CWS gnumake3: pull in cws removetooltypes01

1633 files changed, 31378 insertions, 31270 deletions

diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 5fe0fede94ff..60901a7245bd 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -71,7 +71,7 @@ class MediaItem : public SfxPoolItem
 public:
                             TYPEINFO();
 
-                            MediaItem( USHORT nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
+                            MediaItem( sal_uInt16 nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
                             MediaItem( const MediaItem& rMediaItem );
     virtual                 ~MediaItem();
 
@@ -82,8 +82,8 @@ public:
                                                  SfxMapUnit ePresUnit,
                                                  XubString& rText,
                                                  const IntlWrapper *pIntl ) const;
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual BOOL            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     void                    merge( const MediaItem& rMediaItem );
 
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index ad60b1bdebf3..8d55ab5c401a 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -52,7 +52,7 @@ namespace avmedia
 class MediaPlayer : public SfxChildWindow
 {
 public:
-                        MediaPlayer( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+                        MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
                         ~MediaPlayer();
 
                         SFX_DECL_CHILDWINDOW( MediaPlayer );
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 890fffaf0340..2ae34dc0bd23 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -48,10 +48,10 @@ public:
 
                                 SFX_DECL_TOOLBOX_CONTROL();
 
-                                MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbX );
+                                MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX );
                                 ~MediaToolBoxControl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window*             CreateItemWindow( Window* pParent );
 
 private:
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 2eb18cb164d9..701b7c6cf238 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -86,7 +86,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) );
 
     SetBackground();
-    SetPaintTransparent( TRUE );
+    SetPaintTransparent( sal_True );
     SetParentClipMode( PARENTCLIPMODE_NOCLIP );
 
     if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
@@ -104,11 +104,11 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
         mpZoomListBox->SetBackground();
 
         maZoomToolBox.SetBackground();
-        maZoomToolBox.SetPaintTransparent( TRUE );
+        maZoomToolBox.SetPaintTransparent( sal_True );
         maPlayToolBox.SetBackground();
-        maPlayToolBox.SetPaintTransparent( TRUE );
+        maPlayToolBox.SetPaintTransparent( sal_True );
         maMuteToolBox.SetBackground();
-        maMuteToolBox.SetPaintTransparent( TRUE );
+        maMuteToolBox.SetPaintTransparent( sal_True );
 
     }
 
@@ -362,7 +362,7 @@ void MediaControl::implUpdateToolboxes()
 
         if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() )
         {
-            USHORT nSelectEntryPos ;
+            sal_uInt16 nSelectEntryPos ;
 
             switch( maItem.getZoom() )
             {
@@ -454,7 +454,7 @@ void MediaControl::implUpdateTimeField( double fCurTime )
 
 Image MediaControl::implGetImage( sal_Int32 nImageId ) const
 {
-    return maImageList.GetImage( static_cast< USHORT >( nImageId ) );
+    return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
 }
 
 // ------------------------------------------------------------------------------
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index f9f85eb1ee66..f75fafa0509e 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -50,7 +50,7 @@ TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
 
 // ------------------------------------------------------------------------------
 
-MediaItem::MediaItem( USHORT _nWhich, sal_uInt32 nMaskSet ) :
+MediaItem::MediaItem( sal_uInt16 _nWhich, sal_uInt32 nMaskSet ) :
     SfxPoolItem( _nWhich ),
     mnMaskSet( nMaskSet ),
     meState( MEDIASTATE_STOP ),
@@ -122,7 +122,7 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
 
 //------------------------------------------------------------------------
 
-BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+sal_Bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
 {
     uno::Sequence< uno::Any > aSeq( 9 );
 
@@ -143,10 +143,10 @@ BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
 
 //------------------------------------------------------------------------
 
-BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+sal_Bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
 {
     uno::Sequence< uno::Any >   aSeq;
-    BOOL                        bRet = false;
+    sal_Bool                        bRet = false;
 
     if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) )
     {
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index caab783c6a7c..b476f9a2ef41 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -45,7 +45,7 @@ namespace avmedia
 // - MediaPlayer -
 // ---------------
 
-MediaPlayer::MediaPlayer( Window* _pParent, USHORT nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
+MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
 {
     pWindow = new MediaFloater( _pBindings, this, _pParent );
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 2da70b056bfc..74bacb3861f0 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -95,7 +95,7 @@ SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem )
 
 // -----------------------------------------------------------------------------
 
-MediaToolBoxControl::MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
         rTbx.Invalidate();
@@ -109,7 +109,7 @@ MediaToolBoxControl::~MediaToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void MediaToolBoxControl::StateChanged( USHORT /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
+void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index cf86f54df8f9..72941cd6a78e 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -117,7 +117,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
     if( mpNotifyWindow )
     {
         MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
-                                 sal::static_int_cast< USHORT >(e.ClickCount),
+                                 sal::static_int_cast< sal_uInt16 >(e.ClickCount),
                                  0,
                                 ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
                                 ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
@@ -138,7 +138,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
     if( mpNotifyWindow )
     {
         MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
-                                 sal::static_int_cast< USHORT >(e.ClickCount),
+                                 sal::static_int_cast< sal_uInt16 >(e.ClickCount),
                                  0,
                                 ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
                                 ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index a5928139e7a7..cf45bb40ab9a 100644
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -90,7 +90,7 @@ public:
         IMediaSample *pSample) = 0;
     virtual HRESULT __stdcall BufferCB(
         double SampleTime,
-        WIN_BYTE *pBuffer,
+        BYTE *pBuffer,
         long BufferLen) = 0;
 };
 
@@ -103,13 +103,13 @@ ISampleGrabber : public IUnknown
 {
 public:
     virtual HRESULT __stdcall SetOneShot(
-        WIN_BOOL OneShot) = 0;
+        BOOL OneShot) = 0;
     virtual HRESULT __stdcall SetMediaType(
         const AM_MEDIA_TYPE *pType) = 0;
     virtual HRESULT __stdcall GetConnectedMediaType(
         AM_MEDIA_TYPE *pType) = 0;
     virtual HRESULT __stdcall SetBufferSamples(
-        WIN_BOOL BufferThem) = 0;
+        BOOL BufferThem) = 0;
     virtual HRESULT __stdcall GetCurrentBuffer(
          long *pBufferSize,
          long *pBuffer) = 0;
diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx
index 6d50e1cddc07..7af0e0fe9db7 100644
--- a/basic/inc/basic/basicrt.hxx
+++ b/basic/inc/basic/basicrt.hxx
@@ -44,8 +44,8 @@ public:
     xub_StrLen GetLine();
     xub_StrLen GetCol1();
     xub_StrLen GetCol2();
-    BOOL IsRun();
-    BOOL IsValid() { return pRun != NULL; }
+    sal_Bool IsRun();
+    sal_Bool IsValid() { return pRun != NULL; }
     BasicRuntime GetNextRuntime();
 };
 
@@ -67,12 +67,12 @@ class BasicRuntimeAccess
 public:
     static BasicRuntime GetRuntime();
     static bool HasRuntime();
-    static USHORT GetStackEntryCount();
-    static BasicErrorStackEntry GetStackEntry( USHORT nIndex );
-    static BOOL HasStack();
+    static sal_uInt16 GetStackEntryCount();
+    static BasicErrorStackEntry GetStackEntry( sal_uInt16 nIndex );
+    static sal_Bool HasStack();
     static void DeleteStack();
 
-    static BOOL IsRunInit();
+    static sal_Bool IsRunInit();
 };
 
 #endif
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 720a6efd2182..d8cc5498dfd5 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -68,21 +68,21 @@ class SotStorage;
 class BasicError
 {
 private:
-    ULONG   nErrorId;
-    USHORT  nReason;
+    sal_uIntPtr nErrorId;
+    sal_uInt16  nReason;
     String  aErrStr;
 
 public:
             BasicError();
             BasicError( const BasicError& rErr );
-            BasicError( ULONG nId, USHORT nR, const String& rErrStr );
+            BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr );
 
-    ULONG   GetErrorId() const                  { return nErrorId; }
-    USHORT  GetReason() const                   { return nReason; }
+    sal_uIntPtr     GetErrorId() const                  { return nErrorId; }
+    sal_uInt16  GetReason() const                   { return nReason; }
     String  GetErrorStr()                       { return aErrStr; }
 
-    void    SetErrorId( ULONG n )               { nErrorId = n; }
-    void    SetReason( USHORT n )               { nReason = n; }
+    void    SetErrorId( sal_uIntPtr n )             { nErrorId = n; }
+    void    SetReason( sal_uInt16 n )               { nReason = n; }
     void    SetErrorStr( const String& rStr)    { aErrStr = rStr; }
 };
 
@@ -146,33 +146,33 @@ private:
 
     String              aName;
     String              maStorageName;
-    BOOL                bBasMgrModified;
-    BOOL                mbDocMgr;
+    sal_Bool                bBasMgrModified;
+    sal_Bool                mbDocMgr;
 
     BasicManagerImpl*   mpImpl;
 
     void                Init();
 
 protected:
-    BOOL            ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
-    BOOL            ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly = FALSE ) const;
+    sal_Bool            ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
+    sal_Bool            ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False ) const;
     void            ImpCreateStdLib( StarBASIC* pParentFromStdLib );
     void            ImpMgrNotLoaded(  const String& rStorageName  );
     BasicLibInfo*   CreateLibInfo();
-    void            LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, BOOL bLoadBasics = TRUE );
+    void            LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, sal_Bool bLoadBasics = sal_True );
     void            LoadOldBasicManager( SotStorage& rStorage );
-    BOOL            ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
-    BOOL            ImplEncryptStream( SvStream& rStream ) const;
+    sal_Bool            ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
+    sal_Bool            ImplEncryptStream( SvStream& rStream ) const;
     BasicLibInfo*   FindLibInfo( StarBASIC* pBasic ) const;
-    void            CheckModules( StarBASIC* pBasic, BOOL bReference ) const;
-    void            SetFlagToAllLibs( short nFlag, BOOL bSet ) const;
+    void            CheckModules( StarBASIC* pBasic, sal_Bool bReference ) const;
+    void            SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const;
                     BasicManager(); // Nur zum anpassen von Pfaden bei 'Speichern unter'.
                     ~BasicManager();
 
 public:
                     TYPEINFO();
-                    BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, BOOL bDocMgr = FALSE );
-                    BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, BOOL bDocMgr = FALSE );
+                    BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False );
+                    BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False );
 
     /** deletes the given BasicManager instance
 
@@ -189,12 +189,12 @@ public:
     String          GetName() const                         { return aName; }
 
 
-    USHORT          GetLibCount() const;
-    StarBASIC*      GetLib( USHORT nLib ) const;
+    sal_uInt16          GetLibCount() const;
+    StarBASIC*      GetLib( sal_uInt16 nLib ) const;
     StarBASIC*      GetLib( const String& rName ) const;
-    USHORT          GetLibId( const String& rName ) const;
+    sal_uInt16          GetLibId( const String& rName ) const;
 
-    String          GetLibName( USHORT nLib );
+    String          GetLibName( sal_uInt16 nLib );
 
     /** announces the library containers which belong to this BasicManager
 
@@ -208,14 +208,14 @@ public:
     const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >&
                     GetScriptLibraryContainer()  const;
 
-    BOOL            LoadLib( USHORT nLib );
-    BOOL            RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage );
+    sal_Bool            LoadLib( sal_uInt16 nLib );
+    sal_Bool            RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage );
 
     // Modify-Flag wird nur beim Speichern zurueckgesetzt.
-    BOOL            IsModified() const;
-    BOOL            IsBasicModified() const;
+    sal_Bool            IsModified() const;
+    sal_Bool            IsBasicModified() const;
 
-    BOOL            HasErrors();
+    sal_Bool            HasErrors();
     void            ClearErrors();
     BasicError*     GetFirstError();
     BasicError*     GetNextError();
@@ -245,14 +245,14 @@ public:
     ErrCode         ExecuteMacro( String const& i_fullyQualifiedName, String const& i_commaSeparatedArgs, SbxValue* i_retValue );
 
 private:
-    BOOL            IsReference( USHORT nLib );
+    sal_Bool            IsReference( sal_uInt16 nLib );
 
-    BOOL            SetLibName( USHORT nLib, const String& rName );
+    sal_Bool            SetLibName( sal_uInt16 nLib, const String& rName );
 
     StarBASIC*      GetStdLib() const;
-    StarBASIC*      AddLib( SotStorage& rStorage, const String& rLibName, BOOL bReference );
-    BOOL            RemoveLib( USHORT nLib );
-    BOOL            HasLib( const String& rName ) const;
+    StarBASIC*      AddLib( SotStorage& rStorage, const String& rLibName, sal_Bool bReference );
+    sal_Bool            RemoveLib( sal_uInt16 nLib );
+    sal_Bool            HasLib( const String& rName ) const;
 
     StarBASIC*      CreateLibForLibContainer( const String& rLibName,
                         const com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >&
diff --git a/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx
index aecf55c26a22..2265bd354ec4 100644
--- a/basic/inc/basic/basrdll.hxx
+++ b/basic/inc/basic/basrdll.hxx
@@ -38,8 +38,8 @@ private:
     ResMgr*     pSttResMgr;
     ResMgr*     pBasResMgr;
 
-    BOOL        bDebugMode;
-    BOOL        bBreakEnabled;
+    sal_Bool        bDebugMode;
+    sal_Bool        bBreakEnabled;
 
 public:
                 BasicDLL();
@@ -50,8 +50,8 @@ public:
 
     static void BasicBreak();
 
-    static void EnableBreak( BOOL bEnable );
-    static void SetDebugMode( BOOL bDebugMode );
+    static void EnableBreak( sal_Bool bEnable );
+    static void SetDebugMode( sal_Bool bDebugMode );
 };
 
 #define BASIC_DLL() (*(BasicDLL**)GetAppData( SHL_BASIC ) )
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index 02002f43cdd4..9522dbe7b997 100644
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -36,10 +36,10 @@ class ErrorEntry;
 
 class BasicError {
     AppBasEd* pWin;
-    USHORT  nLine, nCol1, nCol2;
+    sal_uInt16  nLine, nCol1, nCol2;
     String aText;
 public:
-    BasicError( AppBasEd*, USHORT, const String&, USHORT, USHORT, USHORT );
+    BasicError( AppBasEd*, sal_uInt16, const String&, sal_uInt16, sal_uInt16, sal_uInt16 );
     void Show();
 };
 
@@ -51,8 +51,8 @@ DECLARE_LIST( ErrorList, BasicError* )
 class MyBasic : public StarBASIC
 {
     SbError nError;
-    virtual BOOL ErrorHdl();
-    virtual USHORT BreakHdl();
+    virtual sal_Bool ErrorHdl();
+    virtual sal_uInt16 BreakHdl();
 
 protected:
     Link GenLogHdl();
@@ -70,7 +70,7 @@ public:
     ErrorList aErrors;
     MyBasic();
     virtual ~MyBasic();
-    virtual BOOL Compile( SbModule* );
+    virtual sal_Bool Compile( SbModule* );
     void Reset();
     SbError GetErrors() { return nError; }
 
@@ -80,10 +80,10 @@ public:
     virtual void LoadIniFile();
 
     // Determines the extended symbol type for syntax highlighting
-    virtual SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl );
+    virtual SbTextType GetSymbolType( const String &Symbol, sal_Bool bWasTTControl );
     virtual const String GetSpechialErrorText();
     virtual void ReportRuntimeError( AppBasEd *pEditWin );
-    virtual void DebugFindNoErrors( BOOL bDebugFindNoErrors );
+    virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
 
     static void SetCompileModule( SbModule *pMod );
     static SbModule *GetCompileModule();
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index 9a593322b896..e683bf527173 100644
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -42,22 +42,22 @@ class Process
     vos::OArgumentList *pArgumentList;
     vos::OEnvironment *pEnvList;
     vos::OProcess *pProcess;
-    BOOL ImplIsRunning();
+    sal_Bool ImplIsRunning();
     long ImplGetExitCode();
-    BOOL bWasGPF;
-    BOOL bHasBeenStarted;
+    sal_Bool bWasGPF;
+    sal_Bool bHasBeenStarted;
 
 public:
     Process();
     ~Process();
     // Methoden
     void SetImage( const String &aAppPath, const String &aAppParams, const Environment *pEnv = NULL );
-    BOOL Start();
-    ULONG GetExitCode();
-    BOOL IsRunning();
-    BOOL WasGPF();
+    sal_Bool Start();
+    sal_uIntPtr GetExitCode();
+    sal_Bool IsRunning();
+    sal_Bool WasGPF();
 
-    BOOL Terminate();
+    sal_Bool Terminate();
 };
 
 #endif
diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx
index c34176e0bde7..4eeb28d43e32 100644
--- a/basic/inc/basic/sberrors.hxx
+++ b/basic/inc/basic/sberrors.hxx
@@ -31,7 +31,7 @@
 #include <basic/sbxdef.hxx>
 
 #ifndef __RSC
-typedef ULONG SbError;
+typedef sal_uIntPtr SbError;
 #endif
 
 // Mapping to SbxError
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 4e426ffe8552..fea6644db270 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -47,15 +47,15 @@ class SbMethod : public SbxMethod
 
     SbMethodImpl* mpSbMethodImpl;           // Impl data
     SbModule* pMod;
-    USHORT    nDebugFlags;
-    USHORT    nLine1, nLine2;
-    UINT32    nStart;
-    BOOL      bInvalid;
+    sal_uInt16    nDebugFlags;
+    sal_uInt16    nLine1, nLine2;
+    sal_uInt32    nStart;
+    sal_Bool      bInvalid;
     SbxArrayRef refStatics;
     SbMethod( const String&, SbxDataType, SbModule* );
     SbMethod( const SbMethod& );
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual ~SbMethod();
 
 public:
@@ -66,14 +66,14 @@ public:
     SbxArray* GetStatics();
     void      ClearStatics();
     SbModule* GetModule()                { return pMod;        }
-    UINT32    GetId() const              { return nStart;      }
-    USHORT    GetDebugFlags()            { return nDebugFlags; }
-    void      SetDebugFlags( USHORT n )  { nDebugFlags = n;    }
-    void      GetLineRange( USHORT&, USHORT& );
+    sal_uInt32    GetId() const              { return nStart;      }
+    sal_uInt16    GetDebugFlags()            { return nDebugFlags; }
+    void      SetDebugFlags( sal_uInt16 n )  { nDebugFlags = n;    }
+    void      GetLineRange( sal_uInt16&, sal_uInt16& );
 
     // Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
     virtual ErrCode Call( SbxValue* pRet = NULL );
-    virtual void Broadcast( ULONG nHintId );
+    virtual void Broadcast( sal_uIntPtr nHintId );
 };
 
 #ifndef __SB_SBMETHODREF_HXX
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index d6ee1d3eab0e..a0552cdf3d4b 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -40,7 +40,7 @@
 class SbMethod;
 class SbProperty;
 class SbiRuntime;
-typedef std::deque< USHORT > SbiBreakpoints;
+typedef std::deque< sal_uInt16 > SbiBreakpoints;
 class SbiImage;
 class SbProcedureProperty;
 class SbIfaceMapperMethod;
@@ -72,8 +72,8 @@ protected:
     SbiImage*           pImage;        // the Image
     SbiBreakpoints*     pBreaks;       // Breakpoints
     SbClassData*        pClassData;
-    BOOL mbVBACompat;
-    INT32 mnType;
+    sal_Bool mbVBACompat;
+    sal_Int32 mnType;
     SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
     bool    bIsProxyModule;
 
@@ -83,19 +83,19 @@ protected:
     SbProperty*     GetProperty( const String&, SbxDataType );
     SbProcedureProperty* GetProcedureProperty( const String&, SbxDataType );
     SbIfaceMapperMethod* GetIfaceMapperMethod( const String&, SbMethod* );
-    void            EndDefinitions( BOOL=FALSE );
-    USHORT          Run( SbMethod* );
+    void            EndDefinitions( sal_Bool=sal_False );
+    sal_uInt16          Run( SbMethod* );
     void            RunInit();
     void            ClearPrivateVars();
     void            ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic );
-    void            GlobalRunInit( BOOL bBasicStart );  // for all modules
+    void            GlobalRunInit( sal_Bool bBasicStart );  // for all modules
     void            GlobalRunDeInit( void );
-    const BYTE*     FindNextStmnt( const BYTE*, USHORT&, USHORT& ) const;
-    const BYTE*     FindNextStmnt( const BYTE*, USHORT&, USHORT&,
-                        BOOL bFollowJumps, const SbiImage* pImg=NULL ) const;
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
-    virtual BOOL LoadCompleted();
+    const sal_uInt8*    FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const;
+    const sal_uInt8*    FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&,
+                        sal_Bool bFollowJumps, const SbiImage* pImg=NULL ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
+    virtual sal_Bool LoadCompleted();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
     void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -103,7 +103,7 @@ protected:
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
     TYPEINFO();
-                    SbModule( const String&, BOOL bCompat = FALSE );
+                    SbModule( const String&, sal_Bool bCompat = sal_False );
     virtual void    SetParent( SbxObject* );
     virtual void    Clear();
 
@@ -116,33 +116,33 @@ public:
     void            SetSource32( const ::rtl::OUString& r );
     void            SetComment( const String& r );
 
-    virtual BOOL    Compile();
-    BOOL            Disassemble( String& rText );
-    virtual BOOL    IsCompiled() const;
+    virtual sal_Bool    Compile();
+    sal_Bool            Disassemble( String& rText );
+    virtual sal_Bool    IsCompiled() const;
     const SbxObject* FindType( String aTypeName ) const;
 
-    virtual BOOL    IsBreakable( USHORT nLine ) const;
+    virtual sal_Bool    IsBreakable( sal_uInt16 nLine ) const;
     virtual size_t  GetBPCount() const;
-    virtual USHORT  GetBP( size_t n ) const;
-    virtual BOOL    IsBP( USHORT nLine ) const;
-    virtual BOOL    SetBP( USHORT nLine );
-    virtual BOOL    ClearBP( USHORT nLine );
+    virtual sal_uInt16  GetBP( size_t n ) const;
+    virtual sal_Bool    IsBP( sal_uInt16 nLine ) const;
+    virtual sal_Bool    SetBP( sal_uInt16 nLine );
+    virtual sal_Bool    ClearBP( sal_uInt16 nLine );
     virtual void    ClearAllBP();
 
     // Lines of Subs
-    virtual SbMethod*   GetFunctionForLine( USHORT );
+    virtual SbMethod*   GetFunctionForLine( sal_uInt16 );
 
     // Store only image, no source (needed for new password protection)
-       BOOL StoreBinaryData( SvStream& );
-       BOOL StoreBinaryData( SvStream&, USHORT nVer );
-    BOOL LoadBinaryData( SvStream&, USHORT nVer );
-    BOOL LoadBinaryData( SvStream& );
-    BOOL ExceedsLegacyModuleSize();
+       sal_Bool StoreBinaryData( SvStream& );
+       sal_Bool StoreBinaryData( SvStream&, sal_uInt16 nVer );
+    sal_Bool LoadBinaryData( SvStream&, sal_uInt16 nVer );
+    sal_Bool LoadBinaryData( SvStream& );
+    sal_Bool ExceedsLegacyModuleSize();
     void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
-    BOOL IsVBACompat() const;
-    void SetVBACompat( BOOL bCompat );
-    INT32 GetModuleType() { return mnType; }
-    void SetModuleType( INT32 nType ) { mnType = nType; }
+    sal_Bool IsVBACompat() const;
+    void SetVBACompat( sal_Bool bCompat );
+    sal_Int32 GetModuleType() { return mnType; }
+    void SetModuleType( sal_Int32 nType ) { mnType = nType; }
     bool isProxyModule() { return bIsProxyModule; }
     void AddVarName( const String& aName );
     void RemoveVars();
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index 49fefb79309e..f8c515b13108 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -117,7 +117,7 @@ public:
     SbUserFormModuleInstance( SbUserFormModule* pParentModule, const String& rName,
         const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
 
-    virtual BOOL IsClass( const String& ) const;
+    virtual sal_Bool IsClass( const String& ) const;
     virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
 };
 
diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx
index 60cd9e5353c0..88f6504bff76 100644
--- a/basic/inc/basic/sbprop.hxx
+++ b/basic/inc/basic/sbprop.hxx
@@ -39,7 +39,7 @@ class SbProperty : public SbxProperty
     friend class SbModule;
     friend class SbProcedureProperty;
     SbModule* pMod;
-    BOOL     bInvalid;
+    sal_Bool     bInvalid;
     SbProperty( const String&, SbxDataType, SbModule* );
     virtual ~SbProperty();
 public:
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index db67836890e9..9eeee5f71d7c 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -67,13 +67,13 @@ class StarBASIC : public SbxObject
    // Handler-Support:
     Link            aErrorHdl;              // Error handler
     Link            aBreakHdl;              // Breakpoint handler
-    BOOL            bNoRtl;                 // if TRUE: do not search RTL
-    BOOL            bBreak;                 // if TRUE: Break, otherwise Step
-    BOOL            bDocBasic;
-    BOOL            bVBAEnabled;
+    sal_Bool            bNoRtl;                 // if sal_True: do not search RTL
+    sal_Bool            bBreak;                 // if sal_True: Break, otherwise Step
+    sal_Bool            bDocBasic;
+    sal_Bool            bVBAEnabled;
     BasicLibInfo*   pLibInfo;           // Info block for basic manager
     SbLanguageMode  eLanguageMode;      // LanguageMode of the basic object
-    BOOL            bQuit;
+    sal_Bool            bQuit;
 
     SbxObjectRef pVBAGlobals;
     SbxObject* getVBAGlobals( );
@@ -81,19 +81,19 @@ class StarBASIC : public SbxObject
     void implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic );
 
 protected:
-    BOOL            CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
+    sal_Bool            CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
 private:
-    BOOL            RTError( SbError, xub_StrLen, xub_StrLen, xub_StrLen );
-    BOOL            RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
-    USHORT          BreakPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
-    USHORT          StepPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    sal_Bool            RTError( SbError, xub_StrLen, xub_StrLen, xub_StrLen );
+    sal_Bool            RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
+    sal_uInt16          BreakPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+    sal_uInt16          StepPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 
 protected:
 
-    virtual BOOL    ErrorHdl();
-    virtual USHORT  BreakHdl();
+    virtual sal_Bool    ErrorHdl();
+    virtual sal_uInt16  BreakHdl();
     virtual ~StarBASIC();
 
 public:
@@ -101,11 +101,11 @@ public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1);
     TYPEINFO();
 
-    StarBASIC( StarBASIC* pParent = NULL, BOOL bIsDocBasic = FALSE );
+    StarBASIC( StarBASIC* pParent = NULL, sal_Bool bIsDocBasic = sal_False );
 
     // #51727 SetModified overridden so that the Modfied-State is
         // not delivered to Parent.
-    virtual void SetModified( BOOL );
+    virtual void SetModified( sal_Bool );
 
     void* operator  new( size_t );
     void operator   delete( void* );
@@ -122,14 +122,14 @@ public:
     SbModule*       MakeModule( const String& rName, const String& rSrc );
     SbModule*       MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
     SbModule*       MakeModule32( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, const ::rtl::OUString& rSrc );
-    BOOL            Compile( SbModule* );
-    BOOL            Disassemble( SbModule*, String& rText );
+    sal_Bool            Compile( SbModule* );
+    sal_Bool            Disassemble( SbModule*, String& rText );
     static void     Stop();
     static void     Error( SbError );
     static void     Error( SbError, const String& rMsg );
     static void     FatalError( SbError );
     static void     FatalError( SbError, const String& rMsg );
-    static BOOL     IsRunning();
+    static sal_Bool     IsRunning();
     static SbError  GetErrBasic();
     // #66536 make additional message accessible by RTL function Error
     static String   GetErrorMsg();
@@ -138,7 +138,7 @@ public:
     void            Highlight( const String& rSrc, SbTextPortions& rList );
 
     virtual SbxVariable* Find( const String&, SbxClassType );
-    virtual BOOL Call( const String&, SbxArray* = NULL );
+    virtual sal_Bool Call( const String&, SbxArray* = NULL );
 
     SbxArray*       GetModules() { return pModules; }
     SbxObject*      GetRtl()     { return pRtl;     }
@@ -147,26 +147,26 @@ public:
     void            InitAllModules( StarBASIC* pBasicNotToInit = NULL );
     void            DeInitAllModules( void );
     void            ClearAllModuleVars( void );
-    void            ActivateObject( const String*, BOOL );
-    BOOL            LoadOldModules( SvStream& );
+    void            ActivateObject( const String*, sal_Bool );
+    sal_Bool            LoadOldModules( SvStream& );
 
     // #43011 For TestTool; deletes global vars
     void            ClearGlobalVars( void );
 
     // Calls for error and break handler
-    static USHORT   GetLine();
-    static USHORT   GetCol1();
-    static USHORT   GetCol2();
-    static void     SetErrorData( SbError nCode, USHORT nLine,
-                                  USHORT nCol1, USHORT nCol2 );
+    static sal_uInt16   GetLine();
+    static sal_uInt16   GetCol1();
+    static sal_uInt16   GetCol2();
+    static void     SetErrorData( SbError nCode, sal_uInt16 nLine,
+                                  sal_uInt16 nCol1, sal_uInt16 nCol2 );
 
     // Specific to error handler
     static void     MakeErrorText( SbError, const String& aMsg );
     static const    String& GetErrorText();
     static SbError  GetErrorCode();
-    static BOOL     IsCompilerError();
-    static USHORT   GetVBErrorCode( SbError nError );
-    static SbError  GetSfxFromVBError( USHORT nError );
+    static sal_Bool     IsCompilerError();
+    static sal_uInt16   GetVBErrorCode( SbError nError );
+    static SbError  GetSfxFromVBError( sal_uInt16 nError );
     static void     SetGlobalLanguageMode( SbLanguageMode eLangMode );
     static SbLanguageMode GetGlobalLanguageMode();
     // Local settings
@@ -175,7 +175,7 @@ public:
     SbLanguageMode GetLanguageMode();
 
     // Specific for break handler
-    BOOL            IsBreak() const             { return bBreak; }
+    sal_Bool            IsBreak() const             { return bBreak; }
 
     static Link     GetGlobalErrorHdl();
     static void     SetGlobalErrorHdl( const Link& rNewHdl );
@@ -191,24 +191,24 @@ public:
 
     static SbxBase* FindSBXInCurrentScope( const String& rName );
     static SbxVariable* FindVarInCurrentScopy
-                    ( const String& rName, USHORT& rStatus );
-    static SbMethod* GetActiveMethod( USHORT nLevel = 0 );
+                    ( const String& rName, sal_uInt16& rStatus );
+    static SbMethod* GetActiveMethod( sal_uInt16 nLevel = 0 );
     static SbModule* GetActiveModule();
-    void SetVBAEnabled( BOOL bEnabled );
-    BOOL isVBAEnabled();
+    void SetVBAEnabled( sal_Bool bEnabled );
+    sal_Bool isVBAEnabled();
 
-    // #60175 TRUE: SFX-Resource is not displayed on basic errors
-    static void StaticSuppressSfxResource( BOOL bSuppress );
+    // #60175 sal_True: SFX-Resource is not displayed on basic errors
+    static void StaticSuppressSfxResource( sal_Bool bSuppress );
 
-    // #91147 TRUE: Reschedule is enabled (default>, FALSE: No reschedule
-    static void StaticEnableReschedule( BOOL bReschedule );
+    // #91147 sal_True: Reschedule is enabled (default>, sal_False: No reschedule
+    static void StaticEnableReschedule( sal_Bool bReschedule );
 
     SbxObjectRef getRTL( void ) { return pRtl; }
-    BOOL IsDocBasic() { return bDocBasic; }
+    sal_Bool IsDocBasic() { return bDocBasic; }
     SbxVariable* VBAFind( const String& rName, SbxClassType t );
     bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
     void QuitAndExitApplication();
-    BOOL IsQuitApplication() { return bQuit; };
+    sal_Bool IsQuitApplication() { return bQuit; };
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
         GetModelFromBasic( SbxObject* pBasic );
diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx
index 5cc76c8bd9c3..b1c061161896 100644
--- a/basic/inc/basic/sbstdobj.hxx
+++ b/basic/inc/basic/sbstdobj.hxx
@@ -59,9 +59,9 @@ protected:
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
 
-    void    PropType( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void    PropWidth( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void    PropHeight( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+    void    PropType( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void    PropWidth( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void    PropHeight( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
 
 public:
     TYPEINFO();
@@ -79,23 +79,23 @@ public:
 class SbStdFont : public SbxObject
 {
 protected:
-    BOOL    bBold;
-    BOOL    bItalic;
-    BOOL    bStrikeThrough;
-    BOOL    bUnderline;
-    USHORT  nSize;
+    sal_Bool    bBold;
+    sal_Bool    bItalic;
+    sal_Bool    bStrikeThrough;
+    sal_Bool    bUnderline;
+    sal_uInt16  nSize;
     String  aName;
 
    ~SbStdFont();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
 
-    void    PropBold( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void    PropItalic( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void    PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void    PropUnderline( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void    PropSize( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void    PropName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+    void    PropBold( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void    PropItalic( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void    PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void    PropUnderline( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void    PropSize( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void    PropName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
 
 public:
     TYPEINFO();
@@ -103,16 +103,16 @@ public:
     SbStdFont();
     virtual SbxVariable* Find( const String&, SbxClassType );
 
-    void    SetBold( BOOL bB ) { bBold = bB; }
-    BOOL    IsBold() const { return bBold; }
-    void    SetItalic( BOOL bI ) { bItalic = bI; }
-    BOOL    IsItalic() const { return bItalic; }
-    void    SetStrikeThrough( BOOL bS ) { bStrikeThrough = bS; }
-    BOOL    IsStrikeThrough() const { return bStrikeThrough; }
-    void    SetUnderline( BOOL bU ) { bUnderline = bU; }
-    BOOL    IsUnderline() const { return bUnderline; }
-    void    SetSize( USHORT nS ) { nSize = nS; }
-    USHORT  GetSize() const { return nSize; }
+    void    SetBold( sal_Bool bB ) { bBold = bB; }
+    sal_Bool    IsBold() const { return bBold; }
+    void    SetItalic( sal_Bool bI ) { bItalic = bI; }
+    sal_Bool    IsItalic() const { return bItalic; }
+    void    SetStrikeThrough( sal_Bool bS ) { bStrikeThrough = bS; }
+    sal_Bool    IsStrikeThrough() const { return bStrikeThrough; }
+    void    SetUnderline( sal_Bool bU ) { bUnderline = bU; }
+    sal_Bool    IsUnderline() const { return bUnderline; }
+    void    SetSize( sal_uInt16 nS ) { nSize = nS; }
+    sal_uInt16  GetSize() const { return nSize; }
     void    SetFontName( const String& rName ) { aName = rName; }
     String  GetFontName() const { return aName; }
 };
@@ -128,12 +128,12 @@ protected:
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
 
-    void    MethClear( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void    MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void    MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void    MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void    MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void    MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
+    void    MethClear( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void    MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void    MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void    MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void    MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void    MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
 
 public:
     TYPEINFO();
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 2eb194708739..7f0681ccce6c 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -72,9 +72,9 @@ struct SbxParamInfo
     const String aName;          // Name of the parameter
     SbxBaseRef   aTypeRef;       // Object, if object type
     SbxDataType  eType;          // Data type
-    UINT16       nFlags;         // Flag-Bits
-    UINT32       nUserData;      // IDs etc.
-    SbxParamInfo( const String& s, SbxDataType t, USHORT n, SbxBase* b = NULL )
+    sal_uInt16       nFlags;         // Flag-Bits
+    sal_uInt32       nUserData;      // IDs etc.
+    SbxParamInfo( const String& s, SbxDataType t, sal_uInt16 n, SbxBase* b = NULL )
     : aName( s ), aTypeRef( b ), eType( t ), nFlags( n ), nUserData( 0 ) {}
     ~SbxParamInfo() {}
 };
@@ -97,27 +97,27 @@ class SbxInfo : public SvRefBase
 
     String          aComment;
     String          aHelpFile;
-    UINT32          nHelpId;
+    sal_uInt32          nHelpId;
     SbxParams       aParams;
 
 protected:
-    BOOL LoadData( SvStream&, USHORT );
-    BOOL StoreData( SvStream& ) const;
+    sal_Bool LoadData( SvStream&, sal_uInt16 );
+    sal_Bool StoreData( SvStream& ) const;
     virtual ~SbxInfo();
 public:
     SbxInfo();
-    SbxInfo( const String&, UINT32 );
+    SbxInfo( const String&, sal_uInt32 );
 
-    void                AddParam( const String&, SbxDataType, USHORT=SBX_READ );
+    void                AddParam( const String&, SbxDataType, sal_uInt16=SBX_READ );
     void                AddParam( const SbxParamInfo& );
-    const SbxParamInfo* GetParam( USHORT n ) const; // index starts with 1!
+    const SbxParamInfo* GetParam( sal_uInt16 n ) const; // index starts with 1!
     const String&       GetComment() const              { return aComment; }
     const String&       GetHelpFile() const             { return aHelpFile; }
-    UINT32              GetHelpId() const               { return nHelpId;   }
+    sal_uInt32              GetHelpId() const               { return nHelpId;   }
 
     void                SetComment( const String& r )   { aComment = r; }
     void                SetHelpFile( const String& r )  { aHelpFile = r; }
-    void                SetHelpId( UINT32 nId )         { nHelpId = nId; }
+    void                SetHelpId( sal_uInt32 nId )         { nHelpId = nId; }
 };
 
 #endif
@@ -130,7 +130,7 @@ class SbxHint : public SfxSimpleHint
     SbxVariable* pVar;
 public:
     TYPEINFO();
-    SbxHint( ULONG n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
+    SbxHint( sal_uIntPtr n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
     SbxVariable* GetVar() const { return pVar; }
 };
 
@@ -144,7 +144,7 @@ class SbxAlias : public SbxVariable, public SfxListener
 {
     SbxVariableRef xAlias;
     virtual ~SbxAlias();
-    virtual void Broadcast( ULONG );
+    virtual void Broadcast( sal_uIntPtr );
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
 public:
@@ -173,7 +173,7 @@ class SbxArray : public SbxBase
     friend class SbMethod;
     friend class SbClassModuleObject;
     friend SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
-    void PutDirect( SbxVariable* pVar, UINT32 nIdx );
+    void PutDirect( SbxVariable* pVar, sal_uInt32 nIdx );
 
     SbxArrayImpl* mpSbxArrayImpl; // Impl data
     SbxVarRefs*   pData;          // The variables
@@ -181,8 +181,8 @@ class SbxArray : public SbxBase
 protected:
     SbxDataType eType;            // Data type of the array
     virtual ~SbxArray();
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1);
@@ -191,28 +191,28 @@ public:
     SbxArray( const SbxArray& );
     SbxArray& operator=( const SbxArray& );
     virtual void Clear();
-    USHORT Count() const;
+    sal_uInt16 Count() const;
     virtual SbxDataType GetType() const;
     virtual SbxClassType GetClass() const;
-    SbxVariableRef& GetRef( USHORT );
-    SbxVariable* Get( USHORT );
-    void Put( SbxVariable*, USHORT );
-    void Insert( SbxVariable*, USHORT );
-    void Remove( USHORT );
+    SbxVariableRef& GetRef( sal_uInt16 );
+    SbxVariable* Get( sal_uInt16 );
+    void Put( SbxVariable*, sal_uInt16 );
+    void Insert( SbxVariable*, sal_uInt16 );
+    void Remove( sal_uInt16 );
     void Remove( SbxVariable* );
     void Merge( SbxArray* );
-    const String& GetAlias( USHORT );
-    void PutAlias( const String&, USHORT );
-    SbxVariable* FindUserData( UINT32 nUserData );
+    const String& GetAlias( sal_uInt16 );
+    void PutAlias( const String&, sal_uInt16 );
+    SbxVariable* FindUserData( sal_uInt32 nUserData );
     virtual SbxVariable* Find( const String&, SbxClassType );
 
     // Additional methods for 32-bit indices
-    UINT32 Count32() const;
-    SbxVariableRef& GetRef32( UINT32 );
-    SbxVariable* Get32( UINT32 );
-    void Put32( SbxVariable*, UINT32 );
-    void Insert32( SbxVariable*, UINT32 );
-    void Remove32( UINT32 );
+    sal_uInt32 Count32() const;
+    SbxVariableRef& GetRef32( sal_uInt32 );
+    SbxVariable* Get32( sal_uInt32 );
+    void Put32( SbxVariable*, sal_uInt32 );
+    void Insert32( SbxVariable*, sal_uInt32 );
+    void Remove32( sal_uInt32 );
 };
 
 #endif
@@ -231,15 +231,15 @@ class SbxDimArray : public SbxArray
 
     SbxDim* pFirst, *pLast;               // Links to Dimension table
     short   nDim;                         // Number of dimensions
-    void   AddDimImpl32( INT32, INT32, BOOL bAllowSize0 );
+    void   AddDimImpl32( sal_Int32, sal_Int32, sal_Bool bAllowSize0 );
     bool mbHasFixedSize;
 protected:
-    USHORT  Offset( const short* );
-    UINT32  Offset32( const INT32* );
-    USHORT  Offset( SbxArray* );
-    UINT32  Offset32( SbxArray* );
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    sal_uInt16  Offset( const short* );
+    sal_uInt32  Offset32( const sal_Int32* );
+    sal_uInt16  Offset( SbxArray* );
+    sal_uInt32  Offset32( SbxArray* );
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual ~SbxDimArray();
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1);
@@ -261,17 +261,17 @@ public:
     short  GetDims() const { return nDim;  }
     void   AddDim( short, short );
     void   unoAddDim( short, short );
-    BOOL   GetDim( short, short&, short& ) const;
+    sal_Bool   GetDim( short, short&, short& ) const;
 
     using SbxArray::GetRef32;
-    SbxVariableRef& GetRef32( const INT32* );
+    SbxVariableRef& GetRef32( const sal_Int32* );
     using SbxArray::Get32;
-    SbxVariable* Get32( const INT32* );
+    SbxVariable* Get32( const sal_Int32* );
     using SbxArray::Put32;
-    void Put32( SbxVariable*, const INT32* );
-    void   AddDim32( INT32, INT32 );
-    void   unoAddDim32( INT32, INT32 );
-    BOOL   GetDim32( INT32, INT32&, INT32& ) const;
+    void Put32( SbxVariable*, const sal_Int32* );
+    void   AddDim32( sal_Int32, sal_Int32 );
+    void   unoAddDim32( sal_Int32, sal_Int32 );
+    sal_Bool   GetDim32( sal_Int32, sal_Int32&, sal_Int32& ) const;
         bool hasFixedSize() { return mbHasFixedSize; };
         void setHasFixedSize( bool bHasFixedSize ) {mbHasFixedSize = bHasFixedSize; };
 };
@@ -286,7 +286,7 @@ class SbxCollection : public SbxObject
     void Initialize();
 protected:
     virtual ~SbxCollection();
-    virtual BOOL LoadData( SvStream&, USHORT );
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
     // Overridable methods (why not pure virtual?):
@@ -300,7 +300,7 @@ public:
     SbxCollection( const String& rClassname );
     SbxCollection( const SbxCollection& );
     SbxCollection& operator=( const SbxCollection& );
-    virtual SbxVariable* FindUserData( UINT32 nUserData );
+    virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
     virtual SbxVariable* Find( const String&, SbxClassType );
     virtual void Clear();
 };
@@ -314,17 +314,17 @@ class SbxStdCollection : public SbxCollection
 {
 protected:
     String aElemClass;
-    BOOL   bAddRemoveOk;
+    sal_Bool   bAddRemoveOk;
     virtual ~SbxStdCollection();
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual void CollAdd( SbxArray* pPar );
     virtual void CollRemove( SbxArray* pPar );
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1);
     TYPEINFO();
     SbxStdCollection
-        ( const String& rClassname, const String& rElemClass, BOOL=TRUE );
+        ( const String& rClassname, const String& rElemClass, sal_Bool=sal_True );
     SbxStdCollection( const SbxStdCollection& );
     SbxStdCollection& operator=( const SbxStdCollection& );
     virtual void Insert( SbxVariable* );
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 83e474521cc2..b4e80a49f168 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -45,30 +45,30 @@ class UniString;
 
 // This version of the Macros does not define Load/StorePrivateData()-methods
 #define SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )       \
-    virtual UINT32 GetCreator() const { return nCre;   }    \
-    virtual UINT16 GetVersion() const { return nVer;   }    \
-    virtual UINT16 GetSbxId() const   { return nSbxId; }
+    virtual sal_uInt32 GetCreator() const { return nCre;   }    \
+    virtual sal_uInt16 GetVersion() const { return nVer;   }    \
+    virtual sal_uInt16 GetSbxId() const   { return nSbxId; }
 
 #define SBX_DECL_PERSIST_NODATA_()                          \
-    virtual UINT32 GetCreator() const;                      \
-    virtual UINT16 GetVersion() const;                      \
-    virtual UINT16 GetSbxId() const;
+    virtual sal_uInt32 GetCreator() const;                      \
+    virtual sal_uInt16 GetVersion() const;                      \
+    virtual sal_uInt16 GetSbxId() const;
 
 // This version of the macro defines Load/StorePrivateData()-methods
 #define SBX_DECL_PERSIST( nCre, nSbxId, nVer )              \
-    virtual BOOL LoadPrivateData( SvStream&, USHORT );      \
-    virtual BOOL StorePrivateData( SvStream& ) const;       \
+    virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 );      \
+    virtual sal_Bool StorePrivateData( SvStream& ) const;       \
     SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )
 
 #define SBX_DECL_PERSIST_()                                 \
-    virtual BOOL LoadPrivateData( SvStream&, USHORT );      \
-    virtual BOOL StorePrivateData( SvStream& ) const;       \
+    virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 );      \
+    virtual sal_Bool StorePrivateData( SvStream& ) const;       \
     SBX_DECL_PERSIST_NODATA_()
 
 #define SBX_IMPL_PERSIST( C, nCre, nSbxId, nVer )           \
-    UINT32 C::GetCreator() const { return nCre;   }         \
-    UINT16 C::GetVersion() const { return nVer;   }         \
-    UINT16 C::GetSbxId() const   { return nSbxId; }
+    sal_uInt32 C::GetCreator() const { return nCre;   }         \
+    sal_uInt16 C::GetVersion() const { return nVer;   }         \
+    sal_uInt16 C::GetSbxId() const   { return nSbxId; }
 
 class SbxBase;
 class SbxFactory;
@@ -82,10 +82,10 @@ class SbxBase : virtual public SvRefBase
 {
     SbxBaseImpl* mpSbxBaseImpl; // Impl data
 
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 protected:
-    USHORT nFlags;          // Flag-Bits
+    sal_uInt16 nFlags;          // Flag-Bits
 
     SbxBase();
     SbxBase( const SbxBase& );
@@ -94,21 +94,21 @@ protected:
     SBX_DECL_PERSIST(0,0,0);
 public:
     TYPEINFO();
-    inline void     SetFlags( USHORT n );
-    inline USHORT   GetFlags() const;
-    inline void     SetFlag( USHORT n );
-    inline void     ResetFlag( USHORT n );
-    inline BOOL     IsSet( USHORT n ) const;
-    inline BOOL     IsReset( USHORT n ) const;
-    inline BOOL     CanRead() const;
-    inline BOOL     CanWrite() const;
-    inline BOOL     IsModified() const;
-    inline BOOL     IsConst() const;
-    inline BOOL     IsHidden() const;
-    inline BOOL     IsVisible() const;
-
-    virtual BOOL IsFixed() const;
-    virtual void SetModified( BOOL );
+    inline void     SetFlags( sal_uInt16 n );
+    inline sal_uInt16   GetFlags() const;
+    inline void     SetFlag( sal_uInt16 n );
+    inline void     ResetFlag( sal_uInt16 n );
+    inline sal_Bool     IsSet( sal_uInt16 n ) const;
+    inline sal_Bool     IsReset( sal_uInt16 n ) const;
+    inline sal_Bool     CanRead() const;
+    inline sal_Bool     CanWrite() const;
+    inline sal_Bool     IsModified() const;
+    inline sal_Bool     IsConst() const;
+    inline sal_Bool     IsHidden() const;
+    inline sal_Bool     IsVisible() const;
+
+    virtual sal_Bool IsFixed() const;
+    virtual void SetModified( sal_Bool );
 
     virtual SbxDataType  GetType()  const;
     virtual SbxClassType GetClass() const;
@@ -117,24 +117,24 @@ public:
 
     static SbxBase* Load( SvStream& );
     static void Skip( SvStream& );
-    BOOL Store( SvStream& );
-    virtual BOOL LoadCompleted();
-    virtual BOOL StoreCompleted();
+    sal_Bool Store( SvStream& );
+    virtual sal_Bool LoadCompleted();
+    virtual sal_Bool StoreCompleted();
 
     static SbxError GetError();
     static void SetError( SbxError );
-    static BOOL IsError();
+    static sal_Bool IsError();
     static void ResetError();
 
     // Set the factory for Load/Store/Create
     static void AddFactory( SbxFactory* );
     static void RemoveFactory( SbxFactory* );
 
-    static SbxBase* Create( UINT16, UINT32=SBXCR_SBX );
+    static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
     static SbxObject* CreateObject( const String& );
     // Sbx solution as replacement for SfxBroadcaster::Enable()
-    static void StaticEnableBroadcasting( BOOL bEnable );
-    static BOOL StaticIsEnabledBroadcasting( void );
+    static void StaticEnableBroadcasting( sal_Bool bEnable );
+    static sal_Bool StaticIsEnabledBroadcasting( void );
 };
 
 #ifndef SBX_BASE_DECL_DEFINED
@@ -142,40 +142,40 @@ public:
 SV_DECL_REF(SbxBase)
 #endif
 
-inline void SbxBase::SetFlags( USHORT n )
+inline void SbxBase::SetFlags( sal_uInt16 n )
 { DBG_CHKTHIS( SbxBase, 0 ); nFlags = n; }
 
-inline USHORT SbxBase::GetFlags() const
+inline sal_uInt16 SbxBase::GetFlags() const
 { DBG_CHKTHIS( SbxBase, 0 ); return nFlags; }
 
-inline void SbxBase::SetFlag( USHORT n )
+inline void SbxBase::SetFlag( sal_uInt16 n )
 { DBG_CHKTHIS( SbxBase, 0 ); nFlags |= n; }
 
-inline void SbxBase::ResetFlag( USHORT n )
+inline void SbxBase::ResetFlag( sal_uInt16 n )
 { DBG_CHKTHIS( SbxBase, 0 ); nFlags &= ~n; }
 
-inline BOOL SbxBase::IsSet( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) != 0 ); }
+inline sal_Bool SbxBase::IsSet( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) != 0 ); }
 
-inline BOOL SbxBase::IsReset( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) == 0 ); }
+inline sal_Bool SbxBase::IsReset( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) == 0 ); }
 
-inline BOOL SbxBase::CanRead() const
+inline sal_Bool SbxBase::CanRead() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_READ ); }
 
-inline BOOL SbxBase::CanWrite() const
+inline sal_Bool SbxBase::CanWrite() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_WRITE ); }
 
-inline BOOL SbxBase::IsModified() const
+inline sal_Bool SbxBase::IsModified() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_MODIFIED ); }
 
-inline BOOL SbxBase::IsConst() const
+inline sal_Bool SbxBase::IsConst() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_CONST ); }
 
-inline BOOL SbxBase::IsHidden() const
+inline sal_Bool SbxBase::IsHidden() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_HIDDEN ); }
 
-inline BOOL SbxBase::IsVisible() const
+inline sal_Bool SbxBase::IsVisible() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsReset( SBX_INVISIBLE ); }
 
 #endif
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index b85b3552c79e..6dc9fe1d8d66 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -57,23 +57,23 @@ enum SbxClassType {         // SBX-class-IDs (order is important!)
 enum SbxDataType {
     SbxEMPTY      =  0, // * Uninitialized
     SbxNULL       =  1, // * Contains no valid data
-    SbxINTEGER    =  2, // * Integer (INT16)
-    SbxLONG       =  3, // * Long integer (INT32)
+    SbxINTEGER    =  2, // * Integer (sal_Int16)
+    SbxLONG       =  3, // * Long integer (sal_Int32)
     SbxSINGLE     =  4, // * Single-precision floating point number (float)
     SbxDOUBLE     =  5, // * Double-precision floating point number (double)
-    SbxCURRENCY   =  6, //   Currency (INT64)
+    SbxCURRENCY   =  6, //   Currency (sal_Int64)
     SbxDATE       =  7, // * Date (double)
     SbxSTRING     =  8, // * String (StarView)
     SbxOBJECT     =  9, // * SbxBase object pointer
-    SbxERROR      = 10, // * Error (UINT16)
+    SbxERROR      = 10, // * Error (sal_uInt16)
     SbxBOOL       = 11, // * Boolean (0 or -1)
     SbxVARIANT    = 12, // * Anzeige fuer varianten Datentyp
     SbxDATAOBJECT = 13, // * Common data object w/o ref count
 
     SbxCHAR       = 16, // * signed char
     SbxBYTE       = 17, // * unsigned char
-    SbxUSHORT     = 18, // * unsigned short (UINT16)
-    SbxULONG      = 19, // * unsigned long (UINT32)
+    SbxUSHORT     = 18, // * unsigned short (sal_uInt16)
+    SbxULONG      = 19, // * unsigned long (sal_uInt32)
     SbxLONG64     = 20, //   signed 64-bit int
     SbxULONG64    = 21, //   unsigned 64-bit int
     SbxINT        = 22, // * signed machine-dependent int
@@ -105,9 +105,9 @@ enum SbxDataType {
     SbxUSERn  = 2047    // last user defined data type
 };
 
-const UINT32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
-const UINT32 SBX_TYPE_DIM_AS_NEW_FLAG  = 0x20000;
-const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000;   // same value as above as no conflict possible
+const sal_uInt32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
+const sal_uInt32 SBX_TYPE_DIM_AS_NEW_FLAG  = 0x20000;
+const sal_uInt32 SBX_FIXED_LEN_STRING_FLAG = 0x10000;   // same value as above as no conflict possible
 
 #endif
 
@@ -123,8 +123,8 @@ enum SbxOperator {
     SbxPLUS,            // this + var
     SbxMINUS,           // this - var
     SbxNEG,             // -this (var is ignored)
-    SbxIDIV,            // this / var (both operands max. INT32!)
-                        // Boolean operators (max INT32!):
+    SbxIDIV,            // this / var (both operands max. sal_Int32!)
+                        // Boolean operators (max sal_Int32!):
     SbxAND,             // this & var
     SbxOR,              // this | var
     SbxXOR,             // this ^ var
@@ -157,7 +157,7 @@ enum SbxNameType {              // Type of the questioned name of a variable
 #endif
 
 // AB: 20.3.96: New error messages
-typedef ULONG SbxError;         // Preserve old type
+typedef sal_uIntPtr SbxError;           // Preserve old type
 
 #endif
 // von #ifndef __RSC
@@ -356,10 +356,10 @@ enum SbxError {                 // Ergebnis einer Rechenoperation/Konversion
 #define SbxMAXBYTE          ( 255)
 #define SbxMAXINT           ( 32767)
 #define SbxMININT           (-32768)
-#define SbxMAXUINT          ((UINT16) 65535)
+#define SbxMAXUINT          ((sal_uInt16) 65535)
 #define SbxMAXLNG           ( 2147483647)
-#define SbxMINLNG           ((INT32)(-2147483647-1))
-#define SbxMAXULNG          ((UINT32) 0xffffffff)
+#define SbxMINLNG           ((sal_Int32)(-2147483647-1))
+#define SbxMAXULNG          ((sal_uInt32) 0xffffffff)
 
 #define SbxMAXSALINT64      SAL_MAX_INT64
 #define SbxMINSALINT64      SAL_MIN_INT64
@@ -379,7 +379,7 @@ enum SbxError {                 // Ergebnis einer Rechenoperation/Konversion
 #define SBX_MAXINDEX        0x3FF0
 #define SBX_MAXINDEX32      SbxMAXLNG
 
-// The numeric values of TRUE and FALSE
+// The numeric values of sal_True and FALSE
 enum SbxBOOL { SbxFALSE = 0, SbxTRUE = -1 };
 
 #endif // __RSC
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index f72cebd8d979..372785657266 100644
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -37,11 +37,11 @@ class UniString;
 
 class SbxFactory
 {
-    BOOL bHandleLast;   // TRUE: Factory is asked at last because of its expensiveness
+    sal_Bool bHandleLast;   // sal_True: Factory is asked at last because of its expensiveness
 public:
-    SbxFactory( BOOL bLast=FALSE )  { bHandleLast = bLast; }
-    BOOL IsHandleLast( void )       { return bHandleLast; }
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    SbxFactory( sal_Bool bLast=sal_False )  { bHandleLast = bLast; }
+    sal_Bool IsHandleLast( void )       { return bHandleLast; }
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
diff --git a/basic/inc/basic/sbxform.hxx b/basic/inc/basic/sbxform.hxx
index 0e8ab2466271..9f31e3529d04 100644
--- a/basic/inc/basic/sbxform.hxx
+++ b/basic/inc/basic/sbxform.hxx
@@ -111,16 +111,16 @@ class SbxBasicFormater {
     String  BasicFormat( double dNumber, String sFormatStrg );
     String  BasicFormatNull( String sFormatStrg );
 
-    static  BOOL isBasicFormat( String sFormatStrg );
+    static  sal_Bool isBasicFormat( String sFormatStrg );
 
   private:
     //*** some helper methods ***
     //void  ShowError( char *sErrMsg );
-    inline void ShiftString( String& sStrg, USHORT nStartPos );
+    inline void ShiftString( String& sStrg, sal_uInt16 nStartPos );
     inline void StrAppendChar( String& sStrg, sal_Unicode ch );
     void    AppendDigit( String& sStrg, short nDigit );
     void    LeftShiftDecimalPoint( String& sStrg );
-    void    StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow );
+    void    StrRoundDigit( String& sStrg, short nPos, sal_Bool& bOverflow );
     void    StrRoundDigit( String& sStrg, short nPos );
     void    ParseBack( String& sStrg, const String& sFormatStrg,
                 short nFormatPos );
@@ -128,30 +128,30 @@ class SbxBasicFormater {
     // Methods for string conversion with sprintf():
     void    InitScan( double _dNum );
     void    InitExp( double _dNewExp );
-    short   GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit );
+    short   GetDigitAtPosScan( short nPos, sal_Bool& bFoundFirstDigit );
     short   GetDigitAtPosExpScan( double dNewExponent, short nPos,
-                BOOL& bFoundFirstDigit );
-    short   GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit );
+                sal_Bool& bFoundFirstDigit );
+    short   GetDigitAtPosExpScan( short nPos, sal_Bool& bFoundFirstDigit );
 #else
     // Methods for direct 'calculation' with log10() and pow():
     short   GetDigitAtPos( double dNumber, short nPos, double& dNextNumber,
-                BOOL& bFoundFirstDigit );
+                sal_Bool& bFoundFirstDigit );
     short   RoundDigit( double dNumber );
 #endif
-    String  GetPosFormatString( const String& sFormatStrg, BOOL & bFound );
-    String  GetNegFormatString( const String& sFormatStrg, BOOL & bFound );
-    String  Get0FormatString( const String& sFormatStrg, BOOL & bFound );
-    String  GetNullFormatString( const String& sFormatStrg, BOOL & bFound );
+    String  GetPosFormatString( const String& sFormatStrg, sal_Bool & bFound );
+    String  GetNegFormatString( const String& sFormatStrg, sal_Bool & bFound );
+    String  Get0FormatString( const String& sFormatStrg, sal_Bool & bFound );
+    String  GetNullFormatString( const String& sFormatStrg, sal_Bool & bFound );
     short   AnalyseFormatString( const String& sFormatStrg,
                 short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
                 short& nNoOfOptionalDigitsLeft,
                 short& nNoOfExponentDigits,
                 short& nNoOfOptionalExponentDigits,
-                BOOL& bPercent, BOOL& bCurrency, BOOL& bScientific,
-                BOOL& bGenerateThousandSeparator,
+                sal_Bool& bPercent, sal_Bool& bCurrency, sal_Bool& bScientific,
+                sal_Bool& bGenerateThousandSeparator,
                 short& nMultipleThousandSeparators );
     void    ScanFormatString( double dNumber, const String& sFormatStrg,
-                String& sReturnStrg, BOOL bCreateSign );
+                String& sReturnStrg, sal_Bool bCreateSign );
 
     //*** Data ***
     sal_Unicode cDecPoint;      // sign for the decimal point
diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index 5cc9af6f877a..1f812cdb6260 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -44,7 +44,7 @@ public:
     SbxMethod( const SbxMethod& r ) : SvRefBase( r ), SbxVariable( r ) {}
     SbxMethod& operator=( const SbxMethod& r )
     { SbxVariable::operator=( r ); return *this; }
-    BOOL Run( SbxValues* pValues = NULL );
+    sal_Bool Run( SbxValues* pValues = NULL );
     virtual SbxClassType GetClass() const;
 };
 
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
index ebd6a2b93484..c382269f6903 100644
--- a/basic/inc/basic/sbxmstrm.hxx
+++ b/basic/inc/basic/sbxmstrm.hxx
@@ -37,7 +37,7 @@ SV_DECL_REF(SbxMemoryStream)
 class SbxMemoryStream : public SbxBase, public SvMemoryStream
 {
   public:
-    SbxMemoryStream(ULONG nInitSize_=512, ULONG nResize_=64) :
+    SbxMemoryStream(sal_uIntPtr nInitSize_=512, sal_uIntPtr nResize_=64) :
         SvMemoryStream(nInitSize_,nResize_) {}
     ~SbxMemoryStream();
 
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index a1ed962502cd..8b973eee59cb 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -42,9 +42,9 @@ class SbxObject : public SbxVariable, public SfxListener
 {
     SbxObjectImpl* mpSbxObjectImpl; // Impl data
 
-    SbxArray* FindVar( SbxVariable*, USHORT& );
+    SbxArray* FindVar( SbxVariable*, sal_uInt16& );
     // AB 23.3.1997, special method for VCPtrRemove (see below)
-    SbxArray* VCPtrFindVar( SbxVariable*, USHORT& );
+    SbxArray* VCPtrFindVar( SbxVariable*, sal_uInt16& );
 protected:
     SbxArrayRef  pMethods;                  // Methods
     SbxArrayRef  pProps;                    // Properties
@@ -52,8 +52,8 @@ protected:
     SbxProperty* pDfltProp;                 // Default-Property
     String       aClassName;                // Classname
     String       aDfltPropName;
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual ~SbxObject();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
@@ -67,7 +67,7 @@ public:
     virtual SbxClassType GetClass() const;
     virtual void Clear();
 
-    virtual BOOL  IsClass( const String& ) const;
+    virtual sal_Bool  IsClass( const String& ) const;
     const String& GetClassName() const { return aClassName; }
     void          SetClassName( const String &rNew ) { aClassName = rNew; }
     // Default-Property
@@ -75,15 +75,15 @@ public:
     void SetDfltProperty( const String& r );
     void SetDfltProperty( SbxProperty* );
     // Search for an element
-    virtual SbxVariable* FindUserData( UINT32 nUserData );
+    virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
     virtual SbxVariable* Find( const String&, SbxClassType );
     SbxVariable* FindQualified( const String&, SbxClassType );
     // Quick-Call-Interface for Methods
-    virtual BOOL Call( const String&, SbxArray* = NULL );
+    virtual sal_Bool Call( const String&, SbxArray* = NULL );
     // Execution of DDE-Commands
     SbxVariable* Execute( const String& );
     // Manage elements
-    virtual BOOL GetAll( SbxClassType ) { return TRUE; }
+    virtual sal_Bool GetAll( SbxClassType ) { return sal_True; }
     SbxVariable* Make( const String&, SbxClassType, SbxDataType );
     virtual SbxObject* MakeObject( const String&, const String& );
     virtual void Insert( SbxVariable* );
@@ -96,7 +96,7 @@ public:
     virtual void Remove( SbxVariable* );
     // AB 23.3.1997, deletion per pointer for controls (duplicate names!)
     void VCPtrRemove( SbxVariable* );
-    void SetPos( SbxVariable*, USHORT );
+    void SetPos( SbxVariable*, sal_uInt16 );
 
     // Macro-Recording
     virtual String GenerateSource( const String &rLinePrefix,
@@ -108,9 +108,9 @@ public:
     // Hooks
     virtual SvDispatch* GetSvDispatch();
     // Debugging
-    void Dump( SvStream&, BOOL bDumpAll=FALSE );
+    void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
 
-    static void GarbageCollection( ULONG nObjects = 0 /* ::= all */ );
+    static void GarbageCollection( sal_uIntPtr nObjects = 0 /* ::= all */ );
 };
 
 #ifndef __SBX_SBXOBJECTREF_HXX
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 1ba1b5d1edfa..5a2fc4601586 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -38,17 +38,17 @@
 
 struct SbxINT64
 {
-    INT32 nHigh; UINT32 nLow;
+    sal_Int32 nHigh; sal_uInt32 nLow;
 
 #if FALSE
     SbxINT64()           : nHigh( 0 ), nLow( 0 ) {}
-    SbxINT64( UINT8  n ) : nHigh( 0 ), nLow( n ) {}
-    SbxINT64( UINT16 n ) : nHigh( 0 ), nLow( n ) {}
-    SbxINT64( UINT32 n ) : nHigh( 0 ), nLow( n ) {}
+    SbxINT64( sal_uInt8  n ) : nHigh( 0 ), nLow( n ) {}
+    SbxINT64( sal_uInt16 n ) : nHigh( 0 ), nLow( n ) {}
+    SbxINT64( sal_uInt32 n ) : nHigh( 0 ), nLow( n ) {}
     SbxINT64( unsigned int n ) : nHigh( 0 ), nLow( n ) {}
-    SbxINT64( INT8   n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
-    SbxINT64( INT16  n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
-    SbxINT64( INT32  n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
+    SbxINT64( sal_Int8   n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
+    SbxINT64( sal_Int16  n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
+    SbxINT64( sal_Int32  n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
     SbxINT64( int    n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
     SbxINT64( SbxINT64 &r ) : nHigh( r.nHigh ), nLow( r.nLow ) {}
 
@@ -57,7 +57,7 @@ struct SbxINT64
 #endif
     void CHS()
     {
-        nLow  ^= (UINT32)-1;
+        nLow  ^= (sal_uInt32)-1;
         nHigh ^= -1;
         nLow++;
         if( !nLow )
@@ -69,16 +69,16 @@ struct SbxINT64
     {
         if( n >= 0 )
         {
-            nHigh = (INT32)(n / (double)4294967296.0);
-            nLow  = (UINT32)(n - ((double)nHigh * (double)4294967296.0) + 0.5);
+            nHigh = (sal_Int32)(n / (double)4294967296.0);
+            nLow  = (sal_uInt32)(n - ((double)nHigh * (double)4294967296.0) + 0.5);
         }
         else {
-            nHigh = (INT32)(-n / (double)4294967296.0);
-            nLow  = (UINT32)(-n - ((double)nHigh * (double)4294967296.0) + 0.5);
+            nHigh = (sal_Int32)(-n / (double)4294967296.0);
+            nLow  = (sal_uInt32)(-n - ((double)nHigh * (double)4294967296.0) + 0.5);
             CHS();
         }
     }
-    void Set(INT32 n) { nHigh = n < 0 ? -1 : 0; nLow = n; }
+    void Set(sal_Int32 n) { nHigh = n < 0 ? -1 : 0; nLow = n; }
 
     void SetMax()  { nHigh = 0x7FFFFFFF; nLow = 0xFFFFFFFF; }
     void SetMin()  { nHigh = 0x80000000; nLow = 0x00000000; }
@@ -117,14 +117,14 @@ struct SbxINT64
 
 struct SbxUINT64
 {
-    UINT32 nHigh; UINT32 nLow;
+    sal_uInt32 nHigh; sal_uInt32 nLow;
     void Set(double n)
     {
-        nHigh = (UINT32)(n / (double)4294967296.0);
-        nLow  = (UINT32)(n - ((double)nHigh * (double)4294967296.0));
+        nHigh = (sal_uInt32)(n / (double)4294967296.0);
+        nLow  = (sal_uInt32)(n - ((double)nHigh * (double)4294967296.0));
     }
 
-    void Set(UINT32 n) { nHigh = 0; nLow = n; }
+    void Set(sal_uInt32 n) { nHigh = 0; nLow = n; }
 
     void SetMax()  { nHigh = 0xFFFFFFFF; nLow = 0xFFFFFFFF; }
     void SetMin()  { nHigh = 0x00000000; nLow = 0x00000000; }
@@ -165,11 +165,11 @@ struct SbxValues
 {
     union {
         sal_Unicode     nChar;
-        BYTE            nByte;
-        INT16           nInteger;
-        INT32           nLong;
-        UINT16          nUShort;
-        UINT32          nULong;
+        sal_uInt8           nByte;
+        sal_Int16           nInteger;
+        sal_Int32           nLong;
+        sal_uInt16          nUShort;
+        sal_uInt32          nULong;
         float           nSingle;
         double          nDouble;
         SbxINT64        nLong64;
@@ -183,11 +183,11 @@ struct SbxValues
 
         SbxBase*        pObj;
         sal_Unicode*    pChar;
-        BYTE*           pByte;
-        INT16*          pInteger;
-        INT32*          pLong;
-        UINT16*         pUShort;
-        UINT32*         pULong;
+        sal_uInt8*          pByte;
+        sal_Int16*          pInteger;
+        sal_Int32*          pLong;
+        sal_uInt16*         pUShort;
+        sal_uInt32*         pULong;
         float*          pSingle;
         double*         pDouble;
         SbxINT64*       pLong64;
@@ -203,11 +203,11 @@ struct SbxValues
     SbxValues(): pData( NULL ), eType(SbxEMPTY) {}
     SbxValues( SbxDataType e ): eType(e) {}
     SbxValues( char _nChar ): nChar( _nChar ), eType(SbxCHAR) {}
-    SbxValues( BYTE _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
+    SbxValues( sal_uInt8 _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
     SbxValues( short _nInteger ): nInteger( _nInteger ), eType(SbxINTEGER ) {}
     SbxValues( long _nLong ): nLong( _nLong ), eType(SbxLONG) {}
-    SbxValues( USHORT _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
-    SbxValues( ULONG _nULong ): nULong( _nULong ), eType(SbxULONG) {}
+    SbxValues( sal_uInt16 _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
+    SbxValues( sal_uIntPtr _nULong ): nULong( _nULong ), eType(SbxULONG) {}
     SbxValues( float _nSingle ): nSingle( _nSingle ), eType(SbxSINGLE) {}
     SbxValues( double _nDouble ): nDouble( _nDouble ), eType(SbxDOUBLE) {}
     SbxValues( int _nInt ): nInt( _nInt ), eType(SbxINT) {}
@@ -233,17 +233,17 @@ class SbxValue : public SbxBase
     SbxValueImpl* mpSbxValueImplImpl;   // Impl data
 
     // #55226 Transport additional infos
-    SbxValue* TheRealValue( BOOL bObjInObjError ) const;
+    SbxValue* TheRealValue( sal_Bool bObjInObjError ) const;
     SbxValue* TheRealValue() const;
 protected:
     SbxValues aData; // Data
     ::rtl::OUString aPic;  // Picture-String
     String          aToolString;  // tool string copy
 
-    virtual void Broadcast( ULONG );    // Broadcast-Call
+    virtual void Broadcast( sal_uIntPtr );      // Broadcast-Call
     virtual ~SbxValue();
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
     TYPEINFO();
@@ -252,41 +252,41 @@ public:
     SbxValue( const SbxValue& );
     SbxValue& operator=( const SbxValue& );
     virtual void Clear();
-    virtual BOOL IsFixed() const;
-
-    BOOL IsInteger() const { return BOOL( GetType() == SbxINTEGER  ); }
-    BOOL IsLong()    const { return BOOL( GetType() == SbxLONG     ); }
-    BOOL IsSingle()  const { return BOOL( GetType() == SbxSINGLE   ); }
-    BOOL IsDouble()  const { return BOOL( GetType() == SbxDOUBLE   ); }
-    BOOL IsString()  const { return BOOL( GetType() == SbxSTRING   ); }
-    BOOL IsDate()    const { return BOOL( GetType() == SbxDATE     ); }
-    BOOL IsCurrency()const { return BOOL( GetType() == SbxCURRENCY ); }
-    BOOL IsObject()  const { return BOOL( GetType() == SbxOBJECT   ); }
-    BOOL IsDataObject()const{return BOOL( GetType() == SbxDATAOBJECT);}
-    BOOL IsBool()    const { return BOOL( GetType() == SbxBOOL     ); }
-    BOOL IsErr()     const { return BOOL( GetType() == SbxERROR    ); }
-    BOOL IsEmpty()   const { return BOOL( GetType() == SbxEMPTY    ); }
-    BOOL IsNull()    const { return BOOL( GetType() == SbxNULL     ); }
-    BOOL IsChar()    const { return BOOL( GetType() == SbxCHAR     ); }
-    BOOL IsByte()    const { return BOOL( GetType() == SbxBYTE     ); }
-    BOOL IsUShort()  const { return BOOL( GetType() == SbxUSHORT   ); }
-    BOOL IsULong()   const { return BOOL( GetType() == SbxULONG    ); }
-    BOOL IsInt()     const { return BOOL( GetType() == SbxINT      ); }
-    BOOL IsUInt()    const { return BOOL( GetType() == SbxUINT     ); }
-    BOOL IspChar()   const { return BOOL( GetType() == SbxLPSTR    ); }
-    BOOL IsNumeric() const;
-    BOOL IsNumericRTL() const;  // #41692 Interface for Basic
-    BOOL ImpIsNumeric( BOOL bOnlyIntntl ) const;    // Implementation
+    virtual sal_Bool IsFixed() const;
+
+    sal_Bool IsInteger() const { return sal_Bool( GetType() == SbxINTEGER  ); }
+    sal_Bool IsLong()    const { return sal_Bool( GetType() == SbxLONG     ); }
+    sal_Bool IsSingle()  const { return sal_Bool( GetType() == SbxSINGLE   ); }
+    sal_Bool IsDouble()  const { return sal_Bool( GetType() == SbxDOUBLE   ); }
+    sal_Bool IsString()  const { return sal_Bool( GetType() == SbxSTRING   ); }
+    sal_Bool IsDate()    const { return sal_Bool( GetType() == SbxDATE     ); }
+    sal_Bool IsCurrency()const { return sal_Bool( GetType() == SbxCURRENCY ); }
+    sal_Bool IsObject()  const { return sal_Bool( GetType() == SbxOBJECT   ); }
+    sal_Bool IsDataObject()const{return sal_Bool( GetType() == SbxDATAOBJECT);}
+    sal_Bool IsBool()    const { return sal_Bool( GetType() == SbxBOOL     ); }
+    sal_Bool IsErr()     const { return sal_Bool( GetType() == SbxERROR    ); }
+    sal_Bool IsEmpty()   const { return sal_Bool( GetType() == SbxEMPTY    ); }
+    sal_Bool IsNull()    const { return sal_Bool( GetType() == SbxNULL     ); }
+    sal_Bool IsChar()    const { return sal_Bool( GetType() == SbxCHAR     ); }
+    sal_Bool IsByte()    const { return sal_Bool( GetType() == SbxBYTE     ); }
+    sal_Bool IsUShort()  const { return sal_Bool( GetType() == SbxUSHORT   ); }
+    sal_Bool IsULong()   const { return sal_Bool( GetType() == SbxULONG    ); }
+    sal_Bool IsInt()     const { return sal_Bool( GetType() == SbxINT      ); }
+    sal_Bool IsUInt()    const { return sal_Bool( GetType() == SbxUINT     ); }
+    sal_Bool IspChar()   const { return sal_Bool( GetType() == SbxLPSTR    ); }
+    sal_Bool IsNumeric() const;
+    sal_Bool IsNumericRTL() const;  // #41692 Interface for Basic
+    sal_Bool ImpIsNumeric( sal_Bool bOnlyIntntl ) const;    // Implementation
 
     virtual SbxClassType GetClass() const;
     virtual SbxDataType GetType() const;
     SbxDataType GetFullType() const;
-    BOOL SetType( SbxDataType );
+    sal_Bool SetType( SbxDataType );
 
-    virtual BOOL Get( SbxValues& ) const;
-    BOOL GetNoBroadcast( SbxValues& );
+    virtual sal_Bool Get( SbxValues& ) const;
+    sal_Bool GetNoBroadcast( SbxValues& );
     const SbxValues& GetValues_Impl() const { return aData; }
-    virtual BOOL Put( const SbxValues& );
+    virtual sal_Bool Put( const SbxValues& );
 
     inline SbxValues * data() { return &aData; }
 
@@ -295,65 +295,65 @@ public:
     SbxUINT64 GetULong64() const;
     sal_Int64  GetInt64() const;
     sal_uInt64 GetUInt64() const;
-    INT16  GetInteger() const;
-    INT32  GetLong() const;
+    sal_Int16  GetInteger() const;
+    sal_Int32  GetLong() const;
     float  GetSingle() const;
     double GetDouble() const;
     double GetDate() const;
-    BOOL   GetBool() const;
-    UINT16 GetErr() const;
+    sal_Bool   GetBool() const;
+    sal_uInt16 GetErr() const;
     const  String& GetString() const;
     const  String& GetCoreString() const;
     ::rtl::OUString GetOUString() const;
     SbxDecimal* GetDecimal() const;
     SbxBase* GetObject() const;
-    BOOL     HasObject() const;
+    sal_Bool     HasObject() const;
     void*  GetData() const;
     sal_Unicode GetChar() const;
-    BYTE   GetByte() const;
-    UINT16 GetUShort() const;
-    UINT32 GetULong() const;
+    sal_uInt8   GetByte() const;
+    sal_uInt16 GetUShort() const;
+    sal_uInt32 GetULong() const;
     int    GetInt() const;
 
-    BOOL PutCurrency( const SbxINT64& );
-    BOOL PutLong64( const SbxINT64& );
-    BOOL PutULong64( const SbxUINT64& );
-    BOOL PutInt64( sal_Int64 );
-    BOOL PutUInt64( sal_uInt64 );
-    BOOL PutInteger( INT16 );
-    BOOL PutLong( INT32 );
-    BOOL PutSingle( float );
-    BOOL PutDouble( double );
-    BOOL PutDate( double );
-    BOOL PutBool( BOOL );
-    BOOL PutErr( USHORT );
-    BOOL PutStringExt( const ::rtl::OUString& );     // with extended analysis (International, "TRUE"/"FALSE")
-    BOOL PutString( const ::rtl::OUString& );
-    BOOL PutString( const sal_Unicode* );   // Type = SbxSTRING
-    BOOL PutpChar( const sal_Unicode* );    // Type = SbxLPSTR
-    BOOL PutDecimal( SbxDecimal* pDecimal );
-    BOOL PutObject( SbxBase* );
-    BOOL PutData( void* );
-    BOOL PutChar( sal_Unicode );
-    BOOL PutByte( BYTE );
-    BOOL PutUShort( UINT16 );
-    BOOL PutULong( UINT32 );
-    BOOL PutInt( int );
-    BOOL PutEmpty();
-    BOOL PutNull();
+    sal_Bool PutCurrency( const SbxINT64& );
+    sal_Bool PutLong64( const SbxINT64& );
+    sal_Bool PutULong64( const SbxUINT64& );
+    sal_Bool PutInt64( sal_Int64 );
+    sal_Bool PutUInt64( sal_uInt64 );
+    sal_Bool PutInteger( sal_Int16 );
+    sal_Bool PutLong( sal_Int32 );
+    sal_Bool PutSingle( float );
+    sal_Bool PutDouble( double );
+    sal_Bool PutDate( double );
+    sal_Bool PutBool( sal_Bool );
+    sal_Bool PutErr( sal_uInt16 );
+    sal_Bool PutStringExt( const ::rtl::OUString& );     // with extended analysis (International, "sal_True"/"sal_False")
+    sal_Bool PutString( const ::rtl::OUString& );
+    sal_Bool PutString( const sal_Unicode* );   // Type = SbxSTRING
+    sal_Bool PutpChar( const sal_Unicode* );    // Type = SbxLPSTR
+    sal_Bool PutDecimal( SbxDecimal* pDecimal );
+    sal_Bool PutObject( SbxBase* );
+    sal_Bool PutData( void* );
+    sal_Bool PutChar( sal_Unicode );
+    sal_Bool PutByte( sal_uInt8 );
+    sal_Bool PutUShort( sal_uInt16 );
+    sal_Bool PutULong( sal_uInt32 );
+    sal_Bool PutInt( int );
+    sal_Bool PutEmpty();
+    sal_Bool PutNull();
 
     // Special decimal methods
-    BOOL PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
-    BOOL fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+    sal_Bool PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+    sal_Bool fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
 
-    virtual BOOL Convert( SbxDataType );
-    virtual BOOL Compute( SbxOperator, const SbxValue& );
-    virtual BOOL Compare( SbxOperator, const SbxValue& ) const;
-    BOOL Scan( const String&, USHORT* = NULL );
+    virtual sal_Bool Convert( SbxDataType );
+    virtual sal_Bool Compute( SbxOperator, const SbxValue& );
+    virtual sal_Bool Compare( SbxOperator, const SbxValue& ) const;
+    sal_Bool Scan( const String&, sal_uInt16* = NULL );
     void Format( String&, const String* = NULL ) const;
 
     // Interface for CDbl in Basic
-    static SbxError ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle=FALSE );
+    static SbxError ScanNumIntnl( const String& rSrc, double& nVal, sal_Bool bSingle=sal_False );
 
     // The following operators are definied for easier handling.
     // Error conditions (overflow, conversions) are not
@@ -449,7 +449,7 @@ class SbxVariable : public SbxValue
     SfxBroadcaster*  pCst;      // Broadcaster, if needed
     String           maName;            // Name, if available
     SbxArrayRef      mpPar;             // Parameter-Array, if set
-    USHORT           nHash;             // Hash-ID for search
+    sal_uInt16           nHash;             // Hash-ID for search
 
     SbxVariableImpl* getImpl( void );
 
@@ -458,8 +458,8 @@ protected:
     sal_uIntPtr nUserData;          // User data for Call()
     SbxObject* pParent;             // Currently attached object
     virtual ~SbxVariable();
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
     TYPEINFO();
@@ -468,13 +468,13 @@ public:
     SbxVariable( const SbxVariable& );
     SbxVariable& operator=( const SbxVariable& );
 
-    void Dump( SvStream&, BOOL bDumpAll=FALSE );
+    void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
 
     virtual void SetName( const String& );
     virtual const String& GetName( SbxNameType = SbxNAME_NONE ) const;
-    USHORT GetHashCode() const          { return nHash; }
+    sal_uInt16 GetHashCode() const          { return nHash; }
 
-    virtual void SetModified( BOOL );
+    virtual void SetModified( sal_Bool );
 
     sal_uIntPtr GetUserData() const        { return nUserData; }
     void SetUserData( sal_uIntPtr n ) { nUserData = n;    }
@@ -491,8 +491,8 @@ public:
     // Sfx-Broadcasting-Support:
     // Due to data reduction and better DLL-hierarchie currently via casting
     SfxBroadcaster& GetBroadcaster();
-    BOOL IsBroadcaster() const { return BOOL( pCst != NULL ); }
-    virtual void Broadcast( ULONG nHintId );
+    sal_Bool IsBroadcaster() const { return sal_Bool( pCst != NULL ); }
+    virtual void Broadcast( sal_uIntPtr nHintId );
 
     inline const SbxObject* GetParent() const { return pParent; }
     inline SbxObject* GetParent() { return pParent; }
@@ -504,7 +504,7 @@ public:
         StarBASIC* pParentBasic );
     void ClearComListener( void );
 
-    static USHORT MakeHashCode( const String& rName );
+    static sal_uInt16 MakeHashCode( const String& rName );
 };
 
 #ifndef SBX_VARIABLE_DECL_DEFINED
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 37e90bb5cd68..179d28152561 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -40,7 +40,7 @@
 
 // #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
 // this routine became necessary
-BOOL IsTTSignatureForUnicodeTextfile( String aLine );
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine );
 
 //#include "testapp.hxx"
 #define ADD_ERROR_QUIET(nNr, aStr)                                      \
@@ -101,9 +101,9 @@ public:
     String aKurzname;
     String aSlotname;
     String aLangname;
-    USHORT nRType;
+    sal_uInt16 nRType;
     String aRName;
-    BOOL bIsReset;
+    sal_Bool bIsReset;
 };
 
 // Defines for syntax Highlighting
@@ -132,20 +132,20 @@ public:
 class TTExecutionStatusHint : public SfxSimpleHint
 {
 private:
-    USHORT mnType;
+    sal_uInt16 mnType;
     String maExecutionStatus;
     String maAdditionalExecutionStatus;
 
 public:
             TYPEINFO();
-            TTExecutionStatusHint( USHORT nType, sal_Char *pExecutionStatus, const sal_Char *pAdditionalExecutionStatus = "" )
+            TTExecutionStatusHint( sal_uInt16 nType, sal_Char *pExecutionStatus, const sal_Char *pAdditionalExecutionStatus = "" )
                 : SfxSimpleHint(SBX_HINT_EXECUTION_STATUS_INFORMATION)
                 , mnType( nType )
                 , maExecutionStatus( pExecutionStatus, RTL_TEXTENCODING_ASCII_US )
                 , maAdditionalExecutionStatus( pAdditionalExecutionStatus, RTL_TEXTENCODING_ASCII_US )
                 {;}
 
-            TTExecutionStatusHint( USHORT nType, const String &aExecutionStatus = String(), const String &aAdditionalExecutionStatus = String() )
+            TTExecutionStatusHint( sal_uInt16 nType, const String &aExecutionStatus = String(), const String &aAdditionalExecutionStatus = String() )
                 : SfxSimpleHint(SBX_HINT_EXECUTION_STATUS_INFORMATION)
                 , mnType( nType )
                 , maExecutionStatus( aExecutionStatus )
@@ -154,7 +154,7 @@ public:
 
     const String& GetExecutionStatus() const { return maExecutionStatus; }
     const String& GetAdditionalExecutionStatus() const { return maAdditionalExecutionStatus; }
-    USHORT GetType(){ return mnType; }
+    sal_uInt16 GetType(){ return mnType; }
 };
 
 #endif // _BASIC_TESTTOOL_HXX_
diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx
index 06f4939d61c0..27867a97996d 100644
--- a/basic/inc/basic/ttstrhlp.hxx
+++ b/basic/inc/basic/ttstrhlp.hxx
@@ -57,20 +57,20 @@
 #define ResString(nNumber) MakeStringNumber(ResKenn,nNumber)
 #define ArgString(nNumber, aText) MakeStringParam(ArgKenn(nNumber),aText)
 
-UniString GEN_RES_STR0( ULONG nResId );
-UniString GEN_RES_STR1( ULONG nResId, const String &Text1 );
-UniString GEN_RES_STR2( ULONG nResId, const String &Text1, const String &Text2 );
-UniString GEN_RES_STR3( ULONG nResId, const String &Text1, const String &Text2, const String &Text3 );
+UniString GEN_RES_STR0( sal_uIntPtr nResId );
+UniString GEN_RES_STR1( sal_uIntPtr nResId, const String &Text1 );
+UniString GEN_RES_STR2( sal_uIntPtr nResId, const String &Text1, const String &Text2 );
+UniString GEN_RES_STR3( sal_uIntPtr nResId, const String &Text1, const String &Text2, const String &Text3 );
 
 #define GEN_RES_STR1c( nResId, Text1 ) GEN_RES_STR1( nResId, CUniString(Text1) )
 #define GEN_RES_STR2c2( nResId, Text1, Text2 ) GEN_RES_STR2( nResId, Text1, CUniString(Text2) )
 #define GEN_RES_STR3c3( nResId, Text1, Text2, Text3 ) GEN_RES_STR3( nResId, Text1, Text2, CUniString(Text3) )
 
 #define IMPL_GEN_RES_STR \
-UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } \
-UniString GEN_RES_STR1( ULONG nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } \
-UniString GEN_RES_STR2( ULONG nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } \
-UniString GEN_RES_STR3( ULONG nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
+UniString GEN_RES_STR0( sal_uIntPtr nResId ) { return ResString( nResId ); } \
+UniString GEN_RES_STR1( sal_uIntPtr nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } \
+UniString GEN_RES_STR2( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } \
+UniString GEN_RES_STR3( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
 
 #endif
 
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index fd613a81673f..cd3e1dd0061f 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -94,52 +94,52 @@ IMPL_GEN_RES_STR;
 
 #ifdef DBG_UTIL
 // filter Messages generated due to missing configuration  Bug:#83887#
-void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
+void TestToolDebugMessageFilter( const sal_Char *pString, sal_Bool bIsOsl )
 {
-    static BOOL static_bInsideFilter = FALSE;
+    static sal_Bool static_bInsideFilter = sal_False;
 
     // Ignore messages during filtering to avoid endless recursions
     if ( static_bInsideFilter )
         return;
 
-    static_bInsideFilter = TRUE;
+    static_bInsideFilter = sal_True;
 
     ByteString aMessage( pString );
 
-    BOOL bIgnore = FALSE;
+    sal_Bool bIgnore = sal_False;
 
     if ( bIsOsl )
     {
         // OSL
         if ( aMessage.Search( CByteString("Cannot open Configuration: Connector: unknown delegatee com.sun.star.connection.Connector.portal") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
     }
     else
     {
         // DBG
 #if ! (OSL_DEBUG_LEVEL > 1)
         if ( aMessage.Search( CByteString("SelectAppIconPixmap") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
 #endif
         if ( aMessage.Search( CByteString("PropertySetRegistry::") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("property value missing") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("getDateFormatsImpl") ) != STRING_NOTFOUND
             && aMessage.Search( CByteString("no date formats") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("ucb::configureUcb(): Bad arguments") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("CreateInstance with arguments exception") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("AcquireTree failed") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
     }
 
 
     if ( bIgnore )
     {
-        static_bInsideFilter = FALSE;
+        static_bInsideFilter = sal_False;
         return;
     }
 
@@ -164,22 +164,22 @@ void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
 /*    DBG_INSTOUTERROR( DBG_OUT_MSGBOX )
     DBG_ERROR( pString );
     DBG_INSTOUTERROR( DBG_OUT_TESTTOOL )*/
-    static_bInsideFilter = FALSE;
+    static_bInsideFilter = sal_False;
 }
 void SAL_CALL DBG_TestToolDebugMessageFilter( const sal_Char *pString )
 {
-        TestToolDebugMessageFilter( pString, FALSE );
+        TestToolDebugMessageFilter( pString, sal_False );
 }
 extern "C" void SAL_CALL osl_TestToolDebugMessageFilter( const sal_Char *pString )
 {
     if ( !getenv( "DISABLE_SAL_DBGBOX" ) )
-        TestToolDebugMessageFilter( pString, TRUE );
+        TestToolDebugMessageFilter( pString, sal_True );
 }
 #endif
 
 // #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
 // this routine became necessary
-BOOL IsTTSignatureForUnicodeTextfile( String aLine )
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine )
 {
     aLine.SearchAndReplace( '\t', ' ' );
     String ThreeBlanks = CUniString("   ");
@@ -304,7 +304,7 @@ void BasicApp::Main( )
             if ( aDefIniPath.Exists() )
             {
                 aDefIniPath.CopyTo( aIniPath, FSYS_ACTION_COPYFILE );
-                FileStat::SetReadOnlyFlag( aIniPath, FALSE );
+                FileStat::SetReadOnlyFlag( aIniPath, sal_False );
             }
         }
     }
@@ -331,7 +331,7 @@ void BasicApp::Main( )
     }
 
 //  ResMgr::CreateResMgr( CREATEVERSIONRESMGR( stt ),  )
-//const char* ResMgr::GetLang( LanguageType& nType, USHORT nPrio )
+//const char* ResMgr::GetLang( LanguageType& nType, sal_uInt16 nPrio )
 
 //  ResMgr::CreateResMgr( CREATEVERSIONRESMGR( stt )
 //  ResMgr *pRes = new ResMgr( "testtool.res" );
@@ -406,7 +406,7 @@ void BasicApp::SetFocus()
 IMPL_LINK( BasicApp, LateInit, void *, pDummy )
 {
     (void) pDummy; /* avoid warning about unused parameter */
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
     {
         if ( Application::GetCommandLineParam( i ).Copy(0,4).CompareIgnoreCaseToAscii("-run") == COMPARE_EQUAL
@@ -414,7 +414,7 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
             || Application::GetCommandLineParam( i ).Copy(0,4).CompareIgnoreCaseToAscii("/run") == COMPARE_EQUAL
 #endif
             )
-            pFrame->SetAutoRun( TRUE );
+            pFrame->SetAutoRun( sal_True );
         else if ( Application::GetCommandLineParam( i ).Copy(0,7).CompareIgnoreCaseToAscii("-result") == COMPARE_EQUAL
 #ifndef UNX
             || Application::GetCommandLineParam( i ).Copy(0,7).CompareIgnoreCaseToAscii("/result") == COMPARE_EQUAL
@@ -425,7 +425,7 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
             {
                 if ( ByteString( Application::GetCommandLineParam( i+1 ), osl_getThreadTextEncoding() ).IsNumericAscii() )
                 {
-                    MsgEdit::SetMaxLogLen( sal::static_int_cast< USHORT >( Application::GetCommandLineParam( i+1 ).ToInt32() ) );
+                    MsgEdit::SetMaxLogLen( sal::static_int_cast< sal_uInt16 >( Application::GetCommandLineParam( i+1 ).ToInt32() ) );
                 }
                 i++;
             }
@@ -497,7 +497,7 @@ FloatingExecutionStatus::FloatingExecutionStatus( Window * pParent )
 
 void FloatingExecutionStatus::SetStatus( String aW )
 {
-    Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+    Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
     ToTop( TOTOP_NOGRABFOCUS );
     aAusblend.Start();
     aStatus.SetText( aW );
@@ -505,7 +505,7 @@ void FloatingExecutionStatus::SetStatus( String aW )
 
 void FloatingExecutionStatus::SetAdditionalInfo( String aF )
 {
-    Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+    Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
     ToTop( TOTOP_NOGRABFOCUS );
     aAusblend.Start();
     aAdditionalInfo.SetText( aF );
@@ -524,11 +524,11 @@ TYPEINIT1(TTExecutionStatusHint, SfxSimpleHint);
 
 BasicFrame::BasicFrame() : WorkWindow( NULL,
     WinBits( WB_APP | WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) )
-, bIsAutoRun( FALSE )
+, bIsAutoRun( sal_False )
 , pDisplayHidDlg( NULL )
 , pEditVar ( 0 )
-, bAutoReload( FALSE )
-, bAutoSave( TRUE )
+, bAutoReload( sal_False )
+, bAutoSave( sal_True )
 , pBasic( NULL )
 , pExecutionStatus( NULL )
 , pStatus( NULL )
@@ -538,10 +538,10 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
 {
 
     Application::SetDefDialogParent( this );
-    AlwaysEnableInput( TRUE );
+    AlwaysEnableInput( sal_True );
     pBasic  = TTBasic::CreateMyBasic();     // depending on what was linked to the executable
-    bInBreak = FALSE;
-    bDisas = FALSE;
+    bInBreak = sal_False;
+    bDisas = sal_False;
     nFlags  = 0;
 //  Icon aAppIcon;
 
@@ -653,11 +653,11 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
 }
 
 const ByteString ProfilePrefix("_profile_");
-const USHORT ProfilePrefixLen = ProfilePrefix.Len();
+const sal_uInt16 ProfilePrefixLen = ProfilePrefix.Len();
 
 void BasicFrame::LoadIniFile()
 {
-    USHORT i;
+    sal_uInt16 i;
     Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
 
     for ( i = 0 ; i < aConf.GetGroupCount() ; i++ )
@@ -777,12 +777,12 @@ IMPL_LINK( BasicFrame, CheckAllFiles, Timer*, pTimer )
     return 0;
 }
 
-BOOL BasicFrame::IsAutoRun()
+sal_Bool BasicFrame::IsAutoRun()
 {
     return bIsAutoRun;
 }
 
-void BasicFrame::SetAutoRun( BOOL bAuto )
+void BasicFrame::SetAutoRun( sal_Bool bAuto )
 {
     bIsAutoRun = bAuto;
 }
@@ -849,7 +849,7 @@ void BasicFrame::Resize()
 
 
     // Resize possibly maximized window
-    ULONG i;
+    sal_uIntPtr i;
     for( i = pList->Count(); i > 0 ; i-- )
     {
         if ( pList->GetObject( i-1 )->GetWinState() == TT_WIN_STATE_MAX )
@@ -877,7 +877,7 @@ IMPL_LINK( BasicFrame, CloseButtonClick, void*, EMPTYARG )
     {};
     if ( p )
         p->GrabFocus();
-    return Command( RID_FILECLOSE, FALSE );
+    return Command( RID_FILECLOSE, sal_False );
 }
 
 IMPL_LINK( BasicFrame, FloatButtonClick, void*, EMPTYARG )
@@ -906,7 +906,7 @@ void BasicFrame::WinShow_Hide()
         return;
 
     AppWin* p;
-    BOOL bWasFullscreen = FALSE;
+    sal_Bool bWasFullscreen = sal_False;
     for ( p = pList->Last() ; p ; p = pList->Prev() )
     {
         if ( p->pDataEdit )
@@ -916,7 +916,7 @@ void BasicFrame::WinShow_Hide()
                )
                 p->Hide( SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             else
-                p->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+                p->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
         }
         bWasFullscreen |= p->GetWinState() == TT_WIN_STATE_MAX;
     }
@@ -926,10 +926,10 @@ void BasicFrame::WinMax_Restore()
 {
     // The application buttons
     AppWin* p;
-    BOOL bHasFullscreenWin = FALSE;
+    sal_Bool bHasFullscreenWin = sal_False;
     for( p = pList->First(); p && !bHasFullscreenWin ; p = pList->Next() )
         bHasFullscreenWin |= ( p->GetWinState() == TT_WIN_STATE_MAX );
-    GetMenuBar()->ShowButtons( bHasFullscreenWin, FALSE, FALSE );
+    GetMenuBar()->ShowButtons( bHasFullscreenWin, sal_False, sal_False );
     WinShow_Hide();
 }
 
@@ -948,9 +948,9 @@ void BasicFrame::RemoveWindow( AppWin *pWin )
 
     Menu* pMenu = GetMenuBar();
     if( pList->Count() == 0 ) {
-        pMenu->EnableItem( RID_APPEDIT,   FALSE );
-        pMenu->EnableItem( RID_APPRUN,    FALSE );
-        pMenu->EnableItem( RID_APPWINDOW, FALSE );
+        pMenu->EnableItem( RID_APPEDIT,   sal_False );
+        pMenu->EnableItem( RID_APPRUN,    sal_False );
+        pMenu->EnableItem( RID_APPWINDOW, sal_False );
     }
 
     PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
@@ -974,20 +974,20 @@ void BasicFrame::AddWindow( AppWin *pWin )
     // Enable main menu
     MenuBar* pMenu = GetMenuBar();
     if( pList->Count() > 0 ) {
-        pMenu->EnableItem( RID_APPEDIT,   TRUE );
-        pMenu->EnableItem( RID_APPRUN,    TRUE );
-        pMenu->EnableItem( RID_APPWINDOW, TRUE );
+        pMenu->EnableItem( RID_APPEDIT,   sal_True );
+        pMenu->EnableItem( RID_APPRUN,    sal_True );
+        pMenu->EnableItem( RID_APPWINDOW, sal_True );
     }
 
     PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
-    USHORT nLastID = pWinMenu->GetItemId( pWinMenu->GetItemCount() - 1 );
+    sal_uInt16 nLastID = pWinMenu->GetItemId( pWinMenu->GetItemCount() - 1 );
 
     // Separator necessary
     if ( nLastID < RID_WIN_FILE1 && pWinMenu->GetItemType( pWinMenu->GetItemCount() - 1 ) != MENUITEM_SEPARATOR )
         pWinMenu->InsertSeparator();
 
     // Find free ID
-    USHORT nFreeID = RID_WIN_FILE1;
+    sal_uInt16 nFreeID = RID_WIN_FILE1;
     while ( pWinMenu->GetItemPos( nFreeID ) != MENU_ITEM_NOTFOUND && nFreeID < RID_WIN_FILEn )
         nFreeID++;
 
@@ -1013,7 +1013,7 @@ void BasicFrame::FocusWindow( AppWin *pWin )
     pWork = pWin;
     pList->Remove( pWin );
     pList->Insert( pWin, LIST_APPEND );
-    pWin->Minimize( FALSE );
+    pWin->Minimize( sal_False );
 
     aAppFile = pWin->GetText();
     UpdateTitle();
@@ -1022,14 +1022,14 @@ void BasicFrame::FocusWindow( AppWin *pWin )
     pStatus->LoadTaskToolBox();
 }
 
-BOOL BasicFrame::Close()
+sal_Bool BasicFrame::Close()
 {
     if( bInBreak || Basic().IsRunning() )
         if( RET_NO == QueryBox( this, SttResId( IDS_RUNNING ) ).Execute() )
-            return FALSE;
+            return sal_False;
 
     StarBASIC::Stop();
-    bInBreak = FALSE;
+    bInBreak = sal_False;
     if( CloseAll() )
     {
         aLineNum.Stop();
@@ -1043,30 +1043,30 @@ BOOL BasicFrame::Close()
         Application::SetDefDialogParent( NULL );
         WorkWindow::Close();
 
-        return TRUE;
-    } else return FALSE;
+        return sal_True;
+    } else return sal_False;
 }
 
-BOOL BasicFrame::CloseAll()
+sal_Bool BasicFrame::CloseAll()
 {
     while ( pList->Count() )
         if ( !pList->Last()->Close() )
-            return FALSE;
-    return TRUE;
+            return sal_False;
+    return sal_True;
 }
 
-BOOL BasicFrame::CompileAll()
+sal_Bool BasicFrame::CompileAll()
 {
     AppWin* p;
     for( p = pList->First(); p; p = pList->Next() )
-      if( p->ISA(AppBasEd) && !((AppBasEd*)p)->Compile() ) return FALSE;
-    return TRUE;
+      if( p->ISA(AppBasEd) && !((AppBasEd*)p)->Compile() ) return sal_False;
+    return sal_True;
 }
 
 // Setup menu
 #define MENU2FILENAME( Name ) Name.Copy( Name.SearchAscii(" ") +1).EraseAllChars( '~' )
 #define LRUNr( nNr ) CByteString("LRU").Append( ByteString::CreateFromInt32( nNr ) )
-String FILENAME2MENU( USHORT nNr, String aName )
+String FILENAME2MENU( sal_uInt16 nNr, String aName )
 {
     String aRet;
     if ( nNr <= 9 )
@@ -1085,9 +1085,9 @@ void BasicFrame::AddToLRU(String const& aFile)
     PopupMenu *pPopup  = GetMenuBar()->GetPopupMenu(RID_APPFILE);
 
     aConfig.SetGroup("LRU");
-    USHORT nMaxLRU = (USHORT)aConfig.ReadKey("MaxLRU","4").ToInt32();
+    sal_uInt16 nMaxLRU = (sal_uInt16)aConfig.ReadKey("MaxLRU","4").ToInt32();
     DirEntry aFileEntry( aFile );
-    USHORT i,nLastMove = nMaxLRU;
+    sal_uInt16 i,nLastMove = nMaxLRU;
 
     for ( i = 1 ; i<nMaxLRU && nLastMove == nMaxLRU ; i++ )
     {
@@ -1119,15 +1119,15 @@ void BasicFrame::LoadLRU()
 {
     Config     aConfig(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
     PopupMenu *pPopup  = GetMenuBar()->GetPopupMenu(RID_APPFILE);
-    BOOL       bAddSep = TRUE;
+    sal_Bool       bAddSep = sal_True;
 
     aConfig.SetGroup("LRU");
-    USHORT nMaxLRU = (USHORT)aConfig.ReadKey("MaxLRU","4").ToInt32();
+    sal_uInt16 nMaxLRU = (sal_uInt16)aConfig.ReadKey("MaxLRU","4").ToInt32();
 
     if ( pPopup )
         bAddSep = pPopup->GetItemPos( IDM_FILE_LRU1 ) == MENU_ITEM_NOTFOUND;
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 1; i <= nMaxLRU && pPopup != NULL; i++)
     {
         String aFile = UniString( aConfig.ReadKey(LRUNr(i)), RTL_TEXTENCODING_UTF8 );
@@ -1137,7 +1137,7 @@ void BasicFrame::LoadLRU()
             if (bAddSep)
             {
                 pPopup->InsertSeparator();
-                bAddSep = FALSE;
+                bAddSep = sal_False;
             }
 
             if ( pPopup->GetItemPos( IDM_FILE_LRU1 + i-1 ) == MENU_ITEM_NOTFOUND )
@@ -1156,10 +1156,10 @@ void BasicFrame::LoadLRU()
 
 IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
 {
-    BOOL bNormal = BOOL( !bInBreak );
+    sal_Bool bNormal = sal_Bool( !bInBreak );
     pMenu->EnableItem( RID_RUNCOMPILE, bNormal );
 
-    BOOL bHasEdit = BOOL( /*bNormal &&*/ pWork != NULL );
+    sal_Bool bHasEdit = sal_Bool( /*bNormal &&*/ pWork != NULL );
 
 //  pMenu->EnableItem( RID_FILENEW,     bNormal );  // always possible
 //  pMenu->EnableItem( RID_FILEOPEN,    bNormal );
@@ -1171,16 +1171,16 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
     pMenu->EnableItem( RID_FILELOADLIB, bNormal );
     pMenu->EnableItem( RID_FILESAVELIB, bHasEdit );
 
-    BOOL bHasErr = BOOL( bNormal && pBasic->GetErrors() != 0 );
-    BOOL bNext   = bHasErr & bNormal;
-    BOOL bPrev   = bHasErr & bNormal;
+    sal_Bool bHasErr = sal_Bool( bNormal && pBasic->GetErrors() != 0 );
+    sal_Bool bNext   = bHasErr & bNormal;
+    sal_Bool bPrev   = bHasErr & bNormal;
     if( bHasErr )
     {
-        ULONG n = pBasic->aErrors.GetCurPos();
+        sal_uIntPtr n = pBasic->aErrors.GetCurPos();
         if( n == 0 )
-            bPrev = FALSE;
-        if( USHORT(n+1) == pBasic->GetErrors() )
-            bNext = FALSE;
+            bPrev = sal_False;
+        if( sal_uInt16(n+1) == pBasic->GetErrors() )
+            bNext = sal_False;
     }
     pMenu->EnableItem( RID_RUNNEXTERR, bNext );
     pMenu->EnableItem( RID_RUNPREVERR, bPrev );
@@ -1188,7 +1188,7 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
     if( pWork )
         pWork->InitMenu( pMenu );
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK_INLINE_START( BasicFrame, DeInitMenu, Menu *, pMenu )
@@ -1208,7 +1208,7 @@ IMPL_LINK_INLINE_START( BasicFrame, DeInitMenu, Menu *, pMenu )
     pMenu->EnableItem( RID_RUNPREVERR );
     if( pWork ) pWork->DeInitMenu( pMenu );
 */
-    SetAutoRun( FALSE );
+    SetAutoRun( sal_False );
     String aString;
     pStatus->Message( aString );
     return 0L;
@@ -1225,15 +1225,15 @@ IMPL_LINK_INLINE_END( BasicFrame, HighlightMenu, Menu *, pMenu )
 
 IMPL_LINK_INLINE_START( BasicFrame, MenuCommand, Menu *, pMenu )
 {
-    USHORT nId = pMenu->GetCurItemId();
-    BOOL bChecked = pMenu->IsItemChecked( nId );
+    sal_uInt16 nId = pMenu->GetCurItemId();
+    sal_Bool bChecked = pMenu->IsItemChecked( nId );
     return Command( nId, bChecked );
 }
 IMPL_LINK_INLINE_END( BasicFrame, MenuCommand, Menu *, pMenu )
 
 IMPL_LINK_INLINE_START( BasicFrame, Accel, Accelerator*, pAcc )
 {
-    SetAutoRun( FALSE );
+    SetAutoRun( sal_False );
     return Command( pAcc->GetCurItemId() );
 }
 IMPL_LINK_INLINE_END( BasicFrame, Accel, Accelerator*, pAcc )
@@ -1298,14 +1298,14 @@ AppBasEd* BasicFrame::CreateModuleWin( SbModule* pMod )
     return p;
 }
 
-BOOL BasicFrame::LoadFile( String aFilename )
+sal_Bool BasicFrame::LoadFile( String aFilename )
 {
-    BOOL bIsResult = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("RES") == COMPARE_EQUAL;
-    BOOL bIsBasic = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("BAS") == COMPARE_EQUAL;
+    sal_Bool bIsResult = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("RES") == COMPARE_EQUAL;
+    sal_Bool bIsBasic = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("BAS") == COMPARE_EQUAL;
     bIsBasic |= DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("INC") == COMPARE_EQUAL;
 
     AppWin* p;
-    BOOL bSuccess = TRUE;
+    sal_Bool bSuccess = sal_True;
     if ( bIsResult )
     {
         p = new AppError( this, aFilename );
@@ -1332,7 +1332,7 @@ BOOL BasicFrame::LoadFile( String aFilename )
 }
 
 // Execute command
-long BasicFrame::Command( short nID, BOOL bChecked )
+long BasicFrame::Command( short nID, sal_Bool bChecked )
 {
     BasicError* pErr;
 
@@ -1346,7 +1346,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
         case RID_FILEOPEN:
             {
                 String s;
-                if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, FALSE ) ) {
+                if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, sal_False ) ) {
                     AddToLRU( s );
                     LoadFile( s );
 //                  InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
@@ -1387,7 +1387,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             {
                 SbModule *pModule = ((AppBasEd*)pWork)->GetModule();
 #if OSL_DEBUG_LEVEL > 1
-                USHORT x;
+                sal_uInt16 x;
                 x = pWork->GetLineNr();
                 x = ((AppBasEd*)pWork)->GetModule()->GetBPCount();
                 if ( !x )
@@ -1395,7 +1395,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
                 x = pModule->GetBPCount();
 #endif
 
-                for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+                for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
                 {
                     SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
                     DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -1417,7 +1417,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
                 else
                 {
                     AppWin *w = NULL;
-                    for ( w = pList->Last() ; w ? !w->ISA(AppBasEd) : FALSE ; w = pList->Prev() ) ;
+                    for ( w = pList->Last() ; w ? !w->ISA(AppBasEd) : sal_False ; w = pList->Prev() ) ;
                     if ( w )
                     {
                         p = ((AppBasEd*)w);
@@ -1430,7 +1430,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
 
                 if( bInBreak )
                     // Reset the flag
-                    bInBreak = FALSE;
+                    bInBreak = sal_False;
                 else
                 {
                     if( IsAutoSave() && !SaveAll() ) break;
@@ -1439,12 +1439,12 @@ long BasicFrame::Command( short nID, BOOL bChecked )
                     pStatus->Message( aString );
                     if( p )
                     {
-                        BasicDLL::SetDebugMode( TRUE );
+                        BasicDLL::SetDebugMode( sal_True );
                         Basic().ClearGlobalVars();
                         p->Run();
-                        BasicDLL::SetDebugMode( FALSE );
+                        BasicDLL::SetDebugMode( sal_False );
                         // If cancelled during Interactive=FALSE
-//                      BasicDLL::EnableBreak( TRUE );
+//                      BasicDLL::EnableBreak( sal_True );
                     }
                 }}
             }
@@ -1459,7 +1459,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             }
             break;
         case RID_RUNDISAS:
-            bDisas = BOOL( !bChecked );
+            bDisas = sal_Bool( !bChecked );
             break;
         case RID_RUNBREAK:
             if ( Basic().IsRunning() && !bInBreak )
@@ -1470,7 +1470,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             break;
         case RID_RUNSTOP:
             Basic().Stop();
-            bInBreak = FALSE;
+            bInBreak = sal_False;
             break;
         case RID_RUNNEXTERR:
             pErr = pBasic->aErrors.Next();
@@ -1494,7 +1494,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
         case RID_WINTILE:
             {
                 WindowArrange aArange;
-                for ( ULONG i = 0 ; i < pList->Count() ; i++ )
+                for ( sal_uIntPtr i = 0 ; i < pList->Count() ; i++ )
                 {
                     aArange.AddWindow( pList->GetObject( i ) );
                     pList->GetObject( i )->Restore();
@@ -1518,7 +1518,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
         case RID_WINTILEHORZ:
             {
                 WindowArrange aArange;
-                for ( ULONG i = 0 ; i < pList->Count() ; i++ )
+                for ( sal_uIntPtr i = 0 ; i < pList->Count() ; i++ )
                 {
                     aArange.AddWindow( pList->GetObject( i ) );
                     pList->GetObject( i )->Restore();
@@ -1546,7 +1546,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
 //#define WINDOWARRANGE_CASCADE 4
             {
                 WindowArrange aArange;
-                for ( ULONG i = 0 ; i < pList->Count() ; i++ )
+                for ( sal_uIntPtr i = 0 ; i < pList->Count() ; i++ )
                 {
                     aArange.AddWindow( pList->GetObject( i ) );
                     pList->GetObject( i )->Restore();
@@ -1569,7 +1569,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             break;
         case RID_WINCASCADE:
             {
-                for ( USHORT i = 0 ; i < pList->Count() ; i++ )
+                for ( sal_uInt16 i = 0 ; i < pList->Count() ; i++ )
                 {
                     pList->GetObject( i )->Cascade( i );
                 }
@@ -1631,22 +1631,22 @@ long BasicFrame::Command( short nID, BOOL bChecked )
 //              InitMenu(GetMenuBar()->GetPopupMenu( RID_APPEDIT ));    // So daß Delete richtig ist
             }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL BasicFrame::SaveAll()
+sal_Bool BasicFrame::SaveAll()
 {
     AppWin* p, *q = pWork;
     for( p = pList->First(); p; p = pList->Next() )
     {
-        USHORT nRes = p->QuerySave( QUERY_DISK_CHANGED );
+        sal_uInt16 nRes = p->QuerySave( QUERY_DISK_CHANGED );
         if( (( nRes == SAVE_RES_ERROR ) && QueryBox(this,SttResId(IDS_ASKSAVEERROR)).Execute() == RET_NO )
             || ( nRes == SAVE_RES_CANCEL ) )
-            return FALSE;
+            return sal_False;
     }
     if ( q )
         q->ToTop();
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( BasicFrame, ModuleWinExists, String*, pFilename )
@@ -1687,7 +1687,7 @@ AppWin* BasicFrame::FindWin( const String& rName )
     return NULL;
 }
 
-AppWin* BasicFrame::FindWin( USHORT nWinId )
+AppWin* BasicFrame::FindWin( sal_uInt16 nWinId )
 {
     AppWin* p;
     for( p = pList->First(); p; p = pList->Next() )
@@ -1714,10 +1714,10 @@ IMPL_LINK( BasicFrame, WriteString, String*, pString )
     if ( pList->Last() )
     {
         pList->Last()->pDataEdit->ReplaceSelected( *pString );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 class NewFileDialog : public FileDialog
@@ -1740,7 +1740,7 @@ void NewFileDialog::FilterSelect()
         return; // User decides after he has changed the path
 
     String aCurFilter = GetCurFilter();
-    USHORT nFilterNr = 0;
+    sal_uInt16 nFilterNr = 0;
     while ( nFilterNr < GetFilterCount() && aCurFilter != GetFilterName( nFilterNr ) )
     {
         nFilterNr++;
@@ -1759,7 +1759,7 @@ void NewFileDialog::FilterSelect()
 
 short NewFileDialog::Execute()
 {
-    BOOL bRet = (BOOL)FileDialog::Execute();
+    sal_Bool bRet = (sal_Bool)FileDialog::Execute();
     if ( bRet )
     {
         Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
@@ -1772,8 +1772,8 @@ short NewFileDialog::Execute()
     return bRet;
 }
 
-BOOL BasicFrame::QueryFileName
-                (String& rName, FileType nFileType, BOOL bSave )
+sal_Bool BasicFrame::QueryFileName
+                (String& rName, FileType nFileType, sal_Bool bSave )
 {
     NewFileDialog aDlg( this, bSave ? WinBits( WB_SAVEAS ) :
                                 WinBits( WB_OPEN ) );
@@ -1826,21 +1826,21 @@ BOOL BasicFrame::QueryFileName
             if ( rExtension == aDlg.GetFilterName( i ) )
                 rExtension = aDlg.GetFilterType( i );
 */
-        return TRUE;
-    } else return FALSE;
+        return sal_True;
+    } else return sal_False;
 }
 
-USHORT BasicFrame::BreakHandler()
+sal_uInt16 BasicFrame::BreakHandler()
 {
-    bInBreak = TRUE;
+    bInBreak = sal_True;
 //  InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
 //  MenuBar aBar( ResId( RID_APPMENUBAR ) );
-//  aBar.EnableItem( RID_APPEDIT, FALSE );
+//  aBar.EnableItem( RID_APPEDIT, sal_False );
     SetAppMode( String( SttResId ( IDS_APPMODE_BREAK ) ) );
     while( bInBreak )
         GetpApp()->Yield();
     SetAppMode( String( SttResId ( IDS_APPMODE_RUN ) ) );
-//  aBar.EnableItem( RID_APPEDIT, TRUE );
+//  aBar.EnableItem( RID_APPEDIT, sal_True );
 //  InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
     return nFlags;
 }
@@ -1848,7 +1848,7 @@ USHORT BasicFrame::BreakHandler()
 void BasicFrame::LoadLibrary()
 {
     String s;
-    if( QueryFileName( s, FT_BASIC_LIBRARY, FALSE ) )
+    if( QueryFileName( s, FT_BASIC_LIBRARY, sal_False ) )
     {
         CloseAll();
         SvFileStream aStrm( s, STREAM_STD_READ );
@@ -1858,7 +1858,7 @@ void BasicFrame::LoadLibrary()
             pBasic = pNew;
             // Show all contents if existing
             SbxArray* pMods = pBasic->GetModules();
-            for( USHORT i = 0; i < pMods->Count(); i++ )
+            for( sal_uInt16 i = 0; i < pMods->Count(); i++ )
             {
                 SbModule* pMod = (SbModule*) pMods->Get( i );
                 AppWin* p = new AppBasEd( this, pMod );
@@ -1876,7 +1876,7 @@ void BasicFrame::LoadLibrary()
 void BasicFrame::SaveLibrary()
 {
     String s;
-    if( QueryFileName( s, FT_BASIC_LIBRARY, TRUE ) )
+    if( QueryFileName( s, FT_BASIC_LIBRARY, sal_True ) )
     {
         SvFileStream aStrm( s, STREAM_STD_WRITE );
         if( !Basic().Store( aStrm ) )
@@ -1890,8 +1890,8 @@ String BasicFrame::GenRealString( const String &aResString )
     String aType,aValue,aResult(aResString);
     String aString;
     xub_StrLen nInsertPos = 0;
-    BOOL bFound;
-    bFound = FALSE;
+    sal_Bool bFound;
+    bFound = sal_False;
 
     while ( (nStart = aResult.Search(StartKenn,nStartPos)) != STRING_NOTFOUND &&
             (nGleich = aResult.SearchAscii("=",nStart+StartKenn.Len())) != STRING_NOTFOUND &&
@@ -1911,7 +1911,7 @@ String BasicFrame::GenRealString( const String &aResString )
                 aString.Erase();
             }
 //          if ( Resource::GetResManager()->IsAvailable( ResId( aValue ) ) )
-                aString = String( SttResId( (USHORT)(aValue.ToInt32()) ) );
+                aString = String( SttResId( (sal_uInt16)(aValue.ToInt32()) ) );
 //          else
             {
 //              DBG_ERROR( "Could not load resource!" );
@@ -1920,12 +1920,12 @@ String BasicFrame::GenRealString( const String &aResString )
             nInsertPos = nStart;
             nStartPos = nStart;
             aResult.Erase( nStart, nEnd-nStart+1 );
-            bFound = TRUE;
+            bFound = sal_True;
         }
         else if ( aType.Search(BaseArgKenn) == 0 ) // Starts with BaseArgKenn
         {
             // TODO: What the hell is that for??
-            USHORT nArgNr = USHORT( aType.Copy( BaseArgKenn.Len() ).ToInt32() );
+            sal_uInt16 nArgNr = sal_uInt16( aType.Copy( BaseArgKenn.Len() ).ToInt32() );
             DBG_ASSERT( aString.Search( CUniString("($Arg").Append( String::CreateFromInt32(nArgNr) ).AppendAscii(")") ) != STRING_NOTFOUND, "Extra Argument given in String");
             aString.SearchAndReplace( CUniString("($Arg").Append( String::CreateFromInt32(nArgNr) ).AppendAscii(")"), aValue );
             nStartPos = nStart;
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index cd76b6481def..5a501ec5efcf 100644
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -67,7 +67,7 @@ public:
 
     void  LoadIniFile();
     void  SetFocus();
-    void  Wait( BOOL );
+    void  Wait( sal_Bool );
     DECL_LINK( LateInit, void * );
 
 #ifdef DBG_UTIL
@@ -76,7 +76,7 @@ public:
 };
 
 
-typedef USHORT FileType;
+typedef sal_uInt16 FileType;
 
 #define FT_NO_FILE              (FileType)0x00  // An error has occurred ...
 #define FT_BASIC_SOURCE         (FileType)0x01
@@ -95,16 +95,16 @@ class BasicFrame : public WorkWindow, public SfxBroadcaster, public SfxListener
 using SystemWindow::Notify;
 using Window::Command;
 
-virtual BOOL Close();
-    BOOL CloseAll();          // Close all windows
-    BOOL CompileAll();        // Compile all texts
+virtual sal_Bool Close();
+    sal_Bool CloseAll();          // Close all windows
+    sal_Bool CompileAll();        // Compile all texts
     AutoTimer aLineNum;       // Show the line numbers
 virtual void Resize();
 virtual void Move();
 virtual void GetFocus();
     void LoadLibrary();
     void SaveLibrary();
-    BOOL bIsAutoRun;
+    sal_Bool bIsAutoRun;
     DisplayHidDlg* pDisplayHidDlg;
 
 //  BreakPoint *pRunToCursorBP;
@@ -114,8 +114,8 @@ virtual void GetFocus();
 
 
     Timer aCheckFiles;      // Checks the files for changes
-    BOOL bAutoReload;
-    BOOL bAutoSave;
+    sal_Bool bAutoReload;
+    sal_Bool bAutoSave;
     DECL_LINK( CheckAllFiles, Timer* );
 
     MyBasicRef  pBasic;             // BASIC-Engine
@@ -131,16 +131,16 @@ virtual void GetFocus();
     FloatingExecutionStatus *pExecutionStatus;
 
 public:
-    BOOL IsAutoRun();
-    void SetAutoRun( BOOL bAuto );
-    BOOL bInBreak;                  // TRUE if in Break-Handler
+    sal_Bool IsAutoRun();
+    void SetAutoRun( sal_Bool bAuto );
+    sal_Bool bInBreak;                  // sal_True if in Break-Handler
     StatusLine* pStatus;            // Status line
     EditList*   pList;              // List of edit windows
     AppWin*     pWork;              // Current edit window
     BasicPrinter* pPrn;             // Printer
-    BOOL bDisas;                    // TRUE: disassemble
-    USHORT nFlags;                  // Debugging-Flags
-    USHORT nMaximizedWindows;       // Number of maximized windows
+    sal_Bool bDisas;                    // sal_True: disassemble
+    sal_uInt16 nFlags;                  // Debugging-Flags
+    sal_uInt16 nMaximizedWindows;       // Number of maximized windows
     void FocusWindow( AppWin *pWin );
     void WinMax_Restore();
     void WinShow_Hide();
@@ -162,25 +162,25 @@ public:
     MsgEdit* GetMsgTree( String aLogFileName );
     DECL_LINK( Log, TTLogMsg * );
     DECL_LINK( WinInfo, WinInfoRec * );
-    BOOL LoadFile( String aFilename );
-    long Command( short,BOOL=FALSE );  // Command handler
+    sal_Bool LoadFile( String aFilename );
+    long Command( short,sal_Bool=sal_False );  // Command handler
     virtual void Command( const CommandEvent& rCEvt );      // Command handler
-    BOOL SaveAll();                 // Save all windows
-    BOOL QueryFileName( String& rName, FileType nFileType, BOOL bSave ); // Query for filename
+    sal_Bool SaveAll();                 // Save all windows
+    sal_Bool QueryFileName( String& rName, FileType nFileType, sal_Bool bSave ); // Query for filename
     DECL_LINK( ModuleWinExists, String* );
     DECL_LINK( WriteString, String* );
     AppBasEd* CreateModuleWin( SbModule* pMod );
     AppBasEd* FindModuleWin( const String& );
     AppError* FindErrorWin( const String& );
     AppWin* FindWin( const String& );
-    AppWin* FindWin( USHORT nWinId );
+    AppWin* FindWin( sal_uInt16 nWinId );
     AppWin* IsWinValid( AppWin* pMaybeWin );
-    USHORT BreakHandler();          // Break-Handler-Callback
+    sal_uInt16 BreakHandler();          // Break-Handler-Callback
 
     void SetEditVar( SbxVariable *pVar ){ pEditVar = pVar;}
     SbxVariable* GetEditVar(){ return pEditVar;}
-    BOOL IsAutoReload() { return bAutoReload; }
-    BOOL IsAutoSave() { return bAutoSave; }
+    sal_Bool IsAutoReload() { return bAutoReload; }
+    sal_Bool IsAutoSave() { return bAutoSave; }
     void LoadIniFile();
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
index 847a2fde02ec..fd7637fe26bf 100644
--- a/basic/source/app/appbased.cxx
+++ b/basic/source/app/appbased.cxx
@@ -60,11 +60,11 @@ AppBasEd::AppBasEd( BasicFrame* pParent, SbModule* p )
     pBreakpoints->Show();
 
 
-    ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( TRUE );
+    ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( sal_True );
     ((TextEdit*)pDataEdit)->GetTextEditImp().pTextEngine->SetMaxTextLen( STRING_MAXLEN );
 //  ((TextEdit*)pDataEdit)->GetTextEditImp().pTextEngine->SetWordDelimiters( CUniString(" ,.;:(){}[]\"'+-*/<>^\\") );
-    ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( TRUE );
-    ((TextEdit*)pDataEdit)->SaveAsUTF8( TRUE );
+    ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( sal_True );
+    ((TextEdit*)pDataEdit)->SaveAsUTF8( sal_True );
 
     String aEmpty;
 
@@ -110,7 +110,7 @@ void AppBasEd::Notify( SfxBroadcaster&, const SfxHint& rHint )
     const SfxSimpleHint* p = PTR_CAST(SfxSimpleHint,&rHint);
     if( p )
     {
-        ULONG nHintId = p->GetId();
+        sal_uIntPtr nHintId = p->GetId();
         if( nHintId == SBX_HINT_LANGUAGE_EXTENSION_LOADED )
         {
             ((TextEdit*)pDataEdit)->GetTextEditImp().InvalidateSyntaxHighlight();
@@ -126,8 +126,8 @@ FileType AppBasEd::GetFileType()
 IMPL_LINK_INLINE_START( AppBasEd, EditChange, void *, p )
 {
     (void) p; /* avoid warning about unused parameter */
-    bCompiled = FALSE;
-    return TRUE;
+    bCompiled = sal_False;
+    return sal_True;
 }
 IMPL_LINK_INLINE_END( AppBasEd, EditChange, void *, p )
 
@@ -135,16 +135,16 @@ IMPL_LINK_INLINE_END( AppBasEd, EditChange, void *, p )
 long AppBasEd::InitMenu( Menu* pMenu )
 {
     AppEdit::InitMenu (pMenu );
-    BOOL bRunning = pFrame->Basic().IsRunning();
+    sal_Bool bRunning = pFrame->Basic().IsRunning();
     pMenu->EnableItem( RID_RUNCOMPILE,  !bCompiled && !bRunning );
-    return TRUE;
+    return sal_True;
 }
 
 long AppBasEd::DeInitMenu( Menu* pMenu )
 {
     AppEdit::DeInitMenu (pMenu );
     pMenu->EnableItem( RID_RUNCOMPILE );
-    return TRUE;
+    return sal_True;
 }
 
 // Menu Handler
@@ -186,13 +186,13 @@ void AppBasEd::PostLoad()
     pMod->SetName( GetText() );
     pMod->Clear();
     pMod->SetSource( pDataEdit->GetText() );
-    bCompiled = FALSE;  // because the code might have changed in the meantime
+    bCompiled = sal_False;  // because the code might have changed in the meantime
     AppEdit::PostLoad();
 
     pBreakpoints->LoadBreakpoints( GetText() );
 }
 
-USHORT AppBasEd::ImplSave()
+sal_uInt16 AppBasEd::ImplSave()
 {
     pBreakpoints->SaveBreakpoints( GetText() );
     return AppEdit::ImplSave();
@@ -208,7 +208,7 @@ void AppBasEd::Reload()
 // Reload source code file after change
 void AppBasEd::LoadSource()
 {
-    BOOL bErr;
+    sal_Bool bErr;
 
 //  if( pDataEdit->GetText().Len() != 0 ) return;
     String aName = pMod->GetName();
@@ -218,7 +218,7 @@ void AppBasEd::LoadSource()
         ErrorBox( this, SttResId( IDS_READERROR ) ).Execute();
     else
         UpdateFileInfo( HAS_BEEN_LOADED );
-    bCompiled = FALSE;  // because the code might have changed in the meantime
+    bCompiled = sal_False;  // because the code might have changed in the meantime
 }
 
 // Save as (new name)
@@ -229,15 +229,15 @@ void AppBasEd::PostSaveAs()
 }
 
 // Compile
-BOOL AppBasEd::Compile()
+sal_Bool AppBasEd::Compile()
 {
     if( !pDataEdit->HasText() || bCompiled )
-        return TRUE;
+        return sal_True;
     pMod->SetSource( pDataEdit->GetText() );
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if( pFrame->Basic().Compile( pMod ) )
     {
-        bRes = TRUE;
+        bRes = sal_True;
         if( pFrame->bDisas )
             Disassemble();
         TextSelection aSel( pDataEdit->GetSelection() );
@@ -267,7 +267,7 @@ void AppBasEd::Run()
 {
     pFrame->Basic().Reset();
     SbxArray* pAllModules = pFrame->Basic().GetModules();
-    for (USHORT i = 0; i < pAllModules->Count(); i++)
+    for (sal_uInt16 i = 0; i < pAllModules->Count(); i++)
     {
         if ( (pAllModules->Get(i)->GetName()).Copy(0,2).CompareToAscii( "--" ) == COMPARE_EQUAL )
         {
diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx
index 339f0c1a3d18..ccda8ce68c69 100644
--- a/basic/source/app/appbased.hxx
+++ b/basic/source/app/appbased.hxx
@@ -43,12 +43,12 @@ class AppBasEd : public AppEdit  {  // Editor-Window:
 using DockingWindow::Notify;
 
     SbModuleRef pMod;               // compile module
-    BOOL bCompiled;                 // TRUE if compiled
+    sal_Bool bCompiled;                 // sal_True if compiled
 protected:
     DECL_LINK( EditChange, void * );
 #define BREAKPOINTSWIDTH 15
     BreakpointWindow *pBreakpoints;
-    virtual USHORT ImplSave();              // Save file
+    virtual sal_uInt16 ImplSave();              // Save file
 
 public:
     TYPEINFO();
@@ -64,7 +64,7 @@ public:
     virtual void PostSaveAs();       // Postprocess of module...
     void Reload();
     void LoadSource();               // Load source for object
-    BOOL Compile();                  // Compile text
+    sal_Bool Compile();                  // Compile text
     void Run();                      // Run image
     void Disassemble();              // Disassemble image
     const String& GetModName() const { return pMod->GetName(); }
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index a969d227395c..9aa06ffad38e 100644
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -83,8 +83,8 @@ AppEdit::~AppEdit()
 void AppEdit::LoadIniFile()
 {
     TextView *pTextView = ((TextEdit*)pDataEdit)->aEdit.pTextView;
-    BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
-    pTextView->GetTextEngine()->SetModified( FALSE );
+    sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+    pTextView->GetTextEngine()->SetModified( sal_False );
 
     FontList aFontList( pFrame );   // Just some Window is needed
     Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
@@ -93,8 +93,8 @@ void AppEdit::LoadIniFile()
     String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
     String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
     Font aFont = aFontList.Get( aFontName, aFontStyle );
-//    ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
-    ULONG nFontSize = aFontSize.ToInt32();
+//    sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+    sal_uIntPtr nFontSize = aFontSize.ToInt32();
 //    aFont.SetSize( Size( nFontSize, nFontSize ) );
     aFont.SetHeight( nFontSize );
 
@@ -103,7 +103,7 @@ void AppEdit::LoadIniFile()
         Font aFont2( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguage(), 0, pFrame ));
     }
 #endif
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
 //    aFont.SetAlign( ALIGN_BOTTOM );
 //    aFont.SetHeight( aFont.GetHeight()+2 );
     pDataEdit->SetFont( aFont );
@@ -184,7 +184,7 @@ void AppEdit::SetScrollBarRanges()
 
 
 
-USHORT AppEdit::GetLineNr()
+sal_uInt16 AppEdit::GetLineNr()
 {
   return pDataEdit->GetLineNr();
 }
@@ -208,7 +208,7 @@ long AppEdit::InitMenu( Menu* pMenu )
         pMenu->EnableItem( RID_EDITREDO,    RedoCount > 0 );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 long AppEdit::DeInitMenu( Menu* pMenu )
@@ -218,7 +218,7 @@ long AppEdit::DeInitMenu( Menu* pMenu )
     pMenu->EnableItem( RID_EDITUNDO );
     pMenu->EnableItem( RID_EDITREDO );
 
-    return TRUE;
+    return sal_True;
 }
 
 void AppEdit::Resize()
@@ -233,7 +233,7 @@ void AppEdit::Resize()
     if ( pHScroll )
     {
         rHSize = pHScroll->GetSizePixel();
-        ULONG nHieght = rHSize.Height();
+        sal_uIntPtr nHieght = rHSize.Height();
         rNewSize.Height() -= nHieght;
         rHStart.Y() = rNewSize.Height();
     }
@@ -241,7 +241,7 @@ void AppEdit::Resize()
     if ( pVScroll )
     {
         rVSize = pVScroll->GetSizePixel();
-        ULONG nWidth = rVSize.Width();
+        sal_uIntPtr nWidth = rVSize.Width();
         rNewSize.Width() -= nWidth;
         rVStart.X() = rNewSize.Width();
     }
@@ -293,7 +293,7 @@ void AppEdit::PostSaveAs()
 {
 }
 
-void AppEdit::Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 )
+void AppEdit::Highlight( sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 )
 {
     ((TextEdit*)pDataEdit)->Highlight( nLine, nCol1, nCol2 );
     ToTop();
diff --git a/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx
index 4a003bd0482d..b2c71c09c454 100644
--- a/basic/source/app/appedit.hxx
+++ b/basic/source/app/appedit.hxx
@@ -44,7 +44,7 @@ public:
     ScrollBar *pVScroll;
     ScrollBar *pHScroll;
     void SetScrollBarRanges();
-    ULONG nCurTextWidth;
+    sal_uIntPtr nCurTextWidth;
 private:
     void InitScrollBars();
 protected:
@@ -53,7 +53,7 @@ public:
     TYPEINFO();
     AppEdit( BasicFrame* );
     ~AppEdit();
-    USHORT GetLineNr();                                 // Current line number
+    sal_uInt16 GetLineNr();                                 // Current line number
     FileType GetFileType();                             // Returns the file type
     virtual long InitMenu( Menu* );                     // Inits the menu
     virtual long DeInitMenu( Menu* );                   // Reset to enable all Shortcuts
@@ -62,8 +62,8 @@ public:
     void PostLoad();
     void PostSaveAs();
     void Mark( short, short, short );                   // Select text
-    void Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 );
-    virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); }
+    void Highlight( sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 );
+    virtual sal_Bool ReloadAllowed(){ return !StarBASIC::IsRunning(); }
     virtual void LoadIniFile();     // (re)load ini file after change
 };
 
diff --git a/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx
index 001c77a38146..03c8aebd0bbe 100644
--- a/basic/source/app/apperror.cxx
+++ b/basic/source/app/apperror.cxx
@@ -65,10 +65,10 @@ long AppError::InitMenu( Menu* pMenu )
 {
     AppWin::InitMenu (pMenu );
 
-    pMenu->EnableItem( RID_EDITUNDO,    FALSE );
-    pMenu->EnableItem( RID_EDITREDO,    FALSE );
+    pMenu->EnableItem( RID_EDITUNDO,    sal_False );
+    pMenu->EnableItem( RID_EDITREDO,    sal_False );
 
-    return TRUE;
+    return sal_True;
 }
 
 long AppError::DeInitMenu( Menu* pMenu )
@@ -78,10 +78,10 @@ long AppError::DeInitMenu( Menu* pMenu )
     pMenu->EnableItem( RID_EDITUNDO );
     pMenu->EnableItem( RID_EDITREDO );
 
-    return TRUE;
+    return sal_True;
 }
 
-USHORT AppError::GetLineNr(){ return pDataEdit->GetLineNr(); }
+sal_uInt16 AppError::GetLineNr(){ return pDataEdit->GetLineNr(); }
 
 FileType AppError::GetFileType()
 {
@@ -103,12 +103,12 @@ void AppError::LoadIniFile()
     String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
     String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
     Font aFont = aFontList.Get( aFontName, aFontStyle );
-//    ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
-    ULONG nFontSize = aFontSize.ToInt32();
+//    sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+    sal_uIntPtr nFontSize = aFontSize.ToInt32();
 //    aFont.SetSize( Size( nFontSize, nFontSize ) );
     aFont.SetHeight( nFontSize );
 
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
 //    aFont.SetAlign( ALIGN_BOTTOM );
 //    aFont.SetHeight( aFont.GetHeight()+2 );
     pDataEdit->SetFont( aFont );
diff --git a/basic/source/app/apperror.hxx b/basic/source/app/apperror.hxx
index c5be8836efd9..3a7028aeae4b 100644
--- a/basic/source/app/apperror.hxx
+++ b/basic/source/app/apperror.hxx
@@ -39,10 +39,10 @@ public:
 //  long Command( short nID );
     virtual long InitMenu( Menu* );
     virtual long DeInitMenu( Menu* );
-    USHORT GetLineNr();
+    sal_uInt16 GetLineNr();
     FileType GetFileType();
     MsgEdit* GetMsgTree()           { return ((MsgEdit*)pDataEdit); }
-    virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); }
+    virtual sal_Bool ReloadAllowed(){ return !StarBASIC::IsRunning(); }
     virtual void LoadIniFile();     // (re)load ini file after change
     DirEntry aBaseDir;
 };
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index b0a6c07ec956..4d0a5f95fca4 100644
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -52,10 +52,10 @@ TYPEINIT0(AppWin);
 AppWin::AppWin( BasicFrame* pParent )
 : DockingWindow( pParent, WB_SIZEMOVE | WB_CLOSEABLE | WB_PINABLE )
 , nSkipReload(0)
-, bHasFile( FALSE )
-, bReloadAborted( FALSE )
+, bHasFile( sal_False )
+, bReloadAborted( sal_False )
 , pFrame( pParent )
-, bFind( TRUE )
+, bFind( sal_True )
 , pDataEdit(NULL)
 {
     // Load the Untitled string if not yet loaded
@@ -64,7 +64,7 @@ AppWin::AppWin( BasicFrame* pParent )
     nCount++;
 
     // Get maximized state from current window
-    USHORT nInitialWinState;
+    sal_uInt16 nInitialWinState;
     if ( pFrame->pWork )
     {
         nInitialWinState = pFrame->pWork->GetWinState();
@@ -98,7 +98,7 @@ void AppWin::SetText( const XubString& rStr )
     pFrame->WindowRenamed( this );
 }
 
-void AppWin::TitleButtonClick( USHORT nButton )
+void AppWin::TitleButtonClick( sal_uInt16 nButton )
 {
     if ( TITLE_BUTTON_DOCKING == nButton )
         if ( TT_WIN_STATE_MAX != nWinState )
@@ -106,7 +106,7 @@ void AppWin::TitleButtonClick( USHORT nButton )
         else
             Restore();
     else // if ( TITLE_BUTTON_HIDE == nButton )
-        Minimize( TRUE );
+        Minimize( sal_True );
 }
 
 void AppWin::Maximize()
@@ -116,7 +116,7 @@ void AppWin::Maximize()
         nNormalPos = GetPosPixel();
         nNormalSize = GetSizePixel();
 
-        SetFloatingMode( FALSE );
+        SetFloatingMode( sal_False );
 
         pFrame->nMaximizedWindows++;
         nWinState = TT_WIN_STATE_MAX;
@@ -138,7 +138,7 @@ void AppWin::Maximize()
 
 void AppWin::Restore()
 {
-    SetFloatingMode( TRUE );
+    SetFloatingMode( sal_True );
     SetPosSizePixel( nNormalPos, nNormalSize );
 
     if ( TT_WIN_STATE_MAX == nWinState )
@@ -148,7 +148,7 @@ void AppWin::Restore()
     pFrame->WinMax_Restore();
 }
 
-void AppWin::Minimize( BOOL bMinimize )
+void AppWin::Minimize( sal_Bool bMinimize )
 {
     if ( bMinimize )
         nWinState |= TT_WIN_STATE_HIDE;
@@ -157,7 +157,7 @@ void AppWin::Minimize( BOOL bMinimize )
     pFrame->WinMax_Restore();
 }
 
-void AppWin::Cascade( USHORT nNr )
+void AppWin::Cascade( sal_uInt16 nNr )
 {
     Restore();
 
@@ -229,7 +229,7 @@ long AppWin::PreNotify( NotifyEvent& rNEvt )
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         if ( pFrame->pList->Last() != this )
             Activate();
-    return FALSE;       // Der event soll weiter verarbeitet werden
+    return sal_False;       // Der event soll weiter verarbeitet werden
 }
 
 void AppWin::Activate()
@@ -242,14 +242,14 @@ long AppWin::InitMenu( Menu* pMenu )
 {
 
     ::rtl::OUString aTemp;
-    BOOL bMarked;
+    sal_Bool bMarked;
     if( pDataEdit )
     {
         TextSelection r = pDataEdit->GetSelection();
         bMarked = r.HasRange();
     }
     else
-        bMarked = FALSE;
+        bMarked = sal_False;
     pMenu->EnableItem( RID_EDITREPEAT,  (aFind.Len() != 0 ) );
     pMenu->EnableItem( RID_EDITCUT,     bMarked );
     pMenu->EnableItem( RID_EDITCOPY,    bMarked );
@@ -257,20 +257,20 @@ long AppWin::InitMenu( Menu* pMenu )
     pMenu->EnableItem( RID_EDITDEL,     bMarked );
 //  pMenu->EnableItem( RID_HELPTOPIC,   bMarked );
 
-    BOOL bHasText;
+    sal_Bool bHasText;
     if( pDataEdit )
         bHasText = pDataEdit->HasText();
     else
-        bHasText = FALSE;
-    BOOL bRunning = pFrame->Basic().IsRunning();
-    BOOL bCanExecute = BOOL( (!bRunning && bHasText) || pFrame->bInBreak );
+        bHasText = sal_False;
+    sal_Bool bRunning = pFrame->Basic().IsRunning();
+    sal_Bool bCanExecute = sal_Bool( (!bRunning && bHasText) || pFrame->bInBreak );
     pMenu->EnableItem( RID_RUNSTART,    bCanExecute );
     pMenu->EnableItem( RID_RUNBREAK,    bRunning && !pFrame->bInBreak);
     pMenu->EnableItem( RID_RUNSTOP,     bRunning );
     pMenu->EnableItem( RID_RUNTOCURSOR, bCanExecute );
     pMenu->EnableItem( RID_RUNSTEPINTO, bCanExecute );
     pMenu->EnableItem( RID_RUNSTEPOVER, bCanExecute );
-    return TRUE;
+    return sal_True;
 }
 
 long AppWin::DeInitMenu( Menu* pMenu )
@@ -287,7 +287,7 @@ long AppWin::DeInitMenu( Menu* pMenu )
     pMenu->EnableItem( RID_RUNTOCURSOR );
     pMenu->EnableItem( RID_RUNSTEPINTO );
     pMenu->EnableItem( RID_RUNSTEPOVER );
-    return TRUE;
+    return sal_True;
 }
 
 // Menu Handler
@@ -295,7 +295,7 @@ long AppWin::DeInitMenu( Menu* pMenu )
 void AppWin::Command( const CommandEvent& rCEvt )
 {
     TextSelection r  = pDataEdit->GetSelection();
-    BOOL bHasMark = r.HasRange();
+    sal_Bool bHasMark = r.HasRange();
     switch( rCEvt.GetCommand() ) {
         case RID_FILESAVE:
             QuerySave( QUERY_DISK_CHANGED | SAVE_NOT_DIRTY ); break;
@@ -337,7 +337,7 @@ void AppWin::Command( const CommandEvent& rCEvt )
                 pDataEdit->BuildKontextMenu( pKontext );
                 if ( pKontext )
                 {
-                    USHORT nRes = pKontext->Execute( this, GetPointerPosPixel() );
+                    sal_uInt16 nRes = pKontext->Execute( this, GetPointerPosPixel() );
                     if ( nRes )
                         pFrame->Command( nRes );
                     delete pKontext;
@@ -348,12 +348,12 @@ void AppWin::Command( const CommandEvent& rCEvt )
 }
 
 
-BOOL AppWin::IsSkipReload()
+sal_Bool AppWin::IsSkipReload()
 {
     return nSkipReload != 0;
 }
 
-void AppWin::SkipReload( BOOL bSkip )
+void AppWin::SkipReload( sal_Bool bSkip )
 {
     DBG_ASSERT( bSkip || nSkipReload, "SkipReload aufgehoben ohne es zu aktivieren");
     if ( bSkip )
@@ -362,17 +362,17 @@ void AppWin::SkipReload( BOOL bSkip )
         nSkipReload--;
 }
 
-BOOL AppWin::DiskFileChanged( USHORT nWhat )
+sal_Bool AppWin::DiskFileChanged( sal_uInt16 nWhat )
 {
     if ( !bHasFile )
-        return FALSE;
+        return sal_False;
 
     switch ( nWhat )
     {
         case SINCE_LAST_LOAD:
             {
                 if ( bReloadAborted )
-                    return TRUE;
+                    return sal_True;
                 else
                     return DiskFileChanged( SINCE_LAST_ASK_RELOAD );
             }
@@ -393,16 +393,16 @@ BOOL AppWin::DiskFileChanged( USHORT nWhat )
         default:
             DBG_ERROR("Not Implemented in AppWin::DiskFileChanged");
     }
-    return TRUE;
+    return sal_True;
 }
 
-void AppWin::UpdateFileInfo( USHORT nWhat )
+void AppWin::UpdateFileInfo( sal_uInt16 nWhat )
 {
     switch ( nWhat )
     {
         case HAS_BEEN_LOADED:
             {
-                bReloadAborted = FALSE;
+                bReloadAborted = sal_False;
                 UpdateFileInfo( ASKED_RELOAD );
 
             }
@@ -447,7 +447,7 @@ void AppWin::CheckReload()
         }
         else
         {
-            bReloadAborted = TRUE;
+            bReloadAborted = sal_True;
         }
     }
 }
@@ -458,14 +458,14 @@ void AppWin::Reload()
     TextSelection aSelMemo = pDataEdit->GetSelection();
     Load( GetText() );
     pDataEdit->SetSelection( aSelMemo );
-    SkipReload( FALSE );
+    SkipReload( sal_False );
 }
 
 // Load file
-BOOL AppWin::Load( const String& aName )
+sal_Bool AppWin::Load( const String& aName )
 {
     SkipReload();
-    BOOL bErr;
+    sal_Bool bErr;
 
 //  if( !QuerySave() )
 //      return;
@@ -494,17 +494,17 @@ BOOL AppWin::Load( const String& aName )
         SetText( aModName );
         UpdateFileInfo( HAS_BEEN_LOADED );
         PostLoad();
-        bHasFile = TRUE;
+        bHasFile = sal_True;
     }
-    SkipReload( FALSE );
+    SkipReload( sal_False );
     return !bErr;
 }
 
 // Save file
-USHORT AppWin::ImplSave()
+sal_uInt16 AppWin::ImplSave()
 {
     SkipReload();
-    USHORT nResult = SAVE_RES_NOT_SAVED;
+    sal_uInt16 nResult = SAVE_RES_NOT_SAVED;
     String s1 = *pNoName;
     String s2 = GetText().Copy( 0, s1.Len() );
     if( s1 == s2 )
@@ -514,7 +514,7 @@ USHORT AppWin::ImplSave()
         if ( pDataEdit->Save( aName ) )
         {
             nResult = SAVE_RES_SAVED;
-            bHasFile = TRUE;
+            bHasFile = sal_True;
         }
         else
         {
@@ -523,38 +523,38 @@ USHORT AppWin::ImplSave()
         }
         UpdateFileInfo( HAS_BEEN_LOADED );
     }
-    SkipReload( FALSE );
+    SkipReload( sal_False );
     return nResult;
 }
 
 // Save to new file name
-USHORT AppWin::SaveAs()
+sal_uInt16 AppWin::SaveAs()
 {
     SkipReload();
     String s1 = *pNoName;
     String s2 = GetText().Copy( 0, s1.Len() );
     if( s1 == s2 ) s2.Erase();
     else s2 = GetText();
-    if( pFrame->QueryFileName( s2, GetFileType(), TRUE ) )
+    if( pFrame->QueryFileName( s2, GetFileType(), sal_True ) )
     {
         SetText( s2 );
         PostSaveAs();
-        SkipReload( FALSE );
+        SkipReload( sal_False );
         return ImplSave();
     }
     else
     {
-        SkipReload( FALSE );
+        SkipReload( sal_False );
         return SAVE_RES_CANCEL;
     }
 }
 
 // Should we save the file?
-USHORT AppWin::QuerySave( QueryBits nBits )
+sal_uInt16 AppWin::QuerySave( QueryBits nBits )
 {
-    BOOL bQueryDirty = ( nBits & QUERY_DIRTY ) != 0;
-    BOOL bQueryDiskChanged = ( nBits & QUERY_DISK_CHANGED ) != 0;
-    BOOL bSaveNotDirty = ( nBits & SAVE_NOT_DIRTY ) != 0;
+    sal_Bool bQueryDirty = ( nBits & QUERY_DIRTY ) != 0;
+    sal_Bool bQueryDiskChanged = ( nBits & QUERY_DISK_CHANGED ) != 0;
+    sal_Bool bSaveNotDirty = ( nBits & SAVE_NOT_DIRTY ) != 0;
 
     SkipReload();
     short nResult;
@@ -563,8 +563,8 @@ USHORT AppWin::QuerySave( QueryBits nBits )
     else
         nResult = RET_NO;
 
-    BOOL bAlwaysEnableInput = pFrame->IsAlwaysEnableInput();
-    pFrame->AlwaysEnableInput( FALSE );
+    sal_Bool bAlwaysEnableInput = pFrame->IsAlwaysEnableInput();
+    pFrame->AlwaysEnableInput( sal_False );
     if( ( ( IsModified() || bSaveNotDirty ) && bQueryDirty ) || ( DiskFileChanged( SINCE_LAST_LOAD ) && bQueryDiskChanged ) )
     {
         ToTop();
@@ -578,7 +578,7 @@ USHORT AppWin::QuerySave( QueryBits nBits )
     }
     pFrame->AlwaysEnableInput( bAlwaysEnableInput );
 
-    USHORT nReturn;
+    sal_uInt16 nReturn;
     switch( nResult )
     {
         case RET_YES:
@@ -594,11 +594,11 @@ USHORT AppWin::QuerySave( QueryBits nBits )
             DBG_ERROR("switch default where no default should be: Internal error");
             nReturn = SAVE_RES_CANCEL;
     }
-    SkipReload( FALSE );
+    SkipReload( sal_False );
     return nReturn;
 }
 
-BOOL AppWin::Close()
+sal_Bool AppWin::Close()
 {
     switch ( QuerySave( QUERY_DIRTY ) )
     {
@@ -607,21 +607,21 @@ BOOL AppWin::Close()
         {
             DockingWindow::Close();
             delete this;
-            return TRUE;
+            return sal_True;
         }
 // uncomment to avoid compiler warning
 //  break;
     case SAVE_RES_ERROR:
-        return FALSE;
+        return sal_False;
 // uncomment to avoid compiler warning
 //      break;
     case SAVE_RES_CANCEL:
-        return FALSE;
+        return sal_False;
 // uncomment to avoid compiler warning
 //      break;
     default:
         DBG_ERROR("Not Implemented in AppWin::Close");
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -631,7 +631,7 @@ void AppWin::Find()
     SttResId aResId( IDD_FIND_DIALOG );
     FindDialog aDlg( this, aResId, aFind );
     if( aDlg.Execute() ) {
-        bFind = TRUE;
+        bFind = sal_True;
         Repeat();
     }
 }
@@ -643,7 +643,7 @@ void AppWin::Replace()
     ReplaceDialog* pDlg = new ReplaceDialog
                         (this, aResId, aFind, aReplace );
     if( pDlg->Execute() ) {
-        bFind = FALSE;
+        bFind = sal_False;
         Repeat();
     }
 }
@@ -651,7 +651,7 @@ void AppWin::Replace()
 // Repeat search/replace operation
 void AppWin::Repeat()
 {
-    if( (aFind.Len() != 0 ) && ( pDataEdit->Find( aFind ) || (ErrorBox(this,SttResId(IDS_PATTERNNOTFOUND)).Execute() && FALSE) ) && !bFind )
+    if( (aFind.Len() != 0 ) && ( pDataEdit->Find( aFind ) || (ErrorBox(this,SttResId(IDS_PATTERNNOTFOUND)).Execute() && sal_False) ) && !bFind )
       pDataEdit->ReplaceSelected( aReplace );
 }
 
diff --git a/basic/source/app/appwin.hxx b/basic/source/app/appwin.hxx
index 0e864e69eef9..928380d50df8 100644
--- a/basic/source/app/appwin.hxx
+++ b/basic/source/app/appwin.hxx
@@ -35,15 +35,15 @@
 #include "app.hxx"
 #include "dataedit.hxx"
 
-typedef USHORT QueryBits;
+typedef sal_uInt16 QueryBits;
 #define QUERY_NONE              ( QueryBits ( 0x00 ) )
 #define QUERY_DIRTY             ( QueryBits ( 0x01 ) )
 #define QUERY_DISK_CHANGED      ( QueryBits ( 0x02 ) )
 #define QUERY_ALL               ( QUERY_DIRTY | QUERY_DISK_CHANGED )
 #define SAVE_NOT_DIRTY          ( QueryBits ( 0x04 ) )
 
-#define SAVE_RES_SAVED          TRUE
-#define SAVE_RES_NOT_SAVED      FALSE
+#define SAVE_RES_SAVED          sal_True
+#define SAVE_RES_NOT_SAVED      sal_False
 #define SAVE_RES_ERROR          3
 #define SAVE_RES_CANCEL         4
 
@@ -69,68 +69,68 @@ protected:
     static short nCount;            // number of edit windows
     static String *pNoName;         // "Untitled"
     FileStat aLastAccess;           // Last access time of loaded file
-    USHORT nSkipReload;             // Sometimes there must not be a reload
-    BOOL bHasFile;                  // Otherwise reload does not make sense
-    BOOL bReloadAborted;            // Is set if reload was cancelled so that we can ask again wehn closing
+    sal_uInt16 nSkipReload;             // Sometimes there must not be a reload
+    sal_Bool bHasFile;                  // Otherwise reload does not make sense
+    sal_Bool bReloadAborted;            // Is set if reload was cancelled so that we can ask again wehn closing
 
     short nId;                      // ID-Nummer( "Unnamed n" )
     BasicFrame* pFrame;             // Parent-Window
 //  Icon* pIcon;                    // Document icon
     String aFind;                   // Search string
     String aReplace;                // Replace string
-    BOOL bFind;                     // TRUE if search not replace
+    sal_Bool bFind;                     // sal_True if search not replace
     void RequestHelp( const HelpEvent& );           // Help handler
     void GetFocus();                // activate
-    virtual USHORT ImplSave();      // Save file
-    USHORT nWinState;               // Maximized, Iconized or Normal
+    virtual sal_uInt16 ImplSave();      // Save file
+    sal_uInt16 nWinState;               // Maximized, Iconized or Normal
     Point nNormalPos;               // Position if normal
     Size nNormalSize;               // Size if Normal
     virtual long    PreNotify( NotifyEvent& rNEvt );
-    USHORT nWinId;
+    sal_uInt16 nWinId;
 
 public:
     TYPEINFO();
     AppWin( BasicFrame* );
     ~AppWin();
     DataEdit* pDataEdit;                // Data area
-    virtual USHORT GetLineNr()=0;       // Current line number
+    virtual sal_uInt16 GetLineNr()=0;       // Current line number
     virtual long InitMenu( Menu* );     // Init of the menu
     virtual long DeInitMenu( Menu* );   // reset to enable all shortcuts
     virtual void Command( const CommandEvent& rCEvt );  // Command handler
     virtual void Resize();
     virtual void Help();
-    virtual BOOL Load( const String& ); // Load file
+    virtual sal_Bool Load( const String& ); // Load file
     virtual void PostLoad(){}               // Set source at module
-    virtual USHORT SaveAs();                // Save file as
+    virtual sal_uInt16 SaveAs();                // Save file as
     virtual void PostSaveAs(){}
     virtual void Find();                    // find text
     virtual void Replace();                 // replace text
     virtual void Repeat();                  // repeat find/replace
-    virtual BOOL Close();                   // close window
+    virtual sal_Bool Close();                   // close window
     virtual void Activate();                // window was activated
     virtual FileType GetFileType()=0;   // returns the filetype
-    virtual BOOL ReloadAllowed(){ return TRUE; }
+    virtual sal_Bool ReloadAllowed(){ return sal_True; }
     virtual void Reload();                  // Reload after change on disk
     virtual void LoadIniFile(){;}       // (re)load ini file after change
     void CheckReload();                     // Checks and asks if reload should performed
-    BOOL DiskFileChanged( USHORT nWhat );   // Checks file for changes
-    void UpdateFileInfo( USHORT nWhat );    // Remembers last file state
-    BOOL IsSkipReload();                    // Should we test reload?
-    void SkipReload( BOOL bSkip = TRUE );
-    USHORT GetWinState(){ return nWinState; }
+    sal_Bool DiskFileChanged( sal_uInt16 nWhat );   // Checks file for changes
+    void UpdateFileInfo( sal_uInt16 nWhat );    // Remembers last file state
+    sal_Bool IsSkipReload();                    // Should we test reload?
+    void SkipReload( sal_Bool bSkip = sal_True );
+    sal_uInt16 GetWinState(){ return nWinState; }
     void Maximize();
     void Restore();
-    void Minimize( BOOL bMinimize );
-    void Cascade( USHORT nNr );
+    void Minimize( sal_Bool bMinimize );
+    void Cascade( sal_uInt16 nNr );
 
-    USHORT QuerySave( QueryBits nBits = QUERY_ALL );
-    BOOL IsModified()               { return pDataEdit->IsModified(); }
+    sal_uInt16 QuerySave( QueryBits nBits = QUERY_ALL );
+    sal_Bool IsModified()               { return pDataEdit->IsModified(); }
     BasicFrame* GetBasicFrame() { return pFrame; }
-    virtual void    TitleButtonClick( USHORT nButton );
+    virtual void    TitleButtonClick( sal_uInt16 nButton );
     virtual void    SetText( const XubString& rStr );
 
-    USHORT GetWinId() { return nWinId; }
-    void SetWinId( USHORT nWId ) { nWinId = nWId; }
+    sal_uInt16 GetWinId() { return nWinId; }
+    void SetWinId( sal_uInt16 nWId ) { nWinId = nWId; }
 };
 
 DECLARE_LIST( EditList, AppWin* )
diff --git a/basic/source/app/basicrt.cxx b/basic/source/app/basicrt.cxx
index e6c9f550ad5b..2df8df0d53fe 100644
--- a/basic/source/app/basicrt.cxx
+++ b/basic/source/app/basicrt.cxx
@@ -63,7 +63,7 @@ xub_StrLen BasicRuntime::GetCol2()
   return pRun->nCol2;
 }
 
-BOOL BasicRuntime::IsRun()
+sal_Bool BasicRuntime::IsRun()
 {
   return pRun->IsRun();
 }
@@ -117,17 +117,17 @@ bool BasicRuntimeAccess::HasRuntime()
   return pINST && pINST->pRun != NULL;
 }
 
-USHORT BasicRuntimeAccess::GetStackEntryCount()
+sal_uInt16 BasicRuntimeAccess::GetStackEntryCount()
 {
   return GetSbData()->pErrStack->Count();
 }
 
-BasicErrorStackEntry BasicRuntimeAccess::GetStackEntry( USHORT nIndex )
+BasicErrorStackEntry BasicRuntimeAccess::GetStackEntry( sal_uInt16 nIndex )
 {
   return BasicErrorStackEntry( GetSbData()->pErrStack->GetObject( nIndex ) );
 }
 
-BOOL BasicRuntimeAccess::HasStack()
+sal_Bool BasicRuntimeAccess::HasStack()
 {
   return GetSbData()->pErrStack != NULL;
 }
@@ -138,7 +138,7 @@ void BasicRuntimeAccess::DeleteStack()
   GetSbData()->pErrStack = NULL;
 }
 
-BOOL BasicRuntimeAccess::IsRunInit()
+sal_Bool BasicRuntimeAccess::IsRunInit()
 {
   return GetSbData()->bRunInit;
 }
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index 7bafc87e548a..e7687222d5da 100644
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -48,9 +48,9 @@
 
 struct Breakpoint
 {
-    USHORT nLine;
+    sal_uInt16 nLine;
 
-    Breakpoint( USHORT nL ) { nLine = nL; }
+    Breakpoint( sal_uInt16 nL ) { nLine = nL; }
 };
 
 
@@ -62,7 +62,7 @@ BreakpointWindow::BreakpointWindow( Window *pParent )
 , nCurYOffset( 0 )
 , nMarkerPos( MARKER_NOMARKER )
 , pModule( NULL )
-, bErrorMarker( FALSE )
+, bErrorMarker( sal_False )
 {
     if ( !pImages )
         pImages = new ImageList( SttResId( RID_IMGLST_LAYOUT ) );
@@ -90,7 +90,7 @@ void BreakpointWindow::Reset()
 void BreakpointWindow::SetModule( SbModule *pMod )
 {
     pModule = pMod;
-    USHORT i;
+    sal_uInt16 i;
     for ( i=0 ; i < pModule->GetBPCount() ; i++ )
     {
         InsertBreakpoint( pModule->GetBP( i ) );
@@ -106,13 +106,13 @@ void BreakpointWindow::SetBPsInModule()
     Breakpoint* pBrk = First();
     while ( pBrk )
     {
-        pModule->SetBP( (USHORT)pBrk->nLine );
+        pModule->SetBP( (sal_uInt16)pBrk->nLine );
 #if OSL_DEBUG_LEVEL > 1
         DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (USHORT)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
 #endif
         pBrk = Next();
     }
-    for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+    for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
     {
         SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
         DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -121,7 +121,7 @@ void BreakpointWindow::SetBPsInModule()
 }
 
 
-void BreakpointWindow::InsertBreakpoint( USHORT nLine )
+void BreakpointWindow::InsertBreakpoint( sal_uInt16 nLine )
 {
     Breakpoint* pNewBrk = new Breakpoint( nLine );
     Breakpoint* pBrk = First();
@@ -152,7 +152,7 @@ void BreakpointWindow::InsertBreakpoint( USHORT nLine )
 #endif
         if ( StarBASIC::IsRunning() )
         {
-            for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+            for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
             {
                 SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
                 DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -166,7 +166,7 @@ void BreakpointWindow::InsertBreakpoint( USHORT nLine )
 }
 
 
-Breakpoint* BreakpointWindow::FindBreakpoint( ULONG nLine )
+Breakpoint* BreakpointWindow::FindBreakpoint( sal_uIntPtr nLine )
 {
     Breakpoint* pBrk = First();
     while ( pBrk )
@@ -181,20 +181,20 @@ Breakpoint* BreakpointWindow::FindBreakpoint( ULONG nLine )
 }
 
 
-void BreakpointWindow::AdjustBreakpoints( ULONG nLine, BOOL bInserted )
+void BreakpointWindow::AdjustBreakpoints( sal_uIntPtr nLine, sal_Bool bInserted )
 {
     if ( nLine == 0 ) //TODO: nLine == TEXT_PARA_ALL+1
         return;
     Breakpoint* pBrk = First();
     while ( pBrk )
     {
-        BOOL bDelBrk = FALSE;
+        sal_Bool bDelBrk = sal_False;
         if ( pBrk->nLine == nLine )
         {
             if ( bInserted )
                 pBrk->nLine++;
             else
-                bDelBrk = TRUE;
+                bDelBrk = sal_True;
         }
         else if ( pBrk->nLine > nLine )
         {
@@ -206,7 +206,7 @@ void BreakpointWindow::AdjustBreakpoints( ULONG nLine, BOOL bInserted )
 
         if ( bDelBrk )
         {
-            ULONG n = GetCurPos();
+            sal_uIntPtr n = GetCurPos();
             delete Remove( pBrk );
             pBrk = Seek( n );
         }
@@ -232,7 +232,7 @@ void BreakpointWindow::LoadBreakpoints( String aFilename )
 
     for ( i = 0 ; i < aBreakpoints.GetTokenCount( ';' ) ; i++ )
     {
-        InsertBreakpoint( (USHORT)aBreakpoints.GetToken( i, ';' ).ToInt32() );
+        InsertBreakpoint( (sal_uInt16)aBreakpoints.GetToken( i, ';' ).ToInt32() );
     }
 }
 
@@ -280,12 +280,12 @@ void BreakpointWindow::Paint( const Rectangle& )
 #if OSL_DEBUG_LEVEL > 1
         DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
 #endif
-        ULONG nLine = pBrk->nLine-1;
-        ULONG nY = nLine*nLineHeight - nCurYOffset;
+        sal_uIntPtr nLine = pBrk->nLine-1;
+        sal_uIntPtr nY = nLine*nLineHeight - nCurYOffset;
         DrawImage( Point( 0, nY ) + aBmpOff, aBrk );
         pBrk = Next();
     }
-    ShowMarker( TRUE );
+    ShowMarker( sal_True );
 }
 
 
@@ -297,7 +297,7 @@ Breakpoint* BreakpointWindow::FindBreakpoint( const Point& rMousePos )
     Breakpoint* pBrk = First();
     while ( pBrk )
     {
-        ULONG nLine = pBrk->nLine-1;
+        sal_uIntPtr nLine = pBrk->nLine-1;
         long nY = nLine*nLineHeight;
         if ( ( nYPos > nY ) && ( nYPos < ( nY + nLineHeight ) ) )
             return pBrk;
@@ -307,7 +307,7 @@ Breakpoint* BreakpointWindow::FindBreakpoint( const Point& rMousePos )
 }
 
 
-void BreakpointWindow::ToggleBreakpoint( USHORT nLine )
+void BreakpointWindow::ToggleBreakpoint( sal_uInt16 nLine )
 {
     Breakpoint* pBrk = FindBreakpoint( nLine );
     if ( pBrk ) // remove
@@ -323,7 +323,7 @@ void BreakpointWindow::ToggleBreakpoint( USHORT nLine )
     Invalidate();
 }
 
-void BreakpointWindow::ShowMarker( BOOL bShow )
+void BreakpointWindow::ShowMarker( sal_Bool bShow )
 {
     if ( nMarkerPos == MARKER_NOMARKER )
         return;
@@ -343,7 +343,7 @@ void BreakpointWindow::ShowMarker( BOOL bShow )
     aMarkerOff.X() = ( aOutSz.Width() - aMarkerSz.Width() ) / 2;
     aMarkerOff.Y() = ( nLineHeight - aMarkerSz.Height() ) / 2;
 
-    ULONG nY = nMarkerPos*nLineHeight - nCurYOffset;
+    sal_uIntPtr nY = nMarkerPos*nLineHeight - nCurYOffset;
     Point aPos( 0, nY );
     aPos += aMarkerOff;
     if ( bShow )
@@ -361,23 +361,23 @@ void BreakpointWindow::MouseButtonDown( const MouseEvent& rMEvt )
         long nLineHeight = GetTextHeight();
         long nYPos = aMousePos.Y() + nCurYOffset;
         long nLine = nYPos / nLineHeight + 1;
-        ToggleBreakpoint( sal::static_int_cast< USHORT >(nLine) );
+        ToggleBreakpoint( sal::static_int_cast< sal_uInt16 >(nLine) );
         Invalidate();
     }
 }
 
 
-void BreakpointWindow::SetMarkerPos( USHORT nLine, BOOL bError )
+void BreakpointWindow::SetMarkerPos( sal_uInt16 nLine, sal_Bool bError )
 {
-    ShowMarker( FALSE );   // Remove old one
+    ShowMarker( sal_False );   // Remove old one
     nMarkerPos = nLine;
     bErrorMarker = bError;
-    ShowMarker( TRUE );    // Draw new one
+    ShowMarker( sal_True );    // Draw new one
     Update();
 }
 
 
-void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, USHORT nFlags )
+void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
 {
     (void) nFlags; /* avoid warning about unused parameter */
     nCurYOffset -= nVertScroll;
diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx
index 05a03666a71b..64d5c0a9d0d7 100644
--- a/basic/source/app/brkpnts.hxx
+++ b/basic/source/app/brkpnts.hxx
@@ -50,27 +50,27 @@ public:
     void        SetModule( SbModule *pMod );
     void        SetBPsInModule();
 
-    void        InsertBreakpoint( USHORT nLine );
-    void        ToggleBreakpoint( USHORT nLine );
-    void        AdjustBreakpoints( ULONG nLine, BOOL bInserted );
+    void        InsertBreakpoint( sal_uInt16 nLine );
+    void        ToggleBreakpoint( sal_uInt16 nLine );
+    void        AdjustBreakpoints( sal_uIntPtr nLine, sal_Bool bInserted );
 
     void        LoadBreakpoints( String aFilename );
     void        SaveBreakpoints( String aFilename );
 
 protected:
-    Breakpoint* FindBreakpoint( ULONG nLine );
+    Breakpoint* FindBreakpoint( sal_uIntPtr nLine );
 
 private:
     long            nCurYOffset;
-    USHORT          nMarkerPos;
+    sal_uInt16          nMarkerPos;
     SbModule*       pModule;
-    BOOL            bErrorMarker;
+    sal_Bool            bErrorMarker;
     static ImageList *pImages;
 
 protected:
     virtual void    Paint( const Rectangle& );
     Breakpoint*     FindBreakpoint( const Point& rMousePos );
-    void            ShowMarker( BOOL bShow );
+    void            ShowMarker( sal_Bool bShow );
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
 
 public:
@@ -78,10 +78,10 @@ public:
 //  void            SetModulWindow( ModulWindow* pWin )
 //                      { pModulWindow = pWin; }
 
-    void            SetMarkerPos( USHORT nLine, BOOL bErrorMarker = FALSE );
+    void            SetMarkerPos( sal_uInt16 nLine, sal_Bool bErrorMarker = sal_False );
 
     virtual void        Scroll( long nHorzScroll, long nVertScroll,
-                                USHORT nFlags = 0 );
+                                sal_uInt16 nFlags = 0 );
     long&           GetCurYOffset()         { return nCurYOffset; }
 };
 
diff --git a/basic/source/app/dataedit.hxx b/basic/source/app/dataedit.hxx
index cbb114108c56..29148bc79919 100644
--- a/basic/source/app/dataedit.hxx
+++ b/basic/source/app/dataedit.hxx
@@ -41,9 +41,9 @@ class Font;
 #define DATA_FUNC_DEF( MemberName, MemberType )                                 \
 public:                                                                         \
     MemberType MemberName;                                                      \
-    BOOL Find( const String& rStr );                                            \
-    BOOL Load( const String& rStr );                                            \
-    BOOL Save( const String& rStr );                                            \
+    sal_Bool Find( const String& rStr );                                            \
+    sal_Bool Load( const String& rStr );                                            \
+    sal_Bool Save( const String& rStr );                                            \
                                                                                 \
     void GrabFocus(){ MemberName.GrabFocus(); }                                 \
     void Show(){ MemberName.Show(); }                                           \
@@ -62,13 +62,13 @@ public:
     void Redo();                                                                \
     String GetText() const;                                                     \
     void SetText( const String& rStr );                                         \
-    BOOL HasText() const;                                                       \
+    sal_Bool HasText() const;                                                       \
     String GetSelected();                                                       \
     TextSelection GetSelection() const;                                         \
     void SetSelection( const TextSelection& rSelection );                       \
-    USHORT GetLineNr() const;                                                   \
+    sal_uInt16 GetLineNr() const;                                                   \
     void ReplaceSelected( const String& rStr );                                 \
-    BOOL IsModified();                                                          \
+    sal_Bool IsModified();                                                          \
     void SetModifyHdl( Link l );
 
 
@@ -85,19 +85,19 @@ public:
     virtual void Undo()=0;
     virtual void Redo()=0;
 
-    virtual BOOL Find( const String& )=0;         // Find and select text
-    virtual BOOL Load( const String& )=0;         // Load text from file
-    virtual BOOL Save( const String& )=0;         // Save text to file
+    virtual sal_Bool Find( const String& )=0;         // Find and select text
+    virtual sal_Bool Load( const String& )=0;         // Load text from file
+    virtual sal_Bool Save( const String& )=0;         // Save text to file
     virtual String GetSelected()=0;
     virtual void GrabFocus()=0;
     virtual TextSelection GetSelection() const=0;
     virtual void SetSelection( const TextSelection& rSelection )=0;
-    virtual USHORT GetLineNr() const=0;
+    virtual sal_uInt16 GetLineNr() const=0;
     virtual String GetText() const=0;
     virtual void SetText( const String& rStr )=0;
-    virtual BOOL HasText() const=0;               // to avoid GetText.Len()
+    virtual sal_Bool HasText() const=0;               // to avoid GetText.Len()
     virtual void ReplaceSelected( const String& rStr )=0;
-    virtual BOOL IsModified()=0;
+    virtual sal_Bool IsModified()=0;
     virtual void SetModifyHdl( Link )=0;
     virtual void Show()=0;
     virtual void SetPosPixel( const Point& rNewPos )=0;
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index c5abb472a0e4..85f09b6b6cd0 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -108,9 +108,9 @@ IMPL_LINK_INLINE_START( FindDialog, ButtonClick, Button *, pB )
 {
     if( pB == &aOk ) {
         *pFind = aFind.GetText();
-        EndDialog( TRUE );
-    } else EndDialog( FALSE );
-    return TRUE;
+        EndDialog( sal_True );
+    } else EndDialog( sal_False );
+    return sal_True;
 }
 IMPL_LINK_INLINE_END( FindDialog, ButtonClick, Button *, pB )
 
@@ -138,9 +138,9 @@ IMPL_LINK( ReplaceDialog, ButtonClick, Button *, pB )
     if( pB == &aOk ) {
         *pFind = aFind.GetText();
         *pReplace = aReplace.GetText();
-        EndDialog( TRUE );
-    } else EndDialog( FALSE );
-    return TRUE;
+        EndDialog( sal_True );
+    } else EndDialog( sal_False );
+    return sal_True;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -163,7 +163,7 @@ void ConfEdit::Init( Config &aConf )
     aEdit.SetText( aTemp );
 }
 
-ConfEdit::ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf )
+ConfEdit::ConfEdit( Window* pParent, sal_uInt16 nResText, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf )
 : PushButton( pParent, SttResId(nResButton) )
 , aText( pParent, SttResId(nResText) )
 , aEdit( pParent, SttResId(nResEdit) )
@@ -172,7 +172,7 @@ ConfEdit::ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nR
     Init( aConf );
 }
 
-ConfEdit::ConfEdit( Window* pParent, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf )
+ConfEdit::ConfEdit( Window* pParent, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf )
 : PushButton( pParent, SttResId(nResButton) )
 , aText( pParent )
 , aEdit( pParent, SttResId(nResEdit) )
@@ -210,7 +210,7 @@ void ConfEdit::Click()
     }
 }
 
-OptConfEdit::OptConfEdit( Window* pParent, USHORT nResCheck, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf )
+OptConfEdit::OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf )
 : ConfEdit( pParent, nResEdit, nResButton, aKN, aConf )
 , aCheck( pParent, SttResId( nResCheck ) )
 , rBase( rBaseEdit )
@@ -260,7 +260,7 @@ OptionsDialog::OptionsDialog( Window* pParent, const ResId& aResId )
 , aCancel( this )
 , aConfig( Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ) )
 {
-    aConfig.EnablePersistence( FALSE );
+    aConfig.EnablePersistence( sal_False );
     FreeResource();
     aTabCtrl.SetActivatePageHdl( LINK( this, OptionsDialog, ActivatePageHdl ) );
     aTabCtrl.SetCurPageId( RID_TP_PRO );
@@ -274,25 +274,25 @@ OptionsDialog::OptionsDialog( Window* pParent, const ResId& aResId )
 
 OptionsDialog::~OptionsDialog()
 {
-    for ( USHORT i = 0; i < aTabCtrl.GetPageCount(); i++ )
+    for ( sal_uInt16 i = 0; i < aTabCtrl.GetPageCount(); i++ )
         delete aTabCtrl.GetTabPage( aTabCtrl.GetPageId( i ) );
 };
 
-BOOL OptionsDialog::Close()
+sal_Bool OptionsDialog::Close()
 {
   if ( TabDialog::Close() )
   {
     delete this;
-    return TRUE;
+    return sal_True;
   }
   else
-    return FALSE;
+    return sal_False;
 }
 
 
 IMPL_LINK( OptionsDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 {
-    USHORT nId = pTabCtrl->GetCurPageId();
+    sal_uInt16 nId = pTabCtrl->GetCurPageId();
     // If TabPage was not yet created, do it
     if ( !pTabCtrl->GetTabPage( nId ) )
     {
@@ -362,7 +362,7 @@ IMPL_LINK( OptionsDialog, OKClick, Button *, pButton )
 }
 
 const ByteString ProfilePrefix("_profile_");
-const USHORT ProfilePrefixLen = ProfilePrefix.Len();
+const sal_uInt16 ProfilePrefixLen = ProfilePrefix.Len();
 
 ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
 : TabPage( pParent, SttResId( RID_TP_PROFILE ) )
@@ -384,7 +384,7 @@ ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
 {
     FreeResource();
 
-    aCbProfile.EnableAutocomplete( TRUE );
+    aCbProfile.EnableAutocomplete( sal_True );
 
     aCbProfile.SetSelectHdl( LINK( this, ProfileOptions, Select ) );
 
@@ -399,7 +399,7 @@ ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
 void ProfileOptions::LoadData()
 {
     // collect all profiles (all groups starting with the ProfilePrefix)
-    for ( USHORT i = 0 ; i < rConf.GetGroupCount() ; i++ )
+    for ( sal_uInt16 i = 0 ; i < rConf.GetGroupCount() ; i++ )
     {
         ByteString aProfile = rConf.GetGroupName( i );
         if ( aProfile.Match( ProfilePrefix ) )
@@ -520,7 +520,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
 {
     FreeResource();
 
-    aNFCRPort.SetUseThousandSep( FALSE );
+    aNFCRPort.SetUseThousandSep( sal_False );
 
     ByteString aTemp;
 
@@ -530,7 +530,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
     if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
         aCBUseProxy.Check();
     else
-        aCBUseProxy.Check( FALSE );
+        aCBUseProxy.Check( sal_False );
 
     aCBUseProxy.SetToggleHdl( LINK( this, CrashreportOptions, CheckProxy ) );
     LINK( this, CrashreportOptions, CheckProxy ).Call( NULL );  // call once to initialize
@@ -545,7 +545,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
     if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
         aCBAllowContact.Check();
     else
-        aCBAllowContact.Check( FALSE );
+        aCBAllowContact.Check( sal_False );
 
     aCBAllowContact.SetToggleHdl( LINK( this, CrashreportOptions, CheckResponse ) );
     LINK( this, CrashreportOptions, CheckResponse ).Call( NULL );  // call once to initialize
@@ -611,9 +611,9 @@ MiscOptions::MiscOptions( Window* pParent, Config &aConfig )
 {
     FreeResource();
 
-    aNFTTPort.SetUseThousandSep( FALSE );
-    aNFUNOPort.SetUseThousandSep( FALSE );
-    aTFMaxLRU.SetUseThousandSep( FALSE );
+    aNFTTPort.SetUseThousandSep( sal_False );
+    aNFUNOPort.SetUseThousandSep( sal_False );
+    aTFMaxLRU.SetUseThousandSep( sal_False );
 
     ByteString aTemp;
 
@@ -661,8 +661,8 @@ void MiscOptions::Save( Config &aConfig )
 
     aConfig.SetGroup("LRU");
     ByteString aTemp = aConfig.ReadKey( "MaxLRU", "4" );
-    USHORT nOldMaxLRU = (USHORT)aTemp.ToInt32();
-    USHORT n;
+    sal_uInt16 nOldMaxLRU = (sal_uInt16)aTemp.ToInt32();
+    sal_uInt16 n;
     for ( n = nOldMaxLRU ; n > aTFMaxLRU.GetValue() ; n-- )
         aConfig.DeleteKey( ByteString("LRU").Append( ByteString::CreateFromInt32( n ) ) );
     aConfig.WriteKey( "MaxLRU", ByteString::CreateFromInt64( aTFMaxLRU.GetValue() ) );
@@ -735,8 +735,8 @@ IMPL_LINK( FontOptions, FontSizeChanged, void*, EMPTYARG )
 void FontOptions::UpdatePreview()
 {
     Font aFont = aFontList.Get( aFontName.GetText(), aFontStyle.GetText() );
-//    ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
-    ULONG nFontSize = static_cast<ULONG>((aFontSize.GetValue() + 5) / 10);
+//    sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+    sal_uIntPtr nFontSize = static_cast<sal_uIntPtr>((aFontSize.GetValue() + 5) / 10);
     aFont.SetHeight( nFontSize );
     aFTPreview.SetFont( aFont );
     aFTPreview.SetText( aFontName.GetText() );
@@ -770,13 +770,13 @@ GenericOptions::GenericOptions( Window* pParent, Config &aConfig )
 , aPbDelValue( this, SttResId( RID_PB_DEL_VALUE ) )
 
 , nMoveButtons( 0 )
-, bShowSelectPath( FALSE )
+, bShowSelectPath( sal_False )
 {
     FreeResource();
     LoadData();
 
-    aCbArea.EnableAutocomplete( TRUE );
-    aCbValue.EnableAutocomplete( TRUE );
+    aCbArea.EnableAutocomplete( sal_True );
+    aCbValue.EnableAutocomplete( sal_True );
 
     aCbArea.SetSelectHdl( LINK( this, GenericOptions, LoadGroup ) );
 
@@ -802,7 +802,7 @@ GenericOptions::~GenericOptions()
 StringList* GenericOptions::GetAllGroups()
 {
     StringList* pGroups = new StringList();
-    for ( USHORT i = 0 ; i < aConf.GetGroupCount() ; i++ )
+    for ( sal_uInt16 i = 0 ; i < aConf.GetGroupCount() ; i++ )
     {
         String *pGroup = new String( aConf.GetGroupName( i ), RTL_TEXTENCODING_UTF8 );
         pGroups->Insert( pGroup );
@@ -841,16 +841,16 @@ void GenericOptions::ShowSelectPath( const String aType )
     {   // Show Path button
         nMoveButtons += nDelta;
         aMoveTimer.Start();
-        bShowSelectPath = TRUE;
-        aPbSelectPath.Show( TRUE );
-        aPbSelectPath.Enable( TRUE );
+        bShowSelectPath = sal_True;
+        aPbSelectPath.Show( sal_True );
+        aPbSelectPath.Enable( sal_True );
     }
     else if ( !aType.EqualsIgnoreCaseAscii( "PATH" ) && bShowSelectPath )
     {   // Hide Path button
         nMoveButtons -= nDelta;
         aMoveTimer.Start();
-        bShowSelectPath = FALSE;
-        aPbSelectPath.Enable( FALSE );
+        bShowSelectPath = sal_False;
+        aPbSelectPath.Enable( sal_False );
     }
 }
 
@@ -903,7 +903,7 @@ IMPL_LINK( GenericOptions, LoadGroup, ComboBox*, EMPTYARG )
 
         aConf.SetGroup( aLastGroupName );
         aConf.WriteKey( C_KEY_AKTUELL, ByteString( aCurrentValue, RTL_TEXTENCODING_UTF8 ) );
-        USHORT i;
+        sal_uInt16 i;
         for ( i=0 ; i < aCbValue.GetEntryCount() ; i++ )
         {
             if ( i > 0 )
@@ -1021,16 +1021,16 @@ class TextAndWin : public DockingWindow
     Window* pFtOriginalParent;
     Window* pWinOriginalParent;
     long nSpace;    // default space
-    BOOL bAlignTop;
+    sal_Bool bAlignTop;
 
 public:
-    TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, BOOL bAlignTopP );
+    TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, sal_Bool bAlignTopP );
     ~TextAndWin();
 
     virtual void Resize();
 };
 
-TextAndWin::TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, BOOL bAlignTopP )
+TextAndWin::TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, sal_Bool bAlignTopP )
 : DockingWindow( pParent )
 , pFt( pFtP )
 , pWin( pWinP )
@@ -1112,8 +1112,8 @@ DisplayHidDlg::DisplayHidDlg( Window * pParent )
 #endif
 
     pSplit = new SplitWindow( this );
-    pControls = new TextAndWin( pSplit, &aFtControls, &aMlbControls, aMlbControls.GetPosPixel().X(), TRUE );
-    pSlots = new TextAndWin( pSplit, &aFtSlots, &aMlbSlots, aMlbControls.GetPosPixel().X(), FALSE );
+    pControls = new TextAndWin( pSplit, &aFtControls, &aMlbControls, aMlbControls.GetPosPixel().X(), sal_True );
+    pSlots = new TextAndWin( pSplit, &aFtSlots, &aMlbSlots, aMlbControls.GetPosPixel().X(), sal_False );
 
     pSplit->SetPosPixel( aFtControls.GetPosPixel() );
     pSplit->InsertItem( 1, pControls, 70, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE );
@@ -1139,7 +1139,7 @@ DisplayHidDlg::~DisplayHidDlg()
 IMPL_LINK( DisplayHidDlg, CopyToClipboard, void*, EMPTYARG )
 {
     String aSammel;
-    USHORT i;
+    sal_uInt16 i;
 
     for ( i=0 ; i < aMlbControls.GetSelectEntryCount() ; i++ )
     {
@@ -1161,7 +1161,7 @@ IMPL_LINK( DisplayHidDlg, SelectAll, PushButton*, pButton )
 {
     if ( pButton->GetState() != STATE_CHECK )
     {
-        USHORT i;
+        sal_uInt16 i;
         for ( i=0 ; i < aMlbControls.GetEntryCount() ; i++ )
             aMlbControls.SelectEntryPos( i );
         for ( i=0 ; i < aMlbSlots.GetEntryCount() ; i++ )
@@ -1266,7 +1266,7 @@ void DisplayHidDlg::Resize()
     }
     else
     {
-//      SetUpdateMode( FALSE );
+//      SetUpdateMode( sal_False );
 
         // Minimum size
         Size aSize( GetOutputSizePixel() );
@@ -1322,7 +1322,7 @@ void DisplayHidDlg::Resize()
         aPos.Move( pSplit->GetSizePixel().Width(), pSplit->GetSizePixel().Height() );
         aOKClose.SetPosPixel( aPos );
 
-//      SetUpdateMode( TRUE );
+//      SetUpdateMode( sal_True );
 //      Invalidate();
     }
     FloatingWindow::Resize();
@@ -1402,7 +1402,7 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar )
 IMPL_LINK( VarEditDialog, OKClick, Button *, pButton )
 {
     (void) pButton; /* avoid warning about unused parameter */
-    BOOL bWasError = SbxBase::IsError();    // Probably an error is thrown
+    sal_Bool bWasError = SbxBase::IsError();    // Probably an error is thrown
 
 
     SbxDataType eType = pVar->GetType();
@@ -1445,7 +1445,7 @@ SvNumberformat::
 
 
     String aContent( aEditRID_ED_NEW_STRING.GetText() );
-    BOOL bError = FALSE;
+    sal_Bool bError = sal_False;
     switch ( eType )
     {
         case SbxBOOL:
@@ -1458,10 +1458,10 @@ SvNumberformat::
 //          pVar->PutDate( aContent );
 //          break;
         case SbxINTEGER:
-            pVar->PutInteger( (INT16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
+            pVar->PutInteger( (sal_Int16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
             break;
         case SbxLONG:
-            pVar->PutLong( static_cast<INT32>(aNumericFieldRID_NF_NEW_LONG.GetValue()) );
+            pVar->PutLong( static_cast<sal_Int32>(aNumericFieldRID_NF_NEW_LONG.GetValue()) );
             break;
         case SbxDOUBLE:
         case SbxSINGLE:
@@ -1482,7 +1482,7 @@ SvNumberformat::
 //  pVar->PutStringExt( aEditRID_ED_NEW_STRING.GetText() );
     if ( !bWasError && SbxBase::IsError() )
     {
-        bError = TRUE;
+        bError = sal_True;
         SbxBase::ResetError();
     }
 
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index fbd67aa85f1b..e0a2409ad937 100644
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -104,8 +104,8 @@ protected:
     void Init( Config &aConf );
 
 public:
-    ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf );
-    ConfEdit( Window* pParent, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf );
+    ConfEdit( Window* pParent, sal_uInt16 nResText, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf );
+    ConfEdit( Window* pParent, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf );
     void Save( Config &aConf );
     void Reload( Config &aConf );
     void Click();
@@ -121,7 +121,7 @@ protected:
     ConfEdit& rBase;
     DECL_LINK( ToggleHdl, CheckBox* );
 public:
-    OptConfEdit( Window* pParent, USHORT nResCheck, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf );
+    OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf );
     void Reload( Config &aConf );
     DECL_LINK( BaseModifyHdl, Edit* );
 };
@@ -141,7 +141,7 @@ private:
 public:
     OptionsDialog( Window* pParent, const ResId& );
     ~OptionsDialog();
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 
 
     DECL_LINK( ActivatePageHdl, TabControl * );
@@ -273,7 +273,7 @@ class GenericOptions : public TabPage
     PushButton aPbDelValue;
 
     int nMoveButtons;
-    BOOL bShowSelectPath;
+    sal_Bool bShowSelectPath;
     AutoTimer aMoveTimer;
     DECL_LINK( MoveButtons, AutoTimer* );
 
@@ -321,7 +321,7 @@ protected:
     DockingWindow* pSlots;
     SplitWindow *pSplit;
 
-    ULONG nDisplayMode;
+    sal_uIntPtr nDisplayMode;
 
     DECL_LINK( Select, void* );
     DECL_LINK( SelectAll, PushButton* );
@@ -360,7 +360,7 @@ protected:
 
     DECL_LINK( OKClick, Button * );
 
-//  BOOL bCompare = FALSE;
+//  sal_Bool bCompare = sal_False;
 //  String aCompareString;
 
 public:
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 51864a397435..21febe8b3393 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -57,10 +57,10 @@ Version 3           Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
 #include "basmsg.hrc"
 #include "basrid.hxx"
 
-USHORT MsgEdit::nMaxLogLen = 0;
-BOOL MsgEdit::bLimitLogLen = FALSE;
-BOOL MsgEdit::bPrintLogToStdout = FALSE;
-BOOL MsgEdit::bPrintLogToStdoutSet = FALSE;
+sal_uInt16 MsgEdit::nMaxLogLen = 0;
+sal_Bool MsgEdit::bLimitLogLen = sal_False;
+sal_Bool MsgEdit::bPrintLogToStdout = sal_False;
+sal_Bool MsgEdit::bPrintLogToStdoutSet = sal_False;
 
 #define WARNING_PREFIX String( SttResId( S_WARNING_PREFIX ) )
 #define VERSION_STRING CUniString("File Format Version: ")
@@ -74,8 +74,8 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
 , pCurrentTestCase(NULL)
 , pCurrentAssertion( NULL )
 , pCurrentError(NULL)
-, bModified(FALSE)
-, bFileLoading(FALSE)
+, bModified(sal_False)
+, bFileLoading(sal_False)
 , nVersion(0)
 , pAppError( pParent )
 , aEditTree( pParent, pBF, aBits | WB_HASBUTTONS | WB_HASLINES | WB_HASBUTTONSATROOT )
@@ -88,15 +88,15 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
 
     if ( !bPrintLogToStdoutSet )
     {
-        bPrintLogToStdoutSet = TRUE;
-        for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+        bPrintLogToStdoutSet = sal_True;
+        for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
         {
             if ( Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("-printlog") == COMPARE_EQUAL
     #ifndef UNX
               || Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("/printlog") == COMPARE_EQUAL
     #endif
               )
-                bPrintLogToStdout = TRUE;
+                bPrintLogToStdout = sal_True;
         }
     }
 }
@@ -177,11 +177,11 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
 
         if ( !bFileLoading )
         {   // Comes from Testtool and must be written immediately
-            BOOL bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
+            sal_Bool bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
 
             DBG_ASSERT( aLogFileName == LogMsg->aLogFileName, "Logging to different logfile as before" );
             DirEntry aEntry( LogMsg->aLogFileName );
-            BOOL bNewFile = !aEntry.Exists();
+            sal_Bool bNewFile = !aEntry.Exists();
             SvFileStream aStrm( LogMsg->aLogFileName, STREAM_STD_WRITE );
             if ( bNewFile )
             {
@@ -229,7 +229,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
 {
     if ( !bFileLoading && bLimitLogLen )
     {
-        USHORT nSkip = nMaxLogLen;
+        sal_uInt16 nSkip = nMaxLogLen;
         SvLBoxEntry *pRun = aEditTree.First();
         while ( nSkip-- && pRun )
             pRun = aEditTree.NextSibling( pRun );
@@ -240,7 +240,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
                 aEditTree.GetModel()->Remove( aEditTree.NextSibling( pRun ) );
 
             aEditTree.GetModel()->Remove( pRun );
-            bModified = TRUE;
+            bModified = sal_True;
             lModify.Call( NULL );
             Save( aLogFileName );
             pAppError->UpdateFileInfo( HAS_BEEN_LOADED );
@@ -249,9 +249,9 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
 
     COPY_TTDEBUGDATA( LOG_RUN );
     if ( !bFileLoading || ( bFileLoading && nVersion >= 2 ) )
-        pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, 0, pTTDebugData );
+        pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, 0, pTTDebugData );
     else        // First file format
-        pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, LIST_APPEND, pTTDebugData );    // and therefor at the end
+        pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, LIST_APPEND, pTTDebugData );    // and therefor at the end
 
     aEditTree.ShowEntry( pCurrentRun );
     pCurrentTestCase = NULL;
@@ -270,7 +270,7 @@ void MsgEdit::AddTestCase( String aMsg, TTDebugData aDebugData )
         else
         {
             COPY_TTDEBUGDATA( LOG_TEST_CASE );
-            pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+            pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
             aEditTree.ShowEntry( pCurrentTestCase );
         }
     }
@@ -292,7 +292,7 @@ void MsgEdit::AddError( String aMsg, TTDebugData aDebugData )
     if ( pCurrentTestCase )
     {
         COPY_TTDEBUGDATA( LOG_ERROR );
-        pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pCurrentError );
     }
 }
@@ -303,7 +303,7 @@ void MsgEdit::AddCallStack( String aMsg, TTDebugData aDebugData )
     if ( pCurrentError )
     {
         COPY_TTDEBUGDATA( LOG_CALL_STACK );
-        aEditTree.InsertEntry( aMsg, pCurrentError, FALSE, LIST_APPEND, pTTDebugData );
+        aEditTree.InsertEntry( aMsg, pCurrentError, sal_False, LIST_APPEND, pTTDebugData );
     }
 }
 
@@ -312,16 +312,16 @@ void MsgEdit::AddMessage( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry *pThisEntry = NULL;
     COPY_TTDEBUGDATA( LOG_MESSAGE );
     if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 }
@@ -334,16 +334,16 @@ void MsgEdit::AddWarning( String aMsg, TTDebugData aDebugData )
     COPY_TTDEBUGDATA( LOG_WARNING );
 
     if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 
@@ -362,16 +362,16 @@ void MsgEdit::AddAssertion( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry *pThisEntry = NULL;
     COPY_TTDEBUGDATA( LOG_ASSERTION );
     if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 
@@ -386,18 +386,18 @@ void MsgEdit::AddAssertionStack( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry *pThisEntry = NULL;
     COPY_TTDEBUGDATA( LOG_ASSERTION_STACK );
     if ( pCurrentAssertion )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 
@@ -410,16 +410,16 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry *pThisEntry = NULL;
     COPY_TTDEBUGDATA( LOG_QA_ERROR );
     if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 
@@ -428,8 +428,8 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
 }
 
 /*
-    SvLBoxEntry*    GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
-    SvLBoxEntry*    GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
+    SvLBoxEntry*    GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
+    SvLBoxEntry*    GetEntry( sal_uIntPtr nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
 
 
 
@@ -442,16 +442,16 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry*    PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
     SvLBoxEntry*    LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
 
-    SvLBoxEntry*    GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
-    SvLBoxEntry*    GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
+    SvLBoxEntry*    GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
+    SvLBoxEntry*    GetEntry( sal_uIntPtr nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
 
     SvLBoxEntry*    GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
     SvLBoxEntry*    GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
 
-    BOOL            IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
-    SvListEntry*    GetEntry( SvListEntry* pParent, ULONG nPos ) const;
-    SvListEntry*    GetEntry( ULONG nRootPos ) const;
-    SvListEntry*    GetEntryAtAbsPos( ULONG nAbsPos ) const;
+    sal_Bool            IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
+    SvListEntry*    GetEntry( SvListEntry* pParent, sal_uIntPtr nPos ) const;
+    SvListEntry*    GetEntry( sal_uIntPtr nRootPos ) const;
+    SvListEntry*    GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const;
     SvListEntry*    GetParent( SvListEntry* pEntry ) const;
     SvListEntry*    GetRootLevelParent( SvListEntry* pEntry ) const;
 */
@@ -465,11 +465,11 @@ void MsgEdit::Delete()
     CHECK( pCurrentTestCase );
     CHECK( pCurrentAssertion );
     CHECK( pCurrentError );
-    bModified = TRUE;
+    bModified = sal_True;
     lModify.Call( NULL );
 }
 
-void MsgEdit::Cut(){ Copy(); Delete(); bModified = TRUE; lModify.Call( NULL ); }
+void MsgEdit::Cut(){ Copy(); Delete(); bModified = sal_True; lModify.Call( NULL ); }
 void MsgEdit::Copy(){ ::svt::OStringTransfer::CopyString( GetSelected(), &aEditTree ); }
 /**/void MsgEdit::Paste(){ Sound::Beep(); }
 void MsgEdit::Undo(){ Sound::Beep(); }
@@ -548,7 +548,7 @@ String MsgEdit::GetSelected()
 
 TextSelection MsgEdit::GetSelection() const
 {
-    ULONG nStart=0,nEnd=0;
+    sal_uIntPtr nStart=0,nEnd=0;
 
     if ( aEditTree.FirstSelected() )
     {
@@ -563,25 +563,25 @@ TextSelection MsgEdit::GetSelection() const
 
 void MsgEdit::SetSelection( const TextSelection& rSelection )
 {
-    ULONG nStart,nEnd;
+    sal_uIntPtr nStart,nEnd;
 
     while ( aEditTree.GetSelectionCount() )
-        aEditTree.Select( aEditTree.FirstSelected(), FALSE );
+        aEditTree.Select( aEditTree.FirstSelected(), sal_False );
 
     if ( rSelection.HasRange() )
     {
         nStart = rSelection.GetStart().GetPara();
         nEnd = rSelection.GetEnd().GetPara();
 
-        for ( ULONG i = nStart ; i <= nEnd ; i++ )
-            aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), TRUE );
+        for ( sal_uIntPtr i = nStart ; i <= nEnd ; i++ )
+            aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), sal_True );
     }
 }
 
-USHORT MsgEdit::GetLineNr() const
+sal_uInt16 MsgEdit::GetLineNr() const
 {
     if ( aEditTree.GetCurEntry() )
-        return (USHORT)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
+        return (sal_uInt16)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
     else
         return 0;
 }
@@ -593,7 +593,7 @@ void MsgEdit::ReplaceSelected( const String& rStr )
     DBG_ERROR("Not Implemented");
 }
 
-BOOL MsgEdit::IsModified(){ return bModified; }
+sal_Bool MsgEdit::IsModified(){ return bModified; }
 void MsgEdit::SetModifyHdl( Link l ){ lModify = l; }
 
 String MsgEdit::GetText() const
@@ -617,16 +617,16 @@ void MsgEdit::SetText( const String& rStr )
     DBG_ERROR("Not Implemented");
 }
 
-BOOL MsgEdit::HasText() const
+sal_Bool MsgEdit::HasText() const
 {
   return aEditTree.First() != NULL;
 }
 
 // Search from the beginning or mark start + 1
-BOOL MsgEdit::Find( const String& s )
+sal_Bool MsgEdit::Find( const String& s )
 {
     TextSelection r  = GetSelection();
-    USHORT bgn   = (USHORT) r.GetStart().GetPara() + 1;
+    sal_uInt16 bgn   = (sal_uInt16) r.GetStart().GetPara() + 1;
     if ( r.GetStart().GetPara() == 0 )
         bgn = 0;    // Search from the beginning
 
@@ -636,11 +636,11 @@ BOOL MsgEdit::Find( const String& s )
         if( aEditTree.GetEntryText( pEntry ).Search( s, 0 ) != STRING_NOTFOUND )
         {
             aEditTree.SetCurEntry( pEntry );
-            return TRUE;
+            return sal_True;
         }
         pEntry = aEditTree.Next( pEntry );
     }
-    return FALSE;
+    return sal_False;
 }
 
 /******************************************************************
@@ -653,17 +653,17 @@ BOOL MsgEdit::Find( const String& s )
 
 ******************************************************************/
 
-BOOL MsgEdit::Load( const String& aName )
+sal_Bool MsgEdit::Load( const String& aName )
 {
     aLogFileName = aName;
-    BOOL bOk = TRUE, bFirstLine = TRUE;
-    BOOL bLoadError = FALSE;
+    sal_Bool bOk = sal_True, bFirstLine = sal_True;
+    sal_Bool bLoadError = sal_False;
     SvFileStream aStrm( aName, STREAM_STD_READ );
     if( aStrm.IsOpen() )
     {
         aEditTree.Clear();
         String aLine;
-        bFileLoading = TRUE;  // To avoid logging to disk
+        bFileLoading = sal_True;  // To avoid logging to disk
         TTLogMsg *pLogMsg = new TTLogMsg;
         while( !aStrm.IsEof() && bOk )
         {
@@ -673,7 +673,7 @@ BOOL MsgEdit::Load( const String& aName )
                 aStrm.ReadByteStringLine( aLine, RTL_TEXTENCODING_IBM_850 );
 
             if( aStrm.GetError() != SVSTREAM_OK )
-                bOk = FALSE;
+                bOk = sal_False;
 
 #define TOKEN( n ) aLine.GetToken( n )
 
@@ -683,9 +683,9 @@ BOOL MsgEdit::Load( const String& aName )
                 TTDebugData aDebugData;
                 aDebugData.aLogType = TTLogType( TOKEN(0).ToInt32() );
                 aDebugData.aFilename = TOKEN(1);
-                aDebugData.nLine = USHORT( TOKEN(2).ToInt32() );
-                aDebugData.nCol1 = USHORT( TOKEN(3).ToInt32() );
-                aDebugData.nCol2 = USHORT( TOKEN(4).ToInt32() );
+                aDebugData.nLine = sal_uInt16( TOKEN(2).ToInt32() );
+                aDebugData.nCol1 = sal_uInt16( TOKEN(3).ToInt32() );
+                aDebugData.nCol2 = sal_uInt16( TOKEN(4).ToInt32() );
                 aDebugData.aMsg = aLine.GetQuotedToken( 5, CUniString("\"\"") );
 
                 // Remove leading and trailing quotes
@@ -698,13 +698,13 @@ BOOL MsgEdit::Load( const String& aName )
                 AddAnyMsg( pLogMsg );
             }
             else if ( bFirstLine && (aLine.Search( VERSION_STRING ) == 0) )
-                nVersion = USHORT( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
+                nVersion = sal_uInt16( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
             else if ( aLine.Len() )
-                bLoadError = TRUE;
+                bLoadError = sal_True;
 
-            bFirstLine = FALSE;
+            bFirstLine = sal_False;
         }
-        bFileLoading = FALSE;
+        bFileLoading = sal_False;
         delete pLogMsg;
         aStrm.Close();
         if ( nVersion < 2 && !bLoadError )
@@ -712,16 +712,16 @@ BOOL MsgEdit::Load( const String& aName )
 
     }
     else
-        bOk = FALSE;
+        bOk = sal_False;
     return bOk;
 }
 
-BOOL MsgEdit::Save( const String& aName )
+sal_Bool MsgEdit::Save( const String& aName )
 {
-    BOOL bOk = TRUE;
-    BOOL bIsText = DirEntry( aName ).GetExtension().CompareIgnoreCaseToAscii("TXT") == COMPARE_EQUAL;
+    sal_Bool bOk = sal_True;
+    sal_Bool bIsText = DirEntry( aName ).GetExtension().CompareIgnoreCaseToAscii("TXT") == COMPARE_EQUAL;
     if ( bIsText && !QueryBox( NULL, SttResId( IDS_LOSS_OF_INFORMATION ) ).Execute() )
-        return FALSE;
+        return sal_False;
     SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
     if( aStrm.IsOpen() )
     {
@@ -759,16 +759,16 @@ BOOL MsgEdit::Save( const String& aName )
             }
         }
         if( aStrm.GetError() != SVSTREAM_OK )
-            bOk = FALSE;
+            bOk = sal_False;
         else
         {
-            bModified = FALSE;
+            bModified = sal_False;
             lModify.Call( NULL );
         }
 
     }
     else
-        bOk = FALSE;
+        bOk = sal_False;
     return bOk;
 }
 
@@ -780,7 +780,7 @@ TTTreeListBox::TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinSt
 //, nDeselectParent(0)
 {}
 
-BOOL TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
+sal_Bool TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
 {
     if ( pThisEntry && pThisEntry->GetUserData() && ((TTDebugData*)pThisEntry->GetUserData())->aFilename.Len() > 0 )
     {
@@ -816,20 +816,20 @@ BOOL TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
 
         if ( pBasicFrame->pWork && pBasicFrame->pWork->ISA(AppEdit) )
             ((AppEdit*)pBasicFrame->pWork)->Highlight( aData->nLine, aData->nCol1, aData->nCol2 );
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL TTTreeListBox::DoubleClickHdl()
+sal_Bool TTTreeListBox::DoubleClickHdl()
 {
     return JumpToSourcecode( GetHdlEntry() );
 }
 
-/*ULONG TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, BOOL bSelect )
+/*sal_uIntPtr TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect )
 {
     SvLBoxEntry *pEntry = FirstChild( pParent );
-    ULONG nRet = 0;
+    sal_uIntPtr nRet = 0;
     while ( pEntry )
     {
         nRet++;
@@ -844,8 +844,8 @@ void TTTreeListBox::SelectHdl()
 {
     SvLBoxEntry* pHdlEntry = GetHdlEntry();
 
-    SelectChildren( pHdlEntry, TRUE );
-    Select( pHdlEntry, TRUE );
+    SelectChildren( pHdlEntry, sal_True );
+    Select( pHdlEntry, sal_True );
 //  InitMenu(pApp->GetAppMenu()->GetPopupMenu( RID_APPEDIT ));  // So daß Delete richtig ist
 }
 
@@ -855,13 +855,13 @@ void TTTreeListBox::DeselectHdl()
     if ( GetParent( pHdlEntry ) )
     {
         nDeselectParent++;
-        Select( GetParent( pHdlEntry ), FALSE );
+        Select( GetParent( pHdlEntry ), sal_False );
         nDeselectParent--;
     }
     if ( !nDeselectParent )
     {
-        SelectChildren( pHdlEntry, FALSE );
-        Select( pHdlEntry, FALSE );
+        SelectChildren( pHdlEntry, sal_False );
+        Select( pHdlEntry, sal_False );
     }
     Invalidate();
 } */
@@ -932,15 +932,15 @@ class TTLBoxString : public SvLBoxString
 {
 public:
 
-    TTLBoxString( SvLBoxEntry* pEntry, USHORT nFlags,
+    TTLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
         const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {}
 
-    virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
+    virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
         SvLBoxEntry* pEntry);
 };
 
 
-void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
+void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
     SvLBoxEntry* pEntry )
 {
     TTFeatures aFeatures = ((TTTreeListBox*)&rDev)->GetFeatures( pEntry );
@@ -964,7 +964,7 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
         else
         {
             aFont.SetFillColor( aCol );
-            aFont.SetTransparent( FALSE );
+            aFont.SetTransparent( sal_False );
             Color aCol2( COL_BLACK );
             aFont.SetColor( aCol2 );
         }
@@ -990,7 +990,7 @@ void TTTreeListBox::InitEntry(SvLBoxEntry* pEntry,
     const String& rStr ,const Image& rImg1, const Image& rImg2,
     SvLBoxButtonKind eButtonKind )
 {
-    USHORT nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
+    sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem( nColToHilite );
     TTLBoxString* pStr = new TTLBoxString( pEntry, 0, pCol->GetText() );
diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx
index 76b085668768..c3e4d6413db4 100644
--- a/basic/source/app/msgedit.hxx
+++ b/basic/source/app/msgedit.hxx
@@ -37,7 +37,7 @@ class AppError;
 
 #define SelectChildren SelectChilds     // Sonst wird mir schlecht
 
-typedef USHORT TTFeatures;          // Bitfield for features of the entries
+typedef sal_uInt16 TTFeatures;          // Bitfield for features of the entries
 #define HasNothing  TTFeatures(0x00)
 #define HasError    TTFeatures(0x01)
 #define HasWarning  TTFeatures(0x02)
@@ -49,13 +49,13 @@ class TTTreeListBox : public SvTreeListBox
 {
 protected:
 //  virtual void    Command( const CommandEvent& rCEvt );
-//  USHORT          nDeselectParent;
+//  sal_uInt16          nDeselectParent;
     BasicFrame      *pBasicFrame;
     void            InitEntry( SvLBoxEntry*, const String&, const Image&,
                                const Image&, SvLBoxButtonKind eButtonKind );
     AppError        *pAppError;
 
-    BOOL JumpToSourcecode( SvLBoxEntry *pThisEntry );
+    sal_Bool JumpToSourcecode( SvLBoxEntry *pThisEntry );
 
 public:
     TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinStyle=0 );
@@ -63,11 +63,11 @@ public:
 
 //  virtual void    SelectHdl();
 //  virtual void    DeselectHdl();
-    virtual BOOL    DoubleClickHdl();
+    virtual sal_Bool    DoubleClickHdl();
 
     virtual void    KeyInput( const KeyEvent& rKEvt );
 
-//  ULONG           SelectChildren( SvLBoxEntry* pParent, BOOL bSelect );
+//  sal_uIntPtr         SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
     TTFeatures      GetFeatures( SvLBoxEntry* );
 };
 
@@ -79,20 +79,20 @@ class MsgEdit : public DataEdit
     SvLBoxEntry *pCurrentTestCase;
     SvLBoxEntry *pCurrentAssertion;
     SvLBoxEntry *pCurrentError;
-    BOOL bModified;
+    sal_Bool bModified;
     Link lModify;
-    BOOL bFileLoading;      // TRUE while loading a file
+    sal_Bool bFileLoading;      // sal_True while loading a file
     String Impl_MakeText( SvLBoxEntry *pEntry ) const;
     String Impl_MakeSaveText( SvLBoxEntry *pEntry ) const;
     String Impl_MakeSaveText( TTDebugData aData ) const;
-    USHORT nVersion;        // Stores file version
+    sal_uInt16 nVersion;        // Stores file version
     AppError* pAppError;
     String aLogFileName;
 
-    static USHORT nMaxLogLen;
-    static BOOL bLimitLogLen;
-    static BOOL bPrintLogToStdout;
-    static BOOL bPrintLogToStdoutSet;   // has it been initialized yet
+    static sal_uInt16 nMaxLogLen;
+    static sal_Bool bLimitLogLen;
+    static sal_Bool bPrintLogToStdout;
+    static sal_Bool bPrintLogToStdoutSet;   // has it been initialized yet
 public:
     MsgEdit( AppError*, BasicFrame *pBF, const WinBits& );
     ~MsgEdit();
@@ -107,7 +107,7 @@ public:
     void AddAssertionStack( String aMsg, TTDebugData aDebugData );
     void AddQAError( String aMsg, TTDebugData aDebugData );
 
-    static void SetMaxLogLen( USHORT nLen ) { nMaxLogLen = nLen; bLimitLogLen = TRUE; }
+    static void SetMaxLogLen( sal_uInt16 nLen ) { nMaxLogLen = nLen; bLimitLogLen = sal_True; }
 DATA_FUNC_DEF( aEditTree, TTTreeListBox )
 };
 
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index f69c4c468111..791c267cda44 100644
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -65,7 +65,7 @@ TYPEINIT1(MyBasic,StarBASIC)
 class MyFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
 };
 
 static SampleObjectFac aFac1;
@@ -73,7 +73,7 @@ static MyFactory aFac2;
 static ProcessFactory aProcessFac;
 static short nInst = 0;
 
-SbxBase* MyFactory::Create( UINT16 nSbxId, UINT32 nCr )
+SbxBase* MyFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCr )
 {
     if( nCr == SBXCR_TEST && nSbxId == SBXID_MYBASIC )
         return new MyBasic;
@@ -156,7 +156,7 @@ void MyBasic::LoadIniFile()
 {
 }
 
-SbTextType MyBasic::GetSymbolType( const String &rSymbol, BOOL bWasTTControl )
+SbTextType MyBasic::GetSymbolType( const String &rSymbol, sal_Bool bWasTTControl )
 {
     (void) rSymbol;       /* avoid warning about unused parameter */
     (void) bWasTTControl; /* avoid warning about unused parameter */
@@ -181,13 +181,13 @@ void MyBasic::Reset()
     nError = 0;
 }
 
-BOOL MyBasic::Compile( SbModule* p )
+sal_Bool MyBasic::Compile( SbModule* p )
 {
     Reset();
     return StarBASIC::Compile( p );
 }
 
-BOOL MyBasic::ErrorHdl()
+sal_Bool MyBasic::ErrorHdl()
 {
     AppBasEd* pWin = aBasicApp.pFrame->FindModuleWin( GetActiveModule()->GetName() );
     if( !pWin )
@@ -204,12 +204,12 @@ BOOL MyBasic::ErrorHdl()
               0, StarBASIC::GetErrorText(), GetLine(), GetCol1(), GetCol2() ),
               LIST_APPEND );
         nError++;
-        return BOOL( nError < 20 ); // Cancel after 20 errors
+        return sal_Bool( nError < 20 ); // Cancel after 20 errors
     }
     else
     {
         ReportRuntimeError( pWin );
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -226,7 +226,7 @@ void MyBasic::ReportRuntimeError( AppBasEd *pEditWin )
         GetCol1(), GetCol2() ).Show();
 }
 
-void MyBasic::DebugFindNoErrors( BOOL bDebugFindNoErrors )
+void MyBasic::DebugFindNoErrors( sal_Bool bDebugFindNoErrors )
 {
     (void) bDebugFindNoErrors; /* avoid warning about unused parameter */
 }
@@ -236,7 +236,7 @@ const String MyBasic::GetSpechialErrorText()
     return GetErrorText();
 }
 
-USHORT MyBasic::BreakHdl()
+sal_uInt16 MyBasic::BreakHdl()
 {
     SbModule* pMod = GetActiveModule();
     if( pMod )
@@ -270,7 +270,7 @@ USHORT MyBasic::BreakHdl()
 ***************************************************************************/
 
 BasicError::BasicError
-    ( AppBasEd* w, USHORT nE, const String& r, USHORT nL, USHORT nC1, USHORT nC2 )
+    ( AppBasEd* w, sal_uInt16 nE, const String& r, sal_uInt16 nL, sal_uInt16 nC1, sal_uInt16 nC2 )
     : aText( SttResId( IDS_ERROR1 ) )
 {
     pWin  = w;
diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx
index 0ad562970fe6..8e89f5d90c03 100644
--- a/basic/source/app/printer.cxx
+++ b/basic/source/app/printer.cxx
@@ -97,7 +97,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
     // Disable PRINT-Menu
     MenuBar* pBar = pFrame->GetMenuBar();
     Menu* pFileMenu = pBar->GetPopupMenu( RID_APPFILE );
-    pFileMenu->EnableItem( RID_FILEPRINT, FALSE );
+    pFileMenu->EnableItem( RID_FILEPRINT, sal_False );
 
     mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) );
     mpListener->StartPage();
@@ -116,7 +116,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
 
     Printer::PrintJob( mpListener, mpPrinter->GetJobSetup() );
     nPage = 1;
-    pFileMenu->EnableItem( RID_FILEPRINT, TRUE );
+    pFileMenu->EnableItem( RID_FILEPRINT, sal_True );
 }
 
 
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 0eec05e1697c..703f684b38de 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -55,8 +55,8 @@ Process::Process()
 : pArgumentList( NULL )
 , pEnvList( NULL )
 , pProcess( NULL )
-, bWasGPF( FALSE )
-, bHasBeenStarted( FALSE )
+, bWasGPF( sal_False )
+, bHasBeenStarted( sal_False )
 {
 }
 
@@ -68,19 +68,19 @@ Process::~Process()
 }
 
 
-BOOL Process::ImplIsRunning()
+sal_Bool Process::ImplIsRunning()
 {
     if ( pProcess && bHasBeenStarted )
     {
         vos::OProcess::TProcessInfo aProcessInfo;
         pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo );
         if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) )
-            return TRUE;
+            return sal_True;
         else
-            return FALSE;
+            return sal_False;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 long Process::ImplGetExitCode()
@@ -149,19 +149,19 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
         ::rtl::OUString aNormalizedAppPath;
         osl::FileBase::getFileURLFromSystemPath( ::rtl::OUString(aAppPath), aNormalizedAppPath );
         pProcess = new vos::OProcess( aNormalizedAppPath );
-        bHasBeenStarted = FALSE;
+        bHasBeenStarted = sal_False;
 
         delete [] pParamList;
         delete [] pEnvArray;
     }
 }
 
-BOOL Process::Start()
+sal_Bool Process::Start()
 { // Start program
-    BOOL bSuccess=FALSE;
+    sal_Bool bSuccess=sal_False;
     if ( pProcess && !ImplIsRunning() )
     {
-        bWasGPF = FALSE;
+        bWasGPF = sal_False;
 #ifdef WNT
 //      sal_uInt32 nErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT | SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
         sal_uInt32 nErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT | SEM_NOGPFAULTERRORBOX);
@@ -189,7 +189,7 @@ BOOL Process::Start()
         }
         catch( ... )
         {
-            bWasGPF = TRUE;
+            bWasGPF = sal_True;
             // TODO: Output debug message !!
         }
         nErrorMode = SetErrorMode(nErrorMode);
@@ -201,17 +201,17 @@ BOOL Process::Start()
     return bSuccess;
 }
 
-ULONG Process::GetExitCode()
+sal_uIntPtr Process::GetExitCode()
 { // ExitCode of program after execution
     return ImplGetExitCode();
 }
 
-BOOL Process::IsRunning()
+sal_Bool Process::IsRunning()
 {
     return ImplIsRunning();
 }
 
-BOOL Process::WasGPF()
+sal_Bool Process::WasGPF()
 { // Did the process fail?
 #ifdef WNT
     return ImplGetExitCode() == 3221225477;
@@ -220,10 +220,10 @@ BOOL Process::WasGPF()
 #endif
 }
 
-BOOL Process::Terminate()
+sal_Bool Process::Terminate()
 {
     if ( ImplIsRunning() )
         return pProcess->terminate() == vos::OProcess::E_None;
-    return TRUE;
+    return sal_True;
 }
 
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index 291ea9db33b7..0abf5afc0d57 100644
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -48,10 +48,10 @@
 //    none
 // 2) Methods:
 //    SetImage( Filename )
-//    BOOL Start
-//    USHORT GetExitCode
-//    BOOL IsRunning
-//    BOOL WasGPF
+//    sal_Bool Start
+//    sal_uInt16 GetExitCode
+//    sal_Bool IsRunning
+//    sal_Bool WasGPF
 
 
 // This implementation is a sample for a table driven version that
@@ -67,7 +67,7 @@
 #define _BWRITE     0x0200  // can be used as Lvaluen
 #define _LVALUE     _BWRITE
 #define _READWRITE  0x0300  // can read and written
-#define _OPT        0x0400  // TRUE: optional parameter
+#define _OPT        0x0400  // sal_True: optional parameter
 #define _METHOD     0x1000  // Mask-Bit for a method
 #define _PROPERTY   0x2000  // Mask-Bit for a property
 #define _COLL       0x4000  // Mask-Bit for a collection
@@ -128,12 +128,12 @@ SbxVariable* ProcessWrapper::Find( const String& rName, SbxClassType t )
         // otherwise search
         Methods* p = pMethods;
         short nIndex = 0;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         while( p->nArgs != -1 )
         {
             if( rName.EqualsIgnoreCaseAscii( p->pName ) )
             {
-                bFound = TRUE; break;
+                bFound = sal_True; break;
             }
             nIndex += ( p->nArgs & _ARGSMASK ) + 1;
             p = pMethods + nIndex;
@@ -168,22 +168,22 @@ void ProcessWrapper::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCT,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pNotifyPar = pVar->GetParameters();
-        USHORT nIndex = (USHORT) pVar->GetUserData();
+        sal_uInt16 nIndex = (sal_uInt16) pVar->GetUserData();
         // No index: put through
         if( nIndex )
         {
-            ULONG t = pHint->GetId();
+            sal_uIntPtr t = pHint->GetId();
             if( t == SBX_HINT_INFOWANTED )
                 pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
             else
             {
-                BOOL bWrite = FALSE;
+                sal_Bool bWrite = sal_False;
                 if( t == SBX_HINT_DATACHANGED )
-                    bWrite = TRUE;
+                    bWrite = sal_True;
                 if( t == SBX_HINT_DATAWANTED || bWrite )
                 {
                     // Parameter-Test for methods:
-                    USHORT nPar = pMethods[ --nIndex ].nArgs & 0x00FF;
+                    sal_uInt16 nPar = pMethods[ --nIndex ].nArgs & 0x00FF;
                     // Element 0 is the return value
                     if( ( !pNotifyPar && nPar )
                      || ( pNotifyPar && pNotifyPar->Count() < nPar+1 ) )
@@ -212,7 +212,7 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
     {
         p++;
         String aMethodName( p->pName, RTL_TEXTENCODING_ASCII_US );
-        USHORT nInfoFlags = ( p->nArgs >> 8 ) & 0x03;
+        sal_uInt16 nInfoFlags = ( p->nArgs >> 8 ) & 0x03;
         if( p->nArgs & _OPT )
             nInfoFlags |= SBX_OPTIONAL;
         pResultInfo->AddParam( aMethodName, p->eType, nInfoFlags );
@@ -226,10 +226,10 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
 
 ////////////////////////////////////////////////////////////////////////////
 
-// Properties and methods save the return value in argv[0] (Get, bPut = FALSE)
-// and store the value from argv[0] (Put, bPut = TRUE)
+// Properties and methods save the return value in argv[0] (Get, bPut = sal_False)
+// and store the value from argv[0] (Put, bPut = sal_True)
 
-void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // Imagefile of the executable
     (void) pVar; /* avoid warning about unused parameter */
     (void) bWriteIt; /* avoid warning about unused parameter */
@@ -239,28 +239,28 @@ void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL b
         pProcess->SetImage(pMethodePar->Get( 1 )->GetString(), String() );
 }
 
-void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // Program is started
     (void) pMethodePar; /* avoid warning about unused parameter */
     (void) bWriteIt; /* avoid warning about unused parameter */
     pVar->PutBool( pProcess->Start() );
 }
 
-void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // ExitCode of the program after it was finished
     (void) pMethodePar; /* avoid warning about unused parameter */
     (void) bWriteIt; /* avoid warning about unused parameter */
     pVar->PutULong( pProcess->GetExitCode() );
 }
 
-void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // Program is still running
     (void) pMethodePar; /* avoid warning about unused parameter */
     (void) bWriteIt; /* avoid warning about unused parameter */
     pVar->PutBool( pProcess->IsRunning() );
 }
 
-void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // Program faulted with GPF etc.
     (void) pMethodePar; /* avoid warning about unused parameter */
     (void) bWriteIt; /* avoid warning about unused parameter */
diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx
index e04396e20809..69f6eb73a793 100644
--- a/basic/source/app/processw.hxx
+++ b/basic/source/app/processw.hxx
@@ -44,7 +44,7 @@ using SbxVariable::GetInfo;
 public:
 #endif
     typedef void( ProcessWrapper::*pMeth )
-        ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
+        ( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite );
 #if defined ( ICC ) || defined ( HPUX )
 private:
 #endif
@@ -58,11 +58,11 @@ private:
     static Methods aProcessMethods[];   // Method table
     Methods *pMethods;  // Current method table
 
-    void PSetImage( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void PStart( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void PGetExitCode( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void PIsRunning( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void PWasGPF( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+    void PSetImage( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void PStart( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void PGetExitCode( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void PIsRunning( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void PWasGPF( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
 
     // Internal members and methods
     Process *pProcess;
diff --git a/basic/source/app/status.cxx b/basic/source/app/status.cxx
index 604fdedfc133..beb43ec1de18 100644
--- a/basic/source/app/status.cxx
+++ b/basic/source/app/status.cxx
@@ -72,7 +72,7 @@ void StatusLine::SetProfileName( const String& s )
 
 IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
 {
-    USHORT nFirstWinPos=0;
+    sal_uInt16 nFirstWinPos=0;
     MenuBar* pMenu = pFrame->GetMenuBar();
     PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
 
@@ -81,14 +81,14 @@ IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
 
     nFirstWinPos += pTTB->GetItemPos( pTTB->GetCurItemId() ) / 2;
 
-    USHORT x;
+    sal_uInt16 x;
     x = pTTB->GetItemPos( pTTB->GetCurItemId() );
     x = pWinMenu->GetItemId( nFirstWinPos );
     x = pWinMenu->GetItemCount();
     AppWin* pWin = pFrame->FindWin( pWinMenu->GetItemText( pWinMenu->GetItemId( nFirstWinPos ) ).EraseAllChars( L'~' ) );
     if ( pWin )
     {
-        pWin->Minimize( FALSE );
+        pWin->Minimize( sal_False );
         pWin->ToTop();
     }
     return 0;
@@ -96,7 +96,7 @@ IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
 
 void StatusLine::LoadTaskToolBox()
 {
-    USHORT nFirstWinPos=0;
+    sal_uInt16 nFirstWinPos=0;
     MenuBar* pMenu = pFrame->GetMenuBar();
     PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
 
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index bd18d4176803..55e91ea879b5 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -45,19 +45,19 @@
 TextEditImp::TextEditImp( AppEdit* pParent, const WinBits& aBits )
 : Window( pParent, aBits )
 , pAppEdit( pParent )
-, bHighlightning( FALSE )
-, bDoSyntaxHighlight( FALSE )
-, bDelayHighlight( TRUE )
+, bHighlightning( sal_False )
+, bDoSyntaxHighlight( sal_False )
+, bDelayHighlight( sal_True )
 , nTipId( 0 )
-, bViewMoved( FALSE )
+, bViewMoved( sal_False )
 {
     pTextEngine = new TextEngine();
     pTextEngine->SetMaxTextLen( STRING_MAXLEN );
-    pTextEngine->EnableUndo( TRUE );
+    pTextEngine->EnableUndo( sal_True );
 
     pTextView = new TextView( pTextEngine, this );
     pTextEngine->InsertView( pTextView );
-    pTextEngine->SetModified( FALSE );
+    pTextEngine->SetModified( sal_False );
 
     aSyntaxIdleTimer.SetTimeout( 200 );
     aSyntaxIdleTimer.SetTimeoutHdl( LINK( this, TextEditImp, SyntaxTimerHdl ) );
@@ -80,10 +80,10 @@ TextEditImp::~TextEditImp()
     delete pTextEngine;
 }
 
-BOOL TextEditImp::ViewMoved()
+sal_Bool TextEditImp::ViewMoved()
 {
-    BOOL bOld = bViewMoved;
-    bViewMoved = FALSE;
+    sal_Bool bOld = bViewMoved;
+    bViewMoved = sal_False;
     return bOld;
 }
 
@@ -99,7 +99,7 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             pAppEdit->pVScroll->SetThumbPos( pTextView->GetStartDocPos().Y() );
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
                 ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->Scroll( 0, ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->GetCurYOffset() - pTextView->GetStartDocPos().Y() );
-            bViewMoved = TRUE;
+            bViewMoved = sal_True;
         }
         else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
         {
@@ -115,8 +115,8 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         }
         else if( rTextHint.GetId() == TEXT_HINT_TEXTFORMATTED )
         {
-            ULONG nWidth = pTextEngine->CalcTextWidth();
-            if ( (ULONG)nWidth != pAppEdit->nCurTextWidth )
+            sal_uIntPtr nWidth = pTextEngine->CalcTextWidth();
+            if ( (sal_uIntPtr)nWidth != pAppEdit->nCurTextWidth )
             {
                 pAppEdit->nCurTextWidth = nWidth;
                 if ( pAppEdit->pHScroll )
@@ -129,12 +129,12 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         else if( rTextHint.GetId() == TEXT_HINT_PARAINSERTED )
         {
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
-                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, TRUE );
+                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_True );
         }
         else if( rTextHint.GetId() == TEXT_HINT_PARAREMOVED )
         {
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
-                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, FALSE );
+                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_False );
 
             // Itchy adaption for two signs at line ends instead of one (hard coded default)
             pTextEngine->SetMaxTextLen( STRING_MAXLEN - pTextEngine->GetParagraphCount() );
@@ -189,12 +189,12 @@ int TextAttribSpechial::operator==( const TextAttrib& rAttr ) const
                 ( maFontWeight == ((const TextAttribSpechial&)rAttr).maFontWeight ) );
 }
 
-void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
+void TextEditImp::ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff )
 {
     SbTextPortions aPortionList;
     pAppEdit->GetBasicFrame()->Basic().Highlight( rSource, aPortionList );
 
-    USHORT nCount = aPortionList.Count();
+    sal_uInt16 nCount = aPortionList.Count();
     if ( !nCount )
         return;
 
@@ -211,8 +211,8 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
     }
 
     // here is the postprocessing for types for the TestTool
-    USHORT i;
-    BOOL bWasTTControl = FALSE;
+    sal_uInt16 i;
+    sal_Bool bWasTTControl = sal_False;
     for ( i = 0; i < aPortionList.Count(); i++ )
     {
         SbTextPortion& r = aPortionList[i];
@@ -230,20 +230,20 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
                     r.eType = pAppEdit->GetBasicFrame()->Basic().GetSymbolType( aSymbol, bWasTTControl );
 
                     if ( r.eType == TT_CONTROL )
-                        bWasTTControl = TRUE;
+                        bWasTTControl = sal_True;
                     else
-                        bWasTTControl = FALSE;
+                        bWasTTControl = sal_False;
                 }
                 break;
             case SB_PUNCTUATION:
                 {
                      String aPunctuation = rSource.Copy( r.nStart, r.nEnd - r.nStart +1 );
                     if ( aPunctuation.CompareToAscii( "." ) != COMPARE_EQUAL )
-                        bWasTTControl = FALSE;
+                        bWasTTControl = sal_False;
                 }
                 break;
             default:
-                bWasTTControl = FALSE;
+                bWasTTControl = sal_False;
         }
     }
 
@@ -273,7 +273,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
                 r.nEnd = rSource.Len()-1;
         }
 
-    BOOL bWasModified = pTextEngine->IsModified();
+    sal_Bool bWasModified = pTextEngine->IsModified();
     for ( i = 0; i < aPortionList.Count(); i++ )
     {
         SbTextPortion& r = aPortionList[i];
@@ -283,7 +283,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
 
         SbTextType eCol = r.eType;
         Color aColor;
-        ULONG nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
+        sal_uIntPtr nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
         switch ( +eCol )
         {
             case SB_KEYWORD:
@@ -336,7 +336,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
     pTextEngine->SetModified( bWasModified );
 }
 
-void TextEditImp::DoSyntaxHighlight( ULONG nPara )
+void TextEditImp::DoSyntaxHighlight( sal_uIntPtr nPara )
 {
     // Due to delayed syntax highlight it can happend that the
         // paragraph does no longer exist
@@ -362,7 +362,7 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
     {
         if ( bDelayHighlight )
         {
-            aSyntaxLineTable.Insert( nPara, (void*)(ULONG)1 );
+            aSyntaxLineTable.Insert( nPara, (void*)(sal_uIntPtr)1 );
             aSyntaxIdleTimer.Start();
         }
         else
@@ -373,38 +373,38 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
 IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
 {
     DBG_ASSERT( pTextView, "Not yet a View but Syntax-Highlight ?!" );
-    pTextEngine->SetUpdateMode( FALSE );
+    pTextEngine->SetUpdateMode( sal_False );
 
-    bHighlightning = TRUE;
-    USHORT nLine;
+    bHighlightning = sal_True;
+    sal_uInt16 nLine;
     while ( aSyntaxLineTable.First() && !Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
     {
-        nLine = (USHORT)aSyntaxLineTable.GetCurKey();
+        nLine = (sal_uInt16)aSyntaxLineTable.GetCurKey();
         DoSyntaxHighlight( nLine );
         aSyntaxLineTable.Remove( nLine );
 /*      if ( Application::AnyInput() )
         {
             aSyntaxIdleTimer.Start();       // Starten, falls wir in einem Dialog landen
-            pTextView->ShowCursor( TRUE, TRUE );
-            pTextEngine->SetUpdateMode( TRUE );
-            bHighlightning = FALSE;
+            pTextView->ShowCursor( sal_True, sal_True );
+            pTextEngine->SetUpdateMode( sal_True );
+            bHighlightning = sal_False;
             GetpApp()->Reschedule();
-            bHighlightning = TRUE;
-            pTextEngine->SetUpdateMode( FALSE );
+            bHighlightning = sal_True;
+            pTextEngine->SetUpdateMode( sal_False );
         }*/
     }
 
-    BOOL bWasModified = pTextEngine->IsModified();
+    sal_Bool bWasModified = pTextEngine->IsModified();
     if ( aSyntaxLineTable.Count() > 3 )                 // Without VDev
     {
-        pTextEngine->SetUpdateMode( TRUE );
-        pTextView->ShowCursor( TRUE, TRUE );
+        pTextEngine->SetUpdateMode( sal_True );
+        pTextView->ShowCursor( sal_True, sal_True );
     }
     else
-        pTextEngine->SetUpdateMode( TRUE );             // ! With VDev
+        pTextEngine->SetUpdateMode( sal_True );             // ! With VDev
 //  pTextView->ForceUpdate();
 
-    // SetUpdateMode( TRUE ) soll kein Modify setzen
+    // SetUpdateMode( sal_True ) soll kein Modify setzen
     pTextEngine->SetModified( bWasModified );
 
     // SyntaxTimerHdl wird gerufen, wenn Text-Aenderung
@@ -413,7 +413,7 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
 //  nCurTextWidth = pTextEngine->CalcTextWidth();
 //  if ( nCurTextWidth != nPrevTextWidth )
 //      SetScrollBarRanges();
-    bHighlightning = FALSE;
+    bHighlightning = sal_False;
 
     if ( aSyntaxLineTable.First() )
         aImplSyntaxIdleTimer.Start();
@@ -430,7 +430,7 @@ void TextEditImp::InvalidateSyntaxHighlight()
         DoDelayedSyntaxHighlight( i );
 }
 
-void TextEditImp::SyntaxHighlight( BOOL bNew )
+void TextEditImp::SyntaxHighlight( sal_Bool bNew )
 {
     if ( ( bNew && bDoSyntaxHighlight ) || ( !bNew && !bDoSyntaxHighlight ) )
         return;
@@ -447,13 +447,13 @@ void TextEditImp::SyntaxHighlight( BOOL bNew )
     else
     {
         aSyntaxIdleTimer.Stop();
-        pTextEngine->SetUpdateMode( FALSE );
-        for ( ULONG i = 0; i < pTextEngine->GetParagraphCount(); i++ )
+        pTextEngine->SetUpdateMode( sal_False );
+        for ( sal_uIntPtr i = 0; i < pTextEngine->GetParagraphCount(); i++ )
             pTextEngine->RemoveAttribs( i );
 
 //      pTextEngine->QuickFormatDoc();
-        pTextEngine->SetUpdateMode( TRUE );
-        pTextView->ShowCursor(TRUE, TRUE );
+        pTextEngine->SetUpdateMode( sal_True );
+        pTextView->ShowCursor(sal_True, sal_True );
     }
 }
 
@@ -463,15 +463,15 @@ void TextEditImp::SetFont( const Font& rNewFont )
     pTextEngine->SetFont(rNewFont);
 }
 
-BOOL TextEditImp::IsModified()
+sal_Bool TextEditImp::IsModified()
 {
     return pTextEngine->IsModified();
 }
 
 void TextEditImp::KeyInput( const KeyEvent& rKeyEvent )
 {
-    BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
-    pTextView->GetTextEngine()->SetModified( FALSE );
+    sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+    pTextView->GetTextEngine()->SetModified( sal_False );
 
     if ( !pTextView->KeyInput( rKeyEvent ) )
         Window::KeyInput( rKeyEvent );
@@ -487,8 +487,8 @@ void TextEditImp::MouseButtonUp( const MouseEvent& rMouseEvent ){ pTextView->Mou
 //void TextEditImp::MouseButtonDown( const MouseEvent& rMouseEvent ){ pTextView->MouseButtonDown( rMouseEvent );}
 //void TextEditImp::MouseMove( const MouseEvent& rMouseEvent ){ pTextView->MouseMove( rMouseEvent );}
 //void TextEditImp::Command( const CommandEvent& rCEvt ){ pTextView->Command( rCEvt );}
-//BOOL TextEditImp::Drop( const DropEvent& rEvt ){ return FALSE /*pTextView->Drop( rEvt )*/;}
-//BOOL TextEditImp::QueryDrop( DropEvent& rEvt ){ return FALSE /*pTextView->QueryDrop( rEvt )*/;}
+//sal_Bool TextEditImp::Drop( const DropEvent& rEvt ){ return sal_False /*pTextView->Drop( rEvt )*/;}
+//sal_Bool TextEditImp::QueryDrop( DropEvent& rEvt ){ return sal_False /*pTextView->QueryDrop( rEvt )*/;}
 
 
 void TextEditImp::Command( const CommandEvent& rCEvt )
@@ -550,10 +550,10 @@ SbxBase* TextEditImp::GetSbxAtMousePos( String &aWord )
         if ( aSuffixes.Search( aWord.GetChar(nLastChar) ) != STRING_NOTFOUND )
             aWord.Erase( nLastChar, 1 );
         // because perhaps TestTools throws an error
-        BOOL bWasError = SbxBase::IsError();
-        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( TRUE );
+        sal_Bool bWasError = SbxBase::IsError();
+        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_True );
         SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
-        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( FALSE );
+        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_False );
         DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" );
         if ( !bWasError && SbxBase::IsError() )
             SbxBase::ResetError();
@@ -679,8 +679,8 @@ DBG_NAME(TextEdit)
 
 TextEdit::TextEdit( AppEdit* pParent, const WinBits& aBits )
 : pBreakpointWindow( NULL )
-, bFileWasUTF8( FALSE )
-, bSaveAsUTF8( FALSE )
+, bFileWasUTF8( sal_False )
+, bSaveAsUTF8( sal_False )
 , aEdit( pParent, aBits | WB_NOHIDESELECTION )
 {
 DBG_CTOR(TextEdit,0);
@@ -689,7 +689,7 @@ DBG_CTOR(TextEdit,0);
 TextEdit::~TextEdit()
 {DBG_DTOR(TextEdit,0);}
 
-void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
+void TextEdit::Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
 {
     if ( nLine )    // Should not occure but at 'Sub expected' in first line
         nLine--;
@@ -715,7 +715,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
     // Because nCol2 *may* point after the current statement
     // (because the next one starts there) there are space
     // that must be removed
-    BOOL bColon = FALSE;
+    sal_Bool bColon = sal_False;
 
     while ( s.GetChar( nCol2 ) == ' ' && nCol2 > nCol1 && !bColon )
     {
@@ -723,7 +723,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
         if ( s.GetChar( nCol2 ) == ':' )
         {
             nCol2--;
-            bColon = TRUE;
+            bColon = sal_True;
         }
     }
 
@@ -748,31 +748,31 @@ String TextEdit::GetSelected(){ return aEdit.pTextView->GetSelected(); }
 TextSelection TextEdit::GetSelection() const{ return aEdit.pTextView->GetSelection(); }
 void TextEdit::SetSelection( const TextSelection& rSelection ){ aEdit.pTextView->SetSelection( rSelection ); }
 
-USHORT TextEdit::GetLineNr() const
+sal_uInt16 TextEdit::GetLineNr() const
 {
-    return sal::static_int_cast< USHORT >(
+    return sal::static_int_cast< sal_uInt16 >(
         aEdit.pTextView->GetSelection().GetEnd().GetPara()+1);
 }
 
 void TextEdit::ReplaceSelected( const String& rStr ){ aEdit.pTextView->InsertText(rStr); }
-BOOL TextEdit::IsModified(){ return aEdit.IsModified(); }
+sal_Bool TextEdit::IsModified(){ return aEdit.IsModified(); }
 
 String TextEdit::GetText() const
 {
     return aEdit.pTextEngine->GetText( GetSystemLineEnd() );
 }
 
-void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( FALSE ); }
+void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( sal_False ); }
 void TextEdit::SetModifyHdl( Link l ){ aEdit.SetModifyHdl(l); }
-BOOL TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
+sal_Bool TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
 
 // Search from the beginning or at mark + 1
-BOOL TextEdit::Find( const String& s )
+sal_Bool TextEdit::Find( const String& s )
 {
     DBG_CHKTHIS(TextEdit,0);
 
     TextSelection aSelection = aEdit.pTextView->GetSelection();
-    ULONG nPara = aSelection.GetStart().GetPara();
+    sal_uIntPtr nPara = aSelection.GetStart().GetPara();
     xub_StrLen nIndex = aSelection.GetStart().GetIndex();
 
     if ( aSelection.HasRange() )
@@ -786,23 +786,23 @@ BOOL TextEdit::Find( const String& s )
         if( nIndex != STRING_NOTFOUND )
         {
             aEdit.pTextView->SetSelection( TextSelection( TextPaM( nPara, nIndex ), TextPaM( nPara, nIndex + s.Len() ) ) );
-            return TRUE;
+            return sal_True;
         }
         nIndex = 0;
         nPara++;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL TextEdit::Load( const String& aName )
+sal_Bool TextEdit::Load( const String& aName )
 {
 DBG_CHKTHIS(TextEdit,0);
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SvFileStream aStrm( aName, STREAM_STD_READ );
     if( aStrm.IsOpen() )
     {
         String aText, aLine, aLineBreak;
-        BOOL bIsFirstLine = TRUE;
+        sal_Bool bIsFirstLine = sal_True;
         aLineBreak += '\n';
         aLineBreak.ConvertLineEnd();
         rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
@@ -812,29 +812,29 @@ DBG_CHKTHIS(TextEdit,0);
             if ( bIsFirstLine && IsTTSignatureForUnicodeTextfile( aLine ) )
             {
                 aFileEncoding = RTL_TEXTENCODING_UTF8;
-                bFileWasUTF8 = TRUE;
+                bFileWasUTF8 = sal_True;
             }
             else
             {
                 if ( !bIsFirstLine )
                     aText += aLineBreak;
                 aText += aLine;
-                bIsFirstLine = FALSE;
+                bIsFirstLine = sal_False;
             }
             if( aStrm.GetError() != SVSTREAM_OK )
-                bOk = FALSE;
+                bOk = sal_False;
         }
         SetText( aText );
     }
     else
-        bOk = FALSE;
+        bOk = sal_False;
     return bOk;
 }
 
-BOOL TextEdit::Save( const String& aName )
+sal_Bool TextEdit::Save( const String& aName )
 {
 DBG_CHKTHIS(TextEdit,0);
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
     rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
     if( aStrm.IsOpen() )
@@ -849,10 +849,10 @@ DBG_CHKTHIS(TextEdit,0);
         aSave.ConvertLineEnd(LINEEND_LF);
         aStrm << ByteString( aSave, aFileEncoding ).GetBuffer();
         if( aStrm.GetError() != SVSTREAM_OK )
-            bOk = FALSE;
+            bOk = sal_False;
         else
-            aEdit.pTextEngine->SetModified(FALSE);
-    } else bOk = FALSE;
+            aEdit.pTextEngine->SetModified(sal_False);
+    } else bOk = sal_False;
     return bOk;
 }
 
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 354c94dc44ab..404dc4acb2bd 100644
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -49,7 +49,7 @@ class TextEditImp : public Window, public SfxListener
 using Window::Notify;
 
 protected:
-    void            DoSyntaxHighlight( ULONG nPara );
+    void            DoSyntaxHighlight( sal_uIntPtr nPara );
 
 
 private:
@@ -63,10 +63,10 @@ private:
 
     void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    void            ImpDoHighlight( const String& rSource, ULONG nLineOff );
-    BOOL            bHighlightning;
-    BOOL            bDoSyntaxHighlight;
-    BOOL            bDelayHighlight;
+    void            ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff );
+    sal_Bool            bHighlightning;
+    sal_Bool            bDoSyntaxHighlight;
+    sal_Bool            bDelayHighlight;
 
 
     SbxBase* GetSbxAtMousePos( String &aWord );
@@ -75,12 +75,12 @@ private:
     DECL_LINK( ShowVarContents, void* );
     Point aTipPos;
     String aTipWord;
-    ULONG nTipId;
+    sal_uIntPtr nTipId;
 
     Timer HideTipTimer;
     Timer ShowTipTimer;
 
-    BOOL bViewMoved;
+    sal_Bool bViewMoved;
 
 public:
     TextEditImp( AppEdit *pParent, const WinBits& aBits );
@@ -90,7 +90,7 @@ public:
     TextView *pTextView;
 
     void SetFont( const Font& rNewFont );
-    BOOL IsModified();
+    sal_Bool IsModified();
     void SetModifyHdl( Link l ){ ModifyHdl = l; }
 
     void                KeyInput( const KeyEvent& rKeyEvent );
@@ -99,14 +99,14 @@ public:
     void                MouseButtonDown( const MouseEvent& rMouseEvent );
 //  void                MouseMove( const MouseEvent& rMouseEvent );
     void                Command( const CommandEvent& rCEvt );
-    //BOOL              Drop( const DropEvent& rEvt );
-    //BOOL              QueryDrop( DropEvent& rEvt );
+    //sal_Bool              Drop( const DropEvent& rEvt );
+    //sal_Bool              QueryDrop( DropEvent& rEvt );
 
-    BOOL                ViewMoved();
+    sal_Bool                ViewMoved();
 
     void DoDelayedSyntaxHighlight( xub_StrLen nPara );
     void InvalidateSyntaxHighlight();
-    void SyntaxHighlight( BOOL bNew );
+    void SyntaxHighlight( sal_Bool bNew );
     void BuildKontextMenu( PopupMenu *&pMenu );
 };
 
@@ -116,13 +116,13 @@ DBG_NAMEEX(TextEdit)
 class TextEdit : public DataEdit {
 
     BreakpointWindow    *pBreakpointWindow;
-    BOOL bFileWasUTF8;
-    BOOL bSaveAsUTF8;
+    sal_Bool bFileWasUTF8;
+    sal_Bool bSaveAsUTF8;
 
 public:
     TextEdit( AppEdit*, const WinBits& );
     ~TextEdit();
-    void Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+    void Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
     TextEditImp& GetTextEditImp() { return aEdit; }
 
     void                SetBreakpointWindow( BreakpointWindow *pBPWindow ){ pBreakpointWindow = pBPWindow; }
@@ -132,7 +132,7 @@ public:
 
     virtual void BuildKontextMenu( PopupMenu *&pMenu );
 
-    void SaveAsUTF8( BOOL bUTF8 ) { bSaveAsUTF8 = bUTF8; }
+    void SaveAsUTF8( sal_Bool bUTF8 ) { bSaveAsUTF8 = bUTF8; }
 };
 
 #endif
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 695f57ff2e02..e8fe55c2f920 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -451,7 +451,7 @@ namespace basic
             SotStorageRef xDummyStor = new SotStorage( ::rtl::OUString() );
             _out_rpBasicManager = new BasicManager( *xDummyStor, String() /* TODO/LATER: xStorage */,
                                                                 pAppBasic,
-                                                                &aAppBasicDir, TRUE );
+                                                                &aAppBasicDir, sal_True );
             if ( _out_rpBasicManager->HasErrors() )
             {
                 // handle errors
@@ -477,7 +477,7 @@ namespace basic
             // create new BASIC-manager
             StarBASIC* pBasic = new StarBASIC( pAppBasic );
             pBasic->SetFlag( SBX_EXTSEARCH );
-            _out_rpBasicManager = new BasicManager( pBasic, NULL, TRUE );
+            _out_rpBasicManager = new BasicManager( pBasic, NULL, sal_True );
         }
 
         // knit the containers with the BasicManager
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index a491b957fef6..bb686c765f4c 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -92,15 +92,15 @@ typedef WeakImplHelper1< XStarBasicAccess > StarBasicAccessHelper;
 #define CURR_VER        2
 
 // Version 1
-//    ULONG     nEndPos
-//    USHORT    nId
-//    USHORT    nVer
-//    BOOL      bDoLoad
+//    sal_uIntPtr   nEndPos
+//    sal_uInt16    nId
+//    sal_uInt16    nVer
+//    sal_Bool      bDoLoad
 //    String    LibName
 //    String    AbsStorageName
 //    String    RelStorageName
 // Version 2
-//  + BOOL      bReference
+//  + sal_Bool      bReference
 
 static const char* szStdLibName = "Standard";
 static const char szBasicStorage[] = "StarBASIC";
@@ -254,7 +254,7 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
         }
     }
 
-    pLib->SetModified( FALSE );
+    pLib->SetModified( sal_False );
 }
 
 
@@ -312,7 +312,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent
                 }
                 else
                     pLib->MakeModule32( aName, aMod );
-                pLib->SetModified( FALSE );
+                pLib->SetModified( sal_False );
             }
         }
     }
@@ -346,7 +346,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const ContainerEvent
         else
                 pLib->MakeModule32( aName, aMod );
 
-        pLib->SetModified( FALSE );
+        pLib->SetModified( sal_False );
     }
 }
 
@@ -366,8 +366,8 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const ContainerEvent&
         StarBASIC* pLib = mpMgr->GetLib( aName );
         if( pLib )
         {
-            USHORT nLibId = mpMgr->GetLibId( aName );
-            mpMgr->RemoveLib( nLibId, FALSE );
+            sal_uInt16 nLibId = mpMgr->GetLibId( aName );
+            mpMgr->RemoveLib( nLibId, sal_False );
         }
     }
     else
@@ -377,7 +377,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const ContainerEvent&
         if( pMod )
         {
             pLib->Remove( pMod );
-            pLib->SetModified( FALSE );
+            pLib->SetModified( sal_False );
         }
     }
 }
@@ -396,7 +396,7 @@ public:
     void        Reset();
     void        InsertError( const BasicError& rError );
 
-    BOOL        HasErrors()         { return (BOOL)aErrorList.Count(); }
+    sal_Bool        HasErrors()         { return (sal_Bool)aErrorList.Count(); }
     BasicError* GetFirstError()     { return aErrorList.First(); }
     BasicError* GetNextError()      { return aErrorList.Next(); }
 };
@@ -430,7 +430,7 @@ BasicError::BasicError()
     nReason     = 0;
 }
 
-BasicError::BasicError( ULONG nId, USHORT nR, const String& rErrStr ) :
+BasicError::BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr ) :
     aErrStr( rErrStr )
 {
     nErrorId    = nId;
@@ -454,10 +454,10 @@ private:
     String          aRelStorageName;
     String          aPassword;
 
-    BOOL            bDoLoad;
-    BOOL            bReference;
-    BOOL            bPasswordVerified;
-    BOOL            bFoundInPath;   // Must not relativated again!
+    sal_Bool            bDoLoad;
+    sal_Bool            bReference;
+    sal_Bool            bPasswordVerified;
+    sal_Bool            bFoundInPath;   // Must not relativated again!
 
     // Lib represents library in new UNO library container
     Reference< XLibraryContainer > mxScriptCont;
@@ -466,10 +466,10 @@ public:
     BasicLibInfo();
     BasicLibInfo( const String& rStorageName );
 
-    BOOL            IsReference() const     { return bReference; }
-    BOOL&           IsReference()           { return bReference; }
+    sal_Bool            IsReference() const     { return bReference; }
+    sal_Bool&           IsReference()           { return bReference; }
 
-    BOOL            IsExtern() const        { return ! aStorageName.EqualsAscii(szImbedded); }
+    sal_Bool            IsExtern() const        { return ! aStorageName.EqualsAscii(szImbedded); }
 
     void            SetStorageName( const String& rName )   { aStorageName = rName; }
     const String&   GetStorageName() const                  { return aStorageName; }
@@ -492,19 +492,19 @@ public:
     void            SetLibName( const String& rName )   { aLibName = rName; }
 
     // Only temporary for Load/Save
-    BOOL            DoLoad()                            { return bDoLoad; }
+    sal_Bool            DoLoad()                            { return bDoLoad; }
 
-    BOOL            HasPassword() const                 { return aPassword.Len() != 0; }
+    sal_Bool            HasPassword() const                 { return aPassword.Len() != 0; }
     const String&   GetPassword() const                 { return aPassword; }
     void            SetPassword( const String& rNewPassword )
                                                         { aPassword = rNewPassword; }
-    BOOL            IsPasswordVerified() const          { return bPasswordVerified; }
-    void            SetPasswordVerified()               { bPasswordVerified = TRUE; }
+    sal_Bool            IsPasswordVerified() const          { return bPasswordVerified; }
+    void            SetPasswordVerified()               { bPasswordVerified = sal_True; }
 
-    BOOL            IsFoundInPath() const               { return bFoundInPath; }
-    void            SetFoundInPath( BOOL bInPath )      { bFoundInPath = bInPath; }
+    sal_Bool            IsFoundInPath() const               { return bFoundInPath; }
+    void            SetFoundInPath( sal_Bool bInPath )      { bFoundInPath = bInPath; }
 
-    void                    Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo );
+    void                    Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, sal_Bool bUseOldReloadInfo );
     static BasicLibInfo*    Create( SotStorageStream& rSStream );
 
     Reference< XLibraryContainer > GetLibraryContainer( void )
@@ -523,10 +523,10 @@ public:
 
 BasicLibInfo::BasicLibInfo()
 {
-    bReference          = FALSE;
-    bPasswordVerified   = FALSE;
-    bDoLoad             = FALSE;
-    bFoundInPath        = FALSE;
+    bReference          = sal_False;
+    bPasswordVerified   = sal_False;
+    bDoLoad             = sal_False;
+    bFoundInPath        = sal_False;
     mxScriptCont        = NULL;
     aStorageName        = String::CreateFromAscii(szImbedded);
     aRelStorageName     = String::CreateFromAscii(szImbedded);
@@ -534,20 +534,20 @@ BasicLibInfo::BasicLibInfo()
 
 BasicLibInfo::BasicLibInfo( const String& rStorageName )
 {
-    bReference          = TRUE;
-    bPasswordVerified   = FALSE;
-    bDoLoad             = FALSE;
+    bReference          = sal_True;
+    bPasswordVerified   = sal_False;
+    bDoLoad             = sal_False;
     mxScriptCont        = NULL;
     aStorageName        = rStorageName;
 }
 
-void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo )
+void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, sal_Bool bUseOldReloadInfo )
 {
-    ULONG nStartPos = rSStream.Tell();
+    sal_uIntPtr nStartPos = rSStream.Tell();
     sal_uInt32 nEndPos = 0;
 
-    USHORT nId = LIBINFO_ID;
-    USHORT nVer = CURR_VER;
+    sal_uInt16 nId = LIBINFO_ID;
+    sal_uInt16 nVer = CURR_VER;
 
     rSStream << nEndPos;
     rSStream << nId;
@@ -561,7 +561,7 @@ void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStora
         aStorageName = aCurStorageName;
 
     // Load again?
-    BOOL bDoLoad_ = xLib.Is();
+    sal_Bool bDoLoad_ = xLib.Is();
     if ( bUseOldReloadInfo )
         bDoLoad_ = DoLoad();
     rSStream << bDoLoad_;
@@ -614,8 +614,8 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
     BasicLibInfo* pInfo = new BasicLibInfo;
 
     sal_uInt32 nEndPos;
-    USHORT nId;
-    USHORT nVer;
+    sal_uInt16 nId;
+    sal_uInt16 nVer;
 
     rSStream >> nEndPos;
     rSStream >> nId;
@@ -625,7 +625,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
     if( nId == LIBINFO_ID )
     {
         // Reload?
-        BOOL bDoLoad;
+        sal_Bool bDoLoad;
         rSStream >> bDoLoad;
         pInfo->bDoLoad = bDoLoad;
 
@@ -646,7 +646,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
 
         if ( nVer >= 2 )
         {
-            BOOL bReferenz;
+            sal_Bool bReferenz;
             rSStream >> bReferenz;
             pInfo->IsReference() = bReferenz;
         }
@@ -669,7 +669,7 @@ void BasicLibInfo::CalcRelStorageName( const String& rMgrStorageName )
     else
         SetRelStorageName( String() );
 }
-BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath, BOOL bDocMgr ) : mbDocMgr( bDocMgr )
+BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath, sal_Bool bDocMgr ) : mbDocMgr( bDocMgr )
 {
     DBG_CTOR( BasicManager, 0 );
 
@@ -706,13 +706,13 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
             xStdLib->SetName( String::CreateFromAscii(szStdLibName) );
             pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
             xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
-            xStdLib->SetModified( FALSE );
+            xStdLib->SetModified( sal_False );
         }
         else
         {
             pStdLib->SetParent( pParentFromStdLib );
             // The other get StdLib as parent:
-            for ( USHORT nBasic = 1; nBasic < GetLibCount(); nBasic++ )
+            for ( sal_uInt16 nBasic = 1; nBasic < GetLibCount(); nBasic++ )
             {
                 StarBASIC* pBasic = GetLib( nBasic );
                 if ( pBasic )
@@ -723,7 +723,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
                 }
             }
             // Modified through insert
-            pStdLib->SetModified( FALSE );
+            pStdLib->SetModified( sal_False );
         }
 
         // #91626 Save all stream data to save it unmodified if basic isn't modified
@@ -734,12 +734,12 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
         *static_cast<SvStream*>(&xManagerStream) >> *mpImpl->mpManagerStream;
 
         SotStorageRef xBasicStorage = rStorage.OpenSotStorage
-                                ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, FALSE );
+                                ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, sal_False );
         if( xBasicStorage.Is() && !xBasicStorage->GetError() )
         {
-            USHORT nLibs = GetLibCount();
+            sal_uInt16 nLibs = GetLibCount();
             mpImpl->mppLibStreams = new SvMemoryStream*[ nLibs ];
-            for( USHORT nL = 0; nL < nLibs; nL++ )
+            for( sal_uInt16 nL = 0; nL < nLibs; nL++ )
             {
                 BasicLibInfo* pInfo = pLibs->GetObject( nL );
                 DBG_ASSERT( pInfo, "pInfo?!" );
@@ -758,7 +758,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
             LoadOldBasicManager( rStorage );
     }
 
-    bBasMgrModified = FALSE;
+    bBasMgrModified = sal_False;
 }
 
 void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInfo )
@@ -777,8 +777,8 @@ void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInf
     if ( !xLib.is() )
         return;
 
-    USHORT nModCount = pBasic->GetModules()->Count();
-    for ( USHORT nMod = 0 ; nMod < nModCount ; nMod++ )
+    sal_uInt16 nModCount = pBasic->GetModules()->Count();
+    for ( sal_uInt16 nMod = 0 ; nMod < nModCount ; nMod++ )
     {
         SbModule* pModule = (SbModule*)pBasic->GetModules()->Get( nMod );
         DBG_ASSERT( pModule, "Modul nicht erhalten!" );
@@ -842,14 +842,14 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
         else
         {
             // No libs? Maybe an 5.2 document already loaded
-            USHORT nLibs = GetLibCount();
-            for( USHORT nL = 0; nL < nLibs; nL++ )
+            sal_uInt16 nLibs = GetLibCount();
+            for( sal_uInt16 nL = 0; nL < nLibs; nL++ )
             {
                 BasicLibInfo* pBasLibInfo = pLibs->GetObject( nL );
                 StarBASIC* pLib = pBasLibInfo->GetLib();
                 if( !pLib )
                 {
-                    BOOL bLoaded = ImpLoadLibary( pBasLibInfo, NULL, FALSE );
+                    sal_Bool bLoaded = ImpLoadLibary( pBasLibInfo, NULL, sal_False );
                     if( bLoaded )
                         pLib = pBasLibInfo->GetLib();
                 }
@@ -878,7 +878,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
     SetGlobalUNOConstant( "DialogLibraries", makeAny( mpImpl->maContainerInfo.mxDialogCont ) );
 }
 
-BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, BOOL bDocMgr ) : mbDocMgr( bDocMgr )
+BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, sal_Bool bDocMgr ) : mbDocMgr( bDocMgr )
 {
     DBG_CTOR( BasicManager, 0 );
     Init();
@@ -895,8 +895,8 @@ BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, BOOL bDocMgr ) :
     pSLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
 
     // Save is only necessary if basic has changed
-    xStdLib->SetModified( FALSE );
-    bBasMgrModified = FALSE;
+    xStdLib->SetModified( sal_False );
+    bBasMgrModified = sal_False;
 }
 
 BasicManager::BasicManager()
@@ -921,7 +921,7 @@ void BasicManager::ImpMgrNotLoaded( const String& rStorageName )
     xStdLib->SetName( String::CreateFromAscii(szStdLibName) );
     pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
     xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
-    xStdLib->SetModified( FALSE );
+    xStdLib->SetModified( sal_False );
 }
 
 
@@ -936,7 +936,7 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib )
 }
 
 
-void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, BOOL bLoadLibs )
+void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, sal_Bool bLoadLibs )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -974,7 +974,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
     sal_uInt32 nEndPos;
     *xManagerStream >> nEndPos;
 
-    USHORT nLibs;
+    sal_uInt16 nLibs;
     *xManagerStream >> nLibs;
     // Plausi!
     if( nLibs & 0xF000 )
@@ -982,7 +982,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
         DBG_ASSERT( !this, "BasicManager-Stream defect!" );
         return;
     }
-    for ( USHORT nL = 0; nL < nLibs; nL++ )
+    for ( sal_uInt16 nL = 0; nL < nLibs; nL++ )
     {
         BasicLibInfo* pInfo = BasicLibInfo::Create( *xManagerStream );
 
@@ -992,7 +992,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
         {
             INetURLObject aObj( aRealStorageName, INET_PROT_FILE );
             aObj.removeSegment();
-            bool bWasAbsolute = FALSE;
+            bool bWasAbsolute = sal_False;
             aObj = aObj.smartRel2Abs( pInfo->GetRelStorageName(), bWasAbsolute );
 
             //*** TODO: Replace if still necessary
@@ -1008,7 +1008,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
                 if( aPathCFG.SearchFile( aSearchFile, SvtPathOptions::PATH_BASIC ) )
                 {
                     pInfo->SetStorageName( aSearchFile );
-                    pInfo->SetFoundInPath( TRUE );
+                    pInfo->SetFoundInPath( sal_True );
                 }
             }
         }
@@ -1073,8 +1073,8 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
     {
         String aCurStorageName( aStorName );
         INetURLObject aCurStorage( aCurStorageName, INET_PROT_FILE );
-        USHORT nLibs = aLibs.GetTokenCount( LIB_SEP );
-        for ( USHORT nLib = 0; nLib < nLibs; nLib++ )
+        sal_uInt16 nLibs = aLibs.GetTokenCount( LIB_SEP );
+        for ( sal_uInt16 nLib = 0; nLib < nLibs; nLib++ )
         {
             String aLibInfo( aLibs.GetToken( nLib, LIB_SEP ) );
             // TODO: Remove == 2
@@ -1086,7 +1086,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
 
             INetURLObject aLibRelStorage( aStorName );
             aLibRelStorage.removeSegment();
-            bool bWasAbsolute = FALSE;
+            bool bWasAbsolute = sal_False;
             aLibRelStorage = aLibRelStorage.smartRel2Abs( aLibRelStorageName, bWasAbsolute);
             DBG_ASSERT(!bWasAbsolute, "RelStorageName was absolute!" );
 
@@ -1095,14 +1095,14 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
                 xStorageRef = &rStorage;
             else
             {
-                xStorageRef = new SotStorage( FALSE, aLibAbsStorage.GetMainURL
-                    ( INetURLObject::NO_DECODE ), eStorageReadMode, TRUE );
+                xStorageRef = new SotStorage( sal_False, aLibAbsStorage.GetMainURL
+                    ( INetURLObject::NO_DECODE ), eStorageReadMode, sal_True );
                 if ( xStorageRef->GetError() != ERRCODE_NONE )
-                    xStorageRef = new SotStorage( FALSE, aLibRelStorage.
-                    GetMainURL( INetURLObject::NO_DECODE ), eStorageReadMode, TRUE );
+                    xStorageRef = new SotStorage( sal_False, aLibRelStorage.
+                    GetMainURL( INetURLObject::NO_DECODE ), eStorageReadMode, sal_True );
             }
             if ( xStorageRef.Is() )
-                AddLib( *xStorageRef, aLibName, FALSE );
+                AddLib( *xStorageRef, aLibName, sal_False );
             else
             {
 //              String aErrorText( BasicResId( IDS_SBERR_LIBLOAD ) );
@@ -1145,7 +1145,7 @@ void BasicManager::Init()
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
-    bBasMgrModified = FALSE;
+    bBasMgrModified = sal_False;
     pErrorMgr = new BasicErrorManager;
     pLibs = new BasicLibs;
     mpImpl = new BasicManagerImpl();
@@ -1160,7 +1160,7 @@ BasicLibInfo* BasicManager::CreateLibInfo()
     return pInf;
 }
 
-BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly ) const
+sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly ) const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1188,10 +1188,10 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
     }
 
     if ( !xStorage.Is() )
-        xStorage = new SotStorage( FALSE, aStorageName, eStorageReadMode );
+        xStorage = new SotStorage( sal_False, aStorageName, eStorageReadMode );
 
     SotStorageRef xBasicStorage = xStorage->OpenSotStorage
-                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, FALSE );
+                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, sal_False );
 
     if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
     {
@@ -1209,7 +1209,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
         }
         else
         {
-            BOOL bLoaded = FALSE;
+            sal_Bool bLoaded = sal_False;
             if ( xBasicStream->Seek( STREAM_SEEK_TO_END ) != 0 )
             {
                 if ( !bInfosOnly )
@@ -1222,7 +1222,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
                     xBasicStream->SetBufferSize( 0 );
                     StarBASICRef xStdLib = pLibInfo->GetLib();
                     xStdLib->SetName( pLibInfo->GetLibName() );
-                    xStdLib->SetModified( FALSE );
+                    xStdLib->SetModified( sal_False );
                     xStdLib->SetFlag( SBX_DONTSTORE );
                 }
                 else
@@ -1231,7 +1231,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
                     xBasicStream->Seek( STREAM_SEEK_TO_BEGIN );
                     ImplEncryptStream( *xBasicStream );
                     SbxBase::Skip( *xBasicStream );
-                    bLoaded = TRUE;
+                    bLoaded = sal_True;
                 }
             }
             if ( !bLoaded )
@@ -1258,20 +1258,20 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
             return bLoaded;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL BasicManager::ImplEncryptStream( SvStream& rStrm ) const
+sal_Bool BasicManager::ImplEncryptStream( SvStream& rStrm ) const
 {
-    ULONG nPos = rStrm.Tell();
-    UINT32 nCreator;
+    sal_uIntPtr nPos = rStrm.Tell();
+    sal_uInt32 nCreator;
     rStrm >> nCreator;
     rStrm.Seek( nPos );
-    BOOL bProtected = FALSE;
+    sal_Bool bProtected = sal_False;
     if ( nCreator != SBXCR_SBX )
     {
         // Should only be the case for encrypted Streams
-        bProtected = TRUE;
+        bProtected = sal_True;
         rStrm.SetKey( szCryptingKey );
         rStrm.RefreshBuffer();
     }
@@ -1280,11 +1280,11 @@ BOOL BasicManager::ImplEncryptStream( SvStream& rStrm ) const
 
 // This code is necessary to load the BASIC of Beta 1
 // TODO: Which Beta 1?
-BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const
+sal_Bool BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const
 {
-    BOOL bProtected = ImplEncryptStream( rStrm );
+    sal_Bool bProtected = ImplEncryptStream( rStrm );
     SbxBaseRef xNew = SbxBase::Load( rStrm );
-    BOOL bLoaded = FALSE;
+    sal_Bool bLoaded = sal_False;
     if( xNew.Is() )
     {
         if( xNew->IsA( TYPE(StarBASIC) ) )
@@ -1310,8 +1310,8 @@ BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) con
                 rOldBasic->SetFlag( SBX_EXTSEARCH );
             }
 */
-            pNew->SetModified( FALSE );
-            bLoaded = TRUE;
+            pNew->SetModified( sal_False );
+            bLoaded = sal_True;
         }
     }
     if ( bProtected )
@@ -1319,14 +1319,14 @@ BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) con
     return bLoaded;
 }
 
-void BasicManager::CheckModules( StarBASIC* pLib, BOOL bReference ) const
+void BasicManager::CheckModules( StarBASIC* pLib, sal_Bool bReference ) const
 {
     if ( !pLib )
         return;
 
-    BOOL bModified = pLib->IsModified();
+    sal_Bool bModified = pLib->IsModified();
 
-    for ( USHORT nMod = 0; nMod < pLib->GetModules()->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pLib->GetModules()->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pLib->GetModules()->Get( nMod );
         DBG_ASSERT( pModule, "Modul nicht erhalten!" );
@@ -1339,11 +1339,11 @@ void BasicManager::CheckModules( StarBASIC* pLib, BOOL bReference ) const
     if( !bModified && bReference )
     {
         DBG_ERROR( "Per Reference eingebundene Basic-Library ist nicht compiliert!" );
-        pLib->SetModified( FALSE );
+        pLib->SetModified( sal_False );
     }
 }
 
-StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, BOOL bReference )
+StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, sal_Bool bReference )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1361,12 +1361,12 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
     // Use original name otherwise ImpLoadLibary failes...
     pLibInfo->SetLibName( rLibName );
     // Funktioniert so aber nicht, wenn Name doppelt
-//  USHORT nLibId = GetLibId( rLibName );
-    USHORT nLibId = (USHORT) pLibs->GetPos( pLibInfo );
+//  sal_uInt16 nLibId = GetLibId( rLibName );
+    sal_uInt16 nLibId = (sal_uInt16) pLibs->GetPos( pLibInfo );
 
     // Set StorageName before load because it is compared with pCurStorage
     pLibInfo->SetStorageName( aStorageName );
-    BOOL bLoaded = ImpLoadLibary( pLibInfo, &rStorage );
+    sal_Bool bLoaded = ImpLoadLibary( pLibInfo, &rStorage );
 
     if ( bLoaded )
     {
@@ -1375,21 +1375,21 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
 
         if ( bReference )
         {
-            pLibInfo->GetLib()->SetModified( FALSE );   // Don't save in this case
+            pLibInfo->GetLib()->SetModified( sal_False );   // Don't save in this case
             pLibInfo->SetRelStorageName( String() );
 //          pLibInfo->CalcRelStorageName( GetStorageName() );
-            pLibInfo->IsReference() = TRUE;
+            pLibInfo->IsReference() = sal_True;
         }
         else
         {
-            pLibInfo->GetLib()->SetModified( TRUE ); // Must be saved after Add!
+            pLibInfo->GetLib()->SetModified( sal_True ); // Must be saved after Add!
             pLibInfo->SetStorageName( String::CreateFromAscii(szImbedded) ); // Save in BasicManager-Storage
         }
-        bBasMgrModified = TRUE;
+        bBasMgrModified = sal_True;
     }
     else
     {
-        RemoveLib( nLibId, FALSE );
+        RemoveLib( nLibId, sal_False );
         pLibInfo = 0;
     }
 
@@ -1399,7 +1399,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
         return 0;
 }
 
-BOOL BasicManager::IsReference( USHORT nLib )
+sal_Bool BasicManager::IsReference( sal_uInt16 nLib )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1408,16 +1408,16 @@ BOOL BasicManager::IsReference( USHORT nLib )
     if ( pLibInfo )
         return pLibInfo->IsReference();
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL BasicManager::RemoveLib( USHORT nLib )
+sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib )
 {
     // Only pyhsical deletion if no reference
     return RemoveLib( nLib, !IsReference( nLib ) );
 }
 
-BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
+sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage )
 {
     DBG_CHKTHIS( BasicManager, 0 );
     DBG_ASSERT( nLib, "Standard-Lib cannot be removed!" );
@@ -1430,7 +1430,7 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
 //      String aErrorText( BasicResId( IDS_SBERR_REMOVELIB ) );
         StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, String(), ERRCODE_BUTTON_OK );
         pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_STDLIB, pLibInfo->GetLibName() ) );
-        return FALSE;
+        return sal_False;
     }
 
     // If one of the streams cannot be opened, this is not an error,
@@ -1440,14 +1440,14 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
     {
         SotStorageRef xStorage;
         if ( !pLibInfo->IsExtern() )
-            xStorage = new SotStorage( FALSE, GetStorageName() );
+            xStorage = new SotStorage( sal_False, GetStorageName() );
         else
-            xStorage = new SotStorage( FALSE, pLibInfo->GetStorageName() );
+            xStorage = new SotStorage( sal_False, pLibInfo->GetStorageName() );
 
         if ( xStorage->IsStorage( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)) ) )
         {
             SotStorageRef xBasicStorage = xStorage->OpenSotStorage
-                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), STREAM_STD_READWRITE, FALSE );
+                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), STREAM_STD_READWRITE, sal_False );
 
             if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
             {
@@ -1485,20 +1485,20 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
             }
         }
     }
-    bBasMgrModified = TRUE;
+    bBasMgrModified = sal_True;
     if ( pLibInfo->GetLib().Is() )
         GetStdLib()->Remove( pLibInfo->GetLib() );
     delete pLibs->Remove( pLibInfo );
-    return TRUE;    // Remove was successful, del unimportant
+    return sal_True;    // Remove was successful, del unimportant
 }
 
-USHORT BasicManager::GetLibCount() const
+sal_uInt16 BasicManager::GetLibCount() const
 {
     DBG_CHKTHIS( BasicManager, 0 );
-    return (USHORT)pLibs->Count();
+    return (sal_uInt16)pLibs->Count();
 }
 
-StarBASIC* BasicManager::GetLib( USHORT nLib ) const
+StarBASIC* BasicManager::GetLib( sal_uInt16 nLib ) const
 {
     DBG_CHKTHIS( BasicManager, 0 );
     BasicLibInfo* pInf = pLibs->GetObject( nLib );
@@ -1530,7 +1530,7 @@ StarBASIC* BasicManager::GetLib( const String& rName ) const
     return 0;
 }
 
-USHORT BasicManager::GetLibId( const String& rName ) const
+sal_uInt16 BasicManager::GetLibId( const String& rName ) const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1538,14 +1538,14 @@ USHORT BasicManager::GetLibId( const String& rName ) const
     while ( pInf )
     {
         if ( pInf->GetLibName().CompareIgnoreCaseToAscii( rName ) == COMPARE_EQUAL )
-            return (USHORT)pLibs->GetCurPos();
+            return (sal_uInt16)pLibs->GetCurPos();
 
         pInf = pLibs->Next();
     }
     return LIB_NOTFOUND;
 }
 
-BOOL BasicManager::HasLib( const String& rName ) const
+sal_Bool BasicManager::HasLib( const String& rName ) const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1553,14 +1553,14 @@ BOOL BasicManager::HasLib( const String& rName ) const
     while ( pInf )
     {
         if ( pInf->GetLibName().CompareIgnoreCaseToAscii( rName ) == COMPARE_EQUAL )
-            return TRUE;
+            return sal_True;
 
         pInf = pLibs->Next();
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL BasicManager::SetLibName( USHORT nLib, const String& rName )
+sal_Bool BasicManager::SetLibName( sal_uInt16 nLib, const String& rName )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1573,15 +1573,15 @@ BOOL BasicManager::SetLibName( USHORT nLib, const String& rName )
         {
             StarBASICRef xStdLib = pLibInfo->GetLib();
             xStdLib->SetName( rName );
-            xStdLib->SetModified( TRUE );
+            xStdLib->SetModified( sal_True );
         }
-        bBasMgrModified = TRUE;
-        return TRUE;
+        bBasMgrModified = sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-String BasicManager::GetLibName( USHORT nLib )
+String BasicManager::GetLibName( sal_uInt16 nLib )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1592,11 +1592,11 @@ String BasicManager::GetLibName( USHORT nLib )
     return String();
 }
 
-BOOL BasicManager::LoadLib( USHORT nLib )
+sal_Bool BasicManager::LoadLib( sal_uInt16 nLib )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     BasicLibInfo* pLibInfo = pLibs->GetObject( nLib );
     DBG_ASSERT( pLibInfo, "Lib?!" );
     if ( pLibInfo )
@@ -1610,7 +1610,7 @@ BOOL BasicManager::LoadLib( USHORT nLib )
         }
         else
         {
-            bDone = ImpLoadLibary( pLibInfo, NULL, FALSE );
+            bDone = ImpLoadLibary( pLibInfo, NULL, sal_False );
             StarBASIC* pLib = GetLib( nLib );
             if ( pLib )
             {
@@ -1656,17 +1656,17 @@ StarBASIC* BasicManager::CreateLib
     {
         if( LinkTargetURL.Len() != 0 )
         {
-            SotStorageRef xStorage = new SotStorage( FALSE, LinkTargetURL, STREAM_READ | STREAM_SHARE_DENYWRITE );
+            SotStorageRef xStorage = new SotStorage( sal_False, LinkTargetURL, STREAM_READ | STREAM_SHARE_DENYWRITE );
             if( !xStorage->GetError() )
             {
-                pLib = AddLib( *xStorage, rLibName, TRUE );
+                pLib = AddLib( *xStorage, rLibName, sal_True );
 
                 //if( !pLibInfo )
                     //pLibInfo = FindLibInfo( pLib );
                 //pLibInfo->SetStorageName( LinkTargetURL );
-                //pLibInfo->GetLib()->SetModified( FALSE ); // Dann nicht speichern
+                //pLibInfo->GetLib()->SetModified( sal_False ); // Dann nicht speichern
                 //pLibInfo->SetRelStorageName( String() );
-                //pLibInfo->IsReference() = TRUE;
+                //pLibInfo->IsReference() = sal_True;
             }
             //else
                 //Message?
@@ -1722,16 +1722,16 @@ BasicLibInfo* BasicManager::FindLibInfo( StarBASIC* pBasic ) const
 }
 
 
-BOOL BasicManager::IsModified() const
+sal_Bool BasicManager::IsModified() const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
     if ( bBasMgrModified )
-        return TRUE;
+        return sal_True;
     return IsBasicModified();
 }
 
-BOOL BasicManager::IsBasicModified() const
+sal_Bool BasicManager::IsBasicModified() const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1739,17 +1739,17 @@ BOOL BasicManager::IsBasicModified() const
     while ( pInf )
     {
         if ( pInf->GetLib().Is() && pInf->GetLib()->IsModified() )
-            return TRUE;
+            return sal_True;
 
         pInf = pLibs->Next();
     }
-    return FALSE;
+    return sal_False;
 }
 
-void BasicManager::SetFlagToAllLibs( short nFlag, BOOL bSet ) const
+void BasicManager::SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const
 {
-    USHORT nLibs = GetLibCount();
-    for ( USHORT nL = 0; nL < nLibs; nL++ )
+    sal_uInt16 nLibs = GetLibCount();
+    for ( sal_uInt16 nL = 0; nL < nLibs; nL++ )
     {
         BasicLibInfo* pInfo = pLibs->GetObject( nL );
         DBG_ASSERT( pInfo, "Info?!" );
@@ -1764,7 +1764,7 @@ void BasicManager::SetFlagToAllLibs( short nFlag, BOOL bSet ) const
     }
 }
 
-BOOL BasicManager::HasErrors()
+sal_Bool BasicManager::HasErrors()
 {
     DBG_CHKTHIS( BasicManager, 0 );
     return pErrorMgr->HasErrors();
@@ -2133,10 +2133,10 @@ Sequence< ::rtl::OUString > ModuleContainer_Impl::getElementNames()
     throw(RuntimeException)
 {
     SbxArray* pMods = mpLib ? mpLib->GetModules() : NULL;
-    USHORT nMods = pMods ? pMods->Count() : 0;
+    sal_uInt16 nMods = pMods ? pMods->Count() : 0;
     Sequence< ::rtl::OUString > aRetSeq( nMods );
     ::rtl::OUString* pRetSeq = aRetSeq.getArray();
-    for( USHORT i = 0 ; i < nMods ; i++ )
+    for( sal_uInt16 i = 0 ; i < nMods ; i++ )
     {
         SbxVariable* pMod = pMods->Get( i );
         pRetSeq[i] = ::rtl::OUString( pMod->GetName() );
@@ -2463,10 +2463,10 @@ Any LibraryContainer_Impl::getByName( const ::rtl::OUString& aName )
 Sequence< ::rtl::OUString > LibraryContainer_Impl::getElementNames()
     throw(RuntimeException)
 {
-    USHORT nLibs = mpMgr->GetLibCount();
+    sal_uInt16 nLibs = mpMgr->GetLibCount();
     Sequence< ::rtl::OUString > aRetSeq( nLibs );
     ::rtl::OUString* pRetSeq = aRetSeq.getArray();
-    for( USHORT i = 0 ; i < nLibs ; i++ )
+    for( sal_uInt16 i = 0 ; i < nLibs ; i++ )
     {
         pRetSeq[i] = ::rtl::OUString( mpMgr->GetLibName( i ) );
     }
@@ -2503,7 +2503,7 @@ void LibraryContainer_Impl::removeByName( const ::rtl::OUString& Name )
     StarBASIC* pLib = mpMgr->GetLib( Name );
     if( !pLib )
         throw NoSuchElementException();
-    USHORT nLibId = mpMgr->GetLibId( Name );
+    sal_uInt16 nLibId = mpMgr->GetLibId( Name );
     mpMgr->RemoveLib( nLibId );
 }
 
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index a837a3dc4f24..37d777cb8da8 100644
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -236,7 +236,7 @@ static const char* _crlf()
 }
 
 // This method exists because we want to load the file as own segment
-BOOL SbModule::Disassemble( String& rText )
+sal_Bool SbModule::Disassemble( String& rText )
 {
     rText.Erase();
     if( pImage )
@@ -244,7 +244,7 @@ BOOL SbModule::Disassemble( String& rText )
         SbiDisas aDisas( this, pImage );
         aDisas.Disas( rText );
     }
-    return BOOL( rText.Len() != 0 );
+    return sal_Bool( rText.Len() != 0 );
 }
 
 SbiDisas::SbiDisas( SbModule* p, const SbiImage* q ) : rImg( *q ), pMod( p )
@@ -278,23 +278,23 @@ SbiDisas::SbiDisas( SbModule* p, const SbiImage* q ) : rImg( *q ), pMod( p )
     }
     nOff = 0;
     // Add the publics
-    for( USHORT i = 0; i < pMod->GetMethods()->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pMod->GetMethods()->Count(); i++ )
     {
         SbMethod* pMeth = PTR_CAST(SbMethod,pMod->GetMethods()->Get( i ));
         if( pMeth )
         {
-            USHORT nPos = (USHORT) (pMeth->GetId());
+            sal_uInt16 nPos = (sal_uInt16) (pMeth->GetId());
             cLabels[ nPos >> 3 ] |= ( 1 << ( nPos & 7 ) );
         }
     }
 }
 
 // Read current opcode
-BOOL SbiDisas::Fetch()
+sal_Bool SbiDisas::Fetch()
 {
     nPC = nOff;
     if( nOff >= rImg.GetCodeSize() )
-        return FALSE;
+        return sal_False;
     const unsigned char* p = (const unsigned char*)( rImg.GetCode() + nOff );
     eOp = (SbiOpcode) ( *p++ & 0xFF );
     if( eOp <= SbOP0_END )
@@ -302,29 +302,29 @@ BOOL SbiDisas::Fetch()
         nOp1 = nOp2 = 0;
         nParts = 1;
         nOff++;
-        return TRUE;
+        return sal_True;
     }
     else if( eOp <= SbOP1_END )
     {
         nOff += 5;
         if( nOff > rImg.GetCodeSize() )
-            return FALSE;
+            return sal_False;
         nOp1 = *p++; nOp1 |= *p++ << 8; nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
         nParts = 2;
-        return TRUE;
+        return sal_True;
     }
     else if( eOp <= SbOP2_END )
     {
         nOff += 9;
         if( nOff > rImg.GetCodeSize() )
-            return FALSE;
+            return sal_False;
         nOp1 = *p++; nOp1 |= *p++ << 8; nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
         nOp2 = *p++; nOp2 |= *p++ << 8; nOp2 |= *p++ << 16; nOp2 |= *p++ << 24;
         nParts = 3;
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 void SbiDisas::Disas( SvStream& r )
@@ -351,7 +351,7 @@ void SbiDisas::Disas( String& r )
     aText.ConvertLineEnd();
 }
 
-BOOL SbiDisas::DisasLine( String& rText )
+sal_Bool SbiDisas::DisasLine( String& rText )
 {
     char cBuf[ 100 ];
     const char* pMask[] = {
@@ -361,7 +361,7 @@ BOOL SbiDisas::DisasLine( String& rText )
         "%08" SAL_PRIXUINT32 " %02X %08X %08X " };
     rText.Erase();
     if( !Fetch() )
-        return FALSE;
+        return sal_False;
 
 #ifdef DBG_TRACE_BASIC
     String aTraceStr_STMNT;
@@ -373,8 +373,8 @@ BOOL SbiDisas::DisasLine( String& rText )
         // Find line
         String aSource = rImg.aOUSource;
         nLine = nOp1;
-        USHORT n = 0;
-        USHORT l = (USHORT)nLine;
+        sal_uInt16 n = 0;
+        sal_uInt16 l = (sal_uInt16)nLine;
         while( --l ) {
             n = aSource.SearchAscii( "\n", n );
             if( n == STRING_NOTFOUND ) break;
@@ -383,16 +383,16 @@ BOOL SbiDisas::DisasLine( String& rText )
         // Show position
         if( n != STRING_NOTFOUND )
         {
-            USHORT n2 = aSource.SearchAscii( "\n", n );
+            sal_uInt16 n2 = aSource.SearchAscii( "\n", n );
             if( n2 == STRING_NOTFOUND ) n2 = aSource.Len() - n;
             String s( aSource.Copy( n, n2 - n + 1 ) );
-            BOOL bDone;
+            sal_Bool bDone;
             do {
-                bDone = TRUE;
+                bDone = sal_True;
                 n = s.Search( '\r' );
-                if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 );
+                if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
                 n = s.Search( '\n' );
-                if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 );
+                if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
             } while( !bDone );
 //          snprintf( cBuf, sizeof(cBuf), pMask[ 0 ], nPC );
 //          rText += cBuf;
@@ -412,7 +412,7 @@ BOOL SbiDisas::DisasLine( String& rText )
     {
         // Public?
         ByteString aByteMethName;
-        for( USHORT i = 0; i < pMod->GetMethods()->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pMod->GetMethods()->Count(); i++ )
         {
             SbMethod* pMeth = PTR_CAST(SbMethod,pMod->GetMethods()->Get( i ));
             if( pMeth )
@@ -442,7 +442,7 @@ BOOL SbiDisas::DisasLine( String& rText )
         rText += ':';
         rText.AppendAscii( _crlf() );
     }
-    snprintf( cBuf, sizeof(cBuf), pMask[ nParts ], nPC, (USHORT) eOp, nOp1, nOp2 );
+    snprintf( cBuf, sizeof(cBuf), pMask[ nParts ], nPC, (sal_uInt16) eOp, nOp1, nOp2 );
 
     String aPCodeStr;
     aPCodeStr.AppendAscii( cBuf );
@@ -466,13 +466,13 @@ BOOL SbiDisas::DisasLine( String& rText )
     dbg_RegisterTraceTextForPC( pMod, nPC, aTraceStr_STMNT, aPCodeStr );
 #endif
 
-    return TRUE;
+    return sal_True;
 }
 
 // Read from StringPool
 void SbiDisas::StrOp( String& rText )
 {
-    String aStr = rImg.GetString( (USHORT)nOp1 );
+    String aStr = rImg.GetString( (sal_uInt16)nOp1 );
     ByteString aByteString( aStr, RTL_TEXTENCODING_ASCII_US );
     const char* p = aByteString.GetBuffer();
     if( p )
@@ -484,7 +484,7 @@ void SbiDisas::StrOp( String& rText )
     else
     {
         rText.AppendAscii( "?String? " );
-        rText += (USHORT)nOp1;
+        rText += (sal_uInt16)nOp1;
     }
 }
 
@@ -538,7 +538,7 @@ void SbiDisas::ResumeOp( String& rText )
 }
 
 // print Prompt
-// FALSE/TRUE
+// sal_False/TRUE
 void SbiDisas::PromptOp( String& rText )
 {
     if( nOp1 )
@@ -570,16 +570,16 @@ void SbiDisas::CharOp( String& rText )
         rText += '\'';
     else
         rText.AppendAscii( "char " ),
-        rText += (USHORT)nOp1;
+        rText += (sal_uInt16)nOp1;
 }
 
 // Print var: String-ID and type
 void SbiDisas::VarOp( String& rText )
 {
-    rText += rImg.GetString( (USHORT)(nOp1 & 0x7FFF) );
+    rText += rImg.GetString( (sal_uInt16)(nOp1 & 0x7FFF) );
     rText.AppendAscii( "\t; " );
     // The type
-    UINT32 n = nOp1;
+    sal_uInt32 n = nOp1;
     nOp1 = nOp2;
     TypeOp( rText );
     if( n & 0x8000 )
@@ -589,7 +589,7 @@ void SbiDisas::VarOp( String& rText )
 // Define variable: String-ID and type
 void SbiDisas::VarDefOp( String& rText )
 {
-    rText += rImg.GetString( (USHORT)(nOp1 & 0x7FFF) );
+    rText += rImg.GetString( (sal_uInt16)(nOp1 & 0x7FFF) );
     rText.AppendAscii( "\t; " );
     // The Typ
     nOp1 = nOp2;
@@ -602,7 +602,7 @@ void SbiDisas::OffOp( String& rText )
     rText += String::CreateFromInt32( nOp1 & 0x7FFF );
     rText.AppendAscii( "\t; " );
     // The type
-    UINT32 n = nOp1;
+    sal_uInt32 n = nOp1;
     nOp1 = nOp2;
     TypeOp( rText );
     if( n & 0x8000 )
@@ -638,14 +638,14 @@ void SbiDisas::TypeOp( String& rText )
     else
     {
         rText.AppendAscii( "type " );
-        rText += (USHORT)nOp1;
+        rText += (sal_uInt16)nOp1;
     }
 }
 #ifdef HP9000
 #undef pTypes
 #endif
 
-// TRUE-Label, condition Opcode
+// sal_True-Label, condition Opcode
 void SbiDisas::CaseOp( String& rText )
 {
     LblOp( rText );
@@ -658,8 +658,8 @@ void SbiDisas::StmntOp( String& rText )
 {
     rText += String::CreateFromInt32( nOp1 );
     rText += ',';
-    UINT32 nCol = nOp2 & 0xFF;
-    UINT32 nFor = nOp2 / 0x100;
+    sal_uInt32 nCol = nOp2 & 0xFF;
+    sal_uInt32 nFor = nOp2 / 0x100;
     rText += String::CreateFromInt32( nCol );
     rText.AppendAscii( " (For-Level: " );
     rText += String::CreateFromInt32( nFor );
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 6c77259ccc7d..8d9f30e4982f 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -298,7 +298,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
                     if( aName == aLibName )
                     {
                         // Search only in the lib, not automatically in application basic
-                        USHORT nFlags = pBasic->GetFlags();
+                        sal_uInt16 nFlags = pBasic->GetFlags();
                         pBasic->ResetFlag( SBX_GBLSEARCH );
                         pMethVar = pBasic->Find( aMacro, SbxCLASS_DONTCARE );
                         pBasic->SetFlags( nFlags );
@@ -328,7 +328,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
             {
                 SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
                 unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
-                xArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+                xArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
             }
         }
 
@@ -443,7 +443,7 @@ static ::rtl::OUString aDecorationPropName =
 static ::rtl::OUString aTitlePropName =
     ::rtl::OUString::createFromAscii( "Title" );
 
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAscii( "ResourceResolver" );
 
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 79f49eb8724a..fc6228d1aee9 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -47,8 +47,8 @@ SbiImage::SbiImage()
     nLegacyCodeSize  =
     nDimBase   = 0;
     bInit      =
-    bError     = FALSE;
-    bFirstInit = TRUE;
+    bError     = sal_False;
+    bFirstInit = sal_True;
     eCharSet   = gsl_getSystemTextEncoding();
 }
 
@@ -73,7 +73,7 @@ void SbiImage::Clear()
     nCodeSize  = 0;
     eCharSet   = gsl_getSystemTextEncoding();
     nDimBase   = 0;
-    bError     = FALSE;
+    bError     = sal_False;
 }
 
 /**************************************************************************
@@ -82,25 +82,25 @@ void SbiImage::Clear()
 *
 **************************************************************************/
 
-BOOL SbiGood( SvStream& r )
+sal_Bool SbiGood( SvStream& r )
 {
-    return BOOL( !r.IsEof() && r.GetError() == SVSTREAM_OK );
+    return sal_Bool( !r.IsEof() && r.GetError() == SVSTREAM_OK );
 }
 
 // Open Record
-ULONG SbiOpenRecord( SvStream& r, UINT16 nSignature, UINT16 nElem )
+sal_uIntPtr SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16 nElem )
 {
-    ULONG nPos = r.Tell();
-    r << nSignature << (INT32) 0 << nElem;
+    sal_uIntPtr nPos = r.Tell();
+    r << nSignature << (sal_Int32) 0 << nElem;
     return nPos;
 }
 
 // Close Record
-void SbiCloseRecord( SvStream& r, ULONG nOff )
+void SbiCloseRecord( SvStream& r, sal_uIntPtr nOff )
 {
-    ULONG nPos = r.Tell();
+    sal_uIntPtr nPos = r.Tell();
     r.Seek( nOff + 2 );
-    r << (INT32) ( nPos - nOff - 8 );
+    r << (sal_Int32) ( nPos - nOff - 8 );
     r.Seek( nPos );
 }
 
@@ -112,40 +112,40 @@ void SbiCloseRecord( SvStream& r, ULONG nOff )
 
 // If the version number does not find, binary parts are omitted, but not
 // source, comments and name
-BOOL SbiImage::Load( SvStream& r )
+sal_Bool SbiImage::Load( SvStream& r )
 {
-    UINT32 nVersion = 0;        // Versionsnumber
+    sal_uInt32 nVersion = 0;        // Versionsnumber
     return Load( r, nVersion );
 }
-BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
+sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
 {
 
-    UINT16 nSign, nCount;
-    UINT32 nLen, nOff;
+    sal_uInt16 nSign, nCount;
+    sal_uInt32 nLen, nOff;
 
     Clear();
     // Read Master-Record
     r >> nSign >> nLen >> nCount;
-    ULONG nLast = r.Tell() + nLen;
-    UINT32 nCharSet;               // System charset
-    UINT32 lDimBase;
-    UINT16 nReserved1;
-    UINT32 nReserved2;
-    UINT32 nReserved3;
-    BOOL bBadVer = FALSE;
+    sal_uIntPtr nLast = r.Tell() + nLen;
+    sal_uInt32 nCharSet;               // System charset
+    sal_uInt32 lDimBase;
+    sal_uInt16 nReserved1;
+    sal_uInt32 nReserved2;
+    sal_uInt32 nReserved3;
+    sal_Bool bBadVer = sal_False;
     if( nSign == B_MODULE )
     {
         r >> nVersion >> nCharSet >> lDimBase
           >> nFlags >> nReserved1 >> nReserved2 >> nReserved3;
         eCharSet = (CharSet) nCharSet;
         eCharSet = GetSOLoadTextEncoding( eCharSet );
-        bBadVer  = BOOL( nVersion > B_CURVERSION );
-        nDimBase = (USHORT) lDimBase;
+        bBadVer  = sal_Bool( nVersion > B_CURVERSION );
+        nDimBase = (sal_uInt16) lDimBase;
     }
 
     bool bLegacy = ( nVersion < B_EXT_IMG_VERSION );
 
-    ULONG nNext;
+    sal_uIntPtr nNext;
     while( ( nNext = r.Tell() ) < nLast )
     {
         short i;
@@ -174,7 +174,7 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
 #ifdef EXTENDED_BINARY_MODULES
             case B_EXTSOURCE:
             {
-                for( UINT16 j = 0 ; j < nCount ; j++ )
+                for( sal_uInt16 j = 0 ; j < nCount ; j++ )
                 {
                     String aTmp;
                     r.ReadByteString( aTmp, eCharSet );
@@ -191,10 +191,10 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
                 if ( bLegacy )
                 {
                     ReleaseLegacyBuffer(); // release any previously held buffer
-                    nLegacyCodeSize = (UINT16) nCodeSize;
+                    nLegacyCodeSize = (sal_uInt16) nCodeSize;
                     pLegacyPCode = pCode;
 
-                    PCodeBuffConvertor< UINT16, UINT32 > aLegacyToNew( (BYTE*)pLegacyPCode, nLegacyCodeSize );
+                    PCodeBuffConvertor< sal_uInt16, sal_uInt32 > aLegacyToNew( (sal_uInt8*)pLegacyPCode, nLegacyCodeSize );
                     aLegacyToNew.convert();
                     pCode = (char*)aLegacyToNew.GetBuffer();
                     nCodeSize = aLegacyToNew.GetSize();
@@ -219,20 +219,20 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
                 for( i = 0; i < nStrings && SbiGood( r ); i++ )
                 {
                     r >> nOff;
-                    pStringOff[ i ] = (USHORT) nOff;
+                    pStringOff[ i ] = (sal_uInt16) nOff;
                 }
                 r >> nLen;
                 if( SbiGood( r ) )
                 {
                     delete [] pStrings;
                     pStrings = new sal_Unicode[ nLen ];
-                    nStringSize = (USHORT) nLen;
+                    nStringSize = (sal_uInt16) nLen;
 
                     char* pByteStrings = new char[ nLen ];
                     r.Read( pByteStrings, nStringSize );
                     for( short j = 0; j < nStrings; j++ )
                     {
-                        USHORT nOff2 = (USHORT) pStringOff[ j ];
+                        sal_uInt16 nOff2 = (sal_uInt16) pStringOff[ j ];
                         String aStr( pByteStrings + nOff2, eCharSet );
                         memcpy( pStrings + nOff2, aStr.GetBuffer(), (aStr.Len() + 1) * sizeof( sal_Unicode ) );
                     }
@@ -252,11 +252,11 @@ done:
     //if( eCharSet != ::GetSystemCharSet() )
         //ConvertStrings();
     if( !SbiGood( r ) )
-        bError = TRUE;
-    return BOOL( !bError );
+        bError = sal_True;
+    return sal_Bool( !bError );
 }
 
-BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
+sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
 {
     bool bLegacy = ( nVer < B_EXT_IMG_VERSION );
 
@@ -267,23 +267,23 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
         SbiImage aEmptyImg;
         aEmptyImg.aName = aName;
         aEmptyImg.Save( r, B_LEGACYVERSION );
-        return TRUE;
+        return sal_True;
     }
     // First of all the header
-    ULONG nStart = SbiOpenRecord( r, B_MODULE, 1 );
-    ULONG nPos;
+    sal_uIntPtr nStart = SbiOpenRecord( r, B_MODULE, 1 );
+    sal_uIntPtr nPos;
 
     eCharSet = GetSOStoreTextEncoding( eCharSet );
     if ( bLegacy )
-        r << (INT32) B_LEGACYVERSION;
+        r << (sal_Int32) B_LEGACYVERSION;
     else
-        r << (INT32) B_CURVERSION;
-    r  << (INT32) eCharSet
-      << (INT32) nDimBase
-      << (INT16) nFlags
-      << (INT16) 0
-      << (INT32) 0
-      << (INT32) 0;
+        r << (sal_Int32) B_CURVERSION;
+    r  << (sal_Int32) eCharSet
+      << (sal_Int32) nDimBase
+      << (sal_Int16) nFlags
+      << (sal_Int16) 0
+      << (sal_Int32) 0
+      << (sal_Int32) 0;
 
     // Name?
     if( aName.Len() && SbiGood( r ) )
@@ -320,9 +320,9 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
         if( nLen > STRING_MAXLEN )
         {
             sal_Int32 nRemainingLen = nLen - nMaxUnitSize;
-            UINT16 nUnitCount = UINT16( (nRemainingLen + nMaxUnitSize - 1) / nMaxUnitSize );
+            sal_uInt16 nUnitCount = sal_uInt16( (nRemainingLen + nMaxUnitSize - 1) / nMaxUnitSize );
             nPos = SbiOpenRecord( r, B_EXTSOURCE, nUnitCount );
-            for( UINT16 i = 0 ; i < nUnitCount ; i++ )
+            for( sal_uInt16 i = 0 ; i < nUnitCount ; i++ )
             {
                 sal_Int32 nCopyLen =
                     (nRemainingLen > nMaxUnitSize) ? nMaxUnitSize : nRemainingLen;
@@ -341,7 +341,7 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
         if ( bLegacy )
         {
             ReleaseLegacyBuffer(); // release any previously held buffer
-            PCodeBuffConvertor< UINT32, UINT16 > aNewToLegacy( (BYTE*)pCode, nCodeSize );
+            PCodeBuffConvertor< sal_uInt32, sal_uInt16 > aNewToLegacy( (sal_uInt8*)pCode, nCodeSize );
             aNewToLegacy.convert();
             pLegacyPCode = (char*)aNewToLegacy.GetBuffer();
             nLegacyCodeSize = aNewToLegacy.GetSize();
@@ -356,21 +356,21 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
     {
         nPos = SbiOpenRecord( r, B_STRINGPOOL, nStrings );
         // For every String:
-        //  UINT32 Offset of the Strings in the Stringblock
+        //  sal_uInt32 Offset of the Strings in the Stringblock
         short i;
 
         for( i = 0; i < nStrings && SbiGood( r ); i++ )
-            r << (UINT32) pStringOff[ i ];
+            r << (sal_uInt32) pStringOff[ i ];
 
         // Then the String-Block
         char* pByteStrings = new char[ nStringSize ];
         for( i = 0; i < nStrings; i++ )
         {
-            USHORT nOff = (USHORT) pStringOff[ i ];
+            sal_uInt16 nOff = (sal_uInt16) pStringOff[ i ];
             ByteString aStr( pStrings + nOff, eCharSet );
             memcpy( pByteStrings + nOff, aStr.GetBuffer(), (aStr.Len() + 1) * sizeof( char ) );
         }
-        r << (UINT32) nStringSize;
+        r << (sal_uInt32) nStringSize;
         r.Write( pByteStrings, nStringSize );
 
         delete[] pByteStrings;
@@ -379,8 +379,8 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
     // Set overall length
     SbiCloseRecord( r, nStart );
     if( !SbiGood( r ) )
-        bError = TRUE;
-    return BOOL( !bError );
+        bError = sal_True;
+    return sal_Bool( !bError );
 }
 
 /**************************************************************************
@@ -396,15 +396,15 @@ void SbiImage::MakeStrings( short nSize )
     nStringOff = 0;
     nStringSize = 1024;
     pStrings = new sal_Unicode[ nStringSize ];
-    pStringOff = new UINT32[ nSize ];
+    pStringOff = new sal_uInt32[ nSize ];
     if( pStrings && pStringOff )
     {
         nStrings = nSize;
-        memset( pStringOff, 0, nSize * sizeof( UINT32 ) );
+        memset( pStringOff, 0, nSize * sizeof( sal_uInt32 ) );
         memset( pStrings, 0, nStringSize * sizeof( sal_Unicode ) );
     }
     else
-        bError = TRUE;
+        bError = sal_True;
 }
 
 // Hinzufuegen eines Strings an den StringPool. Der String-Puffer
@@ -414,16 +414,16 @@ void SbiImage::MakeStrings( short nSize )
 void SbiImage::AddString( const String& r )
 {
     if( nStringIdx >= nStrings )
-        bError = TRUE;
+        bError = sal_True;
     if( !bError )
     {
         xub_StrLen  len = r.Len() + 1;
-        UINT32 needed = nStringOff + len;
+        sal_uInt32 needed = nStringOff + len;
         if( needed > 0xFFFFFF00L )
-            bError = TRUE;  // out of mem!
+            bError = sal_True;  // out of mem!
         else if( needed > nStringSize )
         {
-            UINT32 nNewLen = needed + 1024;
+            sal_uInt32 nNewLen = needed + 1024;
             nNewLen &= 0xFFFFFC00;  // trim to 1K border
             if( nNewLen > 0xFFFFFF00L )
                 nNewLen = 0xFFFFFF00L;
@@ -433,10 +433,10 @@ void SbiImage::AddString( const String& r )
                 memcpy( p, pStrings, nStringSize * sizeof( sal_Unicode ) );
                 delete[] pStrings;
                 pStrings = p;
-                nStringSize = sal::static_int_cast< UINT16 >(nNewLen);
+                nStringSize = sal::static_int_cast< sal_uInt16 >(nNewLen);
             }
             else
-                bError = TRUE;
+                bError = sal_True;
         }
         if( !bError )
         {
@@ -455,7 +455,7 @@ void SbiImage::AddString( const String& r )
 // The block was fetched by the compiler from class SbBuffer and
 // is already created with new. Additionally it contains all Integers
 // in Big Endian format, so can be directly read/written.
-void SbiImage::AddCode( char* p, UINT32 s )
+void SbiImage::AddCode( char* p, sal_uInt32 s )
 {
     pCode = p;
     nCodeSize = s;
@@ -489,14 +489,14 @@ String SbiImage::GetString( short nId ) const
 {
     if( nId && nId <= nStrings )
     {
-        UINT32 nOff = pStringOff[ nId - 1 ];
+        sal_uInt32 nOff = pStringOff[ nId - 1 ];
         sal_Unicode* pStr = pStrings + nOff;
 
         // #i42467: Special treatment for vbNullChar
         if( *pStr == 0 )
         {
-            UINT32 nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
-            UINT32 nLen = nNextOff - nOff - 1;
+            sal_uInt32 nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
+            sal_uInt32 nLen = nNextOff - nOff - 1;
             if( nLen == 1 )
             {
                 // Force length 1 and make char 0 afterwards
@@ -519,14 +519,14 @@ const SbxObject* SbiImage::FindType (String aTypeName) const
     return rTypes.Is() ? (SbxObject*)rTypes->Find(aTypeName,SbxCLASS_OBJECT) : NULL;
 }
 
-UINT16 SbiImage::CalcLegacyOffset( INT32 nOffset )
+sal_uInt16 SbiImage::CalcLegacyOffset( sal_Int32 nOffset )
 {
-    return SbiCodeGen::calcLegacyOffSet( (BYTE*)pCode, nOffset ) ;
+    return SbiCodeGen::calcLegacyOffSet( (sal_uInt8*)pCode, nOffset ) ;
 }
 
-UINT32 SbiImage::CalcNewOffset( INT16 nOffset )
+sal_uInt32 SbiImage::CalcNewOffset( sal_Int16 nOffset )
 {
-    return SbiCodeGen::calcNewOffSet( (BYTE*)pLegacyPCode, nOffset ) ;
+    return SbiCodeGen::calcNewOffSet( (sal_uInt8*)pLegacyPCode, nOffset ) ;
 }
 
 void  SbiImage::ReleaseLegacyBuffer()
@@ -536,9 +536,9 @@ void  SbiImage::ReleaseLegacyBuffer()
     nLegacyCodeSize = 0;
 }
 
-BOOL SbiImage::ExceedsLegacyLimits()
+sal_Bool SbiImage::ExceedsLegacyLimits()
 {
     if ( ( nStringSize > 0xFF00L ) || ( CalcLegacyOffset( nCodeSize ) > 0xFF00L ) )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 8c7fa0b273b2..9168ef915770 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -93,7 +93,7 @@ SbPropertyValues::~SbPropertyValues()
 {
     _xInfo = Reference< XPropertySetInfo >();
 
-    for ( USHORT n = 0; n < _aPropVals.Count(); ++n )
+    for ( sal_uInt16 n = 0; n < _aPropVals.Count(); ++n )
         delete _aPropVals.GetObject( n );
 }
 
@@ -112,7 +112,7 @@ Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw(
 
 //-------------------------------------------------------------------------
 
-INT32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
+sal_Int32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
 {
     PropertyValue **ppPV;
     ppPV = (PropertyValue **)
@@ -133,9 +133,9 @@ void SbPropertyValues::setPropertyValue(
                     ::com::sun::star::lang::WrappedTargetException,
                     ::com::sun::star::uno::RuntimeException)
 {
-    INT32 nIndex = GetIndex_Impl( aPropertyName );
+    sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
     PropertyValue *pPropVal = _aPropVals.GetObject(
-        sal::static_int_cast< USHORT >(nIndex));
+        sal::static_int_cast< sal_uInt16 >(nIndex));
     pPropVal->Value = aValue;
 }
 
@@ -147,10 +147,10 @@ Any SbPropertyValues::getPropertyValue(
                     ::com::sun::star::lang::WrappedTargetException,
                     ::com::sun::star::uno::RuntimeException)
 {
-    INT32 nIndex = GetIndex_Impl( aPropertyName );
+    sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
     if ( nIndex != USHRT_MAX )
         return _aPropVals.GetObject(
-            sal::static_int_cast< USHORT >(nIndex))->Value;
+            sal::static_int_cast< sal_uInt16 >(nIndex))->Value;
     return Any();
 }
 
@@ -199,7 +199,7 @@ void SbPropertyValues::removeVetoableChangeListener(
 Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException)
 {
     Sequence<PropertyValue> aRet( _aPropVals.Count());
-    for ( USHORT n = 0; n < _aPropVals.Count(); ++n )
+    for ( sal_uInt16 n = 0; n < _aPropVals.Count(); ++n )
         aRet.getArray()[n] = *_aPropVals.GetObject(n);
     return aRet;
 }
@@ -231,14 +231,14 @@ PropertySetInfoImpl::PropertySetInfoImpl()
 {
 }
 
-INT32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
+sal_Int32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
 {
     Property *pP;
     pP = (Property*)
             bsearch( &rPropName, _aProps.getConstArray(), _aProps.getLength(),
                       sizeof( Property ),
                       SbCompare_UString_Property_Impl );
-    return pP ? sal::static_int_cast<INT32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1;
+    return pP ? sal::static_int_cast<sal_Int32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1;
 }
 
 Sequence< Property > PropertySetInfoImpl::getProperties(void) throw()
@@ -272,7 +272,7 @@ SbPropertySetInfo::SbPropertySetInfo()
 SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
 {
     aImpl._aProps.realloc( rPropVals.Count() );
-    for ( USHORT n = 0; n < rPropVals.Count(); ++n )
+    for ( sal_uInt16 n = 0; n < rPropVals.Count(); ++n )
     {
         Property &rProp = aImpl._aProps.getArray()[n];
         const PropertyValue &rPropVal = *rPropVals.GetObject(n);
@@ -302,7 +302,7 @@ Property SbPropertySetInfo::getPropertyByName(const ::rtl::OUString& Name)
     return aImpl.getPropertyByName( Name );
 }
 
-BOOL SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
     throw( RuntimeException )
 {
     return aImpl.hasPropertyByName( Name );
@@ -323,7 +323,7 @@ SbPropertyContainer::~SbPropertyContainer()
 
 //----------------------------------------------------------------------------
 void SbPropertyContainer::addProperty(const ::rtl::OUString& Name,
-                                      INT16 Attributes,
+                                      sal_Int16 Attributes,
                                       const Any& DefaultValue)
     throw(  PropertyExistException, IllegalTypeException,
             IllegalArgumentException, RuntimeException )
@@ -353,7 +353,7 @@ Property SbPropertyContainer::getPropertyByName(const ::rtl::OUString& Name)
     return aImpl.getPropertyByName( Name );
 }
 
-BOOL SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
     throw( RuntimeException )
 {
     return aImpl.hasPropertyByName( Name );
@@ -375,7 +375,7 @@ void SbPropertyContainer::setPropertyValues(const Sequence< PropertyValue >& Pro
 
 //----------------------------------------------------------------------------
 
-void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 30e01892fab9..e2f53dd8ed8e 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -119,7 +119,7 @@ SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t )
 // Create array for conversion SFX <-> VB error code
 struct SFX_VB_ErrorItem
 {
-    USHORT  nErrorVB;
+    sal_uInt16  nErrorVB;
     SbError nErrorSFX;
 };
 
@@ -255,7 +255,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[] =
 // the Modul-relationshop. But it works only when a modul is loaded.
 // Can cause troubles with separately loaded properties!
 
-SbxBase* SbiFactory::Create( UINT16 nSbxId, UINT32 nCreator )
+SbxBase* SbiFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
 {
     if( nCreator ==  SBXCR_SBX )
     {
@@ -304,11 +304,11 @@ SbxObject* SbiFactory::CreateObject( const String& rClass )
 class SbOLEFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
-SbxBase* SbOLEFactory::Create( UINT16, UINT32 )
+SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Not supported
     return NULL;
@@ -329,11 +329,11 @@ SbxObject* SbOLEFactory::CreateObject( const String& rClassName )
 class SbFormFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
-SbxBase* SbFormFactory::Create( UINT16, UINT32 )
+SbxBase* SbFormFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Not supported
     return NULL;
@@ -377,8 +377,8 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
 
     // Copy the properties, not only the reference to them
     SbxArray* pProps = pRet->GetProperties();
-    UINT32 nCount = pProps->Count32();
-    for( UINT32 i = 0 ; i < nCount ; i++ )
+    sal_uInt32 nCount = pProps->Count32();
+    for( sal_uInt32 i = 0 ; i < nCount ; i++ )
     {
         SbxVariable* pVar = pProps->Get32( i );
         SbxProperty* pProp = PTR_CAST( SbxProperty, pVar );
@@ -391,22 +391,22 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
                 SbxBase* pParObj = pVar->GetObject();
                 SbxDimArray* pSource = PTR_CAST(SbxDimArray,pParObj);
                 SbxDimArray* pDest = new SbxDimArray( pVar->GetType() );
-                INT32 lb = 0;
-                INT32 ub = 0;
+                sal_Int32 lb = 0;
+                sal_Int32 ub = 0;
 
                 pDest->setHasFixedSize( pSource->hasFixedSize() );
                 if ( pSource->GetDims() && pSource->hasFixedSize() )
                 {
-                    for ( INT32 j = 1 ; j <= pSource->GetDims(); ++j )
+                    for ( sal_Int32 j = 1 ; j <= pSource->GetDims(); ++j )
                     {
-                        pSource->GetDim32( (INT32)j, lb, ub );
+                        pSource->GetDim32( (sal_Int32)j, lb, ub );
                         pDest->AddDim32( lb, ub );
                     }
                 }
                 else
                     pDest->unoAddDim( 0, -1 ); // variant array
 
-                USHORT nSavFlags = pVar->GetFlags();
+                sal_uInt16 nSavFlags = pVar->GetFlags();
                 pNewProp->ResetFlag( SBX_FIXED );
                 // need to reset the FIXED flag
                 // when calling PutObject ( because the type will not match Object )
@@ -432,11 +432,11 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
 class SbTypeFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
-SbxBase* SbTypeFactory::Create( UINT16, UINT32 )
+SbxBase* SbTypeFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Not supported
     return NULL;
@@ -480,8 +480,8 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
 
     // Copy the methods from original class module
     SbxArray* pClassMethods = pClassModule->GetMethods();
-    UINT32 nMethodCount = pClassMethods->Count32();
-    UINT32 i;
+    sal_uInt32 nMethodCount = pClassMethods->Count32();
+    sal_uInt32 i;
     for( i = 0 ; i < nMethodCount ; i++ )
     {
         SbxVariable* pVar = pClassMethods->Get32( i );
@@ -493,7 +493,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
             SbMethod* pMethod = PTR_CAST(SbMethod, pVar );
             if( pMethod )
             {
-                USHORT nFlags_ = pMethod->GetFlags();
+                sal_uInt16 nFlags_ = pMethod->GetFlags();
                 pMethod->SetFlag( SBX_NO_BROADCAST );
                 SbMethod* pNewMethod = new SbMethod( *pMethod );
                 pNewMethod->ResetFlag( SBX_NO_BROADCAST );
@@ -501,7 +501,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
                 pNewMethod->pMod = this;
                 pNewMethod->SetParent( this );
                 pMethods->PutDirect( pNewMethod, i );
-                StartListening( pNewMethod->GetBroadcaster(), TRUE );
+                StartListening( pNewMethod->GetBroadcaster(), sal_True );
             }
         }
     }
@@ -539,14 +539,14 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
 
     // Copy the properties from original class module
     SbxArray* pClassProps = pClassModule->GetProperties();
-    UINT32 nPropertyCount = pClassProps->Count32();
+    sal_uInt32 nPropertyCount = pClassProps->Count32();
     for( i = 0 ; i < nPropertyCount ; i++ )
     {
         SbxVariable* pVar = pClassProps->Get32( i );
         SbProcedureProperty* pProcedureProp = PTR_CAST( SbProcedureProperty, pVar );
         if( pProcedureProp )
         {
-            USHORT nFlags_ = pProcedureProp->GetFlags();
+            sal_uInt16 nFlags_ = pProcedureProp->GetFlags();
             pProcedureProp->SetFlag( SBX_NO_BROADCAST );
             SbProcedureProperty* pNewProp = new SbProcedureProperty
                 ( pProcedureProp->GetName(), pProcedureProp->GetType() );
@@ -555,14 +555,14 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
             pNewProp->ResetFlag( SBX_NO_BROADCAST ); // except the Broadcast if it was set
             pProcedureProp->SetFlags( nFlags_ );
             pProps->PutDirect( pNewProp, i );
-            StartListening( pNewProp->GetBroadcaster(), TRUE );
+            StartListening( pNewProp->GetBroadcaster(), sal_True );
         }
         else
         {
             SbxProperty* pProp = PTR_CAST( SbxProperty, pVar );
             if( pProp )
             {
-                USHORT nFlags_ = pProp->GetFlags();
+                sal_uInt16 nFlags_ = pProp->GetFlags();
                 pProp->SetFlag( SBX_NO_BROADCAST );
                 SbxProperty* pNewProp = new SbxProperty( *pProp );
 
@@ -709,7 +709,7 @@ void SbClassFactory::RemoveClassModule( SbModule* pClassModule )
     xClassModules->Remove( pClassModule );
 }
 
-SbxBase* SbClassFactory::Create( UINT16, UINT32 )
+SbxBase* SbClassFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Not supported
     return NULL;
@@ -737,13 +737,13 @@ SbModule* SbClassFactory::FindClass( const String& rClassName )
 typedef std::vector< StarBASIC* > DocBasicVector;
 static DocBasicVector GaDocBasics;
 
-StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
+StarBASIC::StarBASIC( StarBASIC* p, sal_Bool bIsDocBasic  )
     : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASIC") ) ), bDocBasic( bIsDocBasic )
 {
     SetParent( p );
     pLibInfo = NULL;
-    bNoRtl = bBreak = FALSE;
-    bVBAEnabled = FALSE;
+    bNoRtl = bBreak = sal_False;
+    bVBAEnabled = sal_False;
     pModules = new SbxArray;
 
     if( !GetSbData()->nInst++ )
@@ -765,7 +765,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
     // Search via StarBasic is always global
     SetFlag( SBX_GBLSEARCH );
     pVBAGlobals = NULL;
-    bQuit = FALSE;
+    bQuit = sal_False;
 
     if( bDocBasic )
         GaDocBasics.push_back( this );
@@ -773,7 +773,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
 
 // #51727 Override SetModified so that the modified state
 // is not given to the parent
-void StarBASIC::SetModified( BOOL b )
+void StarBASIC::SetModified( sal_Bool b )
 {
     SbxBase::SetModified( b );
 }
@@ -835,8 +835,8 @@ StarBASIC::~StarBASIC()
     // #100326 Set Parent NULL in registered listeners
     if( xUnoListeners.Is() )
     {
-        USHORT uCount = xUnoListeners->Count();
-        for( USHORT i = 0 ; i < uCount ; i++ )
+        sal_uInt16 uCount = xUnoListeners->Count();
+        for( sal_uInt16 i = 0 ; i < uCount ; i++ )
         {
             SbxVariable* pListenerObj = xUnoListeners->Get( i );
             pListenerObj->SetParent( NULL );
@@ -853,7 +853,7 @@ void* StarBASIC::operator new( size_t n )
 {
     if( n < sizeof( StarBASIC ) )
     {
-//      DBG_ASSERT( FALSE, "Warnung: inkompatibler BASIC-Stand!" );
+//      DBG_ASSERT( sal_False, "Warnung: inkompatibler BASIC-Stand!" );
         n = sizeof( StarBASIC );
     }
     return ::operator new( n );
@@ -868,14 +868,14 @@ void StarBASIC::implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic )
 {
     if( this != pDeletedBasic )
     {
-        for( USHORT i = 0; i < pModules->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
         {
             SbModule* p = (SbModule*)pModules->Get( i );
             p->ClearVarsDependingOnDeletedBasic( pDeletedBasic );
         }
     }
 
-    for( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+    for( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
     {
         SbxVariable* pVar = pObjs->Get( nObj );
         StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -929,7 +929,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo,
     p->SetSource32( rSrc );
     p->SetParent( this );
     pModules->Insert( p, pModules->Count() );
-    SetModified( TRUE );
+    SetModified( sal_True );
     return p;
 }
 
@@ -939,14 +939,14 @@ void StarBASIC::Insert( SbxVariable* pVar )
     {
         pModules->Insert( pVar, pModules->Count() );
         pVar->SetParent( this );
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
     }
     else
     {
-        BOOL bWasModified = IsModified();
+        sal_Bool bWasModified = IsModified();
         SbxObject::Insert( pVar );
         if( !bWasModified && pVar->IsSet( SBX_DONTSTORE ) )
-            SetModified( FALSE );
+            SetModified( sal_False );
     }
 }
 
@@ -964,17 +964,17 @@ void StarBASIC::Remove( SbxVariable* pVar )
         SbxObject::Remove( pVar );
 }
 
-BOOL StarBASIC::Compile( SbModule* pMod )
+sal_Bool StarBASIC::Compile( SbModule* pMod )
 {
-    return pMod ? pMod->Compile() : FALSE;
+    return pMod ? pMod->Compile() : sal_False;
 }
 
-BOOL StarBASIC::Disassemble( SbModule* pMod, String& rText )
+sal_Bool StarBASIC::Disassemble( SbModule* pMod, String& rText )
 {
     rText.Erase();
     if( pMod )
         pMod->Disassemble( rText );
-    return BOOL( rText.Len() != 0 );
+    return sal_Bool( rText.Len() != 0 );
 }
 
 void StarBASIC::Clear()
@@ -985,7 +985,7 @@ void StarBASIC::Clear()
 
 SbModule* StarBASIC::FindModule( const String& rName )
 {
-    for( USHORT i = 0; i < pModules->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
     {
         SbModule* p = (SbModule*) pModules->Get( i );
         if( p->GetName().EqualsIgnoreCaseAscii( rName ) )
@@ -1066,7 +1066,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
     ::vos::OGuard guard( Application::GetSolarMutex() );
 
     // Init own modules
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         if( !pModule->IsCompiled() )
@@ -1079,7 +1079,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
     // Consider required types to init in right order. Class modules
     // that are required by other modules have to be initialized first.
     ModuleInitDependencyMap aMIDMap;
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         String aModuleName = pModule->GetName();
@@ -1095,7 +1095,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
     }
 
     // Call RunInit on standard modules
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         if( !pModule->isProxyModule() )
@@ -1104,7 +1104,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
 
     // Check all objects if they are BASIC,
     // if yes initialize
-    for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+    for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
     {
         SbxVariable* pVar = pObjs->Get( nObj );
         StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1118,14 +1118,14 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
 void StarBASIC::DeInitAllModules( void )
 {
     // Deinit own modules
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         if( pModule->pImage && !pModule->isProxyModule() && !pModule->ISA(SbObjModule) )
             pModule->pImage->bInit = false;
     }
 
-    for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+    for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
     {
         SbxVariable* pVar = pObjs->Get( nObj );
         StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1138,13 +1138,13 @@ void StarBASIC::DeInitAllModules( void )
 void StarBASIC::ClearGlobalVars( void )
 {
     SbxArrayRef xProps( GetProperties() );
-    USHORT nPropCount = xProps->Count();
-    for ( USHORT nProp = 0 ; nProp < nPropCount ; ++nProp )
+    sal_uInt16 nPropCount = xProps->Count();
+    for ( sal_uInt16 nProp = 0 ; nProp < nPropCount ; ++nProp )
     {
         SbxBase* pVar = xProps->Get( nProp );
         pVar->Clear();
     }
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 // This implementation at first searches within the runtime library,
@@ -1175,7 +1175,7 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
     }
     // Search module
     if( !pRes )
-      for( USHORT i = 0; i < pModules->Count(); i++ )
+      for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
     {
         SbModule* p = (SbModule*) pModules->Get( i );
         if( p->IsVisible() )
@@ -1192,13 +1192,13 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
             }
             // Only variables qualified by the Module Name e.g. Sheet1.foo
             // should work for Documant && Class type Modules
-            INT32 nType = p->GetModuleType();
+            sal_Int32 nType = p->GetModuleType();
             if ( nType == ModuleType::DOCUMENT || nType == ModuleType::FORM )
                 continue;
 
             // otherwise check if the element is available
             // unset GBLSEARCH-Flag (due to Rekursion)
-            USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
+            sal_uInt16 nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
             p->ResetFlag( SBX_GBLSEARCH );
             pRes = p->Find( rName, t );
             p->SetFlag( nGblFlag );
@@ -1214,9 +1214,9 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
     return pRes;
 }
 
-BOOL StarBASIC::Call( const String& rName, SbxArray* pParam )
+sal_Bool StarBASIC::Call( const String& rName, SbxArray* pParam )
 {
-    BOOL bRes = SbxObject::Call( rName, pParam );
+    sal_Bool bRes = SbxObject::Call( rName, pParam );
     if( !bRes )
     {
         SbxError eErr = SbxBase::GetError();
@@ -1239,7 +1239,7 @@ SbxBase* StarBASIC::FindSBXInCurrentScope( const String& rName )
 
 // Preserve old interface
 SbxVariable* StarBASIC::FindVarInCurrentScopy
-( const String& rName, USHORT& rStatus )
+( const String& rName, sal_uInt16& rStatus )
 {
     rStatus = 1;              // Presumption: nothing found
     SbxVariable* pVar = NULL;
@@ -1257,7 +1257,7 @@ SbxVariable* StarBASIC::FindVarInCurrentScopy
 void StarBASIC::QuitAndExitApplication()
 {
     Stop();
-    bQuit = TRUE;
+    bQuit = sal_True;
 }
 
 void StarBASIC::Stop()
@@ -1270,9 +1270,9 @@ void StarBASIC::Stop()
     }
 }
 
-BOOL StarBASIC::IsRunning()
+sal_Bool StarBASIC::IsRunning()
 {
-    return BOOL( pINST != NULL );
+    return sal_Bool( pINST != NULL );
 }
 
 /**************************************************************************
@@ -1283,7 +1283,7 @@ BOOL StarBASIC::IsRunning()
 
 // Activation of an object. There is no need to access active objects
 // with name via BASIC. If NULL is given, everything is activated.
-void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
+void StarBASIC::ActivateObject( const String* pName, sal_Bool bActivate )
 {
     if( pName )
     {
@@ -1298,7 +1298,7 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
     }
     else
     {
-        for( USHORT i = 0; i < GetObjects()->Count(); i++ )
+        for( sal_uInt16 i = 0; i < GetObjects()->Count(); i++ )
         {
             SbxObject* p = (SbxObject*) GetObjects()->Get( i );
             if( bActivate )
@@ -1315,7 +1315,7 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
 *
 **************************************************************************/
 
-SbMethod* StarBASIC::GetActiveMethod( USHORT nLevel )
+SbMethod* StarBASIC::GetActiveMethod( sal_uInt16 nLevel )
 {
     if( pINST )
         return pINST->GetCaller( nLevel );
@@ -1331,41 +1331,41 @@ SbModule* StarBASIC::GetActiveModule()
         return pCMOD;
 }
 
-USHORT StarBASIC::BreakPoint( USHORT l, USHORT c1, USHORT c2 )
+sal_uInt16 StarBASIC::BreakPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     SetErrorData( 0, l, c1, c2 );
-    bBreak = TRUE;
+    bBreak = sal_True;
     if( GetSbData()->aBreakHdl.IsSet() )
-        return (USHORT) GetSbData()->aBreakHdl.Call( this );
+        return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
     else
         return BreakHdl();
 }
 
-USHORT StarBASIC::StepPoint( USHORT l, USHORT c1, USHORT c2 )
+sal_uInt16 StarBASIC::StepPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     SetErrorData( 0, l, c1, c2 );
-    bBreak = FALSE;
+    bBreak = sal_False;
     if( GetSbData()->aBreakHdl.IsSet() )
-        return (USHORT) GetSbData()->aBreakHdl.Call( this );
+        return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
     else
         return BreakHdl();
 }
 
-USHORT __EXPORT StarBASIC::BreakHdl()
+sal_uInt16 __EXPORT StarBASIC::BreakHdl()
 {
-    return (USHORT) ( aBreakHdl.IsSet()
+    return (sal_uInt16) ( aBreakHdl.IsSet()
         ? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE );
 }
 
 // Calls for error handler and break handler
-USHORT StarBASIC::GetLine()     { return GetSbData()->nLine; }
-USHORT StarBASIC::GetCol1()     { return GetSbData()->nCol1; }
-USHORT StarBASIC::GetCol2()     { return GetSbData()->nCol2; }
+sal_uInt16 StarBASIC::GetLine()     { return GetSbData()->nLine; }
+sal_uInt16 StarBASIC::GetCol1()     { return GetSbData()->nCol1; }
+sal_uInt16 StarBASIC::GetCol2()     { return GetSbData()->nCol2; }
 
 // Specific to error handler
 SbError StarBASIC::GetErrorCode()       { return GetSbData()->nCode; }
 const String& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
-BOOL StarBASIC::IsCompilerError()       { return GetSbData()->bCompiler; }
+sal_Bool StarBASIC::IsCompilerError()       { return GetSbData()->bCompiler; }
 void StarBASIC::SetGlobalLanguageMode( SbLanguageMode eLanguageMode )
 {
     GetSbData()->eLanguageMode = eLanguageMode;
@@ -1392,9 +1392,9 @@ SbLanguageMode StarBASIC::GetLanguageMode()
 // binaere Suche bei VB-Error -> SFX-Error.
 
 // Neue Fehler-Codes auf alte, Sbx-Kompatible zurueckmappen
-USHORT StarBASIC::GetVBErrorCode( SbError nError )
+sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
 {
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
 
     if( SbiRuntime::isVBAEnabled() )
     {
@@ -1419,7 +1419,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
 
     // Suchschleife
     const SFX_VB_ErrorItem* pErrItem;
-    USHORT nIndex = 0;
+    sal_uInt16 nIndex = 0;
     do
     {
         pErrItem = SFX_VB_ErrorTab + nIndex;
@@ -1434,7 +1434,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
     return nRet;
 }
 
-SbError StarBASIC::GetSfxFromVBError( USHORT nError )
+SbError StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
 {
     SbError nRet = 0L;
 
@@ -1466,7 +1466,7 @@ SbError StarBASIC::GetSfxFromVBError( USHORT nError )
         }
     }
     const SFX_VB_ErrorItem* pErrItem;
-    USHORT nIndex = 0;
+    sal_uInt16 nIndex = 0;
     do
     {
         pErrItem = SFX_VB_ErrorTab + nIndex;
@@ -1486,7 +1486,7 @@ SbError StarBASIC::GetSfxFromVBError( USHORT nError )
 
 // Error- / Break-Daten setzen
 void StarBASIC::SetErrorData
-( SbError nCode, USHORT nLine, USHORT nCol1, USHORT nCol2 )
+( SbError nCode, sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 )
 {
     SbiGlobals& aGlobals = *GetSbData();
     aGlobals.nCode = nCode;
@@ -1502,26 +1502,26 @@ struct BasicStringList_Impl : private Resource
 {
     ResId aResId;
 
-    BasicStringList_Impl( ResId& rErrIdP,  USHORT nId)
+    BasicStringList_Impl( ResId& rErrIdP,  sal_uInt16 nId)
         : Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr() ){}
     ~BasicStringList_Impl() { FreeResource(); }
 
     String GetString(){ return String( aResId ); }
-    BOOL IsErrorTextAvailable( void )
+    sal_Bool IsErrorTextAvailable( void )
         { return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
 };
 //----------------------------------------------------------------
 
 // #60175 Flag, das bei Basic-Fehlern das Anziehen der SFX-Resourcen verhindert
-static BOOL bStaticSuppressSfxResource = FALSE;
+static sal_Bool bStaticSuppressSfxResource = sal_False;
 
-void StarBASIC::StaticSuppressSfxResource( BOOL bSuppress )
+void StarBASIC::StaticSuppressSfxResource( sal_Bool bSuppress )
 {
     bStaticSuppressSfxResource = bSuppress;
 }
 
 // Hack for #83750, use bStaticSuppressSfxResource as setup flag
-BOOL runsInSetup( void )
+sal_Bool runsInSetup( void )
 {
     return bStaticSuppressSfxResource;
 }
@@ -1537,11 +1537,11 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
         return;
     }
 
-    USHORT nOldID = GetVBErrorCode( nId );
+    sal_uInt16 nOldID = GetVBErrorCode( nId );
 
     // Hilfsklasse instanzieren
     BasResId aId( RID_BASIC_START );
-    BasicStringList_Impl aMyStringList( aId, USHORT(nId & ERRCODE_RES_MASK) );
+    BasicStringList_Impl aMyStringList( aId, sal_uInt16(nId & ERRCODE_RES_MASK) );
 
     if( aMyStringList.IsErrorTextAvailable() )
     {
@@ -1549,7 +1549,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
         String aMsg1 = aMyStringList.GetString();
         // Argument-Platzhalter durch %s ersetzen
         String aSrgStr( RTL_CONSTASCII_USTRINGPARAM("$(ARG1)") );
-        USHORT nResult = aMsg1.Search( aSrgStr );
+        sal_uInt16 nResult = aMsg1.Search( aSrgStr );
 
         if( nResult != STRING_NOTFOUND )
         {
@@ -1570,8 +1570,8 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
 
 }
 
-BOOL StarBASIC::CError
-    ( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::CError
+    ( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     vos::OGuard aSolarGuard( Application::GetSolarMutex() );
 
@@ -1581,39 +1581,39 @@ BOOL StarBASIC::CError
         // #109018 Check if running Basic is affected
         StarBASIC* pStartedBasic = pINST->GetBasic();
         if( pStartedBasic != this )
-            return FALSE;
+            return sal_False;
 
         Stop();
     }
 
     // Flag setzen, damit GlobalRunInit den Fehler mitbekommt
-    GetSbData()->bGlobalInitErr = TRUE;
+    GetSbData()->bGlobalInitErr = sal_True;
 
     // Fehlertext basteln
     MakeErrorText( code, rMsg );
 
     // Umsetzung des Codes fuer String-Transport in SFX-Error
     if( rMsg.Len() )
-        code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+        code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
 
     SetErrorData( code, l, c1, c2 );
-    GetSbData()->bCompiler = TRUE;
-    BOOL bRet;
+    GetSbData()->bCompiler = sal_True;
+    sal_Bool bRet;
     if( GetSbData()->aErrHdl.IsSet() )
-        bRet = (BOOL) GetSbData()->aErrHdl.Call( this );
+        bRet = (sal_Bool) GetSbData()->aErrHdl.Call( this );
     else
         bRet = ErrorHdl();
-    GetSbData()->bCompiler = FALSE;     // nur TRUE fuer Error-Handler
+    GetSbData()->bCompiler = sal_False;     // nur sal_True fuer Error-Handler
     return bRet;
 }
 
-BOOL StarBASIC::RTError
-    ( SbError code, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::RTError
+    ( SbError code, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     return RTError( code, String(), l, c1, c2 );
 }
 
-BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::RTError( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     vos::OGuard aSolarGuard( Application::GetSolarMutex() );
 
@@ -1635,15 +1635,15 @@ BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1,
             aTmp += String::CreateFromInt32( SbxErrObject::getUnoErrObject()->getNumber() );
             aTmp += String( RTL_CONSTASCII_USTRINGPARAM("\'\n") );
             aTmp +=  GetSbData()->aErrMsg.Len() ? GetSbData()->aErrMsg : rMsg;
-            code = (ULONG)*new StringErrorInfo( code, aTmp );
+            code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
         }
         else
-            code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+            code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
     }
 
     SetErrorData( code, l, c1, c2 );
     if( GetSbData()->aErrHdl.IsSet() )
-        return (BOOL) GetSbData()->aErrHdl.Call( this );
+        return (sal_Bool) GetSbData()->aErrHdl.Call( this );
     else
         return ErrorHdl();
 }
@@ -1688,7 +1688,7 @@ String StarBASIC::GetErrorMsg()
         return String();
 }
 
-USHORT StarBASIC::GetErl()
+sal_uInt16 StarBASIC::GetErl()
 {
     if( pINST )
         return pINST->GetErl();
@@ -1696,10 +1696,10 @@ USHORT StarBASIC::GetErl()
         return 0;
 }
 
-BOOL __EXPORT StarBASIC::ErrorHdl()
+sal_Bool __EXPORT StarBASIC::ErrorHdl()
 {
-    return (BOOL) ( aErrorHdl.IsSet()
-        ? aErrorHdl.Call( this ) : FALSE );
+    return (sal_Bool) ( aErrorHdl.IsSet()
+        ? aErrorHdl.Call( this ) : sal_False );
 }
 
 Link StarBASIC::GetGlobalErrorHdl()
@@ -1737,16 +1737,16 @@ SbxArrayRef StarBASIC::getUnoListeners( void )
 *
 **************************************************************************/
 
-BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
+sal_Bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer )
 {
     if( !SbxObject::LoadData( r, nVer ) )
-        return FALSE;
+        return sal_False;
 
     // #95459 Delete dialogs, otherwise endless recursion
     // in SbxVarable::GetType() if dialogs are accessed
-    USHORT nObjCount = pObjs->Count();
+    sal_uInt16 nObjCount = pObjs->Count();
     SbxVariable** ppDeleteTab = new SbxVariable*[ nObjCount ];
-    USHORT nObj;
+    sal_uInt16 nObj;
 
     for( nObj = 0 ; nObj < nObjCount ; nObj++ )
     {
@@ -1762,14 +1762,14 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
     }
     delete[] ppDeleteTab;
 
-    UINT16 nMod;
+    sal_uInt16 nMod;
     pModules->Clear();
     r >> nMod;
-    for( USHORT i = 0; i < nMod; i++ )
+    for( sal_uInt16 i = 0; i < nMod; i++ )
     {
         SbModule* pMod = (SbModule*) SbxBase::Load( r );
         if( !pMod )
-            return FALSE;
+            return sal_False;
         else if( pMod->ISA(SbJScriptModule) )
         {
             // Ref zuweisen, damit pMod deleted wird
@@ -1792,26 +1792,26 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
     // Suche ueber StarBASIC ist immer global
     DBG_ASSERT( IsSet( SBX_GBLSEARCH ), "Basic ohne GBLSEARCH geladen" );
     SetFlag( SBX_GBLSEARCH );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL StarBASIC::StoreData( SvStream& r ) const
+sal_Bool StarBASIC::StoreData( SvStream& r ) const
 {
     if( !SbxObject::StoreData( r ) )
-        return FALSE;
-    r << (UINT16) pModules->Count();
-    for( USHORT i = 0; i < pModules->Count(); i++ )
+        return sal_False;
+    r << (sal_uInt16) pModules->Count();
+    for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
     {
         SbModule* p = (SbModule*) pModules->Get( i );
         if( !p->Store( r ) )
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL StarBASIC::LoadOldModules( SvStream& )
+sal_Bool StarBASIC::LoadOldModules( SvStream& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
@@ -1884,7 +1884,7 @@ static const char pCountStr[]   = "Count";
 static const char pAddStr[]     = "Add";
 static const char pItemStr[]    = "Item";
 static const char pRemoveStr[]  = "Remove";
-static USHORT nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
+static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
 
 SbxInfoRef BasicCollection::xAddInfo = NULL;
 SbxInfoRef BasicCollection::xItemInfo = NULL;
@@ -1955,10 +1955,10 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
     const SbxHint* p = PTR_CAST(SbxHint,&rHint);
     if( p )
     {
-        ULONG nId = p->GetId();
-        BOOL bRead  = BOOL( nId == SBX_HINT_DATAWANTED );
-        BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
-        BOOL bRequestInfo = BOOL( nId == SBX_HINT_INFOWANTED );
+        sal_uIntPtr nId = p->GetId();
+        sal_Bool bRead  = sal_Bool( nId == SBX_HINT_DATAWANTED );
+        sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
+        sal_Bool bRequestInfo = sal_Bool( nId == SBX_HINT_INFOWANTED );
         SbxVariable* pVar = p->GetVar();
         SbxArray* pArg = pVar->GetParameters();
         XubString aVarName( pVar->GetName() );
@@ -1993,9 +1993,9 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
     SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
 }
 
-INT32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
+sal_Int32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
 {
-    INT32 nIndex = -1;
+    sal_Int32 nIndex = -1;
     if( pIndexVar->GetType() == SbxSTRING )
         nIndex = implGetIndexForName( pIndexVar->GetString() );
     else
@@ -2003,12 +2003,12 @@ INT32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
     return nIndex;
 }
 
-INT32 BasicCollection::implGetIndexForName( const String& rName )
+sal_Int32 BasicCollection::implGetIndexForName( const String& rName )
 {
-    INT32 nIndex = -1;
-    INT32 nCount = xItemArray->Count32();
-    INT32 nNameHash = MakeHashCode( rName );
-    for( INT32 i = 0 ; i < nCount ; i++ )
+    sal_Int32 nIndex = -1;
+    sal_Int32 nCount = xItemArray->Count32();
+    sal_Int32 nNameHash = MakeHashCode( rName );
+    for( sal_Int32 i = 0 ; i < nCount ; i++ )
     {
         SbxVariable* pVar = xItemArray->Get32( i );
         if( pVar->GetHashCode() == nNameHash &&
@@ -2023,7 +2023,7 @@ INT32 BasicCollection::implGetIndexForName( const String& rName )
 
 void BasicCollection::CollAdd( SbxArray* pPar_ )
 {
-    USHORT nCount = pPar_->Count();
+    sal_uInt16 nCount = pPar_->Count();
     if( nCount < 2 || nCount > 5 )
     {
         SetError( SbxERR_WRONG_ARGS );
@@ -2049,7 +2049,7 @@ void BasicCollection::CollAdd( SbxArray* pPar_ )
                     return;
                 }
                 SbxVariable* pAfter = pPar_->Get(4);
-                INT32 nAfterIndex = implGetIndex( pAfter );
+                sal_Int32 nAfterIndex = implGetIndex( pAfter );
                 if( nAfterIndex == -1 )
                 {
                     SetError( SbERR_BAD_ARGUMENT );
@@ -2059,7 +2059,7 @@ void BasicCollection::CollAdd( SbxArray* pPar_ )
             }
             else // if( nCount == 4 )
             {
-                INT32 nBeforeIndex = implGetIndex( pBefore );
+                sal_Int32 nBeforeIndex = implGetIndex( pBefore );
                 if( nBeforeIndex == -1 )
                 {
                     SetError( SbERR_BAD_ARGUMENT );
@@ -2108,8 +2108,8 @@ void BasicCollection::CollItem( SbxArray* pPar_ )
     }
     SbxVariable* pRes = NULL;
     SbxVariable* p = pPar_->Get( 1 );
-    INT32 nIndex = implGetIndex( p );
-    if( nIndex >= 0 && nIndex < (INT32)xItemArray->Count32() )
+    sal_Int32 nIndex = implGetIndex( p );
+    if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
         pRes = xItemArray->Get32( nIndex );
     if( !pRes )
         SetError( SbERR_BAD_ARGUMENT );
@@ -2126,8 +2126,8 @@ void BasicCollection::CollRemove( SbxArray* pPar_ )
     }
 
     SbxVariable* p = pPar_->Get( 1 );
-    INT32 nIndex = implGetIndex( p );
-    if( nIndex >= 0 && nIndex < (INT32)xItemArray->Count32() )
+    sal_Int32 nIndex = implGetIndex( p );
+    if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
         xItemArray->Remove32( nIndex );
     else
         SetError( SbERR_BAD_ARGUMENT );
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 55b5f7f371ce..2b1f32e474d5 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -61,13 +61,13 @@ SbiGlobals::SbiGlobals()
     nCode = 0;
     nLine = 0;
     nCol1 = nCol2 = 0;
-    bCompiler = FALSE;
-    bGlobalInitErr = FALSE;
-    bRunInit = FALSE;
+    bCompiler = sal_False;
+    bGlobalInitErr = sal_False;
+    bRunInit = sal_False;
     eLanguageMode = SB_LANG_BASIC;
     pErrStack = NULL;
     pTransliterationWrapper = NULL;
-    bBlockCompilerError = FALSE;
+    bBlockCompilerError = sal_False;
     pAppBasMgr = NULL;
     pMSOMacroRuntimLib = NULL;
 }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index b04552eb937e..13ae406cb305 100755
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -444,7 +444,7 @@ String implGetWrappedMsg( const WrappedTargetException& e )
 
 void implHandleBasicErrorException( BasicErrorException& e )
 {
-    SbError nError = StarBASIC::GetSfxFromVBError( (USHORT)e.ErrorCode );
+    SbError nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)e.ErrorCode );
     StarBASIC::Error( nError, e.ErrorMessageArgument );
 }
 
@@ -471,7 +471,7 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
         // special handling for BasicErrorException errors
         if ( aWrapped.TargetException >>= aBasicError )
         {
-            nError = StarBASIC::GetSfxFromVBError( (USHORT)aBasicError.ErrorCode );
+            nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)aBasicError.ErrorCode );
             aMessageBuf.append( aBasicError.ErrorMessageArgument );
             aExamine.clear();
             break;
@@ -637,7 +637,7 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
         sal_Int32 nLen = xIdlArray->getLen( aValue );
         for ( sal_Int32 index = 0; index < nLen; ++index )
         {
-            Any aElementAny = xIdlArray->get( aValue, (UINT32)index );
+            Any aElementAny = xIdlArray->get( aValue, (sal_uInt32)index );
             // This detects the dimension were currently processing
             if ( dimCopy == dimension )
             {
@@ -751,7 +751,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
                     if ( pArray )
                     {
                         SbxDimArrayRef xArray = pArray;
-                        USHORT nFlags = pVar->GetFlags();
+                        sal_uInt16 nFlags = pVar->GetFlags();
                         pVar->ResetFlag( SBX_FIXED );
                         pVar->PutObject( (SbxDimArray*)xArray );
                         pVar->SetFlags( nFlags );
@@ -799,9 +799,9 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
                                     sal_Int64 nValue64 = aCurrency.Value;
                                     SbxINT64 aInt64;
                                     aInt64.nHigh =
-                                        sal::static_int_cast< INT32 >(
+                                        sal::static_int_cast< sal_Int32 >(
                                             nValue64 >> 32);
-                                    aInt64.nLow = (UINT32)( nValue64 & 0xffffffff );
+                                    aInt64.nLow = (sal_uInt32)( nValue64 & 0xffffffff );
                                     pVar->PutCurrency( aInt64 );
                                     break;
                                 }
@@ -879,7 +879,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
                 for( i = 0 ; i < nLen ; i++ )
                 {
                     // Elemente wandeln
-                    Any aElementAny = xIdlArray->get( aValue, (UINT32)i );
+                    Any aElementAny = xIdlArray->get( aValue, (sal_uInt32)i );
                     SbxVariableRef xVar = new SbxVariable( eSbxElementType );
                     unoToSbxValue( (SbxVariable*)xVar, aElementAny );
 
@@ -893,7 +893,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
             }
 
             // Array zurueckliefern
-            USHORT nFlags = pVar->GetFlags();
+            sal_uInt16 nFlags = pVar->GetFlags();
             pVar->ResetFlag( SBX_FIXED );
             pVar->PutObject( (SbxDimArray*)xArray );
             pVar->SetFlags( nFlags );
@@ -1033,9 +1033,9 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
                     // der genommen, sonst wird das ganze als Any-Sequence betrachtet
                     sal_Bool bNeedsInit = sal_True;
 
-                    INT32 nSize = nUpper - nLower + 1;
-                    INT32 nIdx = nLower;
-                    for( INT32 i = 0 ; i < nSize ; i++,nIdx++ )
+                    sal_Int32 nSize = nUpper - nLower + 1;
+                    sal_Int32 nIdx = nLower;
+                    for( sal_Int32 i = 0 ; i < nSize ; i++,nIdx++ )
                     {
                         SbxVariableRef xVar = pArray->Get32( &nIdx );
                         Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
@@ -1071,10 +1071,10 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
                 if( eElementTypeClass == TypeClass_VOID || eElementTypeClass == TypeClass_ANY )
                 {
                     // For this check the array's dim structure does not matter
-                    UINT32 nFlatArraySize = pArray->Count32();
+                    sal_uInt32 nFlatArraySize = pArray->Count32();
 
                     sal_Bool bNeedsInit = sal_True;
-                    for( UINT32 i = 0 ; i < nFlatArraySize ; i++ )
+                    for( sal_uInt32 i = 0 ; i < nFlatArraySize ; i++ )
                     {
                         SbxVariableRef xVar = pArray->SbxArray::Get32( i );
                         Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
@@ -1635,13 +1635,13 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
 }
 
 // Dbg-Hilfsmethode zum Auslesen der in einem Object implementierten Interfaces
-String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel )
+String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel )
 {
     Type aIfaceType = ::getCppuType( (const Reference< XInterface > *)0 );
     static Reference< XIdlClass > xIfaceClass = TypeToIdlClass( aIfaceType );
 
     String aRetStr;
-    for( USHORT i = 0 ; i < nRekLevel ; i++ )
+    for( sal_uInt16 i = 0 ; i < nRekLevel ; i++ )
         aRetStr.AppendAscii( "    " );
     aRetStr += String( xClass->getName() );
     ::rtl::OUString aClassName = xClass->getName();
@@ -1660,8 +1660,8 @@ String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference<
         // Super-Interfaces holen
         Sequence< Reference< XIdlClass > > aSuperClassSeq = xClass->getSuperclasses();
         const Reference< XIdlClass >* pClasses = aSuperClassSeq.getConstArray();
-        UINT32 nSuperIfaceCount = aSuperClassSeq.getLength();
-        for( UINT32 j = 0 ; j < nSuperIfaceCount ; j++ )
+        sal_uInt32 nSuperIfaceCount = aSuperClassSeq.getLength();
+        for( sal_uInt32 j = 0 ; j < nSuperIfaceCount ; j++ )
         {
             const Reference< XIdlClass >& rxIfaceClass = pClasses[j];
             if( !rxIfaceClass->equals( xIfaceClass ) )
@@ -1742,8 +1742,8 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj,
     {
         Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
         const Type* pTypeArray = aTypeSeq.getConstArray();
-        UINT32 nIfaceCount = aTypeSeq.getLength();
-        for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
+        sal_uInt32 nIfaceCount = aTypeSeq.getLength();
+        for( sal_uInt32 j = 0 ; j < nIfaceCount ; j++ )
         {
             const Type& rType = pTypeArray[j];
 
@@ -1821,8 +1821,8 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
             // Interfaces der Implementation holen
             Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
             const Type* pTypeArray = aTypeSeq.getConstArray();
-            UINT32 nIfaceCount = aTypeSeq.getLength();
-            for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
+            sal_uInt32 nIfaceCount = aTypeSeq.getLength();
+            for( sal_uInt32 j = 0 ; j < nIfaceCount ; j++ )
             {
                 const Type& rType = pTypeArray[j];
 
@@ -1922,13 +1922,13 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
     }
 
     Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
-    UINT32 nUnoPropCount = props.getLength();
+    sal_uInt32 nUnoPropCount = props.getLength();
     const Property* pUnoProps = props.getConstArray();
 
     SbxArray* pProps = pUnoObj->GetProperties();
-    USHORT nPropCount = pProps->Count();
-    USHORT nPropsPerLine = 1 + nPropCount / 30;
-    for( USHORT i = 0; i < nPropCount; i++ )
+    sal_uInt16 nPropCount = pProps->Count();
+    sal_uInt16 nPropsPerLine = 1 + nPropCount / 30;
+    for( sal_uInt16 i = 0; i < nPropCount; i++ )
     {
         SbxVariable* pVar = pProps->Get( i );
         if( pVar )
@@ -1941,7 +1941,7 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
             // Ist es in Uno eine Sequence?
             SbxDataType eType = pVar->GetFullType();
 
-            BOOL bMaybeVoid = FALSE;
+            sal_Bool bMaybeVoid = sal_False;
             if( i < nUnoPropCount )
             {
                 const Property& rProp = pUnoProps[ i ];
@@ -1951,7 +1951,7 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
                 if( rProp.Attributes & PropertyAttribute::MAYBEVOID )
                 {
                     eType = unoToSbxType( rProp.Type.getTypeClass() );
-                    bMaybeVoid = TRUE;
+                    bMaybeVoid = sal_True;
                 }
                 if( eType == SbxOBJECT )
                 {
@@ -2002,14 +2002,14 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj )
     const Reference< XIdlMethod >* pUnoMethods = methods.getConstArray();
 
     SbxArray* pMethods = pUnoObj->GetMethods();
-    USHORT nMethodCount = pMethods->Count();
+    sal_uInt16 nMethodCount = pMethods->Count();
     if( !nMethodCount )
     {
         aRet.AppendAscii( "\nNo methods found\n" );
         return aRet;
     }
-    USHORT nPropsPerLine = 1 + nMethodCount / 30;
-    for( USHORT i = 0; i < nMethodCount; i++ )
+    sal_uInt16 nPropsPerLine = 1 + nMethodCount / 30;
+    for( sal_uInt16 i = 0; i < nMethodCount; i++ )
     {
         SbxVariable* pVar = pMethods->Get( i );
         if( pVar )
@@ -2037,12 +2037,12 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj )
 
             // get-Methode darf keinen Parameter haben
             Sequence< Reference< XIdlClass > > aParamsSeq = rxMethod->getParameterTypes();
-            UINT32 nParamCount = aParamsSeq.getLength();
+            sal_uInt32 nParamCount = aParamsSeq.getLength();
             const Reference< XIdlClass >* pParams = aParamsSeq.getConstArray();
 
             if( nParamCount > 0 )
             {
-                for( USHORT j = 0; j < nParamCount; j++ )
+                for( sal_uInt16 j = 0; j < nParamCount; j++ )
                 {
                     String aTypeStr = Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) );
                     aPropStr += aTypeStr;
@@ -2089,7 +2089,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
             if( pHint->GetId() == SBX_HINT_DATAWANTED )
             {
                 // Test-Properties
-                INT32 nId = pProp->nId;
+                sal_Int32 nId = pProp->nId;
                 if( nId < 0 )
                 {
                     // Id == -1: Implementierte Interfaces gemaess ClassProvider anzeigen
@@ -2200,18 +2200,18 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
             if( pHint->GetId() == SBX_HINT_DATAWANTED )
             {
                 // Anzahl Parameter -1 wegen Param0 == this
-                UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+                sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
                 Sequence<Any> args;
-                BOOL bOutParams = FALSE;
-                UINT32 i;
+                sal_Bool bOutParams = sal_False;
+                sal_uInt32 i;
 
                 if( !bInvocation && mxUnoAccess.is() )
                 {
                     // Infos holen
                     const Sequence<ParamInfo>& rInfoSeq = pMeth->getParamInfos();
                     const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
-                    UINT32 nUnoParamCount = rInfoSeq.getLength();
-                    UINT32 nAllocParamCount = nParamCount;
+                    sal_uInt32 nUnoParamCount = rInfoSeq.getLength();
+                    sal_uInt32 nAllocParamCount = nParamCount;
 
                     // Ueberschuessige Parameter ignorieren, Alternative: Error schmeissen
                     if( nParamCount > nUnoParamCount )
@@ -2254,14 +2254,14 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                             com::sun::star::uno::Type aType( rxClass->getTypeClass(), rxClass->getName() );
 
                             // ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
-                            pAnyArgs[i] = sbxToUnoValue( pParams->Get( (USHORT)(i+1) ), aType );
+                            pAnyArgs[i] = sbxToUnoValue( pParams->Get( (sal_uInt16)(i+1) ), aType );
 
                             // Wenn es nicht schon feststeht pruefen, ob Out-Parameter vorliegen
                             if( !bOutParams )
                             {
                                 ParamMode aParamMode = rInfo.aMode;
                                 if( aParamMode != ParamMode_IN )
-                                    bOutParams = TRUE;
+                                    bOutParams = sal_True;
                             }
                         }
                     }
@@ -2286,7 +2286,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                         Any aValAny;
                         for( i = 0 ; i < nParamCount ; i++ )
                         {
-                            USHORT iSbx = (USHORT)(i+1);
+                            sal_uInt16 iSbx = (sal_uInt16)(i+1);
 
                             // ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
                             aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
@@ -2311,14 +2311,14 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                         for( i = 0 ; i < nParamCount ; i++ )
                         {
                             // ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
-                            pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
+                            pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (sal_uInt16)(i+1) ),
                                                             bBlockConversionToSmallestType );
                         }
                     }
                 }
 
                 // Methode callen
-                GetSbData()->bBlockCompilerError = TRUE;  // #106433 Block compiler errors for API calls
+                GetSbData()->bBlockCompilerError = sal_True;  // #106433 Block compiler errors for API calls
                 try
                 {
                     if( !bInvocation && mxUnoAccess.is() )
@@ -2337,13 +2337,13 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                             const Sequence<ParamInfo>& rInfoSeq = pMeth->getParamInfos();
                             const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
 
-                            UINT32 j;
+                            sal_uInt32 j;
                             for( j = 0 ; j < nParamCount ; j++ )
                             {
                                 const ParamInfo& rInfo = pParamInfos[j];
                                 ParamMode aParamMode = rInfo.aMode;
                                 if( aParamMode != ParamMode_IN )
-                                    unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pAnyArgs[ j ] );
+                                    unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pAnyArgs[ j ] );
                             }
                         }
                     }
@@ -2358,21 +2358,21 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                             aRetAny = xDirectInvoke->directInvoke( pMeth->GetName(), args );
                         else
                         {
-                            Sequence< INT16 > OutParamIndex;
+                            Sequence< sal_Int16 > OutParamIndex;
                             Sequence< Any > OutParam;
                             aRetAny = mxInvocation->invoke( pMeth->GetName(), args, OutParamIndex, OutParam );
 
-                            const INT16* pIndices = OutParamIndex.getConstArray();
-                            UINT32 nLen = OutParamIndex.getLength();
+                            const sal_Int16* pIndices = OutParamIndex.getConstArray();
+                            sal_uInt32 nLen = OutParamIndex.getLength();
                             if( nLen )
                             {
                                 const Any* pNewValues = OutParam.getConstArray();
-                                for( UINT32 j = 0 ; j < nLen ; j++ )
+                                for( sal_uInt32 j = 0 ; j < nLen ; j++ )
                                 {
-                                    INT16 iTarget = pIndices[ j ];
-                                    if( iTarget >= (INT16)nParamCount )
+                                    sal_Int16 iTarget = pIndices[ j ];
+                                    if( iTarget >= (sal_Int16)nParamCount )
                                         break;
-                                    unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
+                                    unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pNewValues[ j ] );
                                 }
                             }
                         }
@@ -2390,7 +2390,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     implHandleAnyException( ::cppu::getCaughtException() );
                 }
-                GetSbData()->bBlockCompilerError = FALSE;  // #106433 Unblock compiler errors
+                GetSbData()->bBlockCompilerError = sal_False;  // #106433 Unblock compiler errors
             }
         }
         else
@@ -2406,8 +2406,8 @@ Reference< XInvocation > createDynamicInvocationFor( const Any& aAny );
 
 SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
     : SbxObject( aName_ )
-    , bNeedIntrospection( TRUE )
-    , bNativeCOMObject( FALSE )
+    , bNeedIntrospection( sal_True )
+    , bNativeCOMObject( sal_False )
 {
     static Reference< XIntrospection > xIntrospection;
 
@@ -2450,7 +2450,7 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
         // Rest bezieht sich nur auf Introspection
         if( !xTypeProvider.is() )
         {
-            bNeedIntrospection = FALSE;
+            bNeedIntrospection = sal_False;
             return;
         }
 
@@ -2458,34 +2458,34 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
         // hiding of equally named COM symbols, e.g. XInvocation::getValue
         Reference< oleautomation::XAutomationObject > xAutomationObject( aUnoObj_, UNO_QUERY );
         if( xAutomationObject.is() )
-            bNativeCOMObject = TRUE;
+            bNativeCOMObject = sal_True;
     }
 
     maTmpUnoObj = aUnoObj_;
 
 
     //*** Namen bestimmen ***
-    BOOL bFatalError = TRUE;
+    sal_Bool bFatalError = sal_True;
 
     // Ist es ein Interface oder eine struct?
-    BOOL bSetClassName = FALSE;
+    sal_Bool bSetClassName = sal_False;
     String aClassName_;
     if( eType == TypeClass_STRUCT || eType == TypeClass_EXCEPTION )
     {
         // Struct ist Ok
-        bFatalError = FALSE;
+        bFatalError = sal_False;
 
         // #67173 Echten Klassen-Namen eintragen
         if( aName_.Len() == 0 )
         {
             aClassName_ = String( aUnoObj_.getValueType().getTypeName() );
-            bSetClassName = TRUE;
+            bSetClassName = sal_True;
         }
     }
     else if( eType == TypeClass_INTERFACE )
     {
         // #70197 Interface geht immer durch Typ im Any
-        bFatalError = FALSE;
+        bFatalError = sal_False;
 
         // Nach XIdlClassProvider-Interface fragen
         Reference< XIdlClassProvider > xClassProvider( x, UNO_QUERY );
@@ -2495,14 +2495,14 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
             if( aName_.Len() == 0 )
             {
                 Sequence< Reference< XIdlClass > > szClasses = xClassProvider->getIdlClasses();
-                UINT32 nLen = szClasses.getLength();
+                sal_uInt32 nLen = szClasses.getLength();
                 if( nLen )
                 {
                     const Reference< XIdlClass > xImplClass = szClasses.getConstArray()[ 0 ];
                     if( xImplClass.is() )
                     {
                         aClassName_ = String( xImplClass->getName() );
-                        bSetClassName = TRUE;
+                        bSetClassName = sal_True;
                     }
                 }
             }
@@ -2533,7 +2533,7 @@ void SbUnoObject::doIntrospection( void )
 
     if( !bNeedIntrospection )
         return;
-    bNeedIntrospection = FALSE;
+    bNeedIntrospection = sal_False;
 
     if( !xIntrospection.is() )
     {
@@ -2680,16 +2680,16 @@ SbxInfo* SbUnoMethod::GetInfo()
 
             const Sequence<ParamInfo>& rInfoSeq = getParamInfos();
             const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
-            UINT32 nParamCount = rInfoSeq.getLength();
+            sal_uInt32 nParamCount = rInfoSeq.getLength();
 
-            for( UINT32 i = 0 ; i < nParamCount ; i++ )
+            for( sal_uInt32 i = 0 ; i < nParamCount ; i++ )
             {
                 const ParamInfo& rInfo = pParamInfos[i];
                 ::rtl::OUString aParamName = rInfo.aName;
 
                 // const Reference< XIdlClass >& rxClass = rInfo.aType;
                 SbxDataType t = SbxVARIANT;
-                USHORT nFlags_ = SBX_READ;
+                sal_uInt16 nFlags_ = SBX_READ;
                 pInfo->AddParam( aParamName, t, nFlags_ );
             }
         }
@@ -2712,7 +2712,7 @@ SbUnoProperty::SbUnoProperty
     const String& aName_,
     SbxDataType eSbxType,
     const Property& aUnoProp_,
-    INT32 nId_,
+    sal_Int32 nId_,
     bool bInvocation
 )
     : SbxProperty( aName_, eSbxType )
@@ -2928,10 +2928,10 @@ void SbUnoObject::implCreateAll( void )
 
     // Properties anlegen
     Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
-    UINT32 nPropCount = props.getLength();
+    sal_uInt32 nPropCount = props.getLength();
     const Property* pProps_ = props.getConstArray();
 
-    UINT32 i;
+    sal_uInt32 i;
     for( i = 0 ; i < nPropCount ; i++ )
     {
         const Property& rProp = pProps_[ i ];
@@ -2954,7 +2954,7 @@ void SbUnoObject::implCreateAll( void )
     // Methoden anlegen
     Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods
         ( MethodConcept::ALL - MethodConcept::DANGEROUS );
-    UINT32 nMethCount = aMethodSeq.getLength();
+    sal_uInt32 nMethCount = aMethodSeq.getLength();
     const Reference< XIdlMethod >* pMethods_ = aMethodSeq.getConstArray();
     for( i = 0 ; i < nMethCount ; i++ )
     {
@@ -3014,7 +3014,7 @@ SbUnoObject* Impl_CreateUnoStruct( const String& aClassName )
 
 
 // Factory-Klasse fuer das Anlegen von Uno-Structs per DIM AS NEW
-SbxBase* SbUnoFactory::Create( UINT16, UINT32 )
+SbxBase* SbUnoFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Ueber SbxId laeuft in Uno nix
     return NULL;
@@ -3047,7 +3047,7 @@ void createAllObjectProperties( SbxObject* pObj )
 }
 
 
-void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3072,7 +3072,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     refVar->PutObject( (SbUnoObject*)xUnoObj );
 }
 
-void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3126,7 +3126,7 @@ void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     }
 }
 
-void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3184,7 +3184,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar,
     }
 }
 
-void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3208,13 +3208,13 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL
     }
 }
 
-void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
 
     // Wir brauchen mindestens 2 Parameter
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3223,7 +3223,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
     // Variable fuer Rueckgabewert
     SbxVariableRef refVar = rPar.Get(0);
-    refVar->PutBool( FALSE );
+    refVar->PutBool( sal_False );
 
     // Uno-Objekt holen
     SbxBaseRef pObj = (SbxBase*)rPar.Get( 1 )->GetObject();
@@ -3242,7 +3242,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     if( !xCoreReflection.is() )
         return;
 
-    for( USHORT i = 2 ; i < nParCount ; i++ )
+    for( sal_uInt16 i = 2 ; i < nParCount ; i++ )
     {
         // Interface-Name der struct holen
         String aIfaceName = rPar.Get( i )->GetString();
@@ -3259,11 +3259,11 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
             return;
     }
 
-    // Alles hat geklappt, dann TRUE liefern
-    refVar->PutBool( TRUE );
+    // Alles hat geklappt, dann sal_True liefern
+    refVar->PutBool( sal_True );
 }
 
-void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3277,7 +3277,7 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
     // Variable fuer Rueckgabewert
     SbxVariableRef refVar = rPar.Get(0);
-    refVar->PutBool( FALSE );
+    refVar->PutBool( sal_False );
 
     // Uno-Objekt holen
     SbxVariableRef xParam = rPar.Get( 1 );
@@ -3289,11 +3289,11 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     Any aAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
     TypeClass eType = aAny.getValueType().getTypeClass();
     if( eType == TypeClass_STRUCT )
-        refVar->PutBool( TRUE );
+        refVar->PutBool( sal_True );
 }
 
 
-void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3306,7 +3306,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
     // Variable fuer Rueckgabewert
     SbxVariableRef refVar = rPar.Get(0);
-    refVar->PutBool( FALSE );
+    refVar->PutBool( sal_False );
 
     // Uno-Objekte holen
     SbxVariableRef xParam1 = rPar.Get( 1 );
@@ -3338,7 +3338,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     //XInterfaceRef x2 = *(XInterfaceRef*)aAny2.get();
 
     if( x1 == x2 )
-        refVar->PutBool( TRUE );
+        refVar->PutBool( sal_True );
 }
 
 typedef std::hash_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash;
@@ -3568,7 +3568,7 @@ SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t )
             // Uns selbst gleich wieder als Listener rausnehmen,
             // die Werte sind alle konstant
             if( pRes->IsBroadcaster() )
-                EndListening( pRes->GetBroadcaster(), TRUE );
+                EndListening( pRes->GetBroadcaster(), sal_True );
         }
     }
     return pRes;
@@ -3652,14 +3652,14 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
         if( pUnoCtor && pHint->GetId() == SBX_HINT_DATAWANTED )
         {
             // Parameter count -1 because of Param0 == this
-            UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+            sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
             Sequence<Any> args;
-            BOOL bOutParams = FALSE;
+            sal_Bool bOutParams = sal_False;
 
             Reference< XServiceConstructorDescription > xCtor = pUnoCtor->getServiceCtorDesc();
             Sequence< Reference< XParameter > > aParameterSeq = xCtor->getParameters();
             const Reference< XParameter >* pParameterSeq = aParameterSeq.getConstArray();
-            UINT32 nUnoParamCount = aParameterSeq.getLength();
+            sal_uInt32 nUnoParamCount = aParameterSeq.getLength();
 
             // Default: Ignore not needed parameters
             bool bParameterError = false;
@@ -3677,8 +3677,8 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
             }
 
             // Too many parameters with context as first parameter?
-            USHORT nSbxParameterOffset = 1;
-            USHORT nParameterOffsetByContext = 0;
+            sal_uInt16 nSbxParameterOffset = 1;
+            sal_uInt16 nParameterOffsetByContext = 0;
             Reference < XComponentContext > xFirstParamContext;
             if( nParamCount > nUnoParamCount )
             {
@@ -3689,8 +3689,8 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                     nParameterOffsetByContext = 1;
             }
 
-            UINT32 nEffectiveParamCount = nParamCount - nParameterOffsetByContext;
-            UINT32 nAllocParamCount = nEffectiveParamCount;
+            sal_uInt32 nEffectiveParamCount = nParamCount - nParameterOffsetByContext;
+            sal_uInt32 nAllocParamCount = nEffectiveParamCount;
             if( nEffectiveParamCount > nUnoParamCount )
             {
                 if( !bRestParameterMode )
@@ -3717,9 +3717,9 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     args.realloc( nAllocParamCount );
                     Any* pAnyArgs = args.getArray();
-                    for( UINT32 i = 0 ; i < nEffectiveParamCount ; i++ )
+                    for( sal_uInt32 i = 0 ; i < nEffectiveParamCount ; i++ )
                     {
-                        USHORT iSbx = (USHORT)(i + nSbxParameterOffset + nParameterOffsetByContext);
+                        sal_uInt16 iSbx = (sal_uInt16)(i + nSbxParameterOffset + nParameterOffsetByContext);
 
                         // bRestParameterMode allows nEffectiveParamCount > nUnoParamCount
                         Reference< XParameter > xParam;
@@ -3741,7 +3741,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                             if( !bOutParams )
                             {
                                 if( xParam->isOut() )
-                                    bOutParams = TRUE;
+                                    bOutParams = sal_True;
                             }
                         }
                         else
@@ -3786,14 +3786,14 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     const Any* pAnyArgs = args.getConstArray();
 
-                    for( UINT32 j = 0 ; j < nUnoParamCount ; j++ )
+                    for( sal_uInt32 j = 0 ; j < nUnoParamCount ; j++ )
                     {
                         Reference< XParameter > xParam = pParameterSeq[j];
                         if( !xParam.is() )
                             continue;
 
                         if( xParam->isOut() )
-                            unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pAnyArgs[ j ] );
+                            unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pAnyArgs[ j ] );
                     }
                 }
             }
@@ -3878,8 +3878,8 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pParams = pVar->GetParameters();
-        UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
-        UINT32 nAllowedParamCount = 1;
+        sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
+        sal_uInt32 nAllowedParamCount = 1;
 
         Reference < XComponentContext > xContextToUse;
         if( nParamCount > 0 )
@@ -3938,7 +3938,7 @@ public:
     ~BasicAllListener_Impl();
 
     // Methoden von XInterface
-    //virtual BOOL queryInterface( Uik aUik, Reference< XInterface > & rOut );
+    //virtual sal_Bool queryInterface( Uik aUik, Reference< XInterface > & rOut );
 
     // Methoden von XAllListener
     virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException );
@@ -3984,13 +3984,13 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
                 // In Basic Array anlegen
                 SbxArrayRef xSbxArray = new SbxArray( SbxVARIANT );
                 const Any * pArgs = Event.Arguments.getConstArray();
-                INT32 nCount = Event.Arguments.getLength();
-                for( INT32 i = 0; i < nCount; i++ )
+                sal_Int32 nCount = Event.Arguments.getLength();
+                for( sal_Int32 i = 0; i < nCount; i++ )
                 {
                     // Elemente wandeln
                     SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
                     unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
-                    xSbxArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+                    xSbxArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
                 }
 
                 pLib->Call( aMethodName, xSbxArray );
@@ -4002,7 +4002,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
                     if( pVar )
                     {
                         // #95792 Avoid a second call
-                        USHORT nFlags = pVar->GetFlags();
+                        sal_uInt16 nFlags = pVar->GetFlags();
                         pVar->SetFlag( SBX_NO_BROADCAST );
                         *pRet = sbxToUnoValueImpl( pVar );
                         pVar->SetFlags( nFlags );
@@ -4197,7 +4197,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const ::rtl::OUStri
 // Uno-Service erzeugen
 // 1. Parameter == Prefix-Name der Makros
 // 2. Parameter == voll qualifizierter Name des Listeners
-void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 //RTLFUNC(CreateUnoListener)
 {
     (void)bWrite;
@@ -4261,7 +4261,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 //========================================================================
 // Represents the DefaultContext property of the ProcessServiceManager
 // in the Basic runtime system.
-void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -4289,7 +4289,7 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite
 //========================================================================
 // Creates a Basic wrapper object for a strongly typed Uno value
 // 1. parameter: Uno type as full qualified type name, e.g. "byte[]"
-void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -4583,7 +4583,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
         {
             SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
             unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
-            xArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+            xArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
         }
     }
 
@@ -4721,8 +4721,8 @@ void disposeComVariablesForBasic( StarBASIC* pBasic )
         StarBasicDisposeItem* pItem = *it;
 
         SbxArray* pArray = pItem->m_pRegisteredVariables;
-        USHORT nCount = pArray->Count();
-        for( USHORT i = 0 ; i < nCount ; ++i )
+        sal_uInt16 nCount = pArray->Count();
+        for( sal_uInt16 i = 0 ; i < nCount ; ++i )
         {
             SbxVariable* pVar = pArray->Get( i );
             pVar->ClearComListener();
@@ -4767,8 +4767,8 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
     bool bSuccess = false;
 
     SbxArray* pModIfaces = pClassData->mxIfaces;
-    USHORT nCount = pModIfaces->Count();
-    for( USHORT i = 0 ; i < nCount ; ++i )
+    sal_uInt16 nCount = pModIfaces->Count();
+    for( sal_uInt16 i = 0 ; i < nCount ; ++i )
     {
         SbxVariable* pVar = pModIfaces->Get( i );
         ::rtl::OUString aIfaceName = pVar->GetName();
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 0f807db7cf8f..a268568a410d 100755
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -265,7 +265,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
     if ( pInfo )
     {
         sal_Int32 nSbxOptional = 0;
-        USHORT n = 1;
+        sal_uInt16 n = 1;
         for ( const SbxParamInfo* pParamInfo = pInfo->GetParam( n ); pParamInfo; pParamInfo = pInfo->GetParam( ++n ) )
         {
             if ( ( pParamInfo->nFlags & SBX_OPTIONAL ) != 0 )
@@ -289,7 +289,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
         {
             SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
             unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), pParams[i] );
-            xSbxParams->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+            xSbxParams->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
 
             // Enable passing by ref
             if ( xSbxVar->GetType() != SbxVARIANT )
@@ -312,7 +312,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
         if ( pInfo_ )
         {
             OutParamMap aOutParamMap;
-            for ( USHORT n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
+            for ( sal_uInt16 n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
             {
                 const SbxParamInfo* pParamInfo = pInfo_->GetParam( n );
                 if ( pParamInfo && ( pParamInfo->eType & SbxBYREF ) != 0 )
@@ -410,7 +410,7 @@ SbMethodRef DocObjectWrapper::getMethod( const rtl::OUString& aName ) throw (Run
     SbMethodRef pMethod = NULL;
     if ( m_pMod )
     {
-        USHORT nSaveFlgs = m_pMod->GetFlags();
+        sal_uInt16 nSaveFlgs = m_pMod->GetFlags();
         // Limit search to this module
         m_pMod->ResetFlag( SBX_GBLSEARCH );
         pMethod = (SbMethod*) m_pMod->SbModule::Find( aName,  SbxCLASS_METHOD );
@@ -425,7 +425,7 @@ SbPropertyRef DocObjectWrapper::getProperty( const rtl::OUString& aName ) throw
     SbPropertyRef pProperty = NULL;
     if ( m_pMod )
     {
-        USHORT nSaveFlgs = m_pMod->GetFlags();
+        sal_uInt16 nSaveFlgs = m_pMod->GetFlags();
         // Limit search to this module.
         m_pMod->ResetFlag( SBX_GBLSEARCH );
         pProperty = (SbProperty*)m_pMod->SbModule::Find( aName,  SbxCLASS_PROPERTY );
@@ -521,7 +521,7 @@ bool VBAUnlockControllers( StarBASIC* pBasic )
 // Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
 // Elemente von anderen Modulen aus gefunden werden koennen.
 
-SbModule::SbModule( const String& rName,  BOOL bVBACompat )
+SbModule::SbModule( const String& rName,  sal_Bool bVBACompat )
          : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ),
            pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( bVBACompat ),  pDocObject( NULL ), bIsProxyModule( false )
 {
@@ -557,9 +557,9 @@ SbModule::GetUnoModule()
     return mxWrapper;
 }
 
-BOOL SbModule::IsCompiled() const
+sal_Bool SbModule::IsCompiled() const
 {
-    return BOOL( pImage != 0 );
+    return sal_Bool( pImage != 0 );
 }
 
 const SbxObject* SbModule::FindType( String aTypeName ) const
@@ -578,12 +578,12 @@ void SbModule::StartDefinitions()
 
     // Methoden und Properties bleiben erhalten, sind jedoch ungueltig
     // schliesslich sind ja u.U. die Infos belegt
-    USHORT i;
+    sal_uInt16 i;
     for( i = 0; i < pMethods->Count(); i++ )
     {
         SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
         if( p )
-            p->bInvalid = TRUE;
+            p->bInvalid = sal_True;
     }
     for( i = 0; i < pProps->Count(); )
     {
@@ -609,11 +609,11 @@ SbMethod* SbModule::GetMethod( const String& rName, SbxDataType t )
         pMeth->SetParent( this );
         pMeth->SetFlags( SBX_READ );
         pMethods->Put( pMeth, pMethods->Count() );
-        StartListening( pMeth->GetBroadcaster(), TRUE );
+        StartListening( pMeth->GetBroadcaster(), sal_True );
     }
     // Per Default ist die Methode GUELTIG, da sie auch vom Compiler
     // (Codegenerator) erzeugt werden kann
-    pMeth->bInvalid = FALSE;
+    pMeth->bInvalid = sal_False;
     pMeth->ResetFlag( SBX_FIXED );
     pMeth->SetFlag( SBX_WRITE );
     pMeth->SetType( t );
@@ -637,7 +637,7 @@ SbProperty* SbModule::GetProperty( const String& rName, SbxDataType t )
         pProp->SetFlag( SBX_READWRITE );
         pProp->SetParent( this );
         pProps->Put( pProp, pProps->Count() );
-        StartListening( pProp->GetBroadcaster(), TRUE );
+        StartListening( pProp->GetBroadcaster(), sal_True );
     }
     return pProp;
 }
@@ -655,7 +655,7 @@ SbProcedureProperty* SbModule::GetProcedureProperty
         pProp->SetFlag( SBX_READWRITE );
         pProp->SetParent( this );
         pProps->Put( pProp, pProps->Count() );
-        StartListening( pProp->GetBroadcaster(), TRUE );
+        StartListening( pProp->GetBroadcaster(), sal_True );
     }
     return pProp;
 }
@@ -674,7 +674,7 @@ SbIfaceMapperMethod* SbModule::GetIfaceMapperMethod
         pMapperMethod->SetFlags( SBX_READ );
         pMethods->Put( pMapperMethod, pMethods->Count() );
     }
-    pMapperMethod->bInvalid = FALSE;
+    pMapperMethod->bInvalid = sal_False;
     return pMapperMethod;
 }
 
@@ -687,9 +687,9 @@ TYPEINIT1(SbIfaceMapperMethod,SbMethod)
 
 // Aus dem Codegenerator: Ungueltige Eintraege entfernen
 
-void SbModule::EndDefinitions( BOOL bNewState )
+void SbModule::EndDefinitions( sal_Bool bNewState )
 {
-    for( USHORT i = 0; i < pMethods->Count(); )
+    for( sal_uInt16 i = 0; i < pMethods->Count(); )
     {
         SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
         if( p )
@@ -705,7 +705,7 @@ void SbModule::EndDefinitions( BOOL bNewState )
         else
             i++;
     }
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 void SbModule::Clear()
@@ -812,7 +812,7 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
             // side effects when using name as variable implicitely
             bool bForwardToSbxObject = true;
 
-            ULONG nId = pHint->GetId();
+            sal_uIntPtr nId = pHint->GetId();
             if( (nId == SBX_HINT_DATAWANTED || nId == SBX_HINT_DATACHANGED) &&
                 pVar->GetName().EqualsIgnoreCaseAscii( "name" ) )
                     bForwardToSbxObject = false;
@@ -869,7 +869,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                         aTok.SetCompatible( true );
                     else if ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) )
                     {
-                            BOOL bIsVBA = ( aTok.GetDbl()== 1 );
+                            sal_Bool bIsVBA = ( aTok.GetDbl()== 1 );
                             SetVBACompat( bIsVBA );
                         aTok.SetCompatible( bIsVBA );
                     }
@@ -881,7 +881,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
         SbMethod* pMeth = NULL;
         if( eEndTok != NIL )
         {
-            USHORT nLine1 = aTok.GetLine();
+            sal_uInt16 nLine1 = aTok.GetLine();
             if( aTok.Next() == SYMBOL )
             {
                 String aName_( aTok.GetSym() );
@@ -891,7 +891,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                 pMeth = GetMethod( aName_, t );
                 pMeth->nLine1 = pMeth->nLine2 = nLine1;
                 // Die Methode ist erst mal GUELTIG
-                pMeth->bInvalid = FALSE;
+                pMeth->bInvalid = sal_False;
             }
             else
                 eEndTok = NIL;
@@ -911,18 +911,18 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                 pMeth->nLine2 = aTok.GetLine();
         }
     }
-    EndDefinitions( TRUE );
+    EndDefinitions( sal_True );
 }
 
 void SbModule::SetComment( const String& r )
 {
     aComment = r;
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
-SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
+SbMethod* SbModule::GetFunctionForLine( sal_uInt16 nLine )
 {
-    for( USHORT i = 0; i < pMethods->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
     {
         SbMethod* p = (SbMethod*) pMethods->Get( i );
         if( p->GetSbxId() == SBXID_BASICMETHOD )
@@ -936,14 +936,14 @@ SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
 
 // Ausstrahlen eines Hints an alle Basics
 
-static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
+static void _SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
 {
     // Selbst ein BASIC?
     if( pObj->IsA( TYPE(StarBASIC) ) && pObj->IsBroadcaster() )
         pObj->GetBroadcaster().Broadcast( SbxHint( nId, p ) );
     // Dann die Unterobjekte fragen
     SbxArray* pObjs = pObj->GetObjects();
-    for( USHORT i = 0; i < pObjs->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pObjs->Count(); i++ )
     {
         SbxVariable* pVar = pObjs->Get( i );
         if( pVar->IsA( TYPE(SbxObject) ) )
@@ -951,7 +951,7 @@ static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
     }
 }
 
-static void SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
+static void SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
 {
     while( pObj->GetParent() )
         pObj = pObj->GetParent();
@@ -988,8 +988,8 @@ void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
 
     // Ueber alle Sub-Basics gehen
     SbxArray* pObjs = pBasic->GetObjects();
-    USHORT nCount = pObjs->Count();
-    for( USHORT i = 0 ; i < nCount ; i++ )
+    sal_uInt16 nCount = pObjs->Count();
+    for( sal_uInt16 i = 0 ; i < nCount ; i++ )
     {
         SbxVariable* pObjVar = pObjs->Get( i );
         StarBASIC* pSubBasic = PTR_CAST( StarBASIC, pObjVar );
@@ -1013,24 +1013,24 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
     if( ((StarBASIC*)p) != pBasic )
         ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
 }
-BOOL SbModule::IsVBACompat() const
+sal_Bool SbModule::IsVBACompat() const
 {
     return mbVBACompat;
 }
 
-void SbModule::SetVBACompat( BOOL bCompat )
+void SbModule::SetVBACompat( sal_Bool bCompat )
 {
     mbVBACompat = bCompat;
 }
 // Ausfuehren eines BASIC-Unterprogramms
-USHORT SbModule::Run( SbMethod* pMeth )
+sal_uInt16 SbModule::Run( SbMethod* pMeth )
 {
-    static USHORT nMaxCallLevel = 0;
+    static sal_uInt16 nMaxCallLevel = 0;
     static String aMSOMacroRuntimeLibName = String::CreateFromAscii( "Launcher" );
     static String aMSOMacroRuntimeAppSymbol = String::CreateFromAscii( "Application" );
 
-    USHORT nRes = 0;
-    BOOL bDelInst = BOOL( pINST == NULL );
+    sal_uInt16 nRes = 0;
+    sal_Bool bDelInst = sal_Bool( pINST == NULL );
     StarBASICRef xBasic;
     if( bDelInst )
     {
@@ -1044,7 +1044,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
 
         // Launcher problem
         // i80726 The Find below will genarate an error in Testtool so we reset it unless there was one before already
-        BOOL bWasError = SbxBase::GetError() != 0;
+        sal_Bool bWasError = SbxBase::GetError() != 0;
         SbxVariable* pMSOMacroRuntimeLibVar = Find( aMSOMacroRuntimeLibName, SbxCLASS_OBJECT );
         if ( !bWasError && (SbxBase::GetError() == SbxERR_PROC_UNDEFINED) )
             SbxBase::ResetError();
@@ -1053,7 +1053,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
             StarBASIC* pMSOMacroRuntimeLib = PTR_CAST(StarBASIC,pMSOMacroRuntimeLibVar);
             if( pMSOMacroRuntimeLib )
             {
-                USHORT nGblFlag = pMSOMacroRuntimeLib->GetFlags() & SBX_GBLSEARCH;
+                sal_uInt16 nGblFlag = pMSOMacroRuntimeLib->GetFlags() & SBX_GBLSEARCH;
                 pMSOMacroRuntimeLib->ResetFlag( SBX_GBLSEARCH );
                 SbxVariable* pAppSymbol = pMSOMacroRuntimeLib->Find( aMSOMacroRuntimeAppSymbol, SbxCLASS_METHOD );
                 pMSOMacroRuntimeLib->SetFlag( nGblFlag );
@@ -1100,7 +1100,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
         GlobalRunInit( /* bBasicStart = */ bDelInst );
 
         // Trat ein Compiler-Fehler auf? Dann starten wir nicht
-        if( GetSbData()->bGlobalInitErr == FALSE )
+        if( GetSbData()->bGlobalInitErr == sal_False )
         {
             if( bDelInst )
             {
@@ -1126,7 +1126,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
             pINST->pRun = pRt;
             if ( mbVBACompat )
             {
-                pINST->EnableCompatibility( TRUE );
+                pINST->EnableCompatibility( sal_True );
             }
             while( pRt->Step() ) {}
             if( pRt->pNext )
@@ -1151,7 +1151,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
                     GetpApp()->Yield();
             }
 
-            nRes = TRUE;
+            nRes = sal_True;
             pINST->pRun = pRt->pNext;
             pINST->nCallLvl--;          // Call-Level wieder runter
 
@@ -1172,7 +1172,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
                 clearNativeObjectWrapperVector();
 
                 DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0");
-                delete pINST, pINST = NULL, bDelInst = FALSE;
+                delete pINST, pINST = NULL, bDelInst = sal_False;
 
                 // #i30690
                 vos::OGuard aSolarGuard( Application::GetSolarMutex() );
@@ -1226,9 +1226,9 @@ void SbModule::RunInit()
      && pImage->GetFlag( SBIMG_INITCODE ) )
     {
         // Flag setzen, dass RunInit aktiv ist (Testtool)
-        GetSbData()->bRunInit = TRUE;
+        GetSbData()->bRunInit = sal_True;
 
-        // BOOL bDelInst = BOOL( pINST == NULL );
+        // sal_Bool bDelInst = sal_Bool( pINST == NULL );
         // if( bDelInst )
             // pINST = new SbiInstance( (StarBASIC*) GetParent() );
         SbModule* pOldMod = pMOD;
@@ -1254,11 +1254,11 @@ void SbModule::RunInit()
         pMOD = pOldMod;
         // if( bDelInst )
             // delete pINST, pINST = NULL;
-        pImage->bInit = TRUE;
-        pImage->bFirstInit = FALSE;
+        pImage->bInit = sal_True;
+        pImage->bFirstInit = sal_False;
 
         // RunInit ist nicht mehr aktiv
-        GetSbData()->bRunInit = FALSE;
+        GetSbData()->bRunInit = sal_False;
     }
 }
 
@@ -1292,7 +1292,7 @@ void SbModule::RemoveVars()
 
 void SbModule::ClearPrivateVars()
 {
-    for( USHORT i = 0 ; i < pProps->Count() ; i++ )
+    for( sal_uInt16 i = 0 ; i < pProps->Count() ; i++ )
     {
         SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
         if( p )
@@ -1303,12 +1303,12 @@ void SbModule::ClearPrivateVars()
                 SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
                 if( pArray )
                 {
-                    for( USHORT j = 0 ; j < pArray->Count() ; j++ )
+                    for( sal_uInt16 j = 0 ; j < pArray->Count() ; j++ )
                     {
                         SbxVariable* pj = PTR_CAST(SbxVariable,pArray->Get( j ));
                         pj->SbxValue::Clear();
                         /*
-                        USHORT nFlags = pj->GetFlags();
+                        sal_uInt16 nFlags = pj->GetFlags();
                         pj->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
                         pj->PutEmpty();
                         pj->SetFlags( nFlags );
@@ -1320,7 +1320,7 @@ void SbModule::ClearPrivateVars()
             {
                 p->SbxValue::Clear();
                 /*
-                USHORT nFlags = p->GetFlags();
+                sal_uInt16 nFlags = p->GetFlags();
                 p->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
                 p->PutEmpty();
                 p->SetFlags( nFlags );
@@ -1360,7 +1360,7 @@ void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
 {
     (void)pDeletedBasic;
 
-    for( USHORT i = 0 ; i < pProps->Count() ; i++ )
+    for( sal_uInt16 i = 0 ; i < pProps->Count() ; i++ )
     {
         SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
         if( p )
@@ -1370,7 +1370,7 @@ void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
                 SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
                 if( pArray )
                 {
-                    for( USHORT j = 0 ; j < pArray->Count() ; j++ )
+                    for( sal_uInt16 j = 0 ; j < pArray->Count() ; j++ )
                     {
                         SbxVariable* pVar = PTR_CAST(SbxVariable,pArray->Get( j ));
                         implClearIfVarDependsOnDeletedBasic( pVar, pDeletedBasic );
@@ -1390,7 +1390,7 @@ void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
 void StarBASIC::ClearAllModuleVars( void )
 {
     // Eigene Module initialisieren
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         // Nur initialisieren, wenn der Startcode schon ausgefuehrt wurde
@@ -1401,7 +1401,7 @@ void StarBASIC::ClearAllModuleVars( void )
     /* #88042 This code can delete already used public vars during runtime!
     // Alle Objekte ueberpruefen, ob es sich um ein Basic handelt
     // Wenn ja, auch dort initialisieren
-    for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+    for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
     {
         SbxVariable* pVar = pObjs->Get( nObj );
         StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1412,7 +1412,7 @@ void StarBASIC::ClearAllModuleVars( void )
 }
 
 // Ausfuehren des Init-Codes aller Module
-void SbModule::GlobalRunInit( BOOL bBasicStart )
+void SbModule::GlobalRunInit( sal_Bool bBasicStart )
 {
     // Wenn kein Basic-Start, nur initialisieren, wenn Modul uninitialisiert
     if( !bBasicStart )
@@ -1423,7 +1423,7 @@ void SbModule::GlobalRunInit( BOOL bBasicStart )
     // Anhand dieses Flags kann in SbModule::Run() nach dem Aufruf
     // von GlobalRunInit festgestellt werden, ob beim initialisieren
     // der Module ein Fehler auftrat. Dann wird nicht gestartet.
-    GetSbData()->bGlobalInitErr = FALSE;
+    GetSbData()->bGlobalInitErr = sal_False;
 
     // Parent vom Modul ist ein Basic
     StarBASIC *pBasic = PTR_CAST(StarBASIC,GetParent());
@@ -1470,15 +1470,15 @@ void SbModule::GlobalRunDeInit( void )
 // Suche nach dem naechsten STMNT-Befehl im Code. Wird vom STMNT-
 // Opcode verwendet, um die Endspalte zu setzen.
 
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol ) const
+const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine, sal_uInt16& nCol ) const
 {
-    return FindNextStmnt( p, nLine, nCol, FALSE );
+    return FindNextStmnt( p, nLine, nCol, sal_False );
 }
 
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
-    BOOL bFollowJumps, const SbiImage* pImg ) const
+const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine, sal_uInt16& nCol,
+    sal_Bool bFollowJumps, const SbiImage* pImg ) const
 {
-    UINT32 nPC = (UINT32) ( p - (const BYTE*) pImage->GetCode() );
+    sal_uInt32 nPC = (sal_uInt32) ( p - (const sal_uInt8*) pImage->GetCode() );
     while( nPC < pImage->GetCodeSize() )
     {
         SbiOpcode eOp = (SbiOpcode ) ( *p++ );
@@ -1486,20 +1486,20 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
         if( bFollowJumps && eOp == _JUMP && pImg )
         {
             DBG_ASSERT( pImg, "FindNextStmnt: pImg==NULL with FollowJumps option" );
-            UINT32 nOp1 = *p++; nOp1 |= *p++ << 8;
+            sal_uInt32 nOp1 = *p++; nOp1 |= *p++ << 8;
             nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
-            p = (const BYTE*) pImg->GetCode() + nOp1;
+            p = (const sal_uInt8*) pImg->GetCode() + nOp1;
         }
         else if( eOp >= SbOP1_START && eOp <= SbOP1_END )
             p += 4, nPC += 4;
         else if( eOp == _STMNT )
         {
-            UINT32 nl, nc;
+            sal_uInt32 nl, nc;
             nl = *p++; nl |= *p++ << 8;
             nl |= *p++ << 16 ; nl |= *p++ << 24;
             nc = *p++; nc |= *p++ << 8;
             nc |= *p++ << 16 ; nc |= *p++ << 24;
-            nLine = (USHORT)nl; nCol = (USHORT)nc;
+            nLine = (sal_uInt16)nl; nCol = (sal_uInt16)nc;
             return p;
         }
         else if( eOp >= SbOP2_START && eOp <= SbOP2_END )
@@ -1515,16 +1515,16 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
 
 // Testen, ob eine Zeile STMNT-Opcodes enthaelt
 
-BOOL SbModule::IsBreakable( USHORT nLine ) const
+sal_Bool SbModule::IsBreakable( sal_uInt16 nLine ) const
 {
     if( !pImage )
-        return FALSE;
-    const BYTE* p = (const BYTE* ) pImage->GetCode();
-    USHORT nl, nc;
+        return sal_False;
+    const sal_uInt8* p = (const sal_uInt8* ) pImage->GetCode();
+    sal_uInt16 nl, nc;
     while( ( p = FindNextStmnt( p, nl, nc ) ) != NULL )
         if( nl == nLine )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 size_t SbModule::GetBPCount() const
@@ -1532,7 +1532,7 @@ size_t SbModule::GetBPCount() const
     return pBreaks ? pBreaks->size() : 0;
 }
 
-USHORT SbModule::GetBP( size_t n ) const
+sal_uInt16 SbModule::GetBP( size_t n ) const
 {
     if( pBreaks && n < pBreaks->size() )
         return pBreaks->operator[]( n );
@@ -1540,34 +1540,34 @@ USHORT SbModule::GetBP( size_t n ) const
         return 0;
 }
 
-BOOL SbModule::IsBP( USHORT nLine ) const
+sal_Bool SbModule::IsBP( sal_uInt16 nLine ) const
 {
     if( pBreaks )
     {
         for( size_t i = 0; i < pBreaks->size(); i++ )
         {
-            USHORT b = pBreaks->operator[]( i );
+            sal_uInt16 b = pBreaks->operator[]( i );
             if( b == nLine )
-                return TRUE;
+                return sal_True;
             if( b < nLine )
                 break;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbModule::SetBP( USHORT nLine )
+sal_Bool SbModule::SetBP( sal_uInt16 nLine )
 {
     if( !IsBreakable( nLine ) )
-        return FALSE;
+        return sal_False;
     if( !pBreaks )
         pBreaks = new SbiBreakpoints;
     size_t i;
     for( i = 0; i < pBreaks->size(); i++ )
     {
-        USHORT b = pBreaks->operator[]( i );
+        sal_uInt16 b = pBreaks->operator[]( i );
         if( b == nLine )
-            return TRUE;
+            return sal_True;
         if( b < nLine )
             break;
     }
@@ -1580,18 +1580,18 @@ BOOL SbModule::SetBP( USHORT nLine )
     return IsBreakable( nLine );
 }
 
-BOOL SbModule::ClearBP( USHORT nLine )
+sal_Bool SbModule::ClearBP( sal_uInt16 nLine )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if( pBreaks )
     {
         for( size_t i = 0; i < pBreaks->size(); i++ )
         {
-            USHORT b = pBreaks->operator[]( i );
+            sal_uInt16 b = pBreaks->operator[]( i );
             if( b == nLine )
             {
                 pBreaks->erase( pBreaks->begin() + i );
-                bRes = TRUE;
+                bRes = sal_True;
                 break;
             }
             if( b < nLine )
@@ -1614,39 +1614,39 @@ SbModule::fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg ) const
 {
         if ( !pImg )
             pImg = pImage;
-        for( UINT32 i = 0; i < pMethods->Count(); i++ )
+        for( sal_uInt32 i = 0; i < pMethods->Count(); i++ )
         {
-            SbMethod* pMeth = PTR_CAST(SbMethod,pMethods->Get( (USHORT)i ) );
+            SbMethod* pMeth = PTR_CAST(SbMethod,pMethods->Get( (sal_uInt16)i ) );
             if( pMeth )
             {
                 //fixup method start positions
                 if ( bCvtToLegacy )
                     pMeth->nStart = pImg->CalcLegacyOffset( pMeth->nStart );
                 else
-                    pMeth->nStart = pImg->CalcNewOffset( (USHORT)pMeth->nStart );
+                    pMeth->nStart = pImg->CalcNewOffset( (sal_uInt16)pMeth->nStart );
             }
         }
 
 }
 
-BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     Clear();
     if( !SbxObject::LoadData( rStrm, 1 ) )
-        return FALSE;
+        return sal_False;
     // Precaution...
     SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
-    BYTE bImage;
+    sal_uInt8 bImage;
     rStrm >> bImage;
     if( bImage )
     {
         SbiImage* p = new SbiImage;
-        UINT32 nImgVer = 0;
+        sal_uInt32 nImgVer = 0;
 
         if( !p->Load( rStrm, nImgVer ) )
         {
             delete p;
-            return FALSE;
+            return sal_False;
         }
         // If the image is in old format, we fix up the method start offsets
         if ( nImgVer < B_EXT_IMG_VERSION )
@@ -1674,24 +1674,24 @@ BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
             delete p;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbModule::StoreData( SvStream& rStrm ) const
+sal_Bool SbModule::StoreData( SvStream& rStrm ) const
 {
-    BOOL bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
+    sal_Bool bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
     if ( bFixup )
         fixUpMethodStart( true );
-    BOOL bRet = SbxObject::StoreData( rStrm );
+    sal_Bool bRet = SbxObject::StoreData( rStrm );
     if ( !bRet )
-        return FALSE;
+        return sal_False;
 
     if( pImage )
     {
         pImage->aOUSource = aOUSource;
         pImage->aComment = aComment;
         pImage->aName = GetName();
-        rStrm << (BYTE) 1;
+        rStrm << (sal_uInt8) 1;
         // # PCode is saved only for legacy formats only
         // It should be noted that it probably isn't necessary
         // It would be better not to store the image ( more flexible with
@@ -1708,12 +1708,12 @@ BOOL SbModule::StoreData( SvStream& rStrm ) const
         aImg.aOUSource = aOUSource;
         aImg.aComment = aComment;
         aImg.aName = GetName();
-        rStrm << (BYTE) 1;
+        rStrm << (sal_uInt8) 1;
         return aImg.Save( rStrm );
     }
 }
 
-BOOL SbModule::ExceedsLegacyModuleSize()
+sal_Bool SbModule::ExceedsLegacyModuleSize()
 {
     if ( !IsCompiled() )
         Compile();
@@ -1724,17 +1724,17 @@ BOOL SbModule::ExceedsLegacyModuleSize()
 
 
 // Store only image, no source
-BOOL SbModule::StoreBinaryData( SvStream& rStrm )
+sal_Bool SbModule::StoreBinaryData( SvStream& rStrm )
 {
     return StoreBinaryData( rStrm, 0 );
 }
 
-BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    BOOL bRet = Compile();
+    sal_Bool bRet = Compile();
     if( bRet )
     {
-        BOOL bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
+        sal_Bool bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
 
         if ( bFixup ) // save in old image format, fix up method starts
             fixUpMethodStart( true );
@@ -1745,7 +1745,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
             pImage->aComment = aComment;
             pImage->aName = GetName();
 
-            rStrm << (BYTE) 1;
+            rStrm << (sal_uInt8) 1;
                     if ( nVer )
                         bRet = pImage->Save( rStrm, B_EXT_IMG_VERSION );
                     else
@@ -1762,7 +1762,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
 // Called for >= OO 1.0 passwd protected libraries only
 //
 
-BOOL SbModule::LoadBinaryData( SvStream& rStrm )
+sal_Bool SbModule::LoadBinaryData( SvStream& rStrm )
 {
     ::rtl::OUString aKeepSource = aOUSource;
     bool bRet = LoadData( rStrm, 2 );
@@ -1772,10 +1772,10 @@ BOOL SbModule::LoadBinaryData( SvStream& rStrm )
 }
 
 
-BOOL SbModule::LoadCompleted()
+sal_Bool SbModule::LoadCompleted()
 {
     SbxArray* p = GetMethods();
-    USHORT i;
+    sal_uInt16 i;
     for( i = 0; i < p->Count(); i++ )
     {
         SbMethod* q = PTR_CAST(SbMethod,p->Get( i ) );
@@ -1789,7 +1789,7 @@ BOOL SbModule::LoadCompleted()
         if( q )
             q->pMod = this;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint )
@@ -1818,12 +1818,12 @@ void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rH
                     aVals.eType = SbxVARIANT;
 
                     SbxArray* pArg = pVar->GetParameters();
-                    USHORT nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
+                    sal_uInt16 nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
                     if( nVarParCount > 1 )
                     {
                         SbxArrayRef xMethParameters = new SbxArray;
                         xMethParameters->Put( pMeth, 0 );   // Method as parameter 0
-                        for( USHORT i = 1 ; i < nVarParCount ; ++i )
+                        for( sal_uInt16 i = 1 ; i < nVarParCount ; ++i )
                         {
                             SbxVariable* pPar = pArg->Get( i );
                             xMethParameters->Put( pPar, i );
@@ -1891,32 +1891,32 @@ SbJScriptModule::SbJScriptModule( const String& rName )
 {
 }
 
-BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     (void)nVer;
 
     Clear();
     if( !SbxObject::LoadData( rStrm, 1 ) )
-        return FALSE;
+        return sal_False;
 
     // Source-String holen
     String aTmp;
     rStrm.ReadByteString( aTmp, gsl_getSystemTextEncoding() );
     aOUSource = aTmp;
     //rStrm >> aSource;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
+sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const
 {
     if( !SbxObject::StoreData( rStrm ) )
-        return FALSE;
+        return sal_False;
 
     // Source-String schreiben
     String aTmp = aOUSource;
     rStrm.WriteByteString( aTmp, gsl_getSystemTextEncoding() );
     //rStrm << aSource;
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1925,7 +1925,7 @@ BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
 SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p )
         : SbxMethod( r, t ), pMod( p )
 {
-    bInvalid     = TRUE;
+    bInvalid     = sal_True;
     nStart       =
     nDebugFlags  =
     nLine1       =
@@ -1970,35 +1970,35 @@ SbxArray* SbMethod::GetStatics()
     return refStatics;
 }
 
-BOOL SbMethod::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbMethod::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     if( !SbxMethod::LoadData( rStrm, 1 ) )
-        return FALSE;
-    INT16 n;
+        return sal_False;
+    sal_Int16 n;
     rStrm >> n;
-    INT16 nTempStart = (INT16)nStart;
+    sal_Int16 nTempStart = (sal_Int16)nStart;
     // nDebugFlags = n;     // AB 16.1.96: Nicht mehr uebernehmen
     if( nVer == 2 )
         rStrm >> nLine1 >> nLine2 >> nTempStart >> bInvalid;
     // AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
     SetFlag( SBX_NO_MODIFY );
     nStart = nTempStart;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbMethod::StoreData( SvStream& rStrm ) const
+sal_Bool SbMethod::StoreData( SvStream& rStrm ) const
 {
     if( !SbxMethod::StoreData( rStrm ) )
-        return FALSE;
-    rStrm << (INT16) nDebugFlags
-          << (INT16) nLine1
-          << (INT16) nLine2
-          << (INT16) nStart
-          << (BYTE)  bInvalid;
-    return TRUE;
+        return sal_False;
+    rStrm << (sal_Int16) nDebugFlags
+          << (sal_Int16) nLine1
+          << (sal_Int16) nLine2
+          << (sal_Int16) nStart
+          << (sal_uInt8)  bInvalid;
+    return sal_True;
 }
 
-void SbMethod::GetLineRange( USHORT& l1, USHORT& l2 )
+void SbMethod::GetLineRange( sal_uInt16& l1, sal_uInt16& l2 )
 {
     l1 = nLine1; l2 = nLine2;
 }
@@ -2048,7 +2048,7 @@ ErrCode SbMethod::Call( SbxValue* pRet )
 
 
 // #100883 Own Broadcast for SbMethod
-void SbMethod::Broadcast( ULONG nHintId )
+void SbMethod::Broadcast( sal_uIntPtr nHintId )
 {
     if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() )
     {
@@ -2080,7 +2080,7 @@ void SbMethod::Broadcast( ULONG nHintId )
         pCst = pSave;
         pSave->Broadcast( SbxHint( nHintId, pThisCopy ) );
 
-        USHORT nSaveFlags = GetFlags();
+        sal_uInt16 nSaveFlags = GetFlags();
         SetFlag( SBX_READWRITE );
         pCst = NULL;
         Put( pThisCopy->GetValues_Impl() );
@@ -2382,7 +2382,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
             {
                 SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
                 unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), aArguments[i] );
-                xArray->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+                xArray->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
 
                 // Enable passing by ref
                 if ( xSbxVar->GetType() != SbxVARIANT )
@@ -2395,7 +2395,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
 
             for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
             {
-                aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< USHORT >(i) + 1) );
+                aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< sal_uInt16 >(i) + 1) );
             }
             pMeth->SetParameters( NULL );
         }
@@ -2465,10 +2465,10 @@ SbUserFormModuleInstance::SbUserFormModuleInstance( SbUserFormModule* pParentMod
 {
 }
 
-BOOL SbUserFormModuleInstance::IsClass( const XubString& rName ) const
+sal_Bool SbUserFormModuleInstance::IsClass( const XubString& rName ) const
 {
-    BOOL bParentNameMatches = m_pParentModule->GetName().EqualsIgnoreCaseAscii( rName );
-    BOOL bRet = bParentNameMatches || SbxObject::IsClass( rName );
+    sal_Bool bParentNameMatches = m_pParentModule->GetName().EqualsIgnoreCaseAscii( rName );
+    sal_Bool bRet = bParentNameMatches || SbxObject::IsClass( rName );
     return bRet;
 }
 
@@ -2613,7 +2613,7 @@ SbUserFormModule::Find( const XubString& rName, SbxClassType t )
 SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
         : SbxProperty( r, t ), pMod( p )
 {
-    bInvalid = FALSE;
+    bInvalid = sal_False;
 }
 
 SbProperty::~SbProperty()
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index 74559bf0e6c4..46df47cbd665 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -32,7 +32,7 @@
 #include "buffer.hxx"
 #include <string.h>
 
-const static UINT32 UP_LIMIT=0xFFFFFF00L;
+const static sal_uInt32 UP_LIMIT=0xFFFFFF00L;
 
 // Der SbiBuffer wird in Inkrements von mindestens 16 Bytes erweitert.
 // Dies ist notwendig, da viele Klassen von einer Pufferlaenge
@@ -69,24 +69,24 @@ char* SbiBuffer::GetBuffer()
 // Test, ob der Puffer n Bytes aufnehmen kann.
 // Im Zweifelsfall wird er vergroessert
 
-BOOL SbiBuffer::Check( USHORT n )
+sal_Bool SbiBuffer::Check( sal_uInt16 n )
 {
-    if( !n ) return TRUE;
-    if( ( static_cast<UINT32>( nOff )+ n ) >  static_cast<UINT32>( nSize ) )
+    if( !n ) return sal_True;
+    if( ( static_cast<sal_uInt32>( nOff )+ n ) >  static_cast<sal_uInt32>( nSize ) )
     {
         if( nInc == 0 )
-            return FALSE;
-        USHORT nn = 0;
+            return sal_False;
+        sal_uInt16 nn = 0;
         while( nn < n ) nn = nn + nInc;
         char* p;
-        if( ( static_cast<UINT32>( nSize ) + nn ) > UP_LIMIT ) p = NULL;
+        if( ( static_cast<sal_uInt32>( nSize ) + nn ) > UP_LIMIT ) p = NULL;
         else p = new char [nSize + nn];
         if( !p )
         {
             pParser->Error( SbERR_PROG_TOO_LARGE );
             nInc = 0;
             delete[] pBuf; pBuf = NULL;
-            return FALSE;
+            return sal_False;
         }
         else
         {
@@ -97,19 +97,19 @@ BOOL SbiBuffer::Check( USHORT n )
             nSize = nSize + nn;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 // Angleich des Puffers auf die uebergebene Byte-Grenze
 
-void SbiBuffer::Align( INT32 n )
+void SbiBuffer::Align( sal_Int32 n )
 {
     if( nOff % n ) {
-        UINT32 nn =( ( nOff + n ) / n ) * n;
+        sal_uInt32 nn =( ( nOff + n ) / n ) * n;
         if( nn <= UP_LIMIT )
         {
             nn = nn - nOff;
-            if( Check( static_cast<USHORT>(nn) ) )
+            if( Check( static_cast<sal_uInt16>(nn) ) )
             {
                 memset( pCur, 0, nn );
                 pCur += nn;
@@ -121,13 +121,13 @@ void SbiBuffer::Align( INT32 n )
 
 // Patch einer Location
 
-void SbiBuffer::Patch( UINT32 off, UINT32 val )
+void SbiBuffer::Patch( sal_uInt32 off, sal_uInt32 val )
 {
-    if( ( off + sizeof( UINT32 ) ) < nOff )
+    if( ( off + sizeof( sal_uInt32 ) ) < nOff )
     {
-        UINT16 val1 = static_cast<UINT16>( val & 0xFFFF );
-        UINT16 val2 = static_cast<UINT16>( val >> 16 );
-        BYTE* p = (BYTE*) pBuf + off;
+        sal_uInt16 val1 = static_cast<sal_uInt16>( val & 0xFFFF );
+        sal_uInt16 val2 = static_cast<sal_uInt16>( val >> 16 );
+        sal_uInt8* p = (sal_uInt8*) pBuf + off;
         *p++ = (char) ( val1 & 0xFF );
         *p++ = (char) ( val1 >> 8 );
         *p++ = (char) ( val2 & 0xFF );
@@ -139,18 +139,18 @@ void SbiBuffer::Patch( UINT32 off, UINT32 val )
 // bauen eine Kette auf. Der Anfang der Kette ist beim uebergebenen
 // Parameter, das Ende der Kette ist 0.
 
-void SbiBuffer::Chain( UINT32 off )
+void SbiBuffer::Chain( sal_uInt32 off )
 {
     if( off && pBuf )
     {
-        BYTE *ip;
-        UINT32 i = off;
-        UINT32 val1 = (nOff & 0xFFFF);
-        UINT32 val2 = (nOff >> 16);
+        sal_uInt8 *ip;
+        sal_uInt32 i = off;
+        sal_uInt32 val1 = (nOff & 0xFFFF);
+        sal_uInt32 val2 = (nOff >> 16);
         do
         {
-            ip = (BYTE*) pBuf + i;
-            BYTE* pTmp = ip;
+            ip = (sal_uInt8*) pBuf + i;
+            sal_uInt8* pTmp = ip;
                      i =  *pTmp++; i |= *pTmp++ << 8; i |= *pTmp++ << 16; i |= *pTmp++ << 24;
 
             if( i >= nOff )
@@ -166,84 +166,84 @@ void SbiBuffer::Chain( UINT32 off )
     }
 }
 
-BOOL SbiBuffer::operator +=( INT8 n )
+sal_Bool SbiBuffer::operator +=( sal_Int8 n )
 {
     if( Check( 1 ) )
     {
-        *pCur++ = (char) n; nOff++; return TRUE;
-    } else return FALSE;
+        *pCur++ = (char) n; nOff++; return sal_True;
+    } else return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( UINT8 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt8 n )
 {
     if( Check( 1 ) )
     {
-        *pCur++ = (char) n; nOff++; return TRUE;
-    } else return FALSE;
+        *pCur++ = (char) n; nOff++; return sal_True;
+    } else return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( INT16 n )
+sal_Bool SbiBuffer::operator +=( sal_Int16 n )
 {
     if( Check( 2 ) )
     {
         *pCur++ = (char) ( n & 0xFF );
         *pCur++ = (char) ( n >> 8 );
-        nOff += 2; return TRUE;
-    } else return FALSE;
+        nOff += 2; return sal_True;
+    } else return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( UINT16 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt16 n )
 {
     if( Check( 2 ) )
     {
         *pCur++ = (char) ( n & 0xFF );
         *pCur++ = (char) ( n >> 8 );
-        nOff += 2; return TRUE;
-    } else return FALSE;
+        nOff += 2; return sal_True;
+    } else return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( UINT32 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt32 n )
 {
     if( Check( 4 ) )
     {
-        UINT16 n1 = static_cast<UINT16>( n & 0xFFFF );
-        UINT16 n2 = static_cast<UINT16>( n >> 16 );
+        sal_uInt16 n1 = static_cast<sal_uInt16>( n & 0xFFFF );
+        sal_uInt16 n2 = static_cast<sal_uInt16>( n >> 16 );
         if ( operator +=( n1 ) && operator +=( n2 ) )
-            return TRUE;
-        return TRUE;
+            return sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( INT32 n )
+sal_Bool SbiBuffer::operator +=( sal_Int32 n )
 {
-    return operator +=( (UINT32) n );
+    return operator +=( (sal_uInt32) n );
 }
 
 
-BOOL SbiBuffer::operator +=( const String& n )
+sal_Bool SbiBuffer::operator +=( const String& n )
 {
-    USHORT l = n.Len() + 1;
+    sal_uInt16 l = n.Len() + 1;
     if( Check( l ) )
     {
         ByteString aByteStr( n, gsl_getSystemTextEncoding() );
         memcpy( pCur, aByteStr.GetBuffer(), l );
         pCur += l;
         nOff = nOff + l;
-        return TRUE;
+        return sal_True;
     }
-    else return FALSE;
+    else return sal_False;
 }
 
-BOOL SbiBuffer::Add( const void* p, USHORT len )
+sal_Bool SbiBuffer::Add( const void* p, sal_uInt16 len )
 {
     if( Check( len ) )
     {
         memcpy( pCur, p, len );
         pCur += len;
         nOff = nOff + len;
-        return TRUE;
-    } else return FALSE;
+        return sal_True;
+    } else return sal_False;
 }
 
 
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 93fb18baf86e..a8c7e3f5330f 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -40,13 +40,13 @@ SbiCodeGen::SbiCodeGen( SbModule& r, SbiParser* p, short nInc )
          : rMod( r ), aCode( p, nInc )
 {
     pParser = p;
-    bStmnt = FALSE;
+    bStmnt = sal_False;
     nLine = 0;
     nCol = 0;
     nForLevel = 0;
 }
 
-UINT32 SbiCodeGen::GetPC()
+sal_uInt32 SbiCodeGen::GetPC()
 {
     return aCode.GetSize();
 }
@@ -55,7 +55,7 @@ UINT32 SbiCodeGen::GetPC()
 
 void SbiCodeGen::Statement()
 {
-    bStmnt = TRUE;
+    bStmnt = sal_True;
 
     nLine = pParser->GetLine();
     nCol  = pParser->GetCol1();
@@ -71,7 +71,7 @@ void SbiCodeGen::GenStmnt()
 {
     if( bStmnt )
     {
-        bStmnt = FALSE;
+        bStmnt = sal_False;
         Gen( _STMNT, nLine, nCol );
     }
 }
@@ -79,39 +79,39 @@ void SbiCodeGen::GenStmnt()
 // Die Gen-Routinen returnen den Offset des 1. Operanden,
 // damit Jumps dort ihr Backchain versenken koennen
 
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode )
 {
 #ifdef DBG_UTIL
     if( eOpcode < SbOP0_START || eOpcode > SbOP0_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE1" );
 #endif
     GenStmnt();
-    aCode += (UINT8) eOpcode;
+    aCode += (sal_uInt8) eOpcode;
     return GetPC();
 }
 
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode, sal_uInt32 nOpnd )
 {
 #ifdef DBG_UTIL
     if( eOpcode < SbOP1_START || eOpcode > SbOP1_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE2" );
 #endif
     GenStmnt();
-    aCode += (UINT8) eOpcode;
-    UINT32 n = GetPC();
+    aCode += (sal_uInt8) eOpcode;
+    sal_uInt32 n = GetPC();
     aCode += nOpnd;
     return n;
 }
 
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd1, UINT32 nOpnd2 )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode, sal_uInt32 nOpnd1, sal_uInt32 nOpnd2 )
 {
 #ifdef DBG_UTIL
     if( eOpcode < SbOP2_START || eOpcode > SbOP2_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE3" );
 #endif
     GenStmnt();
-    aCode += (UINT8) eOpcode;
-    UINT32 n = GetPC();
+    aCode += (sal_uInt8) eOpcode;
+    sal_uInt32 n = GetPC();
     aCode += nOpnd1;
     aCode += nOpnd2;
     return n;
@@ -178,7 +178,7 @@ void SbiCodeGen::Save()
             String aProcName = pProc->GetName();
             String aIfaceProcName;
             String aIfaceName;
-            USHORT nPassCount = 1;
+            sal_uInt16 nPassCount = 1;
             if( nIfaceCount )
             {
                 int nPropPrefixFound =
@@ -206,7 +206,7 @@ void SbiCodeGen::Save()
                 }
             }
             SbMethod* pMeth = NULL;
-            for( USHORT nPass = 0 ; nPass < nPassCount ; nPass++ )
+            for( sal_uInt16 nPass = 0 ; nPass < nPassCount ; nPass++ )
             {
                 if( nPass == 1 )
                     aProcName = aIfaceProcName;
@@ -269,7 +269,7 @@ void SbiCodeGen::Save()
                     // Die Parameter:
                     SbxInfo* pInfo = pMeth->GetInfo();
                     String aHelpFile, aComment;
-                    ULONG nHelpId = 0;
+                    sal_uIntPtr nHelpId = 0;
                     if( pInfo )
                     {
                         // Die Zusatzdaten retten
@@ -282,7 +282,7 @@ void SbiCodeGen::Save()
                     pInfo->SetComment( aComment );
                     SbiSymPool* pPool = &pProc->GetParams();
                     // Das erste Element ist immer der Funktionswert!
-                    for( USHORT i = 1; i < pPool->GetSize(); i++ )
+                    for( sal_uInt16 i = 1; i < pPool->GetSize(); i++ )
                     {
                         SbiSymDef* pPar = pPool->Get( i );
                         SbxDataType t = pPar->GetType();
@@ -291,14 +291,14 @@ void SbiCodeGen::Save()
                         if( pPar->GetDims() )
                             t = (SbxDataType) ( t | SbxARRAY );
                         // #33677 Optional-Info durchreichen
-                        USHORT nFlags = SBX_READ;
+                        sal_uInt16 nFlags = SBX_READ;
                         if( pPar->IsOptional() )
                             nFlags |= SBX_OPTIONAL;
 
                         pInfo->AddParam( pPar->GetName(), t, nFlags );
 
-                        UINT32 nUserData = 0;
-                        USHORT nDefaultId = pPar->GetDefaultId();
+                        sal_uInt32 nUserData = 0;
+                        sal_uInt16 nDefaultId = pPar->GetDefaultId();
                         if( nDefaultId )
                             nUserData |= nDefaultId;
                         if( pPar->IsParamArray() )
@@ -320,14 +320,14 @@ void SbiCodeGen::Save()
 
     // Der globale StringPool. 0 ist nicht belegt.
     SbiStringPool* pPool = &pParser->aGblStrings;
-    USHORT nSize = pPool->GetSize();
+    sal_uInt16 nSize = pPool->GetSize();
     p->MakeStrings( nSize );
-    USHORT i;
+    sal_uInt16 i;
     for( i = 1; i <= nSize; i++ )
         p->AddString( pPool->Find( i ) );
 
     // Typen einfuegen
-    USHORT nCount = pParser->rTypeArray->Count();
+    sal_uInt16 nCount = pParser->rTypeArray->Count();
     for (i = 0; i < nCount; i++)
          p->AddType((SbxObject *)pParser->rTypeArray->Get(i));
 
@@ -350,7 +350,7 @@ class PCodeVisitor
 public:
     virtual ~PCodeVisitor();
 
-    virtual void start( BYTE* pStart ) = 0;
+    virtual void start( sal_uInt8* pStart ) = 0;
     virtual void processOpCode0( SbiOpcode eOp ) = 0;
     virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) = 0;
     virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) = 0;
@@ -366,8 +366,8 @@ class PCodeBufferWalker
 {
 private:
     T  m_nBytes;
-    BYTE* m_pCode;
-    T readParam( BYTE*& pCode )
+    sal_uInt8* m_pCode;
+    T readParam( sal_uInt8*& pCode )
     {
         short nBytes = sizeof( T );
         T nOp1=0;
@@ -376,15 +376,15 @@ private:
         return nOp1;
     }
 public:
-    PCodeBufferWalker( BYTE* pCode, T nBytes ): m_nBytes( nBytes ), m_pCode( pCode )
+    PCodeBufferWalker( sal_uInt8* pCode, T nBytes ): m_nBytes( nBytes ), m_pCode( pCode )
     {
     }
     void visitBuffer( PCodeVisitor< T >& visitor )
     {
-        BYTE* pCode = m_pCode;
+        sal_uInt8* pCode = m_pCode;
         if ( !pCode )
             return;
-        BYTE* pEnd = pCode + m_nBytes;
+        sal_uInt8* pEnd = pCode + m_nBytes;
         visitor.start( m_pCode );
         T nOp1 = 0, nOp2 = 0;
         for( ; pCode < pEnd; )
@@ -426,7 +426,7 @@ class OffSetAccumulator : public PCodeVisitor< T >
 public:
 
     OffSetAccumulator() : m_nNumOp0(0), m_nNumSingleParams(0), m_nNumDoubleParams(0){}
-    virtual void start( BYTE* /*pStart*/ ){}
+    virtual void start( sal_uInt8* /*pStart*/ ){}
     virtual void processOpCode0( SbiOpcode /*eOp*/ ){ ++m_nNumOp0; }
     virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ){  ++m_nNumSingleParams; }
     virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) { ++m_nNumDoubleParams; }
@@ -450,18 +450,18 @@ template < class T, class S >
 
 class BufferTransformer : public PCodeVisitor< T >
 {
-    BYTE* m_pStart;
+    sal_uInt8* m_pStart;
     SbiBuffer m_ConvertedBuf;
 public:
     BufferTransformer():m_pStart(NULL), m_ConvertedBuf( NULL, 1024 ) {}
-    virtual void start( BYTE* pStart ){ m_pStart = pStart; }
+    virtual void start( sal_uInt8* pStart ){ m_pStart = pStart; }
     virtual void processOpCode0( SbiOpcode eOp )
     {
-        m_ConvertedBuf += (UINT8)eOp;
+        m_ConvertedBuf += (sal_uInt8)eOp;
     }
     virtual void processOpCode1( SbiOpcode eOp, T nOp1 )
     {
-        m_ConvertedBuf += (UINT8)eOp;
+        m_ConvertedBuf += (sal_uInt8)eOp;
         switch( eOp )
         {
             case _JUMP:
@@ -486,7 +486,7 @@ public:
     }
     virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 )
     {
-        m_ConvertedBuf += (UINT8)eOp;
+        m_ConvertedBuf += (sal_uInt8)eOp;
         if ( eOp == _CASEIS )
                 if ( nOp1 )
                     nOp1 = static_cast<T>( convertBufferOffSet(m_pStart, nOp1) );
@@ -503,7 +503,7 @@ public:
     {
         return m_ConvertedBuf;
     }
-    static S convertBufferOffSet( BYTE* pStart, T nOp1 )
+    static S convertBufferOffSet( sal_uInt8* pStart, T nOp1 )
     {
         PCodeBufferWalker< T > aBuff( pStart, nOp1);
         OffSetAccumulator< T, S > aVisitor;
@@ -512,16 +512,16 @@ public:
     }
 };
 
-UINT32
-SbiCodeGen::calcNewOffSet( BYTE* pCode, UINT16 nOffset )
+sal_uInt32
+SbiCodeGen::calcNewOffSet( sal_uInt8* pCode, sal_uInt16 nOffset )
 {
-    return BufferTransformer< UINT16, UINT32 >::convertBufferOffSet( pCode, nOffset );
+    return BufferTransformer< sal_uInt16, sal_uInt32 >::convertBufferOffSet( pCode, nOffset );
 }
 
-UINT16
-SbiCodeGen::calcLegacyOffSet( BYTE* pCode, UINT32 nOffset )
+sal_uInt16
+SbiCodeGen::calcLegacyOffSet( sal_uInt8* pCode, sal_uInt32 nOffset )
 {
-    return BufferTransformer< UINT32, UINT16 >::convertBufferOffSet( pCode, nOffset );
+    return BufferTransformer< sal_uInt32, sal_uInt16 >::convertBufferOffSet( pCode, nOffset );
 }
 
 template <class T, class S>
@@ -531,9 +531,9 @@ PCodeBuffConvertor<T,S>::convert()
     PCodeBufferWalker< T > aBuf( m_pStart, m_nSize );
     BufferTransformer< T, S > aTrnsfrmer;
     aBuf.visitBuffer( aTrnsfrmer );
-    m_pCnvtdBuf = (BYTE*)aTrnsfrmer.buffer().GetBuffer();
+    m_pCnvtdBuf = (sal_uInt8*)aTrnsfrmer.buffer().GetBuffer();
     m_nCnvtdSize = static_cast<S>( aTrnsfrmer.buffer().GetSize() );
 }
 
-template class PCodeBuffConvertor< UINT16, UINT32 >;
-template class PCodeBuffConvertor< UINT32, UINT16 >;
+template class PCodeBuffConvertor< sal_uInt16, sal_uInt32 >;
+template class PCodeBuffConvertor< sal_uInt32, sal_uInt16 >;
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 4d188ec1ca8a..1ba8982404e4 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -37,7 +37,7 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
 // Returnwert: eine neue Instanz, die eingefuegt und dann geloescht wird.
 // Array-Indexe werden als SbiDimList zurueckgegeben
 
-SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
+SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, sal_Bool bStatic, sal_Bool bConst )
 {
     bool bWithEvents = false;
     if( Peek() == WITHEVENTS )
@@ -72,7 +72,7 @@ SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
 // Aufloesen einer AS-Typdeklaration
 // Der Datentyp wird in die uebergebene Variable eingetragen
 
-void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
+void SbiParser::TypeDecl( SbiSymDef& rDef, sal_Bool bAsNewAlreadyParsed )
 {
     SbxDataType eType = rDef.GetType();
     short nSize = 0;
@@ -193,34 +193,34 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
 
 void SbiParser::Dim()
 {
-    DefVar( _DIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : FALSE );
+    DefVar( _DIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : sal_False );
 }
 
-void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
+void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
 {
     SbiSymPool* pOldPool = pPool;
-    BOOL bSwitchPool = FALSE;
-    BOOL bPersistantGlobal = FALSE;
+    sal_Bool bSwitchPool = sal_False;
+    sal_Bool bPersistantGlobal = sal_False;
     SbiToken eFirstTok = eCurTok;
     if( pProc && ( eCurTok == GLOBAL || eCurTok == PUBLIC || eCurTok == PRIVATE ) )
         Error( SbERR_NOT_IN_SUBR, eCurTok );
     if( eCurTok == PUBLIC || eCurTok == GLOBAL )
     {
-        bSwitchPool = TRUE;     // im richtigen Moment auf globalen Pool schalten
+        bSwitchPool = sal_True;     // im richtigen Moment auf globalen Pool schalten
         if( eCurTok == GLOBAL )
-            bPersistantGlobal = TRUE;
+            bPersistantGlobal = sal_True;
     }
     // behavior in VBA is that a module scope variable's lifetime is
     // tied to the document. e.g. a module scope variable is global
        if(  GetBasic()->IsDocBasic() && bVBASupportOn && !pProc )
-        bPersistantGlobal = TRUE;
+        bPersistantGlobal = sal_True;
     // PRIVATE ist Synonym fuer DIM
     // _CONST_?
-    BOOL bConst = FALSE;
+    sal_Bool bConst = sal_False;
     if( eCurTok == _CONST_ )
-        bConst = TRUE;
+        bConst = sal_True;
     else if( Peek() == _CONST_ )
-        Next(), bConst = TRUE;
+        Next(), bConst = sal_True;
 
     // #110004 It can also be a sub/function
     if( !bConst && (eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
@@ -241,10 +241,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             if( bNewGblDefs && nGblChain == 0 )
             {
                 nGblChain = aGen.Gen( _JUMP, 0 );
-                bNewGblDefs = FALSE;
+                bNewGblDefs = sal_False;
             }
             Next();
-            DefProc( FALSE, bPrivate );
+            DefProc( sal_False, bPrivate );
             return;
         }
         else if( eCurTok == ENUM )
@@ -291,14 +291,14 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
     SbiDimList* pDim;
 
     // AB 9.7.97, #40689, Statics -> Modul-Initialisierung, in Sub ueberspringen
-    UINT32 nEndOfStaticLbl = 0;
+    sal_uInt32 nEndOfStaticLbl = 0;
     if( !bVBASupportOn && bStatic )
     {
         nEndOfStaticLbl = aGen.Gen( _JUMP, 0 );
         aGen.Statement();   // bei static hier nachholen
     }
 
-    BOOL bDefined = FALSE;
+    sal_Bool bDefined = sal_False;
     while( ( pDef = VarDecl( &pDim, bStatic, bConst ) ) != NULL )
     {
         EnableErrors();
@@ -307,12 +307,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             pPool = &aGlobals;
         SbiSymDef* pOld = pPool->Find( pDef->GetName() );
         // AB 31.3.1996, #25651#, auch in Runtime-Library suchen
-        BOOL bRtlSym = FALSE;
+        sal_Bool bRtlSym = sal_False;
         if( !pOld )
         {
             pOld = CheckRTLForSym( pDef->GetName(), SbxVARIANT );
             if( pOld )
-                bRtlSym = TRUE;
+                bRtlSym = sal_True;
         }
         if( pOld && !(eOp == _REDIM || eOp == _REDIMP) )
         {
@@ -321,7 +321,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
         }
         if( pOld )
         {
-            bDefined = TRUE;
+            bDefined = sal_True;
             // Bei RTL-Symbol immer Fehler
             if( !bRtlSym && (eOp == _REDIM || eOp == _REDIMP) )
             {
@@ -367,11 +367,11 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
                                 }
                 global:         aGen.BackChain( nGblChain );
                                 nGblChain = 0;
-                                bGblDefs = bNewGblDefs = TRUE;
+                                bGblDefs = bNewGblDefs = sal_True;
                                 break;
                 default:        eOp2 = _LOCAL;
             }
-            UINT32 nOpnd2 = sal::static_int_cast< UINT16 >( pDef->GetType() );
+            sal_uInt32 nOpnd2 = sal::static_int_cast< sal_uInt16 >( pDef->GetType() );
             if( pDef->IsWithEvents() )
                 nOpnd2 |= SBX_TYPE_WITH_EVENTS_FLAG;
 
@@ -380,7 +380,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
 
             short nFixedStringLength = pDef->GetFixedStringLength();
             if( nFixedStringLength >= 0 )
-                nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (UINT32(nFixedStringLength) << 17));     // len = all bits above 0x10000
+                nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (sal_uInt32(nFixedStringLength) << 17));     // len = all bits above 0x10000
 
             aGen.Gen( eOp2, pDef->GetId(), nOpnd2 );
         }
@@ -487,10 +487,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
                 }
                 pDef->SetDims( pDim->GetDims() );
                 if( bPersistantGlobal )
-                    pDef->SetGlobal( TRUE );
+                    pDef->SetGlobal( sal_True );
                 SbiExpression aExpr( this, *pDef, pDim );
                 aExpr.Gen();
-                pDef->SetGlobal( FALSE );
+                pDef->SetGlobal( sal_False );
                 aGen.Gen( (eOp == _STATIC) ? _DIM : eOp );
             }
         }
@@ -515,7 +515,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
     {
         // globalen Chain pflegen
         nGblChain = aGen.Gen( _JUMP, 0 );
-        bGblDefs = bNewGblDefs = TRUE;
+        bGblDefs = bNewGblDefs = sal_True;
 
         // fuer Sub Sprung auf Ende der statics eintragen
         aGen.BackChain( nEndOfStaticLbl );
@@ -528,7 +528,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
 
 void SbiParser::ReDim()
 {
-    DefVar( _REDIM, (  pProc && bVBASupportOn ) ? pProc->IsStatic() : FALSE );
+    DefVar( _REDIM, (  pProc && bVBASupportOn ) ? pProc->IsStatic() : sal_False );
 }
 
 // ERASE array, ...
@@ -548,10 +548,10 @@ void SbiParser::Erase()
 
 void SbiParser::Type()
 {
-    DefType( FALSE );
+    DefType( sal_False );
 }
 
-void SbiParser::DefType( BOOL bPrivate )
+void SbiParser::DefType( sal_Bool bPrivate )
 {
     // TODO: Use bPrivate
     (void)bPrivate;
@@ -570,7 +570,7 @@ void SbiParser::DefType( BOOL bPrivate )
 
     SbiSymDef* pElem;
     SbiDimList* pDim = NULL;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     while( !bDone && !IsEof() )
     {
@@ -578,7 +578,7 @@ void SbiParser::DefType( BOOL bPrivate )
         {
             case ENDTYPE :
                 pElem = NULL;
-                bDone = TRUE;
+                bDone = sal_True;
                 Next();
             break;
 
@@ -590,9 +590,9 @@ void SbiParser::DefType( BOOL bPrivate )
 
             default:
                 pDim = NULL;
-                pElem = VarDecl(&pDim,FALSE,FALSE);
+                pElem = VarDecl(&pDim,sal_False,sal_False);
                 if( !pElem )
-                    bDone = TRUE;   // Error occured
+                    bDone = sal_True;   // Error occured
         }
         if( pElem )
         {
@@ -613,8 +613,8 @@ void SbiParser::DefType( BOOL bPrivate )
 
                         for ( short i=0; i<pDim->GetSize();++i )
                         {
-                            INT32 ub = -1;
-                            INT32 lb = nBase;
+                            sal_Int32 ub = -1;
+                            sal_Int32 lb = nBase;
                             SbiExprNode* pNode =  pDim->Get(i)->GetExprNode();
                             ub = pNode->GetNumber();
                             if ( !pDim->Get( i )->IsBased() ) // each dim is low/up
@@ -633,7 +633,7 @@ void SbiParser::DefType( BOOL bPrivate )
                     }
                     else
                         pArray->unoAddDim( 0, -1 ); // variant array
-                    USHORT nSavFlags = pTypeElem->GetFlags();
+                    sal_uInt16 nSavFlags = pTypeElem->GetFlags();
                     // need to reset the FIXED flag
                     // when calling PutObject ( because the type will not match Object )
                     pTypeElem->ResetFlag( SBX_FIXED );
@@ -643,7 +643,7 @@ void SbiParser::DefType( BOOL bPrivate )
                 // Nested user type?
                 if( eElemType == SbxOBJECT )
                 {
-                    USHORT nElemTypeId = pElem->GetTypeId();
+                    sal_uInt16 nElemTypeId = pElem->GetTypeId();
                     if( nElemTypeId != 0 )
                     {
                         String aTypeName( aGblStrings.Find( nElemTypeId ) );
@@ -673,10 +673,10 @@ void SbiParser::DefType( BOOL bPrivate )
 
 void SbiParser::Enum()
 {
-    DefEnum( FALSE );
+    DefEnum( sal_False );
 }
 
-void SbiParser::DefEnum( BOOL bPrivate )
+void SbiParser::DefEnum( sal_Bool bPrivate )
 {
     // Neues Token lesen, es muss ein Symbol sein
     if (!TestSymbol())
@@ -695,7 +695,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
 
     SbiSymDef* pElem;
     SbiDimList* pDim;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     // Starting with -1 to make first default value 0 after ++
     sal_Int32 nCurrentEnumValue = -1;
@@ -705,7 +705,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
         {
             case ENDENUM :
                 pElem = NULL;
-                bDone = TRUE;
+                bDone = sal_True;
                 Next();
             break;
 
@@ -718,20 +718,20 @@ void SbiParser::DefEnum( BOOL bPrivate )
             default:
             {
                 // TODO: Check existing!
-                BOOL bDefined = FALSE;
+                sal_Bool bDefined = sal_False;
 
                 pDim = NULL;
-                pElem = VarDecl( &pDim, FALSE, TRUE );
+                pElem = VarDecl( &pDim, sal_False, sal_True );
                 if( !pElem )
                 {
-                    bDone = TRUE;   // Error occured
+                    bDone = sal_True;   // Error occured
                     break;
                 }
                 else if( pDim )
                 {
                     delete pDim;
                     Error( SbERR_SYNTAX );
-                    bDone = TRUE;   // Error occured
+                    bDone = sal_True;   // Error occured
                     break;
                 }
 
@@ -761,7 +761,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
                 if( pOld )
                 {
                     Error( SbERR_VAR_DEFINED, pElem->GetName() );
-                    bDone = TRUE;   // Error occured
+                    bDone = sal_True;   // Error occured
                     break;
                 }
 
@@ -772,13 +772,13 @@ void SbiParser::DefEnum( BOOL bPrivate )
                     SbiOpcode eOp = _GLOBAL;
                     aGen.BackChain( nGblChain );
                     nGblChain = 0;
-                    bGblDefs = bNewGblDefs = TRUE;
+                    bGblDefs = bNewGblDefs = sal_True;
                     aGen.Gen(
                         eOp, pElem->GetId(),
-                        sal::static_int_cast< UINT16 >( pElem->GetType() ) );
+                        sal::static_int_cast< sal_uInt16 >( pElem->GetType() ) );
 
                     aVar.Gen();
-                    USHORT nStringId = aGen.GetParser()->aGblStrings.Add( nCurrentEnumValue, SbxLONG );
+                    sal_uInt16 nStringId = aGen.GetParser()->aGblStrings.Add( nCurrentEnumValue, SbxLONG );
                     aGen.Gen( _NUMBER, nStringId );
                     aGen.Gen( _PUTC );
                 }
@@ -809,10 +809,10 @@ void SbiParser::DefEnum( BOOL bPrivate )
 // das erste Token ist bereits eingelesen (SUB/FUNCTION)
 // xxx Name [LIB "name"[ALIAS "name"]][(Parameter)][AS TYPE]
 
-SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
+SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl )
 {
-    BOOL bFunc = BOOL( eCurTok == FUNCTION );
-    BOOL bProp = BOOL( eCurTok == GET || eCurTok == SET || eCurTok == LET );
+    sal_Bool bFunc = sal_Bool( eCurTok == FUNCTION );
+    sal_Bool bProp = sal_Bool( eCurTok == GET || eCurTok == SET || eCurTok == LET );
     if( !TestSymbol() ) return NULL;
     String aName( aSym );
     SbxDataType eType = eScanType;
@@ -847,7 +847,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
             Error( SbERR_UNEXPECTED, ALIAS );
         if( pDef->IsCdecl() )
             Error( SbERR_UNEXPECTED, _CDECL_ );
-        pDef->SetCdecl( FALSE );
+        pDef->SetCdecl( sal_False );
         pDef->GetLib().Erase();
         pDef->GetAlias().Erase();
     }
@@ -858,7 +858,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
             Error( SbERR_UNEXPECTED, ALIAS );
         if( pDef->IsCdecl() )
             Error( SbERR_UNEXPECTED, _CDECL_ );
-        pDef->SetCdecl( FALSE );
+        pDef->SetCdecl( sal_False );
         pDef->GetAlias().Erase();
     }
     // Klammern?
@@ -869,23 +869,23 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
             Next();
         else
           for(;;) {
-            BOOL bByVal = FALSE;
-            BOOL bOptional = FALSE;
-            BOOL bParamArray = FALSE;
+            sal_Bool bByVal = sal_False;
+            sal_Bool bOptional = sal_False;
+            sal_Bool bParamArray = sal_False;
             while( Peek() == BYVAL || Peek() == BYREF || Peek() == _OPTIONAL_ )
             {
-                if      ( Peek() == BYVAL )     Next(), bByVal = TRUE;
-                else if ( Peek() == BYREF )     Next(), bByVal = FALSE;
-                else if ( Peek() == _OPTIONAL_ )    Next(), bOptional = TRUE;
+                if      ( Peek() == BYVAL )     Next(), bByVal = sal_True;
+                else if ( Peek() == BYREF )     Next(), bByVal = sal_False;
+                else if ( Peek() == _OPTIONAL_ )    Next(), bOptional = sal_True;
             }
             if( bCompatible && Peek() == PARAMARRAY )
             {
                 if( bByVal || bOptional )
                     Error( SbERR_UNEXPECTED, PARAMARRAY );
                 Next();
-                bParamArray = TRUE;
+                bParamArray = sal_True;
             }
-            SbiSymDef* pPar = VarDecl( NULL, FALSE, FALSE );
+            SbiSymDef* pPar = VarDecl( NULL, sal_False, sal_False );
             if( !pPar )
                 break;
             if( bByVal )
@@ -898,13 +898,13 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
             SbiToken eTok = Next();
             if( eTok != COMMA && eTok != RPAREN )
             {
-                BOOL bError2 = TRUE;
+                sal_Bool bError2 = sal_True;
                 if( bOptional && bCompatible && eTok == EQ )
                 {
                     SbiConstExpression* pDefaultExpr = new SbiConstExpression( this );
                     SbxDataType eType2 = pDefaultExpr->GetType();
 
-                    USHORT nStringId;
+                    sal_uInt16 nStringId;
                     if( eType2 == SbxSTRING )
                         nStringId = aGblStrings.Add( pDefaultExpr->GetString() );
                     else
@@ -915,7 +915,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
 
                     eTok = Next();
                     if( eTok == COMMA || eTok == RPAREN )
-                        bError2 = FALSE;
+                        bError2 = sal_False;
                 }
                 if( bError2 )
                 {
@@ -942,10 +942,10 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
 
 void SbiParser::Declare()
 {
-    DefDeclare( FALSE );
+    DefDeclare( sal_False );
 }
 
-void SbiParser::DefDeclare( BOOL bPrivate )
+void SbiParser::DefDeclare( sal_Bool bPrivate )
 {
     Next();
     if( eCurTok != SUB && eCurTok != FUNCTION )
@@ -954,7 +954,7 @@ void SbiParser::DefDeclare( BOOL bPrivate )
     {
         bool bFunction = (eCurTok == FUNCTION);
 
-        SbiProcDef* pDef = ProcDecl( TRUE );
+        SbiProcDef* pDef = ProcDecl( sal_True );
         if( pDef )
         {
             if( !pDef->GetLib().Len() )
@@ -987,39 +987,39 @@ void SbiParser::DefDeclare( BOOL bPrivate )
                     if( bNewGblDefs && nGblChain == 0 )
                     {
                         nGblChain = aGen.Gen( _JUMP, 0 );
-                        bNewGblDefs = FALSE;
+                        bNewGblDefs = sal_False;
                     }
 
-                    USHORT nSavLine = nLine;
+                    sal_uInt16 nSavLine = nLine;
                     aGen.Statement();
                     pDef->Define();
                     pDef->SetLine1( nSavLine );
                     pDef->SetLine2( nSavLine );
 
                     SbiSymPool& rPool = pDef->GetParams();
-                    USHORT nParCount = rPool.GetSize();
+                    sal_uInt16 nParCount = rPool.GetSize();
 
                     SbxDataType eType = pDef->GetType();
                     if( bFunction )
-                        aGen.Gen( _PARAM, 0, sal::static_int_cast< UINT16 >( eType ) );
+                        aGen.Gen( _PARAM, 0, sal::static_int_cast< sal_uInt16 >( eType ) );
 
                     if( nParCount > 1 )
                     {
                         aGen.Gen( _ARGC );
 
-                        for( USHORT i = 1 ; i < nParCount ; ++i )
+                        for( sal_uInt16 i = 1 ; i < nParCount ; ++i )
                         {
                             SbiSymDef* pParDef = rPool.Get( i );
                             SbxDataType eParType = pParDef->GetType();
 
-                            aGen.Gen( _PARAM, i, sal::static_int_cast< UINT16 >( eParType ) );
+                            aGen.Gen( _PARAM, i, sal::static_int_cast< sal_uInt16 >( eParType ) );
                             aGen.Gen( _ARGV );
 
-                            USHORT nTyp = sal::static_int_cast< USHORT >( pParDef->GetType() );
+                            sal_uInt16 nTyp = sal::static_int_cast< sal_uInt16 >( pParDef->GetType() );
                             if( pParDef->IsByVal() )
                             {
                                 // Reset to avoid additional byval in call to wrapper function
-                                pParDef->SetByVal( FALSE );
+                                pParDef->SetByVal( sal_False );
                                 nTyp |= 0x8000;
                             }
                             aGen.Gen( _ARGTYP, nTyp );
@@ -1029,12 +1029,12 @@ void SbiParser::DefDeclare( BOOL bPrivate )
                     aGen.Gen( _LIB, aGblStrings.Add( pDef->GetLib() ) );
 
                     SbiOpcode eOp = pDef->IsCdecl() ? _CALLC : _CALL;
-                    USHORT nId = pDef->GetId();
+                    sal_uInt16 nId = pDef->GetId();
                     if( pDef->GetAlias().Len() )
                         nId = ( nId & 0x8000 ) | aGblStrings.Add( pDef->GetAlias() );
                     if( nParCount > 1 )
                         nId |= 0x8000;
-                    aGen.Gen( eOp, nId, sal::static_int_cast< UINT16 >( eType ) );
+                    aGen.Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( eType ) );
 
                     if( bFunction )
                         aGen.Gen( _PUT );
@@ -1060,18 +1060,18 @@ void SbiParser::Call()
 
 void SbiParser::SubFunc()
 {
-    DefProc( FALSE, FALSE );
+    DefProc( sal_False, sal_False );
 }
 
 // Einlesen einer Prozedur
 
-BOOL runsInSetup( void );
+sal_Bool runsInSetup( void );
 
-void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
+void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
 {
-    USHORT l1 = nLine, l2 = nLine;
-    BOOL bSub = BOOL( eCurTok == SUB );
-    BOOL bProperty = BOOL( eCurTok == PROPERTY );
+    sal_uInt16 l1 = nLine, l2 = nLine;
+    sal_Bool bSub = sal_Bool( eCurTok == SUB );
+    sal_Bool bProperty = sal_Bool( eCurTok == PROPERTY );
     PropertyMode ePropertyMode = PROPERTY_MODE_NONE;
     if( bProperty )
     {
@@ -1087,7 +1087,7 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
     }
 
     SbiToken eExit = eCurTok;
-    SbiProcDef* pDef = ProcDecl( FALSE );
+    SbiProcDef* pDef = ProcDecl( sal_False );
     if( !pDef )
         return;
     pDef->setPropertyMode( ePropertyMode );
@@ -1141,13 +1141,13 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
     if( bStatic )
         {
         if ( bVBASupportOn )
-            pProc->SetStatic( TRUE );
+            pProc->SetStatic( sal_True );
         else
             Error( SbERR_NOT_IMPLEMENTED ); // STATIC SUB ...
         }
      else
     {
-        pProc->SetStatic( FALSE );
+        pProc->SetStatic( sal_False );
         }
     // Normalfall: Lokale Variable->Parameter->Globale Variable
     pProc->GetLocals().SetParent( &pProc->GetParams() );
@@ -1172,10 +1172,10 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
 
 void SbiParser::Static()
 {
-    DefStatic( FALSE );
+    DefStatic( sal_False );
 }
 
-void SbiParser::DefStatic( BOOL bPrivate )
+void SbiParser::DefStatic( sal_Bool bPrivate )
 {
     switch( Peek() )
     {
@@ -1187,10 +1187,10 @@ void SbiParser::DefStatic( BOOL bPrivate )
             if( bNewGblDefs && nGblChain == 0 )
             {
                 nGblChain = aGen.Gen( _JUMP, 0 );
-                bNewGblDefs = FALSE;
+                bNewGblDefs = sal_False;
             }
             Next();
-            DefProc( TRUE, bPrivate );
+            DefProc( sal_True, bPrivate );
             break;
         default: {
             if( !pProc )
@@ -1198,7 +1198,7 @@ void SbiParser::DefStatic( BOOL bPrivate )
             // Pool umsetzen, damit STATIC-Deklarationen im globalen
             // Pool landen
             SbiSymPool* p = pPool; pPool = &aPublics;
-            DefVar( _STATIC, TRUE );
+            DefVar( _STATIC, sal_True );
             pPool = p;
             } break;
     }
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 3e034af204f5..c77123493916 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -75,12 +75,12 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
             case SbxINTEGER: pGen->Gen( _CONST,  (short) nVal ); break;
             case SbxSTRING:
             {
-                USHORT nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, TRUE );
+                sal_uInt16 nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, sal_True );
                 pGen->Gen( _SCONST, nStringId ); break;
             }
             default:
             {
-                USHORT nStringId = pGen->GetParser()->aGblStrings.Add( nVal, eType );
+                sal_uInt16 nStringId = pGen->GetParser()->aGblStrings.Add( nVal, eType );
                 pGen->Gen( _NUMBER, nStringId );
             }
         }
@@ -174,7 +174,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
     // Das ID ist entweder die Position oder das String-ID
     // Falls das Bit 0x8000 gesetzt ist, hat die Variable
     // eine Parameterliste.
-    USHORT nId = ( eOp == _PARAM ) ? pDef->GetPos() : pDef->GetId();
+    sal_uInt16 nId = ( eOp == _PARAM ) ? pDef->GetPos() : pDef->GetId();
     // Parameterliste aufbauen
     if( aVar.pPar && aVar.pPar->GetSize() )
     {
@@ -182,7 +182,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
         aVar.pPar->Gen();
     }
 
-    pGen->Gen( eOp, nId, sal::static_int_cast< UINT16 >( GetType() ) );
+    pGen->Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( GetType() ) );
 
     if( aVar.pvMorePar )
     {
@@ -207,7 +207,7 @@ void SbiExprList::Gen()
     {
         pParser->aGen.Gen( _ARGC );
         // AB 10.1.96: Typ-Anpassung bei DECLARE
-        USHORT nCount = 1 /*, nParAnz = 0*/;
+        sal_uInt16 nCount = 1 /*, nParAnz = 0*/;
 //      SbiSymPool* pPool = NULL;
         for( SbiExpression* pExpr = pFirst; pExpr; pExpr = pExpr->pNext,nCount++ )
         {
@@ -215,7 +215,7 @@ void SbiExprList::Gen()
             if( pExpr->GetName().Len() )
             {
                 // named arg
-                USHORT nSid = pParser->aGblStrings.Add( pExpr->GetName() );
+                sal_uInt16 nSid = pParser->aGblStrings.Add( pExpr->GetName() );
                 pParser->aGen.Gen( _ARGN, nSid );
 
                 /* TODO: Check after Declare concept change
@@ -226,7 +226,7 @@ void SbiExprList::Gen()
                     pParser->Error( SbERR_NO_NAMED_ARGS );
 
                     // Spaeter, wenn Named Args bei DECLARE moeglich
-                    //for( USHORT i = 1 ; i < nParAnz ; i++ )
+                    //for( sal_uInt16 i = 1 ; i < nParAnz ; i++ )
                     //{
                     //  SbiSymDef* pDef = pPool->Get( i );
                     //  const String& rName = pDef->GetName();
@@ -260,7 +260,7 @@ void SbiExpression::Gen( RecursiveMode eRecMode )
         pParser->aGen.Gen( _BYVAL );
     if( bBased )
     {
-        USHORT uBase = pParser->nBase;
+        sal_uInt16 uBase = pParser->nBase;
         if( pParser->IsCompatible() )
             uBase |= 0x8000;        // #109275 Flag compatiblity
         pParser->aGen.Gen( _BASED, uBase );
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index d47c86f86ea8..f516513d7589 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -53,7 +53,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, SbiToken t, SbiExprNode*
     nVal      = 0;
     eType     = SbxVARIANT;     // Nodes sind immer Variant
     eNodeType = SbxNODE;
-    bComposite= TRUE;
+    bComposite= sal_True;
 }
 
 SbiExprNode::SbiExprNode( SbiParser* p, double n, SbxDataType t )
@@ -86,11 +86,11 @@ SbiExprNode::SbiExprNode( SbiParser* p, const SbiSymDef& r, SbxDataType t, SbiEx
     aVar.pNext= NULL;
 
     // Funktionsergebnisse sind nie starr
-    bComposite= BOOL( aVar.pDef->GetProcDef() != NULL );
+    bComposite= sal_Bool( aVar.pDef->GetProcDef() != NULL );
 }
 
 // #120061 TypeOf
-SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, USHORT nId )
+SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, sal_uInt16 nId )
 {
     BaseInit( p );
 
@@ -101,7 +101,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, USHORT nId )
 }
 
 // new <type>
-SbiExprNode::SbiExprNode( SbiParser* p, USHORT nId )
+SbiExprNode::SbiExprNode( SbiParser* p, sal_uInt16 nId )
 {
     BaseInit( p );
 
@@ -118,8 +118,8 @@ void SbiExprNode::BaseInit( SbiParser* p )
     pLeft       = NULL;
     pRight      = NULL;
     pWithParent = NULL;
-    bComposite  = FALSE;
-    bError      = FALSE;
+    bComposite  = sal_False;
+    bError      = sal_False;
 }
 
 SbiExprNode::~SbiExprNode()
@@ -174,7 +174,7 @@ SbiExprNode* SbiExprNode::GetRealNode()
 
 // Diese Methode setzt den Typ um, falls er in den Integer-Bereich hineinpasst
 
-BOOL SbiExprNode::IsIntConst()
+sal_Bool SbiExprNode::IsIntConst()
 {
     if( eNodeType == SbxNUMVAL )
     {
@@ -185,29 +185,29 @@ BOOL SbiExprNode::IsIntConst()
             {
                 nVal = (double) (short) nVal;
                 eType = SbxINTEGER;
-                return TRUE;
+                return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbiExprNode::IsNumber()
+sal_Bool SbiExprNode::IsNumber()
 {
-    return BOOL( eNodeType == SbxNUMVAL );
+    return sal_Bool( eNodeType == SbxNUMVAL );
 }
 
-BOOL SbiExprNode::IsString()
+sal_Bool SbiExprNode::IsString()
 {
-    return BOOL( eNodeType == SbxSTRVAL );
+    return sal_Bool( eNodeType == SbxSTRVAL );
 }
 
-BOOL SbiExprNode::IsVariable()
+sal_Bool SbiExprNode::IsVariable()
 {
-    return BOOL( eNodeType == SbxVARVAL );
+    return sal_Bool( eNodeType == SbxVARVAL );
 }
 
-BOOL SbiExprNode::IsLvalue()
+sal_Bool SbiExprNode::IsLvalue()
 {
     return IsVariable();
 }
@@ -256,7 +256,7 @@ void SbiExprNode::CollectBits()
     }
 }
 
-// Kann ein Zweig umgeformt werden, wird TRUE zurueckgeliefert. In diesem
+// Kann ein Zweig umgeformt werden, wird sal_True zurueckgeliefert. In diesem
 // Fall ist das Ergebnis im linken Zweig.
 
 void SbiExprNode::FoldConstants()
@@ -283,7 +283,7 @@ void SbiExprNode::FoldConstants()
                 String rr( pRight->GetString() );
                 delete pLeft; pLeft = NULL;
                 delete pRight; pRight = NULL;
-                bComposite = FALSE;
+                bComposite = sal_False;
                 if( eTok == PLUS || eTok == CAT )
                 {
                     eTok = CAT;
@@ -320,7 +320,7 @@ void SbiExprNode::FoldConstants()
                             break;
                         default:
                             pGen->GetParser()->Error( SbERR_CONVERSION );
-                            bError = TRUE;
+                            bError = sal_True;
                     }
                 }
             }
@@ -334,50 +334,50 @@ void SbiExprNode::FoldConstants()
                    || eTok == IDIV || eTok == MOD )
                 {
                     // Integer-Operationen
-                    BOOL err = FALSE;
-                    if( nl > SbxMAXLNG ) err = TRUE, nl = SbxMAXLNG;
+                    sal_Bool err = sal_False;
+                    if( nl > SbxMAXLNG ) err = sal_True, nl = SbxMAXLNG;
                     else
-                    if( nl < SbxMINLNG ) err = TRUE, nl = SbxMINLNG;
-                    if( nr > SbxMAXLNG ) err = TRUE, nr = SbxMAXLNG;
+                    if( nl < SbxMINLNG ) err = sal_True, nl = SbxMINLNG;
+                    if( nr > SbxMAXLNG ) err = sal_True, nr = SbxMAXLNG;
                     else
-                    if( nr < SbxMINLNG ) err = TRUE, nr = SbxMINLNG;
+                    if( nr < SbxMINLNG ) err = sal_True, nr = SbxMINLNG;
                     ll = (long) nl; lr = (long) nr;
                     llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5);
                     lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5);
                     if( err )
                     {
                         pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
-                        bError = TRUE;
+                        bError = sal_True;
                     }
                 }
-                BOOL bBothInt = BOOL( pLeft->eType < SbxSINGLE
+                sal_Bool bBothInt = sal_Bool( pLeft->eType < SbxSINGLE
                                    && pRight->eType < SbxSINGLE );
                 delete pLeft; pLeft = NULL;
                 delete pRight; pRight = NULL;
                 nVal = 0;
                 eType = SbxDOUBLE;
                 eNodeType = SbxNUMVAL;
-                bComposite = FALSE;
-                BOOL bCheckType = FALSE;
+                bComposite = sal_False;
+                sal_Bool bCheckType = sal_False;
                 switch( eTok )
                 {
                     case EXPON:
                         nVal = pow( nl, nr ); break;
                     case MUL:
-                        bCheckType = TRUE;
+                        bCheckType = sal_True;
                         nVal = nl * nr; break;
                     case DIV:
                         if( !nr )
                         {
                             pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
-                            bError = TRUE;
+                            bError = sal_True;
                         } else nVal = nl / nr;
                         break;
                     case PLUS:
-                        bCheckType = TRUE;
+                        bCheckType = sal_True;
                         nVal = nl + nr; break;
                     case MINUS:
-                        bCheckType = TRUE;
+                        bCheckType = sal_True;
                         nVal = nl - nr; break;
                     case EQ:
                         nVal = ( nl == nr ) ? SbxTRUE : SbxFALSE;
@@ -401,14 +401,14 @@ void SbiExprNode::FoldConstants()
                         if( !lr )
                         {
                             pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
-                            bError = TRUE;
+                            bError = sal_True;
                         } else nVal = ll / lr;
                         eType = SbxLONG; break;
                     case MOD:
                         if( !lr )
                         {
                             pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
-                            bError = TRUE;
+                            bError = sal_True;
                         } else nVal = llMod % lrMod;
                         eType = SbxLONG; break;
                     case AND:
@@ -448,21 +448,21 @@ void SbiExprNode::FoldConstants()
         pLeft = NULL;
         eType = SbxDOUBLE;
         eNodeType = SbxNUMVAL;
-        bComposite = FALSE;
+        bComposite = sal_False;
         switch( eTok )
         {
             case NEG:
                 nVal = -nVal; break;
             case NOT: {
                 // Integer-Operation!
-                BOOL err = FALSE;
-                if( nVal > SbxMAXLNG ) err = TRUE, nVal = SbxMAXLNG;
+                sal_Bool err = sal_False;
+                if( nVal > SbxMAXLNG ) err = sal_True, nVal = SbxMAXLNG;
                 else
-                if( nVal < SbxMINLNG ) err = TRUE, nVal = SbxMINLNG;
+                if( nVal < SbxMINLNG ) err = sal_True, nVal = SbxMINLNG;
                 if( err )
                 {
                     pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
-                    bError = TRUE;
+                    bError = sal_True;
                 }
                 nVal = (double) ~((long) nVal);
                 eType = SbxLONG;
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 69f9ea553529..42b4bfa06aaf 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -42,7 +42,7 @@ SbiExpression::SbiExpression( SbiParser* p, SbiExprType t,
     SbiExprMode eMode, const KeywordSymbolInfo* pKeywordSymbolInfo )
 {
     pParser = p;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     nParenLevel = 0;
     eCurExpr = t;
     m_eMode = eMode;
@@ -61,7 +61,7 @@ SbiExpression::SbiExpression( SbiParser* p, double n, SbxDataType t )
     pParser = p;
     eCurExpr = SbOPERAND;
     pNext = NULL;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     pExpr = new SbiExprNode( pParser, n, t );
     pExpr->Optimize();
 }
@@ -70,7 +70,7 @@ SbiExpression::SbiExpression( SbiParser* p, const String& r )
 {
     pParser = p;
     pNext = NULL;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     eCurExpr = SbOPERAND;
     pExpr = new SbiExprNode( pParser, r );
 }
@@ -79,7 +79,7 @@ SbiExpression::SbiExpression( SbiParser* p, const SbiSymDef& r, SbiExprList* pPa
 {
     pParser = p;
     pNext = NULL;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     eCurExpr = SbOPERAND;
     pExpr = new SbiExprNode( pParser, r, SbxVARIANT, pPar );
 }
@@ -88,7 +88,7 @@ SbiExpression::SbiExpression( SbiParser* p, SbiToken t )
 {
     pParser = p;
     pNext = NULL;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     eCurExpr = SbOPERAND;
     pExpr = new SbiExprNode( pParser, NULL, t, NULL );
 }
@@ -107,17 +107,17 @@ SbiExpression::~SbiExpression()
 // Folgen Parameter ohne Klammer? Dies kann eine Zahl, ein String,
 // ein Symbol oder auch ein Komma sein (wenn der 1. Parameter fehlt)
 
-static BOOL DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTok )
+static sal_Bool DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTok )
 {
     if( eTok == LPAREN )
-        return TRUE;
+        return sal_True;
     // Aber nur, wenn CALL-aehnlich!
     if( !p->WhiteSpace() || eCurExpr != SbSYMBOL )
-        return FALSE;
+        return sal_False;
     if (   eTok == NUMBER || eTok == MINUS || eTok == FIXSTRING
         || eTok == SYMBOL || eTok == COMMA  || eTok == DOT || eTok == NOT || eTok == BYVAL )
     {
-        return TRUE;
+        return sal_True;
     }
     else // check for default params with reserved names ( e.g. names of tokens )
     {
@@ -125,9 +125,9 @@ static BOOL DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTo
         // Urk the Next() / Peek() symantics are... weird
         tokens.Next();
         if ( tokens.Peek() == ASSIGN )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 // Definition eines neuen Symbols
@@ -138,7 +138,7 @@ static SbiSymDef* AddSym
 {
     SbiSymDef* pDef;
     // A= ist keine Prozedur
-    BOOL bHasType = BOOL( eTok == EQ || eTok == DOT );
+    sal_Bool bHasType = sal_Bool( eTok == EQ || eTok == DOT );
     if( ( !bHasType && eCurExpr == SbSYMBOL ) || pPar )
     {
         // Dies ist also eine Prozedur
@@ -151,14 +151,14 @@ static SbiSymDef* AddSym
 
         // Sonderbehandlung fuer Colls wie Documents(1)
         if( eCurExpr == SbSTDEXPR )
-            bHasType = TRUE;
+            bHasType = sal_True;
 
         pDef = pProc;
         pDef->SetType( bHasType ? eType : SbxEMPTY );
         if( pPar )
         {
             // Dummy-Parameter generieren
-            USHORT n = 1;
+            sal_uInt16 n = 1;
             for( short i = 0; i < pPar->GetSize(); i++ )
             {
                 String aPar = String::CreateFromAscii( "PAR" );
@@ -232,7 +232,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
         else
         {
             pParser->Error( SbERR_SYNTAX );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
 
@@ -259,18 +259,18 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
     // Es koennte ein Objektteil sein, wenn . oder ! folgt
     // Bei . muss aber die Variable bereits definiert sein; wenn pDef
     // nach der Suche NULL ist, isses ein Objekt!
-    BOOL bObj = BOOL( ( eTok == DOT || eTok == EXCLAM )
+    sal_Bool bObj = sal_Bool( ( eTok == DOT || eTok == EXCLAM )
                     && !pParser->WhiteSpace() );
     if( bObj )
     {
-        bBracket = FALSE;   // Now the bracket for the first term is obsolete
+        bBracket = sal_False;   // Now the bracket for the first term is obsolete
         if( eType == SbxVARIANT )
             eType = SbxOBJECT;
         else
         {
             // Name%. geht wirklich nicht!
             pParser->Error( SbERR_BAD_DECLARATION, aSym );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
     // Suche:
@@ -330,7 +330,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
             {
                 // Wie? Erst mit AS definieren und dann einen Suffix nehmen?
                 pParser->Error( SbERR_BAD_DECLARATION, aSym );
-                bError = TRUE;
+                bError = sal_True;
             }
             else if ( eType == SbxVARIANT )
                 // Falls nix angegeben, den Typ des Eintrags nehmen
@@ -355,13 +355,13 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
             else
             {
                 pParser->Error( SbERR_BAD_DECLARATION, aSym );
-                bError = TRUE;
+                bError = sal_True;
             }
         }
     }
     SbiExprNode* pNd = new SbiExprNode( pParser, *pDef, eType );
     if( !pPar )
-        pPar = new SbiParameters( pParser,FALSE,FALSE );
+        pPar = new SbiParameters( pParser,sal_False,sal_False );
     pNd->aVar.pPar = pPar;
     pNd->aVar.pvMorePar = pvMoreParLcl;
     if( bObj )
@@ -374,7 +374,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
         if( pDef->GetType() != SbxOBJECT && pDef->GetType() != SbxVARIANT )
         {
             pParser->Error( SbERR_BAD_DECLARATION, aSym );
-            bError = TRUE;
+            bError = sal_True;
         }
         if( !bError )
             pNd->aVar.pNext = ObjTerm( *pDef );
@@ -399,14 +399,14 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
             eTok != XOR && eTok != EQV && eTok != IMP && eTok != IS )
         {
             pParser->Error( SbERR_VAR_EXPECTED );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
     /* #118410 Allow type for Class methods and RTL object, e.g. RTL.Chr$(97)
     else
     {
         if( pParser->GetType() != SbxVARIANT )
-            pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+            pParser->Error( SbERR_SYNTAX ), bError = sal_True;
     }
     */
     if( bError )
@@ -437,7 +437,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
         }
 
     }
-    BOOL bObj = BOOL( ( eTok == DOT || eTok == EXCLAM ) && !pParser->WhiteSpace() );
+    sal_Bool bObj = sal_Bool( ( eTok == DOT || eTok == EXCLAM ) && !pParser->WhiteSpace() );
     if( bObj )
     {
         if( eType == SbxVARIANT )
@@ -446,7 +446,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
         {
             // Name%. geht wirklich nicht!
             pParser->Error( SbERR_BAD_DECLARATION, aSym );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
 
@@ -477,7 +477,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
         if( pDef->GetType() != SbxOBJECT )
         {
             pParser->Error( SbERR_BAD_DECLARATION, aSym );
-            bError = TRUE;
+            bError = sal_True;
         }
         if( !bError )
         {
@@ -554,7 +554,7 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf )
                 }
             }
             nParenLevel--;
-            pRes->bComposite = TRUE;
+            pRes->bComposite = sal_True;
             break;
         default:
             // Zur Zeit sind Keywords hier OK!
@@ -604,7 +604,7 @@ SbiExprNode* SbiExpression::Unary()
             pParser->TestToken( IS );
             String aDummy;
             SbiSymDef* pTypeDef = new SbiSymDef( aDummy );
-            pParser->TypeDecl( *pTypeDef, TRUE );
+            pParser->TypeDecl( *pTypeDef, sal_True );
             pNd = new SbiExprNode( pParser, pObjNode, pTypeDef->GetTypeId() );
             break;
         }
@@ -613,7 +613,7 @@ SbiExprNode* SbiExpression::Unary()
             pParser->Next();
             String aStr;
             SbiSymDef* pTypeDef = new SbiSymDef( aStr );
-            pParser->TypeDecl( *pTypeDef, TRUE );
+            pParser->TypeDecl( *pTypeDef, sal_True );
             pNd = new SbiExprNode( pParser, pTypeDef->GetTypeId() );
             break;
         }
@@ -766,7 +766,7 @@ SbiExprNode* SbiExpression::Like()
         if( nCount > 1 )
         {
             pParser->Error( SbERR_SYNTAX );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
     return pNd;
@@ -816,28 +816,28 @@ SbiConstExpression::SbiConstExpression( SbiParser* p ) : SbiExpression( p )
     }
     else
     {
-        // #40204 Spezialbehandlung fuer BOOL-Konstanten
-        BOOL bIsBool = FALSE;
+        // #40204 Spezialbehandlung fuer sal_Bool-Konstanten
+        sal_Bool bIsBool = sal_False;
         if( pExpr->eNodeType == SbxVARVAL )
         {
             SbiSymDef* pVarDef = pExpr->GetVar();
 
-            // Ist es eine BOOL-Konstante?
-            BOOL bBoolVal = FALSE;
+            // Ist es eine sal_Bool-Konstante?
+            sal_Bool bBoolVal = sal_False;
             if( pVarDef->GetName().EqualsIgnoreCaseAscii( "true" ) )
             //if( pVarDef->GetName().ICompare( "true" ) == COMPARE_EQUAL )
             {
-                bIsBool = TRUE;
-                bBoolVal = TRUE;
+                bIsBool = sal_True;
+                bBoolVal = sal_True;
             }
             else if( pVarDef->GetName().EqualsIgnoreCaseAscii( "false" ) )
             //else if( pVarDef->GetName().ICompare( "false" ) == COMPARE_EQUAL )
             {
-                bIsBool = TRUE;
-                bBoolVal = FALSE;
+                bIsBool = sal_True;
+                bBoolVal = sal_False;
             }
 
-            // Wenn es ein BOOL ist, Node austauschen
+            // Wenn es ein sal_Bool ist, Node austauschen
             if( bIsBool )
             {
                 delete pExpr;
@@ -889,7 +889,7 @@ SbiExprList::SbiExprList( SbiParser* p )
     nExpr  =
     nDim   = 0;
     bError =
-    bBracket = FALSE;
+    bBracket = sal_False;
 }
 
 SbiExprList::~SbiExprList()
@@ -937,8 +937,8 @@ void SbiExprList::addExpression( SbiExpression* pExpr )
 
 // #i79918/#i80532: bConst has never been set to true
 // -> reused as bStandaloneExpression
-//SbiParameters::SbiParameters( SbiParser* p, BOOL bConst, BOOL bPar) :
-SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPar) :
+//SbiParameters::SbiParameters( SbiParser* p, sal_Bool bConst, sal_Bool bPar) :
+SbiParameters::SbiParameters( SbiParser* p, sal_Bool bStandaloneExpression, sal_Bool bPar) :
     SbiExprList( p )
 {
     if( !bPar )
@@ -958,7 +958,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
         }
         else
         {
-            bBracket = TRUE;
+            bBracket = sal_True;
             pParser->Next();
             eTok = pParser->Peek();
         }
@@ -982,7 +982,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
         {
             pExpr = new SbiExpression( pParser, 0, SbxEMPTY );
             //if( bConst )
-            //  pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+            //  pParser->Error( SbERR_SYNTAX ), bError = sal_True;
         }
         // Benannte Argumente: entweder .name= oder name:=
         else
@@ -998,25 +998,25 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
             if( bAssumeExprLParenMode )
             {
                 pExpr = new SbiExpression( pParser, SbSTDEXPR, EXPRMODE_LPAREN_PENDING );
-                bAssumeExprLParenMode = FALSE;
+                bAssumeExprLParenMode = sal_False;
 
                 SbiExprMode eModeAfter = pExpr->m_eMode;
                 if( eModeAfter == EXPRMODE_LPAREN_NOT_NEEDED )
                 {
-                    bBracket = TRUE;
+                    bBracket = sal_True;
                 }
                 else if( eModeAfter == EXPRMODE_ARRAY_OR_OBJECT )
                 {
                     // Expression "looks" like an array assignment
                     // a(...)[(...)] = ? or a(...).b(...)
                     // RPAREN is already parsed
-                    bBracket = TRUE;
+                    bBracket = sal_True;
                     bAssumeArrayMode = true;
                     eTok = NIL;
                 }
                 else if( eModeAfter == EXPRMODE_EMPTY_PAREN )
                 {
-                    bBracket = TRUE;
+                    bBracket = sal_True;
                     delete pExpr;
                     if( bByVal )
                         pParser->Error( SbERR_LVALUE_EXPECTED );
@@ -1042,7 +1042,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
                     pParser->Next();
                     pExpr = new SbiExpression( pParser );
                     //if( bConst )
-                    //  pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+                    //  pParser->Error( SbERR_SYNTAX ), bError = sal_True;
                 }
                 pExpr->GetName() = aName;
             }
@@ -1067,7 +1067,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
             pParser->Error( bBracket
                             ? SbERR_BAD_BRACKETS
                             : SbERR_EXPECTED, COMMA );
-            bError = TRUE;
+            bError = sal_True;
         }
         else
         {
@@ -1085,7 +1085,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
         if( !bBracket )
         {
             pParser->Error( SbERR_BAD_BRACKETS );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
     nDim = nExpr;
@@ -1104,12 +1104,12 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
 
 SbiDimList::SbiDimList( SbiParser* p ) : SbiExprList( p )
 {
-    bConst = TRUE;
+    bConst = sal_True;
 
     if( pParser->Next() != LPAREN )
     {
         pParser->Error( SbERR_EXPECTED, LPAREN );
-        bError = TRUE; return;
+        bError = sal_True; return;
     }
 
     if( pParser->Peek() != RPAREN )
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index b211ea0b7b08..958b34ee57ff 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -35,9 +35,9 @@
 
 // Test, ob ein I/O-Channel angegeben wurde
 
-BOOL SbiParser::Channel( BOOL bAlways )
+sal_Bool SbiParser::Channel( sal_Bool bAlways )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     Peek();
     if( IsHash() )
     {
@@ -46,7 +46,7 @@ BOOL SbiParser::Channel( BOOL bAlways )
             Next();
         aExpr.Gen();
         aGen.Gen( _CHANNEL );
-        bRes = TRUE;
+        bRes = sal_True;
     }
     else if( bAlways )
         Error( SbERR_EXPECTED, "#" );
@@ -60,7 +60,7 @@ BOOL SbiParser::Channel( BOOL bAlways )
 
 void SbiParser::Print()
 {
-    BOOL bChan = Channel();
+    sal_Bool bChan = Channel();
     // Die Ausdruecke zum Drucken:
     while( !bAbort )
     {
@@ -91,7 +91,7 @@ void SbiParser::Print()
 
 void SbiParser::Write()
 {
-    BOOL bChan = Channel();
+    sal_Bool bChan = Channel();
     // Die Ausdruecke zum Drucken:
     while( !bAbort )
     {
@@ -143,8 +143,8 @@ void SbiParser::Line()
 
 void SbiParser::LineInput()
 {
-    Channel( TRUE );
-    // BOOL bChan = Channel( TRUE );
+    Channel( sal_True );
+    // sal_Bool bChan = Channel( sal_True );
     SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
     /* AB 15.1.96: Keinen allgemeinen Ausdruck mehr zulassen
     SbiExpression* pExpr = new SbiExpression( this );
@@ -180,8 +180,8 @@ void SbiParser::LineInput()
 void SbiParser::Input()
 {
     aGen.Gen( _RESTART );
-    Channel( TRUE );
-    // BOOL bChan = Channel( TRUE );
+    Channel( sal_True );
+    // sal_Bool bChan = Channel( sal_True );
     SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
     /* ALT: Jetzt keinen allgemeinen Ausdruck mehr zulassen
     SbiExpression* pExpr = new SbiExpression( this );
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index bd4540a8ffde..02feb685c11f 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -34,7 +34,7 @@
 
 void SbiParser::If()
 {
-    UINT32 nEndLbl;
+    sal_uInt32 nEndLbl;
     SbiToken eTok = NIL;
     // Ende-Tokens ignorieren:
     SbiExpression aCond( this );
@@ -46,8 +46,8 @@ void SbiParser::If()
         // eingefuegt werden, damit bei ELSEIF nicht erneut die Bedingung
         // ausgewertet wird. Die Tabelle nimmt alle Absprungstellen auf.
 #define JMP_TABLE_SIZE 100
-        UINT32 pnJmpToEndLbl[JMP_TABLE_SIZE];   // 100 ELSEIFs zulaessig
-        USHORT iJmp = 0;                        // aktueller Tabellen-Index
+        sal_uInt32 pnJmpToEndLbl[JMP_TABLE_SIZE];   // 100 ELSEIFs zulaessig
+        sal_uInt16 iJmp = 0;                        // aktueller Tabellen-Index
 
         // multiline IF
         nEndLbl = aGen.Gen( _JUMPF, 0 );
@@ -58,7 +58,7 @@ void SbiParser::If()
             eTok = Peek();
             if( IsEof() )
             {
-                Error( SbERR_BAD_BLOCK, IF ); bAbort = TRUE; return;
+                Error( SbERR_BAD_BLOCK, IF ); bAbort = sal_True; return;
             }
         }
         // ELSEIF?
@@ -67,7 +67,7 @@ void SbiParser::If()
             // #27720# Bei erfolgreichem IF/ELSEIF auf ENDIF springen
             if( iJmp >= JMP_TABLE_SIZE )
             {
-                Error( SbERR_PROG_TOO_LARGE );  bAbort = TRUE;  return;
+                Error( SbERR_PROG_TOO_LARGE );  bAbort = sal_True;  return;
             }
             pnJmpToEndLbl[iJmp++] = aGen.Gen( _JUMP, 0 );
 
@@ -87,14 +87,14 @@ void SbiParser::If()
                 eTok = Peek();
                 if( IsEof() )
                 {
-                    Error( SbERR_BAD_BLOCK, ELSEIF );  bAbort = TRUE; return;
+                    Error( SbERR_BAD_BLOCK, ELSEIF );  bAbort = sal_True; return;
                 }
             }
         }
         if( eTok == ELSE )
         {
             Next();
-            UINT32 nElseLbl = nEndLbl;
+            sal_uInt32 nElseLbl = nEndLbl;
             nEndLbl = aGen.Gen( _JUMP, 0 );
             aGen.BackChain( nElseLbl );
 
@@ -114,7 +114,7 @@ void SbiParser::If()
     else
     {
         // single line IF
-        bSingleLineIf = TRUE;
+        bSingleLineIf = sal_True;
         nEndLbl = aGen.Gen( _JUMPF, 0 );
         Push( eCurTok );
         while( !bAbort )
@@ -127,7 +127,7 @@ void SbiParser::If()
         if( eTok == ELSE )
         {
             Next();
-            UINT32 nElseLbl = nEndLbl;
+            sal_uInt32 nElseLbl = nEndLbl;
             nEndLbl = aGen.Gen( _JUMP, 0 );
             aGen.BackChain( nElseLbl );
             while( !bAbort )
@@ -138,7 +138,7 @@ void SbiParser::If()
                     break;
             }
         }
-        bSingleLineIf = FALSE;
+        bSingleLineIf = sal_False;
     }
     aGen.BackChain( nEndLbl );
 }
@@ -156,7 +156,7 @@ void SbiParser::NoIf()
 
 void SbiParser::DoLoop()
 {
-    UINT32 nStartLbl = aGen.GetPC();
+    sal_uInt32 nStartLbl = aGen.GetPC();
     OpenBlock( DO );
     SbiToken eTok = Next();
     if( IsEoln( eTok ) )
@@ -183,7 +183,7 @@ void SbiParser::DoLoop()
             SbiExpression aCond( this );
             aCond.Gen();
         }
-        UINT32 nEndLbl = aGen.Gen( eTok == UNTIL ? _JUMPT : _JUMPF, 0 );
+        sal_uInt32 nEndLbl = aGen.Gen( eTok == UNTIL ? _JUMPT : _JUMPF, 0 );
         StmntBlock( LOOP );
         TestEoln();
         aGen.Gen( _JUMP, nStartLbl );
@@ -197,9 +197,9 @@ void SbiParser::DoLoop()
 void SbiParser::While()
 {
     SbiExpression aCond( this );
-    UINT32 nStartLbl = aGen.GetPC();
+    sal_uInt32 nStartLbl = aGen.GetPC();
     aCond.Gen();
-    UINT32 nEndLbl = aGen.Gen( _JUMPF, 0 );
+    sal_uInt32 nEndLbl = aGen.Gen( _JUMPF, 0 );
     StmntBlock( WEND );
     aGen.Gen( _JUMP, nStartLbl );
     aGen.BackChain( nEndLbl );
@@ -248,9 +248,9 @@ void SbiParser::For()
         aGen.Gen( _INITFOR );
     }
 
-    UINT32 nLoop = aGen.GetPC();
+    sal_uInt32 nLoop = aGen.GetPC();
     // Test durchfuehren, evtl. Stack freigeben
-    UINT32 nEndTarget = aGen.Gen( _TESTFOR, 0 );
+    sal_uInt32 nEndTarget = aGen.Gen( _TESTFOR, 0 );
     OpenBlock( FOR );
     StmntBlock( NEXT );
     aGen.Gen( _NEXT );
@@ -305,7 +305,7 @@ void SbiParser::OnGoto()
 {
     SbiExpression aCond( this );
     aCond.Gen();
-    UINT32 nLabelsTarget = aGen.Gen( _ONJUMP, 0 );
+    sal_uInt32 nLabelsTarget = aGen.Gen( _ONJUMP, 0 );
     SbiToken eTok = Next();
     if( eTok != GOTO && eTok != GOSUB )
     {
@@ -313,14 +313,14 @@ void SbiParser::OnGoto()
         eTok = GOTO;
     }
     // Label-Tabelle einlesen:
-    UINT32 nLbl = 0;
+    sal_uInt32 nLbl = 0;
     do
     {
         SbiToken eTok2 = NIL;
         eTok2 = Next(); // Label holen
         if( MayBeLabel() )
         {
-            UINT32 nOff = pProc->GetLabels().Reference( aSym );
+            sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
             aGen.Gen( _JUMP, nOff );
             nLbl++;
         }
@@ -340,7 +340,7 @@ void SbiParser::Goto()
     Next();
     if( MayBeLabel() )
     {
-        UINT32 nOff = pProc->GetLabels().Reference( aSym );
+        sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
         aGen.Gen( eOp, nOff );
     }
     else Error( SbERR_LABEL_EXPECTED );
@@ -353,7 +353,7 @@ void SbiParser::Return()
     Next();
     if( MayBeLabel() )
     {
-        UINT32 nOff = pProc->GetLabels().Reference( aSym );
+        sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
         aGen.Gen( _RETURN, nOff );
     }
     else aGen.Gen( _RETURN, 0 );
@@ -369,9 +369,9 @@ void SbiParser::Select()
     aCase.Gen();
     aGen.Gen( _CASE );
     TestEoln();
-    UINT32 nNextTarget = 0;
-    UINT32 nDoneTarget = 0;
-    BOOL bElse = FALSE;
+    sal_uInt32 nNextTarget = 0;
+    sal_uInt32 nDoneTarget = 0;
+    sal_Bool bElse = sal_False;
     // Die Cases einlesen:
     while( !bAbort )
     {
@@ -382,13 +382,13 @@ void SbiParser::Select()
                 aGen.BackChain( nNextTarget ), nNextTarget = 0;
             aGen.Statement();
             // Jeden Case einlesen
-            BOOL bDone = FALSE;
-            UINT32 nTrueTarget = 0;
+            sal_Bool bDone = sal_False;
+            sal_uInt32 nTrueTarget = 0;
             if( Peek() == ELSE )
             {
                 // CASE ELSE
                 Next();
-                bElse = TRUE;
+                bElse = sal_True;
             }
             else while( !bDone )
             {
@@ -407,7 +407,7 @@ void SbiParser::Select()
                     aCompare.Gen();
                     nTrueTarget = aGen.Gen(
                         _CASEIS, nTrueTarget,
-                        sal::static_int_cast< UINT16 >(
+                        sal::static_int_cast< sal_uInt16 >(
                             SbxEQ + ( eTok2 - EQ ) ) );
                 }
                 else
@@ -428,7 +428,7 @@ void SbiParser::Select()
 
                 }
                 if( Peek() == COMMA ) Next();
-                else TestEoln(), bDone = TRUE;
+                else TestEoln(), bDone = sal_True;
             }
             // Alle Cases abgearbeitet
             if( !bElse )
@@ -493,7 +493,7 @@ void SbiParser::On()
                     aGen.Gen( _STDERROR );
                 else
                 {
-                    UINT32 nOff = pProc->GetLabels().Reference( aSym );
+                    sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
                     aGen.Gen( _ERRHDL, nOff );
                 }
             }
@@ -525,7 +525,7 @@ void SbiParser::On()
 
 void SbiParser::Resume()
 {
-    UINT32 nLbl;
+    sal_uInt32 nLbl;
 
     switch( Next() )
     {
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 3d7178ae7688..670ca7384767 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -35,18 +35,18 @@ struct SbiParseStack {              // "Stack" fuer Statement-Blocks
     SbiParseStack* pNext;           // Chain
     SbiExprNode* pWithVar;          // Variable fuer WITH
     SbiToken eExitTok;              // Exit-Token
-    UINT32  nChain;                 // JUMP-Chain
+    sal_uInt32  nChain;                 // JUMP-Chain
 };
 
 struct SbiStatement {
     SbiToken eTok;
     void( SbiParser::*Func )();     // Verarbeitungsroutine
-    BOOL  bMain;                    // TRUE: ausserhalb SUBs OK
-    BOOL  bSubr;                    // TRUE: in SUBs OK
+    sal_Bool  bMain;                    // sal_True: ausserhalb SUBs OK
+    sal_Bool  bSubr;                    // sal_True: in SUBs OK
 };
 
-#define Y   TRUE
-#define N   FALSE
+#define Y   sal_True
+#define N   sal_False
 
 static SbiStatement StmntTable [] = {
 { CALL,     &SbiParser::Call,       N, Y, }, // CALL
@@ -141,7 +141,7 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
     bGblDefs =
     bNewGblDefs =
     bSingleLineIf =
-    bExplicit = FALSE;
+    bExplicit = sal_False;
     bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::CLASS );
     OSL_TRACE("Parser - %s, bClassModule %d", rtl::OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
     pPool    = &aPublics;
@@ -187,7 +187,7 @@ SbiSymDef* SbiParser::CheckRTLForSym( const String& rSym, SbxDataType eType )
 
 // Globale Chainkette schliessen
 
-BOOL SbiParser::HasGlobalCode()
+sal_Bool SbiParser::HasGlobalCode()
 {
     if( bGblDefs && nGblChain )
     {
@@ -252,49 +252,49 @@ void SbiParser::Exit()
         Error( SbERR_BAD_EXIT );
 }
 
-BOOL SbiParser::TestSymbol( BOOL bKwdOk )
+sal_Bool SbiParser::TestSymbol( sal_Bool bKwdOk )
 {
     Peek();
     if( eCurTok == SYMBOL || ( bKwdOk && IsKwd( eCurTok ) ) )
     {
-        Next(); return TRUE;
+        Next(); return sal_True;
     }
     Error( SbERR_SYMBOL_EXPECTED );
-    return FALSE;
+    return sal_False;
 }
 
 // Testen auf ein bestimmtes Token
 
-BOOL SbiParser::TestToken( SbiToken t )
+sal_Bool SbiParser::TestToken( SbiToken t )
 {
     if( Peek() == t )
     {
-        Next(); return TRUE;
+        Next(); return sal_True;
     }
     else
     {
         Error( SbERR_EXPECTED, t );
-        return FALSE;
+        return sal_False;
     }
 }
 
 // Testen auf Komma oder EOLN
 
-BOOL SbiParser::TestComma()
+sal_Bool SbiParser::TestComma()
 {
     SbiToken eTok = Peek();
     if( IsEoln( eTok ) )
     {
         Next();
-        return FALSE;
+        return sal_False;
     }
     else if( eTok != COMMA )
     {
         Error( SbERR_EXPECTED, COMMA );
-        return FALSE;
+        return sal_False;
     }
     Next();
-    return TRUE;
+    return sal_True;
 }
 
 // Testen, ob EOLN vorliegt
@@ -320,16 +320,16 @@ void SbiParser::StmntBlock( SbiToken eEnd )
     if( IsEof() )
     {
         Error( SbERR_BAD_BLOCK, eEnd );
-        bAbort = TRUE;
+        bAbort = sal_True;
     }
 }
 
 // Die Hauptroutine. Durch wiederholten Aufrufs dieser Routine wird
-// die Quelle geparst. Returnwert FALSE bei Ende/Fehlern.
+// die Quelle geparst. Returnwert sal_False bei Ende/Fehlern.
 
-BOOL SbiParser::Parse()
+sal_Bool SbiParser::Parse()
 {
-    if( bAbort ) return FALSE;
+    if( bAbort ) return sal_False;
 
     EnableErrors();
 
@@ -345,16 +345,16 @@ BOOL SbiParser::Parse()
         // ein nGblChain vorhanden sein, daher vorher abfragen
         if( bNewGblDefs && nGblChain == 0 )
             nGblChain = aGen.Gen( _JUMP, 0 );
-        return FALSE;
+        return sal_False;
     }
 
     // Leerstatement?
     if( IsEoln( eCurTok ) )
     {
-        Next(); return TRUE;
+        Next(); return sal_True;
     }
 
-    if( !bSingleLineIf && MayBeLabel( TRUE ) )
+    if( !bSingleLineIf && MayBeLabel( sal_True ) )
     {
         // Ist ein Label
         if( !pProc )
@@ -365,7 +365,7 @@ BOOL SbiParser::Parse()
         // Leerstatement?
         if( IsEoln( eCurTok ) )
         {
-            Next(); return TRUE;
+            Next(); return sal_True;
         }
     }
 
@@ -378,13 +378,13 @@ BOOL SbiParser::Parse()
         Next();
         if( eCurTok != NIL )
             aGen.Statement();
-        return FALSE;
+        return sal_False;
     }
 
     // Kommentar?
     if( eCurTok == REM )
     {
-        Next(); return TRUE;
+        Next(); return sal_True;
     }
 
     // Kommt ein Symbol, ist es entweder eine Variable( LET )
@@ -428,7 +428,7 @@ BOOL SbiParser::Parse()
                     ( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ) )
                 {
                     nGblChain = aGen.Gen( _JUMP, 0 );
-                    bNewGblDefs = FALSE;
+                    bNewGblDefs = sal_False;
                 }
                 // Statement-Opcode bitte auch am Anfang einer Sub
                 if( ( p->bSubr && (eCurTok != STATIC || Peek() == SUB || Peek() == FUNCTION ) ) ||
@@ -459,7 +459,7 @@ BOOL SbiParser::Parse()
     }
     // Der Parser bricht am Ende ab, das naechste Token ist noch nicht
     // geholt!
-    return TRUE;
+    return sal_True;
 }
 
 // Innerste With-Variable liefern
@@ -564,7 +564,7 @@ void SbiParser::Assign()
     SbiExpression aExpr( this );
     aLvalue.Gen();
     aExpr.Gen();
-    USHORT nLen = 0;
+    sal_uInt16 nLen = 0;
     SbiSymDef* pDef = aLvalue.GetRealVar();
     {
         if( pDef->GetConstDef() )
@@ -595,7 +595,7 @@ void SbiParser::Set()
         Next();
         String aStr;
         SbiSymDef* pTypeDef = new SbiSymDef( aStr );
-        TypeDecl( *pTypeDef, TRUE );
+        TypeDecl( *pTypeDef, sal_True );
 
         aLvalue.Gen();
         // aGen.Gen( _CLASS, pDef->GetTypeId() | 0x8000 );
@@ -747,7 +747,7 @@ void SbiParser::EnableCompatibility()
 {
     if( !bCompatible )
         AddConstants();
-    bCompatible = TRUE;
+    bCompatible = sal_True;
 }
 
 // OPTION
@@ -757,7 +757,7 @@ void SbiParser::Option()
     switch( Next() )
     {
         case EXPLICIT:
-            bExplicit = TRUE; break;
+            bExplicit = sal_True; break;
         case BASE:
             if( Next() == NUMBER )
             {
@@ -780,9 +780,9 @@ void SbiParser::Option()
         {
             SbiToken eTok = Next();
             if( eTok == BINARY )
-                bText = FALSE;
+                bText = sal_False;
             else if( eTok == SYMBOL && GetSym().EqualsIgnoreCaseAscii("text") )
-                bText = TRUE;
+                bText = sal_True;
             else
                 Error( SbERR_EXPECTED, "Text/Binary" );
             break;
@@ -792,7 +792,7 @@ void SbiParser::Option()
             break;
 
         case CLASSMODULE:
-            bClassModule = TRUE;
+            bClassModule = sal_True;
             aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::CLASS );
             break;
         case VBASUPPORT:
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index c8fe782487e3..12e368d1c7eb 100755
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -271,7 +271,7 @@ String lcl_dumpMethodParameters( SbMethod* pMethod )
     {
         aStr += '(';
         // 0 is sub itself
-        for ( USHORT nParam = 1; nParam < pParams->Count(); nParam++ )
+        for ( sal_uInt16 nParam = 1; nParam < pParams->Count(); nParam++ )
         {
             SbxVariable* pVar = pParams->Get( nParam );
             DBG_ASSERT( pVar, "Parameter?!" );
@@ -324,9 +324,9 @@ void dbg_DeInitTrace( void )
     GbTraceOn = GbSavTraceOn;
 }
 
-static INT32 GnLastCallLvl = 0;
+static sal_Int32 GnLastCallLvl = 0;
 
-void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl )
+void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
 {
     if( !GbTraceOn )
         return;
@@ -383,7 +383,7 @@ void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl )
         lcl_lineOut( GpTraceFileName, rStr_PCode.getStr(), lcl_getSpaces( nIndent ) );
 }
 
-void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl, bool bLeave )
+void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, sal_Int32 nCallLvl, bool bLeave )
 {
     static const char* pSeparator = "' ================================================================================";
 
@@ -448,7 +448,7 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl,
         lcl_lineOut( GpTraceFileName, "" );
 }
 
-void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, INT32 nCallLvl )
+void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, sal_Int32 nCallLvl )
 {
     if( !GbTraceOn )
         return;
@@ -463,7 +463,7 @@ void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool b
     lcl_lineOut( GpTraceFileName, Buffer, lcl_getSpaces( nIndent ) );
 }
 
-void dbg_RegisterTraceTextForPC( SbModule* pModule, UINT32 nPC,
+void dbg_RegisterTraceTextForPC( SbModule* pModule, sal_uInt32 nPC,
     const String& aTraceStr_STMNT, const String& aTraceStr_PCode )
 {
     String aModuleName = pModule->GetName();
@@ -490,7 +490,7 @@ void dbg_RegisterTraceTextForPC( SbModule* pModule, UINT32 nPC,
     (*pInnerMap)[nPC] = aData;
 }
 
-void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -621,13 +621,13 @@ void dbg_SaveDisassembly( SbModule* pModule )
 // Diese Routine ist hier definiert, damit der Compiler als eigenes Segment
 // geladen werden kann.
 
-BOOL SbModule::Compile()
+sal_Bool SbModule::Compile()
 {
     if( pImage )
-        return TRUE;
+        return sal_True;
     StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
     if( !pBasic )
-        return FALSE;
+        return sal_False;
     SbxBase::ResetError();
     // Aktuelles Modul!
     SbModule* pOld = pCMOD;
@@ -646,14 +646,14 @@ BOOL SbModule::Compile()
 
     // Beim Compilieren eines Moduls werden die Modul-globalen
     // Variablen aller Module ungueltig
-    BOOL bRet = IsCompiled();
+    sal_Bool bRet = IsCompiled();
     if( bRet )
     {
         if( !this->ISA(SbObjModule) )
             pBasic->ClearAllModuleVars();
         RemoveVars(); // remove 'this' Modules variables
         // clear all method statics
-        for( USHORT i = 0; i < pMethods->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
         {
             SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
             if( p )
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 26c6af53cc56..e518779b78d5 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -66,9 +66,9 @@ SbiScanner::SbiScanner( const ::rtl::OUString& rBuf, StarBASIC* p ) : aBuf( rBuf
     bUsedForHilite =
     bCompatible =
     bVBASupportOn =
-    bPrevLineExtentsComment = FALSE;
+    bPrevLineExtentsComment = sal_False;
     bHash    =
-    bErrors  = TRUE;
+    bErrors  = sal_True;
 }
 
 SbiScanner::~SbiScanner()
@@ -90,19 +90,19 @@ void SbiScanner::GenError( SbError code )
 {
     if( GetSbData()->bBlockCompilerError )
     {
-        bAbort = TRUE;
+        bAbort = sal_True;
         return;
     }
     if( !bError && bErrors )
     {
-        BOOL bRes = TRUE;
+        sal_Bool bRes = sal_True;
         // Nur einen Fehler pro Statement reporten
-        bError = TRUE;
+        bError = sal_True;
         if( pBasic )
         {
             // Falls EXPECTED oder UNEXPECTED kommen sollte, bezieht es sich
             // immer auf das letzte Token, also die Col1 uebernehmen
-            USHORT nc = nColLock ? nSavedCol1 : nCol1;
+            sal_uInt16 nc = nColLock ? nSavedCol1 : nCol1;
             switch( code )
             {
                 case SbERR_EXPECTED:
@@ -122,16 +122,16 @@ void SbiScanner::GenError( SbError code )
         nErrors++;
 }
 
-// Falls sofort ein Doppelpunkt folgt, wird TRUE zurueckgeliefert.
+// Falls sofort ein Doppelpunkt folgt, wird sal_True zurueckgeliefert.
 // Wird von SbiTokenizer::MayBeLabel() verwendet, um einen Label zu erkennen
 
-BOOL SbiScanner::DoesColonFollow()
+sal_Bool SbiScanner::DoesColonFollow()
 {
     if( pLine && *pLine == ':' )
     {
-        pLine++; nCol++; return TRUE;
+        pLine++; nCol++; return sal_True;
     }
-    else return FALSE;
+    else return sal_False;
 }
 
 // Testen auf ein legales Suffix
@@ -143,36 +143,36 @@ static SbxDataType GetSuffixType( sal_Unicode c )
     {
         sal_uInt32 n = aSuffixesStr.Search( c );
         if( STRING_NOTFOUND != n && c != ' ' )
-            return SbxDataType( (USHORT) n + SbxINTEGER );
+            return SbxDataType( (sal_uInt16) n + SbxINTEGER );
     }
     return SbxVARIANT;
 }
 
 // Einlesen des naechsten Symbols in die Variablen aSym, nVal und eType
-// Returnwert ist FALSE bei EOF oder Fehlern
+// Returnwert ist sal_False bei EOF oder Fehlern
 #define BUF_SIZE 80
 
-BOOL SbiScanner::NextSym()
+sal_Bool SbiScanner::NextSym()
 {
     // Fuer den EOLN-Fall merken
-    USHORT nOldLine = nLine;
-    USHORT nOldCol1 = nCol1;
-    USHORT nOldCol2 = nCol2;
+    sal_uInt16 nOldLine = nLine;
+    sal_uInt16 nOldCol1 = nCol1;
+    sal_uInt16 nOldCol2 = nCol2;
     sal_Unicode buf[ BUF_SIZE ], *p = buf;
-    bHash = FALSE;
+    bHash = sal_False;
 
     eScanType = SbxVARIANT;
     aSym.Erase();
     bSymbol =
-    bNumber = bSpaces = FALSE;
+    bNumber = bSpaces = sal_False;
 
     // Zeile einlesen?
     if( !pLine )
     {
-        INT32 n = nBufPos;
-        INT32 nLen = aBuf.getLength();
+        sal_Int32 n = nBufPos;
+        sal_Int32 nLen = aBuf.getLength();
         if( nBufPos >= nLen )
-            return FALSE;
+            return sal_False;
         const sal_Unicode* p2 = aBuf.getStr();
         p2 += n;
         while( ( n < nLen ) && ( *p2 != '\n' ) && ( *p2 != '\r' ) )
@@ -194,7 +194,7 @@ BOOL SbiScanner::NextSym()
 
     // Leerstellen weg:
     while( *pLine && (( *pLine == ' ' ) || ( *pLine == '\t' ) || ( *pLine == '\f' )) )
-        pLine++, nCol++, bSpaces = TRUE;
+        pLine++, nCol++, bSpaces = sal_True;
 
     nCol1 = nCol;
 
@@ -209,7 +209,7 @@ BOOL SbiScanner::NextSym()
     {
         pLine++;
         nCol++;
-        bHash = TRUE;
+        bHash = sal_True;
     }
 
     // Symbol? Dann Zeichen kopieren.
@@ -219,7 +219,7 @@ BOOL SbiScanner::NextSym()
         if( *pLine == '_' && !*(pLine+1) )
         {   pLine++;
             goto eoln;  }
-        bSymbol = TRUE;
+        bSymbol = sal_True;
         short n = nCol;
         for ( ; (BasicSimpleCharClass::isAlphaNumeric( *pLine, bCompatible ) || ( *pLine == '_' ) ); pLine++ )
             nCol++;
@@ -279,13 +279,13 @@ BOOL SbiScanner::NextSym()
         short ndig = 0;
         short ncdig = 0;
         eScanType = SbxDOUBLE;
-        BOOL bBufOverflow = FALSE;
+        sal_Bool bBufOverflow = sal_False;
         while( strchr( "0123456789.DEde", *pLine ) && *pLine )
         {
             // AB 4.1.1996: Buffer voll? -> leer weiter scannen
             if( (p-buf) == (BUF_SIZE-1) )
             {
-                bBufOverflow = TRUE;
+                bBufOverflow = sal_True;
                 pLine++, nCol++;
                 continue;
             }
@@ -322,7 +322,7 @@ BOOL SbiScanner::NextSym()
             if (!exp) ndig++;
         }
         *p = 0;
-        aSym = p; bNumber = TRUE;
+        aSym = p; bNumber = sal_True;
         // Komma, Exponent mehrfach vorhanden?
         if( comma > 1 || exp > 1 )
         {   aError = '.';
@@ -382,10 +382,10 @@ BOOL SbiScanner::NextSym()
                 // Wird als Operator angesehen
                 pLine--; nCol--; nCol1 = nCol-1; aSym = '&'; return SYMBOL;
         }
-        bNumber = TRUE;
+        bNumber = sal_True;
         long l = 0;
         int i;
-        BOOL bBufOverflow = FALSE;
+        sal_Bool bBufOverflow = sal_False;
         while( BasicSimpleCharClass::isAlphaNumeric( *pLine & 0xFF, bCompatible ) )
         {
             sal_Unicode ch = sal::static_int_cast< sal_Unicode >(
@@ -393,7 +393,7 @@ BOOL SbiScanner::NextSym()
             pLine++; nCol++;
             // AB 4.1.1996: Buffer voll, leer weiter scannen
             if( (p-buf) == (BUF_SIZE-1) )
-                bBufOverflow = TRUE;
+                bBufOverflow = sal_True;
             else if( String( cmp ).Search( ch ) != STRING_NOTFOUND )
             //else if( strchr( cmp, ch ) )
                 *p++ = ch;
@@ -426,7 +426,7 @@ BOOL SbiScanner::NextSym()
     {
         sal_Unicode cSep = *pLine;
         if( cSep == '[' )
-            bSymbol = TRUE, cSep = ']';
+            bSymbol = sal_True, cSep = ']';
         short n = nCol+1;
         while( *pLine )
         {
@@ -446,7 +446,7 @@ BOOL SbiScanner::NextSym()
         // Doppelte Stringbegrenzer raus
         String s( cSep );
         s += cSep;
-        USHORT nIdx = 0;
+        sal_uInt16 nIdx = 0;
         do
         {
             nIdx = aSym.Search( s, nIdx );
@@ -485,15 +485,15 @@ PrevLineCommentLbl:
     if( bPrevLineExtentsComment || (eScanType != SbxSTRING &&
         ( aSym.GetBuffer()[0] == '\'' || aSym.EqualsIgnoreCaseAscii( "REM" ) ) ) )
     {
-        bPrevLineExtentsComment = FALSE;
+        bPrevLineExtentsComment = sal_False;
         aSym = String::CreateFromAscii( "REM" );
-        USHORT nLen = String( pLine ).Len();
+        sal_uInt16 nLen = String( pLine ).Len();
         if( bCompatible && pLine[ nLen - 1 ] == '_' && pLine[ nLen - 2 ] == ' ' )
-            bPrevLineExtentsComment = TRUE;
+            bPrevLineExtentsComment = sal_True;
         nCol2 = nCol2 + nLen;
         pLine = NULL;
     }
-    return TRUE;
+    return sal_True;
 
     // Sonst Zeilen-Ende: aber bitte auf '_' testen, ob die
     // Zeile nicht weitergeht!
@@ -508,7 +508,7 @@ eoln:
             //    .Method
             // ^^^  <- spaces is legal in MSO VBA
             OSL_TRACE("*** resetting bSpaces***");
-            bSpaces = FALSE;
+            bSpaces = sal_False;
         }
         return bRes;
     }
@@ -520,7 +520,7 @@ eoln:
         nCol2 = nOldCol2;
         aSym = '\n';
         nColLock = 0;
-        return TRUE;
+        return sal_True;
     }
 }
 
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 9df91a5748b9..2688b5be28cf 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -58,7 +58,7 @@ SbiStringPool::~SbiStringPool()
 
 // Suchen
 
-const String& SbiStringPool::Find( USHORT n ) const
+const String& SbiStringPool::Find( sal_uInt16 n ) const
 {
     if( !n || n > aData.Count() )
         return aEmpty;
@@ -69,10 +69,10 @@ const String& SbiStringPool::Find( USHORT n ) const
 // Hinzufuegen eines Strings. Der String wird Case-Insensitiv
 // verglichen.
 
-short SbiStringPool::Add( const String& rVal, BOOL bNoCase )
+short SbiStringPool::Add( const String& rVal, sal_Bool bNoCase )
 {
-    USHORT n = aData.Count();
-    for( USHORT i = 0; i < n; i++ )
+    sal_uInt16 n = aData.Count();
+    for( sal_uInt16 i = 0; i < n; i++ )
     {
         String* p = aData.GetObject( i );
         if( (  bNoCase && p->Equals( rVal ) )
@@ -125,7 +125,7 @@ void SbiSymPool::Clear()
 
 SbiSymDef* SbiSymPool::First()
 {
-    nCur = (USHORT) -1;
+    nCur = (sal_uInt16) -1;
     return Next();
 }
 
@@ -206,8 +206,8 @@ void SbiSymPool::Add( SbiSymDef* pDef )
 
 SbiSymDef* SbiSymPool::Find( const String& rName ) const
 {
-    USHORT nCount = aData.Count();
-    for( USHORT i = 0; i < nCount; i++ )
+    sal_uInt16 nCount = aData.Count();
+    for( sal_uInt16 i = 0; i < nCount; i++ )
     {
         SbiSymDef* p = aData.GetObject( nCount - i - 1 );
         if( ( !p->nProcId || ( p->nProcId == nProcId ) )
@@ -222,9 +222,9 @@ SbiSymDef* SbiSymPool::Find( const String& rName ) const
 
 // Suchen ueber ID-Nummer
 
-SbiSymDef* SbiSymPool::FindId( USHORT n ) const
+SbiSymDef* SbiSymPool::FindId( sal_uInt16 n ) const
 {
-    for( USHORT i = 0; i < aData.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aData.Count(); i++ )
     {
         SbiSymDef* p = aData.GetObject( i );
         if( p->nId == n && ( !p->nProcId || ( p->nProcId == nProcId ) ) )
@@ -238,7 +238,7 @@ SbiSymDef* SbiSymPool::FindId( USHORT n ) const
 
 // Suchen ueber Position (ab 0)
 
-SbiSymDef* SbiSymPool::Get( USHORT n ) const
+SbiSymDef* SbiSymPool::Get( sal_uInt16 n ) const
 {
     if( n >= aData.Count() )
         return NULL;
@@ -246,7 +246,7 @@ SbiSymDef* SbiSymPool::Get( USHORT n ) const
         return aData.GetObject( n );
 }
 
-UINT32 SbiSymPool::Define( const String& rName )
+sal_uInt32 SbiSymPool::Define( const String& rName )
 {
     SbiSymDef* p = Find( rName );
     if( p )
@@ -258,7 +258,7 @@ UINT32 SbiSymPool::Define( const String& rName )
     return p->Define();
 }
 
-UINT32 SbiSymPool::Reference( const String& rName )
+sal_uInt32 SbiSymPool::Reference( const String& rName )
 {
     SbiSymDef* p = Find( rName );
     if( !p )
@@ -272,7 +272,7 @@ UINT32 SbiSymPool::Reference( const String& rName )
 
 void SbiSymPool::CheckRefs()
 {
-    for( USHORT i = 0; i < aData.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aData.Count(); i++ )
     {
         SbiSymDef* p = aData.GetObject( i );
         if( !p->IsDefined() )
@@ -304,7 +304,7 @@ SbiSymDef::SbiSymDef( const String& rName ) : aName( rName )
     bWithEvents =
     bByVal   =
     bChained =
-    bGlobal  = FALSE;
+    bGlobal  = sal_False;
     pIn      =
     pPool    = NULL;
     nDefaultId = 0;
@@ -360,11 +360,11 @@ void SbiSymDef::SetType( SbxDataType t )
 // Es wird der Wert zurueckgeliefert, der als Operand gespeichert
 // werden soll.
 
-UINT32 SbiSymDef::Reference()
+sal_uInt32 SbiSymDef::Reference()
 {
     if( !bChained )
     {
-        UINT32 n = nChain;
+        sal_uInt32 n = nChain;
         nChain = pIn->pParser->aGen.GetOffset();
         return n;
     }
@@ -374,13 +374,13 @@ UINT32 SbiSymDef::Reference()
 // Definition eines Symbols.
 // Hier wird der Backchain aufgeloest, falls vorhanden
 
-UINT32 SbiSymDef::Define()
+sal_uInt32 SbiSymDef::Define()
 {
-    UINT32 n = pIn->pParser->aGen.GetPC();
+    sal_uInt32 n = pIn->pParser->aGen.GetPC();
     pIn->pParser->aGen.GenStmnt();
     if( nChain ) pIn->pParser->aGen.BackChain( nChain );
     nChain = n;
-    bChained = TRUE;
+    bChained = sal_True;
     return nChain;
 }
 
@@ -409,7 +409,7 @@ SbiSymScope SbiSymDef::GetScope() const
 // 3) aLabels: Labels
 
 SbiProcDef::SbiProcDef( SbiParser* pParser, const String& rName,
-                        BOOL bProcDecl )
+                        sal_Bool bProcDecl )
          : SbiSymDef( rName )
          , aParams( pParser->aGblStrings, SbPARAM )  // wird gedumpt
          , aLabels( pParser->aLclStrings, SbLOCAL )  // wird nicht gedumpt
@@ -421,9 +421,9 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const String& rName,
     nLine1  =
     nLine2  = 0;
     mePropMode = PROPERTY_MODE_NONE;
-    bPublic = TRUE;
-    bCdecl  = FALSE;
-    bStatic = FALSE;
+    bPublic = sal_True;
+    bCdecl  = sal_False;
+    bStatic = sal_False;
     // Fuer Returnwerte ist das erste Element der Parameterliste
     // immer mit dem Namen und dem Typ der Proc definiert
     aParams.AddSym( aName );
@@ -451,7 +451,7 @@ void SbiProcDef::Match( SbiProcDef* pOld )
 {
     SbiSymDef* po, *pn=NULL;
     // Parameter 0 ist der Funktionsname
-    USHORT i;
+    sal_uInt16 i;
     for( i = 1; i < aParams.GetSize(); i++ )
     {
         po = pOld->aParams.Get( i );
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 8cb3126f03f1..8700ae4129ba 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -386,10 +386,10 @@ SbiTokenizer::SbiTokenizer( const ::rtl::OUString& rSrc, StarBASIC* pb )
     //if( StarBASIC::GetGlobalLanguageMode() == SB_LANG_JAVASCRIPT )
     //  pTokTable = aTokTable_Java;
     TokenTable *tp;
-    bEof = bAs = FALSE;
+    bEof = bAs = sal_False;
     eCurTok = NIL;
     ePush = NIL;
-    bEos = bKeywords = bErrorIsSymbol = TRUE;
+    bEos = bKeywords = bErrorIsSymbol = sal_True;
     if( !nToken )
         for( nToken = 0, tp = pTokTable; tp->t; nToken++, tp++ ) {}
 }
@@ -431,9 +431,9 @@ SbiToken SbiTokenizer::Peek()
 {
     if( ePush == NIL )
     {
-        USHORT nOldLine = nLine;
-        USHORT nOldCol1 = nCol1;
-        USHORT nOldCol2 = nCol2;
+        sal_uInt16 nOldLine = nLine;
+        sal_uInt16 nOldCol1 = nCol1;
+        sal_uInt16 nOldCol2 = nCol2;
         ePush = Next();
         nPLine = nLine; nLine = nOldLine;
         nPCol1 = nCol1; nCol1 = nOldCol1;
@@ -498,15 +498,15 @@ SbiToken SbiTokenizer::Next()
     // Sonst einlesen:
     if( !NextSym() )
     {
-        bEof = bEos = TRUE;
+        bEof = bEos = sal_True;
         return eCurTok = EOLN;
     }
     // Zeilenende?
     if( aSym.GetBuffer()[0] == '\n' )
     {
-        bEos = TRUE; return eCurTok = EOLN;
+        bEos = sal_True; return eCurTok = EOLN;
     }
-    bEos = FALSE;
+    bEos = sal_False;
 
     // Zahl?
     if( bNumber )
@@ -573,10 +573,10 @@ special:
     {
         // AB, 15.3.96, Spezialbehandlung fuer END, beim Peek() geht die
         // aktuelle Zeile verloren, daher alles merken und danach restaurieren
-        USHORT nOldLine = nLine;
-        USHORT nOldCol  = nCol;
-        USHORT nOldCol1 = nCol1;
-        USHORT nOldCol2 = nCol2;
+        sal_uInt16 nOldLine = nLine;
+        sal_uInt16 nOldCol  = nCol;
+        sal_uInt16 nOldCol1 = nCol1;
+        sal_uInt16 nOldCol2 = nCol2;
         String aOldSym = aSym;
         SaveLine();             // pLine im Scanner sichern
 
@@ -612,11 +612,11 @@ special:
     eCurTok = tp->t;
     // AS: Datentypen sind Keywords
     if( tp->t == AS )
-        bAs = TRUE;
+        bAs = sal_True;
     else
     {
         if( bAs )
-            bAs = FALSE;
+            bAs = sal_False;
         else if( eCurTok >= DATATYPE1 && eCurTok <= DATATYPE2 && (bErrorIsSymbol || eCurTok != _ERROR_) )
             eCurTok = SYMBOL;
     }
@@ -653,12 +653,12 @@ special:
 
 // Kann das aktuell eingelesene Token ein Label sein?
 
-BOOL SbiTokenizer::MayBeLabel( BOOL bNeedsColon )
+sal_Bool SbiTokenizer::MayBeLabel( sal_Bool bNeedsColon )
 {
     if( eCurTok == SYMBOL || m_aTokenLabelInfo.canTokenBeLabel( eCurTok ) )
-        return bNeedsColon ? DoesColonFollow() : TRUE;
+        return bNeedsColon ? DoesColonFollow() : sal_True;
     else
-        return BOOL( eCurTok == NUMBER
+        return sal_Bool( eCurTok == NUMBER
                   && eScanType == SbxINTEGER
                   && nVal >= 0 );
 }
@@ -670,8 +670,8 @@ BOOL SbiTokenizer::MayBeLabel( BOOL bNeedsColon )
 
 void SbiTokenizer::Hilite( SbTextPortions& rList )
 {
-    bErrors = FALSE;
-    bUsedForHilite = TRUE;
+    bErrors = sal_False;
+    bUsedForHilite = sal_True;
     SbiToken eLastTok = NIL;
     for( ;; )
     {
@@ -709,6 +709,6 @@ void SbiTokenizer::Hilite( SbTextPortions& rList )
             break;
         eLastTok = eCurTok;
     }
-    bUsedForHilite = FALSE;
+    bUsedForHilite = sal_False;
 }
 
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index cbb1a1702354..4c14cac05791 100644
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -37,27 +37,27 @@ class SbiBuffer {                   // Code/Konstanten-Puffer:
     SbiParser* pParser;             // fuer Fehlermeldungen
     char*   pBuf;                   // Puffer-Pointer
     char*   pCur;                   // aktueller Puffer-Pointer
-    UINT32  nOff;                   // aktuelles Offset
-    UINT32  nSize;                  // aktuelle Groesse
+    sal_uInt32  nOff;                   // aktuelles Offset
+    sal_uInt32  nSize;                  // aktuelle Groesse
     short   nInc;                   // Inkrement
-    BOOL    Check( USHORT );        // Buffergroesse testen
+    sal_Bool    Check( sal_uInt16 );        // Buffergroesse testen
 public:
     SbiBuffer( SbiParser*, short ); // Inkrement
    ~SbiBuffer();
-    void Patch( UINT32, UINT32 );   // Patchen
-    void Chain( UINT32 );           // Back-Chain
-    void Align( INT32 );            // Alignment
-    BOOL Add( const void*, USHORT );// Element anfuegen
-    BOOL operator += (const String&);// Basic-String speichern
-    BOOL operator += (INT8);        // Zeichen speichern
-    BOOL operator += (INT16);       // Integer speichern
-    BOOL operator += (UINT8);       // Zeichen speichern
-    BOOL operator += (UINT16);      // Integer speichern
-    BOOL operator += (UINT32);      // Integer speichern
-    BOOL operator += (INT32);       // Integer speichern
+    void Patch( sal_uInt32, sal_uInt32 );   // Patchen
+    void Chain( sal_uInt32 );           // Back-Chain
+    void Align( sal_Int32 );            // Alignment
+    sal_Bool Add( const void*, sal_uInt16 );// Element anfuegen
+    sal_Bool operator += (const String&);// Basic-String speichern
+    sal_Bool operator += (sal_Int8);        // Zeichen speichern
+    sal_Bool operator += (sal_Int16);       // Integer speichern
+    sal_Bool operator += (sal_uInt8);       // Zeichen speichern
+    sal_Bool operator += (sal_uInt16);      // Integer speichern
+    sal_Bool operator += (sal_uInt32);      // Integer speichern
+    sal_Bool operator += (sal_Int32);       // Integer speichern
     char*  GetBuffer();             // Puffer rausgeben (selbst loeschen!)
     char*  GetBufferPtr(){ return pBuf; }
-    UINT32 GetSize()                { return nOff; }
+    sal_uInt32 GetSize()                { return nOff; }
 };
 
 #endif
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index a3fe02227cfd..a496322bb6d7 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -40,28 +40,28 @@ class SbiCodeGen {              // Code-Erzeugung:
     SbiBuffer aCode;                // Code-Puffer
     short  nLine, nCol;         // Zeile, Spalte fuer Stmnt-Befehl
     short  nForLevel;           // #29955 for-Schleifen-Ebene
-    BOOL bStmnt;                // TRUE: Statement-Opcode liegt an
+    sal_Bool bStmnt;                // sal_True: Statement-Opcode liegt an
 public:
     SbiCodeGen( SbModule&, SbiParser*, short );
     SbiParser* GetParser() { return pParser; }
     SbModule& GetModule() { return rMod; }
-    UINT32 Gen( SbiOpcode );
-    UINT32 Gen( SbiOpcode, UINT32 );
-    UINT32 Gen( SbiOpcode, UINT32, UINT32 );
-    void Patch( UINT32 o, UINT32 v ){ aCode.Patch( o, v ); }
-    void BackChain( UINT32 off )    { aCode.Chain( off );  }
+    sal_uInt32 Gen( SbiOpcode );
+    sal_uInt32 Gen( SbiOpcode, sal_uInt32 );
+    sal_uInt32 Gen( SbiOpcode, sal_uInt32, sal_uInt32 );
+    void Patch( sal_uInt32 o, sal_uInt32 v ){ aCode.Patch( o, v ); }
+    void BackChain( sal_uInt32 off )    { aCode.Chain( off );  }
     void Statement();
     void GenStmnt();            // evtl. Statement-Opcode erzeugen
-    UINT32 GetPC();
-    UINT32 GetOffset()              { return GetPC() + 1; }
+    sal_uInt32 GetPC();
+    sal_uInt32 GetOffset()              { return GetPC() + 1; }
     void Save();
 
     // #29955 for-Schleifen-Ebene pflegen
     void IncForLevel( void ) { nForLevel++; }
     void DecForLevel( void ) { nForLevel--; }
 
-    static UINT32 calcNewOffSet( BYTE* pCode, UINT16 nOffset );
-    static UINT16 calcLegacyOffSet( BYTE* pCode, UINT32 nOffset );
+    static sal_uInt32 calcNewOffSet( sal_uInt8* pCode, sal_uInt16 nOffset );
+    static sal_uInt16 calcLegacyOffSet( sal_uInt8* pCode, sal_uInt32 nOffset );
 
 };
 
@@ -69,8 +69,8 @@ template < class T, class S >
 class PCodeBuffConvertor
 {
     T m_nSize; //
-    BYTE* m_pStart;
-    BYTE* m_pCnvtdBuf;
+    sal_uInt8* m_pStart;
+    sal_uInt8* m_pCnvtdBuf;
     S m_nCnvtdSize; //
 
     //  Disable usual copying symantics and bodgy default ctor
@@ -78,11 +78,11 @@ class PCodeBuffConvertor
     PCodeBuffConvertor(const PCodeBuffConvertor& );
     PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& );
 public:
-    PCodeBuffConvertor( BYTE* pCode, T nSize ): m_nSize( nSize ),  m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); }
+    PCodeBuffConvertor( sal_uInt8* pCode, T nSize ): m_nSize( nSize ),  m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); }
     S GetSize(){ return m_nCnvtdSize; }
     void convert();
     // Caller owns the buffer returned
-    BYTE* GetBuffer() { return m_pCnvtdBuf; }
+    sal_uInt8* GetBuffer() { return m_pCnvtdBuf; }
 };
 
 // #111897 PARAM_INFO flags start at 0x00010000 to not
diff --git a/basic/source/inc/disas.hxx b/basic/source/inc/disas.hxx
index 328a085e6c29..2d85dc5d1365 100644
--- a/basic/source/inc/disas.hxx
+++ b/basic/source/inc/disas.hxx
@@ -37,14 +37,14 @@ class SbiDisas {
     const SbiImage& rImg;
     SbModule* pMod;
     char     cLabels[ MAX_LABELS ];     // Bitvektor fuer Labels
-    UINT32   nOff;                  // aktuelle Position
-    UINT32   nPC;                   // Position des Opcodes
+    sal_uInt32   nOff;                  // aktuelle Position
+    sal_uInt32   nPC;                   // Position des Opcodes
     SbiOpcode eOp;                  // Opcode
-    UINT32   nOp1, nOp2;            // Operanden
-    UINT32   nParts;                // 1, 2 oder 3
-    UINT32   nLine;                 // aktuelle Zeile
-    BOOL     DisasLine( String& );
-    BOOL     Fetch();               // naechster Opcode
+    sal_uInt32   nOp1, nOp2;            // Operanden
+    sal_uInt32   nParts;                // 1, 2 oder 3
+    sal_uInt32   nLine;                 // aktuelle Zeile
+    sal_Bool     DisasLine( String& );
+    sal_Bool     Fetch();               // naechster Opcode
 public:
     SbiDisas( SbModule*, const SbiImage* );
     void Disas( SvStream& );
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 3795321f0578..28a84094d918 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -98,7 +98,7 @@ class SbiExprNode {                  // Operatoren (und Operanden)
     friend class SbiExpression;
     friend class SbiConstExpression;
     union {
-        USHORT nTypeStrId;          // gepoolter String-ID, #i59791/#i45570 Now only for TypeOf
+        sal_uInt16 nTypeStrId;          // gepoolter String-ID, #i59791/#i45570 Now only for TypeOf
         double nVal;                // numerischer Wert
         SbVar  aVar;                // oder Variable
     };
@@ -110,19 +110,19 @@ class SbiExprNode {                  // Operatoren (und Operanden)
     SbiNodeType  eNodeType;         // Art des Nodes
     SbxDataType eType;              // aktueller Datentyp
     SbiToken     eTok;              // Token des Operators
-    BOOL  bComposite;               // TRUE: Zusammengesetzter Ausdruck
-    BOOL  bError;                   // TRUE: Fehlerhaft
+    sal_Bool  bComposite;               // sal_True: Zusammengesetzter Ausdruck
+    sal_Bool  bError;                   // sal_True: Fehlerhaft
     void  FoldConstants();          // Constant Folding durchfuehren
     void  CollectBits();            // Umwandeln von Zahlen in Strings
-    BOOL  IsOperand()               // TRUE, wenn Operand
-        { return BOOL( eNodeType != SbxNODE && eNodeType != SbxTYPEOF && eNodeType != SbxNEW ); }
-    BOOL  IsTypeOf()
-        { return BOOL( eNodeType == SbxTYPEOF ); }
-    BOOL  IsNew()
-        { return BOOL( eNodeType == SbxNEW ); }
-    BOOL  IsNumber();               // TRUE bei Zahlen
-    BOOL  IsString();               // TRUE bei Strings
-    BOOL  IsLvalue();               // TRUE, falls als Lvalue verwendbar
+    sal_Bool  IsOperand()               // sal_True, wenn Operand
+        { return sal_Bool( eNodeType != SbxNODE && eNodeType != SbxTYPEOF && eNodeType != SbxNEW ); }
+    sal_Bool  IsTypeOf()
+        { return sal_Bool( eNodeType == SbxTYPEOF ); }
+    sal_Bool  IsNew()
+        { return sal_Bool( eNodeType == SbxNEW ); }
+    sal_Bool  IsNumber();               // sal_True bei Zahlen
+    sal_Bool  IsString();               // sal_True bei Strings
+    sal_Bool  IsLvalue();               // sal_True, falls als Lvalue verwendbar
     void  GenElement( SbiOpcode );  // Element
     void  BaseInit( SbiParser* p ); // Hilfsfunktion fuer Ctor, AB 17.12.95
 public:
@@ -131,15 +131,15 @@ public:
     SbiExprNode( SbiParser*, const String& );
     SbiExprNode( SbiParser*, const SbiSymDef&, SbxDataType, SbiExprList* = NULL );
     SbiExprNode( SbiParser*, SbiExprNode*, SbiToken, SbiExprNode* );
-    SbiExprNode( SbiParser*, SbiExprNode*, USHORT );    // #120061 TypeOf
-    SbiExprNode( SbiParser*, USHORT );                  // new <type>
+    SbiExprNode( SbiParser*, SbiExprNode*, sal_uInt16 );    // #120061 TypeOf
+    SbiExprNode( SbiParser*, sal_uInt16 );                  // new <type>
     virtual ~SbiExprNode();
 
-    BOOL IsValid()                  { return BOOL( !bError ); }
-    BOOL IsConstant()               // TRUE bei konstantem Operanden
-        { return BOOL( eNodeType == SbxSTRVAL || eNodeType == SbxNUMVAL ); }
-    BOOL IsIntConst();              // TRUE bei Integer-Konstanten
-    BOOL IsVariable();              // TRUE, wenn Variable
+    sal_Bool IsValid()                  { return sal_Bool( !bError ); }
+    sal_Bool IsConstant()               // sal_True bei konstantem Operanden
+        { return sal_Bool( eNodeType == SbxSTRVAL || eNodeType == SbxNUMVAL ); }
+    sal_Bool IsIntConst();              // sal_True bei Integer-Konstanten
+    sal_Bool IsVariable();              // sal_True, wenn Variable
 
     SbiExprNode* GetWithParent()            { return pWithParent; }
     void SetWithParent( SbiExprNode* p )    { pWithParent = p; }
@@ -172,11 +172,11 @@ protected:
     SbiExprNode*   pExpr;            // Der Expression-Baum
     SbiExprType   eCurExpr;         // Art des Ausdrucks
     SbiExprMode   m_eMode;          // Expression context
-    BOOL          bBased;           // TRUE: einfacher DIM-Teil (+BASE)
-    BOOL          bError;           // TRUE: Fehler
-    BOOL          bByVal;           // TRUE: ByVal-Parameter
-    BOOL          bBracket;         // TRUE: Parameter list with brackets
-    USHORT        nParenLevel;
+    sal_Bool          bBased;           // sal_True: einfacher DIM-Teil (+BASE)
+    sal_Bool          bError;           // sal_True: Fehler
+    sal_Bool          bByVal;           // sal_True: ByVal-Parameter
+    sal_Bool          bBracket;         // sal_True: Parameter list with brackets
+    sal_uInt16        nParenLevel;
     SbiExprNode* Term( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL );
     SbiExprNode* ObjTerm( SbiSymDef& );
     SbiExprNode* Operand( bool bUsedForTypeOf = false );
@@ -200,16 +200,16 @@ public:
     SbiExpression( SbiParser*, SbiToken );        // Spezial-Expr mit Spezial-Tokens
    ~SbiExpression();
     String& GetName()               { return aArgName;            }
-    void SetBased()                 { bBased = TRUE;              }
-    BOOL IsBased()                  { return bBased;              }
-    void SetByVal()                 { bByVal = TRUE;              }
-    BOOL IsByVal()                  { return bByVal;              }
-    BOOL IsBracket()                { return bBracket;            }
-    BOOL IsValid()                  { return pExpr->IsValid();    }
-    BOOL IsConstant()               { return pExpr->IsConstant(); }
-    BOOL IsVariable()               { return pExpr->IsVariable(); }
-    BOOL IsLvalue()                 { return pExpr->IsLvalue();   }
-    BOOL IsIntConstant()            { return pExpr->IsIntConst(); }
+    void SetBased()                 { bBased = sal_True;              }
+    sal_Bool IsBased()                  { return bBased;              }
+    void SetByVal()                 { bByVal = sal_True;              }
+    sal_Bool IsByVal()                  { return bByVal;              }
+    sal_Bool IsBracket()                { return bBracket;            }
+    sal_Bool IsValid()                  { return pExpr->IsValid();    }
+    sal_Bool IsConstant()               { return pExpr->IsConstant(); }
+    sal_Bool IsVariable()               { return pExpr->IsVariable(); }
+    sal_Bool IsLvalue()                 { return pExpr->IsLvalue();   }
+    sal_Bool IsIntConstant()            { return pExpr->IsIntConst(); }
     const String& GetString()       { return pExpr->GetString();  }
     SbiSymDef* GetVar()             { return pExpr->GetVar();     }
     SbiSymDef* GetRealVar()         { return pExpr->GetRealVar(); }
@@ -237,31 +237,31 @@ protected:
     SbiExpression* pFirst;          // Expressions
     short nExpr;                    // Anzahl Expressions
     short nDim;                     // Anzahl Dimensionen
-    BOOL  bError;                   // TRUE: Fehler
-    BOOL  bBracket;                 // TRUE: Klammern
+    sal_Bool  bError;                   // sal_True: Fehler
+    sal_Bool  bBracket;                 // sal_True: Klammern
 public:
     SbiExprList( SbiParser* );
     virtual ~SbiExprList();
-    BOOL  IsBracket()               { return bBracket;        }
-    BOOL  IsValid()                 { return BOOL( !bError ); }
+    sal_Bool  IsBracket()               { return bBracket;        }
+    sal_Bool  IsValid()                 { return sal_Bool( !bError ); }
     short GetSize()                 { return nExpr;           }
     short GetDims()                 { return nDim;            }
     SbiExpression* Get( short );
-    BOOL  Test( const SbiProcDef& );    // Parameter-Checks
+    sal_Bool  Test( const SbiProcDef& );    // Parameter-Checks
     void  Gen();                    // Code-Erzeugung
     void addExpression( SbiExpression* pExpr );
 };
 
 class SbiParameters : public SbiExprList {
 public:
-    SbiParameters( SbiParser*, BOOL bConst = FALSE, BOOL bPar = TRUE);// parsender Ctor
+    SbiParameters( SbiParser*, sal_Bool bConst = sal_False, sal_Bool bPar = sal_True);// parsender Ctor
 };
 
 class SbiDimList : public SbiExprList {
-    BOOL  bConst;                   // TRUE: Alles sind Integer-Konstanten
+    sal_Bool  bConst;                   // sal_True: Alles sind Integer-Konstanten
 public:
     SbiDimList( SbiParser* );         // Parsender Ctor
-    BOOL  IsConstant()              { return bConst; }
+    sal_Bool  IsConstant()              { return bConst; }
 };
 
 #endif
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index dccdec703dd3..2b3b3eafbf65 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -57,9 +57,9 @@ class SvStream;
 // Diese Records enthalten wiederum weitere Records. Jeder Record hat
 // den folgenden Header:
 
-//  UINT16 Kennung
-//  UINT32 Laenge des Records ohne Header
-//  UINT16 Anzahl Unterelemente
+//  sal_uInt16 Kennung
+//  sal_uInt32 Laenge des Records ohne Header
+//  sal_uInt16 Anzahl Unterelemente
 
 // Alle Datei-Offsets in Records sind relativ zum Start des Moduls!
 
@@ -84,33 +84,33 @@ class SvStream;
 #endif
 
 // Ein Library Record enthaelt nur Module Records
-//  UINT16 Kennung BL
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl Module
+//  sal_uInt16 Kennung BL
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl Module
 
 // Ein Modul-Record enthaelt alle anderen Recordtypen
-//  UINT16 Kennung BM
-//  UINT32 Laenge des Records
-//  UINT16 1
+//  sal_uInt16 Kennung BM
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 1
 // Daten:
-//  UINT32 Versionsnummer
-//  UINT32 Zeichensatz
-//  UINT32 Startadresse Initialisierungscode
-//  UINT32 Startadresse Sub Main
-//  UINT32 Reserviert
-//  UINT32 Reserviert
+//  sal_uInt32 Versionsnummer
+//  sal_uInt32 Zeichensatz
+//  sal_uInt32 Startadresse Initialisierungscode
+//  sal_uInt32 Startadresse Sub Main
+//  sal_uInt32 Reserviert
+//  sal_uInt32 Reserviert
 
 // Modulname, Kommentar und Quellcode:
-//  UINT16 Kennung MN, MC oder SC
-//  UINT32 Laenge des Records
-//  UINT16 1
+//  sal_uInt16 Kennung MN, MC oder SC
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 1
 // Daten:
 //  String-Instanz
 
 // P-Code:
-//  UINT16 Kennung PC
-//  UINT32 Laenge des Records
-//  UINT16 1
+//  sal_uInt16 Kennung PC
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 1
 // Daten:
 //  Der P-Code als Bytesack
 
@@ -118,61 +118,61 @@ class SvStream;
 // Verweise auf diese Strings sind in Form eines Indexes in diesen Pool.
 
 // Liste aller Publics:
-//  UINT16 Kennung PU oder Pu
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Publics
+//  sal_uInt16 Kennung PU oder Pu
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Publics
 // Daten fuer jeden Public-Eintrag:
-//  UINT16 String-Index
-//  UINT32 Startadresse im P-Code-Image (UINT16 fuer alte Publics)
-//  UINT16 Datentyp des Returnwertes (ab Version 2)
+//  sal_uInt16 String-Index
+//  sal_uInt32 Startadresse im P-Code-Image (sal_uInt16 fuer alte Publics)
+//  sal_uInt16 Datentyp des Returnwertes (ab Version 2)
 
 // Verzeichnis der Symbol-Tabellen:
-//  UINT16 Kennung SP
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Symboltabellen
+//  sal_uInt16 Kennung SP
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Symboltabellen
 // Daten fuer jede Symboltabelle:
-//  UINT16 Stringindex des Namens
-//  UINT16 Anzahl Symbole
-//  UINT16 Scope-Kennung
+//  sal_uInt16 Stringindex des Namens
+//  sal_uInt16 Anzahl Symbole
+//  sal_uInt16 Scope-Kennung
 
 // Symboltabelle:
-//  UINT16 Kennung SY
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Symbole
+//  sal_uInt16 Kennung SY
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Symbole
 // Daten:
-//  UINT16 Stringindex des Namens
-//  UINT16 Anzahl Symbole
+//  sal_uInt16 Stringindex des Namens
+//  sal_uInt16 Anzahl Symbole
 // Daten fuer jedes Symbol:
-//  UINT16 Stringindex des Namens
-//  UINT16 Datentyp
-//  UINT16 Laenge bei STRING*n-Symbolen (0x8000: STATIC-Variable)
+//  sal_uInt16 Stringindex des Namens
+//  sal_uInt16 Datentyp
+//  sal_uInt16 Laenge bei STRING*n-Symbolen (0x8000: STATIC-Variable)
 
 // Stringpool:
-//  UINT16 Kennung ST
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Strings
+//  sal_uInt16 Kennung ST
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Strings
 // Daten fuer jeden String:
-//  UINT32 Offset in den Block aller Strings
+//  sal_uInt32 Offset in den Block aller Strings
 // Danach folgt der Block aller Strings, die dort als ASCIIZ-Strings liegen.
 
 // Line Ranges:
-//  UINT16 Kennung LR
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Strings
+//  sal_uInt16 Kennung LR
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Strings
 // Daten fuer jedes Public:
-//  UINT16 1. Zeile (Sub XXX)
-//  UINT16 2. Zeile (End Sub)
+//  sal_uInt16 1. Zeile (Sub XXX)
+//  sal_uInt16 2. Zeile (End Sub)
 
 // SBX-Objekte:
-// UINT16 Anzahl Objekte
+// sal_uInt16 Anzahl Objekte
 // ....   Objektdaten
 
 ////////////////////////////////////////////////////////////////////////////
 
 // Service-Routinen (in IMAGE.CXX)
 
-BOOL  SbGood( SvStream& r );
-ULONG SbOpenRecord( SvStream&, UINT16 nSignature, UINT16 nElem );
-void  SbCloseRecord( SvStream&, ULONG );
+sal_Bool  SbGood( SvStream& r );
+sal_uIntPtr SbOpenRecord( SvStream&, sal_uInt16 nSignature, sal_uInt16 nElem );
+void  SbCloseRecord( SvStream&, sal_uIntPtr );
 
 #endif
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index d674b91faf71..b2d863acc52b 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -44,25 +44,25 @@ class SbiImage {
 
     SbxArrayRef    rTypes;          // User defined types
     SbxArrayRef    rEnums;          // Enum types
-    UINT32*        pStringOff;      // StringId-Offsets
+    sal_uInt32*        pStringOff;      // StringId-Offsets
     sal_Unicode*   pStrings;        // StringPool
     char*          pCode;           // Code-Image
     char*          pLegacyPCode;        // Code-Image
-    BOOL           bError;          // TRUE: Fehler
-    USHORT         nFlags;          // Flags (s.u.)
+    sal_Bool           bError;          // sal_True: Fehler
+    sal_uInt16         nFlags;          // Flags (s.u.)
     short          nStrings;        // Anzahl Strings
-    UINT32         nStringSize;     // Groesse des String-Puffers
-    UINT32         nCodeSize;       // Groesse des Code-Blocks
-    UINT16         nLegacyCodeSize;     // Groesse des Code-Blocks
-    UINT16         nDimBase;        // OPTION BASE-Wert
+    sal_uInt32         nStringSize;     // Groesse des String-Puffers
+    sal_uInt32         nCodeSize;       // Groesse des Code-Blocks
+    sal_uInt16         nLegacyCodeSize;     // Groesse des Code-Blocks
+    sal_uInt16         nDimBase;        // OPTION BASE-Wert
     rtl_TextEncoding eCharSet;      // Zeichensatz fuer Strings
                                     // temporaere Verwaltungs-Variable:
     short          nStringIdx;      // aktueller String-Index
-    UINT32         nStringOff;      // aktuelle Pos im Stringpuffer
+    sal_uInt32         nStringOff;      // aktuelle Pos im Stringpuffer
                                     // Routinen fuer Compiler:
     void MakeStrings( short );      // StringPool einrichten
     void AddString( const String& );// String zufuegen
-    void AddCode( char*, UINT32 );  // Codeblock dazu
+    void AddCode( char*, sal_uInt32 );  // Codeblock dazu
     void AddType(SbxObject *);      // User-Type mit aufnehmen
     void AddEnum(SbxObject *);      // Register enum type
 
@@ -70,35 +70,35 @@ public:
     String aName;                   // Makroname
     ::rtl::OUString aOUSource;      // Quellcode
     String aComment;                // Kommentar
-    BOOL   bInit;                   // TRUE: Init-Code ist gelaufen
-    BOOL   bFirstInit;              // TRUE, wenn das Image das erste mal nach
+    sal_Bool   bInit;                   // sal_True: Init-Code ist gelaufen
+    sal_Bool   bFirstInit;              // sal_True, wenn das Image das erste mal nach
                                     // dem Compilieren initialisiert wird.
     SbiImage();
    ~SbiImage();
     void Clear();                   // Inhalt loeschen
-    BOOL Load( SvStream&, UINT32& nVer );       // Loads image from stream
+    sal_Bool Load( SvStream&, sal_uInt32& nVer );       // Loads image from stream
                             // nVer is set to version
                             // of image
-    BOOL Load( SvStream& );
-    BOOL Save( SvStream&, UINT32 = B_CURVERSION );
-    BOOL IsError()                  { return bError;    }
+    sal_Bool Load( SvStream& );
+    sal_Bool Save( SvStream&, sal_uInt32 = B_CURVERSION );
+    sal_Bool IsError()                  { return bError;    }
 
     const char* GetCode() const     { return pCode;     }
-    UINT32      GetCodeSize() const { return nCodeSize; }
+    sal_uInt32      GetCodeSize() const { return nCodeSize; }
     ::rtl::OUString& GetSource32()  { return aOUSource; }
-    USHORT      GetBase() const     { return nDimBase;  }
+    sal_uInt16      GetBase() const     { return nDimBase;  }
     String      GetString( short nId ) const;
     //const char* GetString( short nId ) const;
     const SbxObject*  FindType (String aTypeName) const;
 
     SbxArrayRef GetEnums()          { return rEnums; }
 
-    void        SetFlag( USHORT n ) { nFlags |= n;      }
-    USHORT      GetFlag( USHORT n ) const { return nFlags & n; }
-    UINT16      CalcLegacyOffset( INT32 nOffset );
-    UINT32      CalcNewOffset( INT16 nOffset );
+    void        SetFlag( sal_uInt16 n ) { nFlags |= n;      }
+    sal_uInt16      GetFlag( sal_uInt16 n ) const { return nFlags & n; }
+    sal_uInt16      CalcLegacyOffset( sal_Int32 nOffset );
+    sal_uInt32      CalcNewOffset( sal_Int16 nOffset );
     void        ReleaseLegacyBuffer();
-    BOOL        ExceedsLegacyLimits();
+    sal_Bool        ExceedsLegacyLimits();
 
 };
 
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index b0ebcb0e87f0..1308e0289b9f 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -49,10 +49,10 @@ class SvStream;
 
 class SbiStream {
     SvStream* pStrm;                // der Stream
-    ULONG  nExpandOnWriteTo;        // bei Schreibzugriff, den Stream
+    sal_uIntPtr  nExpandOnWriteTo;      // bei Schreibzugriff, den Stream
                                     // bis zu dieser Groesse aufblasen
     ByteString aLine;               // aktuelle Zeile
-    ULONG  nLine;                   // aktuelle Zeilennummer
+    sal_uIntPtr  nLine;                 // aktuelle Zeilennummer
     short  nLen;                    // Pufferlaenge
     short  nMode;                   // Bits:
     short  nChan;                   // aktueller Kanal
@@ -64,9 +64,9 @@ public:
    ~SbiStream();
     SbError Open( short, const ByteString&, short, short, short );
     SbError Close();
-    SbError Read( ByteString&, USHORT = 0, bool bForceReadingPerByte=false );
+    SbError Read( ByteString&, sal_uInt16 = 0, bool bForceReadingPerByte=false );
     SbError Read( char& );
-    SbError Write( const ByteString&, USHORT = 0 );
+    SbError Write( const ByteString&, sal_uInt16 = 0 );
 
     bool IsText() const     { return (nMode & SBSTRM_BINARY) == 0; }
     bool IsRandom() const   { return (nMode & SBSTRM_RANDOM) != 0; }
@@ -75,8 +75,8 @@ public:
     bool IsAppend() const   { return (nMode & SBSTRM_APPEND) != 0; }
     short GetBlockLen() const          { return nLen;           }
     short GetMode() const              { return nMode;          }
-    ULONG GetLine() const              { return nLine;          }
-    void SetExpandOnWriteTo( ULONG n ) { nExpandOnWriteTo = n;  }
+    sal_uIntPtr GetLine() const            { return nLine;          }
+    void SetExpandOnWriteTo( sal_uIntPtr n ) { nExpandOnWriteTo = n;    }
     void ExpandFile();
     SvStream* GetStrm()                { return pStrm;          }
 };
diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx
index 29e4f68cc133..aa39eba72ef3 100644
--- a/basic/source/inc/object.hxx
+++ b/basic/source/inc/object.hxx
@@ -60,7 +60,7 @@ using SbxVariable::GetInfo;
 public:
 #endif
     typedef void( SampleObject::*pMeth )
-        ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
+        ( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite );
 #if defined ( ICC ) || defined ( HPUX )
 private:
 #endif
@@ -74,10 +74,10 @@ private:
     static Methods aMethods[];  // Methodentabelle
 
     // Methoden
-    void Display( SbxVariable*, SbxArray*, BOOL );
-    void Event( SbxVariable*, SbxArray*, BOOL );
-    void Square( SbxVariable*, SbxArray*, BOOL );
-    void Create( SbxVariable*, SbxArray*, BOOL );
+    void Display( SbxVariable*, SbxArray*, sal_Bool );
+    void Event( SbxVariable*, SbxArray*, sal_Bool );
+    void Square( SbxVariable*, SbxArray*, sal_Bool );
+    void Create( SbxVariable*, SbxArray*, sal_Bool );
     // Infoblock auffuellen
     SbxInfo* GetInfo( short nIdx );
     // Broadcaster Notification
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 733a65db7f61..62f7da1b4303 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -46,24 +46,24 @@ class SbiParser : public SbiTokenizer
     SbiProcDef* pProc;              // aktuelle Prozedur
     SbiExprNode*  pWithVar;         // aktuelle With-Variable
     SbiToken    eEndTok;            // das Ende-Token
-    UINT32      nGblChain;          // Chainkette fuer globale DIMs
-    BOOL        bGblDefs;           // TRUE globale Definitionen allgemein
-    BOOL        bNewGblDefs;        // TRUE globale Definitionen vor Sub
-    BOOL        bSingleLineIf;      // TRUE einzeiliges if-Statement
-
-    SbiSymDef*  VarDecl( SbiDimList**,BOOL,BOOL );// Variablen-Deklaration
-    SbiProcDef* ProcDecl(BOOL bDecl);// Prozedur-Deklaration
-    void DefStatic( BOOL bPrivate );
-    void DefProc( BOOL bStatic, BOOL bPrivate ); // Prozedur einlesen
-    void DefVar( SbiOpcode eOp, BOOL bStatic ); // DIM/REDIM einlesen
-    void TypeDecl( SbiSymDef&, BOOL bAsNewAlreadyParsed=FALSE );    // AS-Deklaration
+    sal_uInt32      nGblChain;          // Chainkette fuer globale DIMs
+    sal_Bool        bGblDefs;           // sal_True globale Definitionen allgemein
+    sal_Bool        bNewGblDefs;        // sal_True globale Definitionen vor Sub
+    sal_Bool        bSingleLineIf;      // sal_True einzeiliges if-Statement
+
+    SbiSymDef*  VarDecl( SbiDimList**,sal_Bool,sal_Bool );// Variablen-Deklaration
+    SbiProcDef* ProcDecl(sal_Bool bDecl);// Prozedur-Deklaration
+    void DefStatic( sal_Bool bPrivate );
+    void DefProc( sal_Bool bStatic, sal_Bool bPrivate ); // Prozedur einlesen
+    void DefVar( SbiOpcode eOp, sal_Bool bStatic ); // DIM/REDIM einlesen
+    void TypeDecl( SbiSymDef&, sal_Bool bAsNewAlreadyParsed=sal_False );    // AS-Deklaration
     void OpenBlock( SbiToken, SbiExprNode* = NULL );    // Block oeffnen
     void CloseBlock();              // Block aufloesen
-    BOOL Channel( BOOL=FALSE );     // Kanalnummer parsen
+    sal_Bool Channel( sal_Bool=sal_False );     // Kanalnummer parsen
     void StmntBlock( SbiToken );    // Statement-Block abarbeiten
-    void DefType( BOOL bPrivate );  // Parse type declaration
-    void DefEnum( BOOL bPrivate );  // Parse enum declaration
-    void DefDeclare( BOOL bPrivate );
+    void DefType( sal_Bool bPrivate );  // Parse type declaration
+    void DefEnum( sal_Bool bPrivate );  // Parse enum declaration
+    void DefDeclare( sal_Bool bPrivate );
     void EnableCompatibility();
 public:
     SbxArrayRef   rTypeArray;       // das Type-Array
@@ -78,26 +78,26 @@ public:
     SbiSymPool*   pPool;            // aktueller Pool
     SbiExprType   eCurExpr;         // aktueller Expr-Typ
     short         nBase;            // OPTION BASE-Wert
-    BOOL          bText;            // OPTION COMPARE TEXT
-    BOOL          bExplicit;        // TRUE: OPTION EXPLICIT
-    BOOL          bClassModule;     // TRUE: OPTION ClassModule
+    sal_Bool          bText;            // OPTION COMPARE TEXT
+    sal_Bool          bExplicit;        // sal_True: OPTION EXPLICIT
+    sal_Bool          bClassModule;     // sal_True: OPTION ClassModule
     StringVector  aIfaceVector;     // Holds all interfaces implemented by a class module
     StringVector  aRequiredTypes;   // Types used in Dim As New <type> outside subs
     SbxDataType   eDefTypes[26];    // DEFxxx-Datentypen
 
     SbiParser( StarBASIC*, SbModule* );
-    BOOL Parse();                   // die Aktion
+    sal_Bool Parse();                   // die Aktion
     SbiExprNode* GetWithVar();      // Innerste With-Variable liefern
 
     // AB 31.3.1996, Symbol in Runtime-Library suchen
     SbiSymDef* CheckRTLForSym( const String& rSym, SbxDataType eType );
     void AddConstants( void );
 
-    BOOL HasGlobalCode();           // Globaler Code definiert?
+    sal_Bool HasGlobalCode();           // Globaler Code definiert?
 
-    BOOL TestToken( SbiToken );     // bestimmtes TOken?
-    BOOL TestSymbol( BOOL=FALSE );  // Symbol?
-    BOOL TestComma();               // Komma oder EOLN?
+    sal_Bool TestToken( SbiToken );     // bestimmtes TOken?
+    sal_Bool TestSymbol( sal_Bool=sal_False );  // Symbol?
+    sal_Bool TestComma();               // Komma oder EOLN?
     void TestEoln();                // EOLN?
 
     void Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL );  // Let oder Call
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index be396a426185..262a2cf8935d 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -65,7 +65,7 @@ class SbPropertyValues:     public SbPropertyValuesHelper
     NS_UNO::Reference< ::com::sun::star::beans::XPropertySetInfo > _xInfo;
 
 private:
-    INT32                   GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
+    sal_Int32                   GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
 
 public:
                             SbPropertyValues();
@@ -166,7 +166,7 @@ public:
 
     // XPropertyContainer
     virtual void SAL_CALL addProperty(  const ::rtl::OUString& Name,
-                                        INT16 Attributes,
+                                        sal_Int16 Attributes,
                                         const NS_UNO::Any& DefaultValue)
         throw(  NS_BEANS::PropertyExistException, NS_BEANS::IllegalTypeException,
                 NS_LANG::IllegalArgumentException, NS_UNO::RuntimeException );
@@ -190,7 +190,7 @@ public:
 class StarBASIC;
 class SbxArray;
 
-void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
 
 
 #undef NS_BEANS
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 356e07c9e55c..46cd9d16521f 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -109,10 +109,10 @@ struct SbiForStack {                // for/next stack:
 
     // For each support
     ForType         eForType;
-    INT32           nCurCollectionIndex;
-    INT32*          pArrayCurIndices;
-    INT32*          pArrayLowerBounds;
-    INT32*          pArrayUpperBounds;
+    sal_Int32           nCurCollectionIndex;
+    sal_Int32*          pArrayCurIndices;
+    sal_Int32*          pArrayLowerBounds;
+    sal_Int32*          pArrayUpperBounds;
     Reference< XEnumeration > xEnumeration;
 
     SbiForStack( void )
@@ -130,8 +130,8 @@ struct SbiForStack {                // for/next stack:
 
 struct SbiGosubStack {              // GOSUB-Stack:
     SbiGosubStack* pNext;           // Chain
-    const BYTE* pCode;              // Return-Pointer
-    USHORT nStartForLvl;            // #118235: For Level in moment of gosub
+    const sal_uInt8* pCode;             // Return-Pointer
+    sal_uInt16 nStartForLvl;            // #118235: For Level in moment of gosub
 };
 
 #define MAXRECURSION 500            // max. 500 Rekursionen
@@ -156,7 +156,7 @@ public:
 #else
     ::osl::Directory* pDir;
 #endif
-    INT16   nDirFlags;
+    sal_Int16   nDirFlags;
     short   nCurDirPos;
 
     String sFullNameToBeChecked;
@@ -198,9 +198,9 @@ class SbiInstance
 
     SbError         nErr;           // aktueller Fehlercode
     String          aErrorMsg;      // letzte Error-Message fuer $ARG
-    USHORT          nErl;           // aktuelle Fehlerzeile
-    BOOL            bReschedule;    // Flag: TRUE = Reschedule in Hauptschleife
-    BOOL            bCompatibility; // Flag: TRUE = VBA runtime compatibility mode
+    sal_uInt16          nErl;           // aktuelle Fehlerzeile
+    sal_Bool            bReschedule;    // Flag: sal_True = Reschedule in Hauptschleife
+    sal_Bool            bCompatibility; // Flag: sal_True = VBA runtime compatibility mode
 
     ComponentVector_t ComponentVector;
 
@@ -210,9 +210,9 @@ public:
 
     // #31460 Neues Konzept fuer StepInto/Over/Out,
     // Erklaerung siehe runtime.cxx bei SbiInstance::CalcBreakCallLevel()
-    USHORT  nCallLvl;               // Call-Level (wg. Rekursion)
-    USHORT  nBreakCallLvl;          // Call-Level zum Anhalten
-    void    CalcBreakCallLevel( USHORT nFlags );    // Gemaess Flags setzen
+    sal_uInt16  nCallLvl;               // Call-Level (wg. Rekursion)
+    sal_uInt16  nBreakCallLvl;          // Call-Level zum Anhalten
+    void    CalcBreakCallLevel( sal_uInt16 nFlags );    // Gemaess Flags setzen
 
     SbiInstance( StarBASIC* );
    ~SbiInstance();
@@ -229,14 +229,14 @@ public:
     SbError GetErr()                { return nErr; }
     String  GetErrorMsg()           { return aErrorMsg; }
     xub_StrLen GetErl()             { return nErl; }
-    void    EnableReschedule( BOOL bEnable ) { bReschedule = bEnable; }
-    BOOL    IsReschedule( void ) { return bReschedule; }
-    void    EnableCompatibility( BOOL bEnable ) { bCompatibility = bEnable; }
-    BOOL    IsCompatibility( void ) { return bCompatibility; }
+    void    EnableReschedule( sal_Bool bEnable ) { bReschedule = bEnable; }
+    sal_Bool    IsReschedule( void ) { return bReschedule; }
+    void    EnableCompatibility( sal_Bool bEnable ) { bCompatibility = bEnable; }
+    sal_Bool    IsCompatibility( void ) { return bCompatibility; }
 
     ComponentVector_t& getComponentVector( void )  { return ComponentVector; }
 
-    SbMethod* GetCaller( USHORT );
+    SbMethod* GetCaller( sal_uInt16 );
     SbModule* GetActiveModule();
     SbxArray* GetLocals( SbMethod* );
 
@@ -276,11 +276,11 @@ struct RefSaveItem
 
 class SbiRuntime
 {
-    friend void SbRtl_CallByName( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+    friend void SbRtl_CallByName( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
 
     typedef void( SbiRuntime::*pStep0 )();
-    typedef void( SbiRuntime::*pStep1 )( UINT32 nOp1 );
-    typedef void( SbiRuntime::*pStep2 )( UINT32 nOp1, UINT32 nOp2 );
+    typedef void( SbiRuntime::*pStep1 )( sal_uInt32 nOp1 );
+    typedef void( SbiRuntime::*pStep2 )( sal_uInt32 nOp1, sal_uInt32 nOp2 );
     static pStep0 aStep0[];         // Opcode-Tabelle Gruppe 0
     static pStep1 aStep1[];         // Opcode-Tabelle Gruppe 1
     static pStep2 aStep2[];         // Opcode-Tabelle Gruppe 2
@@ -298,15 +298,15 @@ class SbiRuntime
     SbiArgvStack*  pArgvStk;        // ARGV-Stack
     SbiGosubStack* pGosubStk;       // GOSUB stack
     SbiForStack*   pForStk;         // FOR/NEXT-Stack
-    USHORT        nExprLvl;         // Tiefe des Expr-Stacks
-    USHORT        nGosubLvl;        // Zum Vermeiden von Tot-Rekursionen
-    USHORT        nForLvl;          // #118235: Maintain for level
-    const BYTE*   pCode;            // aktueller Code-Pointer
-    const BYTE*   pStmnt;           // Beginn des lezten Statements
-    const BYTE*   pError;           // Adresse des aktuellen Error-Handlers
-    const BYTE*   pRestart;         // Restart-Adresse
-    const BYTE*   pErrCode;         // Restart-Adresse RESUME NEXT
-    const BYTE*   pErrStmnt;        // Restart-Adresse RESUMT 0
+    sal_uInt16        nExprLvl;         // Tiefe des Expr-Stacks
+    sal_uInt16        nGosubLvl;        // Zum Vermeiden von Tot-Rekursionen
+    sal_uInt16        nForLvl;          // #118235: Maintain for level
+    const sal_uInt8*   pCode;            // aktueller Code-Pointer
+    const sal_uInt8*   pStmnt;           // Beginn des lezten Statements
+    const sal_uInt8*   pError;           // Adresse des aktuellen Error-Handlers
+    const sal_uInt8*   pRestart;         // Restart-Adresse
+    const sal_uInt8*   pErrCode;         // Restart-Adresse RESUME NEXT
+    const sal_uInt8*   pErrStmnt;        // Restart-Adresse RESUMT 0
     String        aLibName;         // Lib-Name fuer Declare-Call
     SbxArrayRef   refParams;        // aktuelle Prozedur-Parameter
     SbxArrayRef   refLocals;        // lokale Variable
@@ -314,14 +314,14 @@ class SbiRuntime
     // AB, 28.3.2000 #74254, Ein refSaveObj reicht nicht! Neu: pRefSaveList (s.u.)
     //SbxVariableRef refSaveObj;      // #56368 Bei StepElem Referenz sichern
     short         nArgc;            // aktueller Argc
-    BOOL          bRun;             // TRUE: Programm ist aktiv
-    BOOL          bError;           // TRUE: Fehler behandeln
-    BOOL          bInError;         // TRUE: in einem Fehler-Handler
-    BOOL          bBlocked;         // TRUE: blocked by next call level, #i48868
-    BOOL          bVBAEnabled;
-    USHORT        nFlags;           // Debugging-Flags
+    sal_Bool          bRun;             // sal_True: Programm ist aktiv
+    sal_Bool          bError;           // sal_True: Fehler behandeln
+    sal_Bool          bInError;         // sal_True: in einem Fehler-Handler
+    sal_Bool          bBlocked;         // sal_True: blocked by next call level, #i48868
+    sal_Bool          bVBAEnabled;
+    sal_uInt16        nFlags;           // Debugging-Flags
     SbError       nError;           // letzter Fehler
-    USHORT        nOps;             // Opcode-Zaehler
+    sal_uInt16        nOps;             // Opcode-Zaehler
     sal_uInt32    m_nLastTime;
 
     RefSaveItem*  pRefSaveList;     // #74254 Temporaere Referenzen sichern
@@ -350,17 +350,17 @@ class SbiRuntime
     }
 
     SbxVariable* FindElement
-    ( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError, BOOL bLocal, BOOL bStatic = FALSE );
-    void SetupArgs( SbxVariable*, UINT32 );
+    ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False );
+    void SetupArgs( SbxVariable*, sal_uInt32 );
     SbxVariable* CheckArray( SbxVariable* );
 
     void PushVar( SbxVariable* );   // Variable push
     SbxVariableRef PopVar();          // Variable pop
     SbxVariable* GetTOS( short=0 ); // Variable vom TOS holen
     void TOSMakeTemp();             // TOS in temp. Variable wandeln
-    BOOL ClearExprStack();          // Expr-Stack freigeben
+    sal_Bool ClearExprStack();          // Expr-Stack freigeben
 
-    void PushGosub( const BYTE* );  // GOSUB-Element push
+    void PushGosub( const sal_uInt8* );  // GOSUB-Element push
     void PopGosub();                // GOSUB-Element pop
     void ClearGosubStack();         // GOSUB-Stack freigeben
 
@@ -380,7 +380,7 @@ class SbiRuntime
     void SetParameters( SbxArray* );// Parameter uebernehmen
 
     // MUSS NOCH IMPLEMENTIERT WERDEN
-    void DllCall( const String&, const String&, SbxArray*, SbxDataType, BOOL );
+    void DllCall( const String&, const String&, SbxArray*, SbxDataType, sal_Bool );
 
     // #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
     void DimImpl( SbxVariableRef refVar );
@@ -388,7 +388,7 @@ class SbiRuntime
     // #115829
     bool implIsClass( SbxObject* pObj, const String& aClass );
 
-    void StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt = false );
+    void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false );
 
     // Die nachfolgenden Routinen werden vom Single Stepper
     // gerufen und implementieren die einzelnen Opcodes
@@ -411,40 +411,40 @@ class SbiRuntime
     void StepLSET(),    StepRSET(),     StepREDIMP_ERASE(),     StepERASE_CLEAR();
     void StepARRAYACCESS(), StepBYVAL();
     // Alle Opcodes mit einem Operanden
-    void StepLOADNC( UINT32 ),  StepLOADSC( UINT32 ),   StepLOADI( UINT32 );
-    void StepARGN( UINT32 ),    StepBASED( UINT32 ),    StepPAD( UINT32 );
-    void StepJUMP( UINT32 ),    StepJUMPT( UINT32 );
-    void StepJUMPF( UINT32 ),   StepONJUMP( UINT32 );
-    void StepGOSUB( UINT32 ),   StepRETURN( UINT32 );
-    void StepTESTFOR( UINT32 ), StepCASETO( UINT32 ),   StepERRHDL( UINT32 );
-    void StepRESUME( UINT32 ),  StepSETCLASS( UINT32 ), StepVBASETCLASS( UINT32 ),  StepTESTCLASS( UINT32 ), StepLIB( UINT32 );
+    void StepLOADNC( sal_uInt32 ),  StepLOADSC( sal_uInt32 ),   StepLOADI( sal_uInt32 );
+    void StepARGN( sal_uInt32 ),    StepBASED( sal_uInt32 ),    StepPAD( sal_uInt32 );
+    void StepJUMP( sal_uInt32 ),    StepJUMPT( sal_uInt32 );
+    void StepJUMPF( sal_uInt32 ),   StepONJUMP( sal_uInt32 );
+    void StepGOSUB( sal_uInt32 ),   StepRETURN( sal_uInt32 );
+    void StepTESTFOR( sal_uInt32 ), StepCASETO( sal_uInt32 ),   StepERRHDL( sal_uInt32 );
+    void StepRESUME( sal_uInt32 ),  StepSETCLASS( sal_uInt32 ), StepVBASETCLASS( sal_uInt32 ),  StepTESTCLASS( sal_uInt32 ), StepLIB( sal_uInt32 );
     bool checkClass_Impl( const SbxVariableRef& refVal, const String& aClass, bool bRaiseErrors, bool bDefault = true );
-    void StepCLOSE( UINT32 ),   StepPRCHAR( UINT32 ),   StepARGTYP( UINT32 );
+    void StepCLOSE( sal_uInt32 ),   StepPRCHAR( sal_uInt32 ),   StepARGTYP( sal_uInt32 );
     // Alle Opcodes mit zwei Operanden
-    void StepRTL( UINT32, UINT32 ),     StepPUBLIC( UINT32, UINT32 ),   StepPUBLIC_P( UINT32, UINT32 );
-    void StepPUBLIC_Impl( UINT32, UINT32, bool bUsedForClassModule );
-    void StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError, BOOL bLocal, BOOL bStatic = FALSE );
-    void StepFIND( UINT32, UINT32 ),    StepELEM( UINT32, UINT32 );
-    void StepGLOBAL( UINT32, UINT32 ),  StepLOCAL( UINT32, UINT32 );
-    void StepPARAM( UINT32, UINT32),    StepCREATE( UINT32, UINT32 );
-    void StepCALL( UINT32, UINT32 ),    StepCALLC( UINT32, UINT32 );
-    void StepCASEIS( UINT32, UINT32 ),  StepSTMNT( UINT32, UINT32 );
+    void StepRTL( sal_uInt32, sal_uInt32 ),     StepPUBLIC( sal_uInt32, sal_uInt32 ),   StepPUBLIC_P( sal_uInt32, sal_uInt32 );
+    void StepPUBLIC_Impl( sal_uInt32, sal_uInt32, bool bUsedForClassModule );
+    void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False );
+    void StepFIND( sal_uInt32, sal_uInt32 ),    StepELEM( sal_uInt32, sal_uInt32 );
+    void StepGLOBAL( sal_uInt32, sal_uInt32 ),  StepLOCAL( sal_uInt32, sal_uInt32 );
+    void StepPARAM( sal_uInt32, sal_uInt32),    StepCREATE( sal_uInt32, sal_uInt32 );
+    void StepCALL( sal_uInt32, sal_uInt32 ),    StepCALLC( sal_uInt32, sal_uInt32 );
+    void StepCASEIS( sal_uInt32, sal_uInt32 ),  StepSTMNT( sal_uInt32, sal_uInt32 );
     SbxVariable* StepSTATIC_Impl( String& aName, SbxDataType& t );
-    void StepOPEN( UINT32, UINT32 ),    StepSTATIC( UINT32, UINT32 );
-    void StepTCREATE(UINT32,UINT32),    StepDCREATE(UINT32,UINT32);
-    void StepGLOBAL_P( UINT32, UINT32 ),StepFIND_G( UINT32, UINT32 );
-    void StepDCREATE_REDIMP(UINT32,UINT32), StepDCREATE_IMPL(UINT32,UINT32);
-    void StepFIND_CM( UINT32, UINT32 );
-    void StepFIND_STATIC( UINT32, UINT32 );
-    void implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nOp2 );
+    void StepOPEN( sal_uInt32, sal_uInt32 ),    StepSTATIC( sal_uInt32, sal_uInt32 );
+    void StepTCREATE(sal_uInt32,sal_uInt32),    StepDCREATE(sal_uInt32,sal_uInt32);
+    void StepGLOBAL_P( sal_uInt32, sal_uInt32 ),StepFIND_G( sal_uInt32, sal_uInt32 );
+    void StepDCREATE_REDIMP(sal_uInt32,sal_uInt32), StepDCREATE_IMPL(sal_uInt32,sal_uInt32);
+    void StepFIND_CM( sal_uInt32, sal_uInt32 );
+    void StepFIND_STATIC( sal_uInt32, sal_uInt32 );
+    void implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt32 nOp2 );
 public:
     void          SetVBAEnabled( bool bEnabled );
-    USHORT      GetImageFlag( USHORT n ) const;
-    USHORT      GetBase();
+    sal_uInt16      GetImageFlag( sal_uInt16 n ) const;
+    sal_uInt16      GetBase();
     xub_StrLen  nLine,nCol1,nCol2;  // aktuelle Zeile, Spaltenbereich
     SbiRuntime* pNext;               // Stack-Chain
 
-    SbiRuntime( SbModule*, SbMethod*, UINT32 );
+    SbiRuntime( SbModule*, SbMethod*, sal_uInt32 );
    ~SbiRuntime();
     void Error( SbError, bool bVBATranslationAlreadyDone = false );     // Fehler setzen, falls != 0
     void Error( SbError, const String& );       // Fehler setzen, falls != 0
@@ -452,15 +452,15 @@ public:
     void FatalError( SbError, const String& );  // Fehlerbehandlung=Standard, Fehler setzen
     static sal_Int32 translateErrorToVba( SbError nError, String& rMsg );
     void DumpPCode();
-    BOOL Step();                    // Einzelschritt (ein Opcode)
-    void Stop()            { bRun = FALSE;   }
-    BOOL IsRun()           { return bRun;    }
-    void block( void )     { bBlocked = TRUE; }
-    void unblock( void )   { bBlocked = FALSE; }
+    sal_Bool Step();                    // Einzelschritt (ein Opcode)
+    void Stop()            { bRun = sal_False;   }
+    sal_Bool IsRun()           { return bRun;    }
+    void block( void )     { bBlocked = sal_True; }
+    void unblock( void )   { bBlocked = sal_False; }
     SbMethod* GetMethod()  { return pMeth;   }
     SbModule* GetModule()  { return pMod;    }
-    USHORT GetDebugFlags() { return nFlags;  }
-    void SetDebugFlags( USHORT nFl ) { nFlags = nFl;  }
+    sal_uInt16 GetDebugFlags() { return nFlags;  }
+    void SetDebugFlags( sal_uInt16 nFl ) { nFlags = nFl;  }
     SbMethod* GetCaller();
     SbxArray* GetLocals();
     SbxArray* GetParams();
@@ -493,12 +493,12 @@ StarBASIC* GetCurrentBasic( StarBASIC* pRTBasic );
 // no DDE functionality, no DLLCALL) in basic because
 // of portal "virtual" users (portal user != UNIX user)
 // (Implemented in iosys.cxx)
-BOOL needSecurityRestrictions( void );
+sal_Bool needSecurityRestrictions( void );
 
-// Returns TRUE if UNO is available, otherwise the old
+// Returns sal_True if UNO is available, otherwise the old
 // file system implementation has to be used
 // (Implemented in iosys.cxx)
-BOOL hasUno( void );
+sal_Bool hasUno( void );
 
 // Converts possibly relative paths to absolute paths
 // according to the setting done by ChDir/ChDrive
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 4c54e2301bd5..41296e865032 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -46,7 +46,7 @@ class SbModule;
 class SbiFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
@@ -79,7 +79,7 @@ public:
     void AddClassModule( SbModule* pClassModule );
     void RemoveClassModule( SbModule* pClassModule );
 
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 
     SbModule* FindClass( const String& rClassName );
@@ -117,14 +117,14 @@ struct SbiGlobals
     SbError         nCode;          // aktueller Fehlercode
     xub_StrLen      nLine;          // aktuelle Zeile
     xub_StrLen      nCol1,nCol2;    // aktuelle Spalten (von,bis)
-    BOOL            bCompiler;      // Flag fuer Compiler-Error
-    BOOL            bGlobalInitErr; // Beim GlobalInit trat ein Compiler-Fehler auf
-    BOOL            bRunInit;       // TRUE, wenn RunInit vom Basic aktiv ist
+    sal_Bool            bCompiler;      // Flag fuer Compiler-Error
+    sal_Bool            bGlobalInitErr; // Beim GlobalInit trat ein Compiler-Fehler auf
+    sal_Bool            bRunInit;       // sal_True, wenn RunInit vom Basic aktiv ist
     String          aErrMsg;        // Puffer fuer GetErrorText()
     SbLanguageMode  eLanguageMode;  // Flag fuer Visual-Basic-Script-Modus
     SbErrorStack*   pErrStack;      // Stack fuer die im Fehlerfall abgebaute SbiRuntime Kette
     ::utl::TransliterationWrapper* pTransliterationWrapper;    // For StrComp
-    BOOL            bBlockCompilerError;
+    sal_Bool            bBlockCompilerError;
     BasicManager*   pAppBasMgr;
     StarBASIC*      pMSOMacroRuntimLib; // Lib containing MSO Macro Runtime API entry symbols
 
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index a9b035e79da2..b4f680231f93 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -36,8 +36,8 @@
 
 class SbJScriptModule : public SbModule
 {
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
     TYPEINFO();
diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx
index 50e344fb63d2..d91c7bdf16e8 100755
--- a/basic/source/inc/sbtrace.hxx
+++ b/basic/source/inc/sbtrace.hxx
@@ -33,12 +33,12 @@
 #ifdef DBG_TRACE_BASIC
 void dbg_InitTrace( void );
 void dbg_DeInitTrace( void );
-void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl );
-void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl, bool bLeave = false );
-void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, INT32 nCallLvl );
-void dbg_RegisterTraceTextForPC( SbModule* pModule, UINT32 nPC,
+void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl );
+void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, sal_Int32 nCallLvl, bool bLeave = false );
+void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, sal_Int32 nCallLvl );
+void dbg_RegisterTraceTextForPC( SbModule* pModule, sal_uInt32 nPC,
     const String& aTraceStr_STMNT, const String& aTraceStr_PCode );
-void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
 #endif
 
 #endif
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 051ceedfbc78..5c9d58e8ce55 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -51,8 +51,8 @@ class SbUnoObject: public SbxObject
     ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > mxInvocation;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactName;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactNameInvocation;
-    BOOL bNeedIntrospection;
-    BOOL bNativeCOMObject;
+    sal_Bool bNeedIntrospection;
+    sal_Bool bNativeCOMObject;
     ::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection!
 
     // Hilfs-Methode zum Anlegen der dbg_-Properties
@@ -135,7 +135,7 @@ class SbUnoProperty : public SbxProperty
 
     // Daten der Uno-Property
     ::com::sun::star::beans::Property aUnoProp;
-    INT32 nId;
+    sal_Int32 nId;
 
     bool mbInvocation;      // Property is based on invocation
 
@@ -143,7 +143,7 @@ class SbUnoProperty : public SbxProperty
 public:
     TYPEINFO();
     SbUnoProperty( const String& aName_, SbxDataType eSbxType,
-        const ::com::sun::star::beans::Property& aUnoProp_, INT32 nId_, bool bInvocation );
+        const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation );
 
     bool isInvocationBased( void )
         { return mbInvocation; }
@@ -153,7 +153,7 @@ public:
 class SbUnoFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
@@ -292,15 +292,15 @@ public:
 class StarBASIC;
 
 // Impl-Methoden fuer RTL
-void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
 
 void disposeComVariablesForBasic( StarBASIC* pBasic );
 void clearNativeObjectWrapperVector( void );
@@ -320,8 +320,8 @@ class BasicCollection : public SbxObject
     virtual ~BasicCollection();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
-    INT32 implGetIndex( SbxVariable* pIndexVar );
-    INT32 implGetIndexForName( const String& rName );
+    sal_Int32 implGetIndex( SbxVariable* pIndexVar );
+    sal_Int32 implGetIndexForName( const String& rName );
     void CollAdd( SbxArray* pPar_ );
     void CollItem( SbxArray* pPar_ );
     void CollRemove( SbxArray* pPar_ );
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 9738e8763a1a..0c2c27f72b2f 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -58,33 +58,33 @@ protected:
     short  nCol;                        // aktuelle Spaltennummer
     short  nErrors;                     // Anzahl Fehler
     short  nColLock;                    // Lock-Zaehler fuer Col1
-    INT32  nBufPos;                     // aktuelle Buffer-Pos
-    USHORT nLine;                       // aktuelle Zeile
-    USHORT nCol1, nCol2;                // aktuelle 1. und 2. Spalte
-    BOOL   bSymbol;                     // TRUE: Symbol gescannt
-    BOOL   bNumber;                     // TRUE: Zahl gescannt
-    BOOL   bSpaces;                     // TRUE: Whitespace vor Token
-    BOOL   bErrors;                     // TRUE: Fehler generieren
-    BOOL   bAbort;                      // TRUE: abbrechen
-    BOOL   bHash;                       // TRUE: # eingelesen
-    BOOL   bError;                      // TRUE: Fehler generieren
-    BOOL   bUsedForHilite;              // TRUE: Nutzung fuer Highlighting
-    BOOL   bCompatible;                 // TRUE: OPTION Compatibl
-    BOOL   bVBASupportOn;               // TRUE: OPTION VBASupport 1 otherwise default False
-    BOOL   bPrevLineExtentsComment;     // TRUE: Previous line is comment and ends on "... _"
+    sal_Int32  nBufPos;                     // aktuelle Buffer-Pos
+    sal_uInt16 nLine;                       // aktuelle Zeile
+    sal_uInt16 nCol1, nCol2;                // aktuelle 1. und 2. Spalte
+    sal_Bool   bSymbol;                     // sal_True: Symbol gescannt
+    sal_Bool   bNumber;                     // sal_True: Zahl gescannt
+    sal_Bool   bSpaces;                     // sal_True: Whitespace vor Token
+    sal_Bool   bErrors;                     // sal_True: Fehler generieren
+    sal_Bool   bAbort;                      // sal_True: abbrechen
+    sal_Bool   bHash;                       // sal_True: # eingelesen
+    sal_Bool   bError;                      // sal_True: Fehler generieren
+    sal_Bool   bUsedForHilite;              // sal_True: Nutzung fuer Highlighting
+    sal_Bool   bCompatible;                 // sal_True: OPTION Compatibl
+    sal_Bool   bVBASupportOn;               // sal_True: OPTION VBASupport 1 otherwise default False
+    sal_Bool   bPrevLineExtentsComment;     // sal_True: Previous line is comment and ends on "... _"
 
     void   GenError( SbError );
 public:
     SbiScanner( const ::rtl::OUString&, StarBASIC* = NULL );
    ~SbiScanner();
 
-    void  EnableErrors()            { bError = FALSE; }
-    BOOL  IsHash()                  { return bHash;   }
-    BOOL  IsCompatible()            { return bCompatible; }
+    void  EnableErrors()            { bError = sal_False; }
+    sal_Bool  IsHash()                  { return bHash;   }
+    sal_Bool  IsCompatible()            { return bCompatible; }
     void  SetCompatible( bool b )   { bCompatible = b; }        // #118206
-    BOOL  IsVBASupportOn()          { return bVBASupportOn; }
+    sal_Bool  IsVBASupportOn()          { return bVBASupportOn; }
     void  SetVBASupportOn( bool b ) { bVBASupportOn = b; }
-    BOOL  WhiteSpace()              { return bSpaces; }
+    sal_Bool  WhiteSpace()              { return bSpaces; }
     short GetErrors()               { return nErrors; }
     short GetLine()                 { return nLine;   }
     short GetCol1()                 { return nCol1;   }
@@ -95,9 +95,9 @@ public:
     void  RestoreLine(void)         { pLine = pSaveLine; }
     void  LockColumn();
     void  UnlockColumn();
-    BOOL  DoesColonFollow();
+    sal_Bool  DoesColonFollow();
 
-    BOOL NextSym();                 // naechstes Symbol lesen
+    sal_Bool NextSym();                 // naechstes Symbol lesen
     const String& GetSym()          { return aSym;  }
     SbxDataType GetType()           { return eScanType; }
     double    GetDbl()              { return nVal;  }
@@ -123,22 +123,22 @@ class BasicSimpleCharClass
     static LetterTable aLetterTable;
 
 public:
-    static BOOL isAlpha( sal_Unicode c, bool bCompatible )
+    static sal_Bool isAlpha( sal_Unicode c, bool bCompatible )
     {
-        BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
+        sal_Bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
                     || (bCompatible && aLetterTable.isLetter( c ));
         return bRet;
     }
 
-    static BOOL isDigit( sal_Unicode c )
+    static sal_Bool isDigit( sal_Unicode c )
     {
-        BOOL bRet = (c >= '0' && c <= '9');
+        sal_Bool bRet = (c >= '0' && c <= '9');
         return bRet;
     }
 
-    static BOOL isAlphaNumeric( sal_Unicode c, bool bCompatible )
+    static sal_Bool isAlphaNumeric( sal_Unicode c, bool bCompatible )
     {
-        BOOL bRet = isDigit( c ) || isAlpha( c, bCompatible );
+        sal_Bool bRet = isDigit( c ) || isAlpha( c, bCompatible );
         return bRet;
     }
 };
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index 000e39973eb3..cdf3209624fb 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -45,7 +45,7 @@ class SbiStdObject : public SbxObject
 public:
     SbiStdObject( const String&, StarBASIC* );
     virtual SbxVariable* Find( const String&, SbxClassType );
-    virtual void SetModified( BOOL );
+    virtual void SetModified( sal_Bool );
 };
 
 #endif
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index f2fbaa0ac1f1..c30445d87634 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -58,12 +58,12 @@ class SbiStringPool {               // String-Pool
 public:
     SbiStringPool( SbiParser* );
    ~SbiStringPool();
-    USHORT GetSize() const { return aData.Count(); }
-    // AB 8.4.1999, Default wegen #64236 auf TRUE geaendert
-    // Wenn der Bug sauber behoben ist, wieder auf FALSE aendern.
-    short Add( const String&, BOOL=TRUE );
+    sal_uInt16 GetSize() const { return aData.Count(); }
+    // AB 8.4.1999, Default wegen #64236 auf sal_True geaendert
+    // Wenn der Bug sauber behoben ist, wieder auf sal_False aendern.
+    short Add( const String&, sal_Bool=sal_True );
     short Add( double, SbxDataType );
-    const String& Find( USHORT ) const;
+    const String& Find( sal_uInt16 ) const;
     SbiParser* GetParser() { return pParser; }
 };
 
@@ -80,8 +80,8 @@ protected:
     SbiSymPool* pParent;            // uebergeordneter Symbol-Pool
     SbiParser*  pParser;            // der Parser
     SbiSymScope eScope;             // Scope des Pools
-    USHORT     nProcId;             // aktuelles ProcId fuer STATIC-Variable
-    USHORT     nCur;                // Iterator
+    sal_uInt16     nProcId;             // aktuelles ProcId fuer STATIC-Variable
+    sal_uInt16     nCur;                // Iterator
 public:
     SbiSymPool( SbiStringPool&, SbiSymScope );
    ~SbiSymPool();
@@ -90,7 +90,7 @@ public:
 
     void   SetParent( SbiSymPool* p )   { pParent = p;      }
     void   SetProcId( short n )         { nProcId = n;      }
-    USHORT GetSize() const              { return aData.Count(); }
+    sal_uInt16 GetSize() const              { return aData.Count(); }
     SbiSymScope GetScope() const        { return eScope;    }
     void   SetScope( SbiSymScope s )    { eScope = s;       }
     SbiParser* GetParser()              { return pParser;   }
@@ -99,12 +99,12 @@ public:
     SbiProcDef* AddProc( const String& );// Prozedur hinzufuegen
     void Add( SbiSymDef* );             // Symbol uebernehmen
     SbiSymDef* Find( const String& ) const;// Variablenname
-    SbiSymDef* FindId( USHORT ) const;  // Variable per ID suchen
-    SbiSymDef* Get( USHORT ) const;     // Variable per Position suchen
+    SbiSymDef* FindId( sal_uInt16 ) const;  // Variable per ID suchen
+    SbiSymDef* Get( sal_uInt16 ) const;     // Variable per Position suchen
     SbiSymDef* First(), *Next();        // Iteratoren
 
-    UINT32 Define( const String& );     // Label definieren
-    UINT32 Reference( const String& );  // Label referenzieren
+    sal_uInt32 Define( const String& );     // Label definieren
+    sal_uInt32 Reference( const String& );  // Label referenzieren
     void   CheckRefs();                 // offene Referenzen suchen
 };
 
@@ -119,21 +119,21 @@ protected:
     SbiSymPool* pPool;              // Pool fuer Unterelemente
     short      nLen;                // Stringlaenge bei STRING*n
     short      nDims;               // Array-Dimensionen
-    USHORT     nId;                 // Symbol-Nummer
-    USHORT     nTypeId;             // String-ID des Datentyps (Dim X AS Dytentyp)
-    USHORT     nProcId;             // aktuelles ProcId fuer STATIC-Variable
-    USHORT     nPos;                // Positions-Nummer
-    UINT32     nChain;              // Backchain-Kette
-    BOOL       bNew     : 1;        // TRUE: Dim As New...
-    BOOL       bChained : 1;        // TRUE: Symbol ist in Code definiert
-    BOOL       bByVal   : 1;        // TRUE: ByVal-Parameter
-    BOOL       bOpt     : 1;        // TRUE: optionaler Parameter
-    BOOL       bStatic  : 1;        // TRUE: STATIC-Variable
-    BOOL       bAs      : 1;        // TRUE: Datentyp per AS XXX definiert
-    BOOL       bGlobal  : 1;        // TRUE: Global-Variable
-    BOOL       bParamArray : 1;     // TRUE: ParamArray parameter
-    BOOL       bWithEvents : 1;     // TRUE: Declared WithEvents
-    USHORT     nDefaultId;          // Symbol number of default value
+    sal_uInt16     nId;                 // Symbol-Nummer
+    sal_uInt16     nTypeId;             // String-ID des Datentyps (Dim X AS Dytentyp)
+    sal_uInt16     nProcId;             // aktuelles ProcId fuer STATIC-Variable
+    sal_uInt16     nPos;                // Positions-Nummer
+    sal_uInt32     nChain;              // Backchain-Kette
+    sal_Bool       bNew     : 1;        // sal_True: Dim As New...
+    sal_Bool       bChained : 1;        // sal_True: Symbol ist in Code definiert
+    sal_Bool       bByVal   : 1;        // sal_True: ByVal-Parameter
+    sal_Bool       bOpt     : 1;        // sal_True: optionaler Parameter
+    sal_Bool       bStatic  : 1;        // sal_True: STATIC-Variable
+    sal_Bool       bAs      : 1;        // sal_True: Datentyp per AS XXX definiert
+    sal_Bool       bGlobal  : 1;        // sal_True: Global-Variable
+    sal_Bool       bParamArray : 1;     // sal_True: ParamArray parameter
+    sal_Bool       bWithEvents : 1;     // sal_True: Declared WithEvents
+    sal_uInt16     nDefaultId;          // Symbol number of default value
     short      nFixedStringLength;  // String length in: Dim foo As String*Length
 public:
     SbiSymDef( const String& );
@@ -145,42 +145,42 @@ public:
     virtual void SetType( SbxDataType );
     const String& GetName();
     SbiSymScope GetScope() const;
-    USHORT     GetProcId() const{ return nProcId;   }
-    UINT32     GetAddr() const  { return nChain;    }
-    USHORT     GetId() const    { return nId;       }
-    USHORT     GetTypeId() const{ return nTypeId;   }
-    void       SetTypeId( USHORT n ) { nTypeId = n; eType = SbxOBJECT; }
-    USHORT     GetPos() const   { return nPos;      }
+    sal_uInt16     GetProcId() const{ return nProcId;   }
+    sal_uInt32     GetAddr() const  { return nChain;    }
+    sal_uInt16     GetId() const    { return nId;       }
+    sal_uInt16     GetTypeId() const{ return nTypeId;   }
+    void       SetTypeId( sal_uInt16 n ) { nTypeId = n; eType = SbxOBJECT; }
+    sal_uInt16     GetPos() const   { return nPos;      }
     void       SetLen( short n ){ nLen = n;         }
     short      GetLen() const   { return nLen;      }
     void       SetDims( short n ) { nDims = n;      }
     short      GetDims() const  { return nDims;     }
-    BOOL       IsDefined() const{ return bChained;  }
-    void       SetOptional()    { bOpt = TRUE;      }
-    void       SetParamArray()  { bParamArray = TRUE;       }
-    void       SetWithEvents()  { bWithEvents = TRUE;       }
-    void       SetByVal( BOOL bByVal_ = TRUE )
+    sal_Bool       IsDefined() const{ return bChained;  }
+    void       SetOptional()    { bOpt = sal_True;      }
+    void       SetParamArray()  { bParamArray = sal_True;       }
+    void       SetWithEvents()  { bWithEvents = sal_True;       }
+    void       SetByVal( sal_Bool bByVal_ = sal_True )
                 { bByVal = bByVal_; }
-    void       SetStatic( BOOL bAsStatic = TRUE )       { bStatic = bAsStatic;  }
-    void       SetNew()         { bNew = TRUE;      }
-    void       SetDefinedAs()   { bAs = TRUE;       }
-    void       SetGlobal(BOOL b){ bGlobal = b;  }
-    void       SetDefaultId( USHORT n ) { nDefaultId = n; }
-    USHORT     GetDefaultId( void ) { return nDefaultId; }
-    BOOL       IsOptional() const{ return bOpt;     }
-    BOOL       IsParamArray() const{ return bParamArray; }
-    BOOL       IsWithEvents() const{ return bWithEvents; }
-    BOOL       IsByVal() const  { return bByVal;    }
-    BOOL       IsStatic() const { return bStatic;   }
-    BOOL       IsNew() const    { return bNew;      }
-    BOOL       IsDefinedAs() const { return bAs;    }
-    BOOL       IsGlobal() const { return bGlobal;   }
+    void       SetStatic( sal_Bool bAsStatic = sal_True )       { bStatic = bAsStatic;  }
+    void       SetNew()         { bNew = sal_True;      }
+    void       SetDefinedAs()   { bAs = sal_True;       }
+    void       SetGlobal(sal_Bool b){ bGlobal = b;  }
+    void       SetDefaultId( sal_uInt16 n ) { nDefaultId = n; }
+    sal_uInt16     GetDefaultId( void ) { return nDefaultId; }
+    sal_Bool       IsOptional() const{ return bOpt;     }
+    sal_Bool       IsParamArray() const{ return bParamArray; }
+    sal_Bool       IsWithEvents() const{ return bWithEvents; }
+    sal_Bool       IsByVal() const  { return bByVal;    }
+    sal_Bool       IsStatic() const { return bStatic;   }
+    sal_Bool       IsNew() const    { return bNew;      }
+    sal_Bool       IsDefinedAs() const { return bAs;    }
+    sal_Bool       IsGlobal() const { return bGlobal;   }
     short      GetFixedStringLength( void ) const { return nFixedStringLength; }
     void       SetFixedStringLength( short n ) { nFixedStringLength = n; }
 
     SbiSymPool& GetPool();
-    UINT32     Define();        // Symbol in Code definieren
-    UINT32     Reference();     // Symbol in Code referenzieren
+    sal_uInt32     Define();        // Symbol in Code definieren
+    sal_uInt32     Reference();     // Symbol in Code referenzieren
 
 private:
     SbiSymDef( const SbiSymDef& );
@@ -192,14 +192,14 @@ class SbiProcDef : public SbiSymDef {   // Prozedur-Definition (aus Basic):
     SbiSymPool aLabels;             // lokale Sprungziele
     String aLibName;                // LIB "name"
     String aAlias;                  // ALIAS "name"
-    USHORT nLine1, nLine2;          // Zeilenbereich
+    sal_uInt16 nLine1, nLine2;          // Zeilenbereich
     PropertyMode mePropMode;        // Marks if this is a property procedure and which
     String maPropName;              // Property name if property procedure (!= proc name)
-    BOOL   bCdecl  : 1;             // TRUE: CDECL angegeben
-    BOOL   bPublic : 1;             // TRUE: proc ist PUBLIC
-    BOOL   mbProcDecl : 1;          // TRUE: instanciated by SbiParser::ProcDecl
+    sal_Bool   bCdecl  : 1;             // sal_True: CDECL angegeben
+    sal_Bool   bPublic : 1;             // sal_True: proc ist PUBLIC
+    sal_Bool   mbProcDecl : 1;          // sal_True: instanciated by SbiParser::ProcDecl
 public:
-    SbiProcDef( SbiParser*, const String&, BOOL bProcDecl=false );
+    SbiProcDef( SbiParser*, const String&, sal_Bool bProcDecl=false );
     virtual ~SbiProcDef();
     virtual SbiProcDef* GetProcDef();
     virtual void SetType( SbxDataType );
@@ -208,15 +208,15 @@ public:
     SbiSymPool& GetLocals()         { return GetPool();}
     String& GetLib()                { return aLibName; }
     String& GetAlias()              { return aAlias;   }
-    void SetPublic( BOOL b )        { bPublic = b;     }
-    BOOL IsPublic() const           { return bPublic;  }
-    void SetCdecl( BOOL b = TRUE)   { bCdecl = b;      }
-    BOOL IsCdecl() const            { return bCdecl;   }
-    BOOL IsUsedForProcDecl() const  { return mbProcDecl; }
-    void SetLine1( USHORT n )       { nLine1 = n;      }
-    USHORT GetLine1() const         { return nLine1;   }
-    void SetLine2( USHORT n )       { nLine2 = n;      }
-    USHORT GetLine2() const         { return nLine2;   }
+    void SetPublic( sal_Bool b )        { bPublic = b;     }
+    sal_Bool IsPublic() const           { return bPublic;  }
+    void SetCdecl( sal_Bool b = sal_True)   { bCdecl = b;      }
+    sal_Bool IsCdecl() const            { return bCdecl;   }
+    sal_Bool IsUsedForProcDecl() const  { return mbProcDecl; }
+    void SetLine1( sal_uInt16 n )       { nLine1 = n;      }
+    sal_uInt16 GetLine1() const         { return nLine1;   }
+    void SetLine2( sal_uInt16 n )       { nLine2 = n;      }
+    sal_uInt16 GetLine2() const         { return nLine2;   }
     PropertyMode getPropertyMode()  { return mePropMode; }
     void setPropertyMode( PropertyMode ePropMode );
     const String& GetPropName()     { return maPropName; }
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 930f68910b78..3af2e235c077 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -142,25 +142,25 @@ class SbiTokenizer : public SbiScanner {
 protected:
     SbiToken eCurTok;               // aktuelles Token
     SbiToken ePush;                 // Pushback-Token
-    USHORT  nPLine, nPCol1, nPCol2; // Pushback-Location
-    BOOL bEof;                      // TRUE bei Dateiende
-    BOOL bEos;                      // TRUE bei Statement-Ende
-    BOOL bKeywords;                 // TRUE, falls Keywords geparst werden
-    BOOL bAs;                       // letztes Keyword war AS
-    BOOL bErrorIsSymbol;            // Handle Error token as Symbol, not keyword
+    sal_uInt16  nPLine, nPCol1, nPCol2; // Pushback-Location
+    sal_Bool bEof;                      // sal_True bei Dateiende
+    sal_Bool bEos;                      // sal_True bei Statement-Ende
+    sal_Bool bKeywords;                 // sal_True, falls Keywords geparst werden
+    sal_Bool bAs;                       // letztes Keyword war AS
+    sal_Bool bErrorIsSymbol;            // Handle Error token as Symbol, not keyword
 public:
     SbiTokenizer( const ::rtl::OUString&, StarBASIC* = NULL );
    ~SbiTokenizer();
 
-    inline BOOL IsEof()             { return bEof; }
-    inline BOOL IsEos()             { return bEos; }
+    inline sal_Bool IsEof()             { return bEof; }
+    inline sal_Bool IsEos()             { return bEos; }
 
     void  Push( SbiToken );             // Pushback eines Tokens
     const String& Symbol( SbiToken );// Rueckumwandlung
 
     SbiToken Peek();                    // das naechste Token lesen
     SbiToken Next();                    // Ein Token lesen
-    BOOL MayBeLabel( BOOL= FALSE ); // Kann es ein Label sein?
+    sal_Bool MayBeLabel( sal_Bool= sal_False ); // Kann es ein Label sein?
 
     void Hilite( SbTextPortions& ); // Syntax-Highlighting
 
@@ -169,14 +169,14 @@ public:
     void Error( SbError, const char* );
     void Error( SbError, String );
 
-    void Keywords( BOOL b ) { bKeywords = b; }
+    void Keywords( sal_Bool b ) { bKeywords = b; }
 
-    static BOOL IsEoln( SbiToken t )
-        { return BOOL( t == EOS || t == EOLN || t == REM ); }
-    static BOOL IsKwd( SbiToken t )
-        { return BOOL( t >= FIRSTKWD && t <= LASTKWD ); }
-    static BOOL IsExtra( SbiToken t )
-        { return BOOL( t >= FIRSTEXTRA ); }
+    static sal_Bool IsEoln( SbiToken t )
+        { return sal_Bool( t == EOS || t == EOLN || t == REM ); }
+    static sal_Bool IsKwd( SbiToken t )
+        { return sal_Bool( t >= FIRSTKWD && t <= LASTKWD ); }
+    static sal_Bool IsExtra( SbiToken t )
+        { return sal_Bool( t >= FIRSTEXTRA ); }
 };
 
 
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 799caf0cd954..0cf81e30d9a6 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -54,8 +54,8 @@ BasicDLL::BasicDLL()
     ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
     pSttResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(stt), aLocale );
     pBasResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(sb), aLocale );
-    bDebugMode = FALSE;
-    bBreakEnabled = TRUE;
+    bDebugMode = sal_False;
+    bBreakEnabled = sal_True;
 }
 
 BasicDLL::~BasicDLL()
@@ -64,7 +64,7 @@ BasicDLL::~BasicDLL()
     delete pBasResMgr;
 }
 
-void BasicDLL::EnableBreak( BOOL bEnable )
+void BasicDLL::EnableBreak( sal_Bool bEnable )
 {
     BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
     DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -72,7 +72,7 @@ void BasicDLL::EnableBreak( BOOL bEnable )
         pThis->bBreakEnabled = bEnable;
 }
 
-void BasicDLL::SetDebugMode( BOOL bDebugMode )
+void BasicDLL::SetDebugMode( sal_Bool bDebugMode )
 {
     BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
     DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -85,7 +85,7 @@ void BasicDLL::BasicBreak()
 {
     //bJustStopping: Wenn jemand wie wild x-mal STOP drueckt, aber das Basic
     // nicht schnell genug anhaelt, kommt die Box ggf. oefters...
-    static BOOL bJustStopping = FALSE;
+    static sal_Bool bJustStopping = sal_False;
 
     BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
     DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -93,11 +93,11 @@ void BasicDLL::BasicBreak()
     {
         if ( StarBASIC::IsRunning() && !bJustStopping && ( pThis->bBreakEnabled || pThis->bDebugMode ) )
         {
-            bJustStopping = TRUE;
+            bJustStopping = sal_True;
             StarBASIC::Stop();
             String aMessageStr( BasResId( IDS_SBERR_TERMINATED ) );
             InfoBox( 0, aMessageStr ).Execute();
-            bJustStopping = FALSE;
+            bJustStopping = sal_False;
         }
     }
 }
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 89d473099f0b..5e8775159c38 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -93,12 +93,12 @@ SbiDdeControl::~SbiDdeControl()
     delete pConvList;
 }
 
-INT16 SbiDdeControl::GetFreeChannel()
+sal_Int16 SbiDdeControl::GetFreeChannel()
 {
-    INT16 nListSize = (INT16)pConvList->Count();
+    sal_Int16 nListSize = (sal_Int16)pConvList->Count();
     DdeConnection* pPtr = pConvList->First();
     pPtr = pConvList->Next(); // nullten eintrag ueberspringen
-    INT16 nChannel;
+    sal_Int16 nChannel;
     for( nChannel = 1; nChannel < nListSize; nChannel++ )
     {
         if( pPtr == DDE_FREECHANNEL )
@@ -111,7 +111,7 @@ INT16 SbiDdeControl::GetFreeChannel()
 }
 
 SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic,
-            INT16& rnHandle )
+            sal_Int16& rnHandle )
 {
     SbError nErr;
     DdeConnection* pConv = new DdeConnection( rService, rTopic );
@@ -123,26 +123,26 @@ SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic,
     }
     else
     {
-        INT16 nChannel = GetFreeChannel();
-        pConvList->Replace( pConv, (ULONG)nChannel );
+        sal_Int16 nChannel = GetFreeChannel();
+        pConvList->Replace( pConv, (sal_uIntPtr)nChannel );
         rnHandle = nChannel;
     }
     return 0;
 }
 
-SbError SbiDdeControl::Terminate( INT16 nChannel )
+SbError SbiDdeControl::Terminate( sal_Int16 nChannel )
 {
-    DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+    DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
     if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
         return SbERR_DDE_NO_CHANNEL;
-    pConvList->Replace( DDE_FREECHANNEL, (ULONG)nChannel );
+    pConvList->Replace( DDE_FREECHANNEL, (sal_uIntPtr)nChannel );
     delete pConv;
     return 0L;
 }
 
 SbError SbiDdeControl::TerminateAll()
 {
-    INT16 nChannel = (INT16)pConvList->Count();
+    sal_Int16 nChannel = (sal_Int16)pConvList->Count();
     while( nChannel )
     {
         nChannel--;
@@ -156,9 +156,9 @@ SbError SbiDdeControl::TerminateAll()
     return 0;
 }
 
-SbError SbiDdeControl::Request( INT16 nChannel, const String& rItem, String& rResult )
+SbError SbiDdeControl::Request( sal_Int16 nChannel, const String& rItem, String& rResult )
 {
-    DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+    DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
     if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
         return SbERR_DDE_NO_CHANNEL;
 
@@ -169,9 +169,9 @@ SbError SbiDdeControl::Request( INT16 nChannel, const String& rItem, String& rRe
     return GetLastErr( pConv );
 }
 
-SbError SbiDdeControl::Execute( INT16 nChannel, const String& rCommand )
+SbError SbiDdeControl::Execute( sal_Int16 nChannel, const String& rCommand )
 {
-    DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+    DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
     if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
         return SbERR_DDE_NO_CHANNEL;
     DdeExecute aRequest( *pConv, rCommand, 30000 );
@@ -179,9 +179,9 @@ SbError SbiDdeControl::Execute( INT16 nChannel, const String& rCommand )
     return GetLastErr( pConv );
 }
 
-SbError SbiDdeControl::Poke( INT16 nChannel, const String& rItem, const String& rData )
+SbError SbiDdeControl::Poke( sal_Int16 nChannel, const String& rItem, const String& rData )
 {
-    DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+    DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
     if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
         return SbERR_DDE_NO_CHANNEL;
     DdePoke aRequest( *pConv, rItem, DdeData(rData), 30000 );
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index c1e9da823a20..a99575308fa8 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -43,7 +43,7 @@ class SbiDdeControl
 private:
     DECL_LINK( Data, DdeData* );
     SbError GetLastErr( DdeConnection* );
-    INT16 GetFreeChannel();
+    sal_Int16 GetFreeChannel();
     DdeConnections* pConvList;
     String aData;
 
@@ -53,12 +53,12 @@ public:
     ~SbiDdeControl();
 
     SbError Initiate( const String& rService, const String& rTopic,
-                     INT16& rnHandle );
-    SbError Terminate( INT16 nChannel );
+                     sal_Int16& rnHandle );
+    SbError Terminate( sal_Int16 nChannel );
     SbError TerminateAll();
-    SbError Request( INT16 nChannel, const String& rItem, String& rResult );
-    SbError Execute( INT16 nChannel, const String& rCommand );
-    SbError Poke( INT16 nChannel, const String& rItem, const String& rData );
+    SbError Request( sal_Int16 nChannel, const String& rItem, String& rResult );
+    SbError Execute( sal_Int16 nChannel, const String& rCommand );
+    SbError Poke( sal_Int16 nChannel, const String& rItem, const String& rData );
 };
 
 #endif
diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx
index dbef947f4e94..8cc6ce7edd82 100644
--- a/basic/source/runtime/dllmgr.cxx
+++ b/basic/source/runtime/dllmgr.cxx
@@ -168,7 +168,7 @@ std::size_t alignment(SbxVariable * variable) {
                 std::size_t n = 1;
                 SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
                     GetProperties();
-                for (USHORT i = 0; i < props->Count(); ++i) {
+                for (sal_uInt16 i = 0; i < props->Count(); ++i) {
                     n = std::max(n, alignment(props->Get(i)));
                 }
                 return n;
@@ -183,9 +183,9 @@ std::size_t alignment(SbxVariable * variable) {
     } else {
         SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
         int dims = arr->GetDims();
-        std::vector< INT32 > low(dims);
+        std::vector< sal_Int32 > low(dims);
         for (int i = 0; i < dims; ++i) {
-            INT32 up;
+            sal_Int32 up;
             arr->GetDim32(i + 1, low[i], up);
         }
         return alignment(arr->Get32(&low[0]));
@@ -220,7 +220,7 @@ SbError marshalStruct(
     OSL_ASSERT(variable != 0);
     SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
         GetProperties();
-    for (USHORT i = 0; i < props->Count(); ++i) {
+    for (sal_uInt16 i = 0; i < props->Count(); ++i) {
         SbError e = marshal(false, props->Get(i), false, blob, offset, data);
         if (e != ERRCODE_NONE) {
             return e;
@@ -236,12 +236,12 @@ SbError marshalArray(
     OSL_ASSERT(variable != 0);
     SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
     int dims = arr->GetDims();
-    std::vector< INT32 > low(dims);
-    std::vector< INT32 > up(dims);
+    std::vector< sal_Int32 > low(dims);
+    std::vector< sal_Int32 > up(dims);
     for (int i = 0; i < dims; ++i) {
         arr->GetDim32(i + 1, low[i], up[i]);
     }
-    for (std::vector< INT32 > idx = low;;) {
+    for (std::vector< sal_Int32 > idx = low;;) {
         SbError e = marshal(
             false, arr->Get32(&idx[0]), false, blob, offset, data);
         if (e != ERRCODE_NONE) {
@@ -406,7 +406,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
                         alignment(variable)));
                 SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
                     GetProperties();
-                for (USHORT i = 0; i < props->Count(); ++i) {
+                for (sal_uInt16 i = 0; i < props->Count(); ++i) {
                     data = unmarshal(props->Get(i), data);
                 }
                 break;
@@ -424,12 +424,12 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
     } else {
         SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
         int dims = arr->GetDims();
-        std::vector< INT32 > low(dims);
-        std::vector< INT32 > up(dims);
+        std::vector< sal_Int32 > low(dims);
+        std::vector< sal_Int32 > up(dims);
         for (int i = 0; i < dims; ++i) {
             arr->GetDim32(i + 1, low[i], up[i]);
         }
-        for (std::vector< INT32 > idx = low;;) {
+        for (std::vector< sal_Int32 > idx = low;;) {
             data = unmarshal(arr->Get32(&idx[0]), data);
             int i = dims - 1;
             while (idx[i] == up[i]) {
@@ -489,7 +489,7 @@ SbError call(
             RTL_CONSTASCII_STRINGPARAM("KERNEL32.DLL")) &&
         (proc.name ==
          rtl::OString(RTL_CONSTASCII_STRINGPARAM("GetLogicalDriveStringsA")));
-    for (USHORT i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
+    for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
         SbError e = marshal(
             true, arguments->Get(i), special && i == 2, stack, stack.size(),
             data);
@@ -551,7 +551,7 @@ SbError call(
         OSL_ASSERT(false);
         break;
     }
-    for (USHORT i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
+    for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
         arguments->Get(i)->ResetFlag(SBX_REFERENCE);
             //TODO: skipped for errors?!?
     }
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 17b98ad7addd..c43519a9b2de 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -162,14 +162,14 @@ RTLFUNC(InputBox)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count();
+    sal_uIntPtr nArgCount = rPar.Count();
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
         String aTitle;
         String aDefault;
-        INT32 nX = -1, nY = -1;  // zentrieren
+        sal_Int32 nX = -1, nY = -1;  // zentrieren
         const String& rPrompt = rPar.Get(1)->GetString();
         if ( nArgCount > 2 && !rPar.Get(2)->IsErr() )
             aTitle = rPar.Get(2)->GetString();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 9940890286b4..06faa7c0aba5 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -217,13 +217,13 @@ void SbiStream::MapError()
 
 
 // Hack for #83750
-BOOL runsInSetup( void );
+sal_Bool runsInSetup( void );
 
-BOOL needSecurityRestrictions( void )
+sal_Bool needSecurityRestrictions( void )
 {
 #ifdef _USE_UNO
-    static BOOL bNeedInit = TRUE;
-    static BOOL bRetVal = TRUE;
+    static sal_Bool bNeedInit = sal_True;
+    static sal_Bool bRetVal = sal_True;
 
     if( bNeedInit )
     {
@@ -232,11 +232,11 @@ BOOL needSecurityRestrictions( void )
         if( runsInSetup() )
         {
             // Setup is not critical
-            bRetVal = FALSE;
+            bRetVal = sal_False;
             return bRetVal;
         }
 
-        bNeedInit = FALSE;
+        bNeedInit = sal_False;
 
         // Get system user to compare to portal user
         oslSecurity aSecurity = osl_getCurrentSecurity();
@@ -245,12 +245,12 @@ BOOL needSecurityRestrictions( void )
         if( !bRet )
         {
             // No valid security! -> Secure mode!
-            return TRUE;
+            return sal_True;
         }
 
         Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
         if( !xSMgr.is() )
-            return TRUE;
+            return sal_True;
         Reference< XBridgeFactory > xBridgeFac( xSMgr->createInstance
             ( ::rtl::OUString::createFromAscii( "com.sun.star.bridge.BridgeFactory" ) ), UNO_QUERY );
 
@@ -265,13 +265,13 @@ BOOL needSecurityRestrictions( void )
         if( nBridgeCount == 0 )
         {
             // No bridges -> local
-            bRetVal = FALSE;
+            bRetVal = sal_False;
             return bRetVal;
         }
 
         // Iterate through all bridges to find (portal) user property
         const Reference< XBridge >* pBridges = aBridgeSeq.getConstArray();
-        bRetVal = FALSE;    // Now only TRUE if user different from portal user is found
+        bRetVal = sal_False;    // Now only sal_True if user different from portal user is found
         sal_Int32 i;
         for( i = 0 ; i < nBridgeCount ; i++ )
         {
@@ -289,7 +289,7 @@ BOOL needSecurityRestrictions( void )
                 else
                 {
                     // Different user -> Secure mode!
-                    bRetVal = TRUE;
+                    bRetVal = sal_True;
                     break;
                 }
             }
@@ -299,27 +299,27 @@ BOOL needSecurityRestrictions( void )
 
     return bRetVal;
 #else
-    return FALSE;
+    return sal_False;
 #endif
 }
 
-// Returns TRUE if UNO is available, otherwise the old file
+// Returns sal_True if UNO is available, otherwise the old file
 // system implementation has to be used
 // #89378 New semantic: Don't just ask for UNO but for UCB
-BOOL hasUno( void )
+sal_Bool hasUno( void )
 {
 #ifdef _USE_UNO
-    static BOOL bNeedInit = TRUE;
-    static BOOL bRetVal = TRUE;
+    static sal_Bool bNeedInit = sal_True;
+    static sal_Bool bRetVal = sal_True;
 
     if( bNeedInit )
     {
-        bNeedInit = FALSE;
+        bNeedInit = sal_False;
         Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
         if( !xSMgr.is() )
         {
             // No service manager at all
-            bRetVal = FALSE;
+            bRetVal = sal_False;
         }
         else
         {
@@ -329,13 +329,13 @@ BOOL hasUno( void )
             if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString::createFromAscii( "file:///" ) ).is() ) )
             {
                 // No UCB
-                bRetVal = FALSE;
+                bRetVal = sal_False;
             }
         }
     }
     return bRetVal;
 #else
-    return FALSE;
+    return sal_False;
 #endif
 }
 
@@ -351,11 +351,11 @@ class OslStream : public SvStream
 public:
                     OslStream( const String& rName, short nStrmMode );
                     ~OslStream();
-    virtual ULONG   GetData( void* pData, ULONG nSize );
-    virtual ULONG   PutData( const void* pData, ULONG nSize );
-    virtual ULONG   SeekPos( ULONG nPos );
+    virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize );
+    virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize );
+    virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
     virtual void    FlushData();
-    virtual void    SetSize( ULONG nSize );
+    virtual void    SetSize( sal_uIntPtr nSize );
 };
 
 OslStream::OslStream( const String& rName, short nStrmMode )
@@ -396,23 +396,23 @@ OslStream::~OslStream()
     maFile.close();
 }
 
-ULONG OslStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr OslStream::GetData( void* pData, sal_uIntPtr nSize )
 {
     sal_uInt64 nBytesRead = nSize;
     FileBase::RC nRet = FileBase::E_None;
     nRet = maFile.read( pData, nBytesRead, nBytesRead );
-    return (ULONG)nBytesRead;
+    return (sal_uIntPtr)nBytesRead;
 }
 
-ULONG OslStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr OslStream::PutData( const void* pData, sal_uIntPtr nSize )
 {
     sal_uInt64 nBytesWritten;
     FileBase::RC nRet = FileBase::E_None;
     nRet = maFile.write( pData, (sal_uInt64)nSize, nBytesWritten );
-    return (ULONG)nBytesWritten;
+    return (sal_uIntPtr)nBytesWritten;
 }
 
-ULONG OslStream::SeekPos( ULONG nPos )
+sal_uIntPtr OslStream::SeekPos( sal_uIntPtr nPos )
 {
     FileBase::RC nRet;
     if( nPos == STREAM_SEEK_TO_END )
@@ -425,14 +425,14 @@ ULONG OslStream::SeekPos( ULONG nPos )
     }
     sal_uInt64 nRealPos;
     nRet = maFile.getPos( nRealPos );
-    return sal::static_int_cast<ULONG>(nRealPos);
+    return sal::static_int_cast<sal_uIntPtr>(nRealPos);
 }
 
 void OslStream::FlushData()
 {
 }
 
-void OslStream::SetSize( ULONG nSize )
+void OslStream::SetSize( sal_uIntPtr nSize )
 {
     FileBase::RC nRet = FileBase::E_None;
     nRet = maFile.setSize( (sal_uInt64)nSize );
@@ -454,17 +454,17 @@ public:
                     UCBStream( Reference< XOutputStream > & xOS );
                     UCBStream( Reference< XStream > & xS );
                     ~UCBStream();
-    virtual ULONG   GetData( void* pData, ULONG nSize );
-    virtual ULONG   PutData( const void* pData, ULONG nSize );
-    virtual ULONG   SeekPos( ULONG nPos );
+    virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize );
+    virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize );
+    virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
     virtual void    FlushData();
-    virtual void    SetSize( ULONG nSize );
+    virtual void    SetSize( sal_uIntPtr nSize );
 };
 
 /*
-ULONG UCBErrorToSvStramError( ucb::IOErrorCode nError )
+sal_uIntPtr UCBErrorToSvStramError( ucb::IOErrorCode nError )
 {
-    ULONG eReturn = ERRCODE_IO_GENERAL;
+    sal_uIntPtr eReturn = ERRCODE_IO_GENERAL;
     switch( nError )
     {
         case ucb::IOErrorCode_ABORT:                eReturn = SVSTREAM_GENERALERROR; break;
@@ -535,7 +535,7 @@ UCBStream::~UCBStream()
     }
 }
 
-ULONG   UCBStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr UCBStream::GetData( void* pData, sal_uIntPtr nSize )
 {
     try
     {
@@ -564,7 +564,7 @@ ULONG   UCBStream::GetData( void* pData, ULONG nSize )
     return 0;
 }
 
-ULONG   UCBStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr UCBStream::PutData( const void* pData, sal_uIntPtr nSize )
 {
     try
     {
@@ -591,13 +591,13 @@ ULONG   UCBStream::PutData( const void* pData, ULONG nSize )
     return 0;
 }
 
-ULONG   UCBStream::SeekPos( ULONG nPos )
+sal_uIntPtr UCBStream::SeekPos( sal_uIntPtr nPos )
 {
     try
     {
         if( xSeek.is() )
         {
-            ULONG nLen = sal::static_int_cast<ULONG>( xSeek->getLength() );
+            sal_uIntPtr nLen = sal::static_int_cast<sal_uIntPtr>( xSeek->getLength() );
             if( nPos > nLen )
                 nPos = nLen;
             xSeek->seek( nPos );
@@ -631,7 +631,7 @@ void    UCBStream::FlushData()
     }
 }
 
-void    UCBStream::SetSize( ULONG nSize )
+void    UCBStream::SetSize( sal_uIntPtr nSize )
 {
     (void)nSize;
 
@@ -738,7 +738,7 @@ SbError SbiStream::Close()
     return nError;
 }
 
-SbError SbiStream::Read( ByteString& rBuf, USHORT n, bool bForceReadingPerByte )
+SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerByte )
 {
     nExpandOnWriteTo = 0;
     if( !bForceReadingPerByte && IsText() )
@@ -777,10 +777,10 @@ void SbiStream::ExpandFile()
 {
     if ( nExpandOnWriteTo )
     {
-        ULONG nCur = pStrm->Seek(STREAM_SEEK_TO_END);
+        sal_uIntPtr nCur = pStrm->Seek(STREAM_SEEK_TO_END);
         if( nCur < nExpandOnWriteTo )
         {
-            ULONG nDiff = nExpandOnWriteTo - nCur;
+            sal_uIntPtr nDiff = nExpandOnWriteTo - nCur;
             char c = 0;
             while( nDiff-- )
                 *pStrm << c;
@@ -793,7 +793,7 @@ void SbiStream::ExpandFile()
     }
 }
 
-SbError SbiStream::Write( const ByteString& rBuf, USHORT n )
+SbError SbiStream::Write( const ByteString& rBuf, sal_uInt16 n )
 {
     ExpandFile();
     if( IsAppend() )
@@ -804,7 +804,7 @@ SbError SbiStream::Write( const ByteString& rBuf, USHORT n )
         aLine += rBuf;
         // Raus damit, wenn das Ende ein LF ist, aber CRLF vorher
         // strippen, da der SvStrm ein CRLF anfuegt!
-        USHORT nLineLen = aLine.Len();
+        sal_uInt16 nLineLen = aLine.Len();
         if( nLineLen && aLine.GetBuffer()[ --nLineLen ] == 0x0A )
         {
             aLine.Erase( nLineLen );
@@ -1023,8 +1023,8 @@ void SbiIoSystem::ReadCon( ByteString& rIn )
 void SbiIoSystem::WriteCon( const ByteString& rText )
 {
     aOut += rText;
-    USHORT n1 = aOut.Search( '\n' );
-    USHORT n2 = aOut.Search( '\r' );
+    sal_uInt16 n1 = aOut.Search( '\n' );
+    sal_uInt16 n2 = aOut.Search( '\r' );
     if( n1 != STRING_NOTFOUND || n2 != STRING_NOTFOUND )
     {
         if( n1 == STRING_NOTFOUND ) n1 = n2;
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index cfd84567644a..1d1f1c641547 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -154,7 +154,7 @@ static CharClass& GetCharClass( void )
     return aCharClass;
 }
 
-static inline BOOL isFolder( FileStatus::Type aType )
+static inline sal_Bool isFolder( FileStatus::Type aType )
 {
     return ( aType == FileStatus::Directory || aType == FileStatus::Volume );
 }
@@ -220,8 +220,8 @@ static com::sun::star::uno::Reference< XSimpleFileAccess3 > getFileAccess( void
 
 
 
-// Properties und Methoden legen beim Get (bPut = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bPut = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bPut = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bPut = sal_True) wird der Wert aus
 // Element 0 gespeichert.
 
 // CreateObject( class )
@@ -254,7 +254,7 @@ RTLFUNC(Error)
     {
         String aErrorMsg;
         SbError nErr = 0L;
-        INT32 nCode = 0;
+        sal_Int32 nCode = 0;
         if( rPar.Count() == 1 )
         {
             nErr = StarBASIC::GetErrBasic();
@@ -266,7 +266,7 @@ RTLFUNC(Error)
             if( nCode > 65535L )
                 StarBASIC::Error( SbERR_CONVERSION );
             else
-                nErr = StarBASIC::GetSfxFromVBError( (USHORT)nCode );
+                nErr = StarBASIC::GetSfxFromVBError( (sal_uInt16)nCode );
         }
 
         bool bVBA = SbiRuntime::isVBAEnabled();
@@ -452,7 +452,7 @@ RTLFUNC(CurDir)
 
     int nSize = _PATH_INCR;
     char* pMem;
-    while( TRUE )
+    while( sal_True )
       {
         pMem = new char[nSize];
         if( !pMem )
@@ -489,17 +489,17 @@ RTLFUNC(ChDir) // JSM
     {
 #ifdef _ENABLE_CUR_DIR
         String aPath = rPar.Get(1)->GetString();
-        BOOL bError = FALSE;
+        sal_Bool bError = sal_False;
 #ifdef WNT
         // #55997 Laut MI hilft es bei File-URLs einen DirEntry zwischenzuschalten
         // #40996 Harmoniert bei Verwendung der WIN32-Funktion nicht mit getdir
         DirEntry aEntry( aPath );
         ByteString aFullPath( aEntry.GetFull(), gsl_getSystemTextEncoding() );
         if( chdir( aFullPath.GetBuffer()) )
-            bError = TRUE;
+            bError = sal_True;
 #else
         if (!DirEntry(aPath).SetCWD())
-            bError = TRUE;
+            bError = sal_True;
 #endif
         if( bError )
             StarBASIC::Error( SbERR_PATH_NOT_FOUND );
@@ -880,7 +880,7 @@ RTLFUNC(FileLen)
     {
         SbxVariableRef pArg = rPar.Get( 1 );
         String aStr( pArg->GetString() );
-        INT32 nLen = 0;
+        sal_Int32 nLen = 0;
         // <-- UCB
         if( hasUno() )
         {
@@ -908,7 +908,7 @@ RTLFUNC(FileLen)
             FileBase::RC nRet = DirectoryItem::get( getFullPathUNC( aStr ), aItem );
             FileStatus aFileStatus( FileStatusMask_FileSize );
             nRet = aItem.getFileStatus( aFileStatus );
-            nLen = (INT32)aFileStatus.getFileSize();
+            nLen = (sal_Int32)aFileStatus.getFileSize();
 #endif
         }
         rPar.Get(0)->PutLong( (long)nLen );
@@ -942,23 +942,23 @@ RTLFUNC(InStr)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        USHORT nStartPos = 1;
+        sal_uInt16 nStartPos = 1;
 
-        USHORT nFirstStringPos = 1;
+        sal_uInt16 nFirstStringPos = 1;
         if ( nArgCount >= 3 )
         {
-            INT32 lStartPos = rPar.Get(1)->GetLong();
+            sal_Int32 lStartPos = rPar.Get(1)->GetLong();
             if( lStartPos <= 0 || lStartPos > 0xffff )
             {
                 StarBASIC::Error( SbERR_BAD_ARGUMENT );
                 lStartPos = 1;
             }
-            nStartPos = (USHORT)lStartPos;
+            nStartPos = (sal_uInt16)lStartPos;
             nFirstStringPos++;
         }
 
@@ -968,7 +968,7 @@ RTLFUNC(InStr)
         if( bCompatibility )
         {
             SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
-            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
         }
         else
         {
@@ -977,7 +977,7 @@ RTLFUNC(InStr)
         if ( nArgCount == 4 )
             bTextMode = rPar.Get(4)->GetInteger();
 
-        USHORT nPos;
+        sal_uInt16 nPos;
         const String& rToken = rPar.Get(nFirstStringPos+1)->GetString();
 
         // #97545 Always find empty string
@@ -1024,7 +1024,7 @@ RTLFUNC(InStrRev)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -1032,7 +1032,7 @@ RTLFUNC(InStrRev)
         String aStr1 = rPar.Get(1)->GetString();
         String aToken = rPar.Get(2)->GetString();
 
-        INT32 lStartPos = -1;
+        sal_Int32 lStartPos = -1;
         if ( nArgCount >= 3 )
         {
             lStartPos = rPar.Get(3)->GetLong();
@@ -1049,7 +1049,7 @@ RTLFUNC(InStrRev)
         if( bCompatibility )
         {
             SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
-            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
         }
         else
         {
@@ -1058,13 +1058,13 @@ RTLFUNC(InStrRev)
         if ( nArgCount == 4 )
             bTextMode = rPar.Get(4)->GetInteger();
 
-        USHORT nStrLen = aStr1.Len();
-        USHORT nStartPos = lStartPos == -1 ? nStrLen : (USHORT)lStartPos;
+        sal_uInt16 nStrLen = aStr1.Len();
+        sal_uInt16 nStartPos = lStartPos == -1 ? nStrLen : (sal_uInt16)lStartPos;
 
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         if( nStartPos <= nStrLen )
         {
-            USHORT nTokenLen = aToken.Len();
+            sal_uInt16 nTokenLen = aToken.Len();
             if( !nTokenLen )
             {
                 // Always find empty string
@@ -1080,7 +1080,7 @@ RTLFUNC(InStrRev)
                     if( nRet == -1 )
                         nPos = 0;
                     else
-                        nPos = (USHORT)nRet + 1;
+                        nPos = (sal_uInt16)nRet + 1;
                 }
                 else
                 {
@@ -1094,7 +1094,7 @@ RTLFUNC(InStrRev)
                     if( nRet == -1 )
                         nPos = 0;
                     else
-                        nPos = (USHORT)nRet + 1;
+                        nPos = (sal_uInt16)nRet + 1;
                 }
             }
         }
@@ -1178,7 +1178,7 @@ RTLFUNC(Left)
     else
     {
         String aStr( rPar.Get(1)->GetString() );
-        INT32 lResultLen = rPar.Get(2)->GetLong();
+        sal_Int32 lResultLen = rPar.Get(2)->GetLong();
         if( lResultLen > 0xffff )
         {
             lResultLen = 0xffff;
@@ -1188,7 +1188,7 @@ RTLFUNC(Left)
             lResultLen = 0;
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
         }
-        aStr.Erase( (USHORT)lResultLen );
+        aStr.Erase( (sal_uInt16)lResultLen );
         rPar.Get(0)->PutString( aStr );
     }
 }
@@ -1237,7 +1237,7 @@ RTLFUNC(Mid)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -1247,23 +1247,23 @@ RTLFUNC(Mid)
         // Anders als im Original kann in dieser Variante der 3. Parameter
         // nLength nicht weggelassen werden. Ist ueber bWrite schon vorgesehen.
         if( nArgCount == 4 )
-            bWrite = TRUE;
+            bWrite = sal_True;
 
         String aArgStr = rPar.Get(1)->GetString();
-        USHORT nStartPos = (USHORT)(rPar.Get(2)->GetLong() );
+        sal_uInt16 nStartPos = (sal_uInt16)(rPar.Get(2)->GetLong() );
         if ( nStartPos == 0 )
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
         else
         {
             nStartPos--;
-            USHORT nLen = 0xffff;
+            sal_uInt16 nLen = 0xffff;
             bool bWriteNoLenParam = false;
             if ( nArgCount == 3 || bWrite )
             {
-                INT32 n = rPar.Get(3)->GetLong();
+                sal_Int32 n = rPar.Get(3)->GetLong();
                 if( bWrite && n == -1 )
                     bWriteNoLenParam = true;
-                nLen = (USHORT)n;
+                nLen = (sal_uInt16)n;
             }
             String aResultStr;
             if ( bWrite )
@@ -1272,7 +1272,7 @@ RTLFUNC(Mid)
                 bool bCompatibility = ( pInst && pInst->IsCompatibility() );
                 if( bCompatibility )
                 {
-                    USHORT nArgLen = aArgStr.Len();
+                    sal_uInt16 nArgLen = aArgStr.Len();
                     if( nStartPos + 1 > nArgLen )
                     {
                         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1280,8 +1280,8 @@ RTLFUNC(Mid)
                     }
 
                     String aReplaceStr = rPar.Get(4)->GetString();
-                    USHORT nReplaceStrLen = aReplaceStr.Len();
-                    USHORT nReplaceLen;
+                    sal_uInt16 nReplaceStrLen = aReplaceStr.Len();
+                    sal_uInt16 nReplaceLen;
                     if( bWriteNoLenParam )
                     {
                         nReplaceLen = nReplaceStrLen;
@@ -1293,12 +1293,12 @@ RTLFUNC(Mid)
                             nReplaceLen = nReplaceStrLen;
                     }
 
-                    USHORT nReplaceEndPos = nStartPos + nReplaceLen;
+                    sal_uInt16 nReplaceEndPos = nStartPos + nReplaceLen;
                     if( nReplaceEndPos > nArgLen )
                         nReplaceLen -= (nReplaceEndPos - nArgLen);
 
                     aResultStr = aArgStr;
-                    USHORT nErase = nReplaceLen;
+                    sal_uInt16 nErase = nReplaceLen;
                     aResultStr.Erase( nStartPos, nErase );
                     aResultStr.Insert( aReplaceStr, 0, nReplaceLen, nStartPos );
                 }
@@ -1346,7 +1346,7 @@ RTLFUNC(Replace)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if ( nArgCount < 3 || nArgCount > 6 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -1355,7 +1355,7 @@ RTLFUNC(Replace)
         String aFindStr = rPar.Get(2)->GetString();
         String aReplaceStr = rPar.Get(3)->GetString();
 
-        INT32 lStartPos = 1;
+        sal_Int32 lStartPos = 1;
         if ( nArgCount >= 4 )
         {
             if( rPar.Get(4)->GetType() != SbxEMPTY )
@@ -1367,7 +1367,7 @@ RTLFUNC(Replace)
             }
         }
 
-        INT32 lCount = -1;
+        sal_Int32 lCount = -1;
         if( nArgCount >=5 )
         {
             if( rPar.Get(5)->GetType() != SbxEMPTY )
@@ -1385,7 +1385,7 @@ RTLFUNC(Replace)
         if( bCompatibility )
         {
             SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
-            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
         }
         else
         {
@@ -1394,14 +1394,14 @@ RTLFUNC(Replace)
         if ( nArgCount == 6 )
             bTextMode = rPar.Get(6)->GetInteger();
 
-        USHORT nExpStrLen = aExpStr.Len();
-        USHORT nFindStrLen = aFindStr.Len();
-        USHORT nReplaceStrLen = aReplaceStr.Len();
+        sal_uInt16 nExpStrLen = aExpStr.Len();
+        sal_uInt16 nFindStrLen = aFindStr.Len();
+        sal_uInt16 nReplaceStrLen = aReplaceStr.Len();
 
         if( lStartPos <= nExpStrLen )
         {
-            USHORT nPos = static_cast<USHORT>( lStartPos - 1 );
-            USHORT nCounts = 0;
+            sal_uInt16 nPos = static_cast<sal_uInt16>( lStartPos - 1 );
+            sal_uInt16 nCounts = 0;
             while( lCount == -1 || lCount > nCounts )
             {
                 String aSrcStr( aExpStr );
@@ -1423,7 +1423,7 @@ RTLFUNC(Replace)
                 }
             }
         }
-        rPar.Get(0)->PutString( aExpStr.Copy( static_cast<USHORT>(lStartPos - 1) )  );
+        rPar.Get(0)->PutString( aExpStr.Copy( static_cast<sal_uInt16>(lStartPos - 1) )  );
     }
 }
 
@@ -1437,7 +1437,7 @@ RTLFUNC(Right)
     else
     {
         const String& rStr = rPar.Get(1)->GetString();
-        INT32 lResultLen = rPar.Get(2)->GetLong();
+        sal_Int32 lResultLen = rPar.Get(2)->GetLong();
         if( lResultLen > 0xffff )
         {
             lResultLen = 0xffff;
@@ -1447,8 +1447,8 @@ RTLFUNC(Right)
             lResultLen = 0;
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
         }
-        USHORT nResultLen = (USHORT)lResultLen;
-        USHORT nStrLen = rStr.Len();
+        sal_uInt16 nResultLen = (sal_uInt16)lResultLen;
+        sal_uInt16 nStrLen = rStr.Len();
         if ( nResultLen > nStrLen )
             nResultLen = nStrLen;
         String aResultStr = rStr.Copy( nStrLen-nResultLen );
@@ -1489,7 +1489,7 @@ RTLFUNC(Sgn)
     else
     {
         double aDouble = rPar.Get(1)->GetDouble();
-        INT16 nResult = 0;
+        sal_Int16 nResult = 0;
         if ( aDouble > 0 )
             nResult = 1;
         else if ( aDouble < 0 )
@@ -1508,7 +1508,7 @@ RTLFUNC(Space)
     else
     {
         String aStr;
-        aStr.Fill( (USHORT)(rPar.Get(1)->GetLong() ));
+        aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ));
         rPar.Get(0)->PutString( aStr );
     }
 }
@@ -1523,7 +1523,7 @@ RTLFUNC(Spc)
     else
     {
         String aStr;
-        aStr.Fill( (USHORT)(rPar.Get(1)->GetLong() ));
+        aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ));
         rPar.Get(0)->PutString( aStr );
     }
 }
@@ -1573,11 +1573,11 @@ RTLFUNC(Str)
                 const sal_Unicode* pBuf = aStr.GetBuffer();
 
                 bool bNeg = ( pBuf[0] == '-' );
-                USHORT iZeroSearch = 0;
+                sal_uInt16 iZeroSearch = 0;
                 if( bNeg )
                     iZeroSearch++;
 
-                USHORT iNext = iZeroSearch + 1;
+                sal_uInt16 iNext = iZeroSearch + 1;
                 if( pBuf[iZeroSearch] == '0' && nLen > iNext && pBuf[iNext] == '.' )
                 {
                     aStr.Erase( iZeroSearch, 1 );
@@ -1608,16 +1608,16 @@ RTLFUNC(StrComp)
     const String& rStr2 = rPar.Get(2)->GetString();
 
     SbiInstance* pInst = pINST;
-    INT16 nTextCompare;
+    sal_Int16 nTextCompare;
     bool bCompatibility = ( pInst && pInst->IsCompatibility() );
     if( bCompatibility )
     {
         SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
-        nTextCompare = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+        nTextCompare = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
     }
     else
     {
-        nTextCompare = TRUE;
+        nTextCompare = sal_True;
     }
     if ( rPar.Count() == 4 )
         nTextCompare = rPar.Get(3)->GetInteger();
@@ -1653,7 +1653,7 @@ RTLFUNC(StrComp)
             nRetValue = 1;
     }
 
-    rPar.Get(0)->PutInteger( sal::static_int_cast< INT16 >( nRetValue ) );
+    rPar.Get(0)->PutInteger( sal::static_int_cast< sal_Int16 >( nRetValue ) );
 }
 
 RTLFUNC(String)
@@ -1667,10 +1667,10 @@ RTLFUNC(String)
     {
         String aStr;
         sal_Unicode aFiller;
-        INT32 lCount = rPar.Get(1)->GetLong();
+        sal_Int32 lCount = rPar.Get(1)->GetLong();
         if( lCount < 0 || lCount > 0xffff )
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
-        USHORT nCount = (USHORT)lCount;
+        sal_uInt16 nCount = (sal_uInt16)lCount;
         if( rPar.Get(2)->GetType() == SbxINTEGER )
             aFiller = (sal_Unicode)rPar.Get(2)->GetInteger();
         else
@@ -1728,7 +1728,7 @@ RTLFUNC(Val)
 
         String aStr( rPar.Get(1)->GetString() );
 // lt. Mikkysoft bei Kommas abbrechen!
-//      for( USHORT n=0; n < aStr.Len(); n++ )
+//      for( sal_uInt16 n=0; n < aStr.Len(); n++ )
 //          if( aStr[n] == ',' ) aStr[n] = '.';
 
         FilterWhiteSpace( aStr );
@@ -1743,7 +1743,7 @@ RTLFUNC(Val)
             if ( nRadix != 10 )
             {
                 ByteString aByteStr( aStr, gsl_getSystemTextEncoding() );
-                INT16 nlResult = (INT16)strtol( aByteStr.GetBuffer()+2, &pEndPtr, nRadix);
+                sal_Int16 nlResult = (sal_Int16)strtol( aByteStr.GetBuffer()+2, &pEndPtr, nRadix);
                 nResult = (double)nlResult;
             }
         }
@@ -1761,46 +1761,46 @@ RTLFUNC(Val)
 
 
 // Helper functions for date conversion
-INT16 implGetDateDay( double aDate )
+sal_Int16 implGetDateDay( double aDate )
 {
     aDate -= 2.0; // normieren: 1.1.1900 => 0.0
     Date aRefDate( 1, 1, 1900 );
     if ( aDate >= 0.0 )
     {
         aDate = floor( aDate );
-        aRefDate += (ULONG)aDate;
+        aRefDate += (sal_uIntPtr)aDate;
     }
     else
     {
         aDate = ceil( aDate );
-        aRefDate -= (ULONG)(-1.0 * aDate);
+        aRefDate -= (sal_uIntPtr)(-1.0 * aDate);
     }
 
-    INT16 nRet = (INT16)( aRefDate.GetDay() );
+    sal_Int16 nRet = (sal_Int16)( aRefDate.GetDay() );
     return nRet;
 }
 
-INT16 implGetDateMonth( double aDate )
+sal_Int16 implGetDateMonth( double aDate )
 {
     Date aRefDate( 1,1,1900 );
     long nDays = (long)aDate;
     nDays -= 2; // normieren: 1.1.1900 => 0.0
     aRefDate += nDays;
-    INT16 nRet = (INT16)( aRefDate.GetMonth() );
+    sal_Int16 nRet = (sal_Int16)( aRefDate.GetMonth() );
     return nRet;
 }
 
-INT16 implGetDateYear( double aDate )
+sal_Int16 implGetDateYear( double aDate )
 {
     Date aRefDate( 1,1,1900 );
     long nDays = (long) aDate;
     nDays -= 2; // normieren: 1.1.1900 => 0.0
     aRefDate += nDays;
-    INT16 nRet = (INT16)( aRefDate.GetYear() );
+    sal_Int16 nRet = (sal_Int16)( aRefDate.GetYear() );
     return nRet;
 }
 
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet )
 {
     if ( nYear < 30 && SbiRuntime::isVBAEnabled() )
         nYear += 2000;
@@ -1810,7 +1810,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
     if ((nYear < 100 || nYear > 9999) )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
-        return FALSE;
+        return sal_False;
     }
     if ( !SbiRuntime::isVBAEnabled() )
     {
@@ -1818,7 +1818,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
         (nDay < 1 || nDay > 31 ) )
         {
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
-            return FALSE;
+            return sal_False;
         }
     }
     else
@@ -1833,7 +1833,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
         {
             // inacurrate around leap year, don't use days to calculate,
             // just modify the months directory
-            INT16 nYearAdj = ( nMonth /12 ); // default to positive months inputed
+            sal_Int16 nYearAdj = ( nMonth /12 ); // default to positive months inputed
             if ( nMonth <=0 )
                 nYearAdj = ( ( nMonth -12 ) / 12 );
             aCurDate.SetYear( aCurDate.GetYear() + nYearAdj );
@@ -1850,7 +1850,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
 
     long nDiffDays = GetDayDiff( aCurDate );
     rdRet = (double)nDiffDays;
-    return TRUE;
+    return sal_True;
 }
 
 // Function to convert date to ISO 8601 date format
@@ -1884,14 +1884,14 @@ RTLFUNC(CDateFromIso)
     if ( rPar.Count() == 2 )
     {
         String aStr = rPar.Get(1)->GetString();
-        INT16 iMonthStart = aStr.Len() - 4;
+        sal_Int16 iMonthStart = aStr.Len() - 4;
         String aYearStr  = aStr.Copy( 0, iMonthStart );
         String aMonthStr = aStr.Copy( iMonthStart, 2 );
         String aDayStr   = aStr.Copy( iMonthStart+2, 2 );
 
         double dDate;
-        if( implDateSerial( (INT16)aYearStr.ToInt32(),
-            (INT16)aMonthStr.ToInt32(), (INT16)aDayStr.ToInt32(), dDate ) )
+        if( implDateSerial( (sal_Int16)aYearStr.ToInt32(),
+            (sal_Int16)aMonthStr.ToInt32(), (sal_Int16)aDayStr.ToInt32(), dDate ) )
         {
             rPar.Get(0)->PutDate( dDate );
         }
@@ -1910,9 +1910,9 @@ RTLFUNC(DateSerial)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nYear = rPar.Get(1)->GetInteger();
-    INT16 nMonth = rPar.Get(2)->GetInteger();
-    INT16 nDay = rPar.Get(3)->GetInteger();
+    sal_Int16 nYear = rPar.Get(1)->GetInteger();
+    sal_Int16 nMonth = rPar.Get(2)->GetInteger();
+    sal_Int16 nDay = rPar.Get(3)->GetInteger();
 
     double dDate;
     if( implDateSerial( nYear, nMonth, nDay, dDate ) )
@@ -1929,11 +1929,11 @@ RTLFUNC(TimeSerial)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nHour = rPar.Get(1)->GetInteger();
+    sal_Int16 nHour = rPar.Get(1)->GetInteger();
     if ( nHour == 24 )
         nHour = 0;                      // Wegen UNO DateTimes, die bis 24 Uhr gehen
-    INT16 nMinute = rPar.Get(2)->GetInteger();
-    INT16 nSecond = rPar.Get(3)->GetInteger();
+    sal_Int16 nMinute = rPar.Get(2)->GetInteger();
+    sal_Int16 nSecond = rPar.Get(3)->GetInteger();
     if ((nHour < 0 || nHour > 23)   ||
         (nMinute < 0 || nMinute > 59 )  ||
         (nSecond < 0 || nSecond > 59 ))
@@ -1942,7 +1942,7 @@ RTLFUNC(TimeSerial)
         return;
     }
 
-    INT32 nSeconds = nHour;
+    sal_Int32 nSeconds = nHour;
     nSeconds *= 3600;
     nSeconds += nMinute * 60;
     nSeconds += nSecond;
@@ -1972,7 +1972,7 @@ RTLFUNC(DateValue)
         sal_uInt32 nIndex;
         double fResult;
         String aStr( rPar.Get(1)->GetString() );
-        BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
+        sal_Bool bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
         short nType = pFormatter->GetType( nIndex );
 
         // DateValue("February 12, 1969") raises error if the system locale is not en_US
@@ -2033,7 +2033,7 @@ RTLFUNC(TimeValue)
 
         sal_uInt32 nIndex;
         double fResult;
-        BOOL bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
+        sal_Bool bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
                                                    nIndex, fResult );
         short nType = pFormatter->GetType(nIndex);
         if(bSuccess && (nType==NUMBERFORMAT_TIME||nType==NUMBERFORMAT_DATETIME))
@@ -2064,7 +2064,7 @@ RTLFUNC(Day)
         SbxVariableRef pArg = rPar.Get( 1 );
         double aDate = pArg->GetDate();
 
-        INT16 nDay = implGetDateDay( aDate );
+        sal_Int16 nDay = implGetDateDay( aDate );
         rPar.Get(0)->PutInteger( nDay );
     }
 }
@@ -2078,19 +2078,19 @@ RTLFUNC(Year)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nYear = implGetDateYear( rPar.Get(1)->GetDate() );
+        sal_Int16 nYear = implGetDateYear( rPar.Get(1)->GetDate() );
         rPar.Get(0)->PutInteger( nYear );
     }
 }
 
-INT16 implGetHour( double dDate )
+sal_Int16 implGetHour( double dDate )
 {
     if( dDate < 0.0 )
         dDate *= -1.0;
     double nFrac = dDate - floor( dDate );
     nFrac *= 86400.0;
-    INT32 nSeconds = (INT32)(nFrac + 0.5);
-    INT16 nHour = (INT16)(nSeconds / 3600);
+    sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+    sal_Int16 nHour = (sal_Int16)(nSeconds / 3600);
     return nHour;
 }
 
@@ -2104,20 +2104,20 @@ RTLFUNC(Hour)
     else
     {
         double nArg = rPar.Get(1)->GetDate();
-        INT16 nHour = implGetHour( nArg );
+        sal_Int16 nHour = implGetHour( nArg );
         rPar.Get(0)->PutInteger( nHour );
     }
 }
 
-INT16 implGetMinute( double dDate )
+sal_Int16 implGetMinute( double dDate )
 {
     if( dDate < 0.0 )
         dDate *= -1.0;
     double nFrac = dDate - floor( dDate );
     nFrac *= 86400.0;
-    INT32 nSeconds = (INT32)(nFrac + 0.5);
-    INT16 nTemp = (INT16)(nSeconds % 3600);
-    INT16 nMin = nTemp / 60;
+    sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+    sal_Int16 nTemp = (sal_Int16)(nSeconds % 3600);
+    sal_Int16 nMin = nTemp / 60;
     return nMin;
 }
 
@@ -2131,7 +2131,7 @@ RTLFUNC(Minute)
     else
     {
         double nArg = rPar.Get(1)->GetDate();
-        INT16 nMin = implGetMinute( nArg );
+        sal_Int16 nMin = implGetMinute( nArg );
         rPar.Get(0)->PutInteger( nMin );
     }
 }
@@ -2145,24 +2145,24 @@ RTLFUNC(Month)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nMonth = implGetDateMonth( rPar.Get(1)->GetDate() );
+        sal_Int16 nMonth = implGetDateMonth( rPar.Get(1)->GetDate() );
         rPar.Get(0)->PutInteger( nMonth );
     }
 }
 
-INT16 implGetSecond( double dDate )
+sal_Int16 implGetSecond( double dDate )
 {
     if( dDate < 0.0 )
         dDate *= -1.0;
     double nFrac = dDate - floor( dDate );
     nFrac *= 86400.0;
-    INT32 nSeconds = (INT32)(nFrac + 0.5);
-    INT16 nTemp = (INT16)(nSeconds / 3600);
+    sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+    sal_Int16 nTemp = (sal_Int16)(nSeconds / 3600);
     nSeconds -= nTemp * 3600;
-    nTemp = (INT16)(nSeconds / 60);
+    nTemp = (sal_Int16)(nSeconds / 60);
     nSeconds -= nTemp * 60;
 
-    INT16 nRet = (INT16)nSeconds;
+    sal_Int16 nRet = (sal_Int16)nSeconds;
     return nRet;
 }
 
@@ -2176,7 +2176,7 @@ RTLFUNC(Second)
     else
     {
         double nArg = rPar.Get(1)->GetDate();
-        INT16 nSecond = implGetSecond( nArg );
+        sal_Int16 nSecond = implGetSecond( nArg );
         rPar.Get(0)->PutInteger( nSecond );
     }
 }
@@ -2328,7 +2328,7 @@ RTLFUNC(IsArray)
     if ( rPar.Count() < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
-        rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? TRUE : FALSE );
+        rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? sal_True : sal_False );
 }
 
 RTLFUNC(IsObject)
@@ -2347,7 +2347,7 @@ RTLFUNC(IsObject)
         SbxBase::ResetError();
 
         SbUnoClass* pUnoClass;
-        BOOL bObject;
+        sal_Bool bObject;
         if( pObj &&  NULL != ( pUnoClass=PTR_CAST(SbUnoClass,pObj) ) )
         {
             bObject = pUnoClass->getUnoClass().is();
@@ -2369,14 +2369,14 @@ RTLFUNC(IsDate)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        // #46134 Nur String wird konvertiert, andere Typen ergeben FALSE
+        // #46134 Nur String wird konvertiert, andere Typen ergeben sal_False
         SbxVariableRef xArg = rPar.Get( 1 );
         SbxDataType eType = xArg->GetType();
-        BOOL bDate = FALSE;
+        sal_Bool bDate = sal_False;
 
         if( eType == SbxDATE )
         {
-            bDate = TRUE;
+            bDate = sal_True;
         }
         else if( eType == SbxSTRING )
         {
@@ -2432,12 +2432,12 @@ RTLFUNC(IsNull)
         // #51475 Wegen Uno-Objekten auch true liefern,
         // wenn der pObj-Wert NULL ist
         SbxVariableRef pArg = rPar.Get( 1 );
-        BOOL bNull = rPar.Get(1)->IsNull();
+        sal_Bool bNull = rPar.Get(1)->IsNull();
         if( !bNull && pArg->GetType() == SbxOBJECT )
         {
             SbxBase* pObj = pArg->GetObject();
             if( !pObj )
-                bNull = TRUE;
+                bNull = sal_True;
         }
         rPar.Get( 0 )->PutBool( bNull );
     }
@@ -2577,7 +2577,7 @@ inline sal_Bool implCheckWildcard( const String& rName, SbiRTLData* pRTLData )
 bool isRootDir( String aDirURLStr )
 {
     INetURLObject aDirURLObj( aDirURLStr );
-    BOOL bRoot = FALSE;
+    sal_Bool bRoot = sal_False;
 
     // Check if it's a root directory
     sal_Int32 nCount = aDirURLObj.getSegmentCount();
@@ -2585,22 +2585,22 @@ bool isRootDir( String aDirURLStr )
     // No segment means Unix root directory "file:///"
     if( nCount == 0 )
     {
-        bRoot = TRUE;
+        bRoot = sal_True;
     }
     // Exactly one segment needs further checking, because it
     // can be Unix "file:///foo/" -> no root
     // or Windows  "file:///c:/"  -> root
     else if( nCount == 1 )
     {
-        ::rtl::OUString aSeg1 = aDirURLObj.getName( 0, TRUE,
+        ::rtl::OUString aSeg1 = aDirURLObj.getName( 0, sal_True,
             INetURLObject::DECODE_WITH_CHARSET );
         if( aSeg1.getStr()[1] == (sal_Unicode)':' )
         {
-            bRoot = TRUE;
+            bRoot = sal_True;
         }
     }
     // More than one segments can never be root
-    // so bRoot remains FALSE
+    // so bRoot remains sal_False
 
     return bRoot;
 }
@@ -2612,7 +2612,7 @@ RTLFUNC(Dir)
 
     String aPath;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount > 3 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -2667,7 +2667,7 @@ RTLFUNC(Dir)
                             rPar.Get(0)->PutString( aEmptyStr );
                         }
 
-                        USHORT nFlags = 0;
+                        sal_uInt16 nFlags = 0;
                         if ( nParCount > 2 )
                             pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
                         else
@@ -2681,7 +2681,7 @@ RTLFUNC(Dir)
                         // #78651 Add "." and ".." directories for VB compatibility
                         if( bIncludeFolders )
                         {
-                            BOOL bRoot = isRootDir( aDirURLStr );
+                            sal_Bool bRoot = isRootDir( aDirURLStr );
 
                             // If it's no root directory we flag the need for
                             // the "." and ".." directories by the value -2
@@ -2751,7 +2751,7 @@ RTLFUNC(Dir)
                             }
 
                             INetURLObject aURL( aFile );
-                            aPath = aURL.getName( INetURLObject::LAST_SEGMENT, TRUE,
+                            aPath = aURL.getName( INetURLObject::LAST_SEGMENT, sal_True,
                                 INetURLObject::DECODE_WITH_CHARSET );
                         }
 
@@ -2782,7 +2782,7 @@ RTLFUNC(Dir)
                     rPar.Get(0)->PutString( aEntry.GetName() );
                     return;
                 }
-                USHORT nFlags = 0;
+                sal_uInt16 nFlags = 0;
                 if ( nParCount > 2 )
                     pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
                 else
@@ -2794,7 +2794,7 @@ RTLFUNC(Dir)
                 else
                 {
                     // Die richtige Auswahl treffen
-                    USHORT nMode = FSYS_KIND_FILE;
+                    sal_uInt16 nMode = FSYS_KIND_FILE;
                     if( nFlags & Sb_ATTR_DIRECTORY )
                         nMode |= FSYS_KIND_DIR;
                     if( nFlags == Sb_ATTR_DIRECTORY )
@@ -2829,7 +2829,7 @@ RTLFUNC(Dir)
 
                 String aDirURL = implSetupWildcard( aFileParam, pRTLData );
 
-                USHORT nFlags = 0;
+                sal_uInt16 nFlags = 0;
                 if ( nParCount > 2 )
                     pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
                 else
@@ -2851,7 +2851,7 @@ RTLFUNC(Dir)
                 pRTLData->nCurDirPos = 0;
                 if( bIncludeFolders )
                 {
-                    BOOL bRoot = isRootDir( aDirURL );
+                    sal_Bool bRoot = isRootDir( aDirURL );
 
                     // If it's no root directory we flag the need for
                     // the "." and ".." directories by the value -2
@@ -2931,7 +2931,7 @@ RTLFUNC(GetAttr)
 
     if ( rPar.Count() == 2 )
     {
-        INT16 nFlags = 0;
+        sal_Int16 nFlags = 0;
 
         // In Windows, We want to use Windows API to get the file attributes
         // for VBA interoperability.
@@ -2948,7 +2948,7 @@ RTLFUNC(GetAttr)
             {
                 if (nRealFlags == FILE_ATTRIBUTE_NORMAL)
                     nRealFlags = 0;
-                nFlags = (INT16) (nRealFlags);
+                nFlags = (sal_Int16) (nRealFlags);
             }
             else
                 StarBASIC::Error( SbERR_FILE_NOT_FOUND );
@@ -3114,7 +3114,7 @@ RTLFUNC(EOF)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nChannel = rPar.Get(1)->GetInteger();
+        sal_Int16 nChannel = rPar.Get(1)->GetInteger();
         // nChannel--;  // macht MD beim Oeffnen auch nicht
         SbiIoSystem* pIO = pINST->GetIoSystem();
         SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3123,7 +3123,7 @@ RTLFUNC(EOF)
             StarBASIC::Error( SbERR_BAD_CHANNEL );
             return;
         }
-        BOOL bIsEof;
+        sal_Bool bIsEof;
         SvStream* pSvStrm = pSbStrm->GetStrm();
         if ( pSbStrm->IsText() )
         {
@@ -3154,7 +3154,7 @@ RTLFUNC(FileAttr)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nChannel = rPar.Get(1)->GetInteger();
+        sal_Int16 nChannel = rPar.Get(1)->GetInteger();
 //      nChannel--;
         SbiIoSystem* pIO = pINST->GetIoSystem();
         SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3163,9 +3163,9 @@ RTLFUNC(FileAttr)
             StarBASIC::Error( SbERR_BAD_CHANNEL );
             return;
         }
-        INT16 nRet;
+        sal_Int16 nRet;
         if ( rPar.Get(2)->GetInteger() == 1 )
-            nRet = (INT16)(pSbStrm->GetMode());
+            nRet = (sal_Int16)(pSbStrm->GetMode());
         else
             nRet = 0; // System file handle not supported
 
@@ -3182,7 +3182,7 @@ RTLFUNC(Loc)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nChannel = rPar.Get(1)->GetInteger();
+        sal_Int16 nChannel = rPar.Get(1)->GetInteger();
         SbiIoSystem* pIO = pINST->GetIoSystem();
         SbiStream* pSbStrm = pIO->GetStream( nChannel );
         if ( !pSbStrm )
@@ -3191,7 +3191,7 @@ RTLFUNC(Loc)
             return;
         }
         SvStream* pSvStrm = pSbStrm->GetStrm();
-        ULONG nPos;
+        sal_uIntPtr nPos;
         if( pSbStrm->IsRandom())
         {
             short nBlockLen = pSbStrm->GetBlockLen();
@@ -3206,7 +3206,7 @@ RTLFUNC(Loc)
             nPos = ( pSvStrm->Tell()+1 ) / 128;
         else
             nPos = pSvStrm->Tell();
-        rPar.Get(0)->PutLong( (INT32)nPos );
+        rPar.Get(0)->PutLong( (sal_Int32)nPos );
     }
 }
 
@@ -3220,7 +3220,7 @@ RTLFUNC(Lof)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nChannel = rPar.Get(1)->GetInteger();
+        sal_Int16 nChannel = rPar.Get(1)->GetInteger();
         SbiIoSystem* pIO = pINST->GetIoSystem();
         SbiStream* pSbStrm = pIO->GetStream( nChannel );
         if ( !pSbStrm )
@@ -3229,10 +3229,10 @@ RTLFUNC(Lof)
             return;
         }
         SvStream* pSvStrm = pSbStrm->GetStrm();
-        ULONG nOldPos = pSvStrm->Tell();
-        ULONG nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
+        sal_uIntPtr nOldPos = pSvStrm->Tell();
+        sal_uIntPtr nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
         pSvStrm->Seek( nOldPos );
-        rPar.Get(0)->PutLong( (INT32)nLen );
+        rPar.Get(0)->PutLong( (sal_Int32)nLen );
     }
 }
 
@@ -3249,7 +3249,7 @@ RTLFUNC(Seek)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
 //  nChannel--;
     SbiIoSystem* pIO = pINST->GetIoSystem();
     SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3262,15 +3262,15 @@ RTLFUNC(Seek)
 
     if ( nArgs == 2 )   // Seek-Function
     {
-        ULONG nPos = pStrm->Tell();
+        sal_uIntPtr nPos = pStrm->Tell();
         if( pSbStrm->IsRandom() )
             nPos = nPos / pSbStrm->GetBlockLen();
         nPos++; // Basic zaehlt ab 1
-        rPar.Get(0)->PutLong( (INT32)nPos );
+        rPar.Get(0)->PutLong( (sal_Int32)nPos );
     }
     else                // Seek-Statement
     {
-        INT32 nPos = rPar.Get(2)->GetLong();
+        sal_Int32 nPos = rPar.Get(2)->GetLong();
         if ( nPos < 1 )
         {
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3280,7 +3280,7 @@ RTLFUNC(Seek)
         pSbStrm->SetExpandOnWriteTo( 0 );
         if ( pSbStrm->IsRandom() )
             nPos *= pSbStrm->GetBlockLen();
-        pStrm->Seek( (ULONG)nPos );
+        pStrm->Seek( (sal_uIntPtr)nPos );
         pSbStrm->SetExpandOnWriteTo( nPos );
     }
 }
@@ -3290,7 +3290,7 @@ RTLFUNC(Format)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nArgCount = (USHORT)rPar.Count();
+    sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
     if ( nArgCount < 2 || nArgCount > 3 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -3314,11 +3314,11 @@ RTLFUNC(Randomize)
 
     if ( rPar.Count() > 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
-    INT16 nSeed;
+    sal_Int16 nSeed;
     if( rPar.Count() == 2 )
-        nSeed = (INT16)rPar.Get(1)->GetInteger();
+        nSeed = (sal_Int16)rPar.Get(1)->GetInteger();
     else
-        nSeed = (INT16)rand();
+        nSeed = (sal_Int16)rand();
     srand( nSeed );
 }
 
@@ -3339,7 +3339,7 @@ RTLFUNC(Rnd)
 
 
 //
-//  Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = FALSE ]]])
+//  Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = sal_False ]]])
 //
 //  WindowStyles (VBA-kompatibel):
 //      2 == Minimized
@@ -3363,7 +3363,7 @@ RTLFUNC(Shell)
         return;
     }
 
-    ULONG nArgCount = rPar.Count();
+    sal_uIntPtr nArgCount = rPar.Count();
     if ( nArgCount < 2 || nArgCount > 5 )
     {
         rPar.Get(0)->PutLong(0);
@@ -3371,7 +3371,7 @@ RTLFUNC(Shell)
     }
     else
     {
-        USHORT nOptions = vos::OProcess::TOption_SearchPath|
+        sal_uInt16 nOptions = vos::OProcess::TOption_SearchPath|
                           vos::OProcess::TOption_Detached;
         String aCmdLine = rPar.Get(1)->GetString();
         // Zusaetzliche Parameter anhaengen, es muss eh alles geparsed werden
@@ -3385,13 +3385,13 @@ RTLFUNC(Shell)
             // Spezial-Behandlung (leere Liste) vermeiden
             aCmdLine.AppendAscii( " " );
         }
-        USHORT nLen = aCmdLine.Len();
+        sal_uInt16 nLen = aCmdLine.Len();
 
         // #55735 Wenn Parameter dabei sind, muessen die abgetrennt werden
         // #72471 Auch die einzelnen Parameter trennen
         std::list<String> aTokenList;
         String aToken;
-        USHORT i = 0;
+        sal_uInt16 i = 0;
         sal_Unicode c;
         while( i < nLen )
         {
@@ -3405,7 +3405,7 @@ RTLFUNC(Shell)
 
             if( c == '\"' || c == '\'' )
             {
-                USHORT iFoundPos = aCmdLine.Search( c, i + 1 );
+                sal_uInt16 iFoundPos = aCmdLine.Search( c, i + 1 );
 
                 // Wenn nichts gefunden wurde, Rest kopieren
                 if( iFoundPos == STRING_NOTFOUND )
@@ -3421,9 +3421,9 @@ RTLFUNC(Shell)
             }
             else
             {
-                USHORT iFoundSpacePos = aCmdLine.Search( ' ', i );
-                USHORT iFoundTabPos = aCmdLine.Search( '\t', i );
-                USHORT iFoundPos = Min( iFoundSpacePos, iFoundTabPos );
+                sal_uInt16 iFoundSpacePos = aCmdLine.Search( ' ', i );
+                sal_uInt16 iFoundTabPos = aCmdLine.Search( '\t', i );
+                sal_uInt16 iFoundPos = Min( iFoundSpacePos, iFoundTabPos );
 
                 // Wenn nichts gefunden wurde, Rest kopieren
                 if( iFoundPos == STRING_NOTFOUND )
@@ -3443,7 +3443,7 @@ RTLFUNC(Shell)
         }
         // #55735 / #72471 Ende
 
-        INT16 nWinStyle = 0;
+        sal_Int16 nWinStyle = 0;
         if( nArgCount >= 3 )
         {
             nWinStyle = rPar.Get(2)->GetInteger();
@@ -3460,7 +3460,7 @@ RTLFUNC(Shell)
                     break;
             }
 
-            BOOL bSync = FALSE;
+            sal_Bool bSync = sal_False;
             if( nArgCount >= 5 )
                 bSync = rPar.Get(4)->GetBool();
             if( bSync )
@@ -3478,7 +3478,7 @@ RTLFUNC(Shell)
 
         iter++;
 
-        USHORT nParamCount = sal::static_int_cast< USHORT >(
+        sal_uInt16 nParamCount = sal::static_int_cast< sal_uInt16 >(
             aTokenList.size() - 1 );
         ::rtl::OUString* pArgumentList = NULL;
         //const char** pParamList = NULL;
@@ -3486,7 +3486,7 @@ RTLFUNC(Shell)
         {
             pArgumentList = new ::rtl::OUString[ nParamCount ];
             //pParamList = new const char*[ nParamCount ];
-            USHORT iList = 0;
+            sal_uInt16 iList = 0;
             while( iter != aTokenList.end() )
             {
                 const String& rParamStr = (*iter);
@@ -3499,7 +3499,7 @@ RTLFUNC(Shell)
         //const char* pParams = aParams.Len() ? aParams.GetStr() : 0;
         vos::OProcess* pApp;
         pApp = new vos::OProcess( aOUStrProgUNC );
-        BOOL bSucc;
+        sal_Bool bSucc;
         if( nParamCount == 0 )
         {
             bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
@@ -3515,7 +3515,7 @@ RTLFUNC(Shell)
             pApp = new vos::OProcess( pProg );
         else
             pApp = new vos::OProcess( pProg, pParamList, nParamCount );
-        BOOL bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
+        sal_Bool bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
         */
 
         delete pApp;
@@ -3537,7 +3537,7 @@ RTLFUNC(VarType)
     else
     {
         SbxDataType eType = rPar.Get(1)->GetType();
-        rPar.Get(0)->PutInteger( (INT16)eType );
+        rPar.Get(0)->PutInteger( (sal_Int16)eType );
     }
 }
 
@@ -3587,7 +3587,7 @@ String getBasicTypeName( SbxDataType eType )
     };
 
     int nPos = ((int)eType) & 0x0FFF;
-    USHORT nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
+    sal_uInt16 nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
     if ( nPos < 0 || nPos >= nTypeNameCount )
         nPos = nTypeNameCount - 1;
     String aRetStr = String::CreateFromAscii( pTypeNames[nPos] );
@@ -3604,7 +3604,7 @@ RTLFUNC(TypeName)
     else
     {
         SbxDataType eType = rPar.Get(1)->GetType();
-        BOOL bIsArray = ( ( eType & SbxARRAY ) != 0 );
+        sal_Bool bIsArray = ( ( eType & SbxARRAY ) != 0 );
         String aRetStr = getBasicTypeName( eType );
         if( bIsArray )
             aRetStr.AppendAscii( "()" );
@@ -3622,7 +3622,7 @@ RTLFUNC(Len)
     else
     {
         const String& rStr = rPar.Get(1)->GetString();
-        rPar.Get(0)->PutLong( (INT32)rStr.Len() );
+        rPar.Get(0)->PutLong( (sal_Int32)rStr.Len() );
     }
 }
 
@@ -3648,7 +3648,7 @@ RTLFUNC(DDEInitiate)
     const String& rTopic = rPar.Get(2)->GetString();
 
     SbiDdeControl* pDDE = pINST->GetDdeControl();
-    INT16 nChannel;
+    sal_Int16 nChannel;
     SbError nDdeErr = pDDE->Initiate( rApp, rTopic, nChannel );
     if( nDdeErr )
         StarBASIC::Error( nDdeErr );
@@ -3675,7 +3675,7 @@ RTLFUNC(DDETerminate)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
     SbiDdeControl* pDDE = pINST->GetDdeControl();
     SbError nDdeErr = pDDE->Terminate( nChannel );
     if( nDdeErr )
@@ -3727,7 +3727,7 @@ RTLFUNC(DDERequest)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
     const String& rItem = rPar.Get(2)->GetString();
     SbiDdeControl* pDDE = pINST->GetDdeControl();
     String aResult;
@@ -3757,7 +3757,7 @@ RTLFUNC(DDEExecute)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
     const String& rCommand = rPar.Get(2)->GetString();
     SbiDdeControl* pDDE = pINST->GetDdeControl();
     SbError nDdeErr = pDDE->Execute( nChannel, rCommand );
@@ -3784,7 +3784,7 @@ RTLFUNC(DDEPoke)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
     const String& rItem = rPar.Get(2)->GetString();
     const String& rData = rPar.Get(3)->GetString();
     SbiDdeControl* pDDE = pINST->GetDdeControl();
@@ -3824,7 +3824,7 @@ RTLFUNC(LBound)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount != 3 && nParCount != 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3834,7 +3834,7 @@ RTLFUNC(LBound)
     SbxDimArray* pArr = PTR_CAST(SbxDimArray,pParObj);
     if( pArr )
     {
-        INT32 nLower, nUpper;
+        sal_Int32 nLower, nUpper;
         short nDim = (nParCount == 3) ? (short)rPar.Get(2)->GetInteger() : 1;
         if( !pArr->GetDim32( nDim, nLower, nUpper ) )
             StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -3850,7 +3850,7 @@ RTLFUNC(UBound)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount != 3 && nParCount != 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3861,7 +3861,7 @@ RTLFUNC(UBound)
     SbxDimArray* pArr = PTR_CAST(SbxDimArray,pParObj);
     if( pArr )
     {
-        INT32 nLower, nUpper;
+        sal_Int32 nLower, nUpper;
         short nDim = (nParCount == 3) ? (short)rPar.Get(2)->GetInteger() : 1;
         if( !pArr->GetDim32( nDim, nLower, nUpper ) )
             StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -3883,10 +3883,10 @@ RTLFUNC(RGB)
         return;
     }
 
-    ULONG nRed   = rPar.Get(1)->GetInteger() & 0xFF;
-    ULONG nGreen = rPar.Get(2)->GetInteger() & 0xFF;
-    ULONG nBlue  = rPar.Get(3)->GetInteger() & 0xFF;
-    ULONG nRGB;
+    sal_uIntPtr nRed     = rPar.Get(1)->GetInteger() & 0xFF;
+    sal_uIntPtr nGreen = rPar.Get(2)->GetInteger() & 0xFF;
+    sal_uIntPtr nBlue  = rPar.Get(3)->GetInteger() & 0xFF;
+    sal_uIntPtr nRGB;
 
     SbiInstance* pInst = pINST;
     bool bCompatibility = ( pInst && pInst->IsCompatibility() );
@@ -3906,7 +3906,7 @@ RTLFUNC(QBColor)
     (void)pBasic;
     (void)bWrite;
 
-    static const INT32 pRGB[] =
+    static const sal_Int32 pRGB[] =
     {
         0x000000,
         0x800000,
@@ -3932,13 +3932,13 @@ RTLFUNC(QBColor)
         return;
     }
 
-    INT16 nCol = rPar.Get(1)->GetInteger();
+    sal_Int16 nCol = rPar.Get(1)->GetInteger();
     if( nCol < 0 || nCol > 15 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT32 nRGB = pRGB[ nCol ];
+    sal_Int32 nRGB = pRGB[ nCol ];
     rPar.Get(0)->PutLong( nRGB );
 }
 
@@ -3948,7 +3948,7 @@ RTLFUNC(StrConv)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if( nArgCount < 2 || nArgCount > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3956,16 +3956,16 @@ RTLFUNC(StrConv)
     }
 
     String aOldStr = rPar.Get(1)->GetString();
-    INT32 nConversion = rPar.Get(2)->GetLong();
+    sal_Int32 nConversion = rPar.Get(2)->GetLong();
 
-    USHORT nLanguage = LANGUAGE_SYSTEM;
+    sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
     if( nArgCount == 3 )
     {
         // LCID not supported now
         //nLanguage = rPar.Get(3)->GetInteger();
     }
 
-    USHORT nOldLen = aOldStr.Len();
+    sal_uInt16 nOldLen = aOldStr.Len();
     if( nOldLen == 0 )
     {
         // null string,return
@@ -3973,7 +3973,7 @@ RTLFUNC(StrConv)
         return;
     }
 
-    INT32 nType = 0;
+    sal_Int32 nType = 0;
     if ( (nConversion & 0x03) == 3 ) //  vbProperCase
     {
         CharClass& rCharClass = GetCharClass();
@@ -4007,10 +4007,10 @@ RTLFUNC(StrConv)
     if ( (nConversion & 0x40) == 64 ) // vbUnicode
     {
         // convert the string to byte string, preserving unicode (2 bytes per character)
-        USHORT nSize = aNewStr.Len()*2;
+        sal_uInt16 nSize = aNewStr.Len()*2;
         const sal_Unicode* pSrc = aNewStr.GetBuffer();
         sal_Char* pChar = new sal_Char[nSize+1];
-        for( USHORT i=0; i < nSize; i++ )
+        for( sal_uInt16 i=0; i < nSize; i++ )
         {
             pChar[i] = static_cast< sal_Char >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
             if( i%2 )
@@ -4031,7 +4031,7 @@ RTLFUNC(StrConv)
         // there is no concept about default codepage in unix. so it is incorrectly in unix
         ::rtl::OString aOStr = ::rtl::OUStringToOString(aNewStr,osl_getThreadTextEncoding());
         const sal_Char* pChar = aOStr.getStr();
-        USHORT nArraySize = static_cast< USHORT >( aOStr.getLength() );
+        sal_uInt16 nArraySize = static_cast< sal_uInt16 >( aOStr.getLength() );
         SbxDimArray* pArray = new SbxDimArray(SbxBYTE);
         bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
         if(nArraySize)
@@ -4046,7 +4046,7 @@ RTLFUNC(StrConv)
             pArray->unoAddDim( 0, -1 );
         }
 
-        for( USHORT i=0; i< nArraySize; i++)
+        for( sal_uInt16 i=0; i< nArraySize; i++)
         {
             SbxVariable* pNew = new SbxVariable( SbxBYTE );
             pNew->PutByte(*pChar);
@@ -4059,7 +4059,7 @@ RTLFUNC(StrConv)
         }
 
         SbxVariableRef refVar = rPar.Get(0);
-        USHORT nFlags = refVar->GetFlags();
+        sal_uInt16 nFlags = refVar->GetFlags();
         refVar->ResetFlag( SBX_FIXED );
         refVar->PutObject( pArray );
         refVar->SetFlags( nFlags );
@@ -4215,17 +4215,17 @@ RTLFUNC(MsgBox)
         WB_YES_NO,          // MB_YESNO
         WB_RETRY_CANCEL     // MB_RETRYCANCEL
     };
-    static const INT16 nButtonMap[] =
+    static const sal_Int16 nButtonMap[] =
     {
-        2, // #define RET_CANCEL FALSE
-        1, // #define RET_OK     TRUE
+        2, // #define RET_CANCEL sal_False
+        1, // #define RET_OK     sal_True
         6, // #define RET_YES    2
         7, // #define RET_NO     3
         4  // #define RET_RETRY  4
     };
 
 
-    USHORT nArgCount = (USHORT)rPar.Count();
+    sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
     if( nArgCount < 2 || nArgCount > 6 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4292,11 +4292,11 @@ RTLFUNC(MsgBox)
             pBox = new MessBox( pParent, nWinBits, aTitle, aMsg );
     }
     pBox->SetText( aTitle );
-    USHORT nRet = (USHORT)pBox->Execute();
-    if( nRet == TRUE )
+    sal_uInt16 nRet = (sal_uInt16)pBox->Execute();
+    if( nRet == sal_True )
         nRet = 1;
 
-    INT16 nMappedRet;
+    sal_Int16 nMappedRet;
     if( nStyle == 2 )
     {
         nMappedRet = nRet;
@@ -4319,7 +4319,7 @@ RTLFUNC(SetAttr) // JSM
     if ( rPar.Count() == 3 )
     {
         String aStr = rPar.Get(1)->GetString();
-        INT16 nFlags = rPar.Get(2)->GetInteger();
+        sal_Int16 nFlags = rPar.Get(2)->GetInteger();
 
         // <-- UCB
         if( hasUno() )
@@ -4395,7 +4395,7 @@ RTLFUNC(DumpAllObjects)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nArgCount = (USHORT)rPar.Count();
+    sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
     if( nArgCount < 2 || nArgCount > 3 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else if( !pBasic )
@@ -4423,7 +4423,7 @@ RTLFUNC(FileExists)
     if ( rPar.Count() == 2 )
     {
         String aStr = rPar.Get(1)->GetString();
-        BOOL bExists = FALSE;
+        sal_Bool bExists = sal_False;
 
         // <-- UCB
         if( hasUno() )
@@ -4470,10 +4470,10 @@ RTLFUNC(Partition)
         return;
     }
 
-    INT32 nNumber = rPar.Get(1)->GetLong();
-    INT32 nStart = rPar.Get(2)->GetLong();
-    INT32 nStop = rPar.Get(3)->GetLong();
-    INT32 nInterval = rPar.Get(4)->GetLong();
+    sal_Int32 nNumber = rPar.Get(1)->GetLong();
+    sal_Int32 nStart = rPar.Get(2)->GetLong();
+    sal_Int32 nStop = rPar.Get(3)->GetLong();
+    sal_Int32 nInterval = rPar.Get(4)->GetLong();
 
     if( nStart < 0 || nStop <= nStart || nInterval < 1 )
     {
@@ -4490,9 +4490,9 @@ RTLFUNC(Partition)
     // calculate the  maximun number of characters before lowervalue and uppervalue
     ::rtl::OUString aBeforeStart = ::rtl::OUString::valueOf( nStart - 1 );
     ::rtl::OUString aAfterStop = ::rtl::OUString::valueOf( nStop + 1 );
-    INT32 nLen1 = aBeforeStart.getLength();
-    INT32 nLen2 = aAfterStop.getLength();
-    INT32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
+    sal_Int32 nLen1 = aBeforeStart.getLength();
+    sal_Int32 nLen2 = aAfterStop.getLength();
+    sal_Int32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
 
     ::rtl::OUStringBuffer aRetStr( nLen * 2 + 1);
     ::rtl::OUString aLowerValue;
@@ -4507,8 +4507,8 @@ RTLFUNC(Partition)
     }
     else
     {
-        INT32 nLowerValue = nNumber;
-        INT32 nUpperValue = nLowerValue;
+        sal_Int32 nLowerValue = nNumber;
+        sal_Int32 nUpperValue = nLowerValue;
         if( nInterval > 1 )
         {
             nLowerValue = ((( nNumber - nStart ) / nInterval ) * nInterval ) + nStart;
@@ -4525,14 +4525,14 @@ RTLFUNC(Partition)
     if( nLen > nLen1 )
     {
         // appending the leading spaces for the lowervalue
-        for ( INT32 i= (nLen - nLen1) ; i > 0; --i )
+        for ( sal_Int32 i= (nLen - nLen1) ; i > 0; --i )
             aRetStr.appendAscii(" ");
     }
     aRetStr.append( aLowerValue ).appendAscii(":");
     if( nLen > nLen2 )
     {
         // appending the leading spaces for the uppervalue
-        for ( INT32 i= (nLen - nLen2) ; i > 0; --i )
+        for ( sal_Int32 i= (nLen - nLen2) ; i > 0; --i )
             aRetStr.appendAscii(" ");
     }
     aRetStr.append( aUpperValue );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 6b955fed3d8a..2f6d18685803 100755
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -117,13 +117,13 @@ RTLFUNC(CallByName)
     (void)pBasic;
     (void)bWrite;
 
-    const INT16 vbGet       = 2;
-    const INT16 vbLet       = 4;
-    const INT16 vbMethod    = 1;
-    const INT16 vbSet       = 8;
+    const sal_Int16 vbGet       = 2;
+    const sal_Int16 vbLet       = 4;
+    const sal_Int16 vbMethod    = 1;
+    const sal_Int16 vbSet       = 8;
 
     // At least 3 parameter needed plus function itself -> 4
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount < 4 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -150,7 +150,7 @@ RTLFUNC(CallByName)
     String aNameStr = rPar.Get(2)->GetString();
 
     // 3. parameter is CallType
-    INT16 nCallType = rPar.Get(3)->GetInteger();
+    sal_Int16 nCallType = rPar.Get(3)->GetInteger();
 
     //SbxObject* pFindObj = NULL;
     SbxVariable* pFindVar = pObj->Find( aNameStr, SbxCLASS_DONTCARE );
@@ -209,11 +209,11 @@ RTLFUNC(CallByName)
 
                 // Setup parameters
                 SbxArrayRef xArray;
-                USHORT nMethParamCount = nParCount - 4;
+                sal_uInt16 nMethParamCount = nParCount - 4;
                 if( nMethParamCount > 0 )
                 {
                     xArray = new SbxArray;
-                    for( USHORT i = 0 ; i < nMethParamCount ; i++ )
+                    for( sal_uInt16 i = 0 ; i < nMethParamCount ; i++ )
                     {
                         SbxVariable* pPar = rPar.Get( i + 4 );
                         xArray->Put( pPar, i + 1 );
@@ -238,7 +238,7 @@ RTLFUNC(CBool) // JSM
     (void)pBasic;
     (void)bWrite;
 
-    BOOL bVal = FALSE;
+    sal_Bool bVal = sal_False;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -255,7 +255,7 @@ RTLFUNC(CByte) // JSM
     (void)pBasic;
     (void)bWrite;
 
-    BYTE nByte = 0;
+    sal_uInt8 nByte = 0;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -356,7 +356,7 @@ RTLFUNC(CInt)  // JSM
     (void)pBasic;
     (void)bWrite;
 
-    INT16 nVal = 0;
+    sal_Int16 nVal = 0;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -373,7 +373,7 @@ RTLFUNC(CLng)  // JSM
     (void)pBasic;
     (void)bWrite;
 
-    INT32 nVal = 0;
+    sal_Int32 nVal = 0;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -399,7 +399,7 @@ RTLFUNC(CSng)  // JSM
             // AB #41690 , String holen
             double dVal = 0.0;
             String aScanStr = pSbxVariable->GetString();
-            SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/TRUE );
+            SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/sal_True );
             if( SbxBase::GetError() == SbxERR_OK && Error != SbxERR_OK )
                 StarBASIC::Error( Error );
             nVal = (float)dVal;
@@ -454,7 +454,7 @@ RTLFUNC(CVErr)
     (void)pBasic;
     (void)bWrite;
 
-    INT16 nErrCode = 0;
+    sal_Int16 nErrCode = 0;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -525,10 +525,10 @@ RTLFUNC(Red)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
         nRGB &= 0x00FF0000;
         nRGB >>= 16;
-        rPar.Get(0)->PutInteger( (INT16)nRGB );
+        rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
     }
 }
 
@@ -541,10 +541,10 @@ RTLFUNC(Green)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
         nRGB &= 0x0000FF00;
         nRGB >>= 8;
-        rPar.Get(0)->PutInteger( (INT16)nRGB );
+        rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
     }
 }
 
@@ -557,9 +557,9 @@ RTLFUNC(Blue)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
         nRGB &= 0x000000FF;
-        rPar.Get(0)->PutInteger( (INT16)nRGB );
+        rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
     }
 }
 
@@ -569,11 +569,11 @@ RTLFUNC(Switch)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nCount = rPar.Count();
+    sal_uInt16 nCount = rPar.Count();
     if( !(nCount & 0x0001 ))
         // Anzahl der Argumente muss ungerade sein
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
-    USHORT nCurExpr = 1;
+    sal_uInt16 nCurExpr = 1;
     while( nCurExpr < (nCount-1) )
     {
         if( rPar.Get( nCurExpr )->GetBool())
@@ -671,8 +671,8 @@ RTLFUNC(Choose)
 
     if ( rPar.Count() < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
-    INT16 nIndex = rPar.Get(1)->GetInteger();
-    USHORT nCount = rPar.Count();
+    sal_Int16 nIndex = rPar.Get(1)->GetInteger();
+    sal_uInt16 nCount = rPar.Count();
     nCount--;
     if( nCount == 1 || nIndex > (nCount-1) || nIndex < 1 )
     {
@@ -704,7 +704,7 @@ RTLFUNC(GetSolarVersion)
     (void)pBasic;
     (void)bWrite;
 
-    rPar.Get(0)->PutLong( (INT32)SUPD );
+    rPar.Get(0)->PutLong( (sal_Int32)SUPD );
 }
 
 RTLFUNC(TwipsPerPixelX)
@@ -712,7 +712,7 @@ RTLFUNC(TwipsPerPixelX)
     (void)pBasic;
     (void)bWrite;
 
-    INT32 nResult = 0;
+    sal_Int32 nResult = 0;
     Size aSize( 100,0 );
     MapMode aMap( MAP_TWIP );
     OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -729,7 +729,7 @@ RTLFUNC(TwipsPerPixelY)
     (void)pBasic;
     (void)bWrite;
 
-    INT32 nResult = 0;
+    sal_Int32 nResult = 0;
     Size aSize( 0,100 );
     MapMode aMap( MAP_TWIP );
     OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -756,7 +756,7 @@ bool IsBaseIndexOne()
     bool result = false;
     if ( pINST && pINST->pRun )
     {
-        USHORT res = pINST->pRun->GetBase();
+        sal_uInt16 res = pINST->pRun->GetBase();
         if ( res )
             result = true;
     }
@@ -769,7 +769,7 @@ RTLFUNC(Array)
     (void)bWrite;
 
     SbxDimArray* pArray = new SbxDimArray( SbxVARIANT );
-    USHORT nArraySize = rPar.Count() - 1;
+    sal_uInt16 nArraySize = rPar.Count() - 1;
 
     // Option Base zunaechst ignorieren (kennt leider nur der Compiler)
     bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
@@ -786,10 +786,10 @@ RTLFUNC(Array)
     }
 
     // Parameter ins Array uebernehmen
-    // ATTENTION: Using type USHORT for loop variable is
+    // ATTENTION: Using type sal_uInt16 for loop variable is
     // mandatory to workaround a problem with the
     // Solaris Intel compiler optimizer! See i104354
-    for( USHORT i = 0 ; i < nArraySize ; i++ )
+    for( sal_uInt16 i = 0 ; i < nArraySize ; i++ )
     {
         SbxVariable* pVar = rPar.Get(i+1);
         SbxVariable* pNew = new SbxVariable( *pVar );
@@ -802,7 +802,7 @@ RTLFUNC(Array)
 
     // Array zurueckliefern
     SbxVariableRef refVar = rPar.Get(0);
-    USHORT nFlags = refVar->GetFlags();
+    sal_uInt16 nFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
     refVar->PutObject( pArray );
     refVar->SetFlags( nFlags );
@@ -823,12 +823,12 @@ RTLFUNC(DimArray)
     (void)bWrite;
 
     SbxDimArray * pArray = new SbxDimArray( SbxVARIANT );
-    USHORT nArrayDims = rPar.Count() - 1;
+    sal_uInt16 nArrayDims = rPar.Count() - 1;
     if( nArrayDims > 0 )
     {
-        for( USHORT i = 0; i < nArrayDims ; i++ )
+        for( sal_uInt16 i = 0; i < nArrayDims ; i++ )
         {
-            INT32 ub = rPar.Get(i+1)->GetLong();
+            sal_Int32 ub = rPar.Get(i+1)->GetLong();
             if( ub < 0 )
             {
                 StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -842,7 +842,7 @@ RTLFUNC(DimArray)
 
     // Array zurueckliefern
     SbxVariableRef refVar = rPar.Get(0);
-    USHORT nFlags = refVar->GetFlags();
+    sal_uInt16 nFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
     refVar->PutObject( pArray );
     refVar->SetFlags( nFlags );
@@ -961,12 +961,12 @@ RTLFUNC(FindPropertyObject)
 
 
 
-BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
-    BOOL bBinary, short nBlockLen, BOOL bIsArray )
+sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
+    sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
 {
-    ULONG nFPos = pStrm->Tell();
+    sal_uIntPtr nFPos = pStrm->Tell();
 
-    BOOL bIsVariant = !rVar.IsFixed();
+    sal_Bool bIsVariant = !rVar.IsFixed();
     SbxDataType eType = rVar.GetType();
 
     switch( eType )
@@ -975,7 +975,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
         case SbxCHAR:
         case SbxBYTE:
                 if( bIsVariant )
-                    *pStrm << (USHORT)SbxBYTE; // VarType Id
+                    *pStrm << (sal_uInt16)SbxBYTE; // VarType Id
                 *pStrm << rVar.GetByte();
                 break;
 
@@ -987,7 +987,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
         case SbxINT:
         case SbxUINT:
                 if( bIsVariant )
-                    *pStrm << (USHORT)SbxINTEGER; // VarType Id
+                    *pStrm << (sal_uInt16)SbxINTEGER; // VarType Id
                 *pStrm << rVar.GetInteger();
                 break;
 
@@ -996,13 +996,13 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
         case SbxLONG64:
         case SbxULONG64:
                 if( bIsVariant )
-                    *pStrm << (USHORT)SbxLONG; // VarType Id
+                    *pStrm << (sal_uInt16)SbxLONG; // VarType Id
                 *pStrm << rVar.GetLong();
                 break;
 
         case SbxSINGLE:
                 if( bIsVariant )
-                    *pStrm << (USHORT)eType; // VarType Id
+                    *pStrm << (sal_uInt16)eType; // VarType Id
                 *pStrm << rVar.GetSingle();
                 break;
 
@@ -1010,7 +1010,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
         case SbxCURRENCY:
         case SbxDATE:
                 if( bIsVariant )
-                    *pStrm << (USHORT)eType; // VarType Id
+                    *pStrm << (sal_uInt16)eType; // VarType Id
                 *pStrm << rVar.GetDouble();
                 break;
 
@@ -1021,7 +1021,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
                 if( !bBinary || bIsArray )
                 {
                     if( bIsVariant )
-                        *pStrm << (USHORT)SbxSTRING;
+                        *pStrm << (sal_uInt16)SbxSTRING;
                     pStrm->WriteByteString( rStr, gsl_getSystemTextEncoding() );
                     //*pStrm << rStr;
                 }
@@ -1038,31 +1038,31 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
 
         default:
                 StarBASIC::Error( SbERR_BAD_ARGUMENT );
-                return FALSE;
+                return sal_False;
     }
 
     if( nBlockLen )
         pStrm->Seek( nFPos + nBlockLen );
-    return pStrm->GetErrorCode() ? FALSE : TRUE;
+    return pStrm->GetErrorCode() ? sal_False : sal_True;
 }
 
-BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
-    BOOL bBinary, short nBlockLen, BOOL bIsArray )
+sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
+    sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
 {
     (void)bBinary;
     (void)bIsArray;
 
     double aDouble;
 
-    ULONG nFPos = pStrm->Tell();
+    sal_uIntPtr nFPos = pStrm->Tell();
 
-    BOOL bIsVariant = !rVar.IsFixed();
+    sal_Bool bIsVariant = !rVar.IsFixed();
     SbxDataType eVarType = rVar.GetType();
 
     SbxDataType eSrcType = eVarType;
     if( bIsVariant )
     {
-        USHORT nTemp;
+        sal_uInt16 nTemp;
         *pStrm >> nTemp;
         eSrcType = (SbxDataType)nTemp;
     }
@@ -1073,7 +1073,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
         case SbxCHAR:
         case SbxBYTE:
                 {
-                BYTE aByte;
+                sal_uInt8 aByte;
                 *pStrm >> aByte;
                 rVar.PutByte( aByte );
                 }
@@ -1087,7 +1087,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
         case SbxINT:
         case SbxUINT:
                 {
-                INT16 aInt;
+                sal_Int16 aInt;
                 *pStrm >> aInt;
                 rVar.PutInteger( aInt );
                 }
@@ -1098,7 +1098,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
         case SbxLONG64:
         case SbxULONG64:
                 {
-                INT32 aInt;
+                sal_Int32 aInt;
                 *pStrm >> aInt;
                 rVar.PutLong( aInt );
                 }
@@ -1138,23 +1138,23 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
 
         default:
                 StarBASIC::Error( SbERR_BAD_ARGUMENT );
-                return FALSE;
+                return sal_False;
     }
 
     if( nBlockLen )
         pStrm->Seek( nFPos + nBlockLen );
-    return pStrm->GetErrorCode() ? FALSE : TRUE;
+    return pStrm->GetErrorCode() ? sal_False : sal_True;
 }
 
 
 // nCurDim = 1...n
-BOOL lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
-    BOOL bBinary, short nCurDim, short* pOtherDims, BOOL bWrite )
+sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
+    sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite )
 {
     DBG_ASSERT( nCurDim > 0,"Bad Dim");
     short nLower, nUpper;
     if( !rArr.GetDim( nCurDim, nLower, nUpper ) )
-        return FALSE;
+        return sal_False;
     for( short nCur = nLower; nCur <= nUpper; nCur++ )
     {
         pOtherDims[ nCurDim-1 ] = nCur;
@@ -1163,19 +1163,19 @@ BOOL lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
         else
         {
             SbxVariable* pVar = rArr.Get( (const short*)pOtherDims );
-            BOOL bRet;
+            sal_Bool bRet;
             if( bWrite )
-                bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, TRUE );
+                bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, sal_True );
             else
-                bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, TRUE );
+                bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, sal_True );
             if( !bRet )
-                return FALSE;
+                return sal_False;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-void PutGet( SbxArray& rPar, BOOL bPut )
+void PutGet( SbxArray& rPar, sal_Bool bPut )
 {
     // Wir brauchen 3 Parameter
     if ( rPar.Count() != 4 )
@@ -1183,9 +1183,9 @@ void PutGet( SbxArray& rPar, BOOL bPut )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nFileNo = rPar.Get(1)->GetInteger();
+    sal_Int16 nFileNo = rPar.Get(1)->GetInteger();
     SbxVariable* pVar2 = rPar.Get(2);
-    BOOL bHasRecordNo = (BOOL)(pVar2->GetType() != SbxEMPTY);
+    sal_Bool bHasRecordNo = (sal_Bool)(pVar2->GetType() != SbxEMPTY);
     long nRecordNo = pVar2->GetLong();
     if ( nFileNo < 1 || ( bHasRecordNo && nRecordNo < 1 ) )
     {
@@ -1203,7 +1203,7 @@ void PutGet( SbxArray& rPar, BOOL bPut )
     }
 
     SvStream* pStrm = pSbStrm->GetStrm();
-    BOOL bRandom = pSbStrm->IsRandom();
+    sal_Bool bRandom = pSbStrm->IsRandom();
     short nBlockLen = bRandom ? pSbStrm->GetBlockLen() : 0;
 
     if( bPut )
@@ -1215,7 +1215,7 @@ void PutGet( SbxArray& rPar, BOOL bPut )
     // auf die Startposition seeken
     if( bHasRecordNo )
     {
-        ULONG nFilePos = bRandom ? (ULONG)(nBlockLen*nRecordNo) : (ULONG)nRecordNo;
+        sal_uIntPtr nFilePos = bRandom ? (sal_uIntPtr)(nBlockLen*nRecordNo) : (sal_uIntPtr)nRecordNo;
         pStrm->Seek( nFilePos );
     }
 
@@ -1227,11 +1227,11 @@ void PutGet( SbxArray& rPar, BOOL bPut )
         pArr = PTR_CAST(SbxDimArray,pParObj);
     }
 
-    BOOL bRet;
+    sal_Bool bRet;
 
     if( pArr )
     {
-        ULONG nFPos = pStrm->Tell();
+        sal_uIntPtr nFPos = pStrm->Tell();
         short nDims = pArr->GetDims();
         short* pDims = new short[ nDims ];
         bRet = lcl_WriteReadSbxArray(*pArr,pStrm,!bRandom,nDims,pDims,bPut);
@@ -1242,9 +1242,9 @@ void PutGet( SbxArray& rPar, BOOL bPut )
     else
     {
         if( bPut )
-            bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, FALSE);
+            bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False);
         else
-            bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, FALSE);
+            bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False);
     }
     if( !bRet || pStrm->GetErrorCode() )
         StarBASIC::Error( SbERR_IO_ERROR );
@@ -1255,7 +1255,7 @@ RTLFUNC(Put)
     (void)pBasic;
     (void)bWrite;
 
-    PutGet( rPar, TRUE );
+    PutGet( rPar, sal_True );
 }
 
 RTLFUNC(Get)
@@ -1263,7 +1263,7 @@ RTLFUNC(Get)
     (void)pBasic;
     (void)bWrite;
 
-    PutGet( rPar, FALSE );
+    PutGet( rPar, sal_False );
 }
 
 RTLFUNC(Environ)
@@ -1285,7 +1285,7 @@ RTLFUNC(Environ)
     rPar.Get(0)->PutString( aResult );
 }
 
-static double GetDialogZoomFactor( BOOL bX, long nValue )
+static double GetDialogZoomFactor( sal_Bool bX, long nValue )
 {
     OutputDevice* pDevice = Application::GetDefaultDevice();
     double nResult = 0;
@@ -1325,7 +1325,7 @@ RTLFUNC(GetDialogZoomFactorX)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    rPar.Get(0)->PutDouble( GetDialogZoomFactor( TRUE, rPar.Get(1)->GetLong() ));
+    rPar.Get(0)->PutDouble( GetDialogZoomFactor( sal_True, rPar.Get(1)->GetLong() ));
 }
 
 RTLFUNC(GetDialogZoomFactorY)
@@ -1338,7 +1338,7 @@ RTLFUNC(GetDialogZoomFactorY)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    rPar.Get(0)->PutDouble( GetDialogZoomFactor( FALSE, rPar.Get(1)->GetLong()));
+    rPar.Get(0)->PutDouble( GetDialogZoomFactor( sal_False, rPar.Get(1)->GetLong()));
 }
 
 
@@ -1407,7 +1407,7 @@ RTLFUNC(TypeLen)
     else
     {
         SbxDataType eType = rPar.Get(1)->GetType();
-        INT16 nLen = 0;
+        sal_Int16 nLen = 0;
         switch( eType )
         {
             case SbxEMPTY:
@@ -1462,7 +1462,7 @@ RTLFUNC(TypeLen)
             case SbxLPWSTR:
             case SbxCoreSTRING:
             case SbxSTRING:
-                nLen = (INT16)rPar.Get(1)->GetString().Len();
+                nLen = (sal_Int16)rPar.Get(1)->GetString().Len();
                 break;
 
             default:
@@ -1561,7 +1561,7 @@ RTLFUNC(EqualUnoObjects)
 // Instanciate "com.sun.star.awt.UnoControlDialog" on basis
 // of a DialogLibrary entry: Convert from XML-ByteSequence
 // and attach events. Implemented in classes\eventatt.cxx
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
 
 RTLFUNC(CreateUnoDialog)
 {
@@ -1646,7 +1646,7 @@ RTLFUNC(Join)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount != 3 && nParCount != 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1687,7 +1687,7 @@ RTLFUNC(Split)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount < 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1705,7 +1705,7 @@ RTLFUNC(Split)
         else
             aDelim = String::CreateFromAscii( " " );
 
-        INT32 nCount = -1;
+        sal_Int32 nCount = -1;
         if( nParCount == 4 )
             nCount = rPar.Get(3)->GetLong();
 
@@ -1759,7 +1759,7 @@ RTLFUNC(Split)
 
     // Array zurueckliefern
     SbxVariableRef refVar = rPar.Get(0);
-    USHORT nFlags = refVar->GetFlags();
+    sal_uInt16 nFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
     refVar->PutObject( pArray );
     refVar->SetFlags( nFlags );
@@ -1772,7 +1772,7 @@ RTLFUNC(MonthName)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount != 2 && nParCount != 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1788,14 +1788,14 @@ RTLFUNC(MonthName)
     Sequence< CalendarItem > aMonthSeq = xCalendar->getMonths();
     sal_Int32 nMonthCount = aMonthSeq.getLength();
 
-    INT16 nVal = rPar.Get(1)->GetInteger();
+    sal_Int16 nVal = rPar.Get(1)->GetInteger();
     if( nVal < 1 || nVal > nMonthCount )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
 
-    BOOL bAbbreviate = false;
+    sal_Bool bAbbreviate = false;
     if( nParCount == 3 )
         bAbbreviate = rPar.Get(2)->GetBool();
 
@@ -1812,7 +1812,7 @@ RTLFUNC(WeekdayName)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 2 || nParCount > 4 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1827,9 +1827,9 @@ RTLFUNC(WeekdayName)
     }
 
     Sequence< CalendarItem > aDaySeq = xCalendar->getDays();
-    INT16 nDayCount = (INT16)aDaySeq.getLength();
-    INT16 nDay = rPar.Get(1)->GetInteger();
-    INT16 nFirstDay = 0;
+    sal_Int16 nDayCount = (sal_Int16)aDaySeq.getLength();
+    sal_Int16 nDay = rPar.Get(1)->GetInteger();
+    sal_Int16 nFirstDay = 0;
     if( nParCount == 4 )
     {
         nFirstDay = rPar.Get(3)->GetInteger();
@@ -1840,7 +1840,7 @@ RTLFUNC(WeekdayName)
         }
     }
     if( nFirstDay == 0 )
-        nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+        nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
 
     nDay = 1 + (nDay + nDayCount + nFirstDay - 2) % nDayCount;
     if( nDay < 1 || nDay > nDayCount )
@@ -1849,7 +1849,7 @@ RTLFUNC(WeekdayName)
         return;
     }
 
-    BOOL bAbbreviate = false;
+    sal_Bool bAbbreviate = false;
     if( nParCount >= 3 )
     {
         SbxVariable* pPar2 = rPar.Get(2);
@@ -1864,16 +1864,16 @@ RTLFUNC(WeekdayName)
     rPar.Get(0)->PutString( String(aRetStr) );
 }
 
-INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay = 0 )
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 )
 {
     Date aRefDate( 1,1,1900 );
     long nDays = (long) aDate;
     nDays -= 2; // normieren: 1.1.1900 => 0
     aRefDate += nDays;
     DayOfWeek aDay = aRefDate.GetDayOfWeek();
-    INT16 nDay;
+    sal_Int16 nDay;
     if ( aDay != SUNDAY )
-        nDay = (INT16)aDay + 2;
+        nDay = (sal_Int16)aDay + 2;
     else
         nDay = 1;   // 1==Sonntag
 
@@ -1893,7 +1893,7 @@ INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay
                 StarBASIC::Error( SbERR_INTERNAL_ERROR );
                 return 0;
             }
-            nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+            nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
         }
         nDay = 1 + (nDay + 7 - nFirstDay) % 7;
     }
@@ -1905,7 +1905,7 @@ RTLFUNC(Weekday)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -1913,13 +1913,13 @@ RTLFUNC(Weekday)
         double aDate = rPar.Get(1)->GetDate();
 
         bool bFirstDay = false;
-        INT16 nFirstDay = 0;
+        sal_Int16 nFirstDay = 0;
         if ( nParCount > 2 )
         {
             nFirstDay = rPar.Get(2)->GetInteger();
             bFirstDay = true;
         }
-        INT16 nDay = implGetWeekDay( aDate, bFirstDay, nFirstDay );
+        sal_Int16 nDay = implGetWeekDay( aDate, bFirstDay, nFirstDay );
         rPar.Get(0)->PutInteger( nDay );
     }
 }
@@ -1973,7 +1973,7 @@ static IntervalInfo pIntervalTable[] =
 IntervalInfo* getIntervalInfo( const String& rStringCode )
 {
     IntervalInfo* pInfo = NULL;
-    INT16 i = 0;
+    sal_Int16 i = 0;
     while( (pInfo = pIntervalTable + i)->mpStringCode != NULL )
     {
         if( rStringCode.EqualsIgnoreCaseAscii( pInfo->mpStringCode ) )
@@ -1984,30 +1984,30 @@ IntervalInfo* getIntervalInfo( const String& rStringCode )
 }
 
 // From methods.cxx
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet );
-INT16 implGetDateDay( double aDate );
-INT16 implGetDateMonth( double aDate );
-INT16 implGetDateYear( double aDate );
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet );
+sal_Int16 implGetDateDay( double aDate );
+sal_Int16 implGetDateMonth( double aDate );
+sal_Int16 implGetDateYear( double aDate );
 
-INT16 implGetHour( double dDate );
-INT16 implGetMinute( double dDate );
-INT16 implGetSecond( double dDate );
+sal_Int16 implGetHour( double dDate );
+sal_Int16 implGetMinute( double dDate );
+sal_Int16 implGetSecond( double dDate );
 
 
-inline void implGetDayMonthYear( INT16& rnYear, INT16& rnMonth, INT16& rnDay, double dDate )
+inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate )
 {
     rnDay   = implGetDateDay( dDate );
     rnMonth = implGetDateMonth( dDate );
     rnYear  = implGetDateYear( dDate );
 }
 
-inline INT16 limitToINT16( INT32 n32 )
+inline sal_Int16 limitToINT16( sal_Int32 n32 )
 {
     if( n32 > 32767 )
         n32 = 32767;
     else if( n32 < -32768 )
         n32 = -32768;
-    return (INT16)n32;
+    return (sal_Int16)n32;
 }
 
 RTLFUNC(DateAdd)
@@ -2015,7 +2015,7 @@ RTLFUNC(DateAdd)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount != 4 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2030,7 +2030,7 @@ RTLFUNC(DateAdd)
         return;
     }
 
-    INT32 lNumber = rPar.Get(2)->GetLong();
+    sal_Int32 lNumber = rPar.Get(2)->GetLong();
     double dDate = rPar.Get(3)->GetDate();
     double dNewDate = 0;
     if( pInfo->mbSimple )
@@ -2043,15 +2043,15 @@ RTLFUNC(DateAdd)
         // Keep hours, minutes, seconds
         double dHoursMinutesSeconds = dDate - floor( dDate );
 
-        BOOL bOk = TRUE;
-        INT16 nYear, nMonth, nDay;
-        INT16 nTargetYear16 = 0, nTargetMonth = 0;
+        sal_Bool bOk = sal_True;
+        sal_Int16 nYear, nMonth, nDay;
+        sal_Int16 nTargetYear16 = 0, nTargetMonth = 0;
         implGetDayMonthYear( nYear, nMonth, nDay, dDate );
         switch( pInfo->meInterval )
         {
             case INTERVAL_YYYY:
             {
-                INT32 nTargetYear = lNumber + nYear;
+                sal_Int32 nTargetYear = lNumber + nYear;
                 nTargetYear16 = limitToINT16( nTargetYear );
                 nTargetMonth = nMonth;
                 bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, dNewDate );
@@ -2063,20 +2063,20 @@ RTLFUNC(DateAdd)
                 bool bNeg = (lNumber < 0);
                 if( bNeg )
                     lNumber = -lNumber;
-                INT32 nYearsAdd;
-                INT16 nMonthAdd;
+                sal_Int32 nYearsAdd;
+                sal_Int16 nMonthAdd;
                 if( pInfo->meInterval == INTERVAL_Q )
                 {
                     nYearsAdd = lNumber / 4;
-                    nMonthAdd = (INT16)( 3 * (lNumber % 4) );
+                    nMonthAdd = (sal_Int16)( 3 * (lNumber % 4) );
                 }
                 else
                 {
                     nYearsAdd = lNumber / 12;
-                    nMonthAdd = (INT16)( lNumber % 12 );
+                    nMonthAdd = (sal_Int16)( lNumber % 12 );
                 }
 
-                INT32 nTargetYear;
+                sal_Int32 nTargetYear;
                 if( bNeg )
                 {
                     nTargetMonth = nMonth - nMonthAdd;
@@ -2085,7 +2085,7 @@ RTLFUNC(DateAdd)
                         nTargetMonth += 12;
                         nYearsAdd++;
                     }
-                    nTargetYear = (INT32)nYear - nYearsAdd;
+                    nTargetYear = (sal_Int32)nYear - nYearsAdd;
                 }
                 else
                 {
@@ -2095,7 +2095,7 @@ RTLFUNC(DateAdd)
                         nTargetMonth -= 12;
                         nYearsAdd++;
                     }
-                    nTargetYear = (INT32)nYear + nYearsAdd;
+                    nTargetYear = (sal_Int32)nYear + nYearsAdd;
                 }
                 nTargetYear16 = limitToINT16( nTargetYear );
                 bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, dNewDate );
@@ -2107,14 +2107,14 @@ RTLFUNC(DateAdd)
         if( bOk )
         {
             // Overflow?
-            INT16 nNewYear, nNewMonth, nNewDay;
+            sal_Int16 nNewYear, nNewMonth, nNewDay;
             implGetDayMonthYear( nNewYear, nNewMonth, nNewDay, dNewDate );
             if( nNewYear > 9999 || nNewYear < 100 )
             {
                 StarBASIC::Error( SbERR_BAD_ARGUMENT );
                 return;
             }
-            INT16 nCorrectionDay = nDay;
+            sal_Int16 nCorrectionDay = nDay;
             while( nNewMonth > nTargetMonth )
             {
                 nCorrectionDay--;
@@ -2140,7 +2140,7 @@ RTLFUNC(DateDiff)
 
     // DateDiff(interval, date1, date2[, firstdayofweek[, firstweekofyear]])
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 4 || nParCount > 6 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2163,30 +2163,30 @@ RTLFUNC(DateDiff)
     {
         case INTERVAL_YYYY:
         {
-            INT16 nYear1 = implGetDateYear( dDate1 );
-            INT16 nYear2 = implGetDateYear( dDate2 );
+            sal_Int16 nYear1 = implGetDateYear( dDate1 );
+            sal_Int16 nYear2 = implGetDateYear( dDate2 );
             dRet = nYear2 - nYear1;
             break;
         }
         case INTERVAL_Q:
         {
-            INT16 nYear1 = implGetDateYear( dDate1 );
-            INT16 nYear2 = implGetDateYear( dDate2 );
-            INT16 nQ1 = 1 + (implGetDateMonth( dDate1 ) - 1) / 3;
-            INT16 nQ2 = 1 + (implGetDateMonth( dDate2 ) - 1) / 3;
-            INT16 nQGes1 = 4 * nYear1 + nQ1;
-            INT16 nQGes2 = 4 * nYear2 + nQ2;
+            sal_Int16 nYear1 = implGetDateYear( dDate1 );
+            sal_Int16 nYear2 = implGetDateYear( dDate2 );
+            sal_Int16 nQ1 = 1 + (implGetDateMonth( dDate1 ) - 1) / 3;
+            sal_Int16 nQ2 = 1 + (implGetDateMonth( dDate2 ) - 1) / 3;
+            sal_Int16 nQGes1 = 4 * nYear1 + nQ1;
+            sal_Int16 nQGes2 = 4 * nYear2 + nQ2;
             dRet = nQGes2 - nQGes1;
             break;
         }
         case INTERVAL_M:
         {
-            INT16 nYear1 = implGetDateYear( dDate1 );
-            INT16 nYear2 = implGetDateYear( dDate2 );
-            INT16 nMonth1 = implGetDateMonth( dDate1 );
-            INT16 nMonth2 = implGetDateMonth( dDate2 );
-            INT16 nMonthGes1 = 12 * nYear1 + nMonth1;
-            INT16 nMonthGes2 = 12 * nYear2 + nMonth2;
+            sal_Int16 nYear1 = implGetDateYear( dDate1 );
+            sal_Int16 nYear2 = implGetDateYear( dDate2 );
+            sal_Int16 nMonth1 = implGetDateMonth( dDate1 );
+            sal_Int16 nMonth2 = implGetDateMonth( dDate2 );
+            sal_Int16 nMonthGes1 = 12 * nYear1 + nMonth1;
+            sal_Int16 nMonthGes2 = 12 * nYear2 + nMonth2;
             dRet = nMonthGes2 - nMonthGes1;
             break;
         }
@@ -2205,7 +2205,7 @@ RTLFUNC(DateDiff)
             double dDays2 = floor( dDate2 );
             if( pInfo->meInterval == INTERVAL_WW )
             {
-                INT16 nFirstDay = 1;    // Default
+                sal_Int16 nFirstDay = 1;    // Default
                 if( nParCount >= 5 )
                 {
                     nFirstDay = rPar.Get(4)->GetInteger();
@@ -2222,17 +2222,17 @@ RTLFUNC(DateDiff)
                             StarBASIC::Error( SbERR_INTERNAL_ERROR );
                             return;
                         }
-                        nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+                        nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
                     }
                 }
-                INT16 nDay1 = implGetWeekDay( dDate1 );
-                INT16 nDay1_Diff = nDay1 - nFirstDay;
+                sal_Int16 nDay1 = implGetWeekDay( dDate1 );
+                sal_Int16 nDay1_Diff = nDay1 - nFirstDay;
                 if( nDay1_Diff < 0 )
                     nDay1_Diff += 7;
                 dDays1 -= nDay1_Diff;
 
-                INT16 nDay2 = implGetWeekDay( dDate2 );
-                INT16 nDay2_Diff = nDay2 - nFirstDay;
+                sal_Int16 nDay2 = implGetWeekDay( dDate2 );
+                sal_Int16 nDay2_Diff = nDay2 - nFirstDay;
                 if( nDay2_Diff < 0 )
                     nDay2_Diff += 7;
                 dDays2 -= nDay2_Diff;
@@ -2267,7 +2267,7 @@ RTLFUNC(DateDiff)
 }
 
 double implGetDateOfFirstDayInFirstWeek
-    ( INT16 nYear, INT16& nFirstDay, INT16& nFirstWeek, bool* pbError = NULL )
+    ( sal_Int16 nYear, sal_Int16& nFirstDay, sal_Int16& nFirstWeek, bool* pbError = NULL )
 {
     SbError nError = 0;
     if( nFirstDay < 0 || nFirstDay > 7 )
@@ -2293,9 +2293,9 @@ double implGetDateOfFirstDayInFirstWeek
     }
 
     if( nFirstDay == 0 )
-        nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+        nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
 
-    INT16 nFirstWeekMinDays = 0;    // Not used for vbFirstJan1 = default
+    sal_Int16 nFirstWeekMinDays = 0;    // Not used for vbFirstJan1 = default
     if( nFirstWeek == 0 )
     {
         nFirstWeekMinDays = xCalendar->getMinimumNumberOfDaysForFirstWeek();
@@ -2318,14 +2318,14 @@ double implGetDateOfFirstDayInFirstWeek
     implDateSerial( nYear, 1, 1, dBaseDate );
     double dRetDate = dBaseDate;
 
-    INT16 nWeekDay0101 = implGetWeekDay( dBaseDate );
-    INT16 nDayDiff = nWeekDay0101 - nFirstDay;
+    sal_Int16 nWeekDay0101 = implGetWeekDay( dBaseDate );
+    sal_Int16 nDayDiff = nWeekDay0101 - nFirstDay;
     if( nDayDiff < 0 )
         nDayDiff += 7;
 
     if( nFirstWeekMinDays )
     {
-        INT16 nThisWeeksDaysInYearCount = 7 - nDayDiff;
+        sal_Int16 nThisWeeksDaysInYearCount = 7 - nDayDiff;
         if( nThisWeeksDaysInYearCount < nFirstWeekMinDays )
             nDayDiff -= 7;
     }
@@ -2340,7 +2340,7 @@ RTLFUNC(DatePart)
 
     // DatePart(interval, date[,firstdayofweek[, firstweekofyear]])
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 3 || nParCount > 5 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2357,7 +2357,7 @@ RTLFUNC(DatePart)
 
     double dDate = rPar.Get(2)->GetDate();
 
-    INT32 nRet = 0;
+    sal_Int32 nRet = 0;
     switch( pInfo->meInterval )
     {
         case INTERVAL_YYYY:
@@ -2377,10 +2377,10 @@ RTLFUNC(DatePart)
         }
         case INTERVAL_Y:
         {
-            INT16 nYear = implGetDateYear( dDate );
+            sal_Int16 nYear = implGetDateYear( dDate );
             double dBaseDate;
             implDateSerial( nYear, 1, 1, dBaseDate );
-            nRet = 1 + INT32( dDate - dBaseDate );
+            nRet = 1 + sal_Int32( dDate - dBaseDate );
             break;
         }
         case INTERVAL_D:
@@ -2391,7 +2391,7 @@ RTLFUNC(DatePart)
         case INTERVAL_W:
         {
             bool bFirstDay = false;
-            INT16 nFirstDay = 1;    // Default
+            sal_Int16 nFirstDay = 1;    // Default
             if( nParCount >= 4 )
             {
                 nFirstDay = rPar.Get(3)->GetInteger();
@@ -2402,15 +2402,15 @@ RTLFUNC(DatePart)
         }
         case INTERVAL_WW:
         {
-            INT16 nFirstDay = 1;    // Default
+            sal_Int16 nFirstDay = 1;    // Default
             if( nParCount >= 4 )
                 nFirstDay = rPar.Get(3)->GetInteger();
 
-            INT16 nFirstWeek = 1;   // Default
+            sal_Int16 nFirstWeek = 1;   // Default
             if( nParCount == 5 )
                 nFirstWeek = rPar.Get(4)->GetInteger();
 
-            INT16 nYear = implGetDateYear( dDate );
+            sal_Int16 nYear = implGetDateYear( dDate );
             bool bError = false;
             double dYearFirstDay = implGetDateOfFirstDayInFirstWeek( nYear, nFirstDay, nFirstWeek, &bError );
             if( !bError )
@@ -2430,7 +2430,7 @@ RTLFUNC(DatePart)
 
                 // Calculate week
                 double dDiff = dDate - dYearFirstDay;
-                nRet = 1 + INT32( dDiff / 7 );
+                nRet = 1 + sal_Int32( dDiff / 7 );
             }
             break;
         }
@@ -2461,7 +2461,7 @@ RTLFUNC(FormatDateTime)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 2 || nParCount > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2469,7 +2469,7 @@ RTLFUNC(FormatDateTime)
     }
 
     double dDate = rPar.Get(1)->GetDate();
-    INT16 nNamedFormat = 0;
+    sal_Int16 nNamedFormat = 0;
     if( nParCount > 2 )
     {
         nNamedFormat = rPar.Get(2)->GetInteger();
@@ -2519,7 +2519,7 @@ RTLFUNC(FormatDateTime)
             }
 
             LanguageType eLangType = GetpApp()->GetSettings().GetLanguage();
-            ULONG nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
+            sal_uIntPtr nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
             Color* pCol;
             pFormatter->GetOutputString( dDate, nIndex, aRetStr, &pCol );
 
@@ -2564,7 +2564,7 @@ RTLFUNC(Round)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount != 2 && nParCount != 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2583,7 +2583,7 @@ RTLFUNC(Round)
             dVal = -dVal;
         }
 
-        INT16 numdecimalplaces = 0;
+        sal_Int16 numdecimalplaces = 0;
         if( nParCount == 3 )
         {
             numdecimalplaces = rPar.Get(2)->GetInteger();
@@ -2641,7 +2641,7 @@ RTLFUNC(CompatibilityMode)
     (void)bWrite;
 
     bool bEnabled = false;
-    USHORT nCount = rPar.Count();
+    sal_uInt16 nCount = rPar.Count();
     if ( nCount != 1 && nCount != 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
 
@@ -2668,8 +2668,8 @@ RTLFUNC(Input)
         return;
     }
 
-    USHORT nByteCount  = rPar.Get(1)->GetUShort();
-    INT16  nFileNumber = rPar.Get(2)->GetInteger();
+    sal_uInt16 nByteCount  = rPar.Get(1)->GetUShort();
+    sal_Int16  nFileNumber = rPar.Get(2)->GetInteger();
 
     SbiIoSystem* pIosys = pINST->GetIoSystem();
     SbiStream* pSbStrm = pIosys->GetStream( nFileNumber );
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index 663d12fbcd72..032b687b987b 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -34,8 +34,8 @@
 #include "errobject.hxx"
 
 
-// Properties und Methoden legen beim Get (bWrite = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bWrite = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bWrite = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bWrite = sal_True) wird der Wert aus
 // Element 0 gespeichert.
 
 RTLFUNC(Erl)
@@ -59,9 +59,9 @@ RTLFUNC(Err)
     {
         if( bWrite )
         {
-            INT32 nVal = rPar.Get( 0 )->GetLong();
+            sal_Int32 nVal = rPar.Get( 0 )->GetLong();
             if( nVal <= 65535L )
-                StarBASIC::Error( StarBASIC::GetSfxFromVBError( (USHORT) nVal ) );
+                StarBASIC::Error( StarBASIC::GetSfxFromVBError( (sal_uInt16) nVal ) );
         }
         else
             rPar.Get( 0 )->PutLong( StarBASIC::GetVBErrorCode( StarBASIC::GetErrBasic() ) );
@@ -73,7 +73,7 @@ RTLFUNC(False)
     (void)pBasic;
     (void)bWrite;
 
-    rPar.Get(0)->PutBool( FALSE );
+    rPar.Get(0)->PutBool( sal_False );
 }
 
 RTLFUNC(Empty)
@@ -114,7 +114,7 @@ RTLFUNC(True)
     (void)pBasic;
     (void)bWrite;
 
-    rPar.Get( 0 )->PutBool( TRUE );
+    rPar.Get( 0 )->PutBool( sal_True );
 }
 
 RTLFUNC(ATTR_NORMAL)
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index ba7af48c8472..bb8687ee0db6 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -28,10 +28,10 @@
 #include <basic/sbstar.hxx>
 #include "sbtrace.hxx"
 
-#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 #define RTLNAME( name ) &SbRtl_##name
 
-typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, BOOL bWrite );
+typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, sal_Bool bWrite );
 
 // Properties
 
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 62aa639e4c7e..10d25cc2292b 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -59,13 +59,13 @@ bool SbiRuntime::isVBAEnabled()
 }
 
 // #91147 Global reschedule flag
-static BOOL bStaticGlobalEnableReschedule = TRUE;
+static sal_Bool bStaticGlobalEnableReschedule = sal_True;
 
-void StarBASIC::StaticEnableReschedule( BOOL bReschedule )
+void StarBASIC::StaticEnableReschedule( sal_Bool bReschedule )
 {
     bStaticGlobalEnableReschedule = bReschedule;
 }
-void StarBASIC::SetVBAEnabled( BOOL bEnabled )
+void StarBASIC::SetVBAEnabled( sal_Bool bEnabled )
 {
     if ( bDocBasic )
     {
@@ -73,15 +73,15 @@ void StarBASIC::SetVBAEnabled( BOOL bEnabled )
     }
 }
 
-BOOL StarBASIC::isVBAEnabled()
+sal_Bool StarBASIC::isVBAEnabled()
 {
     if ( bDocBasic )
     {
         if( SbiRuntime::isVBAEnabled() )
-            return TRUE;
+            return sal_True;
         return bVBAEnabled;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -253,12 +253,12 @@ SbiRTLData::~SbiRTLData()
 // (siehe auch step2.cxx, SbiRuntime::StepSTMNT() )
 
 // Hilfsfunktion, um den BreakCallLevel gemaess der der Debug-Flags zu ermitteln
-void SbiInstance::CalcBreakCallLevel( USHORT nFlags )
+void SbiInstance::CalcBreakCallLevel( sal_uInt16 nFlags )
 {
     // Break-Flag wegfiltern
-    nFlags &= ~((USHORT)SbDEBUG_BREAK);
+    nFlags &= ~((sal_uInt16)SbDEBUG_BREAK);
 
-    USHORT nRet;
+    sal_uInt16 nRet;
     switch( nFlags )
     {
         case SbDEBUG_STEPINTO:
@@ -291,8 +291,8 @@ SbiInstance::SbiInstance( StarBASIC* p )
     nBreakCallLvl = 0;
     nErr     =
     nErl     = 0;
-    bReschedule = TRUE;
-    bCompatibility = FALSE;
+    bReschedule = sal_True;
+    bCompatibility = sal_False;
 }
 
 SbiInstance::~SbiInstance()
@@ -450,7 +450,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
 {
     if( !bWatchMode )
     {
-        SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+        SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
         if ( !n )
             n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
 
@@ -464,7 +464,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
 
 void SbiInstance::setErrorVB( sal_Int32 nVBNumber, const String& rMsg )
 {
-    SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+    SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
     if( !n )
         n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
 
@@ -515,7 +515,7 @@ SbModule* SbiInstance::GetActiveModule()
         return NULL;
 }
 
-SbMethod* SbiInstance::GetCaller( USHORT nLevel )
+SbMethod* SbiInstance::GetCaller( sal_uInt16 nLevel )
 {
     SbiRuntime* p = pRun;
     while( nLevel-- && p )
@@ -543,7 +543,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth )
 
 // Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes)
 
-SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
+SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, sal_uInt32 nStart )
          : rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ),
            pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), m_nLastTime(0)
 {
@@ -558,11 +558,11 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
     pRestart  = NULL;
     pNext     = NULL;
     pCode     =
-    pStmnt    = (const BYTE* ) pImg->GetCode() + nStart;
+    pStmnt    = (const sal_uInt8* ) pImg->GetCode() + nStart;
     bRun      =
-    bError    = TRUE;
-    bInError  = FALSE;
-    bBlocked  = FALSE;
+    bError    = sal_True;
+    bInError  = sal_False;
+    bBlocked  = sal_False;
     nLine     = 0;
     nCol1     = 0;
     nCol2     = 0;
@@ -615,10 +615,10 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
     refParams->Put( pMeth, 0 );
 
     SbxInfo* pInfo = pMeth ? pMeth->GetInfo() : NULL;
-    USHORT nParamCount = pParams ? pParams->Count() : 1;
+    sal_uInt16 nParamCount = pParams ? pParams->Count() : 1;
     if( nParamCount > 1 )
     {
-        for( USHORT i = 1 ; i < nParamCount ; i++ )
+        for( sal_uInt16 i = 1 ; i < nParamCount ; i++ )
         {
             const SbxParamInfo* p = pInfo ? pInfo->GetParam( i ) : NULL;
 
@@ -626,9 +626,9 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
             if( p && (p->nUserData & PARAM_INFO_PARAMARRAY) != 0 )
             {
                 SbxDimArray* pArray = new SbxDimArray( SbxVARIANT );
-                USHORT nParamArrayParamCount = nParamCount - i;
+                sal_uInt16 nParamArrayParamCount = nParamCount - i;
                 pArray->unoAddDim( 0, nParamArrayParamCount - 1 );
-                for( USHORT j = i ; j < nParamCount ; j++ )
+                for( sal_uInt16 j = i ; j < nParamCount ; j++ )
                 {
                     SbxVariable* v = pParams->Get( j );
                     short nDimIndex = j - i;
@@ -646,16 +646,16 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
 
             SbxVariable* v = pParams->Get( i );
             // Methoden sind immer byval!
-            BOOL bByVal = v->IsA( TYPE(SbxMethod) );
+            sal_Bool bByVal = v->IsA( TYPE(SbxMethod) );
             SbxDataType t = v->GetType();
             if( p )
             {
-                bByVal |= BOOL( ( p->eType & SbxBYREF ) == 0 );
+                bByVal |= sal_Bool( ( p->eType & SbxBYREF ) == 0 );
                 t = (SbxDataType) ( p->eType & 0x0FFF );
 
                 if( !bByVal && t != SbxVARIANT &&
                     (!v->IsFixed() || (SbxDataType)(v->GetType() & 0x0FFF ) != t) )
-                        bByVal = TRUE;
+                        bByVal = sal_True;
             }
             if( bByVal )
             {
@@ -701,7 +701,7 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
 
 // Einen P-Code ausfuehren
 
-BOOL SbiRuntime::Step()
+sal_Bool SbiRuntime::Step()
 {
     if( bRun )
     {
@@ -724,12 +724,12 @@ BOOL SbiRuntime::Step()
         }
 
 #ifdef DBG_TRACE_BASIC
-        UINT32 nPC = ( pCode - (const BYTE* )pImg->GetCode() );
+        sal_uInt32 nPC = ( pCode - (const sal_uInt8* )pImg->GetCode() );
         dbg_traceStep( pMod, nPC, pINST->nCallLvl );
 #endif
 
         SbiOpcode eOp = (SbiOpcode ) ( *pCode++ );
-        UINT32 nOp1, nOp2;
+        sal_uInt32 nOp1, nOp2;
         if( eOp <= SbOP0_END )
         {
             (this->*( aStep0[ eOp ] ) )();
@@ -784,7 +784,7 @@ BOOL SbiRuntime::Step()
             // Im Error Handler? Dann Std-Error
             if ( !bInError )
             {
-                bInError = TRUE;
+                bInError = sal_True;
 
                 if( !bError )           // On Error Resume Next
                     StepRESUME( 1 );
@@ -809,7 +809,7 @@ BOOL SbiRuntime::Step()
                 while( NULL != (pRt = pRt->pNext) )
                 {
                     // Gibt es einen Error-Handler?
-                    if( pRt->bError == FALSE || pRt->pError != NULL )
+                    if( pRt->bError == sal_False || pRt->pError != NULL )
                     {
                         pRtErrHdl = pRt;
                         break;
@@ -832,7 +832,7 @@ BOOL SbiRuntime::Step()
                         // Fehler setzen
                         pRt->nError = err;
                         if( pRt != pRtErrHdl )
-                            pRt->bRun = FALSE;
+                            pRt->bRun = sal_False;
 
                         // In Error-Stack eintragen
                         SbErrorStackEntry *pEntry = new SbErrorStackEntry
@@ -928,7 +928,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
     {
         // TEST, has to be vb here always
 #ifdef DBG_UTIL
-        SbError nTmp = StarBASIC::GetSfxFromVBError( (USHORT)nError );
+        SbError nTmp = StarBASIC::GetSfxFromVBError( (sal_uInt16)nError );
         DBG_ASSERT( nTmp, "No VB error!" );
 #endif
 
@@ -938,7 +938,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
             rMsg = String( RTL_CONSTASCII_USTRINGPARAM("Internal Object Error:") );
     }
     // no num? most likely then it *is* really a vba err
-    USHORT nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
+    sal_uInt16 nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
     sal_Int32 nVBAErrorNumber = ( nVBErrorCode == 0 ) ? nError : nVBErrorCode;
     return nVBAErrorNumber;
 }
@@ -999,7 +999,7 @@ SbxVariableRef SbiRuntime::PopVar()
     return xVar;
 }
 
-BOOL SbiRuntime::ClearExprStack()
+sal_Bool SbiRuntime::ClearExprStack()
 {
     // Achtung: Clear() reicht nicht, da Methods geloescht werden muessen
     while ( nExprLvl )
@@ -1007,7 +1007,7 @@ BOOL SbiRuntime::ClearExprStack()
         PopVar();
     }
     refExprStk->Clear();
-    return FALSE;
+    return sal_False;
 }
 
 // Variable auf dem Expression-Stack holen, ohne sie zu entfernen
@@ -1023,7 +1023,7 @@ SbxVariable* SbiRuntime::GetTOS( short n )
         return new SbxVariable;
     }
 #endif
-    return refExprStk->Get( (USHORT) n );
+    return refExprStk->Get( (sal_uInt16) n );
 }
 
 // Sicherstellen, dass TOS eine temporaere Variable ist
@@ -1041,7 +1041,7 @@ void SbiRuntime::TOSMakeTemp()
 
 // Der GOSUB-Stack nimmt Returnadressen fuer GOSUBs auf
 
-void SbiRuntime::PushGosub( const BYTE* pc )
+void SbiRuntime::PushGosub( const sal_uInt8* pc )
 {
     if( ++nGosubLvl > MAXRECURSION )
         StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
@@ -1248,7 +1248,7 @@ void SbiRuntime::DllCall
       const String& aDLLName,   // Name der DLL
       SbxArray* pArgs,          // Parameter (ab Index 1, kann NULL sein)
       SbxDataType eResType,     // Returnwert
-      BOOL bCDecl )             // TRUE: nach C-Konventionen
+      sal_Bool bCDecl )             // sal_True: nach C-Konventionen
 {
     // No DllCall for "virtual" portal users
     if( needSecurityRestrictions() )
@@ -1275,13 +1275,13 @@ void SbiRuntime::DllCall
         Error( nErr );
     PushVar( pRes );
 }
-USHORT
-SbiRuntime::GetImageFlag( USHORT n ) const
+
+sal_uInt16 SbiRuntime::GetImageFlag( sal_uInt16 n ) const
 {
     return pImg->GetFlag( n );
 }
-USHORT
-SbiRuntime::GetBase()
+
+sal_uInt16 SbiRuntime::GetBase()
 {
     return pImg->GetBase();
 }
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 39f92afdea4a..ecc0dfb3321b 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -66,7 +66,7 @@ struct Methods {
     SbxDataType eType;      // Datentyp
     short       nArgs;      // Argumente und Flags
     RtlCall     pFunc;      // Function Pointer
-    USHORT      nHash;      // Hashcode
+    sal_uInt16      nHash;      // Hashcode
 };
 
 static Methods aMethods[] = {
@@ -673,11 +673,11 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
     if( !pVar )
     {
         // sonst suchen
-        USHORT nHash_ = SbxVariable::MakeHashCode( rName );
+        sal_uInt16 nHash_ = SbxVariable::MakeHashCode( rName );
         Methods* p = aMethods;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         short nIndex = 0;
-        USHORT nSrchMask = _TYPEMASK;
+        sal_uInt16 nSrchMask = _TYPEMASK;
         switch( t )
         {
             case SbxCLASS_METHOD:   nSrchMask = _METHOD; break;
@@ -691,12 +691,12 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
              && ( p->nHash == nHash_ )
              && ( rName.EqualsIgnoreCaseAscii( p->pName ) ) )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 if( p->nArgs & _COMPTMASK )
                 {
                     SbiInstance* pInst = pINST;
                     if( !pInst || !pInst->IsCompatibility() )
-                        bFound = FALSE;
+                        bFound = sal_False;
                 }
                 break;
             }
@@ -726,7 +726,7 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
 }
 
 // SetModified muß bei der RTL abgklemmt werden
-void SbiStdObject::SetModified( BOOL )
+void SbiStdObject::SetModified( sal_Bool )
 {
 }
 
@@ -741,17 +741,17 @@ void SbiStdObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pPar_ = pVar->GetParameters();
-        ULONG t = pHint->GetId();
-        USHORT nCallId = (USHORT) pVar->GetUserData();
+        sal_uIntPtr t = pHint->GetId();
+        sal_uInt16 nCallId = (sal_uInt16) pVar->GetUserData();
         if( nCallId )
         {
             if( t == SBX_HINT_INFOWANTED )
                 pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
             else
             {
-                BOOL bWrite = FALSE;
+                sal_Bool bWrite = sal_False;
                 if( t == SBX_HINT_DATACHANGED )
-                    bWrite = TRUE;
+                    bWrite = sal_True;
                 if( t == SBX_HINT_DATAWANTED || bWrite )
                 {
                     RtlCall p = (RtlCall) aMethods[ nCallId-1 ].pFunc;
@@ -786,7 +786,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx )
     {
         p++;
         String aName_ = String::CreateFromAscii( p->pName );
-        USHORT nFlags_ = ( p->nArgs >> 8 ) & 0x03;
+        sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
         if( p->nArgs & _OPT )
             nFlags_ |= SBX_OPTIONAL;
         pInfo_->AddParam( aName_, p->eType, nFlags_ );
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 94b7973c7e77..29cbf16125c7 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -71,7 +71,7 @@ SbxObject* SbStdFactory::CreateObject( const String& rClassName )
 
 
 
-void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
     {
@@ -80,7 +80,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
     }
 
     GraphicType eType = aGraphic.GetType();
-    INT16 nType = 0;
+    sal_Int16 nType = 0;
 
     if( eType == GRAPHIC_BITMAP )
         nType = 1;
@@ -92,7 +92,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
 }
 
 
-void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
     {
@@ -104,10 +104,10 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite )
     aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
     aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
 
-    pVar->PutInteger( (INT16)aSize.Width() );
+    pVar->PutInteger( (sal_Int16)aSize.Width() );
 }
 
-void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
     {
@@ -119,7 +119,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite )
     aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
     aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
 
-    pVar->PutInteger( (INT16)aSize.Height() );
+    pVar->PutInteger( (sal_Int16)aSize.Height() );
 }
 
 
@@ -169,8 +169,8 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
         SbxVariable* pVar   = pHint->GetVar();
         SbxArray*    pPar_  = pVar->GetParameters();
-        USHORT       nWhich = (USHORT)pVar->GetUserData();
-        BOOL         bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+        sal_uInt16       nWhich = (sal_uInt16)pVar->GetUserData();
+        sal_Bool         bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
 
         // Propteries
         switch( nWhich )
@@ -186,7 +186,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
 //-----------------------------------------------------------------------------
 
-void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetBold( pVar->GetBool() );
@@ -194,7 +194,7 @@ void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, BOOL bWrite )
         pVar->PutBool( IsBold() );
 }
 
-void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetItalic( pVar->GetBool() );
@@ -202,7 +202,7 @@ void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, BOOL bWrite )
         pVar->PutBool( IsItalic() );
 }
 
-void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetStrikeThrough( pVar->GetBool() );
@@ -210,7 +210,7 @@ void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, BOOL bWrite )
         pVar->PutBool( IsStrikeThrough() );
 }
 
-void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetUnderline( pVar->GetBool() );
@@ -218,15 +218,15 @@ void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, BOOL bWrite )
         pVar->PutBool( IsUnderline() );
 }
 
-void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
-        SetSize( (USHORT)pVar->GetInteger() );
+        SetSize( (sal_uInt16)pVar->GetInteger() );
     else
-        pVar->PutInteger( (INT16)GetSize() );
+        pVar->PutInteger( (sal_Int16)GetSize() );
 }
 
-void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetFontName( pVar->GetString() );
@@ -291,8 +291,8 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
         SbxVariable* pVar   = pHint->GetVar();
         SbxArray*    pPar_  = pVar->GetParameters();
-        USHORT       nWhich = (USHORT)pVar->GetUserData();
-        BOOL         bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+        sal_uInt16       nWhich = (sal_uInt16)pVar->GetUserData();
+        sal_Bool         bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
 
         // Propteries
         switch( nWhich )
@@ -348,7 +348,7 @@ sal_Bool TransferableHelperImpl::GetData( const ::com::sun::star::datatransfer::
 }
 */
 
-void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, sal_Bool )
 {
     if( pPar_ && (pPar_->Count() > 1) )
     {
@@ -359,7 +359,7 @@ void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL )
     //Clipboard::Clear();
 }
 
-void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     (void)pVar;
 
@@ -369,7 +369,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
         return;
     }
 
-    USHORT nFormat = pPar_->Get(1)->GetInteger();
+    sal_uInt16 nFormat = pPar_->Get(1)->GetInteger();
     if( !nFormat  || nFormat > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -392,7 +392,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
     */
 }
 
-void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     if( !pPar_ || (pPar_->Count() != 2) )
     {
@@ -400,18 +400,18 @@ void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL )
         return;
     }
 
-    USHORT nFormat = pPar_->Get(1)->GetInteger();
+    sal_uInt16 nFormat = pPar_->Get(1)->GetInteger();
     if( !nFormat  || nFormat > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
 
-    pVar->PutBool( FALSE );
+    pVar->PutBool( sal_False );
     //pVar->PutBool( Clipboard::HasFormat( nFormat ) );
 }
 
-void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     if( pPar_ && (pPar_->Count() > 1) )
     {
@@ -423,7 +423,7 @@ void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
     //pVar->PutString( Clipboard::PasteString() );
 }
 
-void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     (void)pVar;
 
@@ -433,7 +433,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
         return;
     }
 
-    USHORT nFormat = pPar_->Get(2)->GetInteger();
+    sal_uInt16 nFormat = pPar_->Get(2)->GetInteger();
     if( !nFormat  || nFormat > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -457,7 +457,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
     */
 }
 
-void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     (void)pVar;
 
@@ -530,8 +530,8 @@ void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
         SbxVariable* pVar   = pHint->GetVar();
         SbxArray*    pPar_  = pVar->GetParameters();
-        USHORT       nWhich = (USHORT)pVar->GetUserData();
-        BOOL         bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+        sal_uInt16       nWhich = (sal_uInt16)pVar->GetUserData();
+        sal_Bool         bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
 
         // Methods
         switch( nWhich )
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index c686b0ed80ed..43c930e975d2 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -147,7 +147,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
         if( !pTRUE )
         {
             pTRUE = new SbxVariable;
-            pTRUE->PutBool( TRUE );
+            pTRUE->PutBool( sal_True );
             pTRUE->AddRef();
         }
         PushVar( pTRUE );
@@ -157,7 +157,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
         if( !pFALSE )
         {
             pFALSE = new SbxVariable;
-            pFALSE->PutBool( FALSE );
+            pFALSE->PutBool( sal_False );
             pFALSE->AddRef();
         }
         PushVar( pFALSE );
@@ -320,7 +320,7 @@ void SbiRuntime::StepIS()
         eType2 = refVar2->GetType();
     }
 
-    BOOL bRes = BOOL( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
+    sal_Bool bRes = sal_Bool( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
     if ( bVBAEnabled  && !bRes )
         Error( SbERR_INVALID_USAGE_OBJECT );
     bRes = ( bRes && refVar1->GetObject() == refVar2->GetObject() );
@@ -379,11 +379,11 @@ void SbiRuntime::StepPUT()
     SbxVariableRef refVal = PopVar();
     SbxVariableRef refVar = PopVar();
     // Store auf die eigene Methode (innerhalb einer Function)?
-    BOOL bFlagsChanged = FALSE;
-    USHORT n = 0;
+    sal_Bool bFlagsChanged = sal_False;
+    sal_uInt16 n = 0;
     if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
     {
-        bFlagsChanged = TRUE;
+        bFlagsChanged = sal_True;
         n = refVar->GetFlags();
         refVar->SetFlag( SBX_WRITE );
     }
@@ -515,11 +515,11 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
     else
     {
         // Store auf die eigene Methode (innerhalb einer Function)?
-        BOOL bFlagsChanged = FALSE;
-        USHORT n = 0;
+        sal_Bool bFlagsChanged = sal_False;
+        sal_uInt16 n = 0;
         if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
         {
-            bFlagsChanged = TRUE;
+            bFlagsChanged = sal_True;
             n = refVar->GetFlags();
             refVar->SetFlag( SBX_WRITE );
         }
@@ -569,13 +569,13 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
         }
 
         // Handle Dim As New
-        BOOL bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
+        sal_Bool bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
         SbxBaseRef xPrevVarObj;
         if( bDimAsNew )
             xPrevVarObj = refVar->GetObject();
 
         // Handle withevents
-        BOOL bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
+        sal_Bool bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
         if ( bWithEvents )
         {
             Reference< XInterface > xComListener;
@@ -704,14 +704,14 @@ void SbiRuntime::StepLSET()
     else
     {
         // Store auf die eigene Methode (innerhalb einer Function)?
-        USHORT n = refVar->GetFlags();
+        sal_uInt16 n = refVar->GetFlags();
         if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
             refVar->SetFlag( SBX_WRITE );
         String aRefVarString = refVar->GetString();
         String aRefValString = refVal->GetString();
 
-        USHORT nVarStrLen = aRefVarString.Len();
-        USHORT nValStrLen = aRefValString.Len();
+        sal_uInt16 nVarStrLen = aRefVarString.Len();
+        sal_uInt16 nValStrLen = aRefValString.Len();
         String aNewStr;
         if( nVarStrLen > nValStrLen )
         {
@@ -740,14 +740,14 @@ void SbiRuntime::StepRSET()
     else
     {
         // Store auf die eigene Methode (innerhalb einer Function)?
-        USHORT n = refVar->GetFlags();
+        sal_uInt16 n = refVar->GetFlags();
         if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
             refVar->SetFlag( SBX_WRITE );
         String aRefVarString = refVar->GetString();
         String aRefValString = refVal->GetString();
 
-        USHORT nPos = 0;
-        USHORT nVarStrLen = aRefVarString.Len();
+        sal_uInt16 nPos = 0;
+        sal_uInt16 nVarStrLen = aRefVarString.Len();
         if( nVarStrLen > aRefValString.Len() )
         {
             aRefVarString.Fill(nVarStrLen,' ');
@@ -797,10 +797,10 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
         // AB 2.4.1996, auch Arrays ohne Dimensionsangaben zulassen (VB-komp.)
         if( pDims )
         {
-            for( USHORT i = 1; i < pDims->Count(); )
+            for( sal_uInt16 i = 1; i < pDims->Count(); )
             {
-                INT32 lb = pDims->Get( i++ )->GetLong();
-                INT32 ub = pDims->Get( i++ )->GetLong();
+                sal_Int32 lb = pDims->Get( i++ )->GetLong();
+                sal_Int32 ub = pDims->Get( i++ )->GetLong();
                 if( ub < lb )
                     Error( SbERR_OUT_OF_RANGE ), ub = lb;
                 pArray->AddDim32( lb, ub );
@@ -814,7 +814,7 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
             // Uno-Sequences der Laenge 0 eine Dimension anlegen
             pArray->unoAddDim( 0, -1 );
         }
-        USHORT nSavFlags = refVar->GetFlags();
+        sal_uInt16 nSavFlags = refVar->GetFlags();
         refVar->ResetFlag( SBX_FIXED );
         refVar->PutObject( pArray );
         refVar->SetFlags( nSavFlags );
@@ -876,7 +876,7 @@ void SbiRuntime::StepREDIMP()
             short nDimsNew = pNewArray->GetDims();
             short nDimsOld = pOldArray->GetDims();
             short nDims = nDimsNew;
-            BOOL bRangeError = FALSE;
+            sal_Bool bRangeError = sal_False;
 
             // Store dims to use them for copying later
             sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -885,7 +885,7 @@ void SbiRuntime::StepREDIMP()
 
             if( nDimsOld != nDimsNew )
             {
-                bRangeError = TRUE;
+                bRangeError = sal_True;
             }
             else
             {
@@ -902,7 +902,7 @@ void SbiRuntime::StepREDIMP()
                     // All bounds but the last have to be the same
                     if( i < nDims && ( lBoundNew != lBoundOld || uBoundNew != uBoundOld ) )
                     {
-                        bRangeError = TRUE;
+                        bRangeError = sal_True;
                         break;
                     }
                     else
@@ -961,7 +961,7 @@ void SbiRuntime::StepREDIMP_ERASE()
         }
 
         // As in ERASE
-        USHORT nSavFlags = refVar->GetFlags();
+        sal_uInt16 nSavFlags = refVar->GetFlags();
         refVar->ResetFlag( SBX_FIXED );
         refVar->SetType( SbxDataType(eType & 0x0FFF) );
         refVar->SetFlags( nSavFlags );
@@ -976,7 +976,7 @@ void SbiRuntime::StepREDIMP_ERASE()
 
 void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
 {
-    USHORT nSavFlags = refVar->GetFlags();
+    sal_uInt16 nSavFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
     refVar->SetType( SbxDataType(eType & 0x0FFF) );
     refVar->SetFlags( nSavFlags );
@@ -1148,7 +1148,7 @@ void SbiRuntime::StepINPUT()
         // zu fuellen, dann mit einem Stringwert
         if( !pVar->IsFixed() || pVar->IsNumeric() )
         {
-            USHORT nLen = 0;
+            sal_uInt16 nLen = 0;
             if( !pVar->Scan( s, &nLen ) )
             {
                 err = SbxBase::GetError();
@@ -1271,7 +1271,7 @@ void SbiRuntime::StepENDCASE()
 
 void SbiRuntime::StepSTDERROR()
 {
-    pError = NULL; bError = TRUE;
+    pError = NULL; bError = sal_True;
     pInst->aErrorMsg = String();
     pInst->nErr = 0L;
     pInst->nErl = 0;
@@ -1286,14 +1286,14 @@ void SbiRuntime::StepNOERROR()
     pInst->nErl = 0;
     nError = 0L;
     SbxErrObject::getUnoErrObject()->Clear();
-    bError = FALSE;
+    bError = sal_False;
 }
 
 // UP verlassen
 
 void SbiRuntime::StepLEAVE()
 {
-    bRun = FALSE;
+    bRun = sal_False;
         // If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
     if ( bInError && pError )
         SbxErrObject::getUnoErrObject()->Clear();
@@ -1428,7 +1428,7 @@ void SbiRuntime::StepEMPTY()
 void SbiRuntime::StepERROR()
 {
     SbxVariableRef refCode = PopVar();
-    USHORT n = refCode->GetUShort();
+    sal_uInt16 n = refCode->GetUShort();
     SbError error = StarBASIC::GetSfxFromVBError( n );
     if ( bVBAEnabled )
         pInst->Error( error );
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index e23ef864218e..0a9572906cc8 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -43,14 +43,14 @@ bool checkUnoObjectType( SbUnoObject* refVal,
 
 // Laden einer numerischen Konstanten (+ID)
 
-void SbiRuntime::StepLOADNC( UINT32 nOp1 )
+void SbiRuntime::StepLOADNC( sal_uInt32 nOp1 )
 {
     SbxVariable* p = new SbxVariable( SbxDOUBLE );
 
     // #57844 Lokalisierte Funktion benutzen
     String aStr = pImg->GetString( static_cast<short>( nOp1 ) );
     // Auch , zulassen !!!
-    USHORT iComma = aStr.Search( ',' );
+    sal_uInt16 iComma = aStr.Search( ',' );
     if( iComma != STRING_NOTFOUND )
     {
         String aStr1 = aStr.Copy( 0, iComma );
@@ -67,7 +67,7 @@ void SbiRuntime::StepLOADNC( UINT32 nOp1 )
 
 // Laden einer Stringkonstanten (+ID)
 
-void SbiRuntime::StepLOADSC( UINT32 nOp1 )
+void SbiRuntime::StepLOADSC( sal_uInt32 nOp1 )
 {
     SbxVariable* p = new SbxVariable;
     p->PutString( pImg->GetString( static_cast<short>( nOp1 ) ) );
@@ -76,16 +76,16 @@ void SbiRuntime::StepLOADSC( UINT32 nOp1 )
 
 // Immediate Load (+Wert)
 
-void SbiRuntime::StepLOADI( UINT32 nOp1 )
+void SbiRuntime::StepLOADI( sal_uInt32 nOp1 )
 {
     SbxVariable* p = new SbxVariable;
-    p->PutInteger( static_cast<INT16>( nOp1 ) );
+    p->PutInteger( static_cast<sal_Int16>( nOp1 ) );
     PushVar( p );
 }
 
 // Speichern eines named Arguments in Argv (+Arg-Nr ab 1!)
 
-void SbiRuntime::StepARGN( UINT32 nOp1 )
+void SbiRuntime::StepARGN( sal_uInt32 nOp1 )
 {
     if( !refArgv )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -100,13 +100,13 @@ void SbiRuntime::StepARGN( UINT32 nOp1 )
 
 // Konvertierung des Typs eines Arguments in Argv fuer DECLARE-Fkt. (+Typ)
 
-void SbiRuntime::StepARGTYP( UINT32 nOp1 )
+void SbiRuntime::StepARGTYP( sal_uInt32 nOp1 )
 {
     if( !refArgv )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
     else
     {
-        BOOL bByVal = (nOp1 & 0x8000) != 0;         // Ist BYVAL verlangt?
+        sal_Bool bByVal = (nOp1 & 0x8000) != 0;         // Ist BYVAL verlangt?
         SbxDataType t = (SbxDataType) (nOp1 & 0x7FFF);
         SbxVariable* pVar = refArgv->Get( refArgv->Count() - 1 );   // letztes Arg
 
@@ -145,7 +145,7 @@ void SbiRuntime::StepARGTYP( UINT32 nOp1 )
 
 // String auf feste Laenge bringen (+Laenge)
 
-void SbiRuntime::StepPAD( UINT32 nOp1 )
+void SbiRuntime::StepPAD( sal_uInt32 nOp1 )
 {
     SbxVariable* p = GetTOS();
     String& s = (String&)(const String&) *p;
@@ -157,20 +157,20 @@ void SbiRuntime::StepPAD( UINT32 nOp1 )
 
 // Sprung (+Target)
 
-void SbiRuntime::StepJUMP( UINT32 nOp1 )
+void SbiRuntime::StepJUMP( sal_uInt32 nOp1 )
 {
 #ifdef DBG_UTIL
     // #QUESTION shouln't this be
-    // if( (BYTE*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
+    // if( (sal_uInt8*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
     if( nOp1 >= pImg->GetCodeSize() )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
 #endif
-    pCode = (const BYTE*) pImg->GetCode() + nOp1;
+    pCode = (const sal_uInt8*) pImg->GetCode() + nOp1;
 }
 
 // TOS auswerten, bedingter Sprung (+Target)
 
-void SbiRuntime::StepJUMPT( UINT32 nOp1 )
+void SbiRuntime::StepJUMPT( sal_uInt32 nOp1 )
 {
     SbxVariableRef p = PopVar();
     if( p->GetBool() )
@@ -179,7 +179,7 @@ void SbiRuntime::StepJUMPT( UINT32 nOp1 )
 
 // TOS auswerten, bedingter Sprung (+Target)
 
-void SbiRuntime::StepJUMPF( UINT32 nOp1 )
+void SbiRuntime::StepJUMPF( sal_uInt32 nOp1 )
 {
     SbxVariableRef p = PopVar();
     if( !p->GetBool() )
@@ -194,36 +194,36 @@ void SbiRuntime::StepJUMPF( UINT32 nOp1 )
 // ...
 //Falls im Operanden 0x8000 gesetzt ist, Returnadresse pushen (ON..GOSUB)
 
-void SbiRuntime::StepONJUMP( UINT32 nOp1 )
+void SbiRuntime::StepONJUMP( sal_uInt32 nOp1 )
 {
     SbxVariableRef p = PopVar();
-    INT16 n = p->GetInteger();
+    sal_Int16 n = p->GetInteger();
     if( nOp1 & 0x8000 )
     {
         nOp1 &= 0x7FFF;
         //PushGosub( pCode + 3 * nOp1 );
         PushGosub( pCode + 5 * nOp1 );
     }
-    if( n < 1 || static_cast<UINT32>(n) > nOp1 )
-        n = static_cast<INT16>( nOp1 + 1 );
-    //nOp1 = (UINT32) ( (const char*) pCode - pImg->GetCode() ) + 3 * --n;
-    nOp1 = (UINT32) ( (const char*) pCode - pImg->GetCode() ) + 5 * --n;
+    if( n < 1 || static_cast<sal_uInt32>(n) > nOp1 )
+        n = static_cast<sal_Int16>( nOp1 + 1 );
+    //nOp1 = (sal_uInt32) ( (const char*) pCode - pImg->GetCode() ) + 3 * --n;
+    nOp1 = (sal_uInt32) ( (const char*) pCode - pImg->GetCode() ) + 5 * --n;
     StepJUMP( nOp1 );
 }
 
 // UP-Aufruf (+Target)
 
-void SbiRuntime::StepGOSUB( UINT32 nOp1 )
+void SbiRuntime::StepGOSUB( sal_uInt32 nOp1 )
 {
     PushGosub( pCode );
     if( nOp1 >= pImg->GetCodeSize() )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
-    pCode = (const BYTE*) pImg->GetCode() + nOp1;
+    pCode = (const sal_uInt8*) pImg->GetCode() + nOp1;
 }
 
 // UP-Return (+0 oder Target)
 
-void SbiRuntime::StepRETURN( UINT32 nOp1 )
+void SbiRuntime::StepRETURN( sal_uInt32 nOp1 )
 {
     PopGosub();
     if( nOp1 )
@@ -232,7 +232,7 @@ void SbiRuntime::StepRETURN( UINT32 nOp1 )
 
 // FOR-Variable testen (+Endlabel)
 
-void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
+void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 )
 {
     if( !pForStk )
     {
@@ -295,7 +295,7 @@ void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
         {
             BasicCollection* pCollection = (BasicCollection*)(SbxVariable*)pForStk->refEnd;
             SbxArrayRef xItemArray = pCollection->xItemArray;
-            INT32 nCount = xItemArray->Count32();
+            sal_Int32 nCount = xItemArray->Count32();
             if( pForStk->nCurCollectionIndex < nCount )
             {
                 SbxVariable* pRes = xItemArray->Get32( pForStk->nCurCollectionIndex );
@@ -334,7 +334,7 @@ void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
 
 // Tos+1 <= Tos+2 <= Tos, 2xremove (+Target)
 
-void SbiRuntime::StepCASETO( UINT32 nOp1 )
+void SbiRuntime::StepCASETO( sal_uInt32 nOp1 )
 {
     if( !refCaseStk || !refCaseStk->Count() )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -350,9 +350,9 @@ void SbiRuntime::StepCASETO( UINT32 nOp1 )
 
 // Fehler-Handler
 
-void SbiRuntime::StepERRHDL( UINT32 nOp1 )
+void SbiRuntime::StepERRHDL( sal_uInt32 nOp1 )
 {
-    const BYTE* p = pCode;
+    const sal_uInt8* p = pCode;
     StepJUMP( nOp1 );
     pError = pCode;
     pCode = p;
@@ -365,7 +365,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 )
 
 // Resume nach Fehlern (+0=statement, 1=next or Label)
 
-void SbiRuntime::StepRESUME( UINT32 nOp1 )
+void SbiRuntime::StepRESUME( sal_uInt32 nOp1 )
 {
     // AB #32714 Resume ohne Error? -> Fehler
     if( !bInError )
@@ -376,8 +376,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
     if( nOp1 )
     {
         // Code-Zeiger auf naechstes Statement setzen
-        USHORT n1, n2;
-        pCode = pMod->FindNextStmnt( pErrCode, n1, n2, TRUE, pImg );
+        sal_uInt16 n1, n2;
+        pCode = pMod->FindNextStmnt( pErrCode, n1, n2, sal_True, pImg );
     }
     else
         pCode = pErrStmnt;
@@ -390,7 +390,7 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
     pInst->nErr = 0;
     pInst->nErl = 0;
     nError = 0;
-    bInError = FALSE;
+    bInError = sal_False;
 
     // Error-Stack loeschen
     SbErrorStack*& rErrStack = GetSbData()->pErrStack;
@@ -399,7 +399,7 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
 }
 
 // Kanal schliessen (+Kanal, 0=Alle)
-void SbiRuntime::StepCLOSE( UINT32 nOp1 )
+void SbiRuntime::StepCLOSE( sal_uInt32 nOp1 )
 {
     SbError err;
     if( !nOp1 )
@@ -418,7 +418,7 @@ void SbiRuntime::StepCLOSE( UINT32 nOp1 )
 
 // Zeichen ausgeben (+char)
 
-void SbiRuntime::StepPRCHAR( UINT32 nOp1 )
+void SbiRuntime::StepPRCHAR( sal_uInt32 nOp1 )
 {
     ByteString s( (char) nOp1 );
     pIosys->Write( s );
@@ -509,7 +509,7 @@ bool SbiRuntime::checkClass_Impl( const SbxVariableRef& refVal,
     return bOk;
 }
 
-void SbiRuntime::StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt )
+void SbiRuntime::StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt )
 {
     SbxVariableRef refVal = PopVar();
     SbxVariableRef refVar = PopVar();
@@ -520,17 +520,17 @@ void SbiRuntime::StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt )
         StepSET_Impl( refVal, refVar, bHandleDflt ); // don't do handle dflt prop for a "proper" set
 }
 
-void SbiRuntime::StepVBASETCLASS( UINT32 nOp1 )
+void SbiRuntime::StepVBASETCLASS( sal_uInt32 nOp1 )
 {
     StepSETCLASS_impl( nOp1, false );
 }
 
-void SbiRuntime::StepSETCLASS( UINT32 nOp1 )
+void SbiRuntime::StepSETCLASS( sal_uInt32 nOp1 )
 {
     StepSETCLASS_impl( nOp1, true );
 }
 
-void SbiRuntime::StepTESTCLASS( UINT32 nOp1 )
+void SbiRuntime::StepTESTCLASS( sal_uInt32 nOp1 )
 {
     SbxVariableRef xObjVal = PopVar();
     String aClass( pImg->GetString( static_cast<short>( nOp1 ) ) );
@@ -544,7 +544,7 @@ void SbiRuntime::StepTESTCLASS( UINT32 nOp1 )
 
 // Library fuer anschliessenden Declare-Call definieren
 
-void SbiRuntime::StepLIB( UINT32 nOp1 )
+void SbiRuntime::StepLIB( sal_uInt32 nOp1 )
 {
     aLibName = pImg->GetString( static_cast<short>( nOp1 ) );
 }
@@ -553,14 +553,14 @@ void SbiRuntime::StepLIB( UINT32 nOp1 )
 // Dieser Opcode wird vor DIM/REDIM-Anweisungen gepusht,
 // wenn nur ein Index angegeben wurde.
 
-void SbiRuntime::StepBASED( UINT32 nOp1 )
+void SbiRuntime::StepBASED( sal_uInt32 nOp1 )
 {
     SbxVariable* p1 = new SbxVariable;
     SbxVariableRef x2 = PopVar();
 
     // #109275 Check compatiblity mode
     bool bCompatible = ((nOp1 & 0x8000) != 0);
-    USHORT uBase = static_cast<USHORT>(nOp1 & 1);       // Can only be 0 or 1
+    sal_uInt16 uBase = static_cast<sal_uInt16>(nOp1 & 1);       // Can only be 0 or 1
     p1->PutInteger( uBase );
     if( !bCompatible )
         x2->Compute( SbxPLUS, *p1 );
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 64a9d86ab940..02b22a35b732 100755
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -58,7 +58,7 @@ SbxVariable* getVBAConstant( const String& rName );
 // 0x8000 - Argv ist belegt
 
 SbxVariable* SbiRuntime::FindElement
-    ( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
+    ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
 {
     bool bIsVBAInterOp = SbiRuntime::isVBAEnabled();
     if( bIsVBAInterOp )
@@ -76,7 +76,7 @@ SbxVariable* SbiRuntime::FindElement
     }
     else
     {
-        BOOL bFatalError = FALSE;
+        sal_Bool bFatalError = sal_False;
         SbxDataType t = (SbxDataType) nOp2;
         String aName( pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) ) );
         // Hacky capture of Evaluate [] syntax
@@ -109,8 +109,8 @@ SbxVariable* SbiRuntime::FindElement
         if( !pElem )
         {
             // Die RTL brauchen wir nicht mehr zu durchsuchen!
-            BOOL bSave = rBasic.bNoRtl;
-            rBasic.bNoRtl = TRUE;
+            sal_Bool bSave = rBasic.bNoRtl;
+            rBasic.bNoRtl = sal_True;
             pElem = pObj->Find( aName, SbxCLASS_DONTCARE );
 
             // #110004, #112015: Make private really private
@@ -181,14 +181,14 @@ SbxVariable* SbiRuntime::FindElement
                 // Nicht da und nicht im Objekt?
                 // Hat das Ding Parameter, nicht einrichten!
                 if( nOp1 & 0x8000 )
-                    bFatalError = TRUE;
+                    bFatalError = sal_True;
                     // ALT: StarBASIC::FatalError( nNotFound );
 
                 // Sonst, falls keine Parameter sind, anderen Error Code verwenden
                 if( !bLocal || pImg->GetFlag( SBIMG_EXPLICIT ) )
                 {
                     // #39108 Bei explizit und als ELEM immer ein Fatal Error
-                    bFatalError = TRUE;
+                    bFatalError = sal_True;
 
                     // Falls keine Parameter sind, anderen Error Code verwenden
                     if( !( nOp1 & 0x8000 ) && nNotFound == SbERR_PROC_UNDEFINED )
@@ -233,19 +233,19 @@ SbxVariable* SbiRuntime::FindElement
         {
             // Soll der Typ konvertiert werden?
             SbxDataType t2 = pElem->GetType();
-            BOOL bSet = FALSE;
+            sal_Bool bSet = sal_False;
             if( !( pElem->GetFlags() & SBX_FIXED ) )
             {
                 if( t != SbxVARIANT && t != t2 &&
                     t >= SbxINTEGER && t <= SbxSTRING )
-                    pElem->SetType( t ), bSet = TRUE;
+                    pElem->SetType( t ), bSet = sal_True;
             }
             // pElem auf eine Ref zuweisen, um ggf. eine Temp-Var zu loeschen
             SbxVariableRef refTemp = pElem;
 
             // Moegliche Reste vom letzten Aufruf der SbxMethod beseitigen
             // Vorher Schreiben freigeben, damit kein Error gesetzt wird.
-            USHORT nSavFlags = pElem->GetFlags();
+            sal_uInt16 nSavFlags = pElem->GetFlags();
             pElem->SetFlag( SBX_READWRITE | SBX_NO_BROADCAST );
             pElem->SbxValue::Clear();
             pElem->SetFlags( nSavFlags );
@@ -314,8 +314,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
         SbxInfo* pInfo = pMeth->GetInfo();
         if( pInfo && refParams )
         {
-            USHORT nParamCount = refParams->Count();
-            USHORT j = 1;
+            sal_uInt16 nParamCount = refParams->Count();
+            sal_uInt16 j = 1;
             const SbxParamInfo* pParam = pInfo->GetParam( j );
             while( pParam )
             {
@@ -342,8 +342,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
     if( !pElem )
     {
         // RTL nicht durchsuchen!
-        BOOL bSave = rBasic.bNoRtl;
-        rBasic.bNoRtl = TRUE;
+        sal_Bool bSave = rBasic.bNoRtl;
+        rBasic.bNoRtl = sal_True;
         pElem = pMod->Find( rName, SbxCLASS_DONTCARE );
         rBasic.bNoRtl = bSave;
     }
@@ -355,20 +355,20 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
 // Dabei auch die Argumente umsetzen, falls benannte Parameter
 // verwendet wurden
 
-void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
+void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 )
 {
     if( nOp1 & 0x8000 )
     {
         if( !refArgv )
             StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
-        BOOL bHasNamed = FALSE;
-        USHORT i;
-        USHORT nArgCount = refArgv->Count();
+        sal_Bool bHasNamed = sal_False;
+        sal_uInt16 i;
+        sal_uInt16 nArgCount = refArgv->Count();
         for( i = 1 ; i < nArgCount ; i++ )
         {
             if( refArgv->GetAlias( i ).Len() )
             {
-                bHasNamed = TRUE; break;
+                bHasNamed = sal_True; break;
             }
         }
         if( bHasNamed )
@@ -395,7 +395,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
                         {
                             bError_ = false;
 
-                            USHORT nCurPar = 1;
+                            sal_uInt16 nCurPar = 1;
                             AutomationNamedArgsSbxArray* pArg =
                                 new AutomationNamedArgsSbxArray( nArgCount );
                             ::rtl::OUString* pNames = pArg->getNames().getArray();
@@ -444,7 +444,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
             }
             else
             {
-                USHORT nCurPar = 1;
+                sal_uInt16 nCurPar = 1;
                 SbxArray* pArg = new SbxArray;
                 for( i = 1 ; i < nArgCount ; i++ )
                 {
@@ -453,7 +453,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
                     if( rName.Len() )
                     {
                         // nCurPar wird auf den gefundenen Parameter gesetzt
-                        USHORT j = 1;
+                        sal_uInt16 j = 1;
                         const SbxParamInfo* pParam = pInfo->GetParam( j );
                         while( pParam )
                         {
@@ -544,7 +544,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
                             // Haben wir Index-Access?
                             if( xIndexAccess.is() )
                             {
-                                UINT32 nParamCount = (UINT32)pPar->Count() - 1;
+                                sal_uInt32 nParamCount = (sal_uInt32)pPar->Count() - 1;
                                 if( nParamCount != 1 )
                                 {
                                     StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -552,7 +552,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
                                 }
 
                                 // Index holen
-                                INT32 nIndex = pPar->Get( 1 )->GetLong();
+                                sal_Int32 nIndex = pPar->Get( 1 )->GetLong();
                                 Reference< XInterface > xRet;
                                 try
                                 {
@@ -635,13 +635,13 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
 
 // Laden eines Elements aus der Runtime-Library (+StringID+Typ)
 
-void SbiRuntime::StepRTL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, FALSE ) );
+    PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_False ) );
 }
 
 void
-SbiRuntime::StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
+SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
 {
     if( !refLocals )
         refLocals = new SbxArray;
@@ -649,34 +649,34 @@ SbiRuntime::StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nN
 }
 // Laden einer lokalen/globalen Variablen (+StringID+Typ)
 
-void SbiRuntime::StepFIND( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
 }
 
 // Search inside a class module (CM) to enable global search in time
-void SbiRuntime::StepFIND_CM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_CM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
 
     SbClassModuleObject* pClassModuleObject = PTR_CAST(SbClassModuleObject,pMod);
     if( pClassModuleObject )
         pMod->SetFlag( SBX_GBLSEARCH );
 
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
 
     if( pClassModuleObject )
         pMod->ResetFlag( SBX_GBLSEARCH );
 }
 
-void SbiRuntime::StepFIND_STATIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_STATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE, TRUE );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True, sal_True );
 }
 
 // Laden eines Objekt-Elements (+StringID+Typ)
 // Das Objekt liegt auf TOS
 
-void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepELEM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     // Liegt auf dem TOS ein Objekt?
     SbxVariableRef pObjVar = PopVar();
@@ -695,7 +695,7 @@ void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
     if( pObj )
         SaveRef( (SbxVariable*)pObj );
 
-    PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, FALSE ) );
+    PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, sal_False ) );
 }
 
 // Laden eines Parameters (+Offset+Typ)
@@ -703,17 +703,17 @@ void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
 // Der Datentyp SbxEMPTY zeigt an, daa kein Parameter angegeben ist.
 // Get( 0 ) darf EMPTY sein
 
-void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    USHORT i = static_cast<USHORT>( nOp1 & 0x7FFF );
+    sal_uInt16 i = static_cast<sal_uInt16>( nOp1 & 0x7FFF );
     SbxDataType t = (SbxDataType) nOp2;
     SbxVariable* p;
 
     // #57915 Missing sauberer loesen
-    USHORT nParamCount = refParams->Count();
+    sal_uInt16 nParamCount = refParams->Count();
     if( i >= nParamCount )
     {
-        INT16 iLoop = i;
+        sal_Int16 iLoop = i;
         while( iLoop >= nParamCount )
         {
             p = new SbxVariable();
@@ -739,7 +739,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
     //if( p->GetType() == SbxEMPTY && ( i ) )
     {
         // Wenn ein Parameter fehlt, kann er OPTIONAL sein
-        BOOL bOpt = FALSE;
+        sal_Bool bOpt = sal_False;
         if( pMeth )
         {
             SbxInfo* pInfo = pMeth->GetInfo();
@@ -749,7 +749,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
                 if( pParam && ( (pParam->nFlags & SBX_OPTIONAL) != 0 ) )
                 {
                     // Default value?
-                    USHORT nDefaultId = sal::static_int_cast< USHORT >(
+                    sal_uInt16 nDefaultId = sal::static_int_cast< sal_uInt16 >(
                         pParam->nUserData & 0xffff );
                     if( nDefaultId > 0 )
                     {
@@ -758,11 +758,11 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
                         p->PutString( aDefaultStr );
                         refParams->Put( p, i );
                     }
-                    bOpt = TRUE;
+                    bOpt = sal_True;
                 }
             }
         }
-        if( bOpt == FALSE )
+        if( bOpt == sal_False )
             Error( SbERR_NOT_OPTIONAL );
     }
     else if( t != SbxVARIANT && (SbxDataType)(p->GetType() & 0x0FFF ) != t )
@@ -778,7 +778,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
 
 // Case-Test (+True-Target+Test-Opcode)
 
-void SbiRuntime::StepCASEIS( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCASEIS( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( !refCaseStk || !refCaseStk->Count() )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -794,13 +794,13 @@ void SbiRuntime::StepCASEIS( UINT32 nOp1, UINT32 nOp2 )
 // Aufruf einer DLL-Prozedur (+StringID+Typ)
 // Auch hier zeigt das MSB des StringIDs an, dass Argv belegt ist
 
-void SbiRuntime::StepCALL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCALL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aName = pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) );
     SbxArray* pArgs = NULL;
     if( nOp1 & 0x8000 )
         pArgs = refArgv;
-    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, FALSE );
+    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_False );
     aLibName = String();
     if( nOp1 & 0x8000 )
         PopArgv();
@@ -809,13 +809,13 @@ void SbiRuntime::StepCALL( UINT32 nOp1, UINT32 nOp2 )
 // Aufruf einer DLL-Prozedur nach CDecl (+StringID+Typ)
 // Auch hier zeigt das MSB des StringIDs an, dass Argv belegt ist
 
-void SbiRuntime::StepCALLC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCALLC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aName = pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) );
     SbxArray* pArgs = NULL;
     if( nOp1 & 0x8000 )
         pArgs = refArgv;
-    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, TRUE );
+    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_True );
     aLibName = String();
     if( nOp1 & 0x8000 )
         PopArgv();
@@ -824,14 +824,14 @@ void SbiRuntime::StepCALLC( UINT32 nOp1, UINT32 nOp2 )
 
 // Beginn eines Statements (+Line+Col)
 
-void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepSTMNT( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     // Wenn der Expr-Stack am Anfang einen Statements eine Variable enthaelt,
     // hat ein Trottel X als Funktion aufgerufen, obwohl es eine Variable ist!
-    BOOL bFatalExpr = FALSE;
+    sal_Bool bFatalExpr = sal_False;
     String sUnknownMethodName;
     if( nExprLvl > 1 )
-        bFatalExpr = TRUE;
+        bFatalExpr = sal_True;
     else if( nExprLvl )
     {
         SbxVariable* p = refExprStk->Get( 0 );
@@ -839,7 +839,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
          && refLocals.Is() && refLocals->Find( p->GetName(), p->GetClass() ) )
         {
             sUnknownMethodName = p->GetName();
-            bFatalExpr = TRUE;
+            bFatalExpr = sal_True;
         }
     }
     // Der Expr-Stack ist nun nicht mehr notwendig
@@ -859,7 +859,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
         return;
     }
     pStmnt = pCode - 9;
-    USHORT nOld = nLine;
+    sal_uInt16 nOld = nLine;
     nLine = static_cast<short>( nOp1 );
 
     // #29955 & 0xFF, um for-Schleifen-Ebene wegzufiltern
@@ -871,8 +871,8 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
     // around the final column of this statement to set
 
     nCol2 = 0xffff;
-    USHORT n1, n2;
-    const BYTE* p = pMod->FindNextStmnt( pCode, n1, n2 );
+    sal_uInt16 n1, n2;
+    const sal_uInt8* p = pMod->FindNextStmnt( pCode, n1, n2 );
     if( p )
     {
         if( n1 == nOp1 )
@@ -886,7 +886,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
     if( !bInError )
     {
         // (Bei Sprüngen aus Schleifen tritt hier eine Differenz auf)
-        USHORT nExspectedForLevel = static_cast<USHORT>( nOp2 / 0x100 );
+        sal_uInt16 nExspectedForLevel = static_cast<sal_uInt16>( nOp2 / 0x100 );
         if( pGosubStk )
             nExspectedForLevel = nExspectedForLevel + pGosubStk->nStartForLvl;
 
@@ -902,7 +902,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
     //if( nFlags & SbDEBUG_STEPINTO )
     {
         StarBASIC* pStepBasic = GetCurrentBasic( &rBasic );
-        USHORT nNewFlags = pStepBasic->StepPoint( nLine, nCol1, nCol2 );
+        sal_uInt16 nNewFlags = pStepBasic->StepPoint( nLine, nCol1, nCol2 );
 
         // Neuen BreakCallLevel ermitteln
         pInst->CalcBreakCallLevel( nNewFlags );
@@ -911,10 +911,10 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
     // Breakpoints nur bei STMNT-Befehlen in neuer Zeile!
     else if( ( nOp1 != nOld )
         && ( nFlags & SbDEBUG_BREAK )
-        && pMod->IsBP( static_cast<USHORT>( nOp1 ) ) )
+        && pMod->IsBP( static_cast<sal_uInt16>( nOp1 ) ) )
     {
         StarBASIC* pBreakBasic = GetCurrentBasic( &rBasic );
-        USHORT nNewFlags = pBreakBasic->BreakPoint( nLine, nCol1, nCol2 );
+        sal_uInt16 nNewFlags = pBreakBasic->BreakPoint( nLine, nCol1, nCol2 );
 
         // Neuen BreakCallLevel ermitteln
         pInst->CalcBreakCallLevel( nNewFlags );
@@ -929,7 +929,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
 //        Kanalnummer
 //        Dateiname
 
-void SbiRuntime::StepOPEN( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepOPEN( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     SbxVariableRef pName = PopVar();
     SbxVariableRef pChan = PopVar();
@@ -944,7 +944,7 @@ void SbiRuntime::StepOPEN( UINT32 nOp1, UINT32 nOp2 )
 
 // Objekt kreieren (+StringID+StringID)
 
-void SbiRuntime::StepCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aClass( pImg->GetString( static_cast<short>( nOp2 ) ) );
     SbxObject *pObj = SbxBase::CreateObject( aClass );
@@ -962,12 +962,12 @@ void SbiRuntime::StepCREATE( UINT32 nOp1, UINT32 nOp2 )
     }
 }
 
-void SbiRuntime::StepDCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     StepDCREATE_IMPL( nOp1, nOp2 );
 }
 
-void SbiRuntime::StepDCREATE_REDIMP( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE_REDIMP( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     StepDCREATE_IMPL( nOp1, nOp2 );
 }
@@ -994,7 +994,7 @@ void implCopyDimArray_DCREATE( SbxDimArray* pNewArray, SbxDimArray* pOldArray, s
 }
 
 // #56204 Objekt-Array kreieren (+StringID+StringID), DCREATE == Dim-Create
-void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     SbxVariableRef refVar = PopVar();
 
@@ -1016,11 +1016,11 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
 
         // Dimensionen auswerten
         short nDims = pArray->GetDims();
-        INT32 nTotalSize = 0;
+        sal_Int32 nTotalSize = 0;
 
         // es muss ein eindimensionales Array sein
-        INT32 nLower, nUpper, nSize;
-        INT32 i;
+        sal_Int32 nLower, nUpper, nSize;
+        sal_Int32 i;
         for( i = 0 ; i < nDims ; i++ )
         {
             pArray->GetDim32( i+1, nLower, nUpper );
@@ -1058,7 +1058,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
         short nDimsNew = pArray->GetDims();
         short nDimsOld = pOldArray->GetDims();
         short nDims = nDimsNew;
-        BOOL bRangeError = FALSE;
+        sal_Bool bRangeError = sal_False;
 
         // Store dims to use them for copying later
         sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -1066,7 +1066,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
         sal_Int32* pActualIndices = new sal_Int32[nDims];
         if( nDimsOld != nDimsNew )
         {
-            bRangeError = TRUE;
+            bRangeError = sal_True;
         }
         else
         {
@@ -1109,7 +1109,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
 
 SbxObject* createUserTypeImpl( const String& rClassName );  // sb.cxx
 
-void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepTCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
     String aClass( pImg->GetString( static_cast<short>( nOp2 ) ) );
@@ -1123,7 +1123,7 @@ void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
     PushVar( pNew );
 }
 
-void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nOp2 )
+void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt32 nOp2 )
 {
     bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
     if( bWithEvents )
@@ -1136,7 +1136,7 @@ void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nO
     bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
     if( bFixedString )
     {
-        USHORT nCount = static_cast<USHORT>( nOp2 >> 17 );      // len = all bits above 0x10000
+        sal_uInt16 nCount = static_cast<sal_uInt16>( nOp2 >> 17 );      // len = all bits above 0x10000
         String aStr;
         aStr.Fill( nCount, 0 );
         pVar->PutString( aStr );
@@ -1145,7 +1145,7 @@ void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, UINT32 nO
 
 // Einrichten einer lokalen Variablen (+StringID+Typ)
 
-void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepLOCAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( !refLocals.Is() )
         refLocals = new SbxArray;
@@ -1162,11 +1162,11 @@ void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
 
 // Einrichten einer modulglobalen Variablen (+StringID+Typ)
 
-void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassModule )
+void SbiRuntime::StepPUBLIC_Impl( sal_uInt32 nOp1, sal_uInt32 nOp2, bool bUsedForClassModule )
 {
     String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
     SbxDataType t = (SbxDataType)(SbxDataType)(nOp2 & 0xffff);;
-    BOOL bFlag = pMod->IsSet( SBX_NO_MODIFY );
+    sal_Bool bFlag = pMod->IsSet( SBX_NO_MODIFY );
     pMod->SetFlag( SBX_NO_MODIFY );
     SbxVariableRef p = pMod->Find( aName, SbxCLASS_PROPERTY );
     if( p.Is() )
@@ -1186,12 +1186,12 @@ void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassMo
     }
 }
 
-void SbiRuntime::StepPUBLIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPUBLIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     StepPUBLIC_Impl( nOp1, nOp2, false );
 }
 
-void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPUBLIC_P( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     // Creates module variable that isn't reinitialised when
     // between invocations ( for VBASupport & document basic only )
@@ -1204,7 +1204,7 @@ void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
 
 // Einrichten einer globalen Variablen (+StringID+Typ)
 
-void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( pImg->GetFlag( SBIMG_CLASSMODULE ) )
         StepPUBLIC_Impl( nOp1, nOp2, true );
@@ -1222,7 +1222,7 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
         pMod->AddVarName( aName );
     }
 
-    BOOL bFlag = pStorage->IsSet( SBX_NO_MODIFY );
+    sal_Bool bFlag = pStorage->IsSet( SBX_NO_MODIFY );
     rBasic.SetFlag( SBX_NO_MODIFY );
     SbxVariableRef p = pStorage->Find( aName, SbxCLASS_PROPERTY );
     if( p.Is() )
@@ -1242,7 +1242,7 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
 // Creates global variable that isn't reinitialised when
 // basic is restarted, P=PERSIST (+StringID+Typ)
 
-void SbiRuntime::StepGLOBAL_P( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepGLOBAL_P( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( pMod->pImage->bFirstInit )
     {
@@ -1254,7 +1254,7 @@ void SbiRuntime::StepGLOBAL_P( UINT32 nOp1, UINT32 nOp2 )
 // Searches for global variable, behavior depends on the fact
 // if the variable is initialised for the first time
 
-void SbiRuntime::StepFIND_G( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_G( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( pMod->pImage->bFirstInit )
     {
@@ -1292,7 +1292,7 @@ SbxVariable* SbiRuntime::StepSTATIC_Impl( String& aName, SbxDataType& t )
     return p;
 }
 // Einrichten einer statischen Variablen (+StringID+Typ)
-void SbiRuntime::StepSTATIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepSTATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
     SbxDataType t = (SbxDataType) nOp2;
diff --git a/basic/source/sample/collelem.cxx b/basic/source/sample/collelem.cxx
index 887917048c61..0ada7b60ea6a 100644
--- a/basic/source/sample/collelem.cxx
+++ b/basic/source/sample/collelem.cxx
@@ -55,7 +55,7 @@ void SampleElement::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pPar_ = pVar->GetParameters();
-        ULONG t = pHint->GetId();
+        sal_uIntPtr t = pHint->GetId();
         if( t == SBX_HINT_DATAWANTED && pVar->GetUserData() == 0x12345678 )
         {
             // Die Say-Methode:
diff --git a/basic/source/sample/object.cxx b/basic/source/sample/object.cxx
index 3c5fbeb3478c..15ad6b0168f8 100644
--- a/basic/source/sample/object.cxx
+++ b/basic/source/sample/object.cxx
@@ -77,7 +77,7 @@
 #define _BWRITE     0x0200  // kann as Lvalue verwendet werden
 #define _LVALUE     _BWRITE  // kann as Lvalue verwendet werden
 #define _READWRITE  0x0300  // beides
-#define _OPT        0x0400  // TRUE: optionaler Parameter
+#define _OPT        0x0400  // sal_True: optionaler Parameter
 #define _METHOD     0x1000  // Masken-Bit fuer eine Methode
 #define _PROPERTY   0x2000  // Masken-Bit fuer eine Property
 #define _COLL       0x4000  // Masken-Bit fuer eine Collection
@@ -133,12 +133,12 @@ SbxVariable* SampleObject::Find( const String& rName, SbxClassType t )
         // sonst suchen
         Methods* p = aMethods;
         short nIndex = 0;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         while( p->nArgs != -1 )
         {
             if( rName.EqualsIgnoreCaseAscii( p->pName ) )
             {
-                bFound = TRUE; break;
+                bFound = sal_True; break;
             }
             nIndex += ( p->nArgs & _ARGSMASK ) + 1;
             p = aMethods + nIndex;
@@ -175,22 +175,22 @@ void SampleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCT,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pPar_ = pVar->GetParameters();
-        USHORT nIndex = (USHORT) pVar->GetUserData();
+        sal_uInt16 nIndex = (sal_uInt16) pVar->GetUserData();
         // kein Index: weiterreichen!
         if( nIndex )
         {
-            ULONG t = pHint->GetId();
+            sal_uIntPtr t = pHint->GetId();
             if( t == SBX_HINT_INFOWANTED )
                 pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
             else
             {
-                BOOL bWrite = FALSE;
+                sal_Bool bWrite = sal_False;
                 if( t == SBX_HINT_DATACHANGED )
-                    bWrite = TRUE;
+                    bWrite = sal_True;
                 if( t == SBX_HINT_DATAWANTED || bWrite )
                 {
                     // Parameter-Test fuer Methoden:
-                    USHORT nPar = aMethods[ --nIndex ].nArgs & 0x00FF;
+                    sal_uInt16 nPar = aMethods[ --nIndex ].nArgs & 0x00FF;
                     // Element 0 ist der Returnwert
                     if( ( !pPar_ && nPar )
                      || ( pPar_->Count() != nPar+1 ) )
@@ -220,7 +220,7 @@ SbxInfo* SampleObject::GetInfo( short nIdx )
     {
         p++;
         String aName_ = String::CreateFromAscii( p->pName );
-        USHORT nFlags_ = ( p->nArgs >> 8 ) & 0x03;
+        sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
         if( p->nArgs & _OPT )
             nFlags_ |= SBX_OPTIONAL;
         pInfo_->AddParam( aName_, p->eType, nFlags_ );
@@ -230,13 +230,13 @@ SbxInfo* SampleObject::GetInfo( short nIdx )
 
 ////////////////////////////////////////////////////////////////////////////
 
-// Properties und Methoden legen beim Get (bPut = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bPut = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bPut = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bPut = sal_True) wird der Wert aus
 // Element 0 gespeichert.
 
 // Die Methoden:
 
-void SampleObject::Display( SbxVariable*, SbxArray* pPar_, BOOL )
+void SampleObject::Display( SbxVariable*, SbxArray* pPar_, sal_Bool )
 {
     // GetString() loest u.U. auch einen Error aus!
     String s( pPar_->Get( 1 )->GetString() );
@@ -244,7 +244,7 @@ void SampleObject::Display( SbxVariable*, SbxArray* pPar_, BOOL )
         InfoBox( NULL, s ).Execute();
 }
 
-void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     double n = pPar_->Get( 1 )->GetDouble();
     pVar->PutDouble( n * n );
@@ -252,14 +252,14 @@ void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, BOOL )
 
 // Callback nach BASIC:
 
-void SampleObject::Event( SbxVariable*, SbxArray* pPar_, BOOL )
+void SampleObject::Event( SbxVariable*, SbxArray* pPar_, sal_Bool )
 {
     Call( pPar_->Get( 1 )->GetString(), NULL );
 }
 
 // Neues Element anlegen
 
-void SampleObject::Create( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SampleObject::Create( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     pVar->PutObject(
         MakeObject( pPar_->Get( 1 )->GetString(), String( RTL_CONSTASCII_USTRINGPARAM("SampleElement") ) ) );
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 67e7ce71aded..7a68f2ea5a31 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -35,8 +35,8 @@ using namespace std;
 
 struct SbxDim {                 // eine Array-Dimension:
     SbxDim* pNext;              // Link
-    INT32 nLbound, nUbound;     // Begrenzungen
-    INT32 nSize;                // Anzahl Elemente
+    sal_Int32 nLbound, nUbound;     // Begrenzungen
+    sal_Int32 nSize;                // Anzahl Elemente
 };
 
 class SbxVarEntry : public SbxVariableRef {
@@ -88,7 +88,7 @@ SbxArray& SbxArray::operator=( const SbxArray& rArray )
         eType = rArray.eType;
         Clear();
         SbxVarRefs* pSrc = rArray.pData;
-        for( UINT32 i = 0; i < pSrc->size(); i++ )
+        for( sal_uInt32 i = 0; i < pSrc->size(); i++ )
         {
             SbxVarEntryPtr pSrcRef = (*pSrc)[i];
             const SbxVariable* pSrc_ = *pSrcRef;
@@ -126,8 +126,8 @@ SbxClassType SbxArray::GetClass() const
 
 void SbxArray::Clear()
 {
-    UINT32 nSize = pData->size();
-    for( UINT32 i = 0 ; i < nSize ; i++ )
+    sal_uInt32 nSize = pData->size();
+    for( sal_uInt32 i = 0 ; i < nSize ; i++ )
     {
         SbxVarEntry* pEntry = (*pData)[i];
         delete pEntry;
@@ -135,19 +135,19 @@ void SbxArray::Clear()
     pData->clear();
 }
 
-UINT32 SbxArray::Count32() const
+sal_uInt32 SbxArray::Count32() const
 {
     return pData->size();
 }
 
-USHORT SbxArray::Count() const
+sal_uInt16 SbxArray::Count() const
 {
-    UINT32 nCount = pData->size();
+    sal_uInt32 nCount = pData->size();
     DBG_ASSERT( nCount <= SBX_MAXINDEX, "SBX: Array-Index > SBX_MAXINDEX" );
-    return (USHORT)nCount;
+    return (sal_uInt16)nCount;
 }
 
-SbxVariableRef& SbxArray::GetRef32( UINT32 nIdx )
+SbxVariableRef& SbxArray::GetRef32( sal_uInt32 nIdx )
 {
     // Array ggf. vergroessern
     DBG_ASSERT( nIdx <= SBX_MAXINDEX32, "SBX: Array-Index > SBX_MAXINDEX32" );
@@ -165,7 +165,7 @@ SbxVariableRef& SbxArray::GetRef32( UINT32 nIdx )
     return *((*pData)[nIdx]);
 }
 
-SbxVariableRef& SbxArray::GetRef( USHORT nIdx )
+SbxVariableRef& SbxArray::GetRef( sal_uInt16 nIdx )
 {
     // Array ggf. vergroessern
     DBG_ASSERT( nIdx <= SBX_MAXINDEX, "SBX: Array-Index > SBX_MAXINDEX" );
@@ -183,7 +183,7 @@ SbxVariableRef& SbxArray::GetRef( USHORT nIdx )
     return *((*pData)[nIdx]);
 }
 
-SbxVariable* SbxArray::Get32( UINT32 nIdx )
+SbxVariable* SbxArray::Get32( sal_uInt32 nIdx )
 {
     if( !CanRead() )
     {
@@ -202,7 +202,7 @@ SbxVariable* SbxArray::Get32( UINT32 nIdx )
     return rRef;
 }
 
-SbxVariable* SbxArray::Get( USHORT nIdx )
+SbxVariable* SbxArray::Get( sal_uInt16 nIdx )
 {
     if( !CanRead() )
     {
@@ -221,7 +221,7 @@ SbxVariable* SbxArray::Get( USHORT nIdx )
     return rRef;
 }
 
-void SbxArray::Put32( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::Put32( SbxVariable* pVar, sal_uInt32 nIdx )
 {
     if( !CanWrite() )
         SetError( SbxERR_PROP_READONLY );
@@ -241,7 +241,7 @@ void SbxArray::Put32( SbxVariable* pVar, UINT32 nIdx )
     }
 }
 
-void SbxArray::Put( SbxVariable* pVar, USHORT nIdx )
+void SbxArray::Put( SbxVariable* pVar, sal_uInt16 nIdx )
 {
     if( !CanWrite() )
         SetError( SbxERR_PROP_READONLY );
@@ -261,7 +261,7 @@ void SbxArray::Put( SbxVariable* pVar, USHORT nIdx )
     }
 }
 
-const XubString& SbxArray::GetAlias( USHORT nIdx )
+const XubString& SbxArray::GetAlias( sal_uInt16 nIdx )
 {
     if( !CanRead() )
     {
@@ -280,7 +280,7 @@ const XubString& SbxArray::GetAlias( USHORT nIdx )
     return *rRef.pAlias;
 }
 
-void SbxArray::PutAlias( const XubString& rAlias, USHORT nIdx )
+void SbxArray::PutAlias( const XubString& rAlias, sal_uInt16 nIdx )
 {
     if( !CanWrite() )
         SetError( SbxERR_PROP_READONLY );
@@ -294,7 +294,7 @@ void SbxArray::PutAlias( const XubString& rAlias, USHORT nIdx )
     }
 }
 
-void SbxArray::Insert32( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::Insert32( SbxVariable* pVar, sal_uInt32 nIdx )
 {
     DBG_ASSERT( pData->size() <= SBX_MAXINDEX32, "SBX: Array wird zu gross" );
     if( pData->size() > SBX_MAXINDEX32 )
@@ -317,7 +317,7 @@ void SbxArray::Insert32( SbxVariable* pVar, UINT32 nIdx )
     SetFlag( SBX_MODIFIED );
 }
 
-void SbxArray::Insert( SbxVariable* pVar, USHORT nIdx )
+void SbxArray::Insert( SbxVariable* pVar, sal_uInt16 nIdx )
 {
     DBG_ASSERT( pData->size() <= 0x3FF0, "SBX: Array wird zu gross" );
     if( pData->size() > 0x3FF0 )
@@ -325,7 +325,7 @@ void SbxArray::Insert( SbxVariable* pVar, USHORT nIdx )
     Insert32( pVar, nIdx );
 }
 
-void SbxArray::Remove32( UINT32 nIdx )
+void SbxArray::Remove32( sal_uInt32 nIdx )
 {
     if( nIdx < pData->size() )
     {
@@ -336,7 +336,7 @@ void SbxArray::Remove32( UINT32 nIdx )
     }
 }
 
-void SbxArray::Remove( USHORT nIdx )
+void SbxArray::Remove( sal_uInt16 nIdx )
 {
     if( nIdx < pData->size() )
     {
@@ -351,7 +351,7 @@ void SbxArray::Remove( SbxVariable* pVar )
 {
     if( pVar )
     {
-        for( UINT32 i = 0; i < pData->size(); i++ )
+        for( sal_uInt32 i = 0; i < pData->size(); i++ )
         {
             SbxVariableRef* pRef = (*pData)[i];
             // SbxVariableRef* pRef = pData->GetObject( i );
@@ -370,8 +370,8 @@ void SbxArray::Merge( SbxArray* p )
 {
     if( p )
     {
-        UINT32 nSize = p->Count();
-        for( UINT32 i = 0; i < nSize; i++ )
+        sal_uInt32 nSize = p->Count();
+        for( sal_uInt32 i = 0; i < nSize; i++ )
         {
             SbxVarEntryPtr pRef1 = (*(p->pData))[i];
             // Ist das Element by name schon drin?
@@ -380,8 +380,8 @@ void SbxArray::Merge( SbxArray* p )
             if( pVar )
             {
                 XubString aName = pVar->GetName();
-                USHORT nHash = pVar->GetHashCode();
-                for( UINT32 j = 0; j < pData->size(); j++ )
+                sal_uInt16 nHash = pVar->GetHashCode();
+                for( sal_uInt32 j = 0; j < pData->size(); j++ )
                 {
                     SbxVariableRef* pRef2 = (*pData)[j];
                     if( (*pRef2)->GetHashCode() == nHash
@@ -408,10 +408,10 @@ void SbxArray::Merge( SbxArray* p )
 // Suchen eines Elements ueber die Userdaten. Falls ein Element
 // ein Objekt ist, wird dieses ebenfalls durchsucht.
 
-SbxVariable* SbxArray::FindUserData( UINT32 nData )
+SbxVariable* SbxArray::FindUserData( sal_uInt32 nData )
 {
     SbxVariable* p = NULL;
-    for( UINT32 i = 0; i < pData->size(); i++ )
+    for( sal_uInt32 i = 0; i < pData->size(); i++ )
     {
         SbxVariableRef* pRef = (*pData)[i];
         SbxVariable* pVar = *pRef;
@@ -431,7 +431,7 @@ SbxVariable* SbxArray::FindUserData( UINT32 nData )
                     case SbxCLASS_OBJECT:
                     {
                         // Objekte duerfen ihren Parent nicht durchsuchen
-                        USHORT nOld = pVar->GetFlags();
+                        sal_uInt16 nOld = pVar->GetFlags();
                         pVar->ResetFlag( SBX_GBLSEARCH );
                         p = ((SbxObject*) pVar)->FindUserData( nData );
                         pVar->SetFlags( nOld );
@@ -459,12 +459,12 @@ SbxVariable* SbxArray::FindUserData( UINT32 nData )
 SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
 {
     SbxVariable* p = NULL;
-    UINT32 nCount = pData->size();
+    sal_uInt32 nCount = pData->size();
     if( !nCount )
         return NULL;
-    BOOL bExtSearch = IsSet( SBX_EXTSEARCH );
-    USHORT nHash = SbxVariable::MakeHashCode( rName );
-    for( UINT32 i = 0; i < nCount; i++ )
+    sal_Bool bExtSearch = IsSet( SBX_EXTSEARCH );
+    sal_uInt16 nHash = SbxVariable::MakeHashCode( rName );
+    for( sal_uInt32 i = 0; i < nCount; i++ )
     {
         SbxVariableRef* pRef = (*pData)[i];
         SbxVariable* pVar = *pRef;
@@ -472,7 +472,7 @@ SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
         {
             // Die ganz sichere Suche klappt auch, wenn es
             // keinen Hascode gibt!
-            USHORT nVarHash = pVar->GetHashCode();
+            sal_uInt16 nVarHash = pVar->GetHashCode();
             if( ( !nVarHash || nVarHash == nHash )
                 && ( t == SbxCLASS_DONTCARE || pVar->GetClass() == t )
                 && ( pVar->GetName().EqualsIgnoreCaseAscii( rName ) ) )
@@ -489,7 +489,7 @@ SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
                     case SbxCLASS_OBJECT:
                     {
                         // Objekte duerfen ihren Parent nicht durchsuchen
-                        USHORT nOld = pVar->GetFlags();
+                        sal_uInt16 nOld = pVar->GetFlags();
                         pVar->ResetFlag( SBX_GBLSEARCH );
                         p = ((SbxObject*) pVar)->Find( rName, t );
                         pVar->SetFlags( nOld );
@@ -511,18 +511,18 @@ SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
     return p;
 }
 
-BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    UINT16 nElem;
+    sal_uInt16 nElem;
     Clear();
-    BOOL bRes = TRUE;
-    USHORT f = nFlags;
+    sal_Bool bRes = sal_True;
+    sal_uInt16 f = nFlags;
     nFlags |= SBX_WRITE;
     rStrm >> nElem;
     nElem &= 0x7FFF;
-    for( UINT32 n = 0; n < nElem; n++ )
+    for( sal_uInt32 n = 0; n < nElem; n++ )
     {
-        UINT16 nIdx;
+        sal_uInt16 nIdx;
         rStrm >> nIdx;
         SbxVariable* pVar = (SbxVariable*) Load( rStrm );
         if( pVar )
@@ -532,7 +532,7 @@ BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
         }
         else
         {
-            bRes = FALSE; break;
+            bRes = sal_False; break;
         }
     }
     if( bRes )
@@ -541,10 +541,10 @@ BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
     return bRes;
 }
 
-BOOL SbxArray::StoreData( SvStream& rStrm ) const
+sal_Bool SbxArray::StoreData( SvStream& rStrm ) const
 {
-    UINT32 nElem = 0;
-    UINT32 n;
+    sal_uInt32 nElem = 0;
+    sal_uInt32 n;
     // Welche Elemente sind ueberhaupt definiert?
     for( n = 0; n < pData->size(); n++ )
     {
@@ -553,23 +553,23 @@ BOOL SbxArray::StoreData( SvStream& rStrm ) const
         if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
             nElem++;
     }
-    rStrm << (UINT16) nElem;
+    rStrm << (sal_uInt16) nElem;
     for( n = 0; n < pData->size(); n++ )
     {
         SbxVariableRef* pRef = (*pData)[n];
         SbxVariable* p = *pRef;
         if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
         {
-            rStrm << (UINT16) n;
+            rStrm << (sal_uInt16) n;
             if( !p->Store( rStrm ) )
-                return FALSE;
+                return sal_False;
         }
     }
     return StorePrivateData( rStrm );
 }
 
 // #100883 Method to set method directly to parameter array
-void SbxArray::PutDirect( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::PutDirect( SbxVariable* pVar, sal_uInt32 nIdx )
 {
     SbxVariableRef& rRef = GetRef32( nIdx );
     rRef = pVar;
@@ -632,7 +632,7 @@ void SbxDimArray::Clear()
 
 // Dimension hinzufuegen
 
-void SbxDimArray::AddDimImpl32( INT32 lb, INT32 ub, BOOL bAllowSize0 )
+void SbxDimArray::AddDimImpl32( sal_Int32 lb, sal_Int32 ub, sal_Bool bAllowSize0 )
 {
     SbxError eRes = SbxERR_OK;
     if( ub < lb && !bAllowSize0 )
@@ -656,51 +656,51 @@ void SbxDimArray::AddDimImpl32( INT32 lb, INT32 ub, BOOL bAllowSize0 )
 
 void SbxDimArray::AddDim( short lb, short ub )
 {
-    AddDimImpl32( lb, ub, FALSE );
+    AddDimImpl32( lb, ub, sal_False );
 }
 
 void SbxDimArray::unoAddDim( short lb, short ub )
 {
-    AddDimImpl32( lb, ub, TRUE );
+    AddDimImpl32( lb, ub, sal_True );
 }
 
-void SbxDimArray::AddDim32( INT32 lb, INT32 ub )
+void SbxDimArray::AddDim32( sal_Int32 lb, sal_Int32 ub )
 {
-    AddDimImpl32( lb, ub, FALSE );
+    AddDimImpl32( lb, ub, sal_False );
 }
 
-void SbxDimArray::unoAddDim32( INT32 lb, INT32 ub )
+void SbxDimArray::unoAddDim32( sal_Int32 lb, sal_Int32 ub )
 {
-    AddDimImpl32( lb, ub, TRUE );
+    AddDimImpl32( lb, ub, sal_True );
 }
 
 
 // Dimensionsdaten auslesen
 
-BOOL SbxDimArray::GetDim32( INT32 n, INT32& rlb, INT32& rub ) const
+sal_Bool SbxDimArray::GetDim32( sal_Int32 n, sal_Int32& rlb, sal_Int32& rub ) const
 {
     if( n < 1 || n > nDim )
     {
-        SetError( SbxERR_BOUNDS ); rub = rlb = 0; return FALSE;
+        SetError( SbxERR_BOUNDS ); rub = rlb = 0; return sal_False;
     }
     SbxDim* p = pFirst;
     while( --n )
         p = p->pNext;
     rub = p->nUbound;
     rlb = p->nLbound;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
+sal_Bool SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
 {
-    INT32 rlb32, rub32;
-    BOOL bRet = GetDim32( n, rlb32, rub32 );
+    sal_Int32 rlb32, rub32;
+    sal_Bool bRet = GetDim32( n, rlb32, rub32 );
     if( bRet )
     {
         if( rlb32 < -SBX_MAXINDEX || rub32 > SBX_MAXINDEX )
         {
             SetError( SbxERR_BOUNDS );
-            return FALSE;
+            return sal_False;
         }
         rub = (short)rub32;
         rlb = (short)rlb32;
@@ -710,15 +710,15 @@ BOOL SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
 
 // Element-Ptr anhand einer Index-Liste
 
-UINT32 SbxDimArray::Offset32( const INT32* pIdx )
+sal_uInt32 SbxDimArray::Offset32( const sal_Int32* pIdx )
 {
-    UINT32 nPos = 0;
+    sal_uInt32 nPos = 0;
     for( SbxDim* p = pFirst; p; p = p->pNext )
     {
-        INT32 nIdx = *pIdx++;
+        sal_Int32 nIdx = *pIdx++;
         if( nIdx < p->nLbound || nIdx > p->nUbound )
         {
-            nPos = (UINT32)SBX_MAXINDEX32 + 1; break;
+            nPos = (sal_uInt32)SBX_MAXINDEX32 + 1; break;
         }
         nPos = nPos * p->nSize + nIdx - p->nLbound;
     }
@@ -729,7 +729,7 @@ UINT32 SbxDimArray::Offset32( const INT32* pIdx )
     return nPos;
 }
 
-USHORT SbxDimArray::Offset( const short* pIdx )
+sal_uInt16 SbxDimArray::Offset( const short* pIdx )
 {
     long nPos = 0;
     for( SbxDim* p = pFirst; p; p = p->pNext )
@@ -745,7 +745,7 @@ USHORT SbxDimArray::Offset( const short* pIdx )
     {
         SetError( SbxERR_BOUNDS ); nPos = 0;
     }
-    return (USHORT) nPos;
+    return (sal_uInt16) nPos;
 }
 
 SbxVariableRef& SbxDimArray::GetRef( const short* pIdx )
@@ -763,17 +763,17 @@ void SbxDimArray::Put( SbxVariable* p, const short* pIdx  )
     SbxArray::Put( p, Offset( pIdx ) );
 }
 
-SbxVariableRef& SbxDimArray::GetRef32( const INT32* pIdx )
+SbxVariableRef& SbxDimArray::GetRef32( const sal_Int32* pIdx )
 {
     return SbxArray::GetRef32( Offset32( pIdx ) );
 }
 
-SbxVariable* SbxDimArray::Get32( const INT32* pIdx )
+SbxVariable* SbxDimArray::Get32( const sal_Int32* pIdx )
 {
     return SbxArray::Get32( Offset32( pIdx ) );
 }
 
-void SbxDimArray::Put32( SbxVariable* p, const INT32* pIdx  )
+void SbxDimArray::Put32( SbxVariable* p, const sal_Int32* pIdx  )
 {
     SbxArray::Put32( p, Offset32( pIdx ) );
 }
@@ -781,38 +781,38 @@ void SbxDimArray::Put32( SbxVariable* p, const INT32* pIdx  )
 
 // Element-Nr anhand eines Parameter-Arrays
 
-UINT32 SbxDimArray::Offset32( SbxArray* pPar )
+sal_uInt32 SbxDimArray::Offset32( SbxArray* pPar )
 {
     if( nDim == 0 || !pPar || ( ( nDim != ( pPar->Count() - 1 ) ) && SbiRuntime::isVBAEnabled() ) )
     {
         SetError( SbxERR_BOUNDS ); return 0;
     }
-    UINT32 nPos = 0;
-    USHORT nOff = 1;    // Nicht Element 0!
+    sal_uInt32 nPos = 0;
+    sal_uInt16 nOff = 1;    // Nicht Element 0!
     for( SbxDim* p = pFirst; p && !IsError(); p = p->pNext )
     {
-        INT32 nIdx = pPar->Get( nOff++ )->GetLong();
+        sal_Int32 nIdx = pPar->Get( nOff++ )->GetLong();
         if( nIdx < p->nLbound || nIdx > p->nUbound )
         {
-            nPos = (UINT32) SBX_MAXINDEX32+1; break;
+            nPos = (sal_uInt32) SBX_MAXINDEX32+1; break;
         }
         nPos = nPos * p->nSize + nIdx - p->nLbound;
     }
-    if( nPos > (UINT32) SBX_MAXINDEX32 )
+    if( nPos > (sal_uInt32) SBX_MAXINDEX32 )
     {
         SetError( SbxERR_BOUNDS ); nPos = 0;
     }
     return nPos;
 }
 
-USHORT SbxDimArray::Offset( SbxArray* pPar )
+sal_uInt16 SbxDimArray::Offset( SbxArray* pPar )
 {
-    UINT32 nPos = Offset32( pPar );
+    sal_uInt32 nPos = Offset32( pPar );
     if( nPos > (long) SBX_MAXINDEX )
     {
         SetError( SbxERR_BOUNDS ); nPos = 0;
     }
-    return (USHORT) nPos;
+    return (sal_uInt16) nPos;
 }
 
 SbxVariableRef& SbxDimArray::GetRef( SbxArray* pPar )
@@ -830,27 +830,27 @@ void SbxDimArray::Put( SbxVariable* p, SbxArray* pPar  )
     SbxArray::Put32( p, Offset32( pPar ) );
 }
 
-BOOL SbxDimArray::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     short nDimension;
     rStrm >> nDimension;
     for( short i = 0; i < nDimension && rStrm.GetError() == SVSTREAM_OK; i++ )
     {
-        INT16 lb, ub;
+        sal_Int16 lb, ub;
         rStrm >> lb >> ub;
         AddDim( lb, ub );
     }
     return SbxArray::LoadData( rStrm, nVer );
 }
 
-BOOL SbxDimArray::StoreData( SvStream& rStrm ) const
+sal_Bool SbxDimArray::StoreData( SvStream& rStrm ) const
 {
-    rStrm << (INT16) nDim;
+    rStrm << (sal_Int16) nDim;
     for( short i = 0; i < nDim; i++ )
     {
         short lb, ub;
         GetDim( i, lb, ub );
-        rStrm << (INT16) lb << (INT16) ub;
+        rStrm << (sal_Int16) lb << (sal_Int16) ub;
     }
     return SbxArray::StoreData( rStrm );
 }
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 60bb9fe505e7..54e45c79a8d2 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -108,13 +108,13 @@ void SbxBase::Clear()
     DBG_CHKTHIS( SbxBase, 0 );
 }
 
-BOOL SbxBase::IsFixed() const
+sal_Bool SbxBase::IsFixed() const
 {
     DBG_CHKTHIS( SbxBase, 0 );
     return IsSet( SBX_FIXED );
 }
 
-void SbxBase::SetModified( BOOL b )
+void SbxBase::SetModified( sal_Bool b )
 {
     DBG_CHKTHIS( SbxBase, 0 );
     if( IsSet( SBX_NO_MODIFY ) )
@@ -137,9 +137,9 @@ void SbxBase::SetError( SbxError e )
         p->eSbxError = e;
 }
 
-BOOL SbxBase::IsError()
+sal_Bool SbxBase::IsError()
 {
-    return BOOL( GetSbxData_Impl()->eSbxError != SbxERR_OK );
+    return sal_Bool( GetSbxData_Impl()->eSbxError != SbxERR_OK );
 }
 
 void SbxBase::ResetError()
@@ -153,7 +153,7 @@ void SbxBase::AddFactory( SbxFactory* pFac )
     const SbxFactory* pTemp = pFac;
 
     // AB, 6.3.96: HandleLast-Flag beruecksichtigen
-    USHORT nPos = p->aFacs.Count();     // Einfuege-Position
+    sal_uInt16 nPos = p->aFacs.Count();     // Einfuege-Position
     if( !pFac->IsHandleLast() )         // Nur, wenn nicht selbst HandleLast
     {
         // Neue Factory vor Factories mit HandleLast einordnen
@@ -167,7 +167,7 @@ void SbxBase::AddFactory( SbxFactory* pFac )
 void SbxBase::RemoveFactory( SbxFactory* pFac )
 {
     SbxAppData* p = GetSbxData_Impl();
-    for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+    for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
     {
         if( p->aFacs.GetObject( i ) == pFac )
         {
@@ -177,7 +177,7 @@ void SbxBase::RemoveFactory( SbxFactory* pFac )
 }
 
 
-SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator )
+SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
 {
     // #91626: Hack to skip old Basic dialogs
     // Problem: There does not exist a factory any more,
@@ -203,7 +203,7 @@ SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator )
     // Unbekanter Typ: �ber die Factories gehen!
     SbxAppData* p = GetSbxData_Impl();
     SbxBase* pNew = NULL;
-    for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+    for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
     {
         SbxFactory* pFac = p->aFacs.GetObject( i );
         pNew = pFac->Create( nSbxId, nCreator );
@@ -225,7 +225,7 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass )
 {
     SbxAppData* p = GetSbxData_Impl();
     SbxObject* pNew = NULL;
-    for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+    for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
     {
         pNew = p->aFacs.GetObject( i )->CreateObject( rClass );
         if( pNew )
@@ -243,15 +243,15 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass )
     return pNew;
 }
 
-static BOOL bStaticEnableBroadcasting = TRUE;
+static sal_Bool bStaticEnableBroadcasting = sal_True;
 
 // Sbx-Loesung als Ersatz fuer SfxBroadcaster::Enable()
-void SbxBase::StaticEnableBroadcasting( BOOL bEnable )
+void SbxBase::StaticEnableBroadcasting( sal_Bool bEnable )
 {
     bStaticEnableBroadcasting = bEnable;
 }
 
-BOOL SbxBase::StaticIsEnabledBroadcasting( void )
+sal_Bool SbxBase::StaticIsEnabledBroadcasting( void )
 {
     return bStaticEnableBroadcasting;
 }
@@ -259,15 +259,15 @@ BOOL SbxBase::StaticIsEnabledBroadcasting( void )
 
 SbxBase* SbxBase::Load( SvStream& rStrm )
 {
-    UINT16 nSbxId, nFlags, nVer;
-    UINT32 nCreator, nSize;
+    sal_uInt16 nSbxId, nFlags, nVer;
+    sal_uInt32 nCreator, nSize;
     rStrm >> nCreator >> nSbxId >> nFlags >> nVer;
 
     // Eine Dummheit meinerseits korrigieren:
     if( nFlags & SBX_RESERVED )
         nFlags = ( nFlags & ~SBX_RESERVED ) | SBX_GBLSEARCH;
 
-    ULONG nOldPos = rStrm.Tell();
+    sal_uIntPtr nOldPos = rStrm.Tell();
     rStrm >> nSize;
     SbxBase* p = Create( nSbxId, nCreator );
     if( p )
@@ -275,7 +275,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
         p->nFlags = nFlags;
         if( p->LoadData( rStrm, nVer ) )
         {
-            ULONG nNewPos = rStrm.Tell();
+            sal_uIntPtr nNewPos = rStrm.Tell();
             nOldPos += nSize;
             DBG_ASSERT( nOldPos >= nNewPos, "SBX: Zu viele Daten eingelesen" );
             if( nOldPos != nNewPos )
@@ -303,81 +303,81 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
 // Sbx-Objekt im Stream ueberspringen
 void SbxBase::Skip( SvStream& rStrm )
 {
-    UINT16 nSbxId, nFlags, nVer;
-    UINT32 nCreator, nSize;
+    sal_uInt16 nSbxId, nFlags, nVer;
+    sal_uInt32 nCreator, nSize;
     rStrm >> nCreator >> nSbxId >> nFlags >> nVer;
 
-    ULONG nStartPos = rStrm.Tell();
+    sal_uIntPtr nStartPos = rStrm.Tell();
     rStrm >> nSize;
 
     rStrm.Seek( nStartPos + nSize );
 }
 
-BOOL SbxBase::Store( SvStream& rStrm )
+sal_Bool SbxBase::Store( SvStream& rStrm )
 {
     DBG_CHKTHIS( SbxBase, 0 );
     if( !( nFlags & SBX_DONTSTORE ) )
     {
-        rStrm << (UINT32) GetCreator()
-              << (UINT16) GetSbxId()
-              << (UINT16) GetFlags()
-              << (UINT16) GetVersion();
-        ULONG nOldPos = rStrm.Tell();
-        rStrm << (UINT32) 0L;
-        BOOL bRes = StoreData( rStrm );
-        ULONG nNewPos = rStrm.Tell();
+        rStrm << (sal_uInt32) GetCreator()
+              << (sal_uInt16) GetSbxId()
+              << (sal_uInt16) GetFlags()
+              << (sal_uInt16) GetVersion();
+        sal_uIntPtr nOldPos = rStrm.Tell();
+        rStrm << (sal_uInt32) 0L;
+        sal_Bool bRes = StoreData( rStrm );
+        sal_uIntPtr nNewPos = rStrm.Tell();
         rStrm.Seek( nOldPos );
-        rStrm << (UINT32) ( nNewPos - nOldPos );
+        rStrm << (sal_uInt32) ( nNewPos - nOldPos );
         rStrm.Seek( nNewPos );
         if( rStrm.GetError() != SVSTREAM_OK )
-            bRes = FALSE;
+            bRes = sal_False;
         if( bRes )
             bRes = StoreCompleted();
         return bRes;
     }
     else
-        return TRUE;
+        return sal_True;
 }
 
-BOOL SbxBase::LoadData( SvStream&, USHORT )
+sal_Bool SbxBase::LoadData( SvStream&, sal_uInt16 )
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbxBase::StoreData( SvStream& ) const
+sal_Bool SbxBase::StoreData( SvStream& ) const
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbxBase::LoadPrivateData( SvStream&, USHORT )
+sal_Bool SbxBase::LoadPrivateData( SvStream&, sal_uInt16 )
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxBase::StorePrivateData( SvStream& ) const
+sal_Bool SbxBase::StorePrivateData( SvStream& ) const
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxBase::LoadCompleted()
+sal_Bool SbxBase::LoadCompleted()
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxBase::StoreCompleted()
+sal_Bool SbxBase::StoreCompleted()
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return TRUE;
+    return sal_True;
 }
 
 //////////////////////////////// SbxFactory ////////////////////////////////
 
-SbxBase* SbxFactory::Create( UINT16, UINT32 )
+SbxBase* SbxFactory::Create( sal_uInt16, sal_uInt32 )
 {
     return NULL;
 }
@@ -393,7 +393,7 @@ SbxInfo::~SbxInfo()
 {}
 
 void SbxInfo::AddParam
-        ( const XubString& rName, SbxDataType eType, USHORT nFlags )
+        ( const XubString& rName, SbxDataType eType, sal_uInt16 nFlags )
 {
     const SbxParamInfo* p = new SbxParamInfo( rName, eType, nFlags );
     aParams.Insert( p, aParams.Count() );
@@ -406,7 +406,7 @@ void SbxInfo::AddParam( const SbxParamInfo& r )
     aParams.Insert( p, aParams.Count() );
 }
 
-const SbxParamInfo* SbxInfo::GetParam( USHORT n ) const
+const SbxParamInfo* SbxInfo::GetParam( sal_uInt16 n ) const
 {
     if( n < 1 || n > aParams.Count() )
         return NULL;
@@ -414,18 +414,18 @@ const SbxParamInfo* SbxInfo::GetParam( USHORT n ) const
         return aParams.GetObject( n-1 );
 }
 
-BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     aParams.Remove( 0, aParams.Count() );
-    UINT16 nParam;
+    sal_uInt16 nParam;
     rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US );
     rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
     rStrm >> nHelpId >> nParam;
     while( nParam-- )
     {
         XubString aName;
-        UINT16 nType, nFlags;
-        UINT32 nUserData = 0;
+        sal_uInt16 nType, nFlags;
+        sal_uInt32 nUserData = 0;
         rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US );
         rStrm >> nType >> nFlags;
         if( nVer > 1 )
@@ -434,22 +434,22 @@ BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
         SbxParamInfo* p = aParams.GetObject( aParams.Count() - 1 );
         p->nUserData = nUserData;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxInfo::StoreData( SvStream& rStrm ) const
+sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const
 {
     rStrm.WriteByteString( aComment, RTL_TEXTENCODING_ASCII_US );
     rStrm.WriteByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
     rStrm << nHelpId << aParams.Count();
-    for( USHORT i = 0; i < aParams.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aParams.Count(); i++ )
     {
         SbxParamInfo* p = aParams.GetObject( i );
         rStrm.WriteByteString( p->aName, RTL_TEXTENCODING_ASCII_US );
-        rStrm << (UINT16) p->eType
-              << (UINT16) p->nFlags
-              << (UINT32) p->nUserData;
+        rStrm << (sal_uInt16) p->eType
+              << (sal_uInt16) p->nFlags
+              << (sal_uInt32) p->nUserData;
     }
-    return TRUE;
+    return sal_True;
 }
 
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index c3ed0d09b134..7b9ffe8a1136 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -94,15 +94,15 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
                 else if( !p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_FALSE ) ) )
                 {
                     // Jetzt kann es noch in eine Zahl konvertierbar sein
-                    BOOL bError = TRUE;
+                    sal_Bool bError = sal_True;
                     double n;
                     SbxDataType t;
-                    USHORT nLen = 0;
+                    sal_uInt16 nLen = 0;
                     if( ImpScan( *p->pOUString, n, t, &nLen ) == SbxERR_OK )
                     {
                         if( nLen == p->pOUString->getLength() )
                         {
-                            bError = FALSE;
+                            bError = sal_False;
                             if( n != 0.0 )
                                 nRes = SbxTRUE;
                         }
@@ -159,7 +159,7 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
     return nRes;
 }
 
-void ImpPutBool( SbxValues* p, INT16 n )
+void ImpPutBool( SbxValues* p, sal_Int16 n )
 {
     if( n )
         n = SbxTRUE;
@@ -168,17 +168,17 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxCHAR:
             p->nChar = (xub_Unicode) n; break;
         case SbxUINT:
-            p->nByte = (BYTE) n; break;
+            p->nByte = (sal_uInt8) n; break;
         case SbxINTEGER:
         case SbxBOOL:
             p->nInteger = n; break;
         case SbxLONG:
             p->nLong = n; break;
         case SbxULONG:
-            p->nULong = (UINT32) n; break;
+            p->nULong = (sal_uInt32) n; break;
         case SbxERROR:
         case SbxUSHORT:
-            p->nUShort = (UINT16) n; break;
+            p->nUShort = (sal_uInt16) n; break;
         case SbxSINGLE:
             p->nSingle = n; break;
         case SbxDATE:
@@ -189,13 +189,13 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxSALUINT64:
             p->uInt64 = n; break;
         case SbxULONG64:
-            p->nULong64.Set( (UINT32)n ); break;
+            p->nULong64.Set( (sal_uInt32)n ); break;
         case SbxLONG64:
         case SbxCURRENCY:
-            p->nLong64.Set( (INT32)n ); break;
+            p->nLong64.Set( (sal_Int32)n ); break;
         case SbxDECIMAL:
         case SbxBYREF | SbxDECIMAL:
-            ImpCreateDecimal( p )->setInt( (INT16)n );
+            ImpCreateDecimal( p )->setInt( (sal_Int16)n );
             break;
 
         case SbxBYREF | SbxSTRING:
@@ -211,7 +211,7 @@ void ImpPutBool( SbxValues* p, INT16 n )
         {
             SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
             if( pVal )
-                pVal->PutBool( BOOL( n != 0 ) );
+                pVal->PutBool( sal_Bool( n != 0 ) );
             else
                 SbxBase::SetError( SbxERR_NO_OBJECT );
             break;
@@ -219,17 +219,17 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxBYREF | SbxCHAR:
             *p->pChar = (xub_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             *p->pLong = n; break;
         case SbxBYREF | SbxULONG:
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pSingle = n; break;
         case SbxBYREF | SbxDATE:
@@ -240,10 +240,10 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxBYREF | SbxSALUINT64:
             *p->puInt64 = n; break;
         case SbxBYREF | SbxULONG64:
-            p->pULong64->Set( (UINT32)n ); break;
+            p->pULong64->Set( (sal_uInt32)n ); break;
         case SbxBYREF | SbxLONG64:
         case SbxBYREF | SbxCURRENCY:
-            p->pLong64->Set( (INT32)n ); break;
+            p->pLong64->Set( (sal_Int32)n ); break;
 
         default:
             SbxBase::SetError( SbxERR_CONVERSION );
diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx
index e13c63967fc3..1a9c80f1dd06 100644
--- a/basic/source/sbx/sbxbyte.cxx
+++ b/basic/source/sbx/sbxbyte.cxx
@@ -31,10 +31,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-BYTE ImpGetByte( const SbxValues* p )
+sal_uInt8 ImpGetByte( const SbxValues* p )
 {
     SbxValues aTmp;
-    BYTE nRes;
+    sal_uInt8 nRes;
 start:
     switch( +p->eType )
     {
@@ -48,10 +48,10 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nChar;
+                nRes = (sal_uInt8) p->nChar;
             break;
         case SbxBYTE:
-            nRes = (BYTE) p->nByte; break;
+            nRes = (sal_uInt8) p->nByte;    break;
         case SbxINTEGER:
         case SbxBOOL:
             if( p->nInteger > SbxMAXBYTE )
@@ -63,16 +63,16 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nInteger;
+                nRes = (sal_uInt8) p->nInteger;
             break;
         case SbxERROR:
         case SbxUSHORT:
-            if( p->nUShort > (USHORT) SbxMAXBYTE )
+            if( p->nUShort > (sal_uInt16) SbxMAXBYTE )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->nUShort;
+                nRes = (sal_uInt8) p->nUShort;
             break;
         case SbxLONG:
             if( p->nLong > SbxMAXBYTE )
@@ -84,7 +84,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nLong;
+                nRes = (sal_uInt8) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXBYTE )
@@ -92,7 +92,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->nULong;
+                nRes = (sal_uInt8) p->nULong;
             break;
         case SbxSALINT64:
             if( p->nInt64 > SbxMAXBYTE )
@@ -104,7 +104,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nInt64;
+                nRes = (sal_uInt8) p->nInt64;
             break;
         case SbxSALUINT64:
             if( p->uInt64 > SbxMAXBYTE )
@@ -112,7 +112,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->uInt64;
+                nRes = (sal_uInt8) p->uInt64;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXBYTE )
@@ -124,7 +124,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) ImpRound( p->nSingle );
+                nRes = (sal_uInt8) ImpRound( p->nSingle );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -159,7 +159,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) ImpRound( dVal );
+                nRes = (sal_uInt8) ImpRound( dVal );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -182,7 +182,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
                 }
                 else
-                    nRes = (BYTE) ( d + 0.5 );
+                    nRes = (sal_uInt8) ( d + 0.5 );
             }
             break;
         case SbxOBJECT:
@@ -237,7 +237,7 @@ start:
     return nRes;
 }
 
-void ImpPutByte( SbxValues* p, BYTE n )
+void ImpPutByte( SbxValues* p, sal_uInt8 n )
 {
     switch( +p->eType )
     {
diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index bd4ce91f451b..578f0cfb8adf 100644
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -150,7 +150,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
             }
             else
-                nRes = (BYTE) ImpRound( dVal );
+                nRes = (sal_uInt8) ImpRound( dVal );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -289,17 +289,17 @@ start:
         case SbxBYREF | SbxCHAR:
             *p->pChar = n; break;
         case SbxBYREF | SbxBYTE:
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             *p->pInteger = n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pSingle = (float) n; break;
         case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 7bd32900ecc9..1c95591e28dd 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -41,7 +41,7 @@ static const char* pCount;
 static const char* pAdd;
 static const char* pItem;
 static const char* pRemove;
-static USHORT nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
+static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
 
 /////////////////////////////////////////////////////////////////////////
 
@@ -61,7 +61,7 @@ SbxCollection::SbxCollection( const XubString& rClass )
     }
     Initialize();
     // Fuer Zugriffe auf sich selbst
-    StartListening( GetBroadcaster(), TRUE );
+    StartListening( GetBroadcaster(), sal_True );
 }
 
 SbxCollection::SbxCollection( const SbxCollection& rColl )
@@ -101,7 +101,7 @@ void SbxCollection::Initialize()
     p->SetFlag( SBX_DONTSTORE );
 }
 
-SbxVariable* SbxCollection::FindUserData( UINT32 nData )
+SbxVariable* SbxCollection::FindUserData( sal_uInt32 nData )
 {
     if( GetParameters() )
     {
@@ -129,9 +129,9 @@ void SbxCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
     const SbxHint* p = PTR_CAST(SbxHint,&rHint);
     if( p )
     {
-        ULONG nId = p->GetId();
-        BOOL bRead  = BOOL( nId == SBX_HINT_DATAWANTED );
-        BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
+        sal_uIntPtr nId = p->GetId();
+        sal_Bool bRead  = sal_Bool( nId == SBX_HINT_DATAWANTED );
+        sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
         SbxVariable* pVar = p->GetVar();
         SbxArray* pArg = pVar->GetParameters();
         if( bRead || bWrite )
@@ -191,7 +191,7 @@ void SbxCollection::CollItem( SbxArray* pPar_ )
         {
             short n = p->GetInteger();
             if( n >= 1 && n <= (short) pObjs->Count() )
-                pRes = pObjs->Get( (USHORT) n - 1 );
+                pRes = pObjs->Get( (sal_uInt16) n - 1 );
         }
         if( !pRes )
             SetError( SbxERR_BAD_INDEX );
@@ -211,13 +211,13 @@ void SbxCollection::CollRemove( SbxArray* pPar_ )
         if( n < 1 || n > (short) pObjs->Count() )
             SetError( SbxERR_BAD_INDEX );
         else
-            Remove( pObjs->Get( (USHORT) n - 1 ) );
+            Remove( pObjs->Get( (sal_uInt16) n - 1 ) );
     }
 }
 
-BOOL SbxCollection::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    BOOL bRes = SbxObject::LoadData( rStrm, nVer );
+    sal_Bool bRes = SbxObject::LoadData( rStrm, nVer );
     Initialize();
     return bRes;
 }
@@ -225,7 +225,7 @@ BOOL SbxCollection::LoadData( SvStream& rStrm, USHORT nVer )
 /////////////////////////////////////////////////////////////////////////
 
 SbxStdCollection::SbxStdCollection
-                    ( const XubString& rClass, const XubString& rElem, BOOL b )
+                    ( const XubString& rClass, const XubString& rElem, sal_Bool b )
                   : SbxCollection( rClass ), aElemClass( rElem ),
                     bAddRemoveOk( b )
 {}
@@ -277,9 +277,9 @@ void SbxStdCollection::CollRemove( SbxArray* pPar_ )
         SbxCollection::CollRemove( pPar_ );
 }
 
-BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    BOOL bRes = SbxCollection::LoadData( rStrm, nVer );
+    sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer );
     if( bRes )
     {
         rStrm.ReadByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
@@ -288,9 +288,9 @@ BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
     return bRes;
 }
 
-BOOL SbxStdCollection::StoreData( SvStream& rStrm ) const
+sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const
 {
-    BOOL bRes = SbxCollection::StoreData( rStrm );
+    sal_Bool bRes = SbxCollection::StoreData( rStrm );
     if( bRes )
     {
         rStrm.WriteByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index 16fec542cded..61edeef3a4fa 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -33,19 +33,19 @@
 class SbxArray;
 
 // SBXSCAN.CXX
-extern void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreString=FALSE );
+extern void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, sal_Bool bCoreString=sal_False );
 extern SbxError ImpScan
-    ( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, USHORT* pLen,
-      BOOL bAllowIntntl=FALSE, BOOL bOnlyIntntl=FALSE );
+    ( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, sal_uInt16* pLen,
+      sal_Bool bAllowIntntl=sal_False, sal_Bool bOnlyIntntl=sal_False );
 
-// mit erweiterter Auswertung (International, "TRUE"/"FALSE")
-extern BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
+// mit erweiterter Auswertung (International, "sal_True"/"sal_False")
+extern sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
 
 // SBXINT.CXX
 
 double      ImpRound( double );
-INT16       ImpGetInteger( const SbxValues* );
-void        ImpPutInteger( SbxValues*, INT16 );
+sal_Int16       ImpGetInteger( const SbxValues* );
+void        ImpPutInteger( SbxValues*, sal_Int16 );
 sal_Int64   ImpGetInt64( const SbxValues* );
 void        ImpPutInt64( SbxValues*, sal_Int64 );
 sal_uInt64  ImpGetUInt64( const SbxValues* );
@@ -57,8 +57,8 @@ double      ImpSalUInt64ToDouble( sal_uInt64 n );
 
 // SBXLNG.CXX
 
-INT32   ImpGetLong( const SbxValues* );
-void    ImpPutLong( SbxValues*, INT32 );
+sal_Int32   ImpGetLong( const SbxValues* );
+void    ImpPutLong( SbxValues*, sal_Int32 );
 
 // SBXSNG.CXX
 
@@ -68,7 +68,7 @@ void    ImpPutSingle( SbxValues*, float );
 // SBXDBL.CXX
 
 double  ImpGetDouble( const SbxValues* );
-void    ImpPutDouble( SbxValues*, double, BOOL bCoreString=FALSE );
+void    ImpPutDouble( SbxValues*, double, sal_Bool bCoreString=sal_False );
 
 #if FALSE
 // SBX64.CXX
@@ -87,10 +87,10 @@ SbxINT64  ImpDoubleToINT64( double );
 double    ImpINT64ToDouble( const SbxINT64& );
 
 #if TRUE
-INT32     ImpGetCurrLong( const SbxValues* );
-void      ImpPutCurrLong( SbxValues*, INT32 );
-INT32     ImpDoubleToCurrLong( double );
-double    ImpCurrLongToDouble( INT32 );
+sal_Int32     ImpGetCurrLong( const SbxValues* );
+void      ImpPutCurrLong( SbxValues*, sal_Int32 );
+sal_Int32     ImpDoubleToCurrLong( double );
+double    ImpCurrLongToDouble( sal_Int32 );
 #endif
 
 SbxINT64  ImpGetCurrency( const SbxValues* );
@@ -126,23 +126,23 @@ sal_Unicode ImpGetChar( const SbxValues* );
 void    ImpPutChar( SbxValues*, sal_Unicode );
 
 // SBXBYTE.CXX
-BYTE    ImpGetByte( const SbxValues* );
-void    ImpPutByte( SbxValues*, BYTE );
+sal_uInt8   ImpGetByte( const SbxValues* );
+void    ImpPutByte( SbxValues*, sal_uInt8 );
 
 // SBXUINT.CXX
 
-UINT16  ImpGetUShort( const SbxValues* );
-void    ImpPutUShort( SbxValues*, UINT16 );
+sal_uInt16  ImpGetUShort( const SbxValues* );
+void    ImpPutUShort( SbxValues*, sal_uInt16 );
 
 // SBXULNG.CXX
 
-UINT32  ImpGetULong( const SbxValues* );
-void    ImpPutULong( SbxValues*, UINT32 );
+sal_uInt32  ImpGetULong( const SbxValues* );
+void    ImpPutULong( SbxValues*, sal_uInt32 );
 
 // SBXBOOL.CXX
 
 enum SbxBOOL ImpGetBool( const SbxValues* );
-void    ImpPutBool( SbxValues*, INT16 );
+void    ImpPutBool( SbxValues*, sal_Int16 );
 
 // ByteArry <--> String
 SbxArray* StringToByteArray(const ::rtl::OUString& rStr);
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index e27b11d5166c..5b6e631d174f 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -257,7 +257,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = 0;
             }
-            *p->pByte = (BYTE) dVal; break;
+            *p->pByte = (sal_uInt8) dVal; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( dVal > SbxMAXINT )
@@ -268,7 +268,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = SbxMININT;
             }
-            *p->pInteger = (INT16) dVal; break;
+            *p->pInteger = (sal_Int16) dVal; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( dVal > SbxMAXUINT )
@@ -279,7 +279,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = 0;
             }
-            *p->pUShort = (UINT16) dVal; break;
+            *p->pUShort = (sal_uInt16) dVal; break;
         case SbxBYREF | SbxLONG:
             if( dVal > SbxMAXLNG )
             {
@@ -289,7 +289,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = SbxMINLNG;
             }
-            *p->pLong = (INT32) dVal; break;
+            *p->pLong = (sal_Int32) dVal; break;
         case SbxBYREF | SbxULONG:
             if( dVal > SbxMAXULNG )
             {
@@ -299,7 +299,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = 0;
             }
-            *p->pULong = (UINT32) dVal; break;
+            *p->pULong = (sal_uInt32) dVal; break;
         case SbxBYREF | SbxSALINT64:
             *p->pnInt64 = ImpDoubleToSalInt64( dVal ); break;
         case SbxBYREF | SbxSALUINT64:
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index 1ac8c254ca6b..1d0b81ed98f6 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -125,13 +125,13 @@ double ImpGetDate( const SbxValues* p )
 
                 pFormatter->PutandConvertEntry( aStr, nCheckPos,    nType,
                     nIndex, LANGUAGE_GERMAN, eLangType );
-                BOOL bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes );
+                sal_Bool bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes );
                 if ( bSuccess )
                 {
                     short nType_ = pFormatter->GetType( nIndex );
                     if(!(nType_ & ( NUMBERFORMAT_DATETIME | NUMBERFORMAT_DATE |
                                     NUMBERFORMAT_TIME | NUMBERFORMAT_DEFINED )))
-                        bSuccess = FALSE;
+                        bSuccess = sal_False;
                 }
 
                 if ( !bSuccess )
@@ -328,7 +328,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -339,7 +339,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -350,7 +350,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
@@ -360,7 +360,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n > SbxMAXULNG )
             {
@@ -370,7 +370,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             if( n > SbxMAXSNG )
             {
diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx
index be55d3409131..efbad5521f3b 100644
--- a/basic/source/sbx/sbxdbl.cxx
+++ b/basic/source/sbx/sbxdbl.cxx
@@ -140,7 +140,7 @@ double ImpGetDouble( const SbxValues* p )
     return nRes;
 }
 
-void ImpPutDouble( SbxValues* p, double n, BOOL bCoreString )
+void ImpPutDouble( SbxValues* p, double n, sal_Bool bCoreString )
 {
     SbxValues aTmp;
 start:
@@ -220,7 +220,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -231,7 +231,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -242,7 +242,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
@@ -252,7 +252,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n > SbxMAXULNG )
             {
@@ -262,7 +262,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             if( n > SbxMAXSNG )
             {
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 2191d91c8d82..3a0e65c142e2 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -158,32 +158,32 @@ SbxDecimal::CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight
 
 void SbxDecimal::setChar( sal_Unicode val )
 {
-    VarDecFromUI2( (USHORT)val, &maDec );
+    VarDecFromUI2( (sal_uInt16)val, &maDec );
 }
 
-void SbxDecimal::setByte( BYTE val )
+void SbxDecimal::setByte( sal_uInt8 val )
 {
-    VarDecFromUI1( (BYTE)val, &maDec );
+    VarDecFromUI1( (sal_uInt8)val, &maDec );
 }
 
-void SbxDecimal::setShort( INT16 val )
+void SbxDecimal::setShort( sal_Int16 val )
 {
     VarDecFromI2( (short)val, &maDec );
 }
 
-void SbxDecimal::setLong( INT32 val )
+void SbxDecimal::setLong( sal_Int32 val )
 {
     VarDecFromI4( (long)val, &maDec );
 }
 
-void SbxDecimal::setUShort( UINT16 val )
+void SbxDecimal::setUShort( sal_uInt16 val )
 {
-    VarDecFromUI2( (USHORT)val, &maDec );
+    VarDecFromUI2( (sal_uInt16)val, &maDec );
 }
 
-void SbxDecimal::setULong( UINT32 val )
+void SbxDecimal::setULong( sal_uInt32 val )
 {
-    VarDecFromUI4( (ULONG)val, &maDec );
+    VarDecFromUI4( (sal_uIntPtr)val, &maDec );
 }
 
 bool SbxDecimal::setSingle( float val )
@@ -200,12 +200,12 @@ bool SbxDecimal::setDouble( double val )
 
 void SbxDecimal::setInt( int val )
 {
-    setLong( (INT32)val );
+    setLong( (sal_Int32)val );
 }
 
 void SbxDecimal::setUInt( unsigned int val )
 {
-    setULong( (UINT32)val );
+    setULong( (sal_uInt32)val );
 }
 
 // sbxscan.cxx
@@ -261,31 +261,31 @@ bool SbxDecimal::getChar( sal_Unicode& rVal )
     return bRet;
 }
 
-bool SbxDecimal::getByte( BYTE& rVal )
+bool SbxDecimal::getByte( sal_uInt8& rVal )
 {
     bool bRet = ( VarUI1FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
 }
 
-bool SbxDecimal::getShort( INT16& rVal )
+bool SbxDecimal::getShort( sal_Int16& rVal )
 {
     bool bRet = ( VarI2FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
 }
 
-bool SbxDecimal::getLong( INT32& rVal )
+bool SbxDecimal::getLong( sal_Int32& rVal )
 {
     bool bRet = ( VarI4FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
 }
 
-bool SbxDecimal::getUShort( UINT16& rVal )
+bool SbxDecimal::getUShort( sal_uInt16& rVal )
 {
     bool bRet = ( VarUI2FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
 }
 
-bool SbxDecimal::getULong( UINT32& rVal )
+bool SbxDecimal::getULong( sal_uInt32& rVal )
 {
     bool bRet = ( VarUI4FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
@@ -305,7 +305,7 @@ bool SbxDecimal::getDouble( double& rVal )
 
 bool SbxDecimal::getInt( int& rVal )
 {
-    INT32 TmpVal;
+    sal_Int32 TmpVal;
     bool bRet = getLong( TmpVal );
     rVal = TmpVal;
     return bRet;
@@ -313,7 +313,7 @@ bool SbxDecimal::getInt( int& rVal )
 
 bool SbxDecimal::getUInt( unsigned int& rVal )
 {
-    UINT32 TmpVal;
+    sal_uInt32 TmpVal;
     bool bRet = getULong( TmpVal );
     rVal = TmpVal;
     return bRet;
@@ -364,11 +364,11 @@ SbxDecimal::CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight
 }
 
 void SbxDecimal::setChar( sal_Unicode val )     { (void)val; }
-void SbxDecimal::setByte( BYTE val )            { (void)val; }
-void SbxDecimal::setShort( INT16 val )          { (void)val; }
-void SbxDecimal::setLong( INT32 val )           { (void)val; }
-void SbxDecimal::setUShort( UINT16 val )        { (void)val; }
-void SbxDecimal::setULong( UINT32 val )         { (void)val; }
+void SbxDecimal::setByte( sal_uInt8 val )           { (void)val; }
+void SbxDecimal::setShort( sal_Int16 val )          { (void)val; }
+void SbxDecimal::setLong( sal_Int32 val )           { (void)val; }
+void SbxDecimal::setUShort( sal_uInt16 val )        { (void)val; }
+void SbxDecimal::setULong( sal_uInt32 val )         { (void)val; }
 bool SbxDecimal::setSingle( float val )         { (void)val; return false; }
 bool SbxDecimal::setDouble( double val )        { (void)val; return false; }
 void SbxDecimal::setInt( int val )              { (void)val; }
@@ -376,11 +376,11 @@ void SbxDecimal::setUInt( unsigned int val )    { (void)val; }
 bool SbxDecimal::setString( ::rtl::OUString* pOUString )    { (void)pOUString;  return false; }
 
 bool SbxDecimal::getChar( sal_Unicode& rVal )   { (void)rVal; return false; }
-bool SbxDecimal::getByte( BYTE& rVal )          { (void)rVal; return false; }
-bool SbxDecimal::getShort( INT16& rVal )        { (void)rVal; return false; }
-bool SbxDecimal::getLong( INT32& rVal )         { (void)rVal; return false; }
-bool SbxDecimal::getUShort( UINT16& rVal )      { (void)rVal; return false; }
-bool SbxDecimal::getULong( UINT32& rVal )       { (void)rVal; return false; }
+bool SbxDecimal::getByte( sal_uInt8& rVal )         { (void)rVal; return false; }
+bool SbxDecimal::getShort( sal_Int16& rVal )        { (void)rVal; return false; }
+bool SbxDecimal::getLong( sal_Int32& rVal )         { (void)rVal; return false; }
+bool SbxDecimal::getUShort( sal_uInt16& rVal )      { (void)rVal; return false; }
+bool SbxDecimal::getULong( sal_uInt32& rVal )       { (void)rVal; return false; }
 bool SbxDecimal::getSingle( float& rVal )       { (void)rVal; return false; }
 bool SbxDecimal::getDouble( double& rVal )      { (void)rVal; return false; }
 bool SbxDecimal::getInt( int& rVal )            { (void)rVal; return false; }
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index cd80bbad282e..6b8cd7e31336 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -61,7 +61,7 @@ class SbxDecimal
 #ifdef WIN32
     DECIMAL     maDec;
 #endif
-    INT32       mnRefCount;
+    sal_Int32       mnRefCount;
 
 public:
     SbxDecimal( void );
@@ -76,11 +76,11 @@ public:
     void fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
 
     void setChar( sal_Unicode val );
-    void setByte( BYTE val );
-    void setShort( INT16 val );
-    void setLong( INT32 val );
-    void setUShort( UINT16 val );
-    void setULong( UINT32 val );
+    void setByte( sal_uInt8 val );
+    void setShort( sal_Int16 val );
+    void setLong( sal_Int32 val );
+    void setUShort( sal_uInt16 val );
+    void setULong( sal_uInt32 val );
     bool setSingle( float val );
     bool setDouble( double val );
     void setInt( int val );
@@ -97,11 +97,11 @@ public:
     }
 
     bool getChar( sal_Unicode& rVal );
-    bool getByte( BYTE& rVal );
-    bool getShort( INT16& rVal );
-    bool getLong( INT32& rVal );
-    bool getUShort( UINT16& rVal );
-    bool getULong( UINT32& rVal );
+    bool getByte( sal_uInt8& rVal );
+    bool getShort( sal_Int16& rVal );
+    bool getLong( sal_Int32& rVal );
+    bool getUShort( sal_uInt16& rVal );
+    bool getULong( sal_uInt32& rVal );
     bool getSingle( float& rVal );
     bool getDouble( double& rVal );
     bool getInt( int& rVal );
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index c602b130fc5e..9b43a94873f0 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -37,21 +37,21 @@
 class SbxSimpleCharClass
 {
 public:
-    BOOL isAlpha( sal_Unicode c ) const
+    sal_Bool isAlpha( sal_Unicode c ) const
     {
-        BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+        sal_Bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
         return bRet;
     }
 
-    BOOL isDigit( sal_Unicode c ) const
+    sal_Bool isDigit( sal_Unicode c ) const
     {
-        BOOL bRet = (c >= '0' && c <= '9');
+        sal_Bool bRet = (c >= '0' && c <= '9');
         return bRet;
     }
 
-    BOOL isAlphaNumeric( sal_Unicode c ) const
+    sal_Bool isAlphaNumeric( sal_Unicode c ) const
     {
-        BOOL bRet = isDigit( c ) || isAlpha( c );
+        sal_Bool bRet = isDigit( c ) || isAlpha( c );
         return bRet;
     }
 };
@@ -73,7 +73,7 @@ static const xub_Unicode* SkipWhitespace( const xub_Unicode* p )
 
 static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const SbxSimpleCharClass& rCharClass )
 {
-    USHORT nLen = 0;
+    sal_uInt16 nLen = 0;
     // Haben wir ein Sondersymbol?
     if( *p == '[' )
     {
@@ -143,7 +143,7 @@ static SbxVariable* QualifiedName
 // eine Funktion (mit optionalen Parametern) sein.
 
 static SbxVariable* Operand
-    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, BOOL bVar )
+    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, sal_Bool bVar )
 {
     static SbxSimpleCharClass aCharClass;
 
@@ -155,7 +155,7 @@ static SbxVariable* Operand
      || *p == '&' ) )
     {
         // Eine Zahl kann direkt eingescant werden!
-        USHORT nLen;
+        sal_uInt16 nLen;
         if( !refVar->Scan( XubString( p ), &nLen ) )
             refVar.Clear();
         else
@@ -193,12 +193,12 @@ static SbxVariable* Operand
 static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
 {
     const xub_Unicode* p = *ppBuf;
-    SbxVariableRef refVar( Operand( pObj, pGbl, &p, FALSE ) );
+    SbxVariableRef refVar( Operand( pObj, pGbl, &p, sal_False ) );
     p = SkipWhitespace( p );
     while( refVar.Is() && ( *p == '*' || *p == '/' ) )
     {
         xub_Unicode cOp = *p++;
-        SbxVariableRef refVar2( Operand( pObj, pGbl, &p, FALSE ) );
+        SbxVariableRef refVar2( Operand( pObj, pGbl, &p, sal_False ) );
         if( refVar2.Is() )
         {
             // temporaere Variable!
@@ -257,7 +257,7 @@ static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const xub_Unico
 static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
 {
     const xub_Unicode* p = *ppBuf;
-    SbxVariableRef refVar( Operand( pObj, pGbl, &p, TRUE ) );
+    SbxVariableRef refVar( Operand( pObj, pGbl, &p, sal_True ) );
     p = SkipWhitespace( p );
     if( refVar.Is() )
     {
@@ -305,7 +305,7 @@ static SbxVariable* Element
     SbxVariableRef refVar;
     if( aSym.Len() )
     {
-        USHORT nOld = pObj->GetFlags();
+        sal_uInt16 nOld = pObj->GetFlags();
         if( pObj == pGbl )
             pObj->SetFlag( SBX_GBLSEARCH );
         refVar = pObj->Find( aSym, t );
@@ -319,7 +319,7 @@ static SbxVariable* Element
             {
                 p++;
                 SbxArrayRef refPar = new SbxArray;
-                USHORT nArg = 0;
+                sal_uInt16 nArg = 0;
                 // Wird sind mal relaxed und akzeptieren auch
                 // das Zeilen- oder Komandoende als Begrenzer
                 // Parameter immer global suchen!
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index b53612f1e642..46b6e6caa445 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -151,7 +151,7 @@ void SbxBasicFormater::ShowError( char * sErrMsg )
 // um eine Position zu gr"osseren Indizes, d.h. es wird Platz f"ur
 // ein neues (einzuf"ugendes) Zeichen geschafft.
 // ACHTUNG: der String MUSS gross genug sein !
-inline void SbxBasicFormater::ShiftString( String& sStrg, USHORT nStartPos )
+inline void SbxBasicFormater::ShiftString( String& sStrg, sal_uInt16 nStartPos )
 {
     sStrg.Erase( nStartPos,1 );
 }
@@ -174,7 +174,7 @@ void SbxBasicFormater::AppendDigit( String& sStrg, short nDigit )
 // verschiebt den Dezimal-Punkt um eine Stelle nach links
 void SbxBasicFormater::LeftShiftDecimalPoint( String& sStrg )
 {
-    USHORT nPos = sStrg.Search( cDecPoint );
+    sal_uInt16 nPos = sStrg.Search( cDecPoint );
 
     if( nPos!=STRING_NOTFOUND )
     {
@@ -188,13 +188,13 @@ void SbxBasicFormater::LeftShiftDecimalPoint( String& sStrg )
 // es wird ein Flag zur"uckgeliefert, falls ein Overflow auftrat,
 // d.h. 99.99 --> 100.00, d.h. ein Gr"ossenordung ge"andert wurde
 // (geschieht beim Runden einer 9).
-void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow )
+void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, sal_Bool& bOverflow )
 {
     // wurde ggf ein falscher Index uebergeben --> Aufruf ignorieren
     if( nPos<0 )
         return;
 
-    bOverflow = FALSE;
+    bOverflow = sal_False;
     // "uberspringe den Dezimalpunkt und Tausender-Trennzeichen
     sal_Unicode c = sStrg.GetChar( nPos );
     if( nPos>0 && (c == cDecPoint || c == cThousandSep) )
@@ -218,7 +218,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
         ShiftString( sStrg,0 );
         // f"uhrende 1 einf"ugen: z.B. 99.99 f"ur 0.0
         sStrg.SetChar( 0, '1' );
-        bOverflow = TRUE;
+        bOverflow = sal_True;
     }
     else
     {
@@ -243,7 +243,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
             ShiftString( sStrg,nPos+1 );
             // f"uhrende 1 einf"ugen
             sStrg.SetChar( nPos+1, '1' );
-            bOverflow = TRUE;
+            bOverflow = sal_True;
         }
     }
 }
@@ -251,7 +251,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
 // rundet in einem String die Ziffer an der angegebenen Stelle
 void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos )
 {
-    BOOL bOverflow;
+    sal_Bool bOverflow;
 
     StrRoundDigit( sStrg,nPos,bOverflow );
 }
@@ -302,7 +302,7 @@ void SbxBasicFormater::InitExp( double _dNewExp )
 
 // bestimmt die Ziffer an der angegebenen Stelle (gedacht zur Anwendung im
 // Scan-Durchlauf)
-short SbxBasicFormater::GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit )
+short SbxBasicFormater::GetDigitAtPosScan( short nPos, sal_Bool& bFoundFirstDigit )
 {
     // Versuch eine gr"ossere Ziffer zu lesen,
     // z.B. Stelle 4 in 1.234,
@@ -312,18 +312,18 @@ short SbxBasicFormater::GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit )
         return _NO_DIGIT;
     // bestimme den Index der Stelle in dem Number-String:
     // "uberlese das Vorzeichen
-    USHORT no = 1;
+    sal_uInt16 no = 1;
     // falls notwendig den Dezimal-Punkt "uberlesen:
     if( nPos<nNumExp )
         no++;
     no += nNumExp-nPos;
     // Abfrage der ersten (g"ultigen) Ziffer der Zahl --> Flag setzen
     if( nPos==nNumExp )
-        bFoundFirstDigit = TRUE;
+        bFoundFirstDigit = sal_True;
     return (short)(sSciNumStrg.GetChar( no ) - ASCII_0);
 }
 
-short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit )
+short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, sal_Bool& bFoundFirstDigit )
 {
     // ist die abgefragte Stelle zu gross f"ur den Exponenten ?
     if( nPos>nExpExp )
@@ -331,11 +331,11 @@ short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit
 
     // bestimme den Index der Stelle in dem Number-String:
     // "uberlese das Vorzeichen
-    USHORT no = 1;
+    sal_uInt16 no = 1;
     no += nExpExp-nPos;
     // Abfrage der ersten (g"ultigen) Ziffer der Zahl --> Flag setzen
     if( nPos==nExpExp )
-        bFoundFirstDigit = TRUE;
+        bFoundFirstDigit = sal_True;
     return (short)(sNumExpStrg.GetChar( no ) - ASCII_0);
 }
 
@@ -343,7 +343,7 @@ short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit
 // Zahl ggf. NICHT normiert (z.B. 1.2345e-03) dargestellt werden soll,
 // sondern eventuell 123.345e-3 !
 short SbxBasicFormater::GetDigitAtPosExpScan( double dNewExponent, short nPos,
-                                              BOOL& bFoundFirstDigit )
+                                              sal_Bool& bFoundFirstDigit )
 {
     // neuer Exponent wurde "ubergeben, aktualisiere
     // die tempor"aren Klassen-Variablen
@@ -381,7 +381,7 @@ TODO: ggf einen 'intelligenten' Peek-Parser um Rundungsfehler bei
 //
 // ACHTUNG: anscheinend gibt es manchmal noch Probleme mit Rundungs-Fehlern!
 short SbxBasicFormater::GetDigitAtPos( double dNumber, short nPos,
-                                double& dNextNumber, BOOL& bFoundFirstDigit )
+                                double& dNextNumber, sal_Bool& bFoundFirstDigit )
 // ACHTUNG: nPos kann auch negativ werden, f"ur Stellen nach dem Dezimal-Punkt
 {
     double dTemp = dNumber;
@@ -400,7 +400,7 @@ short SbxBasicFormater::GetDigitAtPos( double dNumber, short nPos,
     if( nMaxDigit<nPos && !bFoundFirstDigit && nPos>=0 )
         return _NO_DIGIT;
     // Ziffer gefunden, setze Flag:
-    bFoundFirstDigit = TRUE;
+    bFoundFirstDigit = sal_True;
     for( short i=nMaxDigit; i>=nPos; i-- )
     {
         double dI = (double)i;
@@ -432,14 +432,14 @@ short SbxBasicFormater::RoundDigit( double dNumber )
 // und liefert diesen zur"uck.
 // Somit wird ein neuer String erzeugt, der vom Aufrufer wieder freigegeben
 // werden muss
-String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, sal_Bool & bFound )
 {
-    bFound = FALSE;     // default...
-    USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+    bFound = sal_False;     // default...
+    sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
 
     if( nPos!=STRING_NOTFOUND )
     {
-        bFound = TRUE;
+        bFound = sal_True;
         // der Format-String f"ur die positiven Zahlen ist alles
         // vor dem ersten ';'
         return sFormatStrg.Copy( 0,nPos );
@@ -451,10 +451,10 @@ String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, BOOL & b
 }
 
 // siehe auch GetPosFormatString()
-String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, sal_Bool & bFound )
 {
-    bFound = FALSE;     // default...
-    USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+    bFound = sal_False;     // default...
+    sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
 
     if( nPos!=STRING_NOTFOUND )
     {
@@ -464,7 +464,7 @@ String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & b
         String sTempStrg = sFormatStrg.Copy( nPos+1 );
         // und suche darin ggf. ein weiteres ';'
         nPos = sTempStrg.Search( FORMAT_SEPARATOR );
-        bFound = TRUE;
+        bFound = sal_True;
         if( nPos==STRING_NOTFOUND )
             // keins gefunden, liefere alles...
             return sTempStrg;
@@ -478,10 +478,10 @@ String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & b
 }
 
 // siehe auch GetPosFormatString()
-String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, sal_Bool & bFound )
 {
-    bFound = FALSE;     // default...
-    USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+    bFound = sal_False;     // default...
+    sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
 
     if( nPos!=STRING_NOTFOUND )
     {
@@ -493,7 +493,7 @@ String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFo
         nPos = sTempStrg.Search( FORMAT_SEPARATOR );
         if( nPos!=STRING_NOTFOUND )
         {
-            bFound = TRUE;
+            bFound = sal_True;
             sTempStrg = sTempStrg.Copy( nPos+1 );
             nPos = sTempStrg.Search( FORMAT_SEPARATOR );
             if( nPos==STRING_NOTFOUND )
@@ -510,10 +510,10 @@ String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFo
 }
 
 // siehe auch GetPosFormatString()
-String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, sal_Bool & bFound )
 {
-    bFound = FALSE;     // default...
-    USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+    bFound = sal_False;     // default...
+    sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
 
     if( nPos!=STRING_NOTFOUND )
     {
@@ -530,7 +530,7 @@ String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, BOOL &
             nPos = sTempStrg.Search( FORMAT_SEPARATOR );
             if( nPos!=STRING_NOTFOUND )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 return sTempStrg.Copy( nPos+1 );
             }
         }
@@ -547,11 +547,11 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                 short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
                 short& nNoOfOptionalDigitsLeft,
                 short& nNoOfExponentDigits, short& nNoOfOptionalExponentDigits,
-                BOOL& bPercent, BOOL& bCurrency, BOOL& bScientific,
-                BOOL& bGenerateThousandSeparator,
+                sal_Bool& bPercent, sal_Bool& bCurrency, sal_Bool& bScientific,
+                sal_Bool& bGenerateThousandSeparator,
                 short& nMultipleThousandSeparators )
 {
-    USHORT nLen;
+    sal_uInt16 nLen;
     short nState = 0;
 
     nLen = sFormatStrg.Len();
@@ -561,9 +561,9 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
     nNoOfOptionalDigitsLeft = 0;
     nNoOfExponentDigits = 0;
     nNoOfOptionalExponentDigits = 0;
-    bPercent = FALSE;
-    bCurrency = FALSE;
-    bScientific = FALSE;
+    bPercent = sal_False;
+    bCurrency = sal_False;
+    bScientific = sal_False;
     // ab 11.7.97: sobald ein Komma in dem Format String gefunden wird,
     // werden alle 3 Zehnerpotenzen markiert (d.h. tausender, milionen, ...)
     // bisher wurde nur an den gesetzten Position ein Tausender-Separator
@@ -572,7 +572,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
     bGenerateThousandSeparator = sFormatStrg.Search( ',' ) != STRING_NOTFOUND;
     nMultipleThousandSeparators = 0;
     // und untersuche den Format-String nach den gew"unschten Informationen
-    for( USHORT i=0; i<nLen; i++ )
+    for( sal_uInt16 i=0; i<nLen; i++ )
     {
         sal_Unicode c = sFormatStrg.GetChar( i );
         switch( c ) {
@@ -615,7 +615,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                     return -1;  // ERROR: zu viele Dezimal-Punkte
                 break;
             case '%':
-                bPercent = TRUE;
+                bPercent = sal_True;
                 /* old:
                 bPercent++;
                 if( bPercent>1 )
@@ -623,7 +623,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                 */
                 break;
             case '(':
-                bCurrency = TRUE;
+                bCurrency = sal_True;
                 break;
             case ',':
             {
@@ -639,7 +639,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                 if( nNoOfDigitsLeft > 0 || nNoOfDigitsRight > 0 )
                 {
                      nState = -1;   // breche jetzt das Z"ahlen der Stellen ab
-                    bScientific = TRUE;
+                    bScientific = sal_True;
                 }
                 /* old:
                 bScientific++;
@@ -654,7 +654,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                 i++;
                 break;
             case CREATE_1000SEP_CHAR:
-                bGenerateThousandSeparator = TRUE;
+                bGenerateThousandSeparator = sal_True;
                 break;
         }
     }
@@ -665,12 +665,12 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
 // erzeugt werden soll
 void SbxBasicFormater::ScanFormatString( double dNumber,
                                 const String& sFormatStrg, String& sReturnStrg,
-                                BOOL bCreateSign )
+                                sal_Bool bCreateSign )
 {
     short   /*nErr,*/nNoOfDigitsLeft,nNoOfDigitsRight,nNoOfOptionalDigitsLeft,
             nNoOfExponentDigits,nNoOfOptionalExponentDigits,
             nMultipleThousandSeparators;
-    BOOL    bPercent,bCurrency,bScientific,bGenerateThousandSeparator;
+    sal_Bool    bPercent,bCurrency,bScientific,bGenerateThousandSeparator;
 
     // Initialisiere den Return-String
     sReturnStrg = String();
@@ -721,12 +721,12 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
         double dExponent;
         short i,nLen;
         short nState,nDigitPos,nExponentPos,nMaxDigit,nMaxExponentDigit;
-        BOOL bFirstDigit,bFirstExponentDigit,bFoundFirstDigit,
+        sal_Bool bFirstDigit,bFirstExponentDigit,bFoundFirstDigit,
              bIsNegative,bZeroSpaceOn, bSignHappend,bDigitPosNegative;
 
         // Initialisierung der Arbeits-Variablen
-        bSignHappend = FALSE;
-        bFoundFirstDigit = FALSE;
+        bSignHappend = sal_False;
+        bFoundFirstDigit = sal_False;
         bIsNegative = dNumber<0.0;
         nLen = sFormatStrg.Len();
         dExponent = get_number_of_digits( dNumber );
@@ -750,8 +750,8 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
             // hier ben"otigt man keine Exponent-Daten !
             bDigitPosNegative = (nDigitPos < 0);
         }
-        bFirstDigit = TRUE;
-        bFirstExponentDigit = TRUE;
+        bFirstDigit = sal_True;
+        bFirstExponentDigit = sal_True;
         nState = 0; // 0 --> Mantisse; 1 --> Exponent
         bZeroSpaceOn = 0;
 
@@ -781,14 +781,14 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                     // Behandlung der Mantisse
                         if( bFirstDigit )
                         {
-                            //org:bFirstDigit = FALSE;
+                            //org:bFirstDigit = sal_False;
                             // ggf. Vorzeichen erzeugen
                             // Bem.: bei bCurrency soll das negative
                             //       Vorzeichen durch () angezeigt werden
                             if( bIsNegative && !bCreateSign/*!bCurrency*/ && !bSignHappend )
                             {
                                 // nur einmal ein Vorzeichen ausgeben
-                                bSignHappend = TRUE;
+                                bSignHappend = sal_True;
                                 StrAppendChar( sReturnStrg,'-' );
                             }
                             // hier jetzt "uberz"ahlige Stellen ausgeben,
@@ -806,7 +806,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                                     // wurde wirklich eine Ziffer eingefuegt ?
                                     if( nTempDigit!=_NO_DIGIT )
                                         // jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
-                                        bFirstDigit = FALSE;
+                                        bFirstDigit = sal_False;
                                     // muss ggf. ein Tausender-Trennzeichen erzeugt werden?
                                     if( bGenerateThousandSeparator && ( c=='0' || nMaxDigit>=nDigitPos ) && j>0 && (j % 3 == 0) )
                                         StrAppendChar( sReturnStrg,cThousandSep );
@@ -818,7 +818,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                         {
                             AppendDigit( sReturnStrg,0 );       // Ja
                             // jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
-                            bFirstDigit = FALSE;
+                            bFirstDigit = sal_False;
                             bZeroSpaceOn = 1;
                             // BEM.: bei Visual-Basic schaltet die erste 0 f"ur alle
                             //       nachfolgenden # (bis zum Dezimal-Punkt) die 0 ein,
@@ -838,7 +838,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                             // wurde wirklich eine Ziffer eingefuegt ?
                             if( nTempDigit!=_NO_DIGIT )
                                 // jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
-                                bFirstDigit = FALSE;
+                                bFirstDigit = sal_False;
                             // muss ggf. ein Tausender-Trennzeichen erzeugt werden?
                             if( bGenerateThousandSeparator && ( c=='0' || nMaxDigit>=nDigitPos ) && nDigitPos>0 && (nDigitPos % 3 == 0) )
                                 StrAppendChar( sReturnStrg,cThousandSep );
@@ -852,7 +852,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                         if( bFirstExponentDigit )
                         {
                             // Vorzeichen wurde schon bei e/E ausgegeben
-                            bFirstExponentDigit = FALSE;
+                            bFirstExponentDigit = sal_False;
                             if( nMaxExponentDigit>nExponentPos )
                             // hier jetzt "uberz"ahlige Stellen ausgeben,
                             // d.h. vom Format-String nicht erfasste Stellen
@@ -913,7 +913,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                             break;
                         }
 
-                        BOOL bOverflow = FALSE;
+                        sal_Bool bOverflow = sal_False;
 #ifdef _with_sprintf
                         short nNextDigit = GetDigitAtPosScan( nDigitPos,bFoundFirstDigit );
 #else
@@ -1047,7 +1047,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 
 String SbxBasicFormater::BasicFormatNull( String sFormatStrg )
 {
-    BOOL bNullFormatFound;
+    sal_Bool bNullFormatFound;
     String sNullFormatStrg = GetNullFormatString( sFormatStrg,bNullFormatFound );
 
     if( bNullFormatFound )
@@ -1059,7 +1059,7 @@ String SbxBasicFormater::BasicFormatNull( String sFormatStrg )
 
 String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
 {
-    BOOL bPosFormatFound,bNegFormatFound,b0FormatFound;
+    sal_Bool bPosFormatFound,bNegFormatFound,b0FormatFound;
 
     // analysiere Format-String auf vordefinierte Formate:
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_GENERALNUMBER ) )
@@ -1108,7 +1108,7 @@ String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
             // verwende String fuer positive Werte
             sTempStrg = sPosFormatStrg;
         }
-        ScanFormatString( dNumber, sTempStrg, sReturnStrg,/*bCreateSign=*/FALSE );
+        ScanFormatString( dNumber, sTempStrg, sReturnStrg,/*bCreateSign=*/sal_False );
     }
     else
     {
@@ -1137,32 +1137,32 @@ String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
         {
             ScanFormatString( dNumber,
                     (/*sPosFormatStrg!=EMPTYFORMATSTRING*/bPosFormatFound ? sPosFormatStrg : sFormatStrg),
-                    sReturnStrg,/*bCreateSign=*/FALSE );
+                    sReturnStrg,/*bCreateSign=*/sal_False );
         }
     }
     return sReturnStrg;
 }
 
-BOOL SbxBasicFormater::isBasicFormat( String sFormatStrg )
+sal_Bool SbxBasicFormater::isBasicFormat( String sFormatStrg )
 {
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_GENERALNUMBER ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_CURRENCY ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_FIXED ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_STANDARD ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_PERCENT ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_SCIENTIFIC ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_YESNO ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_TRUEFALSE ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_ONOFF ) )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 47c38aecb1c2..4c4b3959e7a0 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -36,10 +36,10 @@ double ImpRound( double d )
     return d + ( d < 0 ? -0.5 : 0.5 );
 }
 
-INT16 ImpGetInteger( const SbxValues* p )
+sal_Int16 ImpGetInteger( const SbxValues* p )
 {
     SbxValues aTmp;
-    INT16 nRes;
+    sal_Int16 nRes;
 start:
     switch( +p->eType )
     {
@@ -56,12 +56,12 @@ start:
             nRes = p->nInteger; break;
         case SbxERROR:
         case SbxUSHORT:
-            if( p->nUShort > (USHORT) SbxMAXINT )
+            if( p->nUShort > (sal_uInt16) SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
             }
             else
-                nRes = (INT16) p->nUShort;
+                nRes = (sal_Int16) p->nUShort;
             break;
         case SbxLONG:
             if( p->nLong > SbxMAXINT )
@@ -73,7 +73,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
             }
             else
-                nRes = (INT16) p->nLong;
+                nRes = (sal_Int16) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXINT )
@@ -81,7 +81,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
             }
             else
-                nRes = (INT16) p->nULong;
+                nRes = (sal_Int16) p->nULong;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXINT )
@@ -93,7 +93,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
             }
             else
-                nRes = (INT16) ImpRound( p->nSingle );
+                nRes = (sal_Int16) ImpRound( p->nSingle );
             break;
         case SbxSALINT64:
             if( p->nInt64 > SbxMAXINT )
@@ -105,7 +105,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
             }
             else
-                nRes = (INT16) p->nInt64;
+                nRes = (sal_Int16) p->nInt64;
             break;
         case SbxSALUINT64:
             if( p->uInt64 > SbxMAXINT )
@@ -113,7 +113,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
             }
             else
-                nRes = (INT16) p->uInt64;
+                nRes = (sal_Int16) p->uInt64;
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -148,7 +148,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
             }
             else
-                nRes = (INT16) ImpRound( dVal );
+                nRes = (sal_Int16) ImpRound( dVal );
             break;
             }
         case SbxLPSTR:
@@ -171,7 +171,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
                 }
                 else
-                    nRes = (INT16) ImpRound( d );
+                    nRes = (sal_Int16) ImpRound( d );
             }
             break;
         case SbxOBJECT:
@@ -226,7 +226,7 @@ start:
     return nRes;
 }
 
-void ImpPutInteger( SbxValues* p, INT16 n )
+void ImpPutInteger( SbxValues* p, sal_Int16 n )
 {
     SbxValues aTmp;
 start:
@@ -303,7 +303,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             *p->pInteger = n; break;
@@ -313,15 +313,15 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n < 0 )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSALINT64:
             *p->pnInt64 = n; break;
         case SbxBYREF | SbxSALUINT64:
@@ -610,7 +610,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -621,7 +621,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -632,7 +632,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
@@ -642,7 +642,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n > SbxMAXULNG )
             {
@@ -652,7 +652,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pSingle = (float) n; break;
         case SbxBYREF | SbxDATE:
@@ -907,33 +907,33 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXUINT;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n > SbxMAXULNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXULNG;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pDouble = (float)ImpSalUInt64ToDouble( n ); break;
         case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx
index 1cf2d84061f9..ae873d8eba1b 100644
--- a/basic/source/sbx/sbxlng.cxx
+++ b/basic/source/sbx/sbxlng.cxx
@@ -31,10 +31,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-INT32 ImpGetLong( const SbxValues* p )
+sal_Int32 ImpGetLong( const SbxValues* p )
 {
     SbxValues aTmp;
-    INT32 nRes;
+    sal_Int32 nRes;
 start:
     switch( +p->eType )
     {
@@ -60,7 +60,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXLNG;
             }
             else
-                nRes = (INT32) p->nULong;
+                nRes = (sal_Int32) p->nULong;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXLNG )
@@ -72,7 +72,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
             }
             else
-                nRes = (INT32) ImpRound( p->nSingle );
+                nRes = (sal_Int32) ImpRound( p->nSingle );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -113,7 +113,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
             }
             else
-                nRes = (INT32) ImpRound( dVal );
+                nRes = (sal_Int32) ImpRound( dVal );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -136,7 +136,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
                 }
                 else
-                    nRes = (INT32) ImpRound( d );
+                    nRes = (sal_Int32) ImpRound( d );
             }
             break;
         case SbxOBJECT:
@@ -191,7 +191,7 @@ start:
     return nRes;
 }
 
-void ImpPutLong( SbxValues* p, INT32 n )
+void ImpPutLong( SbxValues* p, sal_Int32 n )
 {
     SbxValues aTmp;
 
@@ -272,7 +272,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -283,7 +283,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -294,7 +294,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             *p->pLong = n; break;
         case SbxBYREF | SbxULONG:
@@ -302,7 +302,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSALINT64:
             *p->pnInt64 = n; break;
         case SbxBYREF | SbxSALUINT64:
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 6628973b29e8..266e39907b66 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -41,7 +41,7 @@ TYPEINIT2(SbxObject,SbxVariable,SfxListener)
 static const char* pNameProp;               // Name-Property
 static const char* pParentProp;             // Parent-Property
 
-static USHORT nNameHash = 0, nParentHash = 0;
+static sal_uInt16 nNameHash = 0, nParentHash = 0;
 
 /////////////////////////////////////////////////////////////////////////
 
@@ -86,18 +86,18 @@ SbxObject& SbxObject::operator=( const SbxObject& r )
         pDfltProp  = r.pDfltProp;
         SetName( r.GetName() );
         SetFlags( r.GetFlags() );
-        SetModified( TRUE );
+        SetModified( sal_True );
     }
     return *this;
 }
 
 static void CheckParentsOnDelete( SbxObject* pObj, SbxArray* p )
 {
-    for( USHORT i = 0; i < p->Count(); i++ )
+    for( sal_uInt16 i = 0; i < p->Count(); i++ )
     {
         SbxVariableRef& rRef = p->GetRef( i );
         if( rRef->IsBroadcaster() )
-            pObj->EndListening( rRef->GetBroadcaster(), TRUE );
+            pObj->EndListening( rRef->GetBroadcaster(), sal_True );
         // Hat das Element mehr als eine Referenz und noch einen Listener?
         if( rRef->GetRefCount() > 1 )
         {
@@ -139,7 +139,7 @@ void SbxObject::Clear()
     p->ResetFlag( SBX_WRITE );
     p->SetFlag( SBX_DONTSTORE );
     pDfltProp  = NULL;
-    SetModified( FALSE );
+    SetModified( sal_False );
 }
 
 void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
@@ -148,14 +148,14 @@ void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
     const SbxHint* p = PTR_CAST(SbxHint,&rHint);
     if( p )
     {
-        ULONG nId = p->GetId();
-        BOOL bRead  = BOOL( nId == SBX_HINT_DATAWANTED );
-        BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
+        sal_uIntPtr nId = p->GetId();
+        sal_Bool bRead  = sal_Bool( nId == SBX_HINT_DATAWANTED );
+        sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
         SbxVariable* pVar = p->GetVar();
         if( bRead || bWrite )
         {
             XubString aVarName( pVar->GetName() );
-            USHORT nHash_ = MakeHashCode( aVarName );
+            sal_uInt16 nHash_ = MakeHashCode( aVarName );
             if( nHash_ == nNameHash
              && aVarName.EqualsIgnoreCaseAscii( pNameProp ) )
             {
@@ -176,12 +176,12 @@ void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
     }
 }
 
-BOOL SbxObject::IsClass( const XubString& rName ) const
+sal_Bool SbxObject::IsClass( const XubString& rName ) const
 {
-    return BOOL( aClassName.EqualsIgnoreCaseAscii( rName ) );
+    return sal_Bool( aClassName.EqualsIgnoreCaseAscii( rName ) );
 }
 
-SbxVariable* SbxObject::FindUserData( UINT32 nData )
+SbxVariable* SbxObject::FindUserData( sal_uInt32 nData )
 {
     if( !GetAll( SbxCLASS_DONTCARE ) )
         return NULL;
@@ -198,10 +198,10 @@ SbxVariable* SbxObject::FindUserData( UINT32 nData )
         while( !pRes && pCur->pParent )
         {
             // Ich selbst bin schon durchsucht worden!
-            USHORT nOwn = pCur->GetFlags();
+            sal_uInt16 nOwn = pCur->GetFlags();
             pCur->ResetFlag( SBX_EXTSEARCH );
             // Ich suche bereits global!
-            USHORT nPar = pCur->pParent->GetFlags();
+            sal_uInt16 nPar = pCur->pParent->GetFlags();
             pCur->pParent->ResetFlag( SBX_GBLSEARCH );
             pRes = pCur->pParent->FindUserData( nData );
             pCur->SetFlags( nOwn );
@@ -215,7 +215,7 @@ SbxVariable* SbxObject::FindUserData( UINT32 nData )
 SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
 {
 #ifdef DBG_UTIL
-    static USHORT nLvl = 0;
+    static sal_uInt16 nLvl = 0;
     static const char* pCls[] =
     { "DontCare","Array","Value","Variable","Method","Property","Object" };
     ByteString aNameStr1( (const UniString&)rName, RTL_TEXTENCODING_ASCII_US );
@@ -265,10 +265,10 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
         while( !pRes && pCur->pParent )
         {
             // Ich selbst bin schon durchsucht worden!
-            USHORT nOwn = pCur->GetFlags();
+            sal_uInt16 nOwn = pCur->GetFlags();
             pCur->ResetFlag( SBX_EXTSEARCH );
             // Ich suche bereits global!
-            USHORT nPar = pCur->pParent->GetFlags();
+            sal_uInt16 nPar = pCur->pParent->GetFlags();
             pCur->pParent->ResetFlag( SBX_GBLSEARCH );
             pRes = pCur->pParent->Find( rName, t );
             pCur->SetFlags( nOwn );
@@ -293,7 +293,7 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
 // Das ganze rekursiv, da Call() ueberladen sein kann
 // Qualified Names sind zugelassen
 
-BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
+sal_Bool SbxObject::Call( const XubString& rName, SbxArray* pParam )
 {
     SbxVariable* pMeth = FindQualified( rName, SbxCLASS_DONTCARE);
     if( pMeth && pMeth->ISA(SbxMethod) )
@@ -303,10 +303,10 @@ BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
             pMeth->SetParameters( pParam );
         pMeth->Broadcast( SBX_HINT_DATAWANTED );
         pMeth->SetParameters( NULL );
-        return TRUE;
+        return sal_True;
     }
     SetError( SbxERR_NO_METHOD );
-    return FALSE;
+    return sal_False;
 }
 
 SbxProperty* SbxObject::GetDfltProperty()
@@ -324,14 +324,14 @@ void SbxObject::SetDfltProperty( const XubString& rName )
     if ( rName != aDfltPropName )
         pDfltProp = NULL;
     aDfltPropName = rName;
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 void SbxObject::SetDfltProperty( SbxProperty* p )
 {
     if( p )
     {
-        USHORT n;
+        sal_uInt16 n;
         SbxArray* pArray = FindVar( p, n );
         pArray->Put( p, n );
         if( p->GetParent() != this )
@@ -339,14 +339,14 @@ void SbxObject::SetDfltProperty( SbxProperty* p )
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
     pDfltProp = p;
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 // Suchen einer bereits vorhandenen Variablen. Falls sie gefunden wurde,
 // wird der Index gesetzt, sonst wird der Count des Arrays geliefert.
 // In jedem Fall wird das korrekte Array geliefert.
 
-SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
+SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
 {
     SbxArray* pArray = NULL;
     if( pVar ) switch( pVar->GetClass() )
@@ -365,7 +365,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
         pArray->ResetFlag( SBX_EXTSEARCH );
         SbxVariable* pOld = pArray->Find( pVar->GetName(), pVar->GetClass() );
         if( pOld )
-          for( USHORT i = 0; i < pArray->Count(); i++ )
+          for( sal_uInt16 i = 0; i < pArray->Count(); i++ )
         {
             SbxVariableRef& rRef = pArray->GetRef( i );
             if( (SbxVariable*) rRef == pOld )
@@ -435,9 +435,9 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy
     }
     pVar->SetParent( this );
     pArray->Put( pVar, pArray->Count() );
-    SetModified( TRUE );
+    SetModified( sal_True );
     // Das Objekt lauscht immer
-    StartListening( pVar->GetBroadcaster(), TRUE );
+    StartListening( pVar->GetBroadcaster(), sal_True );
     Broadcast( SBX_HINT_OBJECTCHANGED );
     return pVar;
 }
@@ -473,9 +473,9 @@ SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClas
         pVar->SetName( rName );
         pVar->SetParent( this );
         pObjs->Put( pVar, pObjs->Count() );
-        SetModified( TRUE );
+        SetModified( sal_True );
         // Das Objekt lauscht immer
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
     return pVar;
@@ -483,7 +483,7 @@ SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClas
 
 void SbxObject::Insert( SbxVariable* pVar )
 {
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     SbxArray* pArray = FindVar( pVar, nIdx );
     if( pArray )
     {
@@ -515,7 +515,7 @@ void SbxObject::Insert( SbxVariable* pVar )
                 }
 #endif
 */
-                EndListening( pOld->GetBroadcaster(), TRUE );
+                EndListening( pOld->GetBroadcaster(), sal_True );
                 if( pVar->GetClass() == SbxCLASS_PROPERTY )
                 {
                     if( pOld == pDfltProp )
@@ -523,11 +523,11 @@ void SbxObject::Insert( SbxVariable* pVar )
                 }
             }
         }
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
         pArray->Put( pVar, nIdx );
         if( pVar->GetParent() != this )
             pVar->SetParent( this );
-        SetModified( TRUE );
+        SetModified( sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
 #ifdef DBG_UTIL
     static const char* pCls[] =
@@ -564,11 +564,11 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
     }
     if( pArray )
     {
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
         pArray->Put( pVar, pArray->Count() );
         if( pVar->GetParent() != this )
             pVar->SetParent( this );
-        SetModified( TRUE );
+        SetModified( sal_True );
 #ifdef DBG_UTIL
     static const char* pCls[] =
     { "DontCare","Array","Value","Variable","Method","Property","Object" };
@@ -603,11 +603,11 @@ void SbxObject::VCPtrInsert( SbxVariable* pVar )
     }
     if( pArray )
     {
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
         pArray->Put( pVar, pArray->Count() );
         if( pVar->GetParent() != this )
             pVar->SetParent( this );
-        SetModified( TRUE );
+        SetModified( sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
 }
@@ -619,7 +619,7 @@ void SbxObject::Remove( const XubString& rName, SbxClassType t )
 
 void SbxObject::Remove( SbxVariable* pVar )
 {
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     SbxArray* pArray = FindVar( pVar, nIdx );
     if( pArray && nIdx < pArray->Count() )
     {
@@ -632,13 +632,13 @@ void SbxObject::Remove( SbxVariable* pVar )
 #endif
         SbxVariableRef pVar_ = pArray->Get( nIdx );
         if( pVar_->IsBroadcaster() )
-            EndListening( pVar_->GetBroadcaster(), TRUE );
+            EndListening( pVar_->GetBroadcaster(), sal_True );
         if( (SbxVariable*) pVar_ == pDfltProp )
             pDfltProp = NULL;
         pArray->Remove( nIdx );
         if( pVar_->GetParent() == this )
             pVar_->SetParent( NULL );
-        SetModified( TRUE );
+        SetModified( sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
 }
@@ -646,26 +646,26 @@ void SbxObject::Remove( SbxVariable* pVar )
 // AB 23.3.1997, Loeschen per Pointer fuer Controls (doppelte Namen!)
 void SbxObject::VCPtrRemove( SbxVariable* pVar )
 {
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     // Neu FindVar-Methode, sonst identisch mit normaler Methode
     SbxArray* pArray = VCPtrFindVar( pVar, nIdx );
     if( pArray && nIdx < pArray->Count() )
     {
         SbxVariableRef xVar = pArray->Get( nIdx );
         if( xVar->IsBroadcaster() )
-            EndListening( xVar->GetBroadcaster(), TRUE );
+            EndListening( xVar->GetBroadcaster(), sal_True );
         if( (SbxVariable*) xVar == pDfltProp )
             pDfltProp = NULL;
         pArray->Remove( nIdx );
         if( xVar->GetParent() == this )
             xVar->SetParent( NULL );
-        SetModified( TRUE );
+        SetModified( sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
 }
 
 // AB 23.3.1997, Zugehoerige Spezial-Methode, nur ueber Pointer suchen
-SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
+SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
 {
     SbxArray* pArray = NULL;
     if( pVar ) switch( pVar->GetClass() )
@@ -680,7 +680,7 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
     if( pArray )
     {
         nArrayIdx = pArray->Count();
-        for( USHORT i = 0; i < pArray->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pArray->Count(); i++ )
         {
             SbxVariableRef& rRef = pArray->GetRef( i );
             if( (SbxVariable*) rRef == pVar )
@@ -694,9 +694,9 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
 
 
 
-void SbxObject::SetPos( SbxVariable* pVar, USHORT nPos )
+void SbxObject::SetPos( SbxVariable* pVar, sal_uInt16 nPos )
 {
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     SbxArray* pArray = FindVar( pVar, nIdx );
     if( pArray )
     {
@@ -709,41 +709,41 @@ void SbxObject::SetPos( SbxVariable* pVar, USHORT nPos )
             pArray->Insert( refVar, nPos );
         }
     }
-//  SetModified( TRUE );
+//  SetModified( sal_True );
 //  Broadcast( SBX_HINT_OBJECTCHANGED );
 }
 
-static BOOL LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
+static sal_Bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
 {
     SbxArrayRef p = (SbxArray*) SbxBase::Load( rStrm );
     if( !p.Is() )
-        return FALSE;
-    for( USHORT i = 0; i < p->Count(); i++ )
+        return sal_False;
+    for( sal_uInt16 i = 0; i < p->Count(); i++ )
     {
         SbxVariableRef& r = p->GetRef( i );
         SbxVariable* pVar = r;
         if( pVar )
         {
             pVar->SetParent( pThis );
-            pThis->StartListening( pVar->GetBroadcaster(), TRUE );
+            pThis->StartListening( pVar->GetBroadcaster(), sal_True );
         }
     }
     pArray->Merge( p );
-    return TRUE;
+    return sal_True;
 }
 
 // Der Load eines Objekts ist additiv!
 
-BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    // Hilfe fuer das Einlesen alter Objekte: einfach TRUE zurueck,
+    // Hilfe fuer das Einlesen alter Objekte: einfach sal_True zurueck,
     // LoadPrivateData() muss Default-Zustand herstellen
     if( !nVer )
-        return TRUE;
+        return sal_True;
 
     pDfltProp = NULL;
     if( !SbxVariable::LoadData( rStrm, nVer ) )
-        return FALSE;
+        return sal_False;
     // Wenn kein fremdes Objekt enthalten ist, uns selbst eintragen
     if( aData.eType == SbxOBJECT && !aData.pObj )
         aData.pObj = this;
@@ -751,11 +751,11 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
     XubString aDfltProp;
     rStrm.ReadByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
     rStrm.ReadByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
-    ULONG nPos = rStrm.Tell();
+    sal_uIntPtr nPos = rStrm.Tell();
     rStrm >> nSize;
     if( !LoadPrivateData( rStrm, nVer ) )
-        return FALSE;
-    ULONG nNewPos = rStrm.Tell();
+        return sal_False;
+    sal_uIntPtr nNewPos = rStrm.Tell();
     nPos += nSize;
     DBG_ASSERT( nPos >= nNewPos, "SBX: Zu viele Daten eingelesen" );
     if( nPos != nNewPos )
@@ -763,39 +763,39 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
     if( !LoadArray( rStrm, this, pMethods )
      || !LoadArray( rStrm, this, pProps )
      || !LoadArray( rStrm, this, pObjs ) )
-        return FALSE;
+        return sal_False;
     // Properties setzen
     if( aDfltProp.Len() )
         pDfltProp = (SbxProperty*) pProps->Find( aDfltProp, SbxCLASS_PROPERTY );
-    SetModified( FALSE );
-    return TRUE;
+    SetModified( sal_False );
+    return sal_True;
 }
 
-BOOL SbxObject::StoreData( SvStream& rStrm ) const
+sal_Bool SbxObject::StoreData( SvStream& rStrm ) const
 {
     if( !SbxVariable::StoreData( rStrm ) )
-        return FALSE;
+        return sal_False;
     XubString aDfltProp;
     if( pDfltProp )
         aDfltProp = pDfltProp->GetName();
     rStrm.WriteByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
     rStrm.WriteByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
-    ULONG nPos = rStrm.Tell();
-    rStrm << (UINT32) 0L;
+    sal_uIntPtr nPos = rStrm.Tell();
+    rStrm << (sal_uInt32) 0L;
     if( !StorePrivateData( rStrm ) )
-        return FALSE;
-    ULONG nNew = rStrm.Tell();
+        return sal_False;
+    sal_uIntPtr nNew = rStrm.Tell();
     rStrm.Seek( nPos );
-    rStrm << (UINT32) ( nNew - nPos );
+    rStrm << (sal_uInt32) ( nNew - nPos );
     rStrm.Seek( nNew );
     if( !pMethods->Store( rStrm ) )
-        return FALSE;
+        return sal_False;
     if( !pProps->Store( rStrm ) )
-        return FALSE;
+        return sal_False;
     if( !pObjs->Store( rStrm ) )
-        return FALSE;
-    ((SbxObject*) this)->SetModified( FALSE );
-    return TRUE;
+        return sal_False;
+    ((SbxObject*) this)->SetModified( sal_False );
+    return sal_True;
 }
 
 XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
@@ -804,8 +804,8 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
     // Properties in einem String einsammeln
     XubString aSource;
     SbxArrayRef xProps( GetProperties() );
-    FASTBOOL bLineFeed = FALSE;
-    for ( USHORT nProp = 0; nProp < xProps->Count(); ++nProp )
+    bool bLineFeed = false;
+    for ( sal_uInt16 nProp = 0; nProp < xProps->Count(); ++nProp )
     {
         SbxPropertyRef xProp = (SbxProperty*) xProps->Get(nProp);
         XubString aPropName( xProp->GetName() );
@@ -817,7 +817,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
             if ( bLineFeed )
                 aSource.AppendAscii( "\n" );
             else
-                bLineFeed = TRUE;
+                bLineFeed = true;
 
             aSource += rLinePrefix;
             aSource += '.';
@@ -853,7 +853,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
     return aSource;
 }
 
-static BOOL CollectAttrs( const SbxBase* p, XubString& rRes )
+static sal_Bool CollectAttrs( const SbxBase* p, XubString& rRes )
 {
     XubString aAttrs;
     if( p->IsHidden() )
@@ -881,19 +881,19 @@ static BOOL CollectAttrs( const SbxBase* p, XubString& rRes )
         rRes.AssignAscii( " (" );
         rRes += aAttrs;
         rRes += ')';
-        return TRUE;
+        return sal_True;
     }
     else
     {
         rRes.Erase();
-        return FALSE;
+        return sal_False;
     }
 }
 
-void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
+void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
 {
     // Einr"uckung
-    static USHORT nLevel = 0;
+    static sal_uInt16 nLevel = 0;
     if ( nLevel > 10 )
     {
         rStrm << "<too deep>" << endl;
@@ -901,7 +901,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     }
     ++nLevel;
     String aIndent;
-    for ( USHORT n = 1; n < nLevel; ++n )
+    for ( sal_uInt16 n = 1; n < nLevel; ++n )
         aIndent.AppendAscii( "    " );
 
     // ggf. Objekt vervollst"andigen
@@ -912,7 +912,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     ByteString aNameStr( (const UniString&)GetName(), RTL_TEXTENCODING_ASCII_US );
     ByteString aClassNameStr( (const UniString&)aClassName, RTL_TEXTENCODING_ASCII_US );
     rStrm << "Object( "
-          << ByteString::CreateFromInt64( (ULONG) this ).GetBuffer() << "=='"
+          << ByteString::CreateFromInt64( (sal_uIntPtr) this ).GetBuffer() << "=='"
           << ( aNameStr.Len() ? aNameStr.GetBuffer() : "<unnamed>" ) << "', "
           << "of class '" << aClassNameStr.GetBuffer() << "', "
           << "counts "
@@ -922,7 +922,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     {
         ByteString aParentNameStr( (const UniString&)GetName(), RTL_TEXTENCODING_ASCII_US );
         rStrm << "in parent "
-              << ByteString::CreateFromInt64( (ULONG) GetParent() ).GetBuffer()
+              << ByteString::CreateFromInt64( (sal_uIntPtr) GetParent() ).GetBuffer()
               << "=='" << ( aParentNameStr.Len() ? aParentNameStr.GetBuffer() : "<unnamed>" ) << "'";
     }
     else
@@ -941,7 +941,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
 
     // Methods
     rStrm << aIndentNameStr.GetBuffer() << "- Methods:" << endl;
-    for( USHORT i = 0; i < pMethods->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
     {
         SbxVariableRef& r = pMethods->GetRef( i );
         SbxVariable* pVar = r;
@@ -974,7 +974,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     // Properties
     rStrm << aIndentNameStr.GetBuffer() << "- Properties:" << endl;
     {
-        for( USHORT i = 0; i < pProps->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pProps->Count(); i++ )
         {
             SbxVariableRef& r = pProps->GetRef( i );
             SbxVariable* pVar = r;
@@ -1008,7 +1008,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     // Objects
     rStrm << aIndentNameStr.GetBuffer() << "- Objects:" << endl;
     {
-        for( USHORT i = 0; i < pObjs->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pObjs->Count(); i++ )
         {
             SbxVariableRef& r = pObjs->GetRef( i );
             SbxVariable* pVar = r;
@@ -1032,7 +1032,7 @@ SvDispatch* SbxObject::GetSvDispatch()
     return NULL;
 }
 
-BOOL SbxMethod::Run( SbxValues* pValues )
+sal_Bool SbxMethod::Run( SbxValues* pValues )
 {
     SbxValues aRes;
     if( !pValues )
@@ -1051,7 +1051,7 @@ SbxClassType SbxProperty::GetClass() const
     return SbxCLASS_PROPERTY;
 }
 
-void SbxObject::GarbageCollection( ULONG nObjects )
+void SbxObject::GarbageCollection( sal_uIntPtr nObjects )
 
 /*  [Beschreibung]
 
@@ -1066,14 +1066,14 @@ void SbxObject::GarbageCollection( ULONG nObjects )
 {
     (void)nObjects;
 
-    static BOOL bInGarbageCollection = FALSE;
+    static sal_Bool bInGarbageCollection = sal_False;
     if ( bInGarbageCollection )
         return;
-    bInGarbageCollection = TRUE;
+    bInGarbageCollection = sal_True;
 
 #if 0
     // erstes Object dieser Runde anspringen
-    BOOL bAll = !nObjects;
+    sal_Bool bAll = !nObjects;
     if ( bAll )
         rObjects.First();
     SbxObject *pObj = rObjects.GetCurObject();
@@ -1088,7 +1088,7 @@ void SbxObject::GarbageCollection( ULONG nObjects )
         {
             // dann alle Properies des Objects durchsuchen
             SbxArray *pProps = pObj->GetProperties();
-            for ( USHORT n = 0; n < pProps->Count(); ++n )
+            for ( sal_uInt16 n = 0; n < pProps->Count(); ++n )
             {
                 // verweist die Property auf den Parent des Object?
                 SbxVariable *pProp = pProps->Get(n);
@@ -1126,12 +1126,12 @@ void SbxObject::GarbageCollection( ULONG nObjects )
     if ( rVars.Count() > 200 && rVars.Count() < 210 )
     {
         SvFileStream aStream( "d:\\tmp\\dump.sbx", STREAM_STD_WRITE );
-        SfxBroadcaster::Enable(FALSE);
-        for ( ULONG n = 0; n < rVars.Count(); ++n )
+        SfxBroadcaster::Enable(sal_False);
+        for ( sal_uIntPtr n = 0; n < rVars.Count(); ++n )
         {
             SbxVariable *pVar = rVars.GetObject(n);
             SbxObject *pObj = PTR_CAST(SbxObject, pVar);
-            USHORT nFlags = pVar->GetFlags();
+            sal_uInt16 nFlags = pVar->GetFlags();
             pVar->SetFlag(SBX_NO_BROADCAST);
             if ( pObj )
                 pObj->Dump(aStream);
@@ -1139,10 +1139,10 @@ void SbxObject::GarbageCollection( ULONG nObjects )
                 pVar->Dump(aStream);
             pVar->SetFlags(nFlags);
         }
-        SfxBroadcaster::Enable(TRUE);
+        SfxBroadcaster::Enable(sal_True);
     }
 #endif
 #endif
-    bInGarbageCollection = FALSE;
+    bInGarbageCollection = sal_False;
 }
 
diff --git a/basic/source/sbx/sbxres.cxx b/basic/source/sbx/sbxres.cxx
index 369349e72069..ec1e1f4c900e 100644
--- a/basic/source/sbx/sbxres.cxx
+++ b/basic/source/sbx/sbxres.cxx
@@ -80,12 +80,12 @@ static const char* pSbxRes[] = {
     "True"
 };
 
-const char* GetSbxRes( USHORT nId )
+const char* GetSbxRes( sal_uInt16 nId )
 {
     return ( ( nId > SBXRES_MAX ) ? "???" : pSbxRes[ nId ] );
 }
 
-SbxRes::SbxRes( USHORT nId )
+SbxRes::SbxRes( sal_uInt16 nId )
     : ::rtl::OUString( ::rtl::OUString::createFromAscii( GetSbxRes( nId ) ) )
 {}
 
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index 8ed3c7054278..75fddc0d90fe 100644
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -78,10 +78,10 @@
 class SbxRes : public ::rtl::OUString
 {
 public:
-    SbxRes( USHORT );
+    SbxRes( sal_uInt16 );
 };
 
-const char* GetSbxRes( USHORT );
+const char* GetSbxRes( sal_uInt16 );
 
 
 #endif
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index b8aad9bbf2e4..d1bf716234a8 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -72,7 +72,7 @@ void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& rcThousandSep )
 // Fixed ist und das ganze nicht hineinpasst!
 
 SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType,
-                  USHORT* pLen, BOOL bAllowIntntl, BOOL bOnlyIntntl )
+                  sal_uInt16* pLen, sal_Bool bAllowIntntl, sal_Bool bOnlyIntntl )
 {
     ::rtl::OString aBStr( ::rtl::OUStringToOString( rWSrc, RTL_TEXTENCODING_ASCII_US ) );
 
@@ -103,15 +103,15 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
     const char* pStart = aBStr.getStr();
     const char* p = pStart;
     char buf[ 80 ], *q = buf;
-    BOOL bRes = TRUE;
-    BOOL bMinus = FALSE;
+    sal_Bool bRes = sal_True;
+    sal_Bool bMinus = sal_False;
     nVal = 0;
     SbxDataType eScanType = SbxSINGLE;
     // Whitespace wech
     while( *p &&( *p == ' ' || *p == '\t' ) ) p++;
     // Zahl? Dann einlesen und konvertieren.
     if( *p == '-' )
-        p++, bMinus = TRUE;
+        p++, bMinus = sal_True;
     if( isdigit( *p ) ||( (*p == cNonIntntlComma || *p == cIntntlComma ||
             *p == cIntntl1000) && isdigit( *(p+1 ) ) ) )
     {
@@ -172,7 +172,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
         *q = 0;
         // Komma, Exponent mehrfach vorhanden?
         if( comma > 1 || exp > 1 )
-            bRes = FALSE;
+            bRes = sal_False;
         // Kann auf Integer gefaltet werden?
         if( !comma && !exp )
         {
@@ -204,7 +204,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
         {
             case 'O': cmp = "01234567"; base = 8; ndig = 11; break;
             case 'H': break;
-            default : bRes = FALSE;
+            default : bRes = sal_False;
         }
         long l = 0;
         int i;
@@ -213,7 +213,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
             char ch = sal::static_int_cast< char >( toupper( *p ) );
             p++;
             if( strchr( cmp, ch ) ) *q++ = ch;
-            else bRes = FALSE;
+            else bRes = sal_False;
         }
         *q = 0;
         for( q = buf; *q; q++ )
@@ -222,7 +222,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
             if( i > 9 ) i -= 7;
             l =( l * base ) + i;
             if( !ndig-- )
-                bRes = FALSE;
+                bRes = sal_False;
         }
         if( *p == '&' ) p++;
         nVal = (double) l;
@@ -235,7 +235,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
         return SbxERR_CONVERSION;
     }
     if( pLen )
-        *pLen = (USHORT) ( p - pStart );
+        *pLen = (sal_uInt16) ( p - pStart );
     if( !bRes )
         return SbxERR_CONVERSION;
     if( bMinus )
@@ -245,12 +245,12 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
 }
 
 // Schnittstelle fuer CDbl im Basic
-SbxError SbxValue::ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle )
+SbxError SbxValue::ScanNumIntnl( const String& rSrc, double& nVal, sal_Bool bSingle )
 {
     SbxDataType t;
-    USHORT nLen = 0;
+    sal_uInt16 nLen = 0;
     SbxError nRetError = ImpScan( rSrc, nVal, t, &nLen,
-        /*bAllowIntntl*/FALSE, /*bOnlyIntntl*/TRUE );
+        /*bAllowIntntl*/sal_False, /*bOnlyIntntl*/sal_True );
     // Komplett gelesen?
     if( nRetError == SbxERR_OK && nLen != rSrc.Len() )
         nRetError = SbxERR_CONVERSION;
@@ -271,20 +271,20 @@ static double roundArray[] = {
 
 /***************************************************************************
 |*
-|*  void myftoa( double, char *, short, short, BOOL, BOOL )
+|*  void myftoa( double, char *, short, short, sal_Bool, sal_Bool )
 |*
 |*  Beschreibung:       Konversion double --> ASCII
 |*  Parameter:          double              die Zahl.
 |*                      char *              der Zielpuffer
 |*                      short               Anzahl Nachkommastellen
 |*                      short               Weite des Exponenten( 0=kein E )
-|*                      BOOL                TRUE: mit 1000er Punkten
-|*                      BOOL                TRUE: formatfreie Ausgabe
+|*                      sal_Bool                sal_True: mit 1000er Punkten
+|*                      sal_Bool                sal_True: formatfreie Ausgabe
 |*
 ***************************************************************************/
 
 static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
-                    BOOL bPt, BOOL bFix, sal_Unicode cForceThousandSep = 0 )
+                    sal_Bool bPt, sal_Bool bFix, sal_Unicode cForceThousandSep = 0 )
 {
 
     short nExp = 0;                     // Exponent
@@ -391,7 +391,7 @@ static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
 #pragma warning(disable: 4748) // "... because optimizations are disabled ..."
 #endif
 
-void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreString )
+void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, sal_Bool bCoreString )
 {
     char *q;
     char cBuf[ 40 ], *p = cBuf;
@@ -407,7 +407,7 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreStrin
     }
     double dMaxNumWithoutExp = (nPrec == 6) ? 1E6 : 1E14;
     myftoa( nNum, p, nPrec,( nNum &&( nNum < 1E-1 || nNum > dMaxNumWithoutExp ) ) ? 4:0,
-        FALSE, TRUE, cDecimalSep );
+        sal_False, sal_True, cDecimalSep );
     // Trailing Zeroes weg:
     for( p = cBuf; *p &&( *p != 'E' ); p++ ) {}
     q = p; p--;
@@ -422,10 +422,10 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreStrin
 #pragma optimize( "", on )
 #endif
 
-BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
+sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
 {
     // Merken, ob ueberhaupt was geaendert wurde
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     ::rtl::OUString aNewString;
 
     // Nur Spezial-Fälle behandeln, als Default tun wir nichts
@@ -451,25 +451,25 @@ BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
                 {
                     sal_Unicode* pStr = (sal_Unicode*)aNewString.getStr();
                     pStr[nPos] = (sal_Unicode)'.';
-                    bChanged = TRUE;
+                    bChanged = sal_True;
                 }
             }
             break;
         }
 
-        // Bei BOOL TRUE und FALSE als String pruefen
+        // Bei sal_Bool sal_True und sal_False als String pruefen
         case SbxBOOL:
         {
             if( rSrc.equalsIgnoreAsciiCaseAscii( "true" ) )
             {
                 aNewString = ::rtl::OUString::valueOf( (sal_Int32)SbxTRUE );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
             else
             if( rSrc.equalsIgnoreAsciiCaseAscii( "false" ) )
             {
                 aNewString = ::rtl::OUString::valueOf( (sal_Int32)SbxFALSE );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
             break;
         }
@@ -490,7 +490,7 @@ BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
 // lasse diesen Code vorl"aufig drin, zum 'abgucken'
 // der bisherigen Implementation
 
-static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt )
+static sal_uInt16 printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt )
 {
     const String& rFmt = rWFmt;
     char    cFill  = ' ';           // Fuellzeichen
@@ -499,10 +499,10 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
     short   nPrec  = 0;             // Anzahl Nachkommastellen
     short   nWidth = 0;             // Zahlenweite gesamnt
     short   nLen;                   // Laenge konvertierte Zahl
-    BOOL    bPoint = FALSE;         // TRUE: mit 1000er Kommas
-    BOOL    bTrail = FALSE;         // TRUE, wenn folgendes Minus
-    BOOL    bSign  = FALSE;         // TRUE: immer mit Vorzeichen
-    BOOL    bNeg   = FALSE;         // TRUE: Zahl ist negativ
+    sal_Bool    bPoint = sal_False;         // sal_True: mit 1000er Kommas
+    sal_Bool    bTrail = sal_False;         // sal_True, wenn folgendes Minus
+    sal_Bool    bSign  = sal_False;         // sal_True: immer mit Vorzeichen
+    sal_Bool    bNeg   = sal_False;         // sal_True: Zahl ist negativ
     char    cBuf [1024];            // Zahlenpuffer
     char  * p;
     const char* pFmt = rFmt;
@@ -518,7 +518,7 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
         case 0:
             break;
         case '+':
-            bSign = TRUE; nWidth++; break;
+            bSign = sal_True; nWidth++; break;
         case '*':
             nWidth++; cFill = '*';
             if( *pFmt == '$' ) nWidth++, pFmt++, cPre = '$';
@@ -537,7 +537,7 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
         // 1000er Kommas?
         if( *pFmt == ',' )
         {
-            nWidth++; pFmt++; bPoint = TRUE;
+            nWidth++; pFmt++; bPoint = sal_True;
         } else break;
     }
     // Nachkomma:
@@ -551,14 +551,14 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
         pFmt++, nExpDig++, nWidth++;
     // Folgendes Minus:
     if( !bSign && *pFmt == '-' )
-        pFmt++, bTrail = TRUE;
+        pFmt++, bTrail = sal_True;
 
     // Zahl konvertieren:
     if( nPrec > 15 ) nPrec = 15;
-    if( nNum < 0.0 ) nNum = -nNum, bNeg = TRUE;
+    if( nNum < 0.0 ) nNum = -nNum, bNeg = sal_True;
     p = cBuf;
     if( bSign ) *p++ = bNeg ? '-' : '+';
-    myftoa( nNum, p, nPrec, nExpDig, bPoint, FALSE );
+    myftoa( nNum, p, nPrec, nExpDig, bPoint, sal_False );
     nLen = strlen( cBuf );
 
     // Ueberlauf?
@@ -573,12 +573,12 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
     if( bTrail )
         rRes += bNeg ? '-' : ' ';
 
-    return (USHORT) ( pFmt - (const char*) rFmt );
+    return (sal_uInt16) ( pFmt - (const char*) rFmt );
 }
 
 #endif //_old_format_code_
 
-static USHORT printfmtstr( const XubString& rStr, XubString& rRes, const XubString& rFmt )
+static sal_uInt16 printfmtstr( const XubString& rStr, XubString& rRes, const XubString& rFmt )
 {
     const xub_Unicode* pStr = rStr.GetBuffer();
     const xub_Unicode* pFmtStart = rFmt.GetBuffer();
@@ -603,12 +603,12 @@ static USHORT printfmtstr( const XubString& rStr, XubString& rRes, const XubStri
             rRes = rStr;
             break;
     }
-    return (USHORT) ( pFmt - pFmtStart );
+    return (sal_uInt16) ( pFmt - pFmtStart );
 }
 
 /////////////////////////////////////////////////////////////////////////
 
-BOOL SbxValue::Scan( const XubString& rSrc, USHORT* pLen )
+sal_Bool SbxValue::Scan( const XubString& rSrc, sal_uInt16* pLen )
 {
     SbxError eRes = SbxERR_OK;
     if( !CanWrite() )
@@ -627,10 +627,10 @@ BOOL SbxValue::Scan( const XubString& rSrc, USHORT* pLen )
     }
     if( eRes )
     {
-        SetError( eRes ); return FALSE;
+        SetError( eRes ); return sal_False;
     }
     else
-        return TRUE;
+        return sal_True;
 }
 
 
@@ -648,7 +648,7 @@ ResMgr* implGetResMgr( void )
 class SbxValueFormatResId : public ResId
 {
 public:
-    SbxValueFormatResId( USHORT nId )
+    SbxValueFormatResId( sal_uInt16 nId )
         : ResId( nId, *implGetResMgr() )
     {}
 };
@@ -693,7 +693,7 @@ static VbaFormatInfo pFormatInfoTable[] =
 VbaFormatInfo* getFormatInfo( const String& rFmt )
 {
     VbaFormatInfo* pInfo = NULL;
-    INT16 i = 0;
+    sal_Int16 i = 0;
     while( (pInfo = pFormatInfoTable + i )->mpVbaFormat != NULL )
     {
         if( rFmt.EqualsIgnoreCaseAscii( pInfo->mpVbaFormat ) )
@@ -713,11 +713,11 @@ VbaFormatInfo* getFormatInfo( const String& rFmt )
 #define VBAFORMAT_UPPERCASE         ">"
 
 // From methods1.cxx
-INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay = 0 );
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 );
 // from methods.cxx
-INT16 implGetMinute( double dDate );
-INT16 implGetDateYear( double aDate );
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet );
+sal_Int16 implGetMinute( double dDate );
+sal_Int16 implGetDateYear( double aDate );
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet );
 
 void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
 {
@@ -753,7 +753,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
         double nNumber;
         Color* pCol;
 
-        BOOL bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber );
+        sal_Bool bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber );
 
         // number format, use SvNumberFormatter to handle it.
         if( bSuccess )
@@ -804,7 +804,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_N )
                     || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ))
             {
-                INT32 nMin = implGetMinute( nNumber );
+                sal_Int32 nMin = implGetMinute( nNumber );
                 if( nMin < 10 && aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ) )
                 {
                     // Minute in two digits
@@ -819,15 +819,15 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
             }
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_W ))
             {
-                INT32 nWeekDay = implGetWeekDay( nNumber );
+                sal_Int32 nWeekDay = implGetWeekDay( nNumber );
                 rRes = String::CreateFromInt32( nWeekDay );
             }
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_Y ))
             {
-                INT16 nYear = implGetDateYear( nNumber );
+                sal_Int16 nYear = implGetDateYear( nNumber );
                 double dBaseDate;
                 implDateSerial( nYear, 1, 1, dBaseDate );
-                INT32 nYear32 = 1 + INT32( nNumber - dBaseDate );
+                sal_Int32 nYear32 = 1 + sal_Int32( nNumber - dBaseDate );
                 rRes = String::CreateFromInt32( nYear32 );
             }
             else
@@ -948,7 +948,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
                 // #45355 wenn es numerisch ist, muss gewandelt werden
                 if( IsNumericRTL() )
                 {
-                    ScanNumIntnl( GetString(), d, /*bSingle*/FALSE );
+                    ScanNumIntnl( GetString(), d, /*bSingle*/sal_False );
                     goto cvt2;
                 }
                 else
diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 70ef1653666b..50313cfe1780 100644
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -270,7 +270,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -281,7 +281,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -292,10 +292,10 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
         {
-            INT32 i;
+            sal_Int32 i;
             if( n > SbxMAXLNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); i = SbxMAXLNG;
@@ -306,13 +306,13 @@ start:
             }
             else
             {
-                i = sal::static_int_cast< INT32 >(n);
+                i = sal::static_int_cast< sal_Int32 >(n);
             }
             *p->pLong = i; break;
         }
         case SbxBYREF | SbxULONG:
         {
-            UINT32 i;
+            sal_uInt32 i;
             if( n > SbxMAXULNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); i = SbxMAXULNG;
@@ -323,7 +323,7 @@ start:
             }
             else
             {
-                i = sal::static_int_cast< UINT32 >(n);
+                i = sal::static_int_cast< sal_uInt32 >(n);
             }
             *p->pULong = i; break;
         }
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index b4156a116ddc..3a73c2757579 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -154,9 +154,9 @@ using namespace rtl;
         XubString aRes;
         aTmp.eType = SbxSTRING;
         if( p->eType == SbxDOUBLE )
-            ImpPutDouble( &aTmp, p->nDouble, /*bCoreString=*/TRUE );
+            ImpPutDouble( &aTmp, p->nDouble, /*bCoreString=*/sal_True );
         else
-            ImpPutDouble( &aTmp, *p->pDouble, /*bCoreString=*/TRUE );
+            ImpPutDouble( &aTmp, *p->pDouble, /*bCoreString=*/sal_True );
         return aRes;
     }
     else
@@ -234,7 +234,7 @@ void ImpPutString( SbxValues* p, const ::rtl::OUString* n )
         case SbxBYREF | SbxINTEGER:
             *p->pInteger = ImpGetInteger( p ); break;
         case SbxBYREF | SbxBOOL:
-            *p->pUShort = sal::static_int_cast< UINT16 >( ImpGetBool( p ) );
+            *p->pUShort = sal::static_int_cast< sal_uInt16 >( ImpGetBool( p ) );
             break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
@@ -276,10 +276,10 @@ SbxArray* StringToByteArray(const ::rtl::OUString& rStr)
         pArray->unoAddDim( 0, -1 );
     }
 
-    for( USHORT i=0; i< nArraySize; i++)
+    for( sal_uInt16 i=0; i< nArraySize; i++)
     {
         SbxVariable* pNew = new SbxVariable( SbxBYTE );
-        BYTE aByte = static_cast< BYTE >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
+        sal_uInt8 aByte = static_cast< sal_uInt8 >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
         pNew->PutByte( aByte );
         pNew->SetFlag( SBX_WRITE );
         pArray->Put( pNew, i );
@@ -292,10 +292,10 @@ SbxArray* StringToByteArray(const ::rtl::OUString& rStr)
 // Convert an array of bytes to string (2bytes per character)
 ::rtl::OUString ByteArrayToString(SbxArray* pArr)
 {
-    USHORT nCount = pArr->Count();
+    sal_uInt16 nCount = pArr->Count();
     OUStringBuffer aStrBuf;
     sal_Unicode aChar = 0;
-    for( USHORT i = 0 ; i < nCount ; i++ )
+    for( sal_uInt16 i = 0 ; i < nCount ; i++ )
     {
         sal_Unicode aTempChar = pArr->Get(i)->GetByte();
         if( i%2 )
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index 5b75a24d6d26..6bfc0c39d260 100644
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -31,10 +31,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-UINT16 ImpGetUShort( const SbxValues* p )
+sal_uInt16 ImpGetUShort( const SbxValues* p )
 {
     SbxValues aTmp;
-    UINT16 nRes;
+    sal_uInt16 nRes;
 start:
     switch( +p->eType )
     {
@@ -70,7 +70,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) p->nLong;
+                nRes = (sal_uInt16) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXUINT )
@@ -78,7 +78,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXUINT;
             }
             else
-                nRes = (UINT16) p->nULong;
+                nRes = (sal_uInt16) p->nULong;
             break;
         case SbxSALINT64:
             if( p->nInt64 > SbxMAXUINT )
@@ -90,7 +90,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) p->nInt64;
+                nRes = (sal_uInt16) p->nInt64;
             break;
         case SbxSALUINT64:
             if( p->uInt64 > SbxMAXUINT )
@@ -98,7 +98,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXUINT;
             }
             else
-                nRes = (UINT16) p->uInt64;
+                nRes = (sal_uInt16) p->uInt64;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXUINT )
@@ -110,7 +110,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) ( p->nSingle + 0.5 );
+                nRes = (sal_uInt16) ( p->nSingle + 0.5 );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -145,7 +145,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) ( dVal + 0.5 );
+                nRes = (sal_uInt16) ( dVal + 0.5 );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -168,7 +168,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
                 }
                 else
-                    nRes = (UINT16) ( d + 0.5 );
+                    nRes = (sal_uInt16) ( d + 0.5 );
             }
             break;
         case SbxOBJECT:
@@ -223,7 +223,7 @@ start:
     return nRes;
 }
 
-void ImpPutUShort( SbxValues* p, UINT16 n )
+void ImpPutUShort( SbxValues* p, sal_uInt16 n )
 {
     SbxValues aTmp;
 
@@ -293,14 +293,14 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             *p->pUShort = n; break;
diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx
index e0f6f3fa421d..7322863f3475 100644
--- a/basic/source/sbx/sbxulng.cxx
+++ b/basic/source/sbx/sbxulng.cxx
@@ -31,10 +31,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-UINT32 ImpGetULong( const SbxValues* p )
+sal_uInt32 ImpGetULong( const SbxValues* p )
 {
     SbxValues aTmp;
-    UINT32 nRes;
+    sal_uInt32 nRes;
 start:
     switch( +p->eType )
     {
@@ -80,7 +80,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT32) ( p->nSingle + 0.5 );
+                nRes = (sal_uInt32) ( p->nSingle + 0.5 );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -121,7 +121,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT32) ( dVal + 0.5 );
+                nRes = (sal_uInt32) ( dVal + 0.5 );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -144,7 +144,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
                 }
                 else
-                    nRes = (UINT32) ( d + 0.5 );
+                    nRes = (sal_uInt32) ( d + 0.5 );
             }
             break;
         case SbxOBJECT:
@@ -199,7 +199,7 @@ start:
     return nRes;
 }
 
-void ImpPutULong( SbxValues* p, UINT32 n )
+void ImpPutULong( SbxValues* p, sal_uInt32 n )
 {
     SbxValues aTmp;
 start:
@@ -270,27 +270,27 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXUINT;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             *p->pULong = n; break;
         case SbxBYREF | SbxSINGLE:
diff --git a/basic/source/sbx/sbxvals.cxx b/basic/source/sbx/sbxvals.cxx
index e63a352879ed..71a3bfc7f0d8 100644
--- a/basic/source/sbx/sbxvals.cxx
+++ b/basic/source/sbx/sbxvals.cxx
@@ -48,21 +48,21 @@ SbxValues::SbxValues( const BigInt &rBig ) : eType(SbxCURRENCY)
 #pragma warning(disable: 4273)
 #endif
 
-BOOL BigInt::INT64( SbxINT64 *p ) const
+sal_Bool BigInt::INT64( SbxINT64 *p ) const
 {
     if( bIsBig ) {
         if( nLen > 4 || (nNum[3] & 0x8000) )
-            return FALSE;
+            return sal_False;
 
-        p->nLow  = ((UINT32)nNum[1] << 16) | (UINT32)nNum[0];
-        p->nHigh = ((UINT32)nNum[3] << 16) | (UINT32)nNum[2];
+        p->nLow  = ((sal_uInt32)nNum[1] << 16) | (sal_uInt32)nNum[0];
+        p->nHigh = ((sal_uInt32)nNum[3] << 16) | (sal_uInt32)nNum[2];
         if( bIsNeg )
             p->CHS();
     }
     else
-        p->Set( (INT32)nVal );
+        p->Set( (sal_Int32)nVal );
 
-    return TRUE;
+    return sal_True;
 }
 
 BigInt::BigInt( const SbxINT64 &r )
@@ -72,28 +72,28 @@ BigInt::BigInt( const SbxINT64 &r )
     *this = r.nHigh;
     if( r.nHigh )
         *this *= a10000;
-    *this += (USHORT)(r.nLow >> 16);
+    *this += (sal_uInt16)(r.nLow >> 16);
     *this *= a10000;
-    *this += (USHORT)r.nLow;
+    *this += (sal_uInt16)r.nLow;
 }
 
-BOOL BigInt::UINT64( SbxUINT64 *p ) const
+sal_Bool BigInt::UINT64( SbxUINT64 *p ) const
 {
     if( bIsBig ) {
         if( bIsNeg || nLen > 4 )
-            return FALSE;
+            return sal_False;
 
-        p->nLow  = ((UINT32)nNum[1] << 16) | (UINT32)nNum[0];
-        p->nHigh = ((UINT32)nNum[3] << 16) | (UINT32)nNum[2];
+        p->nLow  = ((sal_uInt32)nNum[1] << 16) | (sal_uInt32)nNum[0];
+        p->nHigh = ((sal_uInt32)nNum[3] << 16) | (sal_uInt32)nNum[2];
     }
     else {
         if( nVal < 0 )
-            return FALSE;
+            return sal_False;
 
-        p->Set( (UINT32)nVal );
+        p->Set( (sal_uInt32)nVal );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 BigInt::BigInt( const SbxUINT64 &r )
@@ -103,7 +103,7 @@ BigInt::BigInt( const SbxUINT64 &r )
     *this = BigInt(r.nHigh);
     if( r.nHigh )
         *this *= a10000;
-    *this += (USHORT)(r.nLow >> 16);
+    *this += (sal_uInt16)(r.nLow >> 16);
     *this *= a10000;
-    *this += (USHORT)r.nLow;
+    *this += (sal_uInt16)r.nLow;
 }
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index a5e80e8921c6..d7a3e27603ab 100755
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -202,7 +202,7 @@ int matherr( struct _exception* p )
 #endif
         default:        SbxBase::SetError( SbxERR_NOTIMP ); break;
     }
-    return TRUE;
+    return sal_True;
 }
 #endif
 
@@ -228,21 +228,21 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
     if( p )
     switch( t & 0x0FFF )
     {
-        case SbxINTEGER:    n |= SbxBYREF; aData.pInteger = (INT16*) p; break;
+        case SbxINTEGER:    n |= SbxBYREF; aData.pInteger = (sal_Int16*) p; break;
         case SbxULONG64:    n |= SbxBYREF; aData.pULong64 = (SbxUINT64*) p; break;
         case SbxLONG64:
         case SbxCURRENCY:   n |= SbxBYREF; aData.pLong64 = (SbxINT64*) p; break;
-        case SbxLONG:       n |= SbxBYREF; aData.pLong = (INT32*) p; break;
+        case SbxLONG:       n |= SbxBYREF; aData.pLong = (sal_Int32*) p; break;
         case SbxSINGLE:     n |= SbxBYREF; aData.pSingle = (float*) p; break;
         case SbxDATE:
         case SbxDOUBLE:     n |= SbxBYREF; aData.pDouble = (double*) p; break;
         case SbxSTRING:     n |= SbxBYREF; aData.pOUString = (::rtl::OUString*) p; break;
         case SbxERROR:
         case SbxUSHORT:
-        case SbxBOOL:       n |= SbxBYREF; aData.pUShort = (UINT16*) p; break;
-        case SbxULONG:      n |= SbxBYREF; aData.pULong = (UINT32*) p; break;
+        case SbxBOOL:       n |= SbxBYREF; aData.pUShort = (sal_uInt16*) p; break;
+        case SbxULONG:      n |= SbxBYREF; aData.pULong = (sal_uInt32*) p; break;
         case SbxCHAR:       n |= SbxBYREF; aData.pChar = (xub_Unicode*) p; break;
-        case SbxBYTE:       n |= SbxBYREF; aData.pByte = (BYTE*) p; break;
+        case SbxBYTE:       n |= SbxBYREF; aData.pByte = (sal_uInt8*) p; break;
         case SbxINT:        n |= SbxBYREF; aData.pInt = (int*) p; break;
         case SbxOBJECT:
             aData.pObj = (SbxBase*) p;
@@ -363,8 +363,8 @@ SbxValue::~SbxValue()
         {
             HACK(nicht bei Parent-Prop - sonst CyclicRef)
             SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-            BOOL bParentProp = pThisVar && 5345 ==
-            ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+            sal_Bool bParentProp = pThisVar && 5345 ==
+            ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
             if ( !bParentProp )
                 aData.pObj->ReleaseRef();
         }
@@ -394,8 +394,8 @@ void SbxValue::Clear()
                 {
                     HACK(nicht bei Parent-Prop - sonst CyclicRef)
                     SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-                    BOOL bParentProp = pThisVar && 5345 ==
-                    ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+                    sal_Bool bParentProp = pThisVar && 5345 ==
+                    ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
                     if ( !bParentProp )
                         aData.pObj->ReleaseRef();
                 }
@@ -420,7 +420,7 @@ void SbxValue::Clear()
 
 // Dummy
 
-void SbxValue::Broadcast( ULONG )
+void SbxValue::Broadcast( sal_uIntPtr )
 {}
 
 //////////////////////////// Daten auslesen //////////////////////////////
@@ -432,13 +432,13 @@ void SbxValue::Broadcast( ULONG )
 
 SbxValue* SbxValue::TheRealValue() const
 {
-    return TheRealValue( TRUE );
+    return TheRealValue( sal_True );
 }
 
 // #55226 Zusaetzliche Info transportieren
 bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal );    // sbunoobj.cxx
 
-SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
+SbxValue* SbxValue::TheRealValue( sal_Bool bObjInObjError ) const
 {
     SbxValue* p = (SbxValue*) this;
     for( ;; )
@@ -511,9 +511,9 @@ SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
     return p;
 }
 
-BOOL SbxValue::Get( SbxValues& rRes ) const
+sal_Bool SbxValue::Get( SbxValues& rRes ) const
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     SbxError eOld = GetError();
     if( eOld != SbxERR_OK )
         ResetError();
@@ -548,7 +548,7 @@ BOOL SbxValue::Get( SbxValues& rRes ) const
                 case SbxDECIMAL: rRes.pDecimal = ImpGetDecimal( &p->aData ); break;
                 case SbxDATE:    rRes.nDouble = ImpGetDate( &p->aData ); break;
                 case SbxBOOL:
-                    rRes.nUShort = sal::static_int_cast< UINT16 >(
+                    rRes.nUShort = sal::static_int_cast< sal_uInt16 >(
                         ImpGetBool( &p->aData ) );
                     break;
                 case SbxCHAR:    rRes.nChar = ImpGetChar( &p->aData ); break;
@@ -603,18 +603,18 @@ BOOL SbxValue::Get( SbxValues& rRes ) const
     }
     if( !IsError() )
     {
-        bRes = TRUE;
+        bRes = sal_True;
         if( eOld != SbxERR_OK )
             SetError( eOld );
     }
     return bRes;
 }
 
-BOOL SbxValue::GetNoBroadcast( SbxValues& rRes )
+sal_Bool SbxValue::GetNoBroadcast( SbxValues& rRes )
 {
-    USHORT nFlags_ = GetFlags();
+    sal_uInt16 nFlags_ = GetFlags();
     SetFlag( SBX_NO_BROADCAST );
-    BOOL bRes = Get( rRes );
+    sal_Bool bRes = Get( rRes );
     SetFlags( nFlags_ );
     return bRes;
 }
@@ -654,7 +654,7 @@ const XubString& SbxValue::GetCoreString() const
     return aResult;
 }
 
-BOOL SbxValue::HasObject() const
+sal_Bool SbxValue::HasObject() const
 {
     ErrCode eErr = GetError();
     SbxValues aRes;
@@ -664,33 +664,33 @@ BOOL SbxValue::HasObject() const
     return 0 != aRes.pObj;
 }
 
-BOOL SbxValue::GetBool() const
+sal_Bool SbxValue::GetBool() const
 {
     SbxValues aRes;
     aRes.eType = SbxBOOL;
     Get( aRes );
-    return BOOL( aRes.nUShort != 0 );
+    return sal_Bool( aRes.nUShort != 0 );
 }
 
 #define GET( g, e, t, m ) \
 t SbxValue::g() const { SbxValues aRes(e); Get( aRes ); return aRes.m; }
 
-GET( GetByte,     SbxBYTE,       BYTE,             nByte )
+GET( GetByte,     SbxBYTE,       sal_uInt8,             nByte )
 GET( GetChar,     SbxCHAR,       xub_Unicode,           nChar )
 GET( GetCurrency, SbxCURRENCY,   SbxINT64,         nLong64 )
 GET( GetDate,     SbxDATE,       double,           nDouble )
 GET( GetData,     SbxDATAOBJECT, void*,            pData )
 GET( GetDouble,   SbxDOUBLE,     double,           nDouble )
-GET( GetErr,      SbxERROR,      UINT16,           nUShort )
+GET( GetErr,      SbxERROR,      sal_uInt16,           nUShort )
 GET( GetInt,      SbxINT,        int,              nInt )
-GET( GetInteger,  SbxINTEGER,    INT16,            nInteger )
-GET( GetLong,     SbxLONG,       INT32,            nLong )
+GET( GetInteger,  SbxINTEGER,    sal_Int16,            nInteger )
+GET( GetLong,     SbxLONG,       sal_Int32,            nLong )
 GET( GetLong64,   SbxLONG64,     SbxINT64,         nLong64 )
 GET( GetObject,   SbxOBJECT,     SbxBase*,         pObj )
 GET( GetSingle,   SbxSINGLE,     float,            nSingle )
-GET( GetULong,    SbxULONG,      UINT32,           nULong )
+GET( GetULong,    SbxULONG,      sal_uInt32,           nULong )
 GET( GetULong64,  SbxULONG64,    SbxUINT64,        nULong64 )
-GET( GetUShort,   SbxUSHORT,     UINT16,           nUShort )
+GET( GetUShort,   SbxUSHORT,     sal_uInt16,           nUShort )
 GET( GetInt64,    SbxSALINT64,   sal_Int64,        nInt64 )
 GET( GetUInt64,   SbxSALUINT64,  sal_uInt64,       uInt64 )
 GET( GetDecimal,  SbxDECIMAL,    SbxDecimal*,      pDecimal )
@@ -698,9 +698,9 @@ GET( GetDecimal,  SbxDECIMAL,    SbxDecimal*,      pDecimal )
 
 //////////////////////////// Daten schreiben /////////////////////////////
 
-BOOL SbxValue::Put( const SbxValues& rVal )
+sal_Bool SbxValue::Put( const SbxValues& rVal )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     SbxError eOld = GetError();
     if( eOld != SbxERR_OK )
         ResetError();
@@ -714,7 +714,7 @@ BOOL SbxValue::Put( const SbxValues& rVal )
         // die wahren Werte suchen
         SbxValue* p = this;
         if( rVal.eType != SbxOBJECT )
-            p = TheRealValue( FALSE );  // #55226 Hier keinen Fehler erlauben
+            p = TheRealValue( sal_False );  // #55226 Hier keinen Fehler erlauben
         if( p )
         {
             if( !p->CanWrite() )
@@ -743,16 +743,16 @@ BOOL SbxValue::Put( const SbxValues& rVal )
                 case SbxSTRING:     ImpPutString( &p->aData, rVal.pOUString ); break;
                 case SbxINT:
 #if SAL_TYPES_SIZEOFINT == 2
-                    ImpPutInteger( &p->aData, (INT16) rVal.nInt );
+                    ImpPutInteger( &p->aData, (sal_Int16) rVal.nInt );
 #else
-                    ImpPutLong( &p->aData, (INT32) rVal.nInt );
+                    ImpPutLong( &p->aData, (sal_Int32) rVal.nInt );
 #endif
                     break;
                 case SbxUINT:
 #if SAL_TYPES_SIZEOFINT == 2
-                    ImpPutUShort( &p->aData, (UINT16) rVal.nUInt );
+                    ImpPutUShort( &p->aData, (sal_uInt16) rVal.nUInt );
 #else
-                    ImpPutULong( &p->aData, (UINT32) rVal.nUInt );
+                    ImpPutULong( &p->aData, (sal_uInt32) rVal.nUInt );
 #endif
                     break;
                 case SbxOBJECT:
@@ -777,8 +777,8 @@ BOOL SbxValue::Put( const SbxValues& rVal )
                             }
                             HACK(nicht bei Parent-Prop - sonst CyclicRef)
                             SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-                            BOOL bParentProp = pThisVar && 5345 ==
-                                    ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+                            sal_Bool bParentProp = pThisVar && 5345 ==
+                                    ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
                             if ( !bParentProp )
                                 p->aData.pObj->AddRef();
                         }
@@ -798,11 +798,11 @@ BOOL SbxValue::Put( const SbxValues& rVal )
             }
             if( !IsError() )
             {
-                p->SetModified( TRUE );
+                p->SetModified( sal_True );
                 p->Broadcast( SBX_HINT_DATACHANGED );
                 if( eOld != SbxERR_OK )
                     SetError( eOld );
-                bRes = TRUE;
+                bRes = sal_True;
             }
         }
     }
@@ -816,7 +816,7 @@ BOOL SbxValue::Put( const SbxValues& rVal )
 // werden koennen, wenn Floats mit ',' als Dezimaltrenner oder BOOLs
 // explizit mit "TRUE" oder "FALSE" angegeben werden.
 // Implementierung in ImpConvStringExt (SBXSCAN.CXX)
-BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
+sal_Bool SbxValue::PutStringExt( const ::rtl::OUString& r )
 {
     // Kopieren, bei Unicode gleich konvertieren
     ::rtl::OUString aStr( r );
@@ -831,7 +831,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
 
     // Nur, wenn wirklich was konvertiert wurde, Kopie nehmen,
     // sonst Original (Unicode bleibt erhalten)
-    BOOL bRet;
+    sal_Bool bRet;
     if( ImpConvStringExt( aStr, eTargetType ) )
         aRes.pOUString = (::rtl::OUString*)&aStr;
     else
@@ -839,7 +839,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
 
     // #34939: Bei Strings. die eine Zahl enthalten und wenn this einen
     // Num-Typ hat, Fixed-Flag setzen, damit der Typ nicht veraendert wird
-    USHORT nFlags_ = GetFlags();
+    sal_uInt16 nFlags_ = GetFlags();
     if( ( eTargetType >= SbxINTEGER && eTargetType <= SbxCURRENCY ) ||
         ( eTargetType >= SbxCHAR && eTargetType <= SbxUINT ) ||
         eTargetType == SbxBOOL )
@@ -851,7 +851,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
     }
 
     Put( aRes );
-    bRet = BOOL( !IsError() );
+    bRet = sal_Bool( !IsError() );
 
     // Falls das mit dem FIXED einen Error gegeben hat, zuruecksetzen
     // (UI-Aktion sollte keinen Error ergeben, sondern nur scheitern)
@@ -862,104 +862,104 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
     return bRet;
 }
 
-BOOL SbxValue::PutString( const xub_Unicode* p )
+sal_Bool SbxValue::PutString( const xub_Unicode* p )
 {
     ::rtl::OUString aVal( p );
     SbxValues aRes;
     aRes.eType = SbxSTRING;
     aRes.pOUString = &aVal;
     Put( aRes );
-    return BOOL( !IsError() );
+    return sal_Bool( !IsError() );
 }
 
-BOOL SbxValue::PutBool( BOOL b )
+sal_Bool SbxValue::PutBool( sal_Bool b )
 {
     SbxValues aRes;
     aRes.eType = SbxBOOL;
-    aRes.nUShort = sal::static_int_cast< UINT16 >(b ? SbxTRUE : SbxFALSE);
+    aRes.nUShort = sal::static_int_cast< sal_uInt16 >(b ? SbxTRUE : SbxFALSE);
     Put( aRes );
-    return BOOL( !IsError() );
+    return sal_Bool( !IsError() );
 }
 
-BOOL SbxValue::PutEmpty()
+sal_Bool SbxValue::PutEmpty()
 {
-    BOOL bRet = SetType( SbxEMPTY );
-        SetModified( TRUE );
+    sal_Bool bRet = SetType( SbxEMPTY );
+        SetModified( sal_True );
     return bRet;
 }
 
-BOOL SbxValue::PutNull()
+sal_Bool SbxValue::PutNull()
 {
-    BOOL bRet = SetType( SbxNULL );
+    sal_Bool bRet = SetType( SbxNULL );
     if( bRet )
-        SetModified( TRUE );
+        SetModified( sal_True );
     return bRet;
 }
 
 
 // Special decimal methods
-BOOL SbxValue::PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
+sal_Bool SbxValue::PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
 {
     SbxValue::Clear();
     aData.pDecimal = new SbxDecimal( rAutomationDec );
     aData.pDecimal->addRef();
     aData.eType = SbxDECIMAL;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxValue::fillAutomationDecimal
+sal_Bool SbxValue::fillAutomationDecimal
     ( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
 {
     SbxDecimal* pDecimal = GetDecimal();
     if( pDecimal != NULL )
     {
         pDecimal->fillAutomationDecimal( rAutomationDec );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL SbxValue::PutpChar( const xub_Unicode* p )
+sal_Bool SbxValue::PutpChar( const xub_Unicode* p )
 {
     ::rtl::OUString aVal( p );
     SbxValues aRes;
     aRes.eType = SbxLPSTR;
     aRes.pOUString = &aVal;
     Put( aRes );
-    return BOOL( !IsError() );
+    return sal_Bool( !IsError() );
 }
 
-BOOL SbxValue::PutString( const ::rtl::OUString& r )
+sal_Bool SbxValue::PutString( const ::rtl::OUString& r )
 {
     SbxValues aRes;
     aRes.eType = SbxSTRING;
     aRes.pOUString = (::rtl::OUString*) &r;
     Put( aRes );
-    return BOOL( !IsError() );
+    return sal_Bool( !IsError() );
 }
 
 
 #define PUT( p, e, t, m ) \
-BOOL SbxValue::p( t n ) \
-{ SbxValues aRes(e); aRes.m = n; Put( aRes ); return BOOL( !IsError() ); }
+sal_Bool SbxValue::p( t n ) \
+{ SbxValues aRes(e); aRes.m = n; Put( aRes ); return sal_Bool( !IsError() ); }
 
-PUT( PutByte,     SbxBYTE,       BYTE,             nByte )
+PUT( PutByte,     SbxBYTE,       sal_uInt8,             nByte )
 PUT( PutChar,     SbxCHAR,       xub_Unicode,      nChar )
 PUT( PutCurrency, SbxCURRENCY,   const SbxINT64&,  nLong64 )
 PUT( PutDate,     SbxDATE,       double,           nDouble )
 PUT( PutData,     SbxDATAOBJECT, void*,            pData )
 PUT( PutDouble,   SbxDOUBLE,     double,           nDouble )
-PUT( PutErr,      SbxERROR,      UINT16,           nUShort )
+PUT( PutErr,      SbxERROR,      sal_uInt16,           nUShort )
 PUT( PutInt,      SbxINT,        int,              nInt )
-PUT( PutInteger,  SbxINTEGER,    INT16,            nInteger )
-PUT( PutLong,     SbxLONG,       INT32,            nLong )
+PUT( PutInteger,  SbxINTEGER,    sal_Int16,            nInteger )
+PUT( PutLong,     SbxLONG,       sal_Int32,            nLong )
 PUT( PutLong64,   SbxLONG64,     const SbxINT64&,  nLong64 )
 PUT( PutObject,   SbxOBJECT,     SbxBase*,         pObj )
 PUT( PutSingle,   SbxSINGLE,     float,            nSingle )
-PUT( PutULong,    SbxULONG,      UINT32,           nULong )
+PUT( PutULong,    SbxULONG,      sal_uInt32,           nULong )
 PUT( PutULong64,  SbxULONG64,    const SbxUINT64&, nULong64 )
-PUT( PutUShort,   SbxUSHORT,     UINT16,           nUShort )
+PUT( PutUShort,   SbxUSHORT,     sal_uInt16,           nUShort )
 PUT( PutInt64,    SbxSALINT64,   sal_Int64,        nInt64 )
 PUT( PutUInt64,   SbxSALUINT64,  sal_uInt64,       uInt64 )
 PUT( PutDecimal,  SbxDECIMAL,    SbxDecimal*,      pDecimal )
@@ -967,7 +967,7 @@ PUT( PutDecimal,  SbxDECIMAL,    SbxDecimal*,      pDecimal )
 
 ////////////////////////// Setzen des Datentyps ///////////////////////////
 
-BOOL SbxValue::IsFixed() const
+sal_Bool SbxValue::IsFixed() const
 {
     return ( (GetFlags() & SBX_FIXED) | (aData.eType & SbxBYREF) ) != 0;
 }
@@ -976,22 +976,22 @@ BOOL SbxValue::IsFixed() const
 // oder einen vollstaendig konvertierbaren String enthaelt
 
 // #41692, fuer RTL und Basic-Core getrennt implementieren
-BOOL SbxValue::IsNumeric() const
+sal_Bool SbxValue::IsNumeric() const
 {
-    return ImpIsNumeric( /*bOnlyIntntl*/FALSE );
+    return ImpIsNumeric( /*bOnlyIntntl*/sal_False );
 }
 
-BOOL SbxValue::IsNumericRTL() const
+sal_Bool SbxValue::IsNumericRTL() const
 {
-    return ImpIsNumeric( /*bOnlyIntntl*/TRUE );
+    return ImpIsNumeric( /*bOnlyIntntl*/sal_True );
 }
 
-BOOL SbxValue::ImpIsNumeric( BOOL bOnlyIntntl ) const
+sal_Bool SbxValue::ImpIsNumeric( sal_Bool bOnlyIntntl ) const
 {
 
     if( !CanRead() )
     {
-        SetError( SbxERR_PROP_WRITEONLY ); return FALSE;
+        SetError( SbxERR_PROP_WRITEONLY ); return sal_False;
     }
     // Downcast pruefen!!!
     if( this->ISA(SbxVariable) )
@@ -1004,14 +1004,14 @@ BOOL SbxValue::ImpIsNumeric( BOOL bOnlyIntntl ) const
             ::rtl::OUString s( *aData.pOUString );
             double n;
             SbxDataType t2;
-            USHORT nLen = 0;
-            if( ImpScan( s, n, t2, &nLen, /*bAllowIntntl*/FALSE, bOnlyIntntl ) == SbxERR_OK )
-                return BOOL( nLen == s.getLength() );
+            sal_uInt16 nLen = 0;
+            if( ImpScan( s, n, t2, &nLen, /*bAllowIntntl*/sal_False, bOnlyIntntl ) == SbxERR_OK )
+                return sal_Bool( nLen == s.getLength() );
         }
-        return FALSE;
+        return sal_False;
     }
     else
-        return BOOL( t == SbxEMPTY
+        return sal_Bool( t == SbxEMPTY
             || ( t >= SbxINTEGER && t <= SbxCURRENCY )
             || ( t >= SbxCHAR && t <= SbxUINT ) );
 }
@@ -1031,19 +1031,19 @@ SbxDataType SbxValue::GetFullType() const
     return aData.eType;
 }
 
-BOOL SbxValue::SetType( SbxDataType t )
+sal_Bool SbxValue::SetType( SbxDataType t )
 {
     DBG_ASSERT( !( t & 0xF000 ), "Setzen von BYREF|ARRAY verboten!" );
     if( ( t == SbxEMPTY && aData.eType == SbxVOID )
      || ( aData.eType == SbxEMPTY && t == SbxVOID ) )
-        return TRUE;
+        return sal_True;
     if( ( t & 0x0FFF ) == SbxVARIANT )
     {
         // Versuch, den Datentyp auf Variant zu setzen
         ResetFlag( SBX_FIXED );
         if( IsFixed() )
         {
-            SetError( SbxERR_CONVERSION ); return FALSE;
+            SetError( SbxERR_CONVERSION ); return sal_False;
         }
         t = SbxEMPTY;
     }
@@ -1051,7 +1051,7 @@ BOOL SbxValue::SetType( SbxDataType t )
     {
         if( !CanWrite() || IsFixed() )
         {
-            SetError( SbxERR_CONVERSION ); return FALSE;
+            SetError( SbxERR_CONVERSION ); return sal_False;
         }
         else
         {
@@ -1066,12 +1066,12 @@ BOOL SbxValue::SetType( SbxDataType t )
                     {
                         HACK(nicht bei Parent-Prop - sonst CyclicRef)
                         SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-                        UINT16 nSlotId = pThisVar
-                                    ? ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) )
+                        sal_uInt16 nSlotId = pThisVar
+                                    ? ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) )
                                     : 0;
                         DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName() == UniString::CreateFromAscii( "Parent" ),
                                     "SID_PARENTOBJECT heisst nicht 'Parent'" );
-                        BOOL bParentProp = 5345 == nSlotId;
+                        sal_Bool bParentProp = 5345 == nSlotId;
                         if ( !bParentProp )
                             aData.pObj->ReleaseRef();
                     }
@@ -1083,31 +1083,31 @@ BOOL SbxValue::SetType( SbxDataType t )
             aData.eType = t;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxValue::Convert( SbxDataType eTo )
+sal_Bool SbxValue::Convert( SbxDataType eTo )
 {
     eTo = SbxDataType( eTo & 0x0FFF );
     if( ( aData.eType & 0x0FFF ) == eTo )
-        return TRUE;
+        return sal_True;
     if( !CanWrite() )
-        return FALSE;
+        return sal_False;
     if( eTo == SbxVARIANT )
     {
         // Versuch, den Datentyp auf Variant zu setzen
         ResetFlag( SBX_FIXED );
         if( IsFixed() )
         {
-            SetError( SbxERR_CONVERSION ); return FALSE;
+            SetError( SbxERR_CONVERSION ); return sal_False;
         }
         else
-            return TRUE;
+            return sal_True;
     }
     // Convert from Null geht niemals. Einmal Null, immer Null!
     if( aData.eType == SbxNULL )
     {
-        SetError( SbxERR_CONVERSION ); return FALSE;
+        SetError( SbxERR_CONVERSION ); return sal_False;
     }
 
     // Konversion der Daten:
@@ -1121,17 +1121,17 @@ BOOL SbxValue::Convert( SbxDataType eTo )
         {
             SetType( eTo );
             Put( aNew );
-            SetModified( TRUE );
+            SetModified( sal_True );
         }
         Broadcast( SBX_HINT_CONVERTED );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 ////////////////////////////////// Rechnen /////////////////////////////////
 
-BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
+sal_Bool SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
 {
     bool bVBAInterop =  SbiRuntime::isVBAEnabled();
 
@@ -1457,19 +1457,19 @@ Lbl_OpIsDouble:
     }
 Lbl_OpIsEmpty:
 
-    BOOL bRes = BOOL( !IsError() );
+    sal_Bool bRes = sal_Bool( !IsError() );
     if( bRes && eOld != SbxERR_OK )
         SetError( eOld );
     return bRes;
 }
 
-// Die Vergleichs-Routine liefert TRUE oder FALSE.
+// Die Vergleichs-Routine liefert sal_True oder sal_False.
 
-BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
+sal_Bool SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
 {
     bool bVBAInterop =  SbiRuntime::isVBAEnabled();
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     SbxError eOld = GetError();
     if( eOld != SbxERR_OK )
         ResetError();
@@ -1477,24 +1477,24 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
         SetError( SbxERR_PROP_WRITEONLY );
     else if( GetType() == SbxNULL && rOp.GetType() == SbxNULL && !bVBAInterop )
     {
-        bRes = TRUE;
+        bRes = sal_True;
     }
     else if( GetType() == SbxEMPTY && rOp.GetType() == SbxEMPTY )
-        bRes = !bVBAInterop ? TRUE : ( eOp == SbxEQ ? TRUE : FALSE );
+        bRes = !bVBAInterop ? sal_True : ( eOp == SbxEQ ? sal_True : sal_False );
     // Sonderregel 1: Ist ein Operand Null, ist das Ergebnis FALSE
     else if( GetType() == SbxNULL || rOp.GetType() == SbxNULL )
-        bRes = FALSE;
+        bRes = sal_False;
     // Sonderregel 2: Wenn beide Variant sind und einer ist numerisch,
     // und der andere ein String, ist num < str
     else if( !IsFixed() && !rOp.IsFixed()
      && ( rOp.GetType() == SbxSTRING && GetType() != SbxSTRING && IsNumeric() ) && !bVBAInterop
     )
-        bRes = BOOL( eOp == SbxLT || eOp == SbxLE || eOp == SbxNE );
+        bRes = sal_Bool( eOp == SbxLT || eOp == SbxLE || eOp == SbxNE );
     else if( !IsFixed() && !rOp.IsFixed()
      && ( GetType() == SbxSTRING && rOp.GetType() != SbxSTRING && rOp.IsNumeric() )
 && !bVBAInterop
     )
-        bRes = BOOL( eOp == SbxGT || eOp == SbxGE || eOp == SbxNE );
+        bRes = sal_Bool( eOp == SbxGT || eOp == SbxGE || eOp == SbxNE );
     else
     {
         SbxValues aL, aR;
@@ -1506,17 +1506,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
             if( Get( aL ) && rOp.Get( aR ) ) switch( eOp )
             {
                 case SbxEQ:
-                    bRes = BOOL( *aL.pOUString == *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString == *aR.pOUString ); break;
                 case SbxNE:
-                    bRes = BOOL( *aL.pOUString != *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString != *aR.pOUString ); break;
                 case SbxLT:
-                    bRes = BOOL( *aL.pOUString <  *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString <  *aR.pOUString ); break;
                 case SbxGT:
-                    bRes = BOOL( *aL.pOUString >  *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString >  *aR.pOUString ); break;
                 case SbxLE:
-                    bRes = BOOL( *aL.pOUString <= *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString <= *aR.pOUString ); break;
                 case SbxGE:
-                    bRes = BOOL( *aL.pOUString >= *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString >= *aR.pOUString ); break;
                 default:
                     SetError( SbxERR_NOTIMP );
             }
@@ -1530,17 +1530,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
               switch( eOp )
             {
                 case SbxEQ:
-                    bRes = BOOL( aL.nSingle == aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle == aR.nSingle ); break;
                 case SbxNE:
-                    bRes = BOOL( aL.nSingle != aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle != aR.nSingle ); break;
                 case SbxLT:
-                    bRes = BOOL( aL.nSingle <  aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle <  aR.nSingle ); break;
                 case SbxGT:
-                    bRes = BOOL( aL.nSingle >  aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle >  aR.nSingle ); break;
                 case SbxLE:
-                    bRes = BOOL( aL.nSingle <= aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle <= aR.nSingle ); break;
                 case SbxGE:
-                    bRes = BOOL( aL.nSingle >= aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle >= aR.nSingle ); break;
                 default:
                     SetError( SbxERR_NOTIMP );
             }
@@ -1556,17 +1556,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
                 switch( eOp )
                 {
                     case SbxEQ:
-                        bRes = BOOL( eRes == SbxDecimal::EQ ); break;
+                        bRes = sal_Bool( eRes == SbxDecimal::EQ ); break;
                     case SbxNE:
-                        bRes = BOOL( eRes != SbxDecimal::EQ ); break;
+                        bRes = sal_Bool( eRes != SbxDecimal::EQ ); break;
                     case SbxLT:
-                        bRes = BOOL( eRes == SbxDecimal::LT ); break;
+                        bRes = sal_Bool( eRes == SbxDecimal::LT ); break;
                     case SbxGT:
-                        bRes = BOOL( eRes == SbxDecimal::GT ); break;
+                        bRes = sal_Bool( eRes == SbxDecimal::GT ); break;
                     case SbxLE:
-                        bRes = BOOL( eRes != SbxDecimal::GT ); break;
+                        bRes = sal_Bool( eRes != SbxDecimal::GT ); break;
                     case SbxGE:
-                        bRes = BOOL( eRes != SbxDecimal::LT ); break;
+                        bRes = sal_Bool( eRes != SbxDecimal::LT ); break;
                     default:
                         SetError( SbxERR_NOTIMP );
                 }
@@ -1589,17 +1589,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
               switch( eOp )
             {
                 case SbxEQ:
-                    bRes = BOOL( aL.nDouble == aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble == aR.nDouble ); break;
                 case SbxNE:
-                    bRes = BOOL( aL.nDouble != aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble != aR.nDouble ); break;
                 case SbxLT:
-                    bRes = BOOL( aL.nDouble <  aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble <  aR.nDouble ); break;
                 case SbxGT:
-                    bRes = BOOL( aL.nDouble >  aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble >  aR.nDouble ); break;
                 case SbxLE:
-                    bRes = BOOL( aL.nDouble <= aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble <= aR.nDouble ); break;
                 case SbxGE:
-                    bRes = BOOL( aL.nDouble >= aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble >= aR.nDouble ); break;
                 default:
                     SetError( SbxERR_NOTIMP );
             }
@@ -1611,7 +1611,7 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
                 if ( bVBAInterop && eOp == SbxEQ && GetError() == SbxERR_CONVERSION )
                 {
                     ResetError();
-                    bRes = FALSE;
+                    bRes = sal_False;
                 }
             }
         }
@@ -1623,10 +1623,10 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
 
 ///////////////////////////// Lesen/Schreiben ////////////////////////////
 
-BOOL SbxValue::LoadData( SvStream& r, USHORT )
+sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
 {
     SbxValue::Clear();
-    UINT16 nType;
+    sal_uInt16 nType;
     r >> nType;
     aData.eType = SbxDataType( nType );
     switch( nType )
@@ -1646,7 +1646,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
             {
                 aData.nSingle = 0.0F;
-                return FALSE;
+                return sal_False;
             }
             aData.nSingle = (float) d;
             break;
@@ -1661,7 +1661,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK )
             {
                 aData.nDouble = 0.0;
-                return FALSE;
+                return sal_False;
             }
             break;
         }
@@ -1691,7 +1691,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             r >> aData.nUShort; break;
         case SbxOBJECT:
         {
-            BYTE nMode;
+            sal_uInt8 nMode;
             r >> nMode;
             switch( nMode )
             {
@@ -1700,7 +1700,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
                     break;
                 case 1:
                     aData.pObj = SbxBase::Load( r );
-                    return BOOL( aData.pObj != NULL );
+                    return sal_Bool( aData.pObj != NULL );
                 case 2:
                     aData.pObj = this;
                     break;
@@ -1720,7 +1720,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             r >> aData.nULong; break;
         case SbxINT:
         {
-            BYTE n;
+            sal_uInt8 n;
             r >> n;
             // Passt der Int auf diesem System?
             if( n > SAL_TYPES_SIZEOFINT )
@@ -1731,7 +1731,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
         }
         case SbxUINT:
         {
-            BYTE n;
+            sal_uInt8 n;
             r >> n;
             // Passt der UInt auf diesem System?
             if( n > SAL_TYPES_SIZEOFINT )
@@ -1756,14 +1756,14 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             ResetFlag(SBX_FIXED);
             aData.eType = SbxNULL;
             DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxValue::StoreData( SvStream& r ) const
+sal_Bool SbxValue::StoreData( SvStream& r ) const
 {
-    UINT16 nType = sal::static_int_cast< UINT16 >(aData.eType);
+    sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(aData.eType);
     r << nType;
     switch( nType & 0x0FFF )
     {
@@ -1813,14 +1813,14 @@ BOOL SbxValue::StoreData( SvStream& r ) const
             {
                 if( PTR_CAST(SbxValue,aData.pObj) != this )
                 {
-                    r << (BYTE) 1;
+                    r << (sal_uInt8) 1;
                     return aData.pObj->Store( r );
                 }
                 else
-                    r << (BYTE) 2;
+                    r << (sal_uInt8) 2;
             }
             else
-                r << (BYTE) 0;
+                r << (sal_uInt8) 0;
             break;
         case SbxCHAR:
         {
@@ -1834,13 +1834,13 @@ BOOL SbxValue::StoreData( SvStream& r ) const
             r << aData.nULong; break;
         case SbxINT:
         {
-            BYTE n = SAL_TYPES_SIZEOFINT;
+            sal_uInt8 n = SAL_TYPES_SIZEOFINT;
             r << n << (sal_Int32)aData.nInt;
             break;
         }
         case SbxUINT:
         {
-            BYTE n = SAL_TYPES_SIZEOFINT;
+            sal_uInt8 n = SAL_TYPES_SIZEOFINT;
             r << n << (sal_uInt32)aData.nUInt;
             break;
         }
@@ -1857,8 +1857,8 @@ BOOL SbxValue::StoreData( SvStream& r ) const
             break;
         default:
             DBG_ASSERT( !this, "Speichern eines nicht unterstuetzten Datentyps" );
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 12a6d29672a9..1f33cc8acfd2 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -47,9 +47,9 @@ using namespace com::sun::star::uno;
 TYPEINIT1(SbxVariable,SbxValue)
 TYPEINIT1(SbxHint,SfxSimpleHint)
 
-extern UINT32 nVarCreator;          // in SBXBASE.CXX, fuer LoadData()
+extern sal_uInt32 nVarCreator;          // in SBXBASE.CXX, fuer LoadData()
 #ifdef DBG_UTIL
-static ULONG nVar = 0;
+static sal_uIntPtr nVar = 0;
 #endif
 
 ///////////////////////////// SbxVariableImpl ////////////////////////////
@@ -166,7 +166,7 @@ SfxBroadcaster& SbxVariable::GetBroadcaster()
 // Eines Tages kann man vielleicht den Parameter 0 schleifen,
 // dann entfaellt die Kopiererei...
 
-void SbxVariable::Broadcast( ULONG nHintId )
+void SbxVariable::Broadcast( sal_uIntPtr nHintId )
 {
     if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() )
     {
@@ -181,7 +181,7 @@ void SbxVariable::Broadcast( ULONG nHintId )
         // Weitere Broadcasts verhindern
         SfxBroadcaster* pSave = pCst;
         pCst = NULL;
-        USHORT nSaveFlags = GetFlags();
+        sal_uInt16 nSaveFlags = GetFlags();
         SetFlag( SBX_READWRITE );
         if( mpPar.Is() )
             // this, als Element 0 eintragen, aber den Parent nicht umsetzen!
@@ -199,7 +199,7 @@ SbxInfo* SbxVariable::GetInfo()
     {
         Broadcast( SBX_HINT_INFOWANTED );
         if( pInfo.Is() )
-            SetModified( TRUE );
+            SetModified( sal_True );
     }
     return pInfo;
 }
@@ -246,7 +246,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
             aTmp += cType;
     }
     aTmp += '(';
-    for( USHORT i = 0; i < pInfo->aParams.Count(); i++ )
+    for( sal_uInt16 i = 0; i < pInfo->aParams.Count(); i++ )
     {
         const SbxParamInfo* q = pInfo->aParams.GetObject( i );
         int nt = q->eType & 0x0FFF;
@@ -280,7 +280,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
                 aTmp += String( SbxRes( STRING_AS ) );
                 if( nt < 32 )
                     aTmp += String( SbxRes(
-                        sal::static_int_cast< USHORT >( STRING_TYPES + nt ) ) );
+                        sal::static_int_cast< sal_uInt16 >( STRING_TYPES + nt ) ) );
                 else
                     aTmp += String( SbxRes( STRING_ANY ) );
             }
@@ -293,7 +293,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
         aTmp += String( SbxRes( STRING_AS ) );
         if( et < 32 )
             aTmp += String( SbxRes(
-                sal::static_int_cast< USHORT >( STRING_TYPES + et ) ) );
+                sal::static_int_cast< sal_uInt16 >( STRING_TYPES + et ) ) );
         else
             aTmp += String( SbxRes( STRING_ANY ) );
     }
@@ -303,21 +303,21 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
 
 // Einen simplen Hashcode erzeugen: Es werden die ersten 6 Zeichen gewertet.
 
-USHORT SbxVariable::MakeHashCode( const XubString& rName )
+sal_uInt16 SbxVariable::MakeHashCode( const XubString& rName )
 {
-    USHORT n = 0;
-    USHORT nLen = rName.Len();
+    sal_uInt16 n = 0;
+    sal_uInt16 nLen = rName.Len();
     if( nLen > 6 )
         nLen = 6;
     const xub_Unicode* p = rName.GetBuffer();
     while( nLen-- )
     {
-        BYTE c = (BYTE)*p;
+        sal_uInt8 c = (sal_uInt8)*p;
         p++;
         // Falls wir ein Schweinezeichen haben, abbrechen!!
         if( c >= 0x80 )
             return 0;
-        n = sal::static_int_cast< USHORT >( ( n << 3 ) + toupper( c ) );
+        n = sal::static_int_cast< sal_uInt16 >( ( n << 3 ) + toupper( c ) );
     }
     return n;
 }
@@ -356,7 +356,7 @@ SbxClassType SbxVariable::GetClass() const
     return SbxCLASS_VARIABLE;
 }
 
-void SbxVariable::SetModified( BOOL b )
+void SbxVariable::SetModified( sal_Bool b )
 {
     if( IsSet( SBX_NO_MODIFY ) )
         return;
@@ -372,11 +372,11 @@ void SbxVariable::SetParent( SbxObject* p )
     if ( p && ISA(SbxObject) )
     {
         // dann mu\s dieses auch Child vom neuen Parent sein
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         SbxArray *pChilds = p->GetObjects();
         if ( pChilds )
         {
-            for ( USHORT nIdx = 0; !bFound && nIdx < pChilds->Count(); ++nIdx )
+            for ( sal_uInt16 nIdx = 0; !bFound && nIdx < pChilds->Count(); ++nIdx )
                 bFound = ( this == pChilds->Get(nIdx) );
         }
         if ( !bFound )
@@ -432,17 +432,17 @@ void SbxVariable::ClearComListener( void )
 
 ////////////////////////////// Laden/Speichern /////////////////////////////
 
-BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    UINT16 nType;
-    BYTE cMark;
+    sal_uInt16 nType;
+    sal_uInt8 cMark;
     rStrm >> cMark;
     if( cMark == 0xFF )
     {
         if( !SbxValue::LoadData( rStrm, nVer ) )
-            return FALSE;
+            return sal_False;
         rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
-        UINT32 nTemp;
+        sal_uInt32 nTemp;
         rStrm >> nTemp;
         nUserData = nTemp;
     }
@@ -451,7 +451,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
         rStrm.SeekRel( -1L );
         rStrm >> nType;
         rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
-        UINT32 nTemp;
+        sal_uInt32 nTemp;
         rStrm >> nTemp;
         nUserData = nTemp;
         // Korrektur: Alte Methoden haben statt SbxNULL jetzt SbxEMPTY
@@ -479,7 +479,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
                 if( ImpScan( aTmpString, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
                 {
                     aTmp.nSingle = 0;
-                    return FALSE;
+                    return sal_False;
                 }
                 aTmp.nSingle = (float) d;
                 break;
@@ -493,7 +493,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
                 if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK )
                 {
                     aTmp.nDouble = 0;
-                    return FALSE;
+                    return sal_False;
                 }
                 break;
             }
@@ -507,11 +507,11 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
             default:
                 aData.eType = SbxNULL;
                 DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
-                return FALSE;
+                return sal_False;
         }
         // Wert putten
         if( nType != SbxNULL && nType != SbxEMPTY && !Put( aTmp ) )
-            return FALSE;
+            return sal_False;
     }
     rStrm >> cMark;
     // cMark ist auch eine Versionsnummer!
@@ -520,29 +520,29 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
     if( cMark )
     {
         if( cMark > 2 )
-            return FALSE;
+            return sal_False;
         pInfo = new SbxInfo;
-        pInfo->LoadData( rStrm, (USHORT) cMark );
+        pInfo->LoadData( rStrm, (sal_uInt16) cMark );
     }
     // Privatdaten nur laden, wenn es eine SbxVariable ist
     if( GetClass() == SbxCLASS_VARIABLE && !LoadPrivateData( rStrm, nVer ) )
-        return FALSE;
+        return sal_False;
     ((SbxVariable*) this)->Broadcast( SBX_HINT_DATACHANGED );
     nHash =  MakeHashCode( maName );
-    SetModified( TRUE );
-    return TRUE;
+    SetModified( sal_True );
+    return sal_True;
 }
 
-BOOL SbxVariable::StoreData( SvStream& rStrm ) const
+sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const
 {
-    rStrm << (BYTE) 0xFF;       // Marker
-    BOOL bValStore;
+    rStrm << (sal_uInt8) 0xFF;      // Marker
+    sal_Bool bValStore;
     if( this->IsA( TYPE(SbxMethod) ) )
     {
         // #50200 Verhindern, dass Objekte, die zur Laufzeit als Return-Wert
         // in der Methode als Value gespeichert sind, mit gespeichert werden
         SbxVariable* pThis = (SbxVariable*)this;
-        USHORT nSaveFlags = GetFlags();
+        sal_uInt16 nSaveFlags = GetFlags();
         pThis->SetFlag( SBX_WRITE );
         pThis->SbxValue::Clear();
         pThis->SetFlags( nSaveFlags );
@@ -556,23 +556,23 @@ BOOL SbxVariable::StoreData( SvStream& rStrm ) const
     else
         bValStore = SbxValue::StoreData( rStrm );
     if( !bValStore )
-        return FALSE;
+        return sal_False;
     // if( !SbxValue::StoreData( rStrm ) )
-        // return FALSE;
+        // return sal_False;
     rStrm.WriteByteString( maName, RTL_TEXTENCODING_ASCII_US );
-    rStrm << (UINT32)nUserData;
+    rStrm << (sal_uInt32)nUserData;
     if( pInfo.Is() )
     {
-        rStrm << (BYTE) 2;      // Version 2: mit UserData!
+        rStrm << (sal_uInt8) 2;     // Version 2: mit UserData!
         pInfo->StoreData( rStrm );
     }
     else
-        rStrm << (BYTE) 0;
+        rStrm << (sal_uInt8) 0;
     // Privatdaten nur speichern, wenn es eine SbxVariable ist
     if( GetClass() == SbxCLASS_VARIABLE )
         return StorePrivateData( rStrm );
     else
-        return TRUE;
+        return sal_True;
 }
 
 ////////////////////////////// SbxInfo ///////////////////////////////////
@@ -580,7 +580,7 @@ BOOL SbxVariable::StoreData( SvStream& rStrm ) const
 SbxInfo::SbxInfo() : aHelpFile(), nHelpId( 0 ), aParams()
 {}
 
-SbxInfo::SbxInfo( const String& r, UINT32 n )
+SbxInfo::SbxInfo( const String& r, sal_uInt32 n )
        : aHelpFile( r ), nHelpId( n ), aParams()
 {}
 
@@ -613,7 +613,7 @@ SbxAlias::~SbxAlias()
         EndListening( xAlias->GetBroadcaster() );
 }
 
-void SbxAlias::Broadcast( ULONG nHt )
+void SbxAlias::Broadcast( sal_uIntPtr nHt )
 {
     if( xAlias.Is() && StaticIsEnabledBroadcasting() )
     {
@@ -643,11 +643,11 @@ void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
     }
 }
 
-void SbxVariable::Dump( SvStream& rStrm, BOOL bFill )
+void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
 {
     ByteString aBNameStr( (const UniString&)GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US );
     rStrm << "Variable( "
-          << ByteString::CreateFromInt64( (ULONG) this ).GetBuffer() << "=="
+          << ByteString::CreateFromInt64( (sal_uIntPtr) this ).GetBuffer() << "=="
           << aBNameStr.GetBuffer();
     ByteString aBParentNameStr( (const UniString&)GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US );
     if ( GetParent() )
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 004b61fbf198..f173ae5f18ff 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -139,7 +139,7 @@ bool writeOasis2OOoLibraryElement(
 
     if (! xSMgr.is())
     {
-        return FALSE;
+        return sal_False;
     }
 
     Reference< xml::sax::XParser > xParser(
@@ -161,7 +161,7 @@ bool writeOasis2OOoLibraryElement(
 
     if ( !xParser.is() || !xWriter.is() )
     {
-        return FALSE;
+        return sal_False;
     }
 
     Sequence<Any> aArgs( 1 );
@@ -182,7 +182,7 @@ bool writeOasis2OOoLibraryElement(
 
     xParser->parseStream( source );
 
-    return TRUE;
+    return sal_True;
 }
 
 void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
@@ -201,13 +201,13 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
 
     Reference< XInputStream > xInput( xISP->createInputStream() );
 
-    bool bComplete = FALSE;
+    bool bComplete = sal_False;
     if ( mbOasis2OOoFormat )
     {
         bComplete = writeOasis2OOoLibraryElement( xInput, xOutput );
     }
 
-    if ( bComplete == FALSE )
+    if ( bComplete == sal_False )
     {
         Sequence< sal_Int8 > bytes;
         sal_Int32 nRead = xInput->readBytes( bytes, xInput->available() );
@@ -246,7 +246,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
         {
             // if we cannot get the version then the
             // Oasis2OOoTransformer will not be used
-            OSL_ASSERT(FALSE);
+            OSL_ASSERT(sal_False);
         }
     }
 
@@ -329,7 +329,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
     {
         OSL_ENSURE( 0, "Parsing error\n" );
         SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
-        ULONG nErrorCode = ERRCODE_IO_GENERAL;
+        sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
         ErrorHandler::HandleError( nErrorCode );
         return aRetAny;
     }
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index f44846972710..fbf1429f9753 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -736,7 +736,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
                 if( nPass == 0 )
                 {
                     SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
-                    ULONG nErrorCode = ERRCODE_IO_GENERAL;
+                    sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
                     ErrorHandler::HandleError( nErrorCode );
                 }
             }
@@ -758,7 +758,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
                 {
                     xInput.clear();
                     SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
-                    ULONG nErrorCode = ERRCODE_IO_GENERAL;
+                    sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
                     ErrorHandler::HandleError( nErrorCode );
                 }
             }
@@ -1490,7 +1490,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
                         throw;
 
                     SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aElementPath );
-                    ULONG nErrorCode = ERRCODE_IO_GENERAL;
+                    sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
                     ErrorHandler::HandleError( nErrorCode );
                 }
             }
@@ -1603,7 +1603,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
                 throw;
 
             SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aLibInfoPath );
-            ULONG nErrorCode = ERRCODE_IO_GENERAL;
+            sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
             ErrorHandler::HandleError( nErrorCode );
         }
     }
@@ -1678,7 +1678,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile(  SfxLibrary* pLib,
             if( !GbMigrationSuppressErrors )
             {
                 SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
-                ULONG nErrorCode = ERRCODE_IO_GENERAL;
+                sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
                 ErrorHandler::HandleError( nErrorCode );
             }
         }
@@ -1705,7 +1705,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile(  SfxLibrary* pLib,
         //                              makeAny( e ) );
         OSL_ENSURE( 0, "Parsing error\n" );
         SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
-        ULONG nErrorCode = ERRCODE_IO_GENERAL;
+        sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
         ErrorHandler::HandleError( nErrorCode );
         return sal_False;
     }
@@ -2034,7 +2034,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
         }
         catch( uno::Exception& )
         {
-            ULONG nErrorCode = ERRCODE_IO_GENERAL;
+            sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
             ErrorHandler::HandleError( nErrorCode );
         }
     }
@@ -2056,7 +2056,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
         {
             xOut.clear();
             SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aLibInfoPath );
-            ULONG nErrorCode = ERRCODE_IO_GENERAL;
+            sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
             ErrorHandler::HandleError( nErrorCode );
         }
 
@@ -2086,7 +2086,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
     catch( uno::Exception& )
     {
         OSL_ENSURE( sal_False, "Problem during storing of libraries!\n" );
-        ULONG nErrorCode = ERRCODE_IO_GENERAL;
+        sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
         ErrorHandler::HandleError( nErrorCode );
     }
 
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index d99f98589b31..f51ce54cd7ee 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -299,7 +299,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
     catch( Exception& )
     {
         SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
-        ULONG nErrorCode = ERRCODE_IO_GENERAL;
+        sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
         ErrorHandler::HandleError( nErrorCode );
     }
 
@@ -653,7 +653,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                         throw uno::RuntimeException();
 
                     SvMemoryStream aMemStream;
-                    /*BOOL bStore = */pMod->StoreBinaryData( aMemStream );
+                    /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream );
 
                     sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
                     Sequence< sal_Int8 > aBinSeq( nSize );
@@ -794,7 +794,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                                             embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE );
 
                         SvMemoryStream aMemStream;
-                        /*BOOL bStore = */pMod->StoreBinaryData( aMemStream );
+                        /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream );
 
                         sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
                         Sequence< sal_Int8 > aBinSeq( nSize );
@@ -951,7 +951,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                 if( !pMod )
                 {
                     pMod = pBasicLib->MakeModule( aElementName, String() );
-                    pBasicLib->SetModified( FALSE );
+                    pBasicLib->SetModified( sal_False );
                 }
 
                 //OUString aCodeStreamName( RTL_CONSTASCII_USTRINGPARAM("code.bin") );
@@ -973,7 +973,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                         throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), nError );
                     }
 
-                    /*BOOL bRet = */pMod->LoadBinaryData( *pStream );
+                    /*sal_Bool bRet = */pMod->LoadBinaryData( *pStream );
                     // TODO: Check return value
 
                     delete pStream;
@@ -1063,7 +1063,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                         if( !pMod )
                         {
                             pMod = pBasicLib->MakeModule( aElementName, String() );
-                            pBasicLib->SetModified( FALSE );
+                            pBasicLib->SetModified( sal_False );
                         }
 
                         try {
@@ -1082,7 +1082,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                                                                     nError );
                             }
 
-                            /*BOOL bRet = */pMod->LoadBinaryData( *pStream );
+                            /*sal_Bool bRet = */pMod->LoadBinaryData( *pStream );
                             // TODO: Check return value
 
                             delete pStream;
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
index c56506d7ae31..7e3efc597ac1 100644
--- a/basic/workben/mgrtest.cxx
+++ b/basic/workben/mgrtest.cxx
@@ -85,7 +85,7 @@ private:
     BasicManager*   pBasMgr;
 
     void            CheckError();
-    USHORT          nLibX;
+    sal_uInt16          nLibX;
     DECL_LINK( BasicErrorHdl, StarBASIC * );
 
 
@@ -125,7 +125,7 @@ TestWindow::TestWindow() :
     aFont.SetSize( Size( 0, 6 ) );
     aFont.SetPitch( PITCH_VARIABLE );
     aFont.SetFamily( FAMILY_SWISS );
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     aFont.SetAlign( ALIGN_TOP );
     aToolBox.SetFont( aFont );
     SetFont( aFont );
@@ -197,7 +197,7 @@ void TestWindow::ShowInfo()
     if ( pBasMgr )
     {
         Point aPos( 10, aToolBox.GetSizePixel().Height()+5 );
-        for ( USHORT nLib = 0; nLib < pBasMgr->GetLibCount(); nLib++ )
+        for ( sal_uInt16 nLib = 0; nLib < pBasMgr->GetLibCount(); nLib++ )
         {
             String aOutStr( nLib );
             aOutStr +=": ";
@@ -212,7 +212,7 @@ void TestWindow::ShowInfo()
             aOutStr += ">, Storage='";
             aOutStr += pBasMgr->GetLibStorageName( nLib );
             aOutStr += "', bLoaded=";
-            aOutStr += (USHORT)pBasMgr->IsLibLoaded( nLib );
+            aOutStr += (sal_uInt16)pBasMgr->IsLibLoaded( nLib );
             DrawText( aPos, aOutStr );
             aPos.Y() += nH;
         }
@@ -223,22 +223,22 @@ void TestWindow::UpdateToolBox()
 {
     // View of some buttons as checked or disabled if
     // wished by tests
-    aToolBox.EnableItem( TB_ORG, (BOOL)(ULONG)pBasMgr );
+    aToolBox.EnableItem( TB_ORG, (sal_Bool)(sal_uIntPtr)pBasMgr );
 
-    aToolBox.EnableItem( TB_CREATELIB1, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_CREATELIB2, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_CREATELIB3, (BOOL)(ULONG)pBasMgr );
+    aToolBox.EnableItem( TB_CREATELIB1, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_CREATELIB2, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_CREATELIB3, (sal_Bool)(sal_uIntPtr)pBasMgr );
 
-    aToolBox.EnableItem( TB_LOADLIB1, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_LOADLIB2, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_LOADLIB3, (BOOL)(ULONG)pBasMgr );
+    aToolBox.EnableItem( TB_LOADLIB1, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_LOADLIB2, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_LOADLIB3, (sal_Bool)(sal_uIntPtr)pBasMgr );
 
-    aToolBox.EnableItem( TB_STORELIBX, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_EXECX, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_UNLOADX, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_LOADX, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_REMOVEX, (BOOL)(ULONG)pBasMgr );
-    aToolBox.EnableItem( TB_REMOVEDELX, (BOOL)(ULONG)pBasMgr );
+    aToolBox.EnableItem( TB_STORELIBX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_EXECX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_UNLOADX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_LOADX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_REMOVEX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_REMOVEDELX, (sal_Bool)(sal_uIntPtr)pBasMgr );
 
     aToolBox.CheckItem( TB_LIB0, nLibX == 0 );
     aToolBox.CheckItem( TB_LIB1, nLibX == 1 );
@@ -248,8 +248,8 @@ void TestWindow::UpdateToolBox()
 
 IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
 {
-    USHORT nId = aToolBox.GetCurItemId();
-    BOOL bChecked = aToolBox.IsItemChecked( nId );
+    sal_uInt16 nId = aToolBox.GetCurItemId();
+    sal_Bool bChecked = aToolBox.IsItemChecked( nId );
     switch ( nId )
     {
         case TB_NEW:
@@ -289,7 +289,7 @@ IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
         {
             if ( pBasMgr )
             {
-                USHORT nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib1Str ) );
+                sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib1Str ) );
                 if ( nLib != LIB_NOTFOUND )
                 {
                     pBasMgr->SetLibStorageName( nLib, "d:\\mystore.svs" );
@@ -309,7 +309,7 @@ IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
         {
             if ( pBasMgr )
             {
-                USHORT nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib2Str ) );
+                sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib2Str ) );
                 if ( nLib != LIB_NOTFOUND )
                 {
                     pBasMgr->SetLibStorageName( nLib, "d:\\mystore.svs" );
@@ -328,7 +328,7 @@ IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
             if ( pBasMgr )
             {
                 // liegt in einem anderen Storage !!!
-                USHORT nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib3Str ) );
+                sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib3Str ) );
                 if ( nLib != LIB_NOTFOUND )
                 {
                     pBasMgr->SetLibStorageName( nLib, "d:\\mystore2.svs" );
@@ -347,7 +347,7 @@ IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
             if ( pBasMgr )
             {
                 SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
-                if ( !pBasMgr->AddLib( *xStorage, pLib1Str, FALSE ) )
+                if ( !pBasMgr->AddLib( *xStorage, pLib1Str, sal_False ) )
                     Sound::Beep();
             }
         }
@@ -357,7 +357,7 @@ IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
             if ( pBasMgr )
             {
                 SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
-                if ( !pBasMgr->AddLib( *xStorage, pLib2Str, FALSE ) )
+                if ( !pBasMgr->AddLib( *xStorage, pLib2Str, sal_False ) )
                     Sound::Beep();
             }
         }
@@ -368,7 +368,7 @@ IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
             {
                 // liegt in einem anderen Storage !!!
                 SvStorageRef xStorage = new SvStorage( "d:\\mystore2.svs" );
-                if ( !pBasMgr->AddLib( *xStorage, pLib3Str, FALSE ) )
+                if ( !pBasMgr->AddLib( *xStorage, pLib3Str, sal_False ) )
                     Sound::Beep();
             }
         }
@@ -394,13 +394,13 @@ IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
         case TB_REMOVEX:
         {
             if ( pBasMgr )
-                pBasMgr->RemoveLib( nLibX, FALSE );
+                pBasMgr->RemoveLib( nLibX, sal_False );
         }
         break;
         case TB_REMOVEDELX:
         {
             if ( pBasMgr )
-                pBasMgr->RemoveLib( nLibX, TRUE );
+                pBasMgr->RemoveLib( nLibX, sal_True );
         }
         break;
         case TB_EXECX:
@@ -527,7 +527,7 @@ void __EXPORT TestWindow::Resize()
 void __EXPORT TestWindow::KeyInput( const KeyEvent& rKEvt )
 {
     char nCharCode = rKEvt.GetCharCode();
-    USHORT nCode = rKEvt.GetKeyCode().GetCode();
+    sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
 
     // Nur bei Alt-Return
     if ( ( nCode == KEY_RETURN ) && rKEvt.GetKeyCode().IsMod2() )
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 20214c18af75..ef150f126060 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -829,12 +829,12 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::fetchRow" );
     // read the bookmark
 
-    BOOL bIsCurRecordDeleted = sal_False;
+    sal_Bool bIsCurRecordDeleted = sal_False;
     _rRow->setDeleted(bIsCurRecordDeleted);
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     // fields
 
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index d292c7ab5291..8c826766b2c4 100644
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -114,7 +114,7 @@ OEvaluateSet* OFILEOperandAttr::preProcess(OBoolOperator* pOp, OOperand* pRight)
                 if (pIter)
                 {
                     pEvaluateSet = new OEvaluateSet();
-                    ULONG nRec = pIter->First();
+                    sal_uIntPtr nRec = pIter->First();
                     while (nRec != NODE_NOTFOUND)
                     {
                         (*pEvaluateSet)[nRec] = nRec;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index e4d3eafc9071..cd11204b3570 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -143,7 +143,7 @@ ONDXPagePtr ODbaseIndex::getRoot()
     {
         m_nRootPage = m_aHeader.db_rootpage;
         m_nPageCount = m_aHeader.db_pagecount;
-        m_aRoot = CreatePage(m_nRootPage,NULL,TRUE);
+        m_aRoot = CreatePage(m_nRootPage,NULL,sal_True);
     }
     return m_aRoot;
 }
@@ -185,7 +185,7 @@ OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp,
     return new OIndexIterator(this, pOp, pOperand);
 }
 //------------------------------------------------------------------
-BOOL ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
     // Sucht ein bestimmten Wert im Index
@@ -207,13 +207,13 @@ BOOL ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValu
     catch (Exception&)
     {
         OSL_ASSERT(0);
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -224,7 +224,7 @@ BOOL ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -233,35 +233,35 @@ BOOL ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
     // Existiert der Wert bereits
     // Find immer verwenden um das aktuelle Blatt zu bestimmen
     if (!ConvertToKey(&aKey, nRec, rValue) || (getRoot()->Find(aKey) && isUnique()))
-        return FALSE;
+        return sal_False;
 
     ONDXNode aNewNode(aKey);
 
     // einfuegen in das aktuelle Blatt
     if (!m_aCurLeaf.Is())
-        return FALSE;
+        return sal_False;
 
-    BOOL bResult = m_aCurLeaf->Insert(aNewNode);
+    sal_Bool bResult = m_aCurLeaf->Insert(aNewNode);
     Release(bResult);
 
     return bResult;
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
+sal_Bool ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
                          const ORowSetValue& rNewValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
     ONDXKey aKey;
     if (!ConvertToKey(&aKey, nRec, rNewValue) || (isUnique() && getRoot()->Find(aKey)))
-        return FALSE;
+        return sal_False;
     else
         return Delete(nRec, rOldValue) && Insert(nRec,rNewValue);
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -269,13 +269,13 @@ BOOL ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
     // Find immer verwenden um das aktuelle Blatt zu bestimmen
     ONDXKey aKey;
     if (!ConvertToKey(&aKey, nRec, rValue) || !getRoot()->Find(aKey))
-        return FALSE;
+        return sal_False;
 
     ONDXNode aNewNode(aKey);
 
     // einfuegen in das aktuelle Blatt
     if (!m_aCurLeaf.Is())
-        return FALSE;
+        return sal_False;
 #if OSL_DEBUG_LEVEL > 1
     m_aRoot->PrintPage();
 #endif
@@ -289,10 +289,10 @@ void ODbaseIndex::Collect(ONDXPage* pPage)
         m_aCollector.push_back(pPage);
 }
 //------------------------------------------------------------------
-void ODbaseIndex::Release(BOOL bSave)
+void ODbaseIndex::Release(sal_Bool bSave)
 {
     // Freigeben der Indexressourcen
-    m_bUseCollector = FALSE;
+    m_bUseCollector = sal_False;
 
     if (m_aCurLeaf.Is())
     {
@@ -307,7 +307,7 @@ void ODbaseIndex::Release(BOOL bSave)
         m_aRoot.Clear();
     }
     // alle Referenzen freigeben, bevor der FileStream geschlossen wird
-    for (ULONG i = 0; i < m_aCollector.size(); i++)
+    for (sal_uIntPtr i = 0; i < m_aCollector.size(); i++)
         m_aCollector[i]->QueryDelete();
 
     m_aCollector.clear();
@@ -335,7 +335,7 @@ void ODbaseIndex::closeImpl()
     }
 }
 //------------------------------------------------------------------
-ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, BOOL bLoad)
+ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, sal_Bool bLoad)
 {
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
 
@@ -412,14 +412,14 @@ void ODbaseIndex::createINFEntry()
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
 
-    USHORT nSuffix = aInfFile.GetKeyCount();
+    sal_uInt16 nSuffix = aInfFile.GetKeyCount();
     ByteString aNewEntry,aKeyName;
-    BOOL bCase = isCaseSensitive();
+    sal_Bool bCase = isCaseSensitive();
     while (!aNewEntry.Len())
     {
         aNewEntry = "NDX";
         aNewEntry += ByteString::CreateFromInt32(++nSuffix);
-        for (USHORT i = 0; i < aInfFile.GetKeyCount(); i++)
+        for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++)
         {
             aKeyName = aInfFile.GetKeyName(i);
             if (bCase ? aKeyName == aNewEntry : aKeyName.EqualsIgnoreCaseAscii(aNewEntry))
@@ -432,7 +432,7 @@ void ODbaseIndex::createINFEntry()
     aInfFile.WriteKey(aNewEntry,ByteString(sEntry,m_pTable->getConnection()->getTextEncoding()));
 }
 // -------------------------------------------------------------------------
-BOOL ODbaseIndex::DropImpl()
+sal_Bool ODbaseIndex::DropImpl()
 {
     closeImpl();
 
@@ -456,13 +456,13 @@ BOOL ODbaseIndex::DropImpl()
 
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
-    USHORT nKeyCnt = aInfFile.GetKeyCount();
+    sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
     ByteString aKeyName;
     String sEntry = m_Name;
     sEntry += String::CreateFromAscii(".ndx");
 
     // delete entries from the inf file
-    for (USHORT nKey = 0; nKey < nKeyCnt; nKey++)
+    for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
     {
         // Verweist der Key auf ein Indexfile?...
         aKeyName = aInfFile.GetKeyName( nKey );
@@ -475,7 +475,7 @@ BOOL ODbaseIndex::DropImpl()
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 // -------------------------------------------------------------------------
 void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile)
@@ -486,7 +486,7 @@ void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::
     m_pTable->getConnection()->throwGenericSQLException(_nErrorId,*this);
 }
 //------------------------------------------------------------------
-BOOL ODbaseIndex::CreateImpl()
+sal_Bool ODbaseIndex::CreateImpl()
 {
     // Anlegen des Index
     const ::rtl::OUString sFile = getCompletePath();
@@ -515,7 +515,7 @@ BOOL ODbaseIndex::CreateImpl()
 //              String::CreateFromAscii("01000"),
 //              aStatus.CreateErrorMessage(aText),
 //              0, String() );
-//      return FALSE;
+//      return sal_False;
 //  }
 
     // create the index file
@@ -586,7 +586,7 @@ BOOL ODbaseIndex::CreateImpl()
     xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
 
     m_aHeader.db_keytype = (nType == DataType::VARCHAR || nType == DataType::CHAR) ? 0 : 1;
-    m_aHeader.db_keylen  = (m_aHeader.db_keytype) ? 8 : (USHORT)getINT32(xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
+    m_aHeader.db_keylen  = (m_aHeader.db_keytype) ? 8 : (sal_uInt16)getINT32(xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
     m_aHeader.db_keylen = (( m_aHeader.db_keylen - 1) / 4 + 1) * 4;
     m_aHeader.db_maxkeys = (PAGE_SIZE - 4) / (8 + m_aHeader.db_keylen);
     if ( m_aHeader.db_maxkeys < 3 )
@@ -597,7 +597,7 @@ BOOL ODbaseIndex::CreateImpl()
     m_pFileStream->SetStreamSize(PAGE_SIZE);
 
     ByteString aCol(aName,m_pTable->getConnection()->getTextEncoding());
-    strncpy(m_aHeader.db_name,aCol.GetBuffer(),std::min((USHORT)sizeof(m_aHeader.db_name), aCol.Len()));
+    strncpy(m_aHeader.db_name,aCol.GetBuffer(),std::min((sal_uInt16)sizeof(m_aHeader.db_name), aCol.Len()));
     m_aHeader.db_unique  = m_IsUnique ? 1: 0;
     m_aHeader.db_keyrec  = m_aHeader.db_keylen + 8;
 
@@ -609,11 +609,11 @@ BOOL ODbaseIndex::CreateImpl()
 
     //  ODatabaseType eType = m_aHeader.db_keytype == 0 ? DataType::VARCHAR : DataType::DOUBLE;
     m_aCurLeaf = m_aRoot = CreatePage(m_nRootPage);
-    m_aRoot->SetModified(TRUE);
+    m_aRoot->SetModified(sal_True);
 
-    m_bUseCollector = TRUE;
+    m_bUseCollector = sal_True;
 
-    //  ULONG nRowsLeft = pCursor->RowCount();
+    //  sal_uIntPtr nRowsLeft = pCursor->RowCount();
     sal_Int32 nRowsLeft = 0;
     Reference<XRow> xRow(xSet,UNO_QUERY);
 
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index f32b1f2cffe0..b35caa0a3da1 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -46,22 +46,22 @@ OIndexIterator::~OIndexIterator()
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::First()
+sal_uIntPtr OIndexIterator::First()
 {
-    return Find(TRUE);
+    return Find(sal_True);
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::Next()
+sal_uIntPtr OIndexIterator::Next()
 {
-    return Find(FALSE);
+    return Find(sal_False);
 }
 //------------------------------------------------------------------
-ULONG OIndexIterator::Find(BOOL bFirst)
+sal_uIntPtr OIndexIterator::Find(sal_Bool bFirst)
 {
     //  ONDXIndex* m_pIndex = GetNDXIndex();
 
-    ULONG nRes = STRING_NOTFOUND;
+    sal_uIntPtr nRes = STRING_NOTFOUND;
 //  if (!m_pIndex->IsOpen())
 //      return nRes;
 
@@ -108,7 +108,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
     // dieses findet beim Insert besondere Beachtung
     //  ONDXIndex* m_pIndex = GetNDXIndex();
     OOp_COMPARE aTempOp(SQLFilterOperator::GREATER);
-    USHORT i = 0;
+    sal_uInt16 i = 0;
 
     if (pPage->IsLeaf())
     {
@@ -146,7 +146,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetCompare(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetCompare(sal_Bool bFirst)
 {
     ONDXKey* pKey = NULL;
     //  ONDXIndex* m_pIndex = GetNDXIndex();
@@ -217,7 +217,7 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetLike(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetLike(sal_Bool bFirst)
 {
     //  ONDXIndex* m_pIndex = GetNDXIndex();
     if (bFirst)
@@ -238,7 +238,7 @@ ULONG OIndexIterator::GetLike(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetNull(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetNull(sal_Bool bFirst)
 {
     //  ONDXIndex* m_pIndex = GetNDXIndex();
     if (bFirst)
@@ -261,16 +261,16 @@ ULONG OIndexIterator::GetNull(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetNotNull(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst)
 {
     ONDXKey* pKey;
     //  ONDXIndex* m_pIndex = GetNDXIndex();
     if (bFirst)
     {
         // erst alle NULL werte abklappern
-        for (ULONG nRec = GetNull(bFirst);
+        for (sal_uIntPtr nRec = GetNull(bFirst);
              nRec != STRING_NOTFOUND;
-             nRec = GetNull(FALSE))
+             nRec = GetNull(sal_False))
                  ;
         pKey = m_aCurLeaf.Is() ? &(*m_aCurLeaf)[m_nCurNode].GetKey() : NULL;
     }
@@ -293,7 +293,7 @@ ONDXKey* OIndexIterator::GetNextKey()
             ONDXPage* pParentPage = pPage->GetParent();
             if (pParentPage)
             {
-                USHORT nPos = pParentPage->Search(pPage);
+                sal_uInt16 nPos = pParentPage->Search(pPage);
                 if (nPos != pParentPage->Count() - 1)
                 {   // Seite gefunden
                     pPage = (*pParentPage)[nPos+1].GetChild(m_pIndex,pParentPage);
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index b39581f1be15..7534d06f068c 100644
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -90,7 +90,7 @@ sal_Bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
         OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
         sal_Int32 nPos = m_aHeader.db_kopf + (sal_Int32)(m_nFilePos-1) * nEntryLen;
 
-        ULONG nLen = m_pFileStream->Seek(nPos);
+        sal_uIntPtr nLen = m_pFileStream->Seek(nPos);
         if (m_pFileStream->GetError() != ERRCODE_NONE)
             goto Error;
 
@@ -127,10 +127,10 @@ End:
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
-    BOOL bIsText = TRUE;
+    sal_Bool bIsText = sal_True;
     //  SdbConnection* pConnection = GetConnection();
 
     m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
@@ -142,13 +142,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             ByteString aBStr;
             static char aBuf[514];
             aBuf[512] = 0;          // sonst kann der Zufall uebel mitspielen
-            BOOL bReady = sal_False;
+            sal_Bool bReady = sal_False;
 
             do
             {
                 m_pMemoStream->Read(&aBuf,512);
 
-                USHORT i = 0;
+                sal_uInt16 i = 0;
                 while (aBuf[i] != cEOF && ++i < 512)
                     ;
                 bReady = aBuf[i] == cEOF;
@@ -170,7 +170,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             // Foxpro stores text and binary data
             if (m_aMemoHeader.db_typ == MemoFoxPro)
             {
-                if (((BYTE)sHeader[0]) != 0 || ((BYTE)sHeader[1]) != 0 || ((BYTE)sHeader[2]) != 0)
+                if (((sal_uInt8)sHeader[0]) != 0 || ((sal_uInt8)sHeader[1]) != 0 || ((sal_uInt8)sHeader[2]) != 0)
                 {
 //                  String aText = String(SdbResId(STR_STAT_IResultSetHelper::INVALID));
 //                  aText.SearchAndReplace(String::CreateFromAscii("%%d"),m_pMemoStream->GetFileName());
@@ -184,7 +184,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
 
                 bIsText = sHeader[3] != 0;
             }
-            else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+            else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
             {
 //              String aText = String(SdbResId(STR_STAT_IResultSetHelper::INVALID));
 //              aText.SearchAndReplace(String::CreateFromAscii("%%d"),m_pMemoStream->GetFileName());
@@ -232,7 +232,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
 void ODbaseTable::AllocBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
-    UINT16 nSize = m_aHeader.db_slng;
+    sal_uInt16 nSize = m_aHeader.db_slng;
     OSL_ENSURE(nSize > 0, "Size too small");
 
     if (m_nBufferSize != nSize)
@@ -245,11 +245,11 @@ void ODbaseTable::AllocBuffer()
     if (m_pBuffer == NULL && nSize)
     {
         m_nBufferSize = nSize;
-        m_pBuffer       = new BYTE[m_nBufferSize+1];
+        m_pBuffer       = new sal_uInt8[m_nBufferSize+1];
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
     OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
@@ -285,7 +285,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     else
     {
         ByteString aBuf;
-        USHORT nLen = rIndex.getHeader().db_keylen;
+        sal_uInt16 nLen = rIndex.getHeader().db_keylen;
         char* pStr = aBuf.AllocBuffer(nLen+1);
 
         rStream.Read(pStr,nLen);
@@ -319,7 +319,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         if (aKey.getValue().isNull())
         {
             memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
-            rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+            rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
         }
         else
             rStream << (double) aKey.getValue();
@@ -333,7 +333,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
             ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
             strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
         }
-        rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+        rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
     }
     rStream << aChild;
 }
@@ -354,7 +354,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
 // ONDXKey
 //==================================================================
 //------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXKey::IsText" );
     return eType == DataType::VARCHAR || eType == DataType::CHAR;
@@ -383,7 +383,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
     }
     else if (IsText(getDBType()))
     {
-        INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+        sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
         eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
     }
     else
@@ -460,16 +460,16 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
     return *this;
 }
 // -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
 //------------------------------------------------------------------
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 {
     rStream.Seek(rPage.GetPagePos() * 512);
     rStream >> nValue >> rPage.aChild;
-    rPage.nCount = USHORT(nValue);
+    rPage.nCount = sal_uInt16(nValue);
 
 //  DBG_ASSERT(rPage.nCount && rPage.nCount < rPage.GetIndex().GetMaxNodes(), "Falscher Count");
-    for (USHORT i = 0; i < rPage.nCount; i++)
+    for (sal_uInt16 i = 0; i < rPage.nCount; i++)
         rPage[i].Read(rStream, rPage.GetIndex());
     return rStream;
 }
@@ -478,7 +478,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
 {
     // Seite existiert noch nicht
-    ULONG nSize = (rPage.GetPagePos() + 1) * 512;
+    sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * 512;
     if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
     {
         rStream.SetStreamSize(nSize);
@@ -486,27 +486,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
 
         char aEmptyData[512];
         memset(aEmptyData,0x00,512);
-        rStream.Write((BYTE*)aEmptyData,512);
+        rStream.Write((sal_uInt8*)aEmptyData,512);
     }
-    ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
+    sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
     OSL_UNUSED( nCurrentPos );
 
     nValue = rPage.nCount;
     rStream << nValue << rPage.aChild;
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     for (; i < rPage.nCount; i++)
         rPage[i].Write(rStream, rPage);
 
     // check if we have to fill the stream with '\0'
     if(i < rPage.rIndex.getHeader().db_maxkeys)
     {
-        ULONG nTell = rStream.Tell() % 512;
-        USHORT nBufferSize = rStream.GetBufferSize();
-        ULONG nSize = nBufferSize - nTell;
+        sal_uIntPtr nTell = rStream.Tell() % 512;
+        sal_uInt16 nBufferSize = rStream.GetBufferSize();
+        sal_uIntPtr nSize = nBufferSize - nTell;
         char* pEmptyData = new char[nSize];
         memset(pEmptyData,0x00,nSize);
-        rStream.Write((BYTE*)pEmptyData,nSize);
+        rStream.Write((sal_uInt8*)pEmptyData,nSize);
         rStream.Seek(nTell);
         delete [] pEmptyData;
     }
@@ -521,7 +521,7 @@ void ONDXPage::PrintPage()
     DBG_TRACE4("\nSDB: -----------Page: %d  Parent: %d  Count: %d  Child: %d-----",
         nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
 
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ONDXNode rNode = (*this)[i];
         ONDXKey&  rKey = rNode.GetKey();
@@ -546,7 +546,7 @@ void ONDXPage::PrintPage()
     {
 #if OSL_DEBUG_LEVEL > 1
         GetChild(&rIndex)->PrintPage();
-        for (USHORT i = 0; i < nCount; i++)
+        for (sal_uInt16 i = 0; i < nCount; i++)
         {
             ONDXNode rNode = (*this)[i];
             rNode.GetChild(&rIndex,this)->PrintPage();
@@ -557,18 +557,18 @@ void ONDXPage::PrintPage()
 }
 #endif
 // -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::IsFull" );
     return Count() == rIndex.getHeader().db_maxkeys;
 }
 // -----------------------------------------------------------------------------
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
     // binare Suche spaeter
-    USHORT i = 0xFFFF;
+    sal_uInt16 i = 0xFFFF;
     while (++i < Count())
         if ((*this)[i].GetKey() == rSearch)
             break;
@@ -577,10 +577,10 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
-    USHORT i = 0xFFFF;
+    sal_uInt16 i = 0xFFFF;
     while (++i < Count())
         if (((*this)[i]).GetChild() == pPage)
             break;
@@ -598,7 +598,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
     OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
     if (rSearch != rReplace)
     {
-        USHORT nPos = NODE_NOTFOUND;
+        sal_uInt16 nPos = NODE_NOTFOUND;
         ONDXPage* pPage = this;
 
         while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -607,34 +607,34 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
         if (pPage)
         {
             (*pPage)[nPos].GetKey() = rReplace;
-            pPage->SetModified(TRUE);
+            pPage->SetModified(sal_True);
         }
     }
 }
 // -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 
 //------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 // -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Remove" );
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
 
-    for (USHORT i = nPos; i < (nCount-1); i++)
+    for (sal_uInt16 i = nPos; i < (nCount-1); i++)
         (*this)[i] = (*this)[i+1];
 
     nCount--;
-    bModified = TRUE;
+    bModified = sal_True;
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 6adbfbbbf931..a0844b93b0b7 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -229,12 +229,12 @@ void ODbaseTable::readHeader()
     m_pFileStream->RefreshBuffer(); // sicherstellen, dass die Kopfinformationen tatsaechlich neu gelesen werden
     m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
 
-    BYTE nType=0;
+    sal_uInt8 nType=0;
     (*m_pFileStream) >> nType;
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
 
-    m_pFileStream->Read((char*)(&m_aHeader.db_aedat), 3*sizeof(BYTE));
+    m_pFileStream->Read((char*)(&m_aHeader.db_aedat), 3*sizeof(sal_uInt8));
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
     (*m_pFileStream) >> m_aHeader.db_anz;
@@ -246,7 +246,7 @@ void ODbaseTable::readHeader()
     (*m_pFileStream) >> m_aHeader.db_slng;
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
-    m_pFileStream->Read((char*)(&m_aHeader.db_frei), 20*sizeof(BYTE));
+    m_pFileStream->Read((char*)(&m_aHeader.db_frei), 20*sizeof(sal_uInt8));
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
 
@@ -552,7 +552,7 @@ void ODbaseTable::construct()
         //  if(!m_pColumns && (!m_aColumns.isValid() || !m_aColumns->size()))
         fillColumns();
 
-        UINT32 nFileSize = lcl_getFileSize(*m_pFileStream);
+        sal_uInt32 nFileSize = lcl_getFileSize(*m_pFileStream);
         m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
         if ( m_aHeader.db_anz == 0 && ((nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng) > 0) // seems to be empty or someone wrote bullshit into the dbase file
             m_aHeader.db_anz = ((nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng);
@@ -580,7 +580,7 @@ void ODbaseTable::construct()
     }
 }
 //------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemoHeader()
+sal_Bool ODbaseTable::ReadMemoHeader()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemoHeader" );
     m_pMemoStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
@@ -605,7 +605,7 @@ BOOL ODbaseTable::ReadMemoHeader()
                 m_pMemoStream->Seek(m_aMemoHeader.db_size);
                 m_pMemoStream->Read(sHeader,4);
 
-                if ((m_pMemoStream->GetErrorCode() != ERRCODE_NONE) || ((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+                if ((m_pMemoStream->GetErrorCode() != ERRCODE_NONE) || ((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
                     m_aMemoHeader.db_typ  = MemodBaseIII;
                 else
                     m_aMemoHeader.db_typ  = MemodBaseIV;
@@ -628,7 +628,7 @@ BOOL ODbaseTable::ReadMemoHeader()
             OSL_ENSURE( false, "ODbaseTable::ReadMemoHeader: unsupported memo type!" );
             break;
     }
-    return TRUE;
+    return sal_True;
 }
 // -------------------------------------------------------------------------
 String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _sName )
@@ -704,11 +704,11 @@ void ODbaseTable::refreshIndexes()
         aURL.setExtension(String::CreateFromAscii("inf"));
         Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT));
         aInfFile.SetGroup(dBASE_III_GROUP);
-        USHORT nKeyCnt = aInfFile.GetKeyCount();
+        sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
         ByteString aKeyName;
         ByteString aIndexName;
 
-        for (USHORT nKey = 0; nKey < nKeyCnt; nKey++)
+        for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
         {
             // Verweist der Key auf ein Indexfile?...
             aKeyName = aInfFile.GetKeyName( nKey );
@@ -812,7 +812,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::fetchRow" );
     // Einlesen der Daten
-    BOOL bIsCurRecordDeleted = ((char)m_pBuffer[0] == '*') ? TRUE : sal_False;
+    sal_Bool bIsCurRecordDeleted = ((char)m_pBuffer[0] == '*') ? sal_True : sal_False;
 
     // only read the bookmark
 
@@ -822,7 +822,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     sal_Size nByteOffset = 1;
     // Felder:
@@ -982,13 +982,13 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
                 break;
                 case DataType::BIT:
                 {
-                    BOOL b;
+                    sal_Bool b;
                     switch (* ((const char *)pData))
                     {
                         case 'T':
                         case 'Y':
-                        case 'J':   b = TRUE; break;
-                        default:    b = FALSE; break;
+                        case 'J':   b = sal_True; break;
+                        default:    b = sal_False; break;
                     }
                     *(_rRow->get())[i] = b;
                     //  pVal->setDouble(b);
@@ -1034,7 +1034,7 @@ void ODbaseTable::FileClose()
     ODbaseTable_BASE::FileClose();
 }
 // -------------------------------------------------------------------------
-BOOL ODbaseTable::CreateImpl()
+sal_Bool ODbaseTable::CreateImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateImpl" );
     OSL_ENSURE(!m_pFileStream, "SequenceError");
@@ -1084,7 +1084,7 @@ BOOL ODbaseTable::CreateImpl()
     {
     }
 
-    BOOL bMemoFile = sal_False;
+    sal_Bool bMemoFile = sal_False;
 
     sal_Bool bOk = CreateFile(aURL, bMemoFile);
 
@@ -1148,7 +1148,7 @@ BOOL ODbaseTable::CreateImpl()
     else
         m_aHeader.db_typ = dBaseIII;
 
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName)
@@ -1171,7 +1171,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl:
 }
 //------------------------------------------------------------------
 // erzeugt grundsaetzlich dBase IV Datei Format
-BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
+sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateFile" );
     bCreateMemo = sal_False;
@@ -1182,7 +1182,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
     if (!m_pFileStream)
         return sal_False;
 
-    BYTE nDbaseType = dBaseIII;
+    sal_uInt8 nDbaseType = dBaseIII;
     Reference<XIndexAccess> xColumns(getColumns(),UNO_QUERY);
     Reference<XPropertySet> xCol;
     const ::rtl::OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
@@ -1224,19 +1224,19 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
     memset(aBuffer,0,sizeof(aBuffer));
 
     m_pFileStream->Seek(0L);
-    (*m_pFileStream) << (BYTE) nDbaseType;                              // dBase format
-    (*m_pFileStream) << (BYTE) (aDate.GetYear() % 100);                 // aktuelles Datum
+    (*m_pFileStream) << (sal_uInt8) nDbaseType;                              // dBase format
+    (*m_pFileStream) << (sal_uInt8) (aDate.GetYear() % 100);                 // aktuelles Datum
 
 
-    (*m_pFileStream) << (BYTE) aDate.GetMonth();
-    (*m_pFileStream) << (BYTE) aDate.GetDay();
+    (*m_pFileStream) << (sal_uInt8) aDate.GetMonth();
+    (*m_pFileStream) << (sal_uInt8) aDate.GetDay();
     (*m_pFileStream) << 0L;                                             // Anzahl der Datensaetze
-    (*m_pFileStream) << (USHORT)((m_pColumns->getCount()+1) * 32 + 1);  // Kopfinformationen,
+    (*m_pFileStream) << (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1);  // Kopfinformationen,
                                                                         // pColumns erhaelt immer eine Spalte mehr
-    (*m_pFileStream) << (USHORT) 0;                                     // Satzlaenge wird spaeter bestimmt
+    (*m_pFileStream) << (sal_uInt16) 0;                                     // Satzlaenge wird spaeter bestimmt
     m_pFileStream->Write(aBuffer, 20);
 
-    USHORT nRecLength = 1;                                              // Laenge 1 fuer deleted flag
+    sal_uInt16 nRecLength = 1;                                              // Laenge 1 fuer deleted flag
     sal_Int32  nMaxFieldLength = m_pConnection->getMetaData()->getMaxColumnNameLength();
     ::rtl::OUString aName;
     const ::rtl::OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
@@ -1329,9 +1329,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
                     {
                         throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName);
                     }
-                    (*m_pFileStream) << (BYTE) Min((ULONG)nPrecision, 255UL);      //Feldlaenge
-                    nRecLength = nRecLength + (USHORT)::std::min((USHORT)nPrecision, (USHORT)255UL);
-                    (*m_pFileStream) << (BYTE)0;                                                                //Nachkommastellen
+                    (*m_pFileStream) << (sal_uInt8) Min((sal_uIntPtr)nPrecision, 255UL);      //Feldlaenge
+                    nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL);
+                    (*m_pFileStream) << (sal_uInt8)0;                                                                //Nachkommastellen
                     break;
                 case 'F':
                 case 'N':
@@ -1343,41 +1343,41 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
                     }
                     if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency wird gesondert behandelt
                     {
-                        (*m_pFileStream) << (BYTE)10;          // Standard Laenge
-                        (*m_pFileStream) << (BYTE)4;
+                        (*m_pFileStream) << (sal_uInt8)10;          // Standard Laenge
+                        (*m_pFileStream) << (sal_uInt8)4;
                         nRecLength += 10;
                     }
                     else
                     {
                         sal_Int32 nPrec = SvDbaseConverter::ConvertPrecisionToDbase(nPrecision,nScale);
 
-                        (*m_pFileStream) << (BYTE)( nPrec);
-                        (*m_pFileStream) << (BYTE)nScale;
-                        nRecLength += (USHORT)nPrec;
+                        (*m_pFileStream) << (sal_uInt8)( nPrec);
+                        (*m_pFileStream) << (sal_uInt8)nScale;
+                        nRecLength += (sal_uInt16)nPrec;
                     }
                     break;
                 case 'L':
-                    (*m_pFileStream) << (BYTE)1;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)1;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     ++nRecLength;
                     break;
                 case 'I':
-                    (*m_pFileStream) << (BYTE)4;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)4;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 4;
                     break;
                 case 'Y':
                 case 'B':
                 case 'T':
                 case 'D':
-                    (*m_pFileStream) << (BYTE)8;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)8;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 8;
                     break;
                 case 'M':
-                    bCreateMemo = TRUE;
-                    (*m_pFileStream) << (BYTE)10;
-                    (*m_pFileStream) << (BYTE)0;
+                    bCreateMemo = sal_True;
+                    (*m_pFileStream) << (sal_uInt8)10;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 10;
                     if ( bBinary )
                         aBuffer[0] = 0x06;
@@ -1389,7 +1389,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
             aBuffer[0] = 0x00;
         }
 
-        (*m_pFileStream) << (BYTE)FIELD_DESCRIPTOR_TERMINATOR;              // kopf ende
+        (*m_pFileStream) << (sal_uInt8)FIELD_DESCRIPTOR_TERMINATOR;              // kopf ende
         (*m_pFileStream) << (char)DBF_EOL;
         m_pFileStream->Seek(10L);
         (*m_pFileStream) << nRecLength;                                     // Satzlaenge nachtraeglich eintragen
@@ -1398,9 +1398,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
         {
             m_pFileStream->Seek(0L);
             if (nDbaseType == VisualFoxPro)
-                (*m_pFileStream) << (BYTE) FoxProMemo;
+                (*m_pFileStream) << (sal_uInt8) FoxProMemo;
             else
-                (*m_pFileStream) << (BYTE) dBaseIIIMemo;
+                (*m_pFileStream) << (sal_uInt8) dBaseIIIMemo;
         } // if (bCreateMemo)
     }
     catch ( const Exception& e )
@@ -1415,12 +1415,12 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
         catch(const Exception&) { }
         throw;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
 // erzeugt grundsaetzlich dBase III Datei Format
-BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
+sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateMemoFile" );
     // Makro zum Filehandling fuers Erzeugen von Tabellen
@@ -1441,16 +1441,16 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     m_pMemoStream->Flush();
     delete m_pMemoStream;
     m_pMemoStream = NULL;
-    return TRUE;
+    return sal_True;
 }
 //------------------------------------------------------------------
-BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
+sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::Drop_Static" );
     INetURLObject aURL;
     aURL.SetURL(_sUrl);
 
-    BOOL bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
+    sal_Bool bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
 
     if(bDropped)
     {
@@ -1495,7 +1495,7 @@ BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFie
     return bDropped;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::DropImpl()
+sal_Bool ODbaseTable::DropImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::DropImpl" );
     FileClose();
@@ -1503,7 +1503,7 @@ BOOL ODbaseTable::DropImpl()
     if(!m_pIndexes)
         refreshIndexes(); // look for indexes which must be deleted as well
 
-    BOOL bDropped = Drop_Static(getEntry(m_pConnection,m_Name),HasMemoFields(),m_pIndexes);
+    sal_Bool bDropped = Drop_Static(getEntry(m_pConnection,m_Name),HasMemoFields(),m_pIndexes);
     if(!bDropped)
     {// we couldn't drop the table so we have to reopen it
         construct();
@@ -1514,7 +1514,7 @@ BOOL ODbaseTable::DropImpl()
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::InsertRow" );
     // Buffer mit Leerzeichen fuellen
@@ -1524,12 +1524,12 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
 
     // Gesamte neue Row uebernehmen:
     // ... und am Ende als neuen Record hinzufuegen:
-    UINT32 nTempPos = m_nFilePos,
+    sal_uInt32 nTempPos = m_nFilePos,
            nFileSize = 0,
            nMemoFileSize = 0;
 
-    m_nFilePos = (ULONG)m_aHeader.db_anz + 1;
-    BOOL bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
+    m_nFilePos = (sal_uIntPtr)m_aHeader.db_anz + 1;
+    sal_Bool bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
     if ( bInsertRow )
     {
         nFileSize = lcl_getFileSize(*m_pFileStream);
@@ -1572,7 +1572,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::UpdateRow" );
     // Buffer mit Leerzeichen fuellen
@@ -1583,7 +1583,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
     m_pFileStream->Seek(nPos);
     m_pFileStream->Read((char*)m_pBuffer, m_aHeader.db_slng);
 
-    UINT32 nMemoFileSize( 0 );
+    sal_uInt32 nMemoFileSize( 0 );
     if (HasMemoFields() && m_pMemoStream)
     {
         m_pMemoStream->Seek(STREAM_SEEK_TO_END);
@@ -1602,7 +1602,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
+sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::DeleteRow" );
     // Einfach das Loesch-Flag setzen (egal, ob es schon gesetzt war
@@ -1613,13 +1613,13 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
 
     OValueRefRow aRow = new OValueRefVector(_rCols.get().size());
 
-    if (!fetchRow(aRow,_rCols,TRUE,TRUE))
+    if (!fetchRow(aRow,_rCols,sal_True,sal_True))
         return sal_False;
 
     Reference<XPropertySet> xCol;
     ::rtl::OUString aColName;
     ::comphelper::UStringMixEqual aCase(isCaseSensitive());
-    for (USHORT i = 0; i < m_pColumns->getCount(); i++)
+    for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++)
     {
         Reference<XPropertySet> xIndex = isUniqueByColumnName(i);
         if (xIndex.is())
@@ -1651,7 +1651,7 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
     }
 
     m_pFileStream->Seek(nFilePos);
-    (*m_pFileStream) << (BYTE)'*'; // mark the row in the table as deleted
+    (*m_pFileStream) << (sal_uInt8)'*'; // mark the row in the table as deleted
     m_pFileStream->Flush();
     return sal_True;
 }
@@ -1691,18 +1691,18 @@ double toDouble(const ByteString& rString)
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::UpdateBuffer" );
     OSL_ENSURE(m_pBuffer,"Buffer is NULL!");
     if ( !m_pBuffer )
-        return FALSE;
+        return sal_False;
     sal_Int32 nByteOffset  = 1;
 
     // Felder aktualisieren:
     Reference<XPropertySet> xCol;
     Reference<XPropertySet> xIndex;
-    USHORT i;
+    sal_uInt16 i;
     ::rtl::OUString aColName;
     const sal_Int32 nColumnCount = m_pColumns->getCount();
     ::std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
@@ -1936,7 +1936,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
                     // sein koennte und muesste
 
                     const ByteString aDefaultValue( ::rtl::math::doubleToString( n, rtl_math_StringFormat_F, nScale, '.', NULL, 0));
-                    BOOL bValidLength  = aDefaultValue.Len() <= nLen;
+                    sal_Bool bValidLength  = aDefaultValue.Len() <= nLen;
                     if ( bValidLength )
                     {
                         strncpy(pData,aDefaultValue.GetBuffer(),nLen);
@@ -1970,7 +1970,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
                     char cNext = pData[nLen]; // merken und temporaer durch 0 ersetzen
                     pData[nLen] = '\0';       // das geht, da der Puffer immer ein Zeichen groesser ist ...
 
-                    ULONG nBlockNo = strtol((const char *)pData,NULL,10);   // Blocknummer lesen
+                    sal_uIntPtr nBlockNo = strtol((const char *)pData,NULL,10); // Blocknummer lesen
 
                     // Naechstes Anfangszeichen wieder restaurieren:
                     pData[nLen] = cNext;
@@ -2028,14 +2028,14 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
 }
 
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
+sal_Bool ODbaseTable::WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteMemo" );
     // wird die BlockNr 0 vorgegeben, wird der block ans Ende gehaengt
-    ULONG nSize = 0;
+    sal_uIntPtr nSize = 0;
     ::rtl::OString aStr;
     ::com::sun::star::uno::Sequence<sal_Int8> aValue;
-    BYTE nHeader[4];
+    sal_uInt8 nHeader[4];
     const bool bBinary = aVariable.getTypeKind() == DataType::LONGVARBINARY && m_aMemoHeader.db_typ == MemoFoxPro;
     if ( bBinary )
     {
@@ -2048,7 +2048,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
     }
 
     // Anhaengen oder ueberschreiben
-    BOOL bAppend = rBlockNr == 0;
+    sal_Bool bAppend = rBlockNr == 0;
 
     if (!bAppend)
     {
@@ -2065,7 +2065,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
                 m_pMemoStream->SeekRel(4L);
                 m_pMemoStream->Read(sHeader,4);
 
-                ULONG nOldSize;
+                sal_uIntPtr nOldSize;
                 if (m_aMemoHeader.db_typ == MemoFoxPro)
                     nOldSize = ((((unsigned char)sHeader[0]) * 256 +
                                  (unsigned char)sHeader[1]) * 256 +
@@ -2078,7 +2078,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
                                  (unsigned char)sHeader[0]  - 8;
 
                 // passt die neue Laenge in die belegten Bloecke
-                ULONG nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
+                sal_uIntPtr nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
                       nOldUsedBlocks = ((nOldSize + 8) / m_aMemoHeader.db_size) + (((nOldSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0);
                 bAppend = nUsedBlocks > nOldUsedBlocks;
             }
@@ -2087,7 +2087,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
 
     if (bAppend)
     {
-        ULONG nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+        sal_uIntPtr nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
         // letzten block auffuellen
         rBlockNr = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
 
@@ -2112,30 +2112,30 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
         case MemodBaseIV: // dBase IV-Memofeld mit Laengenangabe
         {
             if ( MemodBaseIV == m_aMemoHeader.db_typ )
-                (*m_pMemoStream) << (BYTE)0xFF
-                                 << (BYTE)0xFF
-                                 << (BYTE)0x08;
+                (*m_pMemoStream) << (sal_uInt8)0xFF
+                                 << (sal_uInt8)0xFF
+                                 << (sal_uInt8)0x08;
             else
-                (*m_pMemoStream) << (BYTE)0x00
-                                 << (BYTE)0x00
-                                 << (BYTE)0x00;
+                (*m_pMemoStream) << (sal_uInt8)0x00
+                                 << (sal_uInt8)0x00
+                                 << (sal_uInt8)0x00;
 
-            UINT32 nWriteSize = nSize;
+            sal_uInt32 nWriteSize = nSize;
             if (m_aMemoHeader.db_typ == MemoFoxPro)
             {
                 if ( bBinary )
-                    (*m_pMemoStream) << (BYTE) 0x00; // Picture
+                    (*m_pMemoStream) << (sal_uInt8) 0x00; // Picture
                 else
-                    (*m_pMemoStream) << (BYTE) 0x01; // Memo
+                    (*m_pMemoStream) << (sal_uInt8) 0x01; // Memo
                 for (int i = 4; i > 0; nWriteSize >>= 8)
-                    nHeader[--i] = (BYTE) (nWriteSize % 256);
+                    nHeader[--i] = (sal_uInt8) (nWriteSize % 256);
             }
             else
             {
-                (*m_pMemoStream) << (BYTE) 0x00;
+                (*m_pMemoStream) << (sal_uInt8) 0x00;
                 nWriteSize += 8;
                 for (int i = 0; i < 4; nWriteSize >>= 8)
-                    nHeader[i++] = (BYTE) (nWriteSize % 256);
+                    nHeader[i++] = (sal_uInt8) (nWriteSize % 256);
             }
 
             m_pMemoStream->Write(nHeader,4);
@@ -2151,7 +2151,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
     // Schreiben der neuen Blocknummer
     if (bAppend)
     {
-        ULONG nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+        sal_uIntPtr nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
         m_aMemoHeader.db_next = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
 
         // Schreiben der neuen Blocknummer
@@ -2423,7 +2423,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
         ::dbtools::throwGenericSQLException( sError, *this );
     }
 
-    BOOL bAlreadyDroped = FALSE;
+    sal_Bool bAlreadyDroped = sal_False;
     try
     {
         pNewTable->construct();
@@ -2432,7 +2432,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
         // drop the old table
         if(DropImpl())
         {
-            bAlreadyDroped = TRUE;
+            bAlreadyDroped = sal_True;
             pNewTable->renameImpl(m_Name);
             // release the temp file
         }
@@ -2660,7 +2660,7 @@ sal_Bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
         OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
         sal_Int32 nPos = m_aHeader.db_kopf + (sal_Int32)(m_nFilePos-1) * nEntryLen;
 
-        ULONG nLen = m_pFileStream->Seek(nPos);
+        sal_uIntPtr nLen = m_pFileStream->Seek(nPos);
         if (m_pFileStream->GetError() != ERRCODE_NONE)
             goto Error;
 
@@ -2697,10 +2697,10 @@ End:
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
-    BOOL bIsText = TRUE;
+    sal_Bool bIsText = sal_True;
     //  SdbConnection* pConnection = GetConnection();
 
     m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
@@ -2712,13 +2712,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             ByteString aBStr;
             static char aBuf[514];
             aBuf[512] = 0;          // sonst kann der Zufall uebel mitspielen
-            BOOL bReady = sal_False;
+            sal_Bool bReady = sal_False;
 
             do
             {
                 m_pMemoStream->Read(&aBuf,512);
 
-                USHORT i = 0;
+                sal_uInt16 i = 0;
                 while (aBuf[i] != cEOF && ++i < 512)
                     ;
                 bReady = aBuf[i] == cEOF;
@@ -2740,7 +2740,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             // Foxpro stores text and binary data
             if (m_aMemoHeader.db_typ == MemoFoxPro)
             {
-//              if (((BYTE)sHeader[0]) != 0 || ((BYTE)sHeader[1]) != 0 || ((BYTE)sHeader[2]) != 0)
+//              if (((sal_uInt8)sHeader[0]) != 0 || ((sal_uInt8)sHeader[1]) != 0 || ((sal_uInt8)sHeader[2]) != 0)
 //              {
 ////                    String aText = String(SdbResId(STR_STAT_IResultSetHelper::INVALID));
 ////                    aText.SearchAndReplace(String::CreateFromAscii("%%d"),m_pMemoStream->GetFileName());
@@ -2754,7 +2754,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
 //
                 bIsText = sHeader[3] != 0;
             }
-            else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+            else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
             {
 //              String aText = String(SdbResId(STR_STAT_IResultSetHelper::INVALID));
 //              aText.SearchAndReplace(String::CreateFromAscii("%%d"),m_pMemoStream->GetFileName());
@@ -2812,7 +2812,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
 void ODbaseTable::AllocBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
-    UINT16 nSize = m_aHeader.db_slng;
+    sal_uInt16 nSize = m_aHeader.db_slng;
     OSL_ENSURE(nSize > 0, "Size too small");
 
     if (m_nBufferSize != nSize)
@@ -2825,11 +2825,11 @@ void ODbaseTable::AllocBuffer()
     if (m_pBuffer == NULL && nSize)
     {
         m_nBufferSize = nSize;
-        m_pBuffer       = new BYTE[m_nBufferSize+1];
+        m_pBuffer       = new sal_uInt8[m_nBufferSize+1];
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
     OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 9a8905b6a6ba..767595d06b85 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -42,19 +42,19 @@ using namespace connectivity::dbase;
 using namespace connectivity::file;
 using namespace com::sun::star::sdbc;
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(UINT32 nRec)
+ONDXKey::ONDXKey(sal_uInt32 nRec)
     :nRecord(nRec)
 {
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
     : ONDXKey_BASE(eType)
     , nRecord(nRec)
     , xValue(rVal)
 {
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
      ,nRecord(nRec)
 {
@@ -66,7 +66,7 @@ ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
 }
 // -----------------------------------------------------------------------------
 
-ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
      ,nRecord(nRec)
      ,xValue(aVal)
@@ -79,7 +79,7 @@ ONDXKey::ONDXKey(double aVal, UINT32 nRec)
 //==================================================================
 ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
            :nPagePos(nPos)
-           ,bModified(FALSE)
+           ,bModified(sal_False)
            ,nCount(0)
            ,aParent(pParent)
            ,rIndex(rInd)
@@ -103,16 +103,16 @@ void ONDXPage::QueryDelete()
     if (IsModified() && rIndex.m_pFileStream)
         (*rIndex.m_pFileStream) << *this;
 
-    bModified = FALSE;
+    bModified = sal_False;
     if (rIndex.UseCollector())
     {
         if (aChild.Is())
-            aChild->Release(FALSE);
+            aChild->Release(sal_False);
 
-        for (USHORT i = 0; i < rIndex.getHeader().db_maxkeys;i++)
+        for (sal_uInt16 i = 0; i < rIndex.getHeader().db_maxkeys;i++)
         {
             if (ppNodes[i].GetChild().Is())
-                ppNodes[i].GetChild()->Release(FALSE);
+                ppNodes[i].GetChild()->Release(sal_False);
 
             ppNodes[i] = ONDXNode();
         }
@@ -136,10 +136,10 @@ ONDXPagePtr& ONDXPage::GetChild(ODbaseIndex* pIndex)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::FindPos(const ONDXKey& rKey) const
+sal_uInt16 ONDXPage::FindPos(const ONDXKey& rKey) const
 {
     // sucht nach Platz fuer den vorgegeben key auf einer Seite
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while (i < nCount && rKey > ((*this)[i]).GetKey())
            i++;
 
@@ -147,18 +147,18 @@ USHORT ONDXPage::FindPos(const ONDXKey& rKey) const
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Find(const ONDXKey& rKey)
+sal_Bool ONDXPage::Find(const ONDXKey& rKey)
 {
     // sucht den vorgegeben key
     // Besonderheit: gelangt der Algorithmus ans Ende
     // wird immer die aktuelle Seite und die Knotenposition vermerkt
     // auf die die Bedingung <= zutrifft
     // dieses findet beim Insert besondere Beachtung
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while (i < nCount && rKey > ((*this)[i]).GetKey())
            i++;
 
-    BOOL bResult = FALSE;
+    sal_Bool bResult = sal_False;
 
     if (!IsLeaf())
     {
@@ -170,7 +170,7 @@ BOOL ONDXPage::Find(const ONDXKey& rKey)
     {
         rIndex.m_aCurLeaf = this;
         rIndex.m_nCurNode = i - 1;
-        bResult = FALSE;
+        bResult = sal_False;
     }
     else
     {
@@ -182,14 +182,14 @@ BOOL ONDXPage::Find(const ONDXKey& rKey)
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
+sal_Bool ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
 {
     // beim Erzeugen eines Index koennen auch mehrere Knoten eingefuegt werden
     // diese sin dann aufsteigend sortiert
-    BOOL bAppend = nRowsLeft > 0;
+    sal_Bool bAppend = nRowsLeft > 0;
     if (IsFull())
     {
-        BOOL bResult = TRUE;
+        sal_Bool bResult = sal_True;
         ONDXNode aSplitNode;
         if (bAppend)
             aSplitNode = rNode;
@@ -210,7 +210,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
                 }
                 else  // Position unbekannt
                 {
-                    USHORT nPos = NODE_NOTFOUND;
+                    sal_uInt16 nPos = NODE_NOTFOUND;
                     while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ;
 
                     --nCount;   // (sonst bekomme ich u.U. Assertions und GPFs - 60593)
@@ -295,7 +295,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
         }
         else
         {
-            USHORT nNodePos = FindPos(rNode.GetKey());
+            sal_uInt16 nNodePos = FindPos(rNode.GetKey());
             if (IsLeaf())
                 rIndex.m_nCurNode = nNodePos;
 
@@ -305,17 +305,17 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Insert(USHORT nPos, ONDXNode& rNode)
+sal_Bool ONDXPage::Insert(sal_uInt16 nPos, ONDXNode& rNode)
 {
-    USHORT nMaxCount = rIndex.getHeader().db_maxkeys;
+    sal_uInt16 nMaxCount = rIndex.getHeader().db_maxkeys;
     if (nPos >= nMaxCount)
-        return FALSE;
+        return sal_False;
 
     if (nCount)
     {
         ++nCount;
         // nach rechts verschieben
-        for (USHORT i = std::min((USHORT)(nMaxCount-1), (USHORT)(nCount-1)); nPos < i; --i)
+        for (sal_uInt16 i = std::min((sal_uInt16)(nMaxCount-1), (sal_uInt16)(nCount-1)); nPos < i; --i)
             (*this)[i] = (*this)[i-1];
     }
     else
@@ -331,19 +331,19 @@ BOOL ONDXPage::Insert(USHORT nPos, ONDXNode& rNode)
         rNode.GetChild()->SetParent(this);
     }
 
-    bModified = TRUE;
+    bModified = sal_True;
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Append(ONDXNode& rNode)
+sal_Bool ONDXPage::Append(ONDXNode& rNode)
 {
     DBG_ASSERT(!IsFull(), "kein Append moeglich");
     return Insert(nCount, rNode);
 }
 //------------------------------------------------------------------
-void ONDXPage::Release(BOOL bSave)
+void ONDXPage::Release(sal_Bool bSave)
 {
     // freigeben der Pages
     if (aChild.Is())
@@ -352,7 +352,7 @@ void ONDXPage::Release(BOOL bSave)
     // Pointer freigeben
     aChild.Clear();
 
-    for (USHORT i = 0; i < rIndex.getHeader().db_maxkeys;i++)
+    for (sal_uInt16 i = 0; i < rIndex.getHeader().db_maxkeys;i++)
     {
         if (ppNodes[i].GetChild())
             ppNodes[i].GetChild()->Release(bSave);
@@ -362,7 +362,7 @@ void ONDXPage::Release(BOOL bSave)
     aParent = NULL;
 }
 //------------------------------------------------------------------
-void ONDXPage::ReleaseFull(BOOL bSave)
+void ONDXPage::ReleaseFull(sal_Bool bSave)
 {
     ONDXPagePtr aTempParent = aParent;
     Release(bSave);
@@ -371,7 +371,7 @@ void ONDXPage::ReleaseFull(BOOL bSave)
     {
         // Freigeben nicht benoetigter Seiten, danach besteht keine Referenz
         // mehr auf die Seite, danach kann 'this' nicht mehr gueltig sein!!!
-        USHORT nParentPos = aTempParent->Search(this);
+        sal_uInt16 nParentPos = aTempParent->Search(this);
         if (nParentPos != NODE_NOTFOUND)
             (*aTempParent)[nParentPos].GetChild().Clear();
         else
@@ -379,7 +379,7 @@ void ONDXPage::ReleaseFull(BOOL bSave)
     }
 }
 //------------------------------------------------------------------
-BOOL ONDXPage::Delete(USHORT nNodePos)
+sal_Bool ONDXPage::Delete(sal_uInt16 nNodePos)
 {
     if (IsLeaf())
     {
@@ -402,7 +402,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos)
     if (HasParent() && nCount < (rIndex.GetMaxNodes() / 2))
     {
         // Feststellen, welcher Knoten auf die Seite zeigt
-        USHORT nParentNodePos = aParent->Search(this);
+        sal_uInt16 nParentNodePos = aParent->Search(this);
         // letzte Element auf Vaterseite
         // -> zusammenlegen mit vorletzter Seite
         if (nParentNodePos == (aParent->Count() - 1))
@@ -455,7 +455,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos)
     else if (IsRoot())
         // Sicherstellen das die Position der Wurzel festgehalten wird
         rIndex.SetRootPos(nPagePos);
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -476,7 +476,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     ONDXNode aResultNode;
     if (IsLeaf())
     {
-        for (USHORT i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
+        for (sal_uInt16 i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
             rPage.Insert(j++,(*this)[i]);
 
         // dieser Knoten enthaelt einen Schluessel der noch einmal im Tree vorkommt
@@ -491,7 +491,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     }
     else
     {
-        for (USHORT i = (nCount + 1) / 2 + 1, j = 0 ; i < nCount; i++)
+        for (sal_uInt16 i = (nCount + 1) / 2 + 1, j = 0 ; i < nCount; i++)
             rPage.Insert(j++,(*this)[i]);
 
         aResultNode = (*this)[(nCount + 1) / 2];
@@ -506,31 +506,31 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     // innere Knoten haben keine Recordnummer
     if (rIndex.isUnique())
         aResultNode.GetKey().ResetRecord();
-    bModified = TRUE;
+    bModified = sal_True;
     return aResultNode;
 }
 
 //------------------------------------------------------------------
-void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
+void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage)
 {
     DBG_ASSERT(HasParent(), "kein Vater vorhanden");
     DBG_ASSERT(nParentNodePos != NODE_NOTFOUND, "Falscher Indexaufbau");
 
     /*  Zusammenlegen zweier Seiten */
     ONDXNode aResultNode;
-    USHORT nMaxNodes = rIndex.GetMaxNodes(),
+    sal_uInt16 nMaxNodes = rIndex.GetMaxNodes(),
            nMaxNodes_2 = nMaxNodes / 2;
 
     // Feststellen ob Seite rechter oder linker Nachbar
-    BOOL    bRight    = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // TRUE, wenn xPage die rechte Seite ist
-    USHORT  nNewCount = (*xPage).Count() + Count();
+    sal_Bool    bRight    = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // sal_True, wenn xPage die rechte Seite ist
+    sal_uInt16  nNewCount = (*xPage).Count() + Count();
 
     if (IsLeaf())
     {
         // Bedingung fuers zusammenlegen
         if (nNewCount < (nMaxNodes_2 * 2))
         {
-            USHORT nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
+            sal_uInt16 nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
             if (bRight)
             {
                 DBG_ASSERT(&xPage != this,"xPage und THIS duerfen nicht gleich sein: Endlosschleife");
@@ -555,7 +555,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                     (*aParent)[nParentNodePos-1].SetChild(this,aParent);
                 else // oder als rechten Knoten setzen
                     aParent->SetChild(this);
-                aParent->SetModified(TRUE);
+                aParent->SetModified(sal_True);
 
             }
 
@@ -571,12 +571,12 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 aParent = NULL;
                 rIndex.SetRootPos(nPagePos);
                 rIndex.m_aRoot = this;
-                SetModified(TRUE);
+                SetModified(sal_True);
             }
             else
                 aParent->SearchAndReplace((*this)[nLastNode].GetKey(),(*this)[nCount-1].GetKey());
 
-            xPage->SetModified(FALSE);
+            xPage->SetModified(sal_False);
             xPage->ReleaseFull(); // wird nicht mehr benoetigt
         }
         // Ausgleichen der Elemente   nNewCount >= (nMaxNodes_2 * 2)
@@ -620,7 +620,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 // erhaelt zunaechst Child von xPage
                 (*aParent)[nParentNodePos].SetChild(xPage->GetChild(),aParent);
                 Append((*aParent)[nParentNodePos]);
-                for (USHORT i = 0 ; i < xPage->Count(); i++)
+                for (sal_uInt16 i = 0 ; i < xPage->Count(); i++)
                     Append((*xPage)[i]);
             }
             else
@@ -645,7 +645,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
 
             // danach wird der Vaterknoten zurueckgesetzt
             (*aParent)[nParentNodePos].SetChild();
-            aParent->SetModified(TRUE);
+            aParent->SetModified(sal_True);
 
             if(aParent->IsRoot() && aParent->Count() == 1)
             {
@@ -654,7 +654,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 aParent = NULL;
                 rIndex.SetRootPos(nPagePos);
                 rIndex.m_aRoot = this;
-                SetModified(TRUE);
+                SetModified(sal_True);
             }
             else if(nParentNodePos)
                 // Austauschen des KnotenWertes
@@ -662,7 +662,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 // deshalb muss der Knoten auch hier aktualisiert werden
                 aParent->SearchAndReplace((*aParent)[nParentNodePos-1].GetKey(),(*aParent)[nParentNodePos].GetKey());
 
-            xPage->SetModified(FALSE);
+            xPage->SetModified(sal_False);
             xPage->ReleaseFull();
         }
         // Ausgleichen der Elemente
@@ -693,7 +693,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 (*aParent)[nParentNodePos].SetChild(this,aParent);
 
             }
-            aParent->SetModified(TRUE);
+            aParent->SetModified(sal_True);
         }
     }
 }
@@ -715,7 +715,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     else
     {
         ByteString aBuf;
-        USHORT nLen = rIndex.getHeader().db_keylen;
+        sal_uInt16 nLen = rIndex.getHeader().db_keylen;
         char* pStr = aBuf.AllocBuffer(nLen+1);
 
         rStream.Read(pStr,nLen);
@@ -748,7 +748,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         if (aKey.getValue().isNull())
         {
             memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
-            rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+            rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
         }
         else
             rStream << (double) aKey.getValue();
@@ -762,7 +762,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
             ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
             strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
         }
-        rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+        rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
     }
     rStream << aChild;
 }
@@ -782,7 +782,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
 // ONDXKey
 //==================================================================
 //------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
 {
     return eType == DataType::VARCHAR || eType == DataType::CHAR;
 }
@@ -809,7 +809,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
     }
     else if (IsText(getDBType()))
     {
-        INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+        sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
         eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
     }
     else
@@ -882,16 +882,16 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
     return *this;
 }
 // -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
 //------------------------------------------------------------------
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 {
     rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
     rStream >> nValue >> rPage.aChild;
-    rPage.nCount = USHORT(nValue);
+    rPage.nCount = sal_uInt16(nValue);
 
 //  DBG_ASSERT(rPage.nCount && rPage.nCount < rPage.GetIndex().GetMaxNodes(), "Falscher Count");
-    for (USHORT i = 0; i < rPage.nCount; i++)
+    for (sal_uInt16 i = 0; i < rPage.nCount; i++)
         rPage[i].Read(rStream, rPage.GetIndex());
     return rStream;
 }
@@ -900,7 +900,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
 {
     // Seite existiert noch nicht
-    ULONG nSize = (rPage.GetPagePos() + 1) * PAGE_SIZE;
+    sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * PAGE_SIZE;
     if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
     {
         rStream.SetStreamSize(nSize);
@@ -908,27 +908,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
 
         char aEmptyData[PAGE_SIZE];
         memset(aEmptyData,0x00,PAGE_SIZE);
-        rStream.Write((BYTE*)aEmptyData,PAGE_SIZE);
+        rStream.Write((sal_uInt8*)aEmptyData,PAGE_SIZE);
     }
-    ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
+    sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
     OSL_UNUSED( nCurrentPos );
 
     nValue = rPage.nCount;
     rStream << nValue << rPage.aChild;
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     for (; i < rPage.nCount; i++)
         rPage[i].Write(rStream, rPage);
 
     // check if we have to fill the stream with '\0'
     if(i < rPage.rIndex.getHeader().db_maxkeys)
     {
-        ULONG nTell = rStream.Tell() % PAGE_SIZE;
-        USHORT nBufferSize = rStream.GetBufferSize();
-        ULONG nRemainSize = nBufferSize - nTell;
+        sal_uIntPtr nTell = rStream.Tell() % PAGE_SIZE;
+        sal_uInt16 nBufferSize = rStream.GetBufferSize();
+        sal_uIntPtr nRemainSize = nBufferSize - nTell;
         char* pEmptyData = new char[nRemainSize];
         memset(pEmptyData,0x00,nRemainSize);
-        rStream.Write((BYTE*)pEmptyData,nRemainSize);
+        rStream.Write((sal_uInt8*)pEmptyData,nRemainSize);
         rStream.Seek(nTell);
         delete [] pEmptyData;
     }
@@ -942,7 +942,7 @@ void ONDXPage::PrintPage()
     DBG_TRACE4("\nSDB: -----------Page: %d  Parent: %d  Count: %d  Child: %d-----",
         nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
 
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ONDXNode rNode = (*this)[i];
         ONDXKey&  rKey = rNode.GetKey();
@@ -967,7 +967,7 @@ void ONDXPage::PrintPage()
     {
 #if OSL_DEBUG_LEVEL > 1
         GetChild(&rIndex)->PrintPage();
-        for (USHORT i = 0; i < nCount; i++)
+        for (sal_uInt16 i = 0; i < nCount; i++)
         {
             ONDXNode rNode = (*this)[i];
             rNode.GetChild(&rIndex,this)->PrintPage();
@@ -978,16 +978,16 @@ void ONDXPage::PrintPage()
 }
 #endif
 // -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
 {
     return Count() == rIndex.getHeader().db_maxkeys;
 }
 // -----------------------------------------------------------------------------
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
 {
     // binare Suche spaeter
-    USHORT i = NODE_NOTFOUND;
+    sal_uInt16 i = NODE_NOTFOUND;
     while (++i < Count())
         if ((*this)[i].GetKey() == rSearch)
             break;
@@ -996,9 +996,9 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
 {
-    USHORT i = NODE_NOTFOUND;
+    sal_uInt16 i = NODE_NOTFOUND;
     while (++i < Count())
         if (((*this)[i]).GetChild() == pPage)
             break;
@@ -1015,7 +1015,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
     OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
     if (rSearch != rReplace)
     {
-        USHORT nPos = NODE_NOTFOUND;
+        sal_uInt16 nPos = NODE_NOTFOUND;
         ONDXPage* pPage = this;
 
         while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -1024,33 +1024,33 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
         if (pPage)
         {
             (*pPage)[nPos].GetKey() = rReplace;
-            pPage->SetModified(TRUE);
+            pPage->SetModified(sal_True);
         }
     }
 }
 // -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 
 //------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 // -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
 
-    for (USHORT i = nPos; i < (nCount-1); i++)
+    for (sal_uInt16 i = nPos; i < (nCount-1); i++)
         (*this)[i] = (*this)[i+1];
 
     nCount--;
-    bModified = TRUE;
+    bModified = sal_True;
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index dfa347c12134..02d3fb284312 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -74,7 +74,7 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -125,11 +125,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
         aColumnName += String::CreateFromInt32(i+1);
 
         sal_Int32 eType;
-        UINT16 nPrecision = 0;
-        UINT16 nScale = 0;
+        sal_uInt16 nPrecision = 0;
+        sal_uInt16 nScale = 0;
 
-        BOOL bNumeric = FALSE;
-        ULONG  nIndex = 0;
+        sal_Bool bNumeric = sal_False;
+        sal_uIntPtr  nIndex = 0;
 
         // first without fielddelimiter
         String aField;
@@ -137,7 +137,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
         if (aField.Len() == 0 ||
             (pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
         {
-            bNumeric = FALSE;
+            bNumeric = sal_False;
         }
         else
         {
@@ -149,11 +149,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
 
             if (aField2.Len() == 0)
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
             }
             else
             {
-                bNumeric = TRUE;
+                bNumeric = sal_True;
                 xub_StrLen nDot = 0;
                 for (xub_StrLen j = 0; j < aField2.Len(); j++)
                 {
@@ -163,7 +163,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                         (!cThousandDelimiter || c != cThousandDelimiter) &&
                         !aCharClass.isDigit(aField2,j))
                     {
-                        bNumeric = FALSE;
+                        bNumeric = sal_False;
                         break;
                     }
                     if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -175,7 +175,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                 }
 
                 if (nDot > 1) // if there is more than one dot it isn't a number
-                    bNumeric = FALSE;
+                    bNumeric = sal_False;
                 if (bNumeric && cThousandDelimiter)
                 {
                     // Ist der Trenner richtig angegeben?
@@ -188,7 +188,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                             continue;
                         else
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
                     }
diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index 2941cb6bd20f..16f5d2e2858e 100644
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -63,7 +63,7 @@ namespace connectivity
 
         private:
             void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
 
             sal_Bool fetchRow(OValueRow _rRow,const OSQLColumns& _rCols);
             sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition);
diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx
index 2fefbafb7a94..790dc16c7c98 100644
--- a/connectivity/source/drivers/evoab/LNoException.cxx
+++ b/connectivity/source/drivers/evoab/LNoException.cxx
@@ -40,19 +40,19 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
         return 0;
 
     xub_StrLen nTokCount = 1;
-    BOOL bStart = TRUE;     // Stehen wir auf dem ersten Zeichen im Token?
-    BOOL bInString = FALSE; // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
+    sal_Bool bStart = sal_True;     // Stehen wir auf dem ersten Zeichen im Token?
+    sal_Bool bInString = sal_False; // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
 
     // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen
     for( xub_StrLen i = 0; i < Len(); i++ )
     {
         if (bStart)
         {
-            bStart = FALSE;
+            bStart = sal_False;
             // Erstes Zeichen ein String-Delimiter?
             if ((*this).GetChar(i) == cStrDel)
             {
-                bInString = TRUE;   // dann sind wir jetzt INNERHALB des Strings!
+                bInString = sal_True;   // dann sind wir jetzt INNERHALB des Strings!
                 continue;           // dieses Zeichen ueberlesen!
             }
         }
@@ -69,7 +69,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
                 else
                 {
                     // String-Ende
-                    bInString = FALSE;
+                    bInString = sal_False;
                 }
             }
         } else {
@@ -77,7 +77,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
             if ( (*this).GetChar(i) == cTok )
             {
                 nTokCount++;
-                bStart = TRUE;
+                bStart = sal_True;
             }
         }
     }
@@ -93,7 +93,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
     xub_StrLen nLen = Len();
     if ( nLen )
     {
-        BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
+        sal_Bool bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
 
         // Erstes Zeichen ein String-Delimiter?
         if (bInString )
@@ -116,7 +116,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
                     else
                     {
                         // String-Ende
-                        bInString = FALSE;
+                        bInString = sal_False;
                     }
                 }
                 else
@@ -152,7 +152,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
 {
     if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
     {
-        BOOL bRead2;
+        sal_Bool bRead2;
         do
         {
             bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index b35d1c9551eb..c1a41e91acf2 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -145,11 +145,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
         //OSL_TRACE("OEvoabTable::aColumnName = %s\n", ((OUtoCStr(::rtl::OUString(aColumnName))) ? (OUtoCStr(::rtl::OUString(aColumnName))):("NULL")) );
 
         sal_Int32 eType;
-        UINT16 nPrecision = 0;
-        UINT16 nScale = 0;
+        sal_uInt16 nPrecision = 0;
+        sal_uInt16 nScale = 0;
 
-        BOOL bNumeric = FALSE;
-        ULONG  nIndex = 0;
+        sal_Bool bNumeric = sal_False;
+        sal_uIntPtr  nIndex = 0;
 
         // first without fielddelimiter
         String aField;
@@ -159,7 +159,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
         if (aField.Len() == 0 ||
             (pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
         {
-            bNumeric = FALSE;
+            bNumeric = sal_False;
         }
         else
         {
@@ -173,11 +173,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 
             if (aField2.Len() == 0)
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
             }
             else
             {
-                bNumeric = TRUE;
+                bNumeric = sal_True;
                 xub_StrLen nDot = 0;
                 for (xub_StrLen j = 0; j < aField2.Len(); j++)
                 {
@@ -187,7 +187,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                         (!cThousandDelimiter || c != cThousandDelimiter) &&
                         !aCharClass.isDigit(aField2,j))
                     {
-                        bNumeric = FALSE;
+                        bNumeric = sal_False;
                         break;
                     }
                     if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -199,7 +199,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                 }
 
                 if (nDot > 1) // if there is more than one dot it isn't a number
-                    bNumeric = FALSE;
+                    bNumeric = sal_False;
                 if (bNumeric && cThousandDelimiter)
                 {
                     // Ist der Trenner richtig angegeben?
@@ -212,7 +212,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                             continue;
                         else
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
                     }
@@ -514,7 +514,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
     // Felder:
@@ -700,7 +700,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
 {
     if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
     {
-        BOOL bRead2;
+        sal_Bool bRead2;
         do
         {
             bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 4bf0a2e37a1b..ac04fc9dff86 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -100,16 +100,16 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
     }
 
     // Weiter absteigen im Parse Tree
-    for (UINT32 i = 0; i < pParseNode->count(); i++)
+    for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
 // -----------------------------------------------------------------------------
 OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::GetOrderbyKeyValue" );
-    UINT32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
+    sal_uInt32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
 
-    OKeyValue* pKeyValue = OKeyValue::createKeyValue((UINT32)nBookmarkValue);
+    OKeyValue* pKeyValue = OKeyValue::createKeyValue((sal_uInt32)nBookmarkValue);
 
     ::std::vector<sal_Int32>::iterator aIter = m_aOrderbyColumnNumber.begin();
     for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter)
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 68e23360331b..386a601a3b7c 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -478,7 +478,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
         *((m_aParameterRow->get())[parameterIndex]) = x;
 }
 // -----------------------------------------------------------------------------
-UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::AddParameter" );
     OSL_UNUSED( pParameter );
@@ -492,7 +492,7 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
     ::rtl::OUString sParameterName;
     // Parameter-Column aufsetzen:
     sal_Int32 eType = DataType::VARCHAR;
-    UINT32 nPrecision = 255;
+    sal_uInt32 nPrecision = 255;
     sal_Int32 nScale = 0;
     sal_Int32 nNullable = ColumnValue::NULLABLE;
 
@@ -576,20 +576,20 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
     if (!m_xParamColumns->get().empty())
     {
         // Zunaechst AssignValues
-        USHORT nParaCount=0; // gibt die aktuelle Anzahl der bisher gesetzen Parameter an
+        sal_uInt16 nParaCount=0; // gibt die aktuelle Anzahl der bisher gesetzen Parameter an
 
         // Nach zu substituierenden Parametern suchen:
         size_t nCount = m_aAssignValues.isValid() ? m_aAssignValues->get().size() : 1; // 1 ist wichtig fuer die Kriterien
         for (size_t j = 1; j < nCount; j++)
         {
-            UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j);
+            sal_uInt32 nParameter = (*m_aAssignValues).getParameterIndex(j);
             if (nParameter == SQL_NO_PARAMETER)
                 continue;   // dieser AssignValue ist kein Parameter
 
             ++nParaCount; // ab hier ist der Parameter gueltig
             // Parameter ersetzen. Wenn Parameter nicht verfuegbar,
             //  Value auf NULL setzen.
-            //  (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter];
+            //  (*m_aAssignValues)[j] = (*m_aParameterRow)[(sal_uInt16)nParameter];
         }
 
         if (m_aParameterRow.isValid() &&  (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() )
@@ -627,7 +627,7 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN
     if(nParameter == -1)
         nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol);
     // Nr. des Parameters in der Variablen merken:
-    SetAssignValue(_sColumnName, String(), TRUE, nParameter);
+    SetAssignValue(_sColumnName, String(), sal_True, nParameter);
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index b2cb568eed4e..b9b7180eb65e 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -645,7 +645,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
     // we know that we append new rows at the end
     // so we have to know where the end is
     m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_False);
-    m_bRowInserted = m_pTable->InsertRow(m_aInsertRow.getBody(), TRUE,m_xColsIdx);
+    m_bRowInserted = m_pTable->InsertRow(m_aInsertRow.getBody(), sal_True,m_xColsIdx);
     if(m_bRowInserted && m_pFileSet.isValid())
     {
         sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
@@ -901,20 +901,20 @@ IPropertyArrayHelper & OResultSet::getInfoHelper()
 }
 
 //------------------------------------------------------------------
-BOOL OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
-                               INT32 nFirstOffset,
-                               BOOL bEvaluate,
-                               BOOL bRetrieveData)
+sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+                               sal_Int32 nFirstOffset,
+                               sal_Bool bEvaluate,
+                               sal_Bool bRetrieveData)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::ExecuteRow" );
     OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::ExecuteRow: Analyzer isn't set!");
 
     // Fuer weitere Fetch-Operationen werden diese Angaben ggf. veraendert ...
     IResultSetHelper::Movement eCursorPosition = eFirstCursorPosition;
-    INT32  nOffset = nFirstOffset;
+    sal_Int32  nOffset = nFirstOffset;
 
     const OSQLColumns & rTableCols = m_pTable->getTableColumns().getBody();
-    BOOL bHasRestriction = m_pSQLAnalyzer->hasRestriction();
+    sal_Bool bHasRestriction = m_pSQLAnalyzer->hasRestriction();
 again:
 
     // protect from reading over the end when someboby is inserting while we are reading
@@ -1015,7 +1015,7 @@ again:
         if (bEvaluate)
         {
             // jetzt die eigentliche Ergebniszeile Lesen
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, m_pTable->getTableColumns().getBody(), sal_True,TRUE);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, m_pTable->getTableColumns().getBody(), sal_True,sal_True);
         }
 
         if (bOK)
@@ -1030,7 +1030,7 @@ again:
         sal_Bool bOK = sal_True;
         if (bEvaluate)
         {
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, m_pTable->getTableColumns().getBody(), sal_True,TRUE);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, m_pTable->getTableColumns().getBody(), sal_True,sal_True);
         }
         if (bOK)
         {
@@ -1042,13 +1042,13 @@ again:
 }
 
 //-------------------------------------------------------------------
-BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData)
+sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::Move" );
 
 //IgnoreDeletedRows:
 //
-    INT32 nTempPos = m_nRowPos;
+    sal_Int32 nTempPos = m_nRowPos;
     // exclusiver zugriff auf die Tabelle
     //  vos::OGuard* pGuard = m_pTable->Lock();
 
@@ -1058,7 +1058,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
         if (!m_pFileSet.isValid()) // kein Index verfuegbar
         {
             // Normales FETCH
-            ExecuteRow(eCursorPosition,nOffset,FALSE,bRetrieveData);
+            ExecuteRow(eCursorPosition,nOffset,sal_False,bRetrieveData);
 
             // now set the bookmark for outside this is the logical pos  and not the file pos
             *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1096,17 +1096,17 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
             // Der FileCursor ist ausserhalb des gueltigen Bereichs, wenn
             // a.) m_nRowPos < 1
             // b.) Ein KeySet besteht und m_nRowPos > m_pFileSet->size()
-            if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (INT32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen()
+            if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen()
             {
                 //  aStatus.Set(SQL_STAT_NO_DATA_FOUND);
                 goto Error;
             }
             else
             {
-                if (m_nRowPos < (INT32)m_pFileSet->get().size())
+                if (m_nRowPos < (sal_Int32)m_pFileSet->get().size())
                 {
                     // Fetch ueber Index
-                    ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],FALSE,bRetrieveData);
+                    ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],sal_False,bRetrieveData);
 
                     // now set the bookmark for outside
                     *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1126,26 +1126,26 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
                     }
                     sal_Bool bOK = sal_True;
                     // Ermitteln der Anzahl weiterer Fetches
-                    while (bOK && m_nRowPos >= (INT32)m_pFileSet->get().size())
+                    while (bOK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size())
                     {
                         if (m_pEvaluationKeySet)
                         {
-                            if (m_nRowPos >= (INT32)m_pEvaluationKeySet->size())
+                            if (m_nRowPos >= (sal_Int32)m_pEvaluationKeySet->size())
                                 return sal_False;
                                 //  aStatus.Set(SQL_STAT_NO_DATA_FOUND);
                             else if (m_nRowPos == 0)
                             {
                                 m_aEvaluateIter = m_pEvaluationKeySet->begin();
-                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
                             }
                             else
                             {
                                 ++m_aEvaluateIter;
-                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
                             }
                         }
                         else
-                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE, FALSE);//bRetrieveData);
+                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True, sal_False);//bRetrieveData);
                     }
 
                     if (bOK)
@@ -1324,7 +1324,7 @@ void OResultSet::sortRows()
                 eKeyType[i] = SQL_ORDERBYKEY_DOUBLE;
                 break;
 
-        // Andere Typen sind nicht implementiert (und damit immer FALSE)
+        // Andere Typen sind nicht implementiert (und damit immer sal_False)
             default:
                 eKeyType[i] = SQL_ORDERBYKEY_NONE;
                 OSL_ASSERT("OFILECursor::Execute: Datentyp nicht implementiert");
@@ -1341,19 +1341,19 @@ void OResultSet::sortRows()
 
         while (m_aEvaluateIter != m_pEvaluationKeySet->end())
         {
-            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
             ++m_aEvaluateIter;
         }
     }
     else
     {
-        while ( ExecuteRow( IResultSetHelper::NEXT, 1, FALSE, TRUE ) )
+        while ( ExecuteRow( IResultSetHelper::NEXT, 1, sal_False, sal_True ) )
         {
             m_aSelectRow->get()[0]->setValue( m_aRow->get()[0]->getValue() );
             if ( m_pSQLAnalyzer->hasFunctions() )
                 m_pSQLAnalyzer->setSelectionEvaluationResult( m_aSelectRow, m_aColMapping );
             const sal_Int32 nBookmark = (*m_aRow->get().begin())->getValue();
-            ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, TRUE, FALSE );
+            ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, sal_True, sal_False );
         }
     }
 
@@ -1370,7 +1370,7 @@ void OResultSet::sortRows()
 
 
 // -------------------------------------------------------------------------
-BOOL OResultSet::OpenImpl()
+sal_Bool OResultSet::OpenImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::OpenImpl" );
     OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!");
@@ -1441,9 +1441,9 @@ BOOL OResultSet::OpenImpl()
                     while (bOK)
                     {
                         if (m_pEvaluationKeySet)
-                            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
                         else
-                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
 
                         if (bOK)
                         {
@@ -1465,8 +1465,8 @@ BOOL OResultSet::OpenImpl()
             }
             else
             {
-                BOOL bDistinct = FALSE;
-                BOOL bWasSorted = FALSE;
+                sal_Bool bDistinct = sal_False;
+                sal_Bool bWasSorted = sal_False;
                 OSQLParseNode *pDistinct = m_pParseTree->getChild(1);
                 ::std::vector<sal_Int32>                aOrderbyColumnNumberSave;
                 ::std::vector<TAscendingOrder>          aOrderbyAscendingSave;
@@ -1479,7 +1479,7 @@ BOOL OResultSet::OpenImpl()
                         aOrderbyColumnNumberSave = m_aOrderbyColumnNumber;// .assign(m_aOrderbyColumnNumber.begin(), m_aOrderbyColumnNumber.end());
                         m_aOrderbyColumnNumber.clear();
                         aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(), m_aOrderbyAscending.end());
-                        bWasSorted = TRUE;
+                        bWasSorted = sal_True;
                     }
 
                     // the first column is the bookmark column
@@ -1487,7 +1487,7 @@ BOOL OResultSet::OpenImpl()
                     ::std::copy(aColStart, m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber));
 //                  m_aOrderbyColumnNumber.assign(aColStart, m_aColMapping.end());
                     m_aOrderbyAscending.assign(m_aColMapping.size()-1, SQL_ASC);
-                    bDistinct = TRUE;
+                    bDistinct = sal_True;
                 }
 
                 if (IsSorted())
@@ -1525,15 +1525,15 @@ BOOL OResultSet::OpenImpl()
                     if (nMaxRow)
                     {
     #if OSL_DEBUG_LEVEL > 1
-                        INT32 nFound=0;
+                        sal_Int32 nFound=0;
     #endif
-                        INT32 nPos;
-                        INT32 nKey;
+                        sal_Int32 nPos;
+                        sal_Int32 nKey;
 
                         for( size_t j = nMaxRow-1; j > 0; --j)
                         {
                             nPos = (m_pFileSet->get())[j];
-                            ExecuteRow(IResultSetHelper::BOOKMARK,nPos,FALSE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,nPos,sal_False);
                             m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
                             { // copy row values
                                 OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin();
@@ -1547,7 +1547,7 @@ BOOL OResultSet::OpenImpl()
 
                             // compare with next row
                             nKey = (m_pFileSet->get())[j-1];
-                            ExecuteRow(IResultSetHelper::BOOKMARK,nKey,FALSE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,nKey,sal_False);
                             m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
                             OValueRefVector::Vector::iterator loopInRow = m_aSelectRow->get().begin();
                             OValueVector::Vector::iterator existentInSearchRow = aSearchRow->get().begin();
@@ -1611,9 +1611,9 @@ BOOL OResultSet::OpenImpl()
                 while (bOK)
                 {
                     if (m_pEvaluationKeySet)
-                        ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+                        ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
                     else
-                        bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+                        bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
 
                     if (bOK)
                     {
@@ -1638,7 +1638,7 @@ BOOL OResultSet::OpenImpl()
             m_nRowCountResult = 0;
 
             OSL_ENSURE(m_aAssignValues.isValid(),"No assign values set!");
-            if(!m_pTable->InsertRow(m_aAssignValues.getBody(), TRUE,m_xColsIdx))
+            if(!m_pTable->InsertRow(m_aAssignValues.getBody(), sal_True,m_xColsIdx))
             {
                 m_nFilePos  = 0;
                 return sal_False;
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 52200553d042..929fc1524337 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -743,7 +743,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
     else if (SQL_ISTOKEN(pRow_Value_Constructor_Elem,NULL))
     {
         // NULL setzen
-        SetAssignValue(aColumnName, String(), TRUE);
+        SetAssignValue(aColumnName, String(), sal_True);
     }
     else if (SQL_ISRULE(pRow_Value_Constructor_Elem,parameter))
         parseParamterElem(aColumnName,pRow_Value_Constructor_Elem);
@@ -756,8 +756,8 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
 //------------------------------------------------------------------
 void OStatement_Base::SetAssignValue(const String& aColumnName,
                                    const String& aValue,
-                                   BOOL bSetNull,
-                                   UINT32 nParameter)
+                                   sal_Bool bSetNull,
+                                   sal_uInt32 nParameter)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::SetAssignValue" );
     Reference<XPropertySet> xCol;
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index e317120da95c..4d10d97b24b5 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -204,19 +204,19 @@ void SAL_CALL OFileTable::release() throw()
     OTable_TYPEDEF::release();
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::InsertRow(OValueRefVector& /*rRow*/, BOOL /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, sal_Bool /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::InsertRow" );
     return sal_False;
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
+sal_Bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::DeleteRow" );
     return sal_False;
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::UpdateRow" );
     return sal_False;
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 8211e954a49f..04df24ab379e 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -284,12 +284,12 @@ OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
     return new OOperandAttr(static_cast<sal_uInt16>(_nPos),_xCol);
 }
 // -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasRestriction() const
+sal_Bool OSQLAnalyzer::hasRestriction() const
 {
     return m_aCompiler->hasCode();
 }
 // -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasFunctions() const
+sal_Bool OSQLAnalyzer::hasFunctions() const
 {
     if ( m_bSelectionFirstTime )
     {
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 9d4e1644d370..57b562664026 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -355,7 +355,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
         case DataType::LONGVARCHAR:
         {
             rtl::OUString sLH = aLH, sRH = aRH;
-            INT32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
+            sal_Int32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
                 (
                  sLH.pData->buffer,
                  sLH.pData->length,
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index eeaec1ff40f1..4ea918ef3e27 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -60,7 +60,7 @@ OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs
                      // : m_rCursor(rCurs)
                      : m_pAnalyzer(pAnalyzer)
                      , m_nParamCounter(0)
-                     , m_bORCondition(FALSE)
+                     , m_bORCondition(sal_False)
 {
     DBG_CTOR(OPredicateCompiler,NULL);
 }
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 9b315f8cce85..6abfa8a02e01 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -44,8 +44,8 @@ namespace connectivity
             return 0;
 
         xub_StrLen nTokCount = 1;
-        BOOL bStart = TRUE;     // Stehen wir auf dem ersten Zeichen im Token?
-        BOOL bInString = FALSE; // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
+        sal_Bool bStart = sal_True;     // Stehen wir auf dem ersten Zeichen im Token?
+        sal_Bool bInString = sal_False; // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
 
         // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen
         for( xub_StrLen i = 0; i < nLen; ++i )
@@ -53,11 +53,11 @@ namespace connectivity
             const sal_Unicode cChar = m_sString.GetChar(i);
             if (bStart)
             {
-                bStart = FALSE;
+                bStart = sal_False;
                 // Erstes Zeichen ein String-Delimiter?
                 if ( cChar == cStrDel )
                 {
-                    bInString = TRUE;   // dann sind wir jetzt INNERHALB des Strings!
+                    bInString = sal_True;   // dann sind wir jetzt INNERHALB des Strings!
                     continue;           // dieses Zeichen ueberlesen!
                 }
             }
@@ -75,7 +75,7 @@ namespace connectivity
                     else
                     {
                         // String-Ende
-                        bInString = FALSE;
+                        bInString = sal_False;
                     }
                 }
             } // if (bInString)
@@ -85,7 +85,7 @@ namespace connectivity
                 if ( cChar == cTok )
                 {
                     ++nTokCount;
-                    bStart = TRUE;
+                    bStart = sal_True;
                 }
             }
         }
@@ -102,7 +102,7 @@ namespace connectivity
         const xub_StrLen nLen = m_sString.Len();
         if ( nLen )
         {
-            BOOL bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel);   // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
+            sal_Bool bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel);   // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
 
             // Erstes Zeichen ein String-Delimiter?
             if (bInString )
@@ -131,7 +131,7 @@ namespace connectivity
                         else
                         {
                             // String-Ende
-                            bInString = FALSE;
+                            bInString = sal_False;
                             *pData = 0;
                         }
                     }
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index c427675f15a0..4dc27265b585 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::lang;
 void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatTable::fillColumns" );
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OFlatConnection* pConnection = (OFlatConnection*)m_pConnection;
@@ -193,8 +193,8 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
 {
     if ( io_nType != DataType::VARCHAR )
     {
-        BOOL bNumeric = io_nType == DataType::SQLNULL || io_nType == DataType::DOUBLE || io_nType == DataType::DECIMAL || io_nType == DataType::INTEGER;
-        ULONG  nIndex = 0;
+        sal_Bool bNumeric = io_nType == DataType::SQLNULL || io_nType == DataType::DOUBLE || io_nType == DataType::DECIMAL || io_nType == DataType::INTEGER;
+        sal_uLong  nIndex = 0;
 
         if ( bNumeric )
         {
@@ -204,7 +204,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
             if (aField.Len() == 0 ||
                 (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
                 if ( m_cStringDelimiter != '\0' )
                     aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
                 else
@@ -220,11 +220,11 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
 
                 if (aField2.Len() == 0)
                 {
-                    bNumeric = FALSE;
+                    bNumeric = sal_False;
                 }
                 else
                 {
-                    bNumeric = TRUE;
+                    bNumeric = sal_True;
                     xub_StrLen nDot = 0;
                     xub_StrLen nDecimalDelCount = 0;
                     xub_StrLen nSpaceCount = 0;
@@ -242,7 +242,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
                             !aCharClass.isDigit(aField2,j)                      &&
                             ( j != 0 || (c != '+' && c != '-' ) ) )
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
                         if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -256,7 +256,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
                     }
 
                     if (nDecimalDelCount > 1 || nDot > 1 ) // if there is more than one dot it isn't a number
-                        bNumeric = FALSE;
+                        bNumeric = sal_False;
                     if (bNumeric && cThousandDelimiter)
                     {
                         // Ist der Trenner richtig angegeben?
@@ -269,7 +269,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
                                 continue;
                             else
                             {
-                                bNumeric = FALSE;
+                                bNumeric = sal_False;
                                 break;
                             }
                         }
@@ -606,7 +606,7 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
     if ( m_bNeedToReadLine )
     {
         sal_Int32 nCurrentPos = 0;
diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index 762d51160db9..a1667b2c87a5 100644
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -25,13 +25,6 @@
  *
  ************************************************************************/
 
-#ifndef BOOL
-# define MOZ_BOOL
-
-# define BOOL mozBOOL
-# define Bool mozBooL
-#endif
-
 // Turn off DEBUG Assertions
 #ifdef _DEBUG
     #define _DEBUG_WAS_DEFINED _DEBUG
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 9155ba72bb87..2637a7a2a5b1 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -83,13 +83,13 @@ namespace connectivity
             ONDXPageList    m_aCollector;                   // Pool von nicht mehr benoetigten Seiten
             ONDXPagePtr     m_aRoot,                        // Wurzel des b+ Baums
                             m_aCurLeaf;                 // aktuelles Blatt
-            USHORT          m_nCurNode;                 // Position des aktuellen Knoten
+            sal_uInt16          m_nCurNode;                 // Position des aktuellen Knoten
 
             sal_uInt32          m_nPageCount,
                             m_nRootPage;
 
             ODbaseTable*    m_pTable;
-            BOOL            m_bUseCollector : 1;                        // Verwenden des GarbageCollectors
+            sal_Bool            m_bUseCollector : 1;                        // Verwenden des GarbageCollectors
 
             ::rtl::OUString getCompletePath();
             void closeImpl();
@@ -123,31 +123,31 @@ namespace connectivity
             sal_uInt32 GetRootPos()                 {return m_nRootPage;}
             sal_uInt32 GetPageCount()               {return m_nPageCount;}
 
-            BOOL IsText() const                 {return m_aHeader.db_keytype == 0;}
-            USHORT GetMaxNodes() const          {return m_aHeader.db_maxkeys;}
+            sal_Bool IsText() const                 {return m_aHeader.db_keytype == 0;}
+            sal_uInt16 GetMaxNodes() const          {return m_aHeader.db_maxkeys;}
 
-            virtual BOOL Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
-            virtual BOOL Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
-            virtual BOOL Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
-            virtual BOOL Find(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
+            virtual sal_Bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
 
             void createINFEntry();
-            BOOL CreateImpl();
-            BOOL DropImpl();
+            sal_Bool CreateImpl();
+            sal_Bool DropImpl();
 
             DECLARE_SERVICE_INFO();
         protected:
 
-            ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, BOOL bLoad = FALSE);
+            ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, sal_Bool bLoad = sal_False);
             void Collect(ONDXPage*);
             ONDXPagePtr getRoot();
 
             sal_Bool isUnique() const { return m_IsUnique; }
-            BOOL UseCollector() const {return m_bUseCollector;}
+            sal_Bool UseCollector() const {return m_bUseCollector;}
             // Tree operationen
             void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode);
-            void Release(BOOL bSave = TRUE);
-            BOOL ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
+            void Release(sal_Bool bSave = sal_True);
+            sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
         };
 
         SvStream& operator << (SvStream &rStream, ODbaseIndex&);
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 99ed3f37af91..d24f981ae740 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -47,14 +47,14 @@ namespace connectivity
             ODbaseIndex*            m_pIndex;
             ONDXPagePtr             m_aRoot,
                                     m_aCurLeaf;
-            USHORT                  m_nCurNode;
+            sal_uInt16                  m_nCurNode;
 
         protected:
-            ULONG Find(BOOL bFirst);
-            ULONG GetCompare(BOOL bFirst);
-            ULONG GetLike(BOOL bFirst);
-            ULONG GetNull(BOOL bFirst);
-            ULONG GetNotNull(BOOL bFirst);
+            sal_uIntPtr Find(sal_Bool bFirst);
+            sal_uIntPtr GetCompare(sal_Bool bFirst);
+            sal_uIntPtr GetLike(sal_Bool bFirst);
+            sal_uIntPtr GetNull(sal_Bool bFirst);
+            sal_uIntPtr GetNotNull(sal_Bool bFirst);
 
             ONDXKey* GetFirstKey(ONDXPage* pPage,
                                 const file::OOperand& rKey);
@@ -75,8 +75,8 @@ namespace connectivity
             }
 
             virtual ~OIndexIterator();
-            ULONG First();
-            ULONG Next();
+            sal_uIntPtr First();
+            sal_uIntPtr Next();
 
         };
     }
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index ad67a7f7ee20..2ec510a234ff 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -61,18 +61,18 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
-            UINT32  nPagePos;       // Position in der Indexdatei
+            sal_uInt32  nPagePos;       // Position in der Indexdatei
 
         public:
-            ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){}
+            ONDXPagePtr(sal_uInt32 nPos = 0):nPagePos(nPos){}
             ONDXPagePtr(const ONDXPagePtr& rRef);
             ONDXPagePtr(ONDXPage* pRefPage);
 
             ONDXPagePtr& operator=(const ONDXPagePtr& rRef);
             ONDXPagePtr& operator=(ONDXPage* pPageRef);
 
-            UINT32 GetPagePos() const {return nPagePos;}
-            BOOL HasPage() const {return nPagePos != 0;}
+            sal_uInt32 GetPagePos() const {return nPagePos;}
+            sal_Bool HasPage() const {return nPagePos != 0;}
             sal_Bool Is() const { return isValid(); }
             void Clear()
             {
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index cca6d97c41c6..56be27f69dce 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -68,26 +68,26 @@ namespace connectivity
         private:
             struct DBFHeader {                       /* Kopfsatz-Struktur            */
                                 DBFType db_typ;                         /* Dateityp                     */
-                                BYTE    db_aedat[3];                    /* Datum der letzen Aenderung   */
+                                sal_uInt8    db_aedat[3];                    /* Datum der letzen Aenderung   */
                                                                         /* JJ MM TT                     */
                                 sal_uInt32   db_anz;                         /* Anzahl der Saetze            */
-                                USHORT  db_kopf;                        /* laenge Kopfsatz-Struktur     */
-                                USHORT  db_slng;                        /* laenge der Daten-Saetze      */
-                                BYTE    db_frei[20];                    /* reserviert                   */
+                                sal_uInt16  db_kopf;                        /* laenge Kopfsatz-Struktur     */
+                                sal_uInt16  db_slng;                        /* laenge der Daten-Saetze      */
+                                sal_uInt8    db_frei[20];                    /* reserviert                   */
                             };
             struct DBFColumn {                       /* Feldbezeichner               */
-                                BYTE    db_fnm[11];                     /* Feldname                     */
-                                BYTE    db_typ;                         /* Feldtyp                      */
-                                UINT32  db_adr;                         /* Feldadresse                  */
-                                BYTE    db_flng;                        /* Feldlaenge                   */
-                                BYTE    db_dez;                         /* Dezimalstellen fuer N        */
-                                BYTE    db_frei2[14];                   /* reserviert                   */
+                                sal_uInt8    db_fnm[11];                     /* Feldname                     */
+                                sal_uInt8    db_typ;                         /* Feldtyp                      */
+                                sal_uInt32  db_adr;                         /* Feldadresse                  */
+                                sal_uInt8    db_flng;                        /* Feldlaenge                   */
+                                sal_uInt8    db_dez;                         /* Dezimalstellen fuer N        */
+                                sal_uInt8    db_frei2[14];                   /* reserviert                   */
                             };
             struct DBFMemoHeader
                             {
                                 DBFMemoType db_typ;                     /* Dateityp                     */
-                                UINT32  db_next;                        /* naechster freier Block       */
-                                USHORT  db_size;                        /* Blockgroesse: dBase 3 fest   */
+                                sal_uInt32  db_next;                        /* naechster freier Block       */
+                                sal_uInt16  db_size;                        /* Blockgroesse: dBase 3 fest   */
                             };
 
             ::std::vector<sal_Int32> m_aTypes;      // holds all type for columns just to avoid to ask the propertyset
@@ -107,15 +107,15 @@ namespace connectivity
             void fillColumns();
             String createTempFile();
             void copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
-            BOOL CreateMemoFile(const INetURLObject& aFile);
-            BOOL HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
-            BOOL ReadMemoHeader();
-            BOOL ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable);
-
-            BOOL WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr);
-            BOOL WriteBuffer();
-            BOOL UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
+            sal_Bool CreateMemoFile(const INetURLObject& aFile);
+            sal_Bool HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
+            sal_Bool ReadMemoHeader();
+            sal_Bool ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable);
+
+            sal_Bool WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr);
+            sal_Bool WriteBuffer();
+            sal_Bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> isUniqueByColumnName(sal_Int32 _nColumnPos);
             void AllocBuffer();
 
@@ -161,19 +161,19 @@ namespace connectivity
             // XRename
             virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
 
-            BOOL    DropImpl();
-            BOOL    CreateImpl();
+            sal_Bool    DropImpl();
+            sal_Bool    CreateImpl();
 
 
-            virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
-            virtual BOOL DeleteRow(const OSQLColumns& _rCols);
-            virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+            virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
 
             virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
             virtual void dropColumn(sal_Int32 _nPos);
 
             static String   getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL );
-            static BOOL     Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
+            static sal_Bool     Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
 
             virtual void refreshHeader();
 
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 97661e3ff5d9..da60eeee0c9b 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -50,14 +50,14 @@ namespace connectivity
         class ONDXKey : public ONDXKey_BASE
         {
             friend class ONDXNode;
-            UINT32          nRecord;                /* Satzzeiger               */
+            sal_uInt32          nRecord;                /* Satzzeiger               */
             ORowSetValue    xValue;                 /* Schluesselwert           */
 
         public:
-            ONDXKey(UINT32 nRec=0);
-            ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec);
-            ONDXKey(const rtl::OUString& aStr, UINT32 nRec = 0);
-            ONDXKey(double aVal, UINT32 nRec = 0);
+            ONDXKey(sal_uInt32 nRec=0);
+            ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec);
+            ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec = 0);
+            ONDXKey(double aVal, sal_uInt32 nRec = 0);
 
             inline ONDXKey(const ONDXKey& rKey);
 
@@ -66,21 +66,21 @@ namespace connectivity
 
             virtual const ORowSetValue& getValue() const;
 
-            UINT32 GetRecord() const        { return nRecord;   }
-            void setRecord(UINT32 _nRec)    { nRecord = _nRec;  }
+            sal_uInt32 GetRecord() const        { return nRecord;   }
+            void setRecord(sal_uInt32 _nRec)    { nRecord = _nRec;  }
             void   ResetRecord()            { nRecord = 0;      }
 
-            BOOL operator == (const ONDXKey& rKey) const;
-            BOOL operator != (const ONDXKey& rKey) const;
-            BOOL operator <  (const ONDXKey& rKey) const;
-            BOOL operator <= (const ONDXKey& rKey) const;
-            BOOL operator >  (const ONDXKey& rKey) const;
-            BOOL operator >= (const ONDXKey& rKey) const;
+            sal_Bool operator == (const ONDXKey& rKey) const;
+            sal_Bool operator != (const ONDXKey& rKey) const;
+            sal_Bool operator <  (const ONDXKey& rKey) const;
+            sal_Bool operator <= (const ONDXKey& rKey) const;
+            sal_Bool operator >  (const ONDXKey& rKey) const;
+            sal_Bool operator >= (const ONDXKey& rKey) const;
 
-            BOOL Load (SvFileStream& rStream, BOOL bText);
-            BOOL Write(SvFileStream& rStream, BOOL bText);
+            sal_Bool Load (SvFileStream& rStream, sal_Bool bText);
+            sal_Bool Write(SvFileStream& rStream, sal_Bool bText);
 
-            static BOOL IsText(sal_Int32 eType);
+            static sal_Bool IsText(sal_Int32 eType);
 
         private:
             StringCompare Compare(const ONDXKey& rKey) const;
@@ -100,18 +100,18 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
-            UINT32  nPagePos;       // Position in der Indexdatei
+            sal_uInt32  nPagePos;       // Position in der Indexdatei
 
         public:
-            ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){}
+            ONDXPagePtr(sal_uInt32 nPos = 0):nPagePos(nPos){}
             ONDXPagePtr(const ONDXPagePtr& rRef);
             ONDXPagePtr(ONDXPage* pRefPage);
 
             ONDXPagePtr& operator=(const ONDXPagePtr& rRef);
             ONDXPagePtr& operator=(ONDXPage* pPageRef);
 
-            UINT32 GetPagePos() const {return nPagePos;}
-            BOOL HasPage() const {return nPagePos != 0;}
+            sal_uInt32 GetPagePos() const {return nPagePos;}
+            sal_Bool HasPage() const {return nPagePos != 0;}
             //  sal_Bool Is() const { return isValid(); }
         };
         //==================================================================
@@ -124,9 +124,9 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPage&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPage&);
 
-            UINT32      nPagePos;               // Position in der Indexdatei
-            BOOL        bModified : 1;
-            USHORT      nCount;
+            sal_uInt32      nPagePos;               // Position in der Indexdatei
+            sal_Bool        bModified : 1;
+            sal_uInt16      nCount;
 
             ONDXPagePtr aParent,            // VaterSeite
                         aChild;             // Zeiger auf rechte ChildPage
@@ -135,33 +135,33 @@ namespace connectivity
 
         public:
             // Knoten Operationen
-            USHORT  Count() const {return nCount;}
+            sal_uInt16  Count() const {return nCount;}
 
-            BOOL    Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
-            BOOL    Insert(USHORT nIndex, ONDXNode& rNode);
-            BOOL    Append(ONDXNode& rNode);
-            BOOL    Delete(USHORT);
-            void    Remove(USHORT);
-            void    Release(BOOL bSave = TRUE);
-            void    ReleaseFull(BOOL bSave = TRUE);
+            sal_Bool    Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
+            sal_Bool    Insert(sal_uInt16 nIndex, ONDXNode& rNode);
+            sal_Bool    Append(ONDXNode& rNode);
+            sal_Bool    Delete(sal_uInt16);
+            void    Remove(sal_uInt16);
+            void    Release(sal_Bool bSave = sal_True);
+            void    ReleaseFull(sal_Bool bSave = sal_True);
 
             // Aufteilen und Zerlegen
             ONDXNode Split(ONDXPage& rPage);
-            void Merge(USHORT nParentNodePos, ONDXPagePtr xPage);
+            void Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage);
 
             // Zugriffsoperationen
-            ONDXNode& operator[] (USHORT nPos);
-            const ONDXNode& operator[] (USHORT nPos) const;
+            ONDXNode& operator[] (sal_uInt16 nPos);
+            const ONDXNode& operator[] (sal_uInt16 nPos) const;
 
-            BOOL IsRoot() const;
-            BOOL IsLeaf() const;
-            BOOL IsModified() const;
-            BOOL HasParent();
-            BOOL HasChild() const;
+            sal_Bool IsRoot() const;
+            sal_Bool IsLeaf() const;
+            sal_Bool IsModified() const;
+            sal_Bool HasParent();
+            sal_Bool HasChild() const;
 
-            BOOL IsFull() const;
+            sal_Bool IsFull() const;
 
-            UINT32 GetPagePos() const {return nPagePos;}
+            sal_uInt32 GetPagePos() const {return nPagePos;}
             ONDXPagePtr& GetChild(ODbaseIndex* pIndex = 0);
 
             // Parent braucht nicht nachgeladen zu werden
@@ -173,8 +173,8 @@ namespace connectivity
             void SetChild(ONDXPagePtr aCh);
             void SetParent(ONDXPagePtr aPa);
 
-            USHORT Search(const ONDXKey& rSearch);
-            USHORT Search(const ONDXPage* pPage);
+            sal_uInt16 Search(const ONDXKey& rSearch);
+            sal_uInt16 Search(const ONDXPage* pPage);
             void   SearchAndReplace(const ONDXKey& rSearch, ONDXKey& rReplace);
 
         protected:
@@ -183,11 +183,11 @@ namespace connectivity
 
             virtual void QueryDelete();
 
-            void SetModified(BOOL bMod) {bModified = bMod;}
-            void SetPagePos(UINT32 nPage) {nPagePos = nPage;}
+            void SetModified(sal_Bool bMod) {bModified = bMod;}
+            void SetPagePos(sal_uInt32 nPage) {nPagePos = nPage;}
 
-            BOOL Find(const ONDXKey&);  // rek. Abstieg
-            USHORT FindPos(const ONDXKey& rKey) const;
+            sal_Bool Find(const ONDXKey&);  // rek. Abstieg
+            sal_uInt16 FindPos(const ONDXKey& rKey) const;
 
 #if OSL_DEBUG_LEVEL > 1
             void PrintPage();
@@ -199,11 +199,11 @@ namespace connectivity
         SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
         SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
-        inline BOOL ONDXPage::IsRoot() const {return !aParent.Is();}
-        inline BOOL ONDXPage::IsLeaf() const {return !aChild.HasPage();}
-        inline BOOL ONDXPage::IsModified() const {return bModified;}
-        inline BOOL ONDXPage::HasParent() {return aParent.Is();}
-        inline BOOL ONDXPage::HasChild() const {return aChild.HasPage();}
+        inline sal_Bool ONDXPage::IsRoot() const {return !aParent.Is();}
+        inline sal_Bool ONDXPage::IsLeaf() const {return !aChild.HasPage();}
+        inline sal_Bool ONDXPage::IsModified() const {return bModified;}
+        inline sal_Bool ONDXPage::HasParent() {return aParent.Is();}
+        inline sal_Bool ONDXPage::HasChild() const {return aChild.HasPage();}
         inline ONDXPagePtr ONDXPage::GetParent() {return aParent;}
 
         inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr())
@@ -239,7 +239,7 @@ namespace connectivity
                        :aChild(aPagePtr),aKey(rKey) {}
 
             // verweist der Knoten auf eine Seite
-            BOOL            HasChild() const {return aChild.HasPage();}
+            sal_Bool            HasChild() const {return aChild.HasPage();}
             // Ist ein Index angegeben, kann gegebenfalls die Seite nachgeladen werden
             ONDXPagePtr&    GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL);
 
@@ -256,14 +256,14 @@ namespace connectivity
         //==================================================================
         // inline implementation
         //==================================================================
-//      inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+//      inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
 //          : ONDXKey_BASE(eType)
 //          , nRecord(nRec),xValue(rVal)
 //      {
 //      }
 
 
-//      inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+//      inline ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
 //                  : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
 //                   ,nRecord(nRec)
 //      {
@@ -271,14 +271,14 @@ namespace connectivity
 //              xValue = aStr;
 //      }
 
-//      inline ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+//      inline ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
 //                   : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
 //                   ,nRecord(nRec)
 //                   ,xValue(aVal)
 //      {
 //      }
 
-//      inline ONDXKey::ONDXKey(UINT32 nRec)
+//      inline ONDXKey::ONDXKey(sal_uInt32 nRec)
 //                   :nRecord(nRec)
 //      {
 //      }
@@ -301,29 +301,29 @@ namespace connectivity
             return *this;
         }
 
-        inline BOOL ONDXKey::operator == (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator == (const ONDXKey& rKey) const
         {
             if(&rKey == this)
                 return sal_True;
             return Compare(rKey) == COMPARE_EQUAL;
         }
-        inline BOOL ONDXKey::operator != (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator != (const ONDXKey& rKey) const
         {
             return !operator== (rKey);
         }
-        inline BOOL ONDXKey::operator <  (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator <  (const ONDXKey& rKey) const
         {
             return Compare(rKey) == COMPARE_LESS;
         }
-        inline BOOL ONDXKey::operator >  (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator >  (const ONDXKey& rKey) const
         {
             return Compare(rKey) == COMPARE_GREATER;
         }
-        inline BOOL ONDXKey::operator <= (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator <= (const ONDXKey& rKey) const
         {
             return !operator > (rKey);
         }
-        inline BOOL ONDXKey::operator >= (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator >= (const ONDXKey& rKey) const
         {
             return !operator< (rKey);
         }
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 9528ca16a508..d5bbd21b191a 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -68,7 +68,7 @@ namespace connectivity
             void checkAndResizeParameters(sal_Int32 parameterIndex);
             void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
 
-            UINT32 AddParameter(connectivity::OSQLParseNode * pParameter,
+            sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter,
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
             void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
             void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 530387ceef4a..ca774b53e341 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -166,13 +166,13 @@ namespace connectivity
             void construct();
             sal_Bool evaluate();
 
-            BOOL ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
-                                INT32 nOffset = 1,
-                                BOOL bEvaluate = TRUE,
-                                BOOL bRetrieveData = TRUE);
+            sal_Bool ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+                                sal_Int32 nOffset = 1,
+                                sal_Bool bEvaluate = sal_True,
+                                sal_Bool bRetrieveData = sal_True);
 
             OKeyValue* GetOrderbyKeyValue(OValueRefRow& _rRow);
-            BOOL IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
+            sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
 
             // return true when the select statement is "select count(*) from table"
             inline sal_Bool isCount() const { return m_bIsCount; }
@@ -187,7 +187,7 @@ namespace connectivity
 
             using OResultSet_BASE::rBHelper;
 
-            BOOL Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData);
+            sal_Bool Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData);
             virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex);
 
             // OPropertyArrayUsageHelper
@@ -300,7 +300,7 @@ namespace connectivity
 
             // special methods
             inline sal_Int32 mapColumn(sal_Int32    column);
-            virtual BOOL OpenImpl();
+            virtual sal_Bool OpenImpl();
             virtual void doTableSpecials(const OSQLTable& _xTable);
 
             inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 0983811b9bd2..4c6fbcd426af 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -134,8 +134,8 @@ namespace connectivity
             void GetAssignValues();
             void SetAssignValue(const String& aColumnName,
                                    const String& aValue,
-                                   BOOL bSetNull = FALSE,
-                                   UINT32 nParameter=SQL_NO_PARAMETER);
+                                   sal_Bool bSetNull = sal_False,
+                                   sal_uInt32 nParameter=SQL_NO_PARAMETER);
             void ParseAssignValues( const ::std::vector< String>& aColumnNameList,
                                     connectivity::OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex);
 
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index bc4cd450f931..f21a89ea0aef 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -87,9 +87,9 @@ namespace connectivity
             virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) = 0;
 
             ::vos::ORef<OSQLColumns> getTableColumns() const {return m_aColumns;}
-            virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
-            virtual BOOL DeleteRow(const OSQLColumns& _rCols);
-            virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+            virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
             virtual void dropColumn(sal_Int32 _nPos);
             // refresh the header of file based tables to see changes done by someone
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index c882b760765a..96f815a5cc0d 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -81,9 +81,9 @@ namespace connectivity
             void dispose();
             void start(OSQLParseNode* pSQLParseNode);
             void clean();
-            virtual BOOL hasRestriction() const;
-            virtual BOOL hasFunctions() const;
-            inline BOOL evaluateRestriction()   { return m_aInterpreter->start(); }
+            virtual sal_Bool hasRestriction() const;
+            virtual sal_Bool hasFunctions() const;
+            inline sal_Bool evaluateRestriction()   { return m_aInterpreter->start(); }
             void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
             void setOrigColumns(const OFileColumns& rCols);
             virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos,
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index ed3c40614217..cdbb902e9458 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -66,7 +66,7 @@ namespace connectivity
             bool                            m_bNeedToReadLine;
         private:
             void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
             sal_Bool readLine(sal_Int32& _rnCurrentPos);
             void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,xub_StrLen& nStartPosFirstLine,xub_StrLen& nStartPosFirstLine2
                                              ,sal_Int32& io_nType,sal_Int32& io_nPrecisions,sal_Int32& io_nScales,String& o_sTypeName
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index b64327bd7232..3b3cba11f5a0 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -91,8 +91,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 );
 
@@ -164,7 +164,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,
@@ -203,7 +203,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 edc2473ce426..a2f602082fe4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -252,7 +252,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 )
@@ -823,7 +823,7 @@ void Desktop::DeInit()
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "FINISHED WITH Destop::DeInit" );
 }
 
-BOOL Desktop::QueryExit()
+sal_Bool Desktop::QueryExit()
 {
     try
     {
@@ -849,7 +849,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() )
@@ -1452,10 +1452,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 );
@@ -1467,7 +1467,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.
@@ -1637,7 +1637,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 )
@@ -1982,7 +1982,7 @@ void Desktop::doShutdown()
     FlushConfiguration();
     // The acceptors in the AcceptorMap must be released (in DeregisterServices)
     // with the solar mutex unlocked, to avoid deadlock:
-    ULONG nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
     DeregisterServices();
     Application::AcquireSolarMutex(nAcquireCount);
     tools::DeInitTestToolLib();
@@ -2168,17 +2168,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:
@@ -2616,7 +2616,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;
@@ -2766,7 +2766,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 100755..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 100755..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 ea0b66245988..6476667a19d8 100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -139,9 +139,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) )
 
@@ -164,13 +164,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;
 };
 
 //------------------------------------------------------------------------------
@@ -194,15 +194,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 ),
@@ -658,7 +658,7 @@ UpdateDialog::~UpdateDialog()
 }
 
 //------------------------------------------------------------------------------
-BOOL UpdateDialog::Close() {
+sal_Bool UpdateDialog::Close() {
     m_thread->stop();
     return ModalDialog::Close();
 }
@@ -686,10 +686,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);
 }
 
 //------------------------------------------------------------------------------
@@ -727,7 +727,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 ) )
@@ -742,7 +742,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;
@@ -774,11 +774,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 ) );
@@ -807,7 +807,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;
@@ -818,7 +818,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
@@ -833,7 +833,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;
@@ -849,7 +849,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;
@@ -1306,7 +1306,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)
         {
@@ -1401,7 +1401,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 ) )
@@ -1449,7 +1449,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 cebcc65e26a8..a3cc76faaee8 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 0adb63614828..025cbd36cf7d 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -547,7 +547,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 03352d33f7c6..eefb529d0ca7 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 a89262e8ec5b..47eae23ff58c 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -64,7 +64,7 @@ protected:
 
 class LicenseView : public MultiLineEdit, public SfxListener
 {
-    BOOL            mbEndReached;
+    sal_Bool            mbEndReached;
     Link            maEndReachedHdl;
     Link            maScrolledHdl;
 
@@ -74,9 +74,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 150a58ce2729..3489d7186b4f 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -102,7 +102,7 @@ static sal_Int32 getBuildId()
     return nBuildId;
 }
 
-WizardResId::WizardResId( USHORT nId ) :
+WizardResId::WizardResId( sal_uInt16 nId ) :
     ResId( nId, *FirstStartWizard::GetResManager() )
 {
 }
@@ -230,7 +230,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 48045f6b035f..96bd74dcd859 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -39,7 +39,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;
         }
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 9418e8afe8bd..c9774bea3f34 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -402,7 +402,7 @@ namespace drawinglayer
             // define various other FontAttribute
             aRetval.SetAlign(ALIGN_BASELINE);
             aRetval.SetCharSet(rFontAttribute.getSymbol() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE);
-            aRetval.SetVertical(rFontAttribute.getVertical() ? TRUE : FALSE);
+            aRetval.SetVertical(rFontAttribute.getVertical() ? sal_True : sal_False);
             aRetval.SetWeight(static_cast<FontWeight>(rFontAttribute.getWeight()));
             aRetval.SetItalic(rFontAttribute.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
             aRetval.SetOutline(rFontAttribute.getOutline());
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 263cdeede4f8..b845ed189aad 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -355,7 +355,7 @@ namespace drawinglayer
                 SvMemoryStream aMemStm;
 
                 aMemStm << *pSvtGraphicFill;
-                mpMetaFile->AddAction(new MetaCommentAction("XPATHFILL_SEQ_BEGIN", 0, static_cast< const BYTE* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
+                mpMetaFile->AddAction(new MetaCommentAction("XPATHFILL_SEQ_BEGIN", 0, static_cast< const sal_uInt8* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
                 mnSvtGraphicFillCount++;
             }
         }
@@ -508,7 +508,7 @@ namespace drawinglayer
                 SvMemoryStream aMemStm;
 
                 aMemStm << *pSvtGraphicStroke;
-                mpMetaFile->AddAction(new MetaCommentAction("XPATHSTROKE_SEQ_BEGIN", 0, static_cast< const BYTE* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
+                mpMetaFile->AddAction(new MetaCommentAction("XPATHSTROKE_SEQ_BEGIN", 0, static_cast< const sal_uInt8* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
                 mnSvtGraphicStrokeCount++;
             }
         }
@@ -964,7 +964,7 @@ namespace drawinglayer
                         {
                             const rtl::OUString& rURL = rFieldPrimitive.getString();
                             const String aOldString(rURL);
-                            mpMetaFile->AddAction(new MetaCommentAction(aCommentStringCommon, 0, reinterpret_cast< const BYTE* >(aOldString.GetBuffer()), 2 * aOldString.Len()));
+                            mpMetaFile->AddAction(new MetaCommentAction(aCommentStringCommon, 0, reinterpret_cast< const sal_uInt8* >(aOldString.GetBuffer()), 2 * aOldString.Len()));
                             break;
                         }
                     }
diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx
index 2358e8120917..2897eff65c3e 100644
--- a/editeng/inc/editeng/AccessibleContextBase.hxx
+++ b/editeng/inc/editeng/AccessibleContextBase.hxx
@@ -345,8 +345,8 @@ protected:
     /** Check whether or not the object has been disposed (or is in the
         state of beeing disposed).
 
-        @return sal_True, if the object is disposed or in the course
-        of being disposed. Otherwise, sal_False is returned.
+        @return TRUE, if the object is disposed or in the course
+        of being disposed. Otherwise, FALSE is returned.
     */
     sal_Bool IsDisposed (void);
 
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index 8e35f0f7d138..4847bb60d281 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -320,7 +320,7 @@ namespace accessibility
 
             @return sal_False, if the method was not able to determine the range
          */
-        sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, sal_Int32 nIndex );
+        sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex );
 
         // syntactic sugar for FireEvent
         void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const;
@@ -353,13 +353,13 @@ namespace accessibility
         // Get text from forwarder
         String GetText( sal_Int32 nIndex ) SAL_THROW((::com::sun::star::uno::RuntimeException));
         String GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((::com::sun::star::uno::RuntimeException));
-        USHORT GetTextLen() const SAL_THROW((::com::sun::star::uno::RuntimeException));
+        sal_uInt16 GetTextLen() const SAL_THROW((::com::sun::star::uno::RuntimeException));
 
         /** Get the current selection of this paragraph
 
             @return sal_False, if nothing in this paragraph is selected
          */
-        sal_Bool GetSelection( USHORT& nStartPos, USHORT& nEndPos ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+        sal_Bool GetSelection( sal_uInt16& nStartPos, sal_uInt16& nEndPos ) SAL_THROW((::com::sun::star::uno::RuntimeException));
 
         /** create selection from Accessible selection.
 
diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index d86cf23f274a..560772be0fa1 100644
--- a/editeng/inc/editeng/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -46,45 +46,45 @@ namespace rtl
 [Beschreibung]
 Dieses Item beschreibt die Zeilenausrichtung.
 */
-#define ADJUST_LASTBLOCK_VERSION        ((USHORT)0x0001)
+#define ADJUST_LASTBLOCK_VERSION        ((sal_uInt16)0x0001)
 
 class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
 {
-    BOOL    bLeft      : 1;
-    BOOL    bRight     : 1;
-    BOOL    bCenter    : 1;
-    BOOL    bBlock     : 1;
+    sal_Bool    bLeft      : 1;
+    sal_Bool    bRight     : 1;
+    sal_Bool    bCenter    : 1;
+    sal_Bool    bBlock     : 1;
 
     // nur aktiv, wenn bBlock
-    BOOL    bOneBlock : 1;
-    BOOL    bLastCenter : 1;
-    BOOL    bLastBlock : 1;
+    sal_Bool    bOneBlock : 1;
+    sal_Bool    bLastCenter : 1;
+    sal_Bool    bLastBlock : 1;
 
     friend SvStream& operator<<( SvStream&, SvxAdjustItem& ); //$ ostream
 public:
     TYPEINFO();
 
     SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/,
-                   const USHORT nId );
+                   const sal_uInt16 nId );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual USHORT           GetValueCount() const;
-    virtual String           GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT           GetEnumValue() const;
-    virtual void             SetEnumValue( USHORT nNewVal );
+    virtual sal_uInt16           GetValueCount() const;
+    virtual String           GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16           GetEnumValue() const;
+    virtual void             SetEnumValue( sal_uInt16 nNewVal );
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nFileVersion ) const;
 
     inline void SetOneWord( const SvxAdjust eType )
     {
diff --git a/editeng/inc/editeng/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx
index e574c61207c1..4c12759c6c8f 100644
--- a/editeng/inc/editeng/akrnitem.hxx
+++ b/editeng/inc/editeng/akrnitem.hxx
@@ -50,13 +50,13 @@ class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxAutoKernItem( const BOOL bAutoKern /*= FALSE*/,
-                     const USHORT nId );
+    SvxAutoKernItem( const sal_Bool bAutoKern /*= sal_False*/,
+                     const sal_uInt16 nId );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx
index f1160c42b67d..c3df2d2ab9db 100644
--- a/editeng/inc/editeng/blnkitem.hxx
+++ b/editeng/inc/editeng/blnkitem.hxx
@@ -51,12 +51,12 @@ class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxBlinkItem( const BOOL bBlink /*= FALSE*/, const USHORT nId  );
+    SvxBlinkItem( const sal_Bool bBlink /*= sal_False*/, const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index e932434e2a23..14d05b105ccb 100644
--- a/editeng/inc/editeng/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.hxx
@@ -51,13 +51,13 @@ class EDITENG_DLLPUBLIC SvxLineItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxLineItem( const USHORT nId );
+    SvxLineItem( const sal_uInt16 nId );
     SvxLineItem( const SvxLineItem& rCpy );
     ~SvxLineItem();
     SvxLineItem &operator=( const SvxLineItem& rLine );
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,8 +65,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
 
diff --git a/editeng/inc/editeng/borderline.hxx b/editeng/inc/editeng/borderline.hxx
index 10d27f176d85..fdf08b693ee7 100644
--- a/editeng/inc/editeng/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -94,32 +94,32 @@ class EDITENG_DLLPUBLIC SvxBorderLine
 {
 protected:
     Color  aColor;
-    USHORT nOutWidth;
-    USHORT nInWidth;
-    USHORT nDistance;
+    sal_uInt16 nOutWidth;
+    sal_uInt16 nInWidth;
+    sal_uInt16 nDistance;
 
 public:
-    SvxBorderLine( const Color *pCol = 0, USHORT nOut = 0, USHORT nIn = 0, USHORT nDist = 0 );
+    SvxBorderLine( const Color *pCol = 0, sal_uInt16 nOut = 0, sal_uInt16 nIn = 0, sal_uInt16 nDist = 0 );
     SvxBorderLine( const SvxBorderLine& r );
 
     SvxBorderLine& operator=( const SvxBorderLine& r );
 
     const Color&    GetColor() const { return aColor; }
-    USHORT          GetOutWidth() const { return nOutWidth; }
-    USHORT          GetInWidth() const { return nInWidth; }
-    USHORT          GetDistance() const { return nDistance; }
+    sal_uInt16          GetOutWidth() const { return nOutWidth; }
+    sal_uInt16          GetInWidth() const { return nInWidth; }
+    sal_uInt16          GetDistance() const { return nDistance; }
 
     void            SetColor( const Color &rColor ) { aColor = rColor; }
-    void            SetOutWidth( USHORT nNew ) { nOutWidth = nNew; }
-    void            SetInWidth( USHORT nNew ) { nInWidth = nNew;  }
-    void            SetDistance( USHORT nNew ) { nDistance = nNew; }
+    void            SetOutWidth( sal_uInt16 nNew ) { nOutWidth = nNew; }
+    void            SetInWidth( sal_uInt16 nNew ) { nInWidth = nNew;  }
+    void            SetDistance( sal_uInt16 nNew ) { nDistance = nNew; }
     void            ScaleMetrics( long nMult, long nDiv );
 
-    BOOL            operator==( const SvxBorderLine &rCmp ) const;
+    sal_Bool            operator==( const SvxBorderLine &rCmp ) const;
 
     String          GetValueString( SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit,
                                     const IntlWrapper* pIntl,
-                                    BOOL bMetricStr = FALSE ) const;
+                                    sal_Bool bMetricStr = sal_False ) const;
 
     bool            HasPriority( const SvxBorderLine& rOtherLine ) const;
 
diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index 4d13f7ef4dc9..283ef326c9ba 100644
--- a/editeng/inc/editeng/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -42,12 +42,12 @@ Dieses Item beschreibt ein Umrandungsattribut (alle vier Kanten und
 Abstand nach innen.
 */
 
-#define BOX_LINE_TOP    ((USHORT)0)
-#define BOX_LINE_BOTTOM ((USHORT)1)
-#define BOX_LINE_LEFT   ((USHORT)2)
-#define BOX_LINE_RIGHT  ((USHORT)3)
+#define BOX_LINE_TOP    ((sal_uInt16)0)
+#define BOX_LINE_BOTTOM ((sal_uInt16)1)
+#define BOX_LINE_LEFT   ((sal_uInt16)2)
+#define BOX_LINE_RIGHT  ((sal_uInt16)3)
 
-#define BOX_4DISTS_VERSION ((USHORT)1)
+#define BOX_4DISTS_VERSION ((sal_uInt16)1)
 
 class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
 {
@@ -55,7 +55,7 @@ class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
                    *pBottom,
                    *pLeft,
                    *pRight;
-    USHORT          nTopDist,
+    sal_uInt16          nTopDist,
                     nBottomDist,
                     nLeftDist,
                     nRightDist;
@@ -63,15 +63,15 @@ class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxBoxItem( const USHORT nId );
+    SvxBoxItem( const sal_uInt16 nId );
     SvxBoxItem( const SvxBoxItem &rCpy );
     ~SvxBoxItem();
     SvxBoxItem &operator=( const SvxBoxItem& rBox );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -79,9 +79,9 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
@@ -91,26 +91,26 @@ public:
     const   SvxBorderLine* GetLeft()   const { return pLeft; }
     const   SvxBorderLine* GetRight()  const { return pRight; }
 
-    const   SvxBorderLine* GetLine( USHORT nLine ) const;
+    const   SvxBorderLine* GetLine( sal_uInt16 nLine ) const;
 
         //Die Pointer werden kopiert!
-    void    SetLine( const SvxBorderLine* pNew, USHORT nLine );
+    void    SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine );
 
-    USHORT  GetDistance( USHORT nLine ) const;
-    USHORT  GetDistance() const;
+    sal_uInt16  GetDistance( sal_uInt16 nLine ) const;
+    sal_uInt16  GetDistance() const;
 
-    void    SetDistance( USHORT nNew, USHORT nLine );
-    inline void SetDistance( USHORT nNew );
+    void    SetDistance( sal_uInt16 nNew, sal_uInt16 nLine );
+    inline void SetDistance( sal_uInt16 nNew );
 
         //Breite der Linien plus Zwischenraum plus Abstand nach innen.
-        //JP 09.06.99: bIgnoreLine = TRUE -> Distance auch returnen, wenn
+        //JP 09.06.99: bIgnoreLine = sal_True -> Distance auch returnen, wenn
         //                          keine Line gesetzt ist
-    USHORT  CalcLineSpace( USHORT nLine, BOOL bIgnoreLine = FALSE ) const;
+    sal_uInt16  CalcLineSpace( sal_uInt16 nLine, sal_Bool bIgnoreLine = sal_False ) const;
     static com::sun::star::table::BorderLine SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert );
     static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
 };
 
-inline void SvxBoxItem::SetDistance( USHORT nNew )
+inline void SvxBoxItem::SetDistance( sal_uInt16 nNew )
 {
     nTopDist = nBottomDist = nLeftDist = nRightDist = nNew;
 }
@@ -126,8 +126,8 @@ Andererseits werden ueber dieses Attribut ggf. die BorderLines fuer die
 horizontalen und vertikalen innerern Linien transportiert.
 */
 
-#define BOXINFO_LINE_HORI   ((USHORT)0)
-#define BOXINFO_LINE_VERT   ((USHORT)1)
+#define BOXINFO_LINE_HORI   ((sal_uInt16)0)
+#define BOXINFO_LINE_VERT   ((sal_uInt16)1)
 
 #define VALID_TOP           0x01
 #define VALID_BOTTOM        0x02
@@ -156,10 +156,10 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
      Abstand von der App zum Dialog und zurueck transportiert.
     */
 
-    BOOL    bDist      :1;  // TRUE, Abstand freischalten.
-    BOOL    bMinDist   :1;  // TRUE, Abstand darf nicht unterschritten werden.
+    sal_Bool    bDist      :1;  // sal_True, Abstand freischalten.
+    sal_Bool    bMinDist   :1;  // sal_True, Abstand darf nicht unterschritten werden.
 
-    BYTE    nValidFlags;    // 0000 0000
+    sal_uInt8   nValidFlags;    // 0000 0000
                             // ³³³³ ³³³ÀÄ VALID_TOP
                             // ³³³³ ³³ÀÄÄ VALID_BOTTOM
                             // ³³³³ ³ÀÄÄÄ VALID_LEFT
@@ -169,12 +169,12 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
                             // ³ÀÄÄÄÄÄÄÄÄ VALID_DIST
                             // ÀÄÄÄÄÄÄÄÄÄ VALID_DISABLE
 
-    USHORT  nDefDist;       // Der Default- bzw. Minimalabstand.
+    sal_uInt16  nDefDist;       // Der Default- bzw. Minimalabstand.
 
 public:
     TYPEINFO();
 
-    SvxBoxInfoItem( const USHORT nId );
+    SvxBoxInfoItem( const sal_uInt16 nId );
     SvxBoxInfoItem( const SvxBoxInfoItem &rCpy );
     ~SvxBoxInfoItem();
     SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy );
@@ -185,12 +185,12 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const;
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
 
@@ -198,26 +198,26 @@ public:
     const SvxBorderLine*    GetVert() const { return pVert; }
 
     //Die Pointer werden kopiert!
-    void                    SetLine( const SvxBorderLine* pNew, USHORT nLine );
+    void                    SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine );
 
-    BOOL    IsTable() const             { return mbEnableHor && mbEnableVer; }
-    void    SetTable( BOOL bNew )       { mbEnableHor = mbEnableVer = bNew; }
+    sal_Bool    IsTable() const             { return mbEnableHor && mbEnableVer; }
+    void    SetTable( sal_Bool bNew )       { mbEnableHor = mbEnableVer = bNew; }
 
     inline bool         IsHorEnabled() const { return mbEnableHor; }
     inline void         EnableHor( bool bEnable ) { mbEnableHor = bEnable; }
     inline bool         IsVerEnabled() const { return mbEnableVer; }
     inline void         EnableVer( bool bEnable ) { mbEnableVer = bEnable; }
 
-    BOOL    IsDist() const              { return bDist; }
-    void    SetDist( BOOL bNew )        { bDist = bNew; }
-    BOOL    IsMinDist() const           { return bMinDist; }
-    void    SetMinDist( BOOL bNew )     { bMinDist = bNew; }
-    USHORT  GetDefDist() const          { return nDefDist; }
-    void    SetDefDist( USHORT nNew )   { nDefDist = nNew; }
+    sal_Bool    IsDist() const              { return bDist; }
+    void    SetDist( sal_Bool bNew )        { bDist = bNew; }
+    sal_Bool    IsMinDist() const           { return bMinDist; }
+    void    SetMinDist( sal_Bool bNew )     { bMinDist = bNew; }
+    sal_uInt16  GetDefDist() const          { return nDefDist; }
+    void    SetDefDist( sal_uInt16 nNew )   { nDefDist = nNew; }
 
-    BOOL                    IsValid( BYTE nValid ) const
+    sal_Bool                    IsValid( sal_uInt8 nValid ) const
                                 { return ( nValidFlags & nValid ) == nValid; }
-    void                    SetValid( BYTE nValid, BOOL bValid = TRUE )
+    void                    SetValid( sal_uInt8 nValid, sal_Bool bValid = sal_True )
                                 { bValid ? ( nValidFlags |= nValid )
                                          : ( nValidFlags &= ~nValid ); }
     void                    ResetFlags();
diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index 2a295b2201b4..8e039697617b 100644
--- a/editeng/inc/editeng/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -45,7 +45,7 @@ namespace rtl
     Dieses Item beschreibt ein Umbruch-Attribut
     Automatisch?, Seiten- oder Spaltenumbruch, davor oder danach?
 */
-#define FMTBREAK_NOAUTO ((USHORT)0x0001)
+#define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
 
 class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
 {
@@ -53,39 +53,39 @@ public:
     TYPEINFO();
 
     inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
-                            const USHORT nWhich );
+                            const sal_uInt16 nWhich );
     inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
     inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual String           GetValueTextByPos( USHORT nPos ) const;
+    virtual String           GetValueTextByPos( sal_uInt16 nPos ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SvStream&        Store( SvStream& , USHORT nItemVersion ) const;
-    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
-    virtual SfxPoolItem*     Create( SvStream&, USHORT ) const;
-    virtual USHORT           GetValueCount() const;
+    virtual SvStream&        Store( SvStream& , sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nFileVersion ) const;
+    virtual SfxPoolItem*     Create( SvStream&, sal_uInt16 ) const;
+    virtual sal_uInt16           GetValueCount() const;
 
     // MS VC4.0 kommt durcheinander
-    void             SetValue( USHORT nNewVal )
+    void             SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
     SvxBreak             GetBreak() const { return SvxBreak( GetValue() ); }
     void                     SetBreak( const SvxBreak eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 
 inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
-                                         const USHORT _nWhich ) :
-    SfxEnumItem( _nWhich, (USHORT)eBreak )
+                                         const sal_uInt16 _nWhich ) :
+    SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
 {}
 
 inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index 14b11b97a5e7..7802ba3e41a7 100644
--- a/editeng/inc/editeng/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -44,7 +44,7 @@ namespace rtl
     class OUString;
 }
 
-#define BRUSH_GRAPHIC_VERSION   ((USHORT)0x0001)
+#define BRUSH_GRAPHIC_VERSION   ((sal_uInt16)0x0001)
 
 enum SvxGraphicPosition
 {
@@ -66,28 +66,28 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
     String*             pStrLink;
     String*             pStrFilter;
     SvxGraphicPosition  eGraphicPos;
-    BOOL                bLoadAgain;
+    sal_Bool                bLoadAgain;
 
     void        ApplyGraphicTransparency_Impl();
     DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *);
     // wird nur von Create benutzt
     SvxBrushItem( SvStream& rStrm,
-                  USHORT nVersion, USHORT nWhich  );
+                  sal_uInt16 nVersion, sal_uInt16 nWhich  );
 
 public:
     TYPEINFO();
 
-    SvxBrushItem( USHORT nWhich );
-    SvxBrushItem( const Color& rColor, USHORT nWhich  );
+    SvxBrushItem( sal_uInt16 nWhich );
+    SvxBrushItem( const Color& rColor, sal_uInt16 nWhich  );
 
     SvxBrushItem( const Graphic& rGraphic,
-                  SvxGraphicPosition ePos, USHORT nWhich );
+                  SvxGraphicPosition ePos, sal_uInt16 nWhich );
     SvxBrushItem( const GraphicObject& rGraphicObj,
-                  SvxGraphicPosition ePos, USHORT nWhich );
+                  SvxGraphicPosition ePos, sal_uInt16 nWhich );
     SvxBrushItem( const String& rLink, const String& rFilter,
-                  SvxGraphicPosition ePos, USHORT nWhich );
+                  SvxGraphicPosition ePos, sal_uInt16 nWhich );
     SvxBrushItem( const SvxBrushItem& );
-    SvxBrushItem( const CntWallpaperItem&, USHORT nWhich );
+    SvxBrushItem( const CntWallpaperItem&, sal_uInt16 nWhich );
 
     ~SvxBrushItem();
 
@@ -99,13 +99,13 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create( SvStream&, USHORT nVersion ) const;
-    virtual SvStream&        Store( SvStream& , USHORT nItemVersion ) const;
-    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*     Create( SvStream&, sal_uInt16 nVersion ) const;
+    virtual SvStream&        Store( SvStream& , sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nFileVersion ) const;
 
     const Color&    GetColor() const                { return aColor; }
     Color&          GetColor()                      { return aColor; }
diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx
index 7d64664ea19f..494cb074872f 100644
--- a/editeng/inc/editeng/bulitem.hxx
+++ b/editeng/inc/editeng/bulitem.hxx
@@ -75,13 +75,13 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
     GraphicObject*  pGraphicObject;
     String          aPrevText;
     String          aFollowText;
-    USHORT          nStart;
-    USHORT          nStyle;
+    sal_uInt16          nStart;
+    sal_uInt16          nStyle;
     long            nWidth;
-    USHORT          nScale;
+    sal_uInt16          nScale;
     sal_Unicode     cSymbol;
-    BYTE            nJustify;
-    USHORT          nValidMask; // Nur temporaer fuer GetAttribs/SetAttribs, wegen des grossen Bullets
+    sal_uInt8            nJustify;
+    sal_uInt16          nValidMask; // Nur temporaer fuer GetAttribs/SetAttribs, wegen des grossen Bullets
 
 #ifdef _SVX_BULITEM_CXX
     void    SetDefaultFont_Impl();
@@ -91,30 +91,30 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxBulletItem( USHORT nWhich = 0 );
-    SvxBulletItem( BYTE nStyle, const Font& rFont, USHORT nStart = 0, USHORT nWhich = 0 );
-    SvxBulletItem( const Font& rFont, sal_Unicode cSymbol, USHORT nWhich=0 );
-    SvxBulletItem( const Bitmap&, USHORT nWhich = 0 );
-    SvxBulletItem( const GraphicObject&, USHORT nWhich = 0 );
-    SvxBulletItem( SvStream& rStrm, USHORT nWhich = 0 );
+    SvxBulletItem( sal_uInt16 nWhich = 0 );
+    SvxBulletItem( sal_uInt8 nStyle, const Font& rFont, sal_uInt16 nStart = 0, sal_uInt16 nWhich = 0 );
+    SvxBulletItem( const Font& rFont, sal_Unicode cSymbol, sal_uInt16 nWhich=0 );
+    SvxBulletItem( const Bitmap&, sal_uInt16 nWhich = 0 );
+    SvxBulletItem( const GraphicObject&, sal_uInt16 nWhich = 0 );
+    SvxBulletItem( SvStream& rStrm, sal_uInt16 nWhich = 0 );
     SvxBulletItem( const SvxBulletItem& );
     ~SvxBulletItem();
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream & , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream & , sal_uInt16 nItemVersion ) const;
 
     String              GetFullText() const;
     sal_Unicode         GetSymbol() const { return cSymbol; }
     String              GetPrevText() const { return aPrevText; }
     String              GetFollowText() const { return aFollowText; }
 
-    USHORT              GetStart() const { return nStart; }
+    sal_uInt16              GetStart() const { return nStart; }
     long                GetWidth() const { return nWidth; }
-    USHORT              GetStyle() const { return nStyle; }
-    BYTE                GetJustification() const { return nJustify; }
+    sal_uInt16              GetStyle() const { return nStyle; }
+    sal_uInt8                GetJustification() const { return nJustify; }
     Font                GetFont() const { return aFont; }
-    USHORT              GetScale() const { return nScale; }
+    sal_uInt16              GetScale() const { return nScale; }
 
     Bitmap              GetBitmap() const;
     void                SetBitmap( const Bitmap& rBmp );
@@ -126,14 +126,14 @@ public:
     void                SetPrevText( const String& rStr) { aPrevText = rStr;}
     void                SetFollowText(const String& rStr) { aFollowText=rStr;}
 
-    void                SetStart( USHORT nNew ) { nStart = nNew; }
+    void                SetStart( sal_uInt16 nNew ) { nStart = nNew; }
     void                SetWidth( long nNew ) { nWidth = nNew; }
-    void                SetStyle( USHORT nNew ) { nStyle = nNew; }
-    void                SetJustification( BYTE nNew ) { nJustify = nNew; }
+    void                SetStyle( sal_uInt16 nNew ) { nStyle = nNew; }
+    void                SetJustification( sal_uInt8 nNew ) { nJustify = nNew; }
     void                SetFont( const Font& rNew) { aFont = rNew; }
-    void                SetScale( USHORT nNew ) { nScale = nNew; }
+    void                SetScale( sal_uInt16 nNew ) { nScale = nNew; }
 
-    virtual USHORT      GetVersion(USHORT nFileVersion) const;
+    virtual sal_uInt16      GetVersion(sal_uInt16 nFileVersion) const;
     virtual int         operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -141,12 +141,12 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     static void         StoreFont( SvStream&, const Font& );
-    static Font         CreateFont( SvStream&, USHORT nVer );
+    static Font         CreateFont( SvStream&, sal_uInt16 nVer );
 
-    USHORT&             GetValidMask()                  { return nValidMask;    }
-    USHORT              GetValidMask() const            { return nValidMask;    }
-    USHORT              IsValid( USHORT nFlag ) const   { return nValidMask & nFlag; }
-    void                SetValid( USHORT nFlag, BOOL bValid )
+    sal_uInt16&             GetValidMask()                  { return nValidMask;    }
+    sal_uInt16              GetValidMask() const            { return nValidMask;    }
+    sal_uInt16              IsValid( sal_uInt16 nFlag ) const   { return nValidMask & nFlag; }
+    void                SetValid( sal_uInt16 nFlag, sal_Bool bValid )
                         {
                             if ( bValid )
                                 nValidMask |= nFlag;
diff --git a/editeng/inc/editeng/charhiddenitem.hxx b/editeng/inc/editeng/charhiddenitem.hxx
index 2bffbfa2da5f..352b14b4e953 100644
--- a/editeng/inc/editeng/charhiddenitem.hxx
+++ b/editeng/inc/editeng/charhiddenitem.hxx
@@ -44,7 +44,7 @@ class EDITENG_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxCharHiddenItem( const BOOL bHidden /*= FALSE*/, const USHORT nId );
+    SvxCharHiddenItem( const sal_Bool bHidden /*= sal_False*/, const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 8fc17c60d7fc..edacdf5d2e61 100644
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -51,12 +51,12 @@ public:
                        const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-     virtual USHORT         GetValueCount() const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+     virtual sal_uInt16         GetValueCount() const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,9 +65,9 @@ public:
                                     const IntlWrapper * = 0 ) const;
 
     virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
+                                    sal_uInt8 nMemberId );
     virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+                                sal_uInt8 nMemberId ) const;
 
     inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem )
     {
diff --git a/editeng/inc/editeng/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
index 4c5aedb8cdc8..87d19d65b9e8 100644
--- a/editeng/inc/editeng/charrotateitem.hxx
+++ b/editeng/inc/editeng/charrotateitem.hxx
@@ -54,9 +54,9 @@ public:
                        const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,9 +65,9 @@ public:
                                     const IntlWrapper * = 0 ) const;
 
     virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
+                                    sal_uInt8 nMemberId );
     virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+                                sal_uInt8 nMemberId ) const;
 
     inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem )
     {
diff --git a/editeng/inc/editeng/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
index a6ccb3d3f5e5..d2b6d856ce47 100644
--- a/editeng/inc/editeng/charscaleitem.hxx
+++ b/editeng/inc/editeng/charscaleitem.hxx
@@ -51,9 +51,9 @@ public:
                             const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store( SvStream& , USHORT nItemVersion ) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store( SvStream& , sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -62,9 +62,9 @@ public:
                                     const IntlWrapper * = 0 ) const;
 
     virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
+                                    sal_uInt8 nMemberId );
     virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+                                sal_uInt8 nMemberId ) const;
 
     inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem )
     {
diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index e88792bc4e99..154f0222247e 100644
--- a/editeng/inc/editeng/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
 
     SvxCaseMapItem( const SvxCaseMap eMap /*= SVX_CASEMAP_NOT_MAPPED*/,
-                    const USHORT nId );
+                    const sal_uInt16 nId );
 
     // "pure virtual Methoden" vom SfxPoolItem + SfxEnumItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -61,13 +61,13 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetValueCount() const;
 
     // MS VC4.0 kommt durcheinander
-    void                    SetValue( USHORT nNewVal )
+    void                    SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
 
     inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap)
@@ -80,9 +80,9 @@ public:
     SvxCaseMap              GetCaseMap() const
                                 { return (SvxCaseMap)GetValue(); }
     void                    SetCaseMap( SvxCaseMap eNew )
-                                { SetValue( (USHORT)eNew ); }
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+                                { SetValue( (sal_uInt16)eNew ); }
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/editeng/inc/editeng/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx
index 9a5bedaf810a..b367bd401316 100644
--- a/editeng/inc/editeng/cntritem.hxx
+++ b/editeng/inc/editeng/cntritem.hxx
@@ -44,13 +44,13 @@ class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxContourItem( const BOOL bContoured /*= FALSE*/,
-                    const USHORT nId );
+    SvxContourItem( const sal_Bool bContoured /*= sal_False*/,
+                    const sal_uInt16 nId );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/colritem.hxx b/editeng/inc/editeng/colritem.hxx
index 1eec9e48817d..e9e3f47ae9b4 100644
--- a/editeng/inc/editeng/colritem.hxx
+++ b/editeng/inc/editeng/colritem.hxx
@@ -56,17 +56,17 @@ private:
 public:
     TYPEINFO();
 
-    SvxColorItem( const USHORT nId );
-    SvxColorItem( const Color& aColor, const USHORT nId  );
-    SvxColorItem( SvStream& rStrm, const USHORT nId  );
+    SvxColorItem( const sal_uInt16 nId );
+    SvxColorItem( const Color& aColor, const sal_uInt16 nId  );
+    SvxColorItem( SvStream& rStrm, const sal_uInt16 nId  );
     SvxColorItem( const SvxColorItem& rCopy );
     ~SvxColorItem();
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -74,8 +74,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     inline SvxColorItem& operator=(const SvxColorItem& rColor)
     {
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index d713ae209b6a..077de1582069 100644
--- a/editeng/inc/editeng/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
 
     SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/,
-                       const USHORT nId  );
+                       const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -61,20 +61,20 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetValueCount() const;
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     // MS VC4.0 kommt durcheinander
-    void                    SetValue( USHORT nNewVal )
+    void                    SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
 
     virtual int             HasBoolValue() const;
-    virtual BOOL            GetBoolValue() const;
-    virtual void            SetBoolValue( BOOL bVal );
+    virtual sal_Bool            GetBoolValue() const;
+    virtual void            SetBoolValue( sal_Bool bVal );
 
     inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross)
         {
@@ -86,7 +86,7 @@ public:
     FontStrikeout           GetStrikeout() const
                                 { return (FontStrikeout)GetValue(); }
     void                    SetStrikeout( FontStrikeout eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 #endif // #ifndef _SVX_CRSDITEM_HXX
diff --git a/editeng/inc/editeng/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx
index f9e990af118a..f1897ef0986c 100644
--- a/editeng/inc/editeng/cscoitem.hxx
+++ b/editeng/inc/editeng/cscoitem.hxx
@@ -46,9 +46,9 @@ class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
 public:
     TYPEINFO();
 
-    SvxCharSetColorItem( const USHORT nId  );
+    SvxCharSetColorItem( const sal_uInt16 nId  );
     SvxCharSetColorItem( const Color& aColor, const rtl_TextEncoding eFrom,
-                     const USHORT nId  );
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -57,8 +57,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     inline rtl_TextEncoding&    GetCharSet() { return eFrom; }
     inline rtl_TextEncoding     GetCharSet() const { return eFrom; }
diff --git a/editeng/inc/editeng/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index f541d64536d8..993ee7b73c4a 100644
--- a/editeng/inc/editeng/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -109,7 +109,7 @@ class SfxStyleSheet;
 
 struct EPosition
 {
-    USHORT      nPara;
+    sal_uInt16      nPara;
     xub_StrLen  nIndex;
 
     EPosition() :
@@ -118,7 +118,7 @@ struct EPosition
     {
     }
 
-    EPosition( USHORT nPara_, xub_StrLen nPos_ ) :
+    EPosition( sal_uInt16 nPara_, xub_StrLen nPos_ ) :
         nPara( nPara_ ),
         nIndex( nPos_ )
     {
@@ -127,14 +127,14 @@ struct EPosition
 
 struct ESelection
 {
-    USHORT      nStartPara;
+    sal_uInt16      nStartPara;
     xub_StrLen  nStartPos;
-    USHORT      nEndPara;
+    sal_uInt16      nEndPara;
     xub_StrLen  nEndPos;
 
     ESelection() : nStartPara( 0 ), nStartPos( 0 ), nEndPara( 0 ), nEndPos( 0 ) {}
 
-    ESelection( USHORT nStPara, xub_StrLen nStPos, USHORT nEPara, xub_StrLen nEPos ) :
+    ESelection( sal_uInt16 nStPara, xub_StrLen nStPos, sal_uInt16 nEPara, xub_StrLen nEPos ) :
         nStartPara( nStPara ),
         nStartPos( nStPos ),
         nEndPara( nEPara ),
@@ -142,7 +142,7 @@ struct ESelection
     {
     }
 
-    ESelection( USHORT nPara, xub_StrLen nPos ) :
+    ESelection( sal_uInt16 nPara, xub_StrLen nPos ) :
         nStartPara( nPara ),
         nStartPos( nPos ),
         nEndPara( nPara ),
@@ -151,14 +151,14 @@ struct ESelection
     }
 
     void    Adjust();
-    BOOL    IsEqual( const ESelection& rS ) const;
-    BOOL    IsLess( const ESelection& rS ) const;
-    BOOL    IsGreater( const ESelection& rS ) const;
-    BOOL    IsZero() const;
-    BOOL    HasRange() const;
+    sal_Bool    IsEqual( const ESelection& rS ) const;
+    sal_Bool    IsLess( const ESelection& rS ) const;
+    sal_Bool    IsGreater( const ESelection& rS ) const;
+    sal_Bool    IsZero() const;
+    sal_Bool    HasRange() const;
 };
 
-inline BOOL ESelection::HasRange() const
+inline sal_Bool ESelection::HasRange() const
 {
     return ( nStartPara != nEndPara ) || ( nStartPos != nEndPos );
 }
@@ -224,7 +224,7 @@ struct EDITENG_DLLPUBLIC EFieldInfo
     EPosition       aPosition;
 
     EFieldInfo();
-    EFieldInfo( const SvxFieldItem& rFieldItem, USHORT nPara, USHORT nPos );
+    EFieldInfo( const SvxFieldItem& rFieldItem, sal_uInt16 nPara, sal_uInt16 nPos );
     ~EFieldInfo();
 
     EFieldInfo( const EFieldInfo& );
@@ -282,24 +282,24 @@ struct ParagraphInfos
         , nFirstLineMaxAscent( 0 )
         , bValid( 0 )
         {}
-    USHORT  nParaHeight;
-    USHORT  nLines;
+    sal_uInt16  nParaHeight;
+    sal_uInt16  nLines;
 
-    USHORT  nFirstLineStartX;
+    sal_uInt16  nFirstLineStartX;
 
-    USHORT  nFirstLineOffset;
-    USHORT  nFirstLineHeight;
-    USHORT  nFirstLineTextHeight;
-    USHORT  nFirstLineMaxAscent;
+    sal_uInt16  nFirstLineOffset;
+    sal_uInt16  nFirstLineHeight;
+    sal_uInt16  nFirstLineTextHeight;
+    sal_uInt16  nFirstLineMaxAscent;
 
-    BOOL    bValid; // Bei einer Abfrage waehrend der Formatierung ungueltig!
+    sal_Bool    bValid; // Bei einer Abfrage waehrend der Formatierung ungueltig!
 };
 
 struct EECharAttrib
 {
     const SfxPoolItem*  pAttr;
 
-    USHORT              nPara;
+    sal_uInt16              nPara;
     xub_StrLen          nStart;
     xub_StrLen          nEnd;
 };
@@ -308,11 +308,11 @@ SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, EDITENG_DLLPUB
 
 struct MoveParagraphsInfo
 {
-    USHORT  nStartPara;
-    USHORT  nEndPara;
-    USHORT  nDestPara;
+    sal_uInt16  nStartPara;
+    sal_uInt16  nEndPara;
+    sal_uInt16  nDestPara;
 
-    MoveParagraphsInfo( USHORT nS, USHORT nE, USHORT nD )
+    MoveParagraphsInfo( sal_uInt16 nS, sal_uInt16 nE, sal_uInt16 nD )
         { nStartPara = nS; nEndPara = nE; nDestPara = nD; }
 };
 
@@ -321,9 +321,9 @@ struct MoveParagraphsInfo
 
 struct PasteOrDropInfos
 {
-    USHORT  nAction;
-    USHORT  nStartPara;
-    USHORT  nEndPara;
+    sal_uInt16  nAction;
+    sal_uInt16  nStartPara;
+    sal_uInt16  nEndPara;
 
     PasteOrDropInfos() : nAction(0), nStartPara(0xFFFF), nEndPara(0xFFFF)  {}
 };
@@ -376,10 +376,10 @@ struct EENotify
     EditEngine*     pEditEngine;
     EditView*       pEditView;
 
-    USHORT          nParagraph; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED
+    sal_uInt16          nParagraph; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED
 
-    USHORT          nParam1;
-    USHORT          nParam2;
+    sal_uInt16          nParam1;
+    sal_uInt16          nParam2;
 
     EENotify( EENotifyType eType )
         { eNotificationType = eType; pEditEngine = NULL; pEditView = NULL; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; }
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 642c290f4853..d046b77d98b3 100755
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -126,7 +126,7 @@ private:
     EDITENG_DLLPRIVATE EditEngine&      operator=( const EditEngine& );
 
 //#if 0 // _SOLAR__PRIVATE
-    EDITENG_DLLPRIVATE BOOL             PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
+    EDITENG_DLLPRIVATE sal_Bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
 //#endif
 
 protected:
@@ -138,8 +138,8 @@ public:
 
     const SfxItemSet&   GetEmptyItemSet();
 
-    void            SetDefTab( USHORT nDefTab );
-    USHORT          GetDefTab() const;
+    void            SetDefTab( sal_uInt16 nDefTab );
+    sal_uInt16          GetDefTab() const;
 
     void            SetRefDevice( OutputDevice* pRefDef );
     OutputDevice*   GetRefDevice() const;
@@ -147,51 +147,51 @@ public:
     void            SetRefMapMode( const MapMode& rMapMode );
     MapMode         GetRefMapMode();
 
-    void            SetUpdateMode( BOOL bUpdate );
-    BOOL            GetUpdateMode() const;
+    void            SetUpdateMode( sal_Bool bUpdate );
+    sal_Bool            GetUpdateMode() const;
 
     void            SetBackgroundColor( const Color& rColor );
     Color           GetBackgroundColor() const;
     Color           GetAutoColor() const;
-    void            EnableAutoColor( BOOL b );
-    BOOL            IsAutoColorEnabled() const;
-    void            ForceAutoColor( BOOL b );
-    BOOL            IsForceAutoColor() const;
+    void            EnableAutoColor( sal_Bool b );
+    sal_Bool            IsAutoColorEnabled() const;
+    void            ForceAutoColor( sal_Bool b );
+    sal_Bool            IsForceAutoColor() const;
 
-    void            InsertView( EditView* pEditView, USHORT nIndex = EE_APPEND );
+    void            InsertView( EditView* pEditView, sal_uInt16 nIndex = EE_APPEND );
     EditView*       RemoveView( EditView* pEditView );
-    EditView*       RemoveView( USHORT nIndex = EE_APPEND );
-    EditView*       GetView( USHORT nIndex = 0 ) const;
-    USHORT          GetViewCount() const;
-    BOOL            HasView( EditView* pView ) const;
+    EditView*       RemoveView( sal_uInt16 nIndex = EE_APPEND );
+    EditView*       GetView( sal_uInt16 nIndex = 0 ) const;
+    sal_uInt16          GetViewCount() const;
+    sal_Bool            HasView( EditView* pView ) const;
     EditView*       GetActiveView() const;
     void            SetActiveView( EditView* pView );
 
     void            SetPaperSize( const Size& rSize );
     const Size&     GetPaperSize() const;
 
-    void            SetVertical( BOOL bVertical );
-    BOOL            IsVertical() const;
+    void            SetVertical( sal_Bool bVertical );
+    sal_Bool            IsVertical() const;
 
-    void            SetFixedCellHeight( BOOL bUseFixedCellHeight );
-    BOOL            IsFixedCellHeight() const;
+    void            SetFixedCellHeight( sal_Bool bUseFixedCellHeight );
+    sal_Bool            IsFixedCellHeight() const;
 
     void                        SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir );
     EEHorizontalTextDirection   GetDefaultHorizontalTextDirection() const;
 
-    USHORT          GetScriptType( const ESelection& rSelection ) const;
-    LanguageType    GetLanguage( USHORT nPara, USHORT nPos ) const;
+    sal_uInt16          GetScriptType( const ESelection& rSelection ) const;
+    LanguageType    GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const;
 
     void            TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode );
 
-    void            SetAsianCompressionMode( USHORT nCompression );
-    USHORT          GetAsianCompressionMode() const;
+    void            SetAsianCompressionMode( sal_uInt16 nCompression );
+    sal_uInt16          GetAsianCompressionMode() const;
 
-    void            SetKernAsianPunctuation( BOOL bEnabled );
-    BOOL            IsKernAsianPunctuation() const;
+    void            SetKernAsianPunctuation( sal_Bool bEnabled );
+    sal_Bool            IsKernAsianPunctuation() const;
 
-    void            SetAddExtLeading( BOOL b );
-    BOOL            IsAddExtLeading() const;
+    void            SetAddExtLeading( sal_Bool b );
+    sal_Bool            IsAddExtLeading() const;
 
     void                SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon );
     void                SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon);
@@ -210,107 +210,107 @@ public:
     sal_uInt32      GetTextHeight() const;
     sal_uInt32      CalcTextWidth();
 
-    String          GetText( USHORT nParagraph ) const;
-    xub_StrLen      GetTextLen( USHORT nParagraph ) const;
-    sal_uInt32      GetTextHeight( USHORT nParagraph ) const;
+    String          GetText( sal_uInt16 nParagraph ) const;
+    xub_StrLen      GetTextLen( sal_uInt16 nParagraph ) const;
+    sal_uInt32      GetTextHeight( sal_uInt16 nParagraph ) const;
 
-    USHORT          GetParagraphCount() const;
+    sal_uInt16          GetParagraphCount() const;
 
-    USHORT          GetLineCount( USHORT nParagraph ) const;
-    xub_StrLen      GetLineLen( USHORT nParagraph, USHORT nLine ) const;
-    void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
-    sal_uInt32      GetLineHeight( USHORT nParagraph, USHORT nLine = 0 );
-    USHORT          GetFirstLineOffset( USHORT nParagraph );
-    ParagraphInfos  GetParagraphInfos( USHORT nPara );
-    USHORT          FindParagraph( long nDocPosY );
+    sal_uInt16          GetLineCount( sal_uInt16 nParagraph ) const;
+    xub_StrLen      GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    sal_uInt32      GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine = 0 );
+    sal_uInt16          GetFirstLineOffset( sal_uInt16 nParagraph );
+    ParagraphInfos  GetParagraphInfos( sal_uInt16 nPara );
+    sal_uInt16          FindParagraph( long nDocPosY );
     EPosition       FindDocPosition( const Point& rDocPos ) const;
     Rectangle       GetCharacterBounds( const EPosition& rPos ) const;
 
-    String          GetWord( USHORT nPara, xub_StrLen nIndex );
+    String          GetWord( sal_uInt16 nPara, xub_StrLen nIndex );
 
-    ESelection      GetWord( const ESelection& rSelection, USHORT nWordType ) const;
-    ESelection      WordLeft( const ESelection& rSelection, USHORT nWordType  ) const;
-    ESelection      WordRight( const ESelection& rSelection, USHORT nWordType  ) const;
-    ESelection      CursorLeft( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const;
-    ESelection      CursorRight( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const;
+    ESelection      GetWord( const ESelection& rSelection, sal_uInt16 nWordType ) const;
+    ESelection      WordLeft( const ESelection& rSelection, sal_uInt16 nWordType  ) const;
+    ESelection      WordRight( const ESelection& rSelection, sal_uInt16 nWordType  ) const;
+    ESelection      CursorLeft( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const;
+    ESelection      CursorRight( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const;
     ESelection      SelectSentence( const ESelection& rCurSel ) const;
 
     void            Clear();
     void            SetText( const String& rStr );
 
     EditTextObject* CreateTextObject();
-    EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 );
+    EditTextObject* CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas = 1 );
     EditTextObject* CreateTextObject( const ESelection& rESelection );
     void            SetText( const EditTextObject& rTextObject );
 
-    void            RemoveParagraph( USHORT nPara );
-    void            InsertParagraph( USHORT nPara, const EditTextObject& rTxtObj );
-    void            InsertParagraph( USHORT nPara, const String& rText);
+    void            RemoveParagraph( sal_uInt16 nPara );
+    void            InsertParagraph( sal_uInt16 nPara, const EditTextObject& rTxtObj );
+    void            InsertParagraph( sal_uInt16 nPara, const String& rText);
 
-    void            SetText( USHORT nPara, const EditTextObject& rTxtObj );
-    void            SetText( USHORT nPara, const String& rText);
+    void            SetText( sal_uInt16 nPara, const EditTextObject& rTxtObj );
+    void            SetText( sal_uInt16 nPara, const String& rText);
 
-    virtual void                SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
-    virtual const SfxItemSet&   GetParaAttribs( USHORT nPara ) const;
+    virtual void                SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
+    virtual const SfxItemSet&   GetParaAttribs( sal_uInt16 nPara ) const;
 
-    void                GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const;
+    void                GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
 
-    SfxItemSet          GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags = 0xFF ) const;
-    SfxItemSet          GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All );
+    SfxItemSet          GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags = 0xFF ) const;
+    SfxItemSet          GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All );
 
-    BOOL                HasParaAttrib( USHORT nPara, USHORT nWhich ) const;
-    const SfxPoolItem&  GetParaAttrib( USHORT nPara, USHORT nWhich );
+    sal_Bool                HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
+    const SfxPoolItem&  GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich );
 
-    Font            GetStandardFont( USHORT nPara );
-    SvxFont         GetStandardSvxFont( USHORT nPara );
+    Font            GetStandardFont( sal_uInt16 nPara );
+    SvxFont         GetStandardSvxFont( sal_uInt16 nPara );
 
     void            RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
 
-    void            ShowParagraph( USHORT nParagraph, BOOL bShow = TRUE );
-    BOOL            IsParagraphVisible( USHORT nParagraph );
+    void            ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow = sal_True );
+    sal_Bool            IsParagraphVisible( sal_uInt16 nParagraph );
 
     ::svl::IUndoManager&
                     GetUndoManager();
-    void            UndoActionStart( USHORT nId );
-    void            UndoActionEnd( USHORT nId );
-    BOOL            IsInUndo();
+    void            UndoActionStart( sal_uInt16 nId );
+    void            UndoActionEnd( sal_uInt16 nId );
+    sal_Bool        IsInUndo();
 
-    void            EnableUndo( BOOL bEnable );
-    BOOL            IsUndoEnabled();
+    void            EnableUndo( sal_Bool bEnable );
+    sal_Bool            IsUndoEnabled();
 
     /** returns the value last used for bTryMerge while calling ImpEditEngine::InsertUndo
         This is currently used in a bad but needed hack to get undo actions merged in the
         OutlineView in impress. Do not use it unless you want to sell your soul too! */
-    BOOL            HasTriedMergeOnLastAddUndo() const;
+    sal_Bool            HasTriedMergeOnLastAddUndo() const;
 
     void            ClearModifyFlag();
     void            SetModified();
-    BOOL            IsModified() const;
+    sal_Bool            IsModified() const;
 
     void            SetModifyHdl( const Link& rLink );
     Link            GetModifyHdl() const;
 
-    BOOL            IsInSelectionMode() const;
+    sal_Bool            IsInSelectionMode() const;
     void            StopSelectionMode();
 
     void            StripPortions();
-    void            GetPortions( USHORT nPara, SvUShorts& rList );
+    void            GetPortions( sal_uInt16 nPara, SvUShorts& rList );
 
-    long            GetFirstLineStartX( USHORT nParagraph );
-    Point           GetDocPosTopLeft( USHORT nParagraph );
+    long            GetFirstLineStartX( sal_uInt16 nParagraph );
+    Point           GetDocPosTopLeft( sal_uInt16 nParagraph );
     Point           GetDocPos( const Point& rPaperPos ) const;
-    BOOL            IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 );
+    sal_Bool            IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 );
 
     // StartDocPos entspr. VisArea.TopLeft().
     void            Draw( OutputDevice* pOutDev, const Rectangle& rOutRect );
     void            Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos );
-    void            Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, BOOL bClip );
+    void            Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, sal_Bool bClip );
     void            Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
 
-//  ULONG: Fehlercode des Streams.
-    ULONG           Read( SvStream& rInput, const String& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
-    ULONG           Write( SvStream& rOutput, EETextFormat );
+//  sal_uInt32: Fehlercode des Streams.
+        sal_uLong               Read( SvStream& rInput, const String& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+    sal_uLong       Write( SvStream& rOutput, EETextFormat );
 
     void            SetStatusEventHdl( const Link& rLink );
     Link            GetStatusEventHdl() const;
@@ -322,25 +322,25 @@ public:
     Link            GetImportHdl() const;
 
     // Flat-Mode: Keine Zeichenformatierung auswerten => Fuer Outliner
-    BOOL            IsFlatMode() const;
-    void            SetFlatMode( BOOL bFlat );
+    sal_Bool            IsFlatMode() const;
+    void            SetFlatMode( sal_Bool bFlat );
 
     void            SetControlWord( sal_uInt32 nWord );
     sal_uInt32      GetControlWord() const;
 
     void            QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
-    void            QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
+    void            QuickRemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0 );
     void            QuickMarkInvalid( const ESelection& rSel );
-    void            QuickFormatDoc( BOOL bFull = FALSE );
+    void            QuickFormatDoc( sal_Bool bFull = sal_False );
     void            QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
     void            QuickInsertLineBreak( const ESelection& rSel );
     void            QuickInsertText( const String& rText, const ESelection& rSel );
     void            QuickDelete( const ESelection& rSel );
-    void            QuickMarkToBeRepainted( USHORT nPara );
+    void            QuickMarkToBeRepainted( sal_uInt16 nPara );
 
-    void            SetGlobalCharStretching( USHORT nX = 100, USHORT nY = 100 );
-    void            GetGlobalCharStretching( USHORT& rX, USHORT& rY );
-    void            DoStretchChars( USHORT nX, USHORT nY );
+    void            SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 );
+    void            GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY );
+    void            DoStretchChars( sal_uInt16 nX, sal_uInt16 nY );
 
     void            SetEditTextObjectPool( SfxItemPool* pPool );
     SfxItemPool*    GetEditTextObjectPool() const;
@@ -348,8 +348,8 @@ public:
     void                SetStyleSheetPool( SfxStyleSheetPool* pSPool );
     SfxStyleSheetPool*  GetStyleSheetPool();
 
-    void                SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle );
-    SfxStyleSheet*      GetStyleSheet( USHORT nPara ) const;
+    void                SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle );
+    SfxStyleSheet*      GetStyleSheet( sal_uInt16 nPara ) const;
 
     void            SetWordDelimiters( const String& rDelimiters );
     String          GetWordDelimiters() const;
@@ -357,11 +357,11 @@ public:
     void            SetGroupChars( const String& rChars );
     String          GetGroupChars() const;
 
-    void            EnablePasteSpecial( BOOL bEnable );
-    BOOL            IsPasteSpecialEnabled() const;
+    void            EnablePasteSpecial( sal_Bool bEnable );
+    sal_Bool            IsPasteSpecialEnabled() const;
 
-    void            EnableIdleFormatter( BOOL bEnable );
-    BOOL            IsIdleFormatterEnabled() const;
+    void            EnableIdleFormatter( sal_Bool bEnable );
+    sal_Bool            IsIdleFormatterEnabled() const;
 
     void            EraseVirtualDevice();
 
@@ -382,16 +382,16 @@ public:
     void            SetDefaultLanguage( LanguageType eLang );
     LanguageType    GetDefaultLanguage() const;
 
-    BOOL            HasOnlineSpellErrors() const;
+    sal_Bool            HasOnlineSpellErrors() const;
     void            CompleteOnlineSpelling();
 
-    void            SetBigTextObjectStart( USHORT nStartAtPortionCount );
-    USHORT          GetBigTextObjectStart() const;
-    BOOL            ShouldCreateBigTextObject() const;
+    void            SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount );
+    sal_uInt16          GetBigTextObjectStart() const;
+    sal_Bool            ShouldCreateBigTextObject() const;
 
     // Zum schnellen Vorab-Pruefen ohne View:
     EESpellState    HasSpellErrors();
-    BOOL            HasText( const SvxSearchItem& rSearchItem );
+    sal_Bool            HasText( const SvxSearchItem& rSearchItem );
 
     //initialize sentence spelling
     void            StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc);
@@ -406,15 +406,15 @@ public:
 
     // for text conversion (see also HasSpellErrors)
     sal_Bool        HasConvertibleTextPortion( LanguageType nLang );
-    virtual BOOL    ConvertNextDocument();
+    virtual sal_Bool    ConvertNextDocument();
 
-    BOOL            UpdateFields();
-    void            RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL );
+    sal_Bool            UpdateFields();
+    void            RemoveFields( sal_Bool bKeepFieldText, TypeId aType = NULL );
 
-    USHORT          GetFieldCount( USHORT nPara ) const;
-    EFieldInfo      GetFieldInfo( USHORT nPara, USHORT nField ) const;
+    sal_uInt16          GetFieldCount( sal_uInt16 nPara ) const;
+    EFieldInfo      GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
 
-    BOOL            IsRightToLeft( USHORT nPara ) const;
+    sal_Bool            IsRightToLeft( sal_uInt16 nPara ) const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
                     CreateTransferable( const ESelection& rSelection ) const;
@@ -425,18 +425,18 @@ public:
     void            SetBeginPasteOrDropHdl( const Link& rLink );
     void            SetEndPasteOrDropHdl( const Link& rLink );
 
-    virtual void    PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
-    virtual void    ParagraphInserted( USHORT nNewParagraph );
-    virtual void    ParagraphDeleted( USHORT nDeletedParagraph );
-    virtual void    ParagraphConnected( USHORT nLeftParagraph, USHORT nRightParagraph );
-    virtual void    ParaAttribsChanged( USHORT nParagraph );
+    virtual void    PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
+    virtual void    ParagraphInserted( sal_uInt16 nNewParagraph );
+    virtual void    ParagraphDeleted( sal_uInt16 nDeletedParagraph );
+    virtual void    ParagraphConnected( sal_uInt16 nLeftParagraph, sal_uInt16 nRightParagraph );
+    virtual void    ParaAttribsChanged( sal_uInt16 nParagraph );
     virtual void    StyleSheetChanged( SfxStyleSheet* pStyle );
-    virtual void    ParagraphHeightChanged( USHORT nPara );
+    virtual void    ParagraphHeightChanged( sal_uInt16 nPara );
 
     // #101498#
     virtual void DrawingText(
-        const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray,
-        const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
+        const Point& rStartPos, const String& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray,
+        const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         bool bEndOfLine,
@@ -446,33 +446,33 @@ public:
         const Color& rOverlineColor,
         const Color& rTextLineColor);
 
-    virtual String  GetUndoComment( USHORT nUndoId ) const;
-    virtual BOOL    FormattingParagraph( USHORT nPara );
-    virtual BOOL    SpellNextDocument();
-    virtual void    FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual void    FieldSelected( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual String  CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual String  GetUndoComment( sal_uInt16 nUndoId ) const;
+    virtual sal_Bool    FormattingParagraph( sal_uInt16 nPara );
+    virtual sal_Bool    SpellNextDocument();
+    virtual void    FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual void    FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual String  CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
 
     // to be overloaded if access to bullet information needs to be provided
-    virtual const SvxNumberFormat * GetNumberFormat( USHORT nPara ) const;
+    virtual const SvxNumberFormat * GetNumberFormat( sal_uInt16 nPara ) const;
 
-    virtual Rectangle GetBulletArea( USHORT nPara );
+    virtual Rectangle GetBulletArea( sal_uInt16 nPara );
 
-    static SfxItemPool* CreatePool( BOOL bLoadRefCounts = TRUE );
+    static SfxItemPool* CreatePool( sal_Bool bLoadRefCounts = sal_True );
     static SfxItemPool& GetGlobalItemPool();
     static sal_uInt32   RegisterClipboardFormatName();
-    static BOOL     DoesKeyChangeText( const KeyEvent& rKeyEvent );
-    static BOOL     DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
-    static BOOL     IsSimpleCharInput( const KeyEvent& rKeyEvent );
-    static USHORT   GetAvailableSearchOptions();
+    static sal_Bool     DoesKeyChangeText( const KeyEvent& rKeyEvent );
+    static sal_Bool     DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
+    static sal_Bool     IsSimpleCharInput( const KeyEvent& rKeyEvent );
+    static sal_uInt16   GetAvailableSearchOptions();
     static void     SetFontInfoInItemSet( SfxItemSet& rItemSet, const Font& rFont );
     static void     SetFontInfoInItemSet( SfxItemSet& rItemSet, const SvxFont& rFont );
     static Font     CreateFontFromItemSet( const SfxItemSet& rItemSet );
-    static Font     CreateFontFromItemSet( const SfxItemSet& rItemSet, USHORT nScriptType );
+    static Font     CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType );
     static SvxFont  CreateSvxFontFromItemSet( const SfxItemSet& rItemSet );
-    static void     ImportBulletItem( SvxNumBulletItem& rNumBullet, USHORT nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
-    static BOOL     IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
-    static BOOL     HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
+    static void     ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
+    static sal_Bool     IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
+    static sal_Bool     HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
 
     /** sets a link that is called at the beginning of a drag operation at an edit view */
     void            SetBeginDropHdl( const Link& rLink );
@@ -483,8 +483,8 @@ public:
     Link            GetEndDropHdl() const;
 
     /// specifies if auto-correction should capitalize the first word or not (default is on)
-    void            SetFirstWordCapitalization( BOOL bCapitalize );
-    BOOL            IsFirstWordCapitalization() const;
+    void            SetFirstWordCapitalization( sal_Bool bCapitalize );
+    sal_Bool            IsFirstWordCapitalization() const;
 };
 
 #endif // _MyEDITENG_HXX
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index ef3307fe20c8..3ede397562a5 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -48,11 +48,11 @@ class EECharAttribArray;
 class EDITENG_DLLPUBLIC EditTextObject
 {
 private:
-    USHORT              nWhich;
+    sal_uInt16              nWhich;
     EDITENG_DLLPRIVATE EditTextObject&      operator=( const EditTextObject& );
 
 protected:
-                        EditTextObject( USHORT nWhich );
+                        EditTextObject( sal_uInt16 nWhich );
                         EditTextObject( const EditTextObject& r );
 
     virtual void        StoreData( SvStream& rOStream ) const;
@@ -61,59 +61,59 @@ protected:
 public:
     virtual             ~EditTextObject();
 
-    USHORT              Which() const { return nWhich; }
+    sal_uInt16              Which() const { return nWhich; }
 
-    virtual USHORT      GetUserType() const;    // Fuer OutlinerMode, der kann das aber nicht kompatibel speichern
-    virtual void        SetUserType( USHORT n );
+    virtual sal_uInt16      GetUserType() const;    // Fuer OutlinerMode, der kann das aber nicht kompatibel speichern
+    virtual void        SetUserType( sal_uInt16 n );
 
-    virtual ULONG       GetObjectSettings() const;
-    virtual void        SetObjectSettings( ULONG n );
+    virtual sal_uLong       GetObjectSettings() const;
+    virtual void        SetObjectSettings( sal_uLong n );
 
-    virtual BOOL        IsVertical() const;
-    virtual void        SetVertical( BOOL bVertical );
+    virtual sal_Bool        IsVertical() const;
+    virtual void        SetVertical( sal_Bool bVertical );
 
-    virtual USHORT      GetScriptType() const;
+    virtual sal_uInt16      GetScriptType() const;
 
-    virtual USHORT      GetVersion() const; // Solange der Outliner keine Recordlaenge speichert
+    virtual sal_uInt16      GetVersion() const; // Solange der Outliner keine Recordlaenge speichert
 
     virtual EditTextObject* Clone() const = 0;
 
-    BOOL                    Store( SvStream& rOStream ) const;
+    sal_Bool                    Store( SvStream& rOStream ) const;
     static EditTextObject*  Create( SvStream& rIStream,
                                 SfxItemPool* pGlobalTextObjectPool = 0 );
     void                    Skip( SvStream& rIStream );
 
-    virtual USHORT      GetParagraphCount() const;
+    virtual sal_uInt16      GetParagraphCount() const;
 
-    virtual XubString   GetText( USHORT nParagraph ) const;
-    virtual void        Insert( const EditTextObject& rObj, USHORT nPara );
-    virtual void        RemoveParagraph( USHORT nPara );
-    virtual EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 ) const;
+    virtual XubString   GetText( sal_uInt16 nParagraph ) const;
+    virtual void        Insert( const EditTextObject& rObj, sal_uInt16 nPara );
+    virtual void        RemoveParagraph( sal_uInt16 nPara );
+    virtual EditTextObject* CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas = 1 ) const;
 
-    virtual BOOL        HasPortionInfo() const;
+    virtual sal_Bool        HasPortionInfo() const;
     virtual void        ClearPortionInfo();
 
-    virtual BOOL        HasOnlineSpellErrors() const;
+    virtual sal_Bool        HasOnlineSpellErrors() const;
 
-    virtual BOOL        HasCharAttribs( USHORT nWhich = 0 ) const;
-    virtual void        GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const;
+    virtual sal_Bool        HasCharAttribs( sal_uInt16 nWhich = 0 ) const;
+    virtual void        GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
 
-    virtual BOOL        RemoveCharAttribs( USHORT nWhich = 0 );
-    virtual BOOL        RemoveParaAttribs( USHORT nWhich = 0 );
+    virtual sal_Bool        RemoveCharAttribs( sal_uInt16 nWhich = 0 );
+    virtual sal_Bool        RemoveParaAttribs( sal_uInt16 nWhich = 0 );
 
-    virtual void        MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart = EE_CHAR_START, USHORT nEnd = EE_CHAR_END );
+    virtual void        MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart = EE_CHAR_START, sal_uInt16 nEnd = EE_CHAR_END );
 
-    virtual BOOL        IsFieldObject() const;
+    virtual sal_Bool        IsFieldObject() const;
     virtual const SvxFieldItem* GetField() const;
-    virtual BOOL        HasField( TypeId aType = NULL ) const;
+    virtual sal_Bool        HasField( TypeId aType = NULL ) const;
 
-    virtual SfxItemSet  GetParaAttribs( USHORT nPara ) const;
-    virtual void        SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs );
+    virtual SfxItemSet  GetParaAttribs( sal_uInt16 nPara ) const;
+    virtual void        SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rAttribs );
 
-    virtual BOOL        HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
-    virtual void        GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
-    virtual void        SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily );
-    virtual BOOL        ChangeStyleSheets(  const XubString& rOldName, SfxStyleFamily eOldFamily,
+    virtual sal_Bool        HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
+    virtual void        GetStyleSheet( sal_uInt16 nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
+    virtual void        SetStyleSheet( sal_uInt16 nPara, const XubString& rName, const SfxStyleFamily& eFamily );
+    virtual sal_Bool        ChangeStyleSheets(  const XubString& rOldName, SfxStyleFamily eOldFamily,
                                             const XubString& rNewName, SfxStyleFamily eNewFamily );
     virtual void        ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName );
 
diff --git a/editeng/inc/editeng/editstat.hxx b/editeng/inc/editeng/editstat.hxx
index 8db48c63f72c..6c9373c1638d 100644
--- a/editeng/inc/editeng/editstat.hxx
+++ b/editeng/inc/editeng/editstat.hxx
@@ -88,7 +88,7 @@
     EE_STAT_CRSRLEFTPARA zur Zeit bei Cursorbewegungen und Return.
 */
 
-inline void SetFlags( ULONG& rBits, const ULONG nMask, FASTBOOL bOn )
+inline void SetFlags( sal_uLong& rBits, const sal_uInt32 nMask, sal_Bool bOn )
 {
     if ( bOn )
         rBits |= nMask;
@@ -99,25 +99,25 @@ inline void SetFlags( ULONG& rBits, const ULONG nMask, FASTBOOL bOn )
 class EditStatus
 {
 protected:
-    ULONG   nStatusBits;
-    ULONG   nControlBits;
-    USHORT  nPrevPara;                  // fuer EE_STAT_CRSRLEFTPARA
+    sal_uLong   nStatusBits;
+    sal_uLong   nControlBits;
+    sal_uInt16  nPrevPara;                  // fuer EE_STAT_CRSRLEFTPARA
 
 public:
             EditStatus()                { nStatusBits = 0; nControlBits = 0; nPrevPara = 0xFFFF; }
 
     void    Clear()                     { nStatusBits = 0; }
-    void    SetControlBits( ULONG nMask, FASTBOOL bOn )
+    void    SetControlBits( sal_uLong nMask, sal_Bool bOn )
                 { SetFlags( nControlBits, nMask, bOn ); }
 
-    ULONG   GetStatusWord() const       { return nStatusBits; }
-    ULONG&  GetStatusWord()             { return nStatusBits; }
+    sal_uLong   GetStatusWord() const       { return nStatusBits; }
+    sal_uLong&  GetStatusWord()             { return nStatusBits; }
 
-    ULONG   GetControlWord() const      { return nControlBits; }
-    ULONG&  GetControlWord()            { return nControlBits; }
+    sal_uLong   GetControlWord() const      { return nControlBits; }
+    sal_uLong&  GetControlWord()            { return nControlBits; }
 
-    USHORT  GetPrevParagraph() const    { return nPrevPara; }
-    USHORT& GetPrevParagraph()          { return nPrevPara; }
+    sal_uInt16  GetPrevParagraph() const    { return nPrevPara; }
+    sal_uInt16& GetPrevParagraph()          { return nPrevPara; }
 };
 
 #define SPELLCMD_IGNOREWORD         0x0001
@@ -128,18 +128,18 @@ public:
 
 struct SpellCallbackInfo
 {
-    USHORT          nCommand;
+    sal_uInt16          nCommand;
     String          aWord;
     LanguageType    eLanguage;
 
-    SpellCallbackInfo( USHORT nCMD, const String& rWord )
+    SpellCallbackInfo( sal_uInt16 nCMD, const String& rWord )
     : aWord( rWord )
     {
         nCommand = nCMD;
         eLanguage = LANGUAGE_DONTKNOW;
     }
 
-    SpellCallbackInfo( USHORT nCMD, LanguageType eLang )
+    SpellCallbackInfo( sal_uInt16 nCMD, LanguageType eLang )
     {
         nCommand = nCMD;
         eLanguage = eLang;
diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index 14091ea3e1a7..52986e6ee1e4 100644
--- a/editeng/inc/editeng/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -43,8 +43,8 @@ private:
 public:
                     EditUndoManager( ImpEditEngine* pImpEE );
 
-    virtual BOOL    Undo();
-    virtual BOOL    Redo();
+    virtual sal_Bool Undo();
+    virtual sal_Bool Redo();
 };
 
 // -----------------------------------------------------------------------
@@ -53,12 +53,12 @@ public:
 class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction
 {
 private:
-    USHORT          nId;
+    sal_uInt16          nId;
     ImpEditEngine*  pImpEE;
 
 public:
                     TYPEINFO();
-                    EditUndo( USHORT nI, ImpEditEngine* pImpEE );
+                    EditUndo( sal_uInt16 nI, ImpEditEngine* pImpEE );
     virtual         ~EditUndo();
 
     ImpEditEngine*  GetImpEditEngine() const    { return pImpEE; }
@@ -66,9 +66,9 @@ public:
     virtual void    Undo()      = 0;
     virtual void    Redo()      = 0;
 
-    virtual BOOL    CanRepeat(SfxRepeatTarget&) const;
+    virtual sal_Bool    CanRepeat(SfxRepeatTarget&) const;
     virtual String  GetComment() const;
-    virtual USHORT  GetId() const;
+    virtual sal_uInt16  GetId() const;
 };
 
 #endif  // _EDITUND2_HXX
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 15052ecc3c0c..c187ea60743b 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -99,33 +99,33 @@ public:
 
     void            Paint( const Rectangle& rRect );
     void            Invalidate();
-    Pair            Scroll( long nHorzScroll, long nVertScroll, BYTE nRangeCheck = RGCHK_NEG );
+    Pair            Scroll( long nHorzScroll, long nVertScroll, sal_uInt8 nRangeCheck = RGCHK_NEG );
 
-    void            ShowCursor( BOOL bGotoCursor = TRUE, BOOL bForceVisCursor = TRUE );
+    void            ShowCursor( sal_Bool bGotoCursor = sal_True, sal_Bool bForceVisCursor = sal_True );
     void            HideCursor();
 
     EESelectionMode GetSelectionMode() const;
     void            SetSelectionMode( EESelectionMode eMode );
 
-    void            SetReadOnly( BOOL bReadOnly );
-    BOOL            IsReadOnly() const;
+    void            SetReadOnly( sal_Bool bReadOnly );
+    sal_Bool            IsReadOnly() const;
 
-    BOOL            HasSelection() const;
+    sal_Bool            HasSelection() const;
     ESelection      GetSelection() const;
     void            SetSelection( const ESelection& rNewSel );
-    BOOL            SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+    sal_Bool            SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
 
     void            IndentBlock();
     void            UnindentBlock();
 
-    BOOL            IsInsertMode() const;
-    void            SetInsertMode( BOOL bInsert );
+    sal_Bool            IsInsertMode() const;
+    void            SetInsertMode( sal_Bool bInsert );
 
     void            ReplaceSelected( const String& rStr );
     String          GetSelected();
     void            DeleteSelected();
 
-    USHORT          GetSelectedScriptType() const;
+    sal_uInt16          GetSelectedScriptType() const;
 
                         // Position der VisArea im Ausgabefenster.
                         // Eine Groessenaenderung betrifft auch die VisArea
@@ -143,17 +143,17 @@ public:
     void            SetCursor( const Cursor& rCursor );
     Cursor*         GetCursor() const;
 
-    void            InsertText( const String& rNew, BOOL bSelect = FALSE );
+    void            InsertText( const String& rNew, sal_Bool bSelect = sal_False );
 
-    BOOL            PostKeyEvent( const KeyEvent& rKeyEvent );
+    sal_Bool            PostKeyEvent( const KeyEvent& rKeyEvent );
 
-    BOOL            MouseButtonUp( const MouseEvent& rMouseEvent );
-    BOOL            MouseButtonDown( const MouseEvent& rMouseEvent );
-    BOOL            MouseMove( const MouseEvent& rMouseEvent );
+    sal_Bool            MouseButtonUp( const MouseEvent& rMouseEvent );
+    sal_Bool            MouseButtonDown( const MouseEvent& rMouseEvent );
+    sal_Bool            MouseMove( const MouseEvent& rMouseEvent );
     void            Command( const CommandEvent& rCEvt );
 
-    BOOL            Drop( const DropEvent& rEvt );
-    BOOL            QueryDrop( DropEvent& rEvt );
+    sal_Bool            Drop( const DropEvent& rEvt );
+    sal_Bool            QueryDrop( DropEvent& rEvt );
     ESelection      GetDropPos();
 
     void            Cut();
@@ -161,28 +161,28 @@ public:
     void            Paste();
     void            PasteSpecial();
 
-    void            EnablePaste( BOOL bEnable );
-    BOOL            IsPasteEnabled() const;
+    void            EnablePaste( sal_Bool bEnable );
+    sal_Bool            IsPasteEnabled() const;
 
     void            Undo();
     void            Redo();
 
     // speziell fuer Olli
-    USHORT          GetParagraph( const Point& rMousePosPixel );
-    Point           GetWindowPosTopLeft( USHORT nParagraph );
-    void            MoveParagraphs( Range aParagraphs, USHORT nNewPos );
+    sal_uInt16          GetParagraph( const Point& rMousePosPixel );
+    Point           GetWindowPosTopLeft( sal_uInt16 nParagraph );
+    void            MoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos );
     void            MoveParagraphs( long nDiff );
 
     const SfxItemSet&   GetEmptyItemSet();
     SfxItemSet          GetAttribs();
     void                SetAttribs( const SfxItemSet& rSet );
-    void                SetParaAttribs( const SfxItemSet& rSet, USHORT nPara );
-    void                RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0 );
-    void                RemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
-    void                RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs = FALSE );
+    void                SetParaAttribs( const SfxItemSet& rSet, sal_uInt16 nPara );
+    void                RemoveAttribs( sal_Bool bRemoveParaAttribs = sal_False, sal_uInt16 nWhich = 0 );
+    void                RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0 );
+    void                RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs = sal_False );
 
-    ULONG           Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
-    ULONG           Write( SvStream& rOutput, EETextFormat eFormat );
+    sal_uLong           Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+    sal_uLong           Write( SvStream& rOutput, EETextFormat eFormat );
 
     void            SetBackgroundColor( const Color& rColor );
     Color           GetBackgroundColor() const;
@@ -192,12 +192,12 @@ public:
 
     EditTextObject* CreateTextObject();
     void            InsertText( const EditTextObject& rTextObject );
-    void            InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, BOOL bUseSpecial );
+    void            InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, sal_Bool bUseSpecial );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > GetTransferable();
 
-    // An EditView, damit bei TRUE flackerfreies Update:
-    void            SetEditEngineUpdateMode( BOOL bUpdate );
+    // An EditView, damit bei sal_True flackerfreies Update:
+    void            SetEditEngineUpdateMode( sal_Bool bUpdate );
     void            ForceUpdate();
 
     SfxStyleSheet*  GetStyleSheet() const;
@@ -206,37 +206,37 @@ public:
     void            SetAnchorMode( EVAnchorMode eMode );
     EVAnchorMode    GetAnchorMode() const;
 
-    BOOL            MatchGroup();
+    sal_Bool            MatchGroup();
 
     void            CompleteAutoCorrect();
 
-    EESpellState    StartSpeller( BOOL bMultipleDoc = FALSE );
+    EESpellState    StartSpeller( sal_Bool bMultipleDoc = sal_False );
     EESpellState    StartThesaurus();
-    USHORT          StartSearchAndReplace( const SvxSearchItem& rSearchItem );
+    sal_uInt16          StartSearchAndReplace( const SvxSearchItem& rSearchItem );
 
     // for text conversion
-    void            StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc );
+    void            StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc );
     sal_Bool        HasConvertibleTextPortion( LanguageType nLang );
 
     void            TransliterateText( sal_Int32 nTransliterationMode );
 
-    BOOL            IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong = FALSE );
-    BOOL            IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong = FALSE );
+    sal_Bool            IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
+    sal_Bool            IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
     void            SpellIgnoreWord();
     void            ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
 
     void                InsertField( const SvxFieldItem& rFld );
     const SvxFieldItem* GetFieldUnderMousePointer() const;
-    const SvxFieldItem* GetFieldUnderMousePointer( USHORT& nPara, xub_StrLen& nPos ) const;
-    const SvxFieldItem* GetField( const Point& rPos, USHORT* pnPara = NULL, xub_StrLen* pnPos = NULL ) const;
+    const SvxFieldItem* GetFieldUnderMousePointer( sal_uInt16& nPara, xub_StrLen& nPos ) const;
+    const SvxFieldItem* GetField( const Point& rPos, sal_uInt16* pnPara = NULL, xub_StrLen* pnPos = NULL ) const;
 
     const SvxFieldItem* GetFieldAtSelection() const;
 
     String          GetWordUnderMousePointer() const;
     String          GetWordUnderMousePointer( Rectangle& rWordRect ) const;
 
-    void            SetInvalidateMore( USHORT nPixel );
-    USHORT          GetInvalidateMore() const;
+    void            SetInvalidateMore( sal_uInt16 nPixel );
+    sal_uInt16          GetInvalidateMore() const;
 
     // grows or shrinks the font height for the current selection
     void            ChangeFontSize( bool bGrow, const FontList* pList );
diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 417fab6c1e2a..0889d6e0d5b1 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -37,7 +37,7 @@ class GlobalEditData;
 class EDITENG_DLLPUBLIC EditResId: public ResId
 {
 public:
-    EditResId( USHORT nId );
+    EditResId( sal_uInt16 nId );
 };
 
 class EditDLL
diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
index e461817e4bdb..18845e64a3db 100644
--- a/editeng/inc/editeng/emphitem.hxx
+++ b/editeng/inc/editeng/emphitem.hxx
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
 
     SvxEmphasisMarkItem(  const FontEmphasisMark eVal /*= EMPHASISMARK_NONE*/,
-                          const USHORT nId  );
+                          const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem + SfxEnumItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -62,14 +62,14 @@ public:
                                     const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal,
-                                            BYTE nMemberId = 0 ) const;
+                                            sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal,
-                                            BYTE nMemberId = 0 );
+                                            sal_uInt8 nMemberId = 0 );
 
     inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
     {
@@ -81,7 +81,7 @@ public:
     FontEmphasisMark        GetEmphasisMark() const
                                 { return (FontEmphasisMark)GetValue(); }
     void                    SetEmphasisMark( FontEmphasisMark eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 #endif // #ifndef _SVX_EMPHITEM_HXX
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index 95311632e947..2f29c8f2e79b 100644
--- a/editeng/inc/editeng/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -55,15 +55,15 @@ namespace rtl
 class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
 {
     short nEsc;
-    BYTE  nProp;
+    sal_uInt8  nProp;
 public:
     TYPEINFO();
 
-    SvxEscapementItem( const USHORT nId  );
+    SvxEscapementItem( const sal_uInt16 nId  );
     SvxEscapementItem( const SvxEscapement eEscape,
-                   const USHORT nId  );
-    SvxEscapementItem( const short nEsc, const BYTE nProp,
-                   const USHORT nId  );
+                   const sal_uInt16 nId  );
+    SvxEscapementItem( const short nEsc, const sal_uInt8 nProp,
+                   const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
@@ -72,12 +72,12 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     inline void SetEscapement( const SvxEscapement eNew )
     {
@@ -94,8 +94,8 @@ public:
     inline short &GetEsc() { return nEsc; }
     inline short GetEsc() const { return nEsc; }
 
-    inline BYTE &GetProp() { return nProp; }
-    inline BYTE GetProp() const { return nProp; }
+    inline sal_uInt8 &GetProp() { return nProp; }
+    inline sal_uInt8 GetProp() const { return nProp; }
 
     inline SvxEscapementItem& operator=(const SvxEscapementItem& rEsc)
         {
@@ -104,10 +104,10 @@ public:
             return *this;
         }
 
-    virtual USHORT          GetValueCount() const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetEnumValue() const;
-    virtual void            SetEnumValue( USHORT nNewVal );
+    virtual sal_uInt16          GetValueCount() const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetEnumValue() const;
+    virtual void            SetEnumValue( sal_uInt16 nNewVal );
 };
 
 #endif
diff --git a/editeng/inc/editeng/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index 573e959cd59e..5b087e952d57 100644
--- a/editeng/inc/editeng/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -47,24 +47,24 @@ namespace rtl
     Dieses Item beschreibt die Font-Hoehe.
 */
 
-#define FONTHEIGHT_16_VERSION   ((USHORT)0x0001)
-#define FONTHEIGHT_UNIT_VERSION ((USHORT)0x0002)
+#define FONTHEIGHT_16_VERSION   ((sal_uInt16)0x0001)
+#define FONTHEIGHT_UNIT_VERSION ((sal_uInt16)0x0002)
 
 class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
 {
-    UINT32  nHeight;
-    USHORT  nProp;              // default 100%
+    sal_uInt32  nHeight;
+    sal_uInt16  nProp;              // default 100%
     SfxMapUnit ePropUnit;       // Percent, Twip, ...
 public:
     TYPEINFO();
 
-    SvxFontHeightItem( const ULONG nSz /*= 240*/, const USHORT nPropHeight /*= 100*/,
-                       const USHORT nId  );
+    SvxFontHeightItem( const sal_uLong nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/,
+                       const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -72,9 +72,9 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
-    virtual USHORT           GetVersion( USHORT nItemVersion) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nItemVersion) const;
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
 
@@ -85,21 +85,21 @@ public:
             return *this;
         }
 
-    void SetHeight( UINT32 nNewHeight, const USHORT nNewProp = 100,
+    void SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp = 100,
                      SfxMapUnit eUnit = SFX_MAPUNIT_RELATIVE );
 
-    void SetHeight( UINT32 nNewHeight, USHORT nNewProp,
+    void SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp,
                      SfxMapUnit eUnit, SfxMapUnit eCoreUnit );
 
-    UINT32 GetHeight() const { return nHeight; }
+    sal_uInt32 GetHeight() const { return nHeight; }
 
-    void SetHeightValue( UINT32 nNewHeight )
+    void SetHeightValue( sal_uInt32 nNewHeight )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
             nHeight = nNewHeight;
         }
 
-    void SetProp( const USHORT nNewProp,
+    void SetProp( const sal_uInt16 nNewProp,
                     SfxMapUnit eUnit = SFX_MAPUNIT_RELATIVE )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
@@ -107,7 +107,7 @@ public:
             ePropUnit = eUnit;
         }
 
-    USHORT GetProp() const { return nProp; }
+    sal_uInt16 GetProp() const { return nProp; }
 
     SfxMapUnit GetPropUnit() const { return ePropUnit;  }   // Percent, Twip, ...
 };
diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index 67233ba5337f..30f08ee38257 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -68,19 +68,19 @@ class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem
 private:
     SvxFieldData*           pField;
 
-                    EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId );
+                    EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const sal_uInt16 nId );
 
 public:
             TYPEINFO();
 
-            SvxFieldItem( const SvxFieldData& rField, const USHORT nId  );
+            SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId  );
             SvxFieldItem( const SvxFieldItem& rItem );
             ~SvxFieldItem();
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nVer ) const;
-    virtual SvStream&       Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 nVer ) const;
+    virtual SvStream&       Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     const SvxFieldData*     GetField() const    { return pField; }
     static SvClassManager&  GetClassManager();
diff --git a/editeng/inc/editeng/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
index 8c4fd0cd589e..7a607f475828 100644
--- a/editeng/inc/editeng/flstitem.hxx
+++ b/editeng/inc/editeng/flstitem.hxx
@@ -55,13 +55,13 @@ public:
     TYPEINFO();
 
     SvxFontListItem( const FontList* pFontLst,
-                     const USHORT nId  );
+                     const sal_uInt16 nId  );
     SvxFontListItem( const SvxFontListItem& rItem );
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index fa6d1e085aab..4ec96052769c 100644
--- a/editeng/inc/editeng/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -55,25 +55,25 @@ class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
     FontPitch ePitch;
     rtl_TextEncoding eTextEncoding;
 
-    static BOOL bEnableStoreUnicodeNames;
+    static sal_Bool bEnableStoreUnicodeNames;
 
 public:
     TYPEINFO();
 
-    SvxFontItem( const USHORT nId  );
+    SvxFontItem( const sal_uInt16 nId  );
     SvxFontItem( const FontFamily eFam, const String& rFamilyName,
         const String& rStyleName,
         const FontPitch eFontPitch /*= PITCH_DONTKNOW*/,
         const rtl_TextEncoding eFontTextEncoding /*= RTL_TEXTENCODING_DONTKNOW*/,
-        const USHORT nId  );
+        const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -106,7 +106,7 @@ public:
         return *this;
     }
 
-    static void EnableStoreUnicodeNames( BOOL bEnable );
+    static void EnableStoreUnicodeNames( sal_Bool bEnable );
 
 };
 
diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index 3bb83f68ed12..877121b69005 100644
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -47,7 +47,7 @@ namespace lang {
 struct ForbiddenCharactersInfo
 {
     com::sun::star::i18n::ForbiddenCharacters aForbiddenChars;
-    BOOL bTemporary;
+    sal_Bool bTemporary;
 };
 
 DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* )
@@ -58,12 +58,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
 
 public:
-            SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, USHORT nISize = 4, USHORT nGrow = 4 );
+            SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, sal_uInt16 nISize = 4, sal_uInt16 nGrow = 4 );
             ~SvxForbiddenCharactersTable();
 
-    const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( USHORT nLanuage, BOOL bGetDefault ) const;
-    void    SetForbiddenCharacters(  USHORT nLanuage , const com::sun::star::i18n::ForbiddenCharacters& );
-    void    ClearForbiddenCharacters( USHORT nLanuage );
+    const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( sal_uInt16 nLanuage, sal_Bool bGetDefault ) const;
+    void    SetForbiddenCharacters(  sal_uInt16 nLanuage , const com::sun::star::i18n::ForbiddenCharacters& );
+    void    ClearForbiddenCharacters( sal_uInt16 nLanuage );
 };
 
 #endif // _FORBIDDENCHARACTERSTABLE_HXX
diff --git a/editeng/inc/editeng/forbiddenruleitem.hxx b/editeng/inc/editeng/forbiddenruleitem.hxx
index e3ca0602b8f9..e0e5aac309a2 100644
--- a/editeng/inc/editeng/forbiddenruleitem.hxx
+++ b/editeng/inc/editeng/forbiddenruleitem.hxx
@@ -48,8 +48,8 @@ public:
                         const sal_uInt16 nId  );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
index 505f51b7cfab..6e479d27530b 100644
--- a/editeng/inc/editeng/frmdiritem.hxx
+++ b/editeng/inc/editeng/frmdiritem.hxx
@@ -47,15 +47,15 @@ class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
 public:
     TYPEINFO();
 
-    SvxFrameDirectionItem( USHORT nWhich  );
+    SvxFrameDirectionItem( sal_uInt16 nWhich  );
     SvxFrameDirectionItem( SvxFrameDirection nValue /*= FRMDIR_HORI_LEFT_TOP*/,
-                            USHORT nWhich  );
+                            sal_uInt16 nWhich  );
     virtual ~SvxFrameDirectionItem();
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -65,9 +65,9 @@ public:
                                     const IntlWrapper * = 0 ) const;
 
     virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
+                                    sal_uInt8 nMemberId );
     virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+                                sal_uInt8 nMemberId ) const;
 
     inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem )
     {
diff --git a/editeng/inc/editeng/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index 10b3bdc964fa..05f957835912 100644
--- a/editeng/inc/editeng/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
@@ -43,19 +43,19 @@
 
 class SvxFontWidthItem : public SfxPoolItem
 {
-    UINT16  nWidth;         // 0 = default
-    USHORT  nProp;          // default 100%
+    sal_uInt16  nWidth;         // 0 = default
+    sal_uInt16  nProp;          // default 100%
 public:
     TYPEINFO();
 
-    SvxFontWidthItem(   const USHORT nSz /*= 0*/,
-                        const USHORT nPropWidth /*= 100*/,
-                        const USHORT nId  );
+    SvxFontWidthItem(   const sal_uInt16 nSz /*= 0*/,
+                        const sal_uInt16 nPropWidth /*= 100*/,
+                        const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -63,8 +63,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const;
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
 
@@ -75,28 +75,28 @@ public:
             return *this;
         }
 
-    void SetWidth( UINT16 nNewWidth, const USHORT nNewProp = 100 )
+    void SetWidth( sal_uInt16 nNewWidth, const sal_uInt16 nNewProp = 100 )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
-            nWidth = UINT16(( (UINT32)nNewWidth * nNewProp ) / 100 );
+            nWidth = sal_uInt16(( (sal_uInt32)nNewWidth * nNewProp ) / 100 );
             nProp = nNewProp;
         }
 
-    UINT16 GetWidth() const { return nWidth; }
+    sal_uInt16 GetWidth() const { return nWidth; }
 
-    void SetWidthValue( UINT16 nNewWidth )
+    void SetWidthValue( sal_uInt16 nNewWidth )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
             nWidth = nNewWidth;
         }
 
-    void SetProp( const USHORT nNewProp )
+    void SetProp( const sal_uInt16 nNewProp )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
             nProp = nNewProp;
         }
 
-    USHORT GetProp() const { return nProp; }
+    sal_uInt16 GetProp() const { return nProp; }
 };
 
 
diff --git a/editeng/inc/editeng/hngpnctitem.hxx b/editeng/inc/editeng/hngpnctitem.hxx
index cecdba9e42f0..dfe060c45f92 100644
--- a/editeng/inc/editeng/hngpnctitem.hxx
+++ b/editeng/inc/editeng/hngpnctitem.hxx
@@ -48,8 +48,8 @@ public:
                         const sal_uInt16 nId  );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
index 15acf21825c6..15c6665c620f 100644
--- a/editeng/inc/editeng/hyznitem.hxx
+++ b/editeng/inc/editeng/hyznitem.hxx
@@ -48,24 +48,24 @@ Zeichen am Zeilenende und -anfang).
 
 class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
 {
-    BOOL bHyphen:  1;
-    BOOL bPageEnd: 1;
-    BYTE nMinLead;
-    BYTE nMinTrail;
-    BYTE nMaxHyphens;
+    sal_Bool bHyphen:  1;
+    sal_Bool bPageEnd: 1;
+    sal_uInt8 nMinLead;
+    sal_uInt8 nMinTrail;
+    sal_uInt8 nMaxHyphens;
 
     friend SvStream & operator<<( SvStream & aS, SvxHyphenZoneItem & );
 
 public:
     TYPEINFO();
 
-    SvxHyphenZoneItem( const BOOL bHyph /*= FALSE*/,
-                       const USHORT nId  );
+    SvxHyphenZoneItem( const sal_Bool bHyph /*= sal_False*/,
+                       const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -73,23 +73,23 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
-    inline void SetHyphen( const BOOL bNew ) { bHyphen = bNew; }
-    inline BOOL IsHyphen() const { return bHyphen; }
+    inline void SetHyphen( const sal_Bool bNew ) { bHyphen = bNew; }
+    inline sal_Bool IsHyphen() const { return bHyphen; }
 
-    inline void SetPageEnd( const BOOL bNew ) { bPageEnd = bNew; }
-    inline BOOL IsPageEnd() const { return bPageEnd; }
+    inline void SetPageEnd( const sal_Bool bNew ) { bPageEnd = bNew; }
+    inline sal_Bool IsPageEnd() const { return bPageEnd; }
 
-    inline BYTE &GetMinLead() { return nMinLead; }
-    inline BYTE GetMinLead() const { return nMinLead; }
+    inline sal_uInt8 &GetMinLead() { return nMinLead; }
+    inline sal_uInt8 GetMinLead() const { return nMinLead; }
 
-    inline BYTE &GetMinTrail() { return nMinTrail; }
-    inline BYTE GetMinTrail() const { return nMinTrail; }
+    inline sal_uInt8 &GetMinTrail() { return nMinTrail; }
+    inline sal_uInt8 GetMinTrail() const { return nMinTrail; }
 
-    inline BYTE &GetMaxHyphens() { return nMaxHyphens; }
-    inline BYTE GetMaxHyphens() const { return nMaxHyphens; }
+    inline sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; }
+    inline sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; }
 
     inline SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew )
     {
diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index d3ffe0ad53a3..19bf08ed0d5d 100644
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -48,14 +48,14 @@ class IntlWrapper;
 static const sal_Unicode cDelim = ',';
 static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
 
-EDITENG_DLLPUBLIC String GetSvxString( USHORT nId );
+EDITENG_DLLPUBLIC String GetSvxString( sal_uInt16 nId );
 EDITENG_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
 String GetColorString( const Color& rCol );
-EDITENG_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit );
+EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit );
 
 // -----------------------------------------------------------------------
 
-inline String GetBoolString( BOOL bVal )
+inline String GetBoolString( sal_Bool bVal )
 {
     return String( EditResId( bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE ) );
 }
diff --git a/editeng/inc/editeng/keepitem.hxx b/editeng/inc/editeng/keepitem.hxx
index 29c7241f01c3..a7751eb1efda 100644
--- a/editeng/inc/editeng/keepitem.hxx
+++ b/editeng/inc/editeng/keepitem.hxx
@@ -49,14 +49,14 @@ class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    inline SvxFmtKeepItem( const BOOL bKeep /*= FALSE*/,
-                           const USHORT _nWhich  );
+    inline SvxFmtKeepItem( const sal_Bool bKeep /*= sal_False*/,
+                           const sal_uInt16 _nWhich  );
     inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT ) const;
-    virtual SvStream&       Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&       Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -64,7 +64,7 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxFmtKeepItem::SvxFmtKeepItem( const BOOL bKeep, const USHORT _nWhich ) :
+inline SvxFmtKeepItem::SvxFmtKeepItem( const sal_Bool bKeep, const sal_uInt16 _nWhich ) :
     SfxBoolItem( _nWhich, bKeep )
 {}
 
diff --git a/editeng/inc/editeng/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index f4d4d67f0361..f18cf9ff316e 100644
--- a/editeng/inc/editeng/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -53,12 +53,12 @@ class EDITENG_DLLPUBLIC SvxKerningItem : public SfxInt16Item
 public:
     TYPEINFO();
 
-    SvxKerningItem( const short nKern /*= 0*/, const USHORT nId  );
+    SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
     virtual int             ScaleMetrics( long nMult, long nDiv );
     virtual int             HasMetrics() const;
 
@@ -72,8 +72,8 @@ public:
             return *this;
         }
 
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual BOOL            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index c683b7c6a38c..a90982f16799 100644
--- a/editeng/inc/editeng/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
 
     SvxLanguageItem( const LanguageType eLang /*= LANGUAGE_GERMAN*/,
-                     const USHORT nId  );
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -61,9 +61,9 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual sal_uInt16          GetValueCount() const;
 
     inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang)
         {
@@ -75,9 +75,9 @@ public:
     LanguageType            GetLanguage() const
                                 { return (LanguageType)GetValue(); }
     void                    SetLanguage( const LanguageType eLang )
-                                { SetValue( (USHORT)eLang ); }
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+                                { SetValue( (sal_uInt16)eLang ); }
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/editeng/inc/editeng/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index 74fd91461be7..969d0316b198 100644
--- a/editeng/inc/editeng/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -42,9 +42,9 @@ class EDITENG_DLLPUBLIC SvxLineColorItem : public SvxColorItem
 public:
     TYPEINFO();
 
-    SvxLineColorItem( const USHORT nId  );
-    SvxLineColorItem( const Color& aColor, const USHORT nId  );
-    SvxLineColorItem( SvStream& rStrm, const USHORT nId  );
+    SvxLineColorItem( const sal_uInt16 nId  );
+    SvxLineColorItem( const Color& aColor, const sal_uInt16 nId  );
+    SvxLineColorItem( SvStream& rStrm, const sal_uInt16 nId  );
     SvxLineColorItem( const SvxLineColorItem& rCopy );
     ~SvxLineColorItem();
 
diff --git a/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index f667c72b1d8b..cf903fbd7a07 100644
--- a/editeng/inc/editeng/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -58,37 +58,37 @@ SetTxtLeft SetTxtFirst GetLeft  GetTxtLeft  GetTxtFirst  (Was?)
     700       -500       200       700         -500
 */
 
-#define LRSPACE_16_VERSION      ((USHORT)0x0001)
-#define LRSPACE_TXTLEFT_VERSION ((USHORT)0x0002)
-#define LRSPACE_AUTOFIRST_VERSION ((USHORT)0x0003)
-#define LRSPACE_NEGATIVE_VERSION ((USHORT)0x0004)
+#define LRSPACE_16_VERSION      ((sal_uInt16)0x0001)
+#define LRSPACE_TXTLEFT_VERSION ((sal_uInt16)0x0002)
+#define LRSPACE_AUTOFIRST_VERSION ((sal_uInt16)0x0003)
+#define LRSPACE_NEGATIVE_VERSION ((sal_uInt16)0x0004)
 
 class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
 {
     short   nFirstLineOfst;     // Erstzeileneinzug _immer_ relativ zu nTxtLeft
-    long    nTxtLeft;           // wir spendieren einen USHORT
+    long    nTxtLeft;           // wir spendieren einen sal_uInt16
     long    nLeftMargin;        // nLeft oder der neg. Erstzeileneinzug
     long    nRightMargin;       // der unproblematische rechte Rand
 
-    USHORT  nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin;
-    BOOL    bAutoFirst  : 1;    // Automatische Berechnung der Erstzeileneinzugs
+    sal_uInt16  nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin;
+    sal_Bool    bAutoFirst  : 1;    // Automatische Berechnung der Erstzeileneinzugs
 
     void   AdjustLeft();        // nLeftMargin und nTxtLeft werden angepasst.
 
 public:
     TYPEINFO();
 
-    SvxLRSpaceItem( const USHORT nId  );
+    SvxLRSpaceItem( const sal_uInt16 nId  );
     SvxLRSpaceItem( const long nLeft, const long nRight,
                     const long nTLeft /*= 0*/, const short nOfset /*= 0*/,
-                    const USHORT nId  );
+                    const sal_uInt16 nId  );
     inline SvxLRSpaceItem& operator=( const SvxLRSpaceItem &rCpy );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -96,41 +96,41 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nFileVersion ) const;
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
 
     // Die "Layout-Schnittstelle":
-    inline void   SetLeft ( const long nL, const USHORT nProp = 100 );
-    inline void   SetRight( const long nR, const USHORT nProp = 100 );
+    inline void   SetLeft ( const long nL, const sal_uInt16 nProp = 100 );
+    inline void   SetRight( const long nR, const sal_uInt16 nProp = 100 );
 
     // abfragen / direktes setzen der absoluten Werte
     inline long GetLeft()  const { return nLeftMargin; }
     inline long GetRight() const { return nRightMargin;}
     inline void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; }
     inline void SetRightValue( const long nR ) { nRightMargin = nR; }
-    inline BOOL IsAutoFirst()  const { return bAutoFirst; }
-    inline void SetAutoFirst( const BOOL bNew ) { bAutoFirst = bNew; }
+    inline sal_Bool IsAutoFirst()  const { return bAutoFirst; }
+    inline void SetAutoFirst( const sal_Bool bNew ) { bAutoFirst = bNew; }
 
     // abfragen / setzen der Prozent-Werte
-    inline void SetPropLeft( const USHORT nProp = 100 )
+    inline void SetPropLeft( const sal_uInt16 nProp = 100 )
                     { nPropLeftMargin = nProp; }
-    inline void SetPropRight( const USHORT nProp = 100 )
+    inline void SetPropRight( const sal_uInt16 nProp = 100 )
                     { nPropRightMargin = nProp;}
-    inline USHORT GetPropLeft()  const { return nPropLeftMargin; }
-    inline USHORT GetPropRight() const { return nPropRightMargin;}
+    inline sal_uInt16 GetPropLeft()  const { return nPropLeftMargin; }
+    inline sal_uInt16 GetPropRight() const { return nPropRightMargin;}
 
     // Die "UI/Text-Schnittstelle":
-    inline void SetTxtLeft( const long nL, const USHORT nProp = 100 );
+    inline void SetTxtLeft( const long nL, const sal_uInt16 nProp = 100 );
     inline long GetTxtLeft() const { return nTxtLeft; }
 
-    inline void   SetTxtFirstLineOfst( const short nF, const USHORT nProp = 100 );
+    inline void   SetTxtFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
     inline short  GetTxtFirstLineOfst() const { return nFirstLineOfst; }
-    inline void SetPropTxtFirstLineOfst( const USHORT nProp = 100 )
+    inline void SetPropTxtFirstLineOfst( const sal_uInt16 nProp = 100 )
                     { nPropFirstLineOfst = nProp; }
-    inline USHORT GetPropTxtFirstLineOfst() const
+    inline sal_uInt16 GetPropTxtFirstLineOfst() const
                     { return nPropFirstLineOfst; }
     inline void SetTxtFirstLineOfstValue( const short nValue )
                     { nFirstLineOfst = nValue; }
@@ -149,26 +149,26 @@ inline SvxLRSpaceItem &SvxLRSpaceItem::operator=( const SvxLRSpaceItem &rCpy )
     return *this;
 }
 
-inline void SvxLRSpaceItem::SetLeft( const long nL, const USHORT nProp )
+inline void SvxLRSpaceItem::SetLeft( const long nL, const sal_uInt16 nProp )
 {
     nLeftMargin = (nL * nProp) / 100;
     nTxtLeft = nLeftMargin;
     nPropLeftMargin = nProp;
 }
-inline void SvxLRSpaceItem::SetRight( const long nR, const USHORT nProp )
+inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
 {
     nRightMargin = (nR * nProp) / 100;
     nPropRightMargin = nProp;
 }
 inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
-                                                 const USHORT nProp )
+                                                 const sal_uInt16 nProp )
 {
     nFirstLineOfst = short((long(nF) * nProp ) / 100);
     nPropFirstLineOfst = nProp;
     AdjustLeft();
 }
 
-inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const USHORT nProp )
+inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const sal_uInt16 nProp )
 {
     nTxtLeft = (nL * nProp) / 100;
     nPropLeftMargin = nProp;
diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index f02676598543..8e444ff8aed1 100644
--- a/editeng/inc/editeng/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -52,8 +52,8 @@ class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
     friend SvStream& operator<<( SvStream&, SvxLineSpacingItem& ); //$ ostream
 
     short nInterLineSpace;
-    USHORT nLineHeight;
-    BYTE nPropLineSpace;
+    sal_uInt16 nLineHeight;
+    sal_uInt8 nPropLineSpace;
     SvxLineSpace eLineSpace;
     SvxInterLineSpace eInterLineSpace;
 
@@ -66,12 +66,12 @@ public:
     // => lieber einen krummen Wert als Default, aber der Programmierer
     // sieht, dass dort etwas besonderes passiert.
 
-    SvxLineSpacingItem( USHORT nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const USHORT nId  );
+    SvxLineSpacingItem( sal_uInt16 nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -79,8 +79,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
     // Methoden zum Abfragen und Aendern
     // Interlinespace wird zur Hoehe addiert.
@@ -92,16 +92,16 @@ public:
     }
 
     // Bestimmt absolute oder minimale Zeilenhoehe.
-    inline USHORT GetLineHeight() const { return nLineHeight; }
-    inline void SetLineHeight( const USHORT nHeight )
+    inline sal_uInt16 GetLineHeight() const { return nLineHeight; }
+    inline void SetLineHeight( const sal_uInt16 nHeight )
     {
         nLineHeight = nHeight;
         eLineSpace = SVX_LINE_SPACE_MIN;
     }
 
     // Vergroessert oder verkleinert die Zeilenhoehe.
-    BYTE GetPropLineSpace() const { return nPropLineSpace; }
-    inline void SetPropLineSpace( const BYTE nProp )
+    sal_uInt8 GetPropLineSpace() const { return nPropLineSpace; }
+    inline void SetPropLineSpace( const sal_uInt8 nProp )
     {
         nPropLineSpace = nProp;
         eInterLineSpace = SVX_INTER_LINE_SPACE_PROP;
@@ -113,10 +113,10 @@ public:
     inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; }
     inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; }
 
-    virtual USHORT          GetValueCount() const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetEnumValue() const;
-    virtual void            SetEnumValue( USHORT nNewVal );
+    virtual sal_uInt16          GetValueCount() const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetEnumValue() const;
+    virtual void            SetEnumValue( sal_uInt16 nNewVal );
 };
 
 #endif
diff --git a/editeng/inc/editeng/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx
index 344d5296f3c1..3443ffc0cdec 100644
--- a/editeng/inc/editeng/nhypitem.hxx
+++ b/editeng/inc/editeng/nhypitem.hxx
@@ -44,13 +44,13 @@ class EDITENG_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxNoHyphenItem( const BOOL bHyphen /*= TRUE*/,
-                     const USHORT nId  );
+    SvxNoHyphenItem( const sal_Bool bHyphen /*= sal_True*/,
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx
index 356b9ebc991f..9287168c4c59 100644
--- a/editeng/inc/editeng/nlbkitem.hxx
+++ b/editeng/inc/editeng/nlbkitem.hxx
@@ -46,13 +46,13 @@ class EDITENG_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxNoLinebreakItem( const BOOL bBreak /*= TRUE*/,
-                        const USHORT nId  );
+    SvxNoLinebreakItem( const sal_Bool bBreak /*= sal_True*/,
+                        const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 101518b227c4..cb0f8a1f6765 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -55,7 +55,7 @@ namespace com{namespace sun{ namespace star{
 }}}
 
 // -----------------------------------------------------------------------
-//Feature-Flags (only USHORT!)
+//Feature-Flags (only sal_uInt16!)
 #define NUM_CONTINUOUS          0x0001 // fortlaufende Numerierung moeglich?
 #define NUM_CHAR_TEXT_DISTANCE  0x0002 // Abstand Symbol<->Text?
 #define NUM_CHAR_STYLE          0x0004 // Zeichenvorlagen?
@@ -83,8 +83,8 @@ public:
     SvxNumberType(const SvxNumberType& rType);
     ~SvxNumberType();
 
-    String          GetNumStr( ULONG nNo ) const;
-    String          GetNumStr( ULONG nNo, const com::sun::star::lang::Locale& rLocale ) const;
+    String          GetNumStr( sal_uLong nNo ) const;
+    String          GetNumStr( sal_uLong nNo, const com::sun::star::lang::Locale& rLocale ) const;
 
     void            SetNumberingType(sal_Int16 nSet) {nNumType = nSet;}
     sal_Int16       GetNumberingType() const {return nNumType;}
@@ -123,11 +123,11 @@ private:
 
     SvxAdjust           eNumAdjust;
 
-    BYTE                nInclUpperLevels;   //Nummern aus der vorigen Ebenen uebernehmen
-    USHORT              nStart;             //Start der Zaehlung
+    sal_uInt8               nInclUpperLevels;   //Nummern aus der vorigen Ebenen uebernehmen
+    sal_uInt16              nStart;             //Start der Zaehlung
 
     sal_Unicode         cBullet;            //Symbol
-    USHORT              nBulletRelSize;     //proz. Groesse des Bullets
+    sal_uInt16              nBulletRelSize;     //proz. Groesse des Bullets
     Color               nBulletColor;       //Bullet color
 
     // --> OD 2008-01-08 #newlistlevelattrs#
@@ -185,8 +185,8 @@ public:
     SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
 
     SvxNumberFormat& operator=( const SvxNumberFormat&  );
-    BOOL            operator==( const SvxNumberFormat&  ) const;
-    BOOL            operator!=( const SvxNumberFormat& rFmt) const {return !(*this == rFmt);}
+    sal_Bool            operator==( const SvxNumberFormat&  ) const;
+    sal_Bool            operator!=( const SvxNumberFormat& rFmt) const {return !(*this == rFmt);}
 
     void            SetNumAdjust(SvxAdjust eSet) {eNumAdjust = eSet;}
     SvxAdjust       GetNumAdjust() const {return eNumAdjust;}
@@ -202,15 +202,15 @@ public:
     const Font*     GetBulletFont() const {return pBulletFont;}
     void            SetBulletChar(sal_Unicode cSet){cBullet = cSet;}
     sal_Unicode     GetBulletChar()const {return cBullet;}
-    void            SetBulletRelSize(USHORT nSet) {nBulletRelSize = nSet;}
-    USHORT          GetBulletRelSize() const { return nBulletRelSize;}
+    void            SetBulletRelSize(sal_uInt16 nSet) {nBulletRelSize = nSet;}
+    sal_uInt16          GetBulletRelSize() const { return nBulletRelSize;}
     void            SetBulletColor(Color nSet){nBulletColor = nSet;}
     Color           GetBulletColor()const {return nBulletColor;}
 
-    void            SetIncludeUpperLevels( BYTE nSet ) { nInclUpperLevels = nSet;}
-    BYTE            GetIncludeUpperLevels()const  { return nInclUpperLevels;}
-    void            SetStart(USHORT nSet) {nStart = nSet;}
-    USHORT          GetStart() const {return nStart;}
+    void            SetIncludeUpperLevels( sal_uInt8 nSet ) { nInclUpperLevels = nSet;}
+    sal_uInt8           GetIncludeUpperLevels()const  { return nInclUpperLevels;}
+    void            SetStart(sal_uInt16 nSet) {nStart = nSet;}
+    sal_uInt16          GetStart() const {return nStart;}
 
     virtual void    SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0);
     const SvxBrushItem*         GetBrush() const {return pGraphicBrush;}
@@ -254,7 +254,7 @@ public:
     // <--
 
     static Size     GetGraphicSizeMM100(const Graphic* pGraphic);
-    static String   CreateRomanString( ULONG nNo, BOOL bUpper );
+    static String   CreateRomanString( sal_uLong nNo, sal_Bool bUpper );
 };
 
 enum SvxNumRuleType
@@ -267,21 +267,21 @@ enum SvxNumRuleType
 
 class EDITENG_DLLPUBLIC SvxNumRule
 {
-    USHORT              nLevelCount;            // Anzahl der unterstuetzten Levels
-    ULONG               nFeatureFlags;          // was wird unterstuetzt?
+    sal_uInt16              nLevelCount;            // Anzahl der unterstuetzten Levels
+    sal_uInt32              nFeatureFlags;          // was wird unterstuetzt?
     SvxNumRuleType      eNumberingType;         // was fuer eine Numerierung
-    BOOL                bContinuousNumbering;   // fortlaufende Numerierung
+    sal_Bool                bContinuousNumbering;   // fortlaufende Numerierung
 
     SvxNumberFormat*    aFmts[SVX_MAX_NUM];
-    BOOL                aFmtsSet[SVX_MAX_NUM]; //Flags ueber Gueltigkeit der Ebenen
+    sal_Bool                aFmtsSet[SVX_MAX_NUM]; //Flags ueber Gueltigkeit der Ebenen
 
     static sal_Int32    nRefCount;
     com::sun::star::lang::Locale aLocale;
 public:
     // --> OD 2008-02-11 #newlistlevelattrs#
-    SvxNumRule( ULONG nFeatures,
-                USHORT nLevels,
-                BOOL bCont,
+    SvxNumRule( sal_uLong nFeatures,
+                sal_uInt16 nLevels,
+                sal_Bool bCont,
                 SvxNumRuleType eType = SVX_RULETYPE_NUMBERING,
                 SvxNumberFormat::SvxNumPositionAndSpaceMode
                         eDefaultNumberFormatPositionAndSpaceMode
@@ -298,28 +298,28 @@ public:
 
     SvStream&               Store(SvStream &rStream);
 
-    const SvxNumberFormat*  Get(USHORT nLevel)const;
-    const SvxNumberFormat&  GetLevel(USHORT nLevel)const;
-    void                    SetLevel(USHORT nLevel, const SvxNumberFormat& rFmt, BOOL bIsValid = TRUE);
-    void                    SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt);
+    const SvxNumberFormat*  Get(sal_uInt16 nLevel)const;
+    const SvxNumberFormat&  GetLevel(sal_uInt16 nLevel)const;
+    void                    SetLevel(sal_uInt16 nLevel, const SvxNumberFormat& rFmt, sal_Bool bIsValid = sal_True);
+    void                    SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt);
 
-    BOOL                    IsContinuousNumbering()const
+    sal_Bool                    IsContinuousNumbering()const
                                             {return bContinuousNumbering;}
-    void                    SetContinuousNumbering(BOOL bSet)
+    void                    SetContinuousNumbering(sal_Bool bSet)
                                             {bContinuousNumbering = bSet;}
 
-    USHORT                  GetLevelCount() const {return nLevelCount;}
-    BOOL                    IsFeatureSupported(ULONG nFeature) const
+    sal_uInt16                  GetLevelCount() const {return nLevelCount;}
+    sal_Bool                    IsFeatureSupported(sal_uInt32 nFeature) const
                                             {return 0 != (nFeatureFlags & nFeature);}
-    ULONG                   GetFeatureFlags() const {return nFeatureFlags;}
-    void                    SetFeatureFlag( ULONG nFlag, BOOL bSet = TRUE ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; }
+    sal_uInt32                  GetFeatureFlags() const {return nFeatureFlags;}
+    void                    SetFeatureFlag( sal_uInt32 nFlag, sal_Bool bSet = sal_True ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; }
 
-    String                  MakeNumString( const SvxNodeNum&, BOOL bInclStrings = TRUE ) const;
+    String                  MakeNumString( const SvxNodeNum&, sal_Bool bInclStrings = sal_True ) const;
 
     SvxNumRuleType          GetNumRuleType() const { return eNumberingType; }
     void                    SetNumRuleType( const SvxNumRuleType& rType ) { eNumberingType = rType; }
 
-    BOOL                    UnLinkGraphics();
+    sal_Bool                    UnLinkGraphics();
 };
 /* -----------------27.10.98 13:04-------------------
  *
@@ -329,50 +329,50 @@ class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
     SvxNumRule*             pNumRule;
 public:
     SvxNumBulletItem(SvxNumRule& rRule);
-    SvxNumBulletItem(SvxNumRule& rRule, USHORT nWhich );
+    SvxNumBulletItem(SvxNumRule& rRule, sal_uInt16 nWhich );
     SvxNumBulletItem(const SvxNumBulletItem& rCopy);
     virtual ~SvxNumBulletItem();
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    USHORT  GetVersion( USHORT nFileVersion ) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    sal_uInt16  GetVersion( sal_uInt16 nFileVersion ) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
     virtual int              operator==( const SfxPoolItem& ) const;
 
     SvxNumRule*             GetNumRule() const {return pNumRule;}
 
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 /* -----------------28.10.98 15:21-------------------
  *
  * --------------------------------------------------*/
 class SvxNodeNum
 {
-    USHORT nLevelVal[ SVX_MAX_NUM ];    // Nummern aller Levels
-    USHORT nSetValue;                   // vorgegebene Nummer
-    BYTE nMyLevel;                      // akt. Level
-    BOOL bStartNum;                     // Numerierung neu starten
+    sal_uInt16 nLevelVal[ SVX_MAX_NUM ];    // Nummern aller Levels
+    sal_uInt16 nSetValue;                   // vorgegebene Nummer
+    sal_uInt8 nMyLevel;                     // akt. Level
+    sal_Bool bStartNum;                     // Numerierung neu starten
 
 public:
-    inline SvxNodeNum( BYTE nLevel = SVX_NO_NUM, USHORT nSetVal = USHRT_MAX );
+    inline SvxNodeNum( sal_uInt8 nLevel = SVX_NO_NUM, sal_uInt16 nSetVal = USHRT_MAX );
     inline SvxNodeNum& operator=( const SvxNodeNum& rCpy );
 
-    BYTE GetLevel() const                   { return nMyLevel; }
-    void SetLevel( BYTE nVal )              { nMyLevel = nVal; }
+    sal_uInt8 GetLevel() const                  { return nMyLevel; }
+    void SetLevel( sal_uInt8 nVal )             { nMyLevel = nVal; }
 
-    BOOL IsStart() const                    { return bStartNum; }
-    void SetStart( BOOL bFlag = TRUE )      { bStartNum = bFlag; }
+    sal_Bool IsStart() const                    { return bStartNum; }
+    void SetStart( sal_Bool bFlag = sal_True )      { bStartNum = bFlag; }
 
-    USHORT GetSetValue() const              { return nSetValue; }
-    void SetSetValue( USHORT nVal )         { nSetValue = nVal; }
+    sal_uInt16 GetSetValue() const              { return nSetValue; }
+    void SetSetValue( sal_uInt16 nVal )         { nSetValue = nVal; }
 
-    const USHORT* GetLevelVal() const       { return nLevelVal; }
-          USHORT* GetLevelVal()             { return nLevelVal; }
+    const sal_uInt16* GetLevelVal() const       { return nLevelVal; }
+          sal_uInt16* GetLevelVal()             { return nLevelVal; }
 };
 
-SvxNodeNum::SvxNodeNum( BYTE nLevel, USHORT nSetVal )
-    : nSetValue( nSetVal ), nMyLevel( nLevel ), bStartNum( FALSE )
+SvxNodeNum::SvxNodeNum( sal_uInt8 nLevel, sal_uInt16 nSetVal )
+    : nSetValue( nSetVal ), nMyLevel( nLevel ), bStartNum( sal_False )
 {
     memset( nLevelVal, 0, sizeof( nLevelVal ) );
 }
@@ -390,7 +390,7 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy )
 /* --------------------------------------------------
  *
  * --------------------------------------------------*/
-SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevel, SvxNumRuleType eType );
+SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, sal_uInt16 nLevel, SvxNumRuleType eType );
 
 #endif
 
diff --git a/editeng/inc/editeng/opaqitem.hxx b/editeng/inc/editeng/opaqitem.hxx
index 4c71f0cfbb53..3dcd828184e0 100644
--- a/editeng/inc/editeng/opaqitem.hxx
+++ b/editeng/inc/editeng/opaqitem.hxx
@@ -51,13 +51,13 @@ class EDITENG_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxOpaqueItem( const USHORT nId , const BOOL bOpa = TRUE );
+    SvxOpaqueItem( const sal_uInt16 nId , const sal_Bool bOpa = sal_True );
     inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,7 +65,7 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxOpaqueItem::SvxOpaqueItem( const USHORT nId, const BOOL bOpa )
+inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const sal_Bool bOpa )
     : SfxBoolItem( nId, bOpa )
 {}
 
diff --git a/editeng/inc/editeng/orphitem.hxx b/editeng/inc/editeng/orphitem.hxx
index 32cd8574cf45..8271275a81f7 100644
--- a/editeng/inc/editeng/orphitem.hxx
+++ b/editeng/inc/editeng/orphitem.hxx
@@ -51,12 +51,12 @@ class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem
 public:
     TYPEINFO();
 
-    SvxOrphansItem( const BYTE nL /*= 0*/, const USHORT nId  );
+    SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 900ee69af2d5..a14d688864eb 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -136,12 +136,12 @@ private:
 
     Paragraph& operator=(const Paragraph& rPara );
 
-    USHORT              nFlags;
+    sal_uInt16              nFlags;
     XubString           aBulText;
     Size                aBulSize;
-    BOOL                bVisible;
+    sal_Bool                bVisible;
 
-    BOOL                IsVisible() const { return bVisible; }
+    sal_Bool                IsVisible() const { return bVisible; }
     void                SetText( const XubString& rText ) { aBulText = rText; aBulSize.Width() = -1; }
     void                Invalidate() { aBulSize.Width() = -1; }
     void                SetDepth( sal_Int16 nNewDepth ) { nDepth = nNewDepth; aBulSize.Width() = -1; }
@@ -160,27 +160,27 @@ private:
     sal_Bool            IsParaIsNumberingRestart() const { return mbParaIsNumberingRestart; }
     void                SetParaIsNumberingRestart( sal_Bool bParaIsNumberingRestart );
 
-    void                SetFlag( USHORT nFlag ) { nFlags |= nFlag; }
-    void                RemoveFlag( USHORT nFlag ) { nFlags &= ~nFlag; }
-    bool                HasFlag( USHORT nFlag ) const { return (nFlags & nFlag) != 0; }
+    void                SetFlag( sal_uInt16 nFlag ) { nFlags |= nFlag; }
+    void                RemoveFlag( sal_uInt16 nFlag ) { nFlags &= ~nFlag; }
+    bool                HasFlag( sal_uInt16 nFlag ) const { return (nFlags & nFlag) != 0; }
 };
 
 struct ParaRange
 {
-    USHORT  nStartPara;
-    USHORT  nEndPara;
+    sal_uInt16  nStartPara;
+    sal_uInt16  nEndPara;
 
-            ParaRange( USHORT nS, USHORT nE ) { nStartPara = nS, nEndPara = nE; }
+            ParaRange( sal_uInt16 nS, sal_uInt16 nE ) { nStartPara = nS, nEndPara = nE; }
 
     void    Adjust();
-    USHORT  Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); }
+    sal_uInt16  Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); }
 };
 
 inline void ParaRange::Adjust()
 {
     if ( nStartPara > nEndPara )
     {
-        USHORT nTmp = nStartPara;
+        sal_uInt16 nTmp = nStartPara;
         nStartPara = nEndPara;
         nEndPara = nTmp;
     }
@@ -198,18 +198,18 @@ private:
     EditView*   pEditView;
 
     // Drag & Drop
-    BOOL        bBeginDragAtMove_OLDMEMBER;
-    BOOL        bInDragMode;
+    sal_Bool        bBeginDragAtMove_OLDMEMBER;
+    sal_Bool        bInDragMode;
     Point       aDDStartPosRef;
     Point       aDDStartPosPix;
-    ULONG       nDDStartPara;
-    ULONG       nDDStartParaVisChildCount;
-    ULONG       nDDCurPara;
-    USHORT      nDDStartDepth;
-    USHORT      nDDCurDepth;
-    USHORT      nDDMaxDepth;
-    BOOL        bDDChangingDepth;
-    BOOL        bDDCursorVisible;
+    sal_uLong       nDDStartPara;
+    sal_uLong       nDDStartParaVisChildCount;
+    sal_uLong       nDDCurPara;
+    sal_uInt16      nDDStartDepth;
+    sal_uInt16      nDDCurDepth;
+    sal_uInt16      nDDMaxDepth;
+    sal_Bool        bDDChangingDepth;
+    sal_Bool        bDDCursorVisible;
     long*       pHorTabArrDoc;
     long        nDDScrollLRBorderWidthWin;  // Left Right
     long        nDDScrollTBBorderWidthWin;  // Top Bottom
@@ -217,7 +217,7 @@ private:
     long        nDDScrollTDOffs;
 
     void*       pDummy;
-    ULONG       nDummy;
+    sal_uLong       nDummy;
 
     enum MouseTarget {
         MouseText = 0,
@@ -230,11 +230,11 @@ private:
 
 #ifdef _OUTLINER_CXX
 
-    EDITENG_DLLPRIVATE void         ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand );
+    EDITENG_DLLPRIVATE void         ImplExpandOrCollaps( sal_uInt16 nStartPara, sal_uInt16 nEndPara, sal_Bool bExpand );
 
-    EDITENG_DLLPRIVATE ULONG       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
+    EDITENG_DLLPRIVATE sal_uLong       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
     EDITENG_DLLPRIVATE void        ImpToggleExpand( Paragraph* pParentPara );
-    EDITENG_DLLPRIVATE ParaRange    ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds );
+    EDITENG_DLLPRIVATE ParaRange    ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds );
     EDITENG_DLLPRIVATE void        ImpHideDDCursor();
     EDITENG_DLLPRIVATE void        ImpShowDDCursor();
     EDITENG_DLLPRIVATE void        ImpPaintDDCursor();
@@ -245,13 +245,13 @@ private:
     EDITENG_DLLPRIVATE void        ImpScrollUp();
     EDITENG_DLLPRIVATE void        ImpScrollDown();
 
-    EDITENG_DLLPRIVATE ULONG       ImpGetInsertionPara( const Point& rPosPixel );
+    EDITENG_DLLPRIVATE sal_uLong       ImpGetInsertionPara( const Point& rPosPixel );
     EDITENG_DLLPRIVATE Point       ImpGetDocPos( const Point& rPosPixel );
     EDITENG_DLLPRIVATE Pointer     ImpGetMousePointer( MouseTarget eTarget );
-    EDITENG_DLLPRIVATE USHORT      ImpInitPaste( ULONG& rStart );
-    EDITENG_DLLPRIVATE void        ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize);
-    EDITENG_DLLPRIVATE USHORT      ImpCalcSelectedPages( BOOL bIncludeFirstSelected );
-    EDITENG_DLLPRIVATE BOOL        ImpIsIndentingPages();
+    EDITENG_DLLPRIVATE sal_uInt16      ImpInitPaste( sal_uLong& rStart );
+    EDITENG_DLLPRIVATE void        ImpPasted( sal_uLong nStart, sal_uLong nPrevParaCount, sal_uInt16 nSize);
+    EDITENG_DLLPRIVATE sal_uInt16      ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected );
+    EDITENG_DLLPRIVATE sal_Bool        ImpIsIndentingPages();
 
 #endif
 
@@ -264,12 +264,12 @@ public:
     void        Scroll( long nHorzScroll, long nVertScroll );
 
     void        Paint( const Rectangle& rRect );
-    BOOL        PostKeyEvent( const KeyEvent& rKEvt );
-    BOOL        MouseButtonDown( const MouseEvent& );
-    BOOL        MouseButtonUp( const MouseEvent& );
-    BOOL        MouseMove( const MouseEvent& );
+    sal_Bool        PostKeyEvent( const KeyEvent& rKEvt );
+    sal_Bool        MouseButtonDown( const MouseEvent& );
+    sal_Bool        MouseButtonUp( const MouseEvent& );
+    sal_Bool        MouseMove( const MouseEvent& );
 
-    void        ShowCursor( BOOL bGotoCursor = TRUE );
+    void        ShowCursor( sal_Bool bGotoCursor = sal_True );
     void        HideCursor();
 
     void        SetOutliner( Outliner* pOutliner );
@@ -278,8 +278,8 @@ public:
     void        SetWindow( Window* pWindow );
     Window*     GetWindow() const;
 
-    void        SetReadOnly( BOOL bReadOnly );
-    BOOL        IsReadOnly() const;
+    void        SetReadOnly( sal_Bool bReadOnly );
+    sal_Bool        IsReadOnly() const;
 
     void        SetOutputArea( const Rectangle& rRect );
     Rectangle   GetOutputArea() const;
@@ -290,26 +290,26 @@ public:
 
     // gibt Anzahl selektierter Absaetze zurueck
     // MT 07/00: Who needs this?
-    ULONG       Select( Paragraph* pParagraph,
-                    BOOL bSelect=TRUE,
-                    BOOL bWChilds=TRUE);
+    sal_uLong       Select( Paragraph* pParagraph,
+                    sal_Bool bSelect=sal_True,
+                    sal_Bool bWChilds=sal_True);
 
     String      GetSelected() const;
-    void        SelectRange( ULONG nFirst, USHORT nCount );
+    void        SelectRange( sal_uLong nFirst, sal_uInt16 nCount );
     void        SetAttribs( const SfxItemSet& );
     void        Indent( short nDiff );
     void        AdjustDepth( short nDX );   // Spaeter gegeb Indent ersetzen!
 
-    BOOL        AdjustHeight( long nDY );
+    sal_Bool        AdjustHeight( long nDY );
     void        AdjustDepth( Paragraph* pPara, short nDX,
-                    BOOL bWithChilds = FALSE );
+                    sal_Bool bWithChilds = sal_False );
     void        AdjustHeight( Paragraph* pPara, long nDY,
-                    BOOL bWithChilds=FALSE );
+                    sal_Bool bWithChilds=sal_False );
 
-    ULONG       Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
-    ULONG       Write( SvStream& rOutput, EETextFormat eFormat );
+    sal_uLong       Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+    sal_uLong       Write( SvStream& rOutput, EETextFormat eFormat );
 
-    void        InsertText( const String& rNew, BOOL bSelect = FALSE );
+    void        InsertText( const String& rNew, sal_Bool bSelect = sal_False );
     void        InsertText( const OutlinerParaObject& rParaObj );
     void        Expand();
     void        Collapse();
@@ -327,7 +327,7 @@ public:
     void        Copy();
     void        Paste();
     void        PasteSpecial();
-    void        EnablePaste( BOOL bEnable );
+    void        EnablePaste( sal_Bool bEnable );
 
     void        Undo();
     void        Redo();
@@ -335,41 +335,41 @@ public:
     void            SetStyleSheet( SfxStyleSheet* );
     SfxStyleSheet*  GetStyleSheet() const;
 
-    void        SetControlWord( ULONG nWord );
-    ULONG       GetControlWord() const;
+    void        SetControlWord( sal_uLong nWord );
+    sal_uLong       GetControlWord() const;
 
     void            SetAnchorMode( EVAnchorMode eMode );
     EVAnchorMode    GetAnchorMode() const;
 
     Pointer     GetPointer( const Point& rPosPixel );
     void        Command( const CommandEvent& rCEvt );
-    void        RemoveCharAttribs( ULONG nPara, USHORT nWhich = 0 );
+    void        RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich = 0 );
 
     void        CompleteAutoCorrect();
 
-    EESpellState    StartSpeller( BOOL bMultipleDoc = FALSE );
+    EESpellState    StartSpeller( sal_Bool bMultipleDoc = sal_False );
     EESpellState    StartThesaurus();
-    USHORT          StartSearchAndReplace( const SvxSearchItem& rSearchItem );
+    sal_uInt16          StartSearchAndReplace( const SvxSearchItem& rSearchItem );
 
     // for text conversion
-    void            StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc );
+    void            StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc );
 
     void            TransliterateText( sal_Int32 nTransliterationMode );
 
     ESelection  GetSelection();
 
-    USHORT      GetSelectedScriptType() const;
+    sal_uInt16      GetSelectedScriptType() const;
 
     void        SetVisArea( const Rectangle& rRec );
     void        SetSelection( const ESelection& );
 
-    void        RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0, BOOL bKeepLanguages = FALSE );
-    void        RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs );
-    BOOL        HasSelection() const;
+    void        RemoveAttribs( sal_Bool bRemoveParaAttribs = sal_False, sal_uInt16 nWhich = 0, sal_Bool bKeepLanguages = sal_False );
+    void        RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs );
+    sal_Bool        HasSelection() const;
 
     void                InsertField( const SvxFieldItem& rFld );
     const SvxFieldItem* GetFieldUnderMousePointer() const;
-    const SvxFieldItem* GetFieldUnderMousePointer( USHORT& nPara, xub_StrLen& nPos ) const;
+    const SvxFieldItem* GetFieldUnderMousePointer( sal_uInt16& nPara, xub_StrLen& nPos ) const;
     const SvxFieldItem* GetFieldAtSelection() const;
 
     /** enables numbering for the selected paragraphs if the numbering of the first paragraph is off
@@ -382,13 +382,13 @@ public:
     */
     void        EnableBullets();
 
-    BOOL        IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong = FALSE );
-    BOOL        IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong = FALSE );
+    sal_Bool        IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
+    sal_Bool        IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
     void        SpellIgnoreWord();
     void        ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
 
-    void        SetInvalidateMore( USHORT nPixel );
-    USHORT      GetInvalidateMore() const;
+    void        SetInvalidateMore( sal_uInt16 nPixel );
+    sal_uInt16      GetInvalidateMore() const;
 
     String      GetSurroundingText() const;
      Selection  GetSurroundingTextSelection() const;
@@ -425,14 +425,14 @@ public:
     const Color maTextLineColor;
 
     // #101498# BiDi level needs to be transported, too.
-    BYTE                mnBiDiLevel;
+    sal_uInt8               mnBiDiLevel;
 
     // bitfield
     unsigned            mbEndOfLine : 1;
     unsigned            mbEndOfParagraph : 1;
     unsigned            mbEndOfBullet : 1;
 
-    BYTE GetBiDiLevel() const { return mnBiDiLevel; }
+    sal_uInt8 GetBiDiLevel() const { return mnBiDiLevel; }
     sal_Bool IsRTL() const;
 
     DrawPortionInfo(
@@ -449,7 +449,7 @@ public:
         const ::com::sun::star::lang::Locale* pLocale,
         const Color& rOverlineColor,
         const Color& rTextLineColor,
-        BYTE nBiDiLevel,
+        sal_uInt8 nBiDiLevel,
         bool bEndOfLine,
         bool bEndOfParagraph,
         bool bEndOfBullet)
@@ -492,14 +492,14 @@ public:
 
 struct EDITENG_DLLPUBLIC PaintFirstLineInfo
 {
-    USHORT mnPara;
+    sal_uInt16 mnPara;
     const Point& mrStartPos;
     long mnBaseLineY;
     const Point& mrOrigin;
     short mnOrientation;
     OutputDevice* mpOutDev;
 
-    PaintFirstLineInfo( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
+    PaintFirstLineInfo( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
         : mnPara( nPara ), mrStartPos( rStartPos ), mnBaseLineY( nBaseLineY ), mrOrigin( rOrigin ), mnOrientation( nOrientation ), mpOutDev( pOutDev )
     {}
 };
@@ -517,9 +517,9 @@ private:
 
     String              aRepresentation;
 
-    USHORT              nPara;
+    sal_uInt16              nPara;
     xub_StrLen          nPos;
-    BOOL                bSimpleClick;
+    sal_Bool                bSimpleClick;
 
                         EditFieldInfo();
                         EditFieldInfo( const EditFieldInfo& );
@@ -527,12 +527,12 @@ private:
     SdrPage*            mpSdrPage;
 
 public:
-                    EditFieldInfo( Outliner* pOutl, const SvxFieldItem& rFItem, USHORT nPa, xub_StrLen nPo )
+                    EditFieldInfo( Outliner* pOutl, const SvxFieldItem& rFItem, sal_uInt16 nPa, xub_StrLen nPo )
                         : rFldItem( rFItem )
                     {
                         pOutliner = pOutl;
                         nPara = nPa; nPos = nPo;
-                        pTxtColor = 0; pFldColor = 0; bSimpleClick = FALSE;
+                        pTxtColor = 0; pFldColor = 0; bSimpleClick = sal_False;
                         mpSdrPage = 0;
                     }
                     ~EditFieldInfo()
@@ -555,11 +555,11 @@ public:
     void            ClearFldColor()
                         { delete pFldColor; pFldColor = 0; }
 
-    USHORT          GetPara() const { return nPara; }
+    sal_uInt16          GetPara() const { return nPara; }
     xub_StrLen          GetPos() const { return nPos; }
 
-    BOOL            IsSimpleClick() const { return bSimpleClick; }
-    void            SetSimpleClick( BOOL bSimple ) { bSimpleClick = bSimple; }
+    sal_Bool            IsSimpleClick() const { return bSimpleClick; }
+    void            SetSimpleClick( sal_Bool bSimple ) { bSimpleClick = bSimple; }
 
     const String&       GetRepresentation() const                { return aRepresentation; }
     String&             GetRepresentation()                      { return aRepresentation; }
@@ -571,15 +571,15 @@ public:
 
 struct EBulletInfo
 {
-    BOOL        bVisible;
-    USHORT      nType;          // see SvxNumberType
+    sal_Bool        bVisible;
+    sal_uInt16      nType;          // see SvxNumberType
     String      aText;
     SvxFont     aFont;
     Graphic     aGraphic;
-    USHORT      nParagraph;
+    sal_uInt16      nParagraph;
     Rectangle   aBounds;
 
-    EBulletInfo() : bVisible( FALSE ), nType( 0 ), nParagraph( EE_PARA_NOT_FOUND ) {}
+    EBulletInfo() : bVisible( sal_False ), nType( 0 ), nParagraph( EE_PARA_NOT_FOUND ) {}
 };
 
 #define OUTLINERMODE_DONTKNOW       0x0000
@@ -609,7 +609,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
     ViewList            aViewList;
 
     Paragraph*          pHdlParagraph;
-    ULONG               mnFirstSelPage;
+    sal_uLong               mnFirstSelPage;
     Link                aDrawPortionHdl;
     Link                aDrawBulletHdl;
     Link                aExpandHdl;
@@ -628,20 +628,20 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
     Link                maEndPasteOrDropHdl;
 
     sal_Int16           nDepthChangedHdlPrevDepth;
-    USHORT              mnDepthChangeHdlPrevFlags;
+    sal_uInt16              mnDepthChangeHdlPrevFlags;
     sal_Int16           nMaxDepth;
     const sal_Int16     nMinDepth;
-    USHORT              nFirstPage;
+    sal_uInt16              nFirstPage;
 
-    USHORT              nOutlinerMode;
+    sal_uInt16              nOutlinerMode;
 
-    BOOL                bIsExpanding; // Nur in Expand/Collaps-Hdl gueltig, mal umstellen
-    BOOL                bFirstParaIsEmpty;
-    BOOL                bBlockInsCallback;
-    BOOL                bStrippingPortions;
-    BOOL                bPasting;
+    sal_Bool                bIsExpanding; // Nur in Expand/Collaps-Hdl gueltig, mal umstellen
+    sal_Bool                bFirstParaIsEmpty;
+    sal_Bool                bBlockInsCallback;
+    sal_Bool                bStrippingPortions;
+    sal_Bool                bPasting;
 
-    ULONG               nDummy;
+    sal_uLong               nDummy;
 
 #ifdef _OUTLINER_CXX
 
@@ -651,96 +651,96 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
     DECL_LINK(              BeginPasteOrDropHdl, PasteOrDropInfos* );
     DECL_LINK(              EndPasteOrDropHdl, PasteOrDropInfos* );
     DECL_LINK(              EditEngineNotifyHdl, EENotify* );
-    void                    ImplCheckParagraphs( USHORT nStart, USHORT nEnd );
-    BOOL                    ImplHasBullet( USHORT nPara ) const;
-    Size                    ImplGetBulletSize( USHORT nPara );
-    sal_uInt16              ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pParaFmt );
-    void                    ImplCalcBulletText( USHORT nPara, BOOL bRecalcLevel, BOOL bRecalcChilds );
-    String                  ImplGetBulletText( USHORT nPara );
-    void                    ImplCheckNumBulletItem( USHORT nPara );
-    void                    ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo, BOOL bUndoAction = FALSE );
-    void                    ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLevelStyle = NULL );
-
-    void                    ImplBlockInsertionCallbacks( BOOL b );
-
-    void                ImplCheckStyleSheet( USHORT nPara, BOOL bReplaceExistingStyle );
-    void                ImpRecalcBulletIndent( ULONG nPara );
-
-    const SvxBulletItem& ImpGetBullet( ULONG nPara, USHORT& );
-    void        ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara );
+    void                    ImplCheckParagraphs( sal_uInt16 nStart, sal_uInt16 nEnd );
+    sal_Bool                    ImplHasBullet( sal_uInt16 nPara ) const;
+    Size                    ImplGetBulletSize( sal_uInt16 nPara );
+    sal_uInt16              ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat* pParaFmt );
+    void                    ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChilds );
+    String                  ImplGetBulletText( sal_uInt16 nPara );
+    void                    ImplCheckNumBulletItem( sal_uInt16 nPara );
+    void                    ImplInitDepth( sal_uInt16 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction = sal_False );
+    void                    ImplSetLevelDependendStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pLevelStyle = NULL );
+
+    void                    ImplBlockInsertionCallbacks( sal_Bool b );
+
+    void                ImplCheckStyleSheet( sal_uInt16 nPara, sal_Bool bReplaceExistingStyle );
+    void                ImpRecalcBulletIndent( sal_uLong nPara );
+
+    const SvxBulletItem& ImpGetBullet( sal_uLong nPara, sal_uInt16& );
+    void        ImpFilterIndents( sal_uLong nFirstPara, sal_uLong nLastPara );
     bool        ImpConvertEdtToOut( sal_uInt32 nPara, EditView* pView = 0 );
 
-    void        ImpTextPasted( ULONG nStartPara, USHORT nCount );
-    long        ImpCalcMaxBulletWidth( USHORT nPara, const SvxBulletItem& rBullet );
-    Font        ImpCalcBulletFont( USHORT nPara ) const;
-    Rectangle   ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnPaperPos );
-    long        ImpGetTextIndent( ULONG nPara );
-    BOOL        ImpCanIndentSelectedPages( OutlinerView* pCurView );
-    BOOL        ImpCanDeleteSelectedPages( OutlinerView* pCurView );
-    BOOL        ImpCanDeleteSelectedPages( OutlinerView* pCurView, USHORT nFirstPage, USHORT nPages );
+    void        ImpTextPasted( sal_uLong nStartPara, sal_uInt16 nCount );
+    long        ImpCalcMaxBulletWidth( sal_uInt16 nPara, const SvxBulletItem& rBullet );
+    Font        ImpCalcBulletFont( sal_uInt16 nPara ) const;
+    Rectangle   ImpCalcBulletArea( sal_uInt16 nPara, sal_Bool bAdjust, sal_Bool bReturnPaperPos );
+    long        ImpGetTextIndent( sal_uLong nPara );
+    sal_Bool        ImpCanIndentSelectedPages( OutlinerView* pCurView );
+    sal_Bool        ImpCanDeleteSelectedPages( OutlinerView* pCurView );
+    sal_Bool        ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_uInt16 nFirstPage, sal_uInt16 nPages );
 
-    USHORT      ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
+    sal_uInt16      ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
     void        ImplCheckDepth( sal_Int16& rnDepth ) const;
 #endif
 
 protected:
-    void            ParagraphInserted( USHORT nParagraph );
-    void            ParagraphDeleted( USHORT nParagraph );
-    void            ParaAttribsChanged( USHORT nParagraph );
+    void            ParagraphInserted( sal_uInt16 nParagraph );
+    void            ParagraphDeleted( sal_uInt16 nParagraph );
+    void            ParaAttribsChanged( sal_uInt16 nParagraph );
 
     virtual void    StyleSheetChanged( SfxStyleSheet* pStyle );
 
-    void        InvalidateBullet( Paragraph* pPara, ULONG nPara );
-    void        PaintBullet( USHORT nPara, const Point& rStartPos,
+    void        InvalidateBullet( Paragraph* pPara, sal_uLong nPara );
+    void        PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
                     const Point& rOrigin, short nOrientation,
                     OutputDevice* pOutDev );
 
     // used by OutlinerEditEng. Allows Outliner objects to provide
     // bullet access to the EditEngine.
-    virtual const SvxNumberFormat*  GetNumberFormat( USHORT nPara ) const;
+    virtual const SvxNumberFormat*  GetNumberFormat( sal_uInt16 nPara ) const;
 
 public:
 
-                    Outliner( SfxItemPool* pPool, USHORT nOutlinerMode );
+                    Outliner( SfxItemPool* pPool, sal_uInt16 nOutlinerMode );
     virtual         ~Outliner();
 
-    void            Init( USHORT nOutlinerMode );
-    USHORT          GetMode() const { return nOutlinerMode; }
+    void            Init( sal_uInt16 nOutlinerMode );
+    sal_uInt16          GetMode() const { return nOutlinerMode; }
 
-    void            SetVertical( BOOL bVertical );
-    BOOL            IsVertical() const;
+    void            SetVertical( sal_Bool bVertical );
+    sal_Bool            IsVertical() const;
 
-    void            SetFixedCellHeight( BOOL bUseFixedCellHeight );
-    BOOL            IsFixedCellHeight() const;
+    void            SetFixedCellHeight( sal_Bool bUseFixedCellHeight );
+    sal_Bool            IsFixedCellHeight() const;
 
     void                        SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir );
     EEHorizontalTextDirection   GetDefaultHorizontalTextDirection() const;
 
-    USHORT          GetScriptType( const ESelection& rSelection ) const;
-    LanguageType    GetLanguage( USHORT nPara, USHORT nPos ) const;
+    sal_uInt16          GetScriptType( const ESelection& rSelection ) const;
+    LanguageType    GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const;
 
-    void            SetAsianCompressionMode( USHORT nCompressionMode );
-    USHORT          GetAsianCompressionMode() const;
+    void            SetAsianCompressionMode( sal_uInt16 nCompressionMode );
+    sal_uInt16          GetAsianCompressionMode() const;
 
-    void            SetKernAsianPunctuation( BOOL bEnabled );
-    BOOL            IsKernAsianPunctuation() const;
+    void            SetKernAsianPunctuation( sal_Bool bEnabled );
+    sal_Bool            IsKernAsianPunctuation() const;
 
-    void            SetAddExtLeading( BOOL b );
-    BOOL            IsAddExtLeading() const;
+    void            SetAddExtLeading( sal_Bool b );
+    sal_Bool            IsAddExtLeading() const;
 
-    ULONG           InsertView( OutlinerView* pView, ULONG nIndex=LIST_APPEND);
+    sal_uLong           InsertView( OutlinerView* pView, sal_uLong nIndex=LIST_APPEND);
     OutlinerView*   RemoveView( OutlinerView* pView );
-    OutlinerView*   RemoveView( ULONG nIndex );
-    OutlinerView*   GetView( ULONG nIndex ) const;
-    ULONG           GetViewCount() const;
+    OutlinerView*   RemoveView( sal_uLong nIndex );
+    OutlinerView*   GetView( sal_uLong nIndex ) const;
+    sal_uLong           GetViewCount() const;
 
-    Paragraph*      Insert( const String& rText, ULONG nAbsPos = LIST_APPEND, sal_Int16 nDepth = 0 );
+    Paragraph*      Insert( const String& rText, sal_uLong nAbsPos = LIST_APPEND, sal_Int16 nDepth = 0 );
     void            SetText( const OutlinerParaObject& );
     void            AddText( const OutlinerParaObject& );
     void            SetText( const String& rText, Paragraph* pParagraph );
-    String          GetText( Paragraph* pPara, ULONG nParaCount=1 ) const;
+    String          GetText( Paragraph* pPara, sal_uLong nParaCount=1 ) const;
 
-    OutlinerParaObject* CreateParaObject( USHORT nStartPara = 0, USHORT nParaCount = 0xFFFF ) const;
+    OutlinerParaObject* CreateParaObject( sal_uInt16 nStartPara = 0, sal_uInt16 nParaCount = 0xFFFF ) const;
 
     const SfxItemSet& GetEmptyItemSet() const;
 
@@ -752,46 +752,46 @@ public:
 
     sal_Int16       GetMinDepth() const { return -1; }
 
-    void            SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParas = FALSE );
+    void            SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParas = sal_False );
     sal_Int16          GetMaxDepth() const { return nMaxDepth; }
 
-    void            SetUpdateMode( BOOL bUpdate );
-    BOOL            GetUpdateMode() const;
+    void            SetUpdateMode( sal_Bool bUpdate );
+    sal_Bool            GetUpdateMode() const;
 
     void            Clear();
 
     void            RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
 
-    ULONG           GetParagraphCount() const;
-    Paragraph*      GetParagraph( ULONG nAbsPos ) const;
+    sal_uLong           GetParagraphCount() const;
+    Paragraph*      GetParagraph( sal_uLong nAbsPos ) const;
 
-    BOOL            HasParent( Paragraph* pParagraph ) const;
-    BOOL            HasChilds( Paragraph* pParagraph ) const;
-    ULONG           GetChildCount( Paragraph* pParent ) const;
-    BOOL            IsExpanded( Paragraph* pPara ) const;
-//  Paragraph*      GetParagraph( Paragraph* pParent, ULONG nRelPos ) const;
+    sal_Bool            HasParent( Paragraph* pParagraph ) const;
+    sal_Bool            HasChilds( Paragraph* pParagraph ) const;
+    sal_uLong           GetChildCount( Paragraph* pParent ) const;
+    sal_Bool            IsExpanded( Paragraph* pPara ) const;
+//  Paragraph*      GetParagraph( Paragraph* pParent, sal_uLong nRelPos ) const;
     Paragraph*      GetParent( Paragraph* pParagraph ) const;
-//  ULONG           GetRelPos( Paragraph* pParent, Paragraph* pPara ) const;
-    ULONG           GetAbsPos( Paragraph* pPara );
+//  sal_uLong           GetRelPos( Paragraph* pParent, Paragraph* pPara ) const;
+    sal_uLong           GetAbsPos( Paragraph* pPara );
 
-    sal_Int16       GetDepth( ULONG nPara ) const;
+    sal_Int16       GetDepth( sal_uLong nPara ) const;
     void            SetDepth( Paragraph* pParagraph, sal_Int16 nNewDepth );
 
-    void            SetVisible( Paragraph* pPara, BOOL bVisible );
-    BOOL            IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); }
+    void            SetVisible( Paragraph* pPara, sal_Bool bVisible );
+    sal_Bool            IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); }
 
-    void            EnableUndo( BOOL bEnable );
-    BOOL            IsUndoEnabled() const;
-    void            UndoActionStart( USHORT nId );
-    void            UndoActionEnd( USHORT nId );
+    void            EnableUndo( sal_Bool bEnable );
+    sal_Bool            IsUndoEnabled() const;
+    void            UndoActionStart( sal_uInt16 nId );
+    void            UndoActionEnd( sal_uInt16 nId );
     void            InsertUndo( EditUndo* pUndo );
-    BOOL            IsInUndo();
+    sal_Bool            IsInUndo();
 
     void            ClearModifyFlag();
-    BOOL            IsModified() const;
+    sal_Bool            IsModified() const;
 
     Paragraph*      GetHdlParagraph() const { return pHdlParagraph; }
-    BOOL            IsExpanding() const { return bIsExpanding; }
+    sal_Bool            IsExpanding() const { return bIsExpanding; }
 
     virtual void    ExpandHdl();
     void            SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; }
@@ -809,7 +809,7 @@ public:
     void            SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;}
     Link            GetDepthChangedHdl() const { return aDepthChangedHdl; }
     sal_Int16       GetPrevDepth() const { return nDepthChangedHdlPrevDepth; }
-    USHORT          GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; }
+    sal_uInt16          GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; }
 
     virtual long    RemovingPagesHdl( OutlinerView* );
     void            SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;}
@@ -818,9 +818,9 @@ public:
     void            SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;}
     Link            GetIndentingPagesHdl() const { return aIndentingPagesHdl; }
     // nur gueltig in den beiden oberen Handlern
-    USHORT          GetSelPageCount() const { return nDepthChangedHdlPrevDepth; }
+    sal_uInt16          GetSelPageCount() const { return nDepthChangedHdlPrevDepth; }
     // nur gueltig in den beiden oberen Handlern
-    ULONG           GetFirstSelPage() const { return mnFirstSelPage; }
+    sal_uLong           GetFirstSelPage() const { return mnFirstSelPage; }
 
     void            SetCalcFieldValueHdl(const Link& rLink ) { aCalcFieldValueHdl= rLink; }
     Link            GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; }
@@ -853,8 +853,8 @@ public:
     const Size&     GetPaperSize() const;
     void            SetPaperSize( const Size& rSize );
 
-    void            SetFirstPageNumber( USHORT n )  { nFirstPage = n; }
-    USHORT          GetFirstPageNumber() const      { return nFirstPage; }
+    void            SetFirstPageNumber( sal_uInt16 n )  { nFirstPage = n; }
+    sal_uInt16          GetFirstPageNumber() const      { return nFirstPage; }
 
     void                SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon );
     void                SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon);
@@ -867,30 +867,30 @@ public:
     const Size&     GetMaxAutoPaperSize() const;
     void            SetMaxAutoPaperSize( const Size& rSz );
 
-    void            SetDefTab( USHORT nTab );
-    USHORT          GetDefTab() const;
+    void            SetDefTab( sal_uInt16 nTab );
+    sal_uInt16          GetDefTab() const;
 
-    BOOL            IsFlatMode() const;
-    void            SetFlatMode( BOOL bFlat );
+    sal_Bool            IsFlatMode() const;
+    void            SetFlatMode( sal_Bool bFlat );
 
-    void            EnableAutoColor( BOOL b );
-    BOOL            IsAutoColorEnabled() const;
+    void            EnableAutoColor( sal_Bool b );
+    sal_Bool            IsAutoColorEnabled() const;
 
-    void            ForceAutoColor( BOOL b );
-    BOOL            IsForceAutoColor() const;
+    void            ForceAutoColor( sal_Bool b );
+    sal_Bool            IsForceAutoColor() const;
 
-    EBulletInfo     GetBulletInfo( USHORT nPara );
+    EBulletInfo     GetBulletInfo( sal_uInt16 nPara );
 
     void        SetWordDelimiters( const String& rDelimiters );
     String      GetWordDelimiters() const;
-    String      GetWord( USHORT nPara, xub_StrLen nIndex );
+    String      GetWord( sal_uInt16 nPara, xub_StrLen nIndex );
 
     void            StripPortions();
 
     // #101498#
     virtual void DrawingText(
-        const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen,
-        const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
+        const Point& rStartPos, const String& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen,
+        const sal_Int32* pDXArray, const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         bool bEndOfLine,
@@ -907,17 +907,17 @@ public:
     void                SetStyleSheetPool( SfxStyleSheetPool* pSPool );
     SfxStyleSheetPool*  GetStyleSheetPool();
 
-    BOOL            IsInSelectionMode() const;
+    sal_Bool            IsInSelectionMode() const;
 
-    void            SetStyleSheet( ULONG nPara, SfxStyleSheet* pStyle );
-    SfxStyleSheet*  GetStyleSheet( ULONG nPara );
+    void            SetStyleSheet( sal_uLong nPara, SfxStyleSheet* pStyle );
+    SfxStyleSheet*  GetStyleSheet( sal_uLong nPara );
 
-    void            SetParaAttribs( USHORT nPara, const SfxItemSet& );
-    SfxItemSet      GetParaAttribs( USHORT nPara );
+    void            SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& );
+    SfxItemSet      GetParaAttribs( sal_uInt16 nPara );
 
-    void            Remove( Paragraph* pPara, ULONG nParaCount );
-    BOOL            Expand( Paragraph* );
-    BOOL            Collapse( Paragraph* );
+    void            Remove( Paragraph* pPara, sal_uLong nParaCount );
+    sal_Bool            Expand( Paragraph* );
+    sal_Bool            Collapse( Paragraph* );
 
     void            SetParaFlag( Paragraph* pPara,  sal_uInt16 nFlag );
     void            RemoveParaFlag( Paragraph* pPara, sal_uInt16 nFlag );
@@ -928,20 +928,20 @@ public:
     Link            GetWidthArrReqHdl() const{ return aWidthArrReqHdl; }
     void            SetWidthArrReqHdl(const Link& rLink){aWidthArrReqHdl=rLink; }
 
-    void            SetControlWord( ULONG nWord );
-    ULONG           GetControlWord() const;
+    void            SetControlWord( sal_uLong nWord );
+    sal_uLong           GetControlWord() const;
 
     Link            GetBeginMovingHdl() const { return aBeginMovingHdl; }
     void            SetBeginMovingHdl(const Link& rLink) {aBeginMovingHdl=rLink;}
     Link            GetEndMovingHdl() const {return aEndMovingHdl;}
     void            SetEndMovingHdl( const Link& rLink){aEndMovingHdl=rLink;}
 
-    ULONG           GetLineCount( ULONG nParagraph ) const;
-    USHORT          GetLineLen( ULONG nParagraph, USHORT nLine ) const;
-    ULONG           GetLineHeight( ULONG nParagraph, ULONG nLine = 0 );
+    sal_uLong           GetLineCount( sal_uLong nParagraph ) const;
+    sal_uInt16          GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const;
+    sal_uLong           GetLineHeight( sal_uLong nParagraph, sal_uLong nLine = 0 );
 
     // nFormat muss ein Wert aus dem enum EETextFormat sein (wg.CLOOKS)
-    ULONG           Read( SvStream& rInput, const String& rBaseURL, USHORT, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+    sal_uLong           Read( SvStream& rInput, const String& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
 
     ::svl::IUndoManager&
                     GetUndoManager();
@@ -953,15 +953,15 @@ public:
     // nur fuer EditEngine-Modus
     void            QuickInsertText( const String& rText, const ESelection& rSel );
     void            QuickDelete( const ESelection& rSel );
-    void            QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
-    void            QuickFormatDoc( BOOL bFull = FALSE );
+    void            QuickRemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0 );
+    void            QuickFormatDoc( sal_Bool bFull = sal_False );
 
-    BOOL            UpdateFields();
-    void            RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL );
+    sal_Bool            UpdateFields();
+    void            RemoveFields( sal_Bool bKeepFieldText, TypeId aType = NULL );
 
-    virtual void    FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual void    FieldSelected( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual String  CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual void    FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual void    FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual String  CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
 
     void            SetSpeller( ::com::sun::star::uno::Reference<
                             ::com::sun::star::linguistic2::XSpellChecker1 > &xSpeller );
@@ -981,16 +981,16 @@ public:
     void            SetDefaultLanguage( LanguageType eLang );
     LanguageType    GetDefaultLanguage() const;
 
-    BOOL            HasOnlineSpellErrors() const;
+    sal_Bool            HasOnlineSpellErrors() const;
     void            CompleteOnlineSpelling();
 
     EESpellState    HasSpellErrors();
-    BOOL            HasText( const SvxSearchItem& rSearchItem );
-    virtual BOOL    SpellNextDocument();
+    sal_Bool            HasText( const SvxSearchItem& rSearchItem );
+    virtual sal_Bool    SpellNextDocument();
 
     // for text conversion
     sal_Bool        HasConvertibleTextPortion( LanguageType nLang );
-    virtual BOOL    ConvertNextDocument();
+    virtual sal_Bool    ConvertNextDocument();
 
     void            SetEditTextObjectPool( SfxItemPool* pPool );
     SfxItemPool*    GetEditTextObjectPool() const;
@@ -998,30 +998,30 @@ public:
     void            SetRefDevice( OutputDevice* pRefDev );
     OutputDevice*   GetRefDevice() const;
 
-    USHORT          GetFirstLineOffset( ULONG nParagraph );
+    sal_uInt16          GetFirstLineOffset( sal_uLong nParagraph );
 
-    ULONG           GetTextHeight() const;
-    ULONG           GetTextHeight( ULONG nParagraph ) const;
-    Point           GetDocPosTopLeft( ULONG nParagraph );
+    sal_uLong           GetTextHeight() const;
+    sal_uLong           GetTextHeight( sal_uLong nParagraph ) const;
+    Point           GetDocPosTopLeft( sal_uLong nParagraph );
     Point           GetDocPos( const Point& rPaperPos ) const;
-    BOOL            IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 );
-    BOOL            IsTextPos( const Point& rPaperPos, USHORT nBorder, BOOL* pbBuuletPos );
+    sal_Bool            IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 );
+    sal_Bool            IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBuuletPos );
 
-    void            SetGlobalCharStretching( USHORT nX = 100, USHORT nY = 100 );
-    void            GetGlobalCharStretching( USHORT& rX, USHORT& rY );
-    void            DoStretchChars( USHORT nX, USHORT nY );
+    void            SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 );
+    void            GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY );
+    void            DoStretchChars( sal_uInt16 nX, sal_uInt16 nY );
     void            EraseVirtualDevice();
 
-    void            SetBigTextObjectStart( USHORT nStartAtPortionCount );
-    USHORT          GetBigTextObjectStart() const;
-    BOOL            ShouldCreateBigTextObject() const;
+    void            SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount );
+    sal_uInt16          GetBigTextObjectStart() const;
+    sal_Bool            ShouldCreateBigTextObject() const;
 
     const EditEngine& GetEditEngine() const { return *((EditEngine*)pEditEngine); }
 
     // this is needed for StarOffice Api
-    void SetLevelDependendStyleSheet( USHORT nPara );
+    void SetLevelDependendStyleSheet( sal_uInt16 nPara );
 
-    USHORT  GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
+    sal_uInt16  GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
 
     void            StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc);
     //spell and return a sentence
diff --git a/editeng/inc/editeng/paperinf.hxx b/editeng/inc/editeng/paperinf.hxx
index dbc5c9e01d37..3f2584edc452 100644
--- a/editeng/inc/editeng/paperinf.hxx
+++ b/editeng/inc/editeng/paperinf.hxx
@@ -48,7 +48,7 @@ public:
     static Size     GetDefaultPaperSize( MapUnit eUnit = MAP_TWIP );
     static Size     GetPaperSize( Paper ePaper, MapUnit eUnit = MAP_TWIP );
     static Size     GetPaperSize( const Printer* pPrinter );
-    static Paper    GetSvxPaper( const Size &rSize, MapUnit eUnit = MAP_TWIP, bool bSloppy = FALSE );
+    static Paper    GetSvxPaper( const Size &rSize, MapUnit eUnit = MAP_TWIP, bool bSloppy = sal_False );
     static long     GetSloppyPaperDimension( long nSize, MapUnit eUnit = MAP_TWIP );
     static String   GetName( Paper ePaper );
 };
diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
index 2def5bc71dbe..74264c0b8aba 100644
--- a/editeng/inc/editeng/paravertalignitem.hxx
+++ b/editeng/inc/editeng/paravertalignitem.hxx
@@ -51,9 +51,9 @@ public:
                        const sal_uInt16 nId  );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -62,9 +62,9 @@ public:
                                     const IntlWrapper * = 0 ) const;
 
     virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
+                                    sal_uInt8 nMemberId );
     virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+                                sal_uInt8 nMemberId ) const;
 
     inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem )
     {
diff --git a/editeng/inc/editeng/pbinitem.hxx b/editeng/inc/editeng/pbinitem.hxx
index bc1bd5aa0d59..9b4941ee0744 100644
--- a/editeng/inc/editeng/pbinitem.hxx
+++ b/editeng/inc/editeng/pbinitem.hxx
@@ -34,7 +34,7 @@
 
 // define ----------------------------------------------------------------
 
-#define PAPERBIN_PRINTER_SETTINGS   ((BYTE)0xFF)
+#define PAPERBIN_PRINTER_SETTINGS   ((sal_uInt8)0xFF)
 
 // class SvxPaperBinItem -------------------------------------------------
 
@@ -48,21 +48,21 @@ class EDITENG_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
 public:
     TYPEINFO();
 
-    inline SvxPaperBinItem( const USHORT nId ,
-                            const BYTE nTray = PAPERBIN_PRINTER_SETTINGS );
+    inline SvxPaperBinItem( const sal_uInt16 nId ,
+                            const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS );
     inline SvxPaperBinItem &operator=( const SvxPaperBinItem &rCpy );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream &, USHORT ) const;
-    virtual SvStream&       Store( SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 ) const;
+    virtual SvStream&       Store( SvStream &, sal_uInt16 nItemVersion ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                              SfxMapUnit eCoreMetric,
                                              SfxMapUnit ePresMetric,
                                              String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxPaperBinItem::SvxPaperBinItem( const USHORT nId, const BYTE nT )
+inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT )
     : SfxByteItem( nId, nT )
 {}
 
diff --git a/editeng/inc/editeng/pgrditem.hxx b/editeng/inc/editeng/pgrditem.hxx
index c4b81eb69244..eb464290e736 100644
--- a/editeng/inc/editeng/pgrditem.hxx
+++ b/editeng/inc/editeng/pgrditem.hxx
@@ -45,13 +45,13 @@ class EDITENG_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxParaGridItem( const BOOL bSnapToGrid /*= TRUE*/,
-                     const USHORT nId  );
+    SvxParaGridItem( const sal_Bool bSnapToGrid /*= sal_True*/,
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
index e14b056ed363..631cbb4ff9f7 100644
--- a/editeng/inc/editeng/pmdlitem.hxx
+++ b/editeng/inc/editeng/pmdlitem.hxx
@@ -42,14 +42,14 @@ Dieses Item enthaelt einen Namen einer Seitenvorlage.
 class EDITENG_DLLPUBLIC SvxPageModelItem : public SfxStringItem
 {
 private:
-    BOOL bAuto;
+    sal_Bool bAuto;
 
 public:
     TYPEINFO();
 
-    inline SvxPageModelItem( USHORT nWh  );
-    inline SvxPageModelItem( const String& rModel, BOOL bA /*= FALSE*/,
-                             USHORT nWh  );
+    inline SvxPageModelItem( sal_uInt16 nWh  );
+    inline SvxPageModelItem( const String& rModel, sal_Bool bA /*= sal_False*/,
+                             sal_uInt16 nWh  );
     inline SvxPageModelItem& operator=( const SvxPageModelItem& rModel );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
@@ -59,19 +59,19 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    BOOL IsAuto() const { return bAuto; }
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+    sal_Bool IsAuto() const { return bAuto; }
 };
 
-inline SvxPageModelItem::SvxPageModelItem( USHORT nWh )
-    : bAuto( FALSE )
+inline SvxPageModelItem::SvxPageModelItem( sal_uInt16 nWh )
+    : bAuto( sal_False )
 {
     SetWhich( nWh );
 }
 
-inline SvxPageModelItem::SvxPageModelItem( const String& rModel, BOOL bA,
-                                           USHORT nWh ) :
+inline SvxPageModelItem::SvxPageModelItem( const String& rModel, sal_Bool bA,
+                                           sal_uInt16 nWh ) :
     SfxStringItem( nWh, rModel ),
     bAuto( bA )
 {}
diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index 9c59aafd8b19..873f2c0d068f 100644
--- a/editeng/inc/editeng/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
 
     SvxPostureItem( const FontItalic ePost /*= ITALIC_NONE*/,
-                    const USHORT nId  );
+                    const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem + SwEnumItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -61,17 +61,17 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetValueCount() const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual int             HasBoolValue() const;
-    virtual BOOL            GetBoolValue() const;
-    virtual void            SetBoolValue( BOOL bVal );
+    virtual sal_Bool            GetBoolValue() const;
+    virtual void            SetBoolValue( sal_Bool bVal );
 
     inline SvxPostureItem& operator=(const SvxPostureItem& rPost) {
         SetValue( rPost.GetValue() );
@@ -82,7 +82,7 @@ public:
     FontItalic              GetPosture() const
                                 { return (FontItalic)GetValue(); }
     void                    SetPosture( FontItalic eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 #endif // #ifndef _SVX_POSTITEM_HXX
diff --git a/editeng/inc/editeng/prntitem.hxx b/editeng/inc/editeng/prntitem.hxx
index 53646b520f32..9571b831720b 100644
--- a/editeng/inc/editeng/prntitem.hxx
+++ b/editeng/inc/editeng/prntitem.hxx
@@ -48,13 +48,13 @@ class EDITENG_DLLPUBLIC SvxPrintItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxPrintItem( const USHORT nId , const BOOL bPrt = TRUE );
+    SvxPrintItem( const sal_uInt16 nId , const sal_Bool bPrt = sal_True );
     inline SvxPrintItem &operator=( const SvxPrintItem &rCpy );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -62,7 +62,7 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxPrintItem::SvxPrintItem( const USHORT nId, const BOOL bPrt )
+inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const sal_Bool bPrt )
     : SfxBoolItem( nId, bPrt )
 {}
 
diff --git a/editeng/inc/editeng/protitem.hxx b/editeng/inc/editeng/protitem.hxx
index 9ba2976bb367..b4a4e26b6f5b 100644
--- a/editeng/inc/editeng/protitem.hxx
+++ b/editeng/inc/editeng/protitem.hxx
@@ -50,14 +50,14 @@ sollen.
 
 class EDITENG_DLLPUBLIC SvxProtectItem : public SfxPoolItem
 {
-    BOOL bCntnt :1;     //Inhalt geschuetzt
-    BOOL bSize  :1;     //Groesse geschuetzt
-    BOOL bPos   :1;     //Position geschuetzt
+    sal_Bool bCntnt :1;     //Inhalt geschuetzt
+    sal_Bool bSize  :1;     //Groesse geschuetzt
+    sal_Bool bPos   :1;     //Position geschuetzt
 
 public:
     TYPEINFO();
 
-    inline SvxProtectItem( const USHORT nId  );
+    inline SvxProtectItem( const sal_uInt16 nId  );
     inline SvxProtectItem &operator=( const SvxProtectItem &rCpy );
 
     // "pure virtual Methoden" vom SfxPoolItem
@@ -70,24 +70,24 @@ public:
 
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
-
-    BOOL IsCntntProtected() const { return bCntnt; }
-    BOOL IsSizeProtected()  const { return bSize;  }
-    BOOL IsPosProtected()   const { return bPos;   }
-    void SetCntntProtect( BOOL bNew ) { bCntnt = bNew; }
-    void SetSizeProtect ( BOOL bNew ) { bSize  = bNew; }
-    void SetPosProtect  ( BOOL bNew ) { bPos   = bNew; }
-
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
+
+    sal_Bool IsCntntProtected() const { return bCntnt; }
+    sal_Bool IsSizeProtected()  const { return bSize;  }
+    sal_Bool IsPosProtected()   const { return bPos;   }
+    void SetCntntProtect( sal_Bool bNew ) { bCntnt = bNew; }
+    void SetSizeProtect ( sal_Bool bNew ) { bSize  = bNew; }
+    void SetPosProtect  ( sal_Bool bNew ) { bPos   = bNew; }
+
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
-inline SvxProtectItem::SvxProtectItem( const USHORT nId )
+inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
     : SfxPoolItem( nId )
 {
-    bCntnt = bSize = bPos = FALSE;
+    bCntnt = bSize = bPos = sal_False;
 }
 
 inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy )
diff --git a/editeng/inc/editeng/prszitem.hxx b/editeng/inc/editeng/prszitem.hxx
index 8a1286c603d8..0d74f26d0651 100644
--- a/editeng/inc/editeng/prszitem.hxx
+++ b/editeng/inc/editeng/prszitem.hxx
@@ -44,13 +44,13 @@ class EDITENG_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
 public:
     TYPEINFO();
 
-    SvxPropSizeItem( const USHORT nPercent /*= 100*/,
-                 const USHORT nID  );
+    SvxPropSizeItem( const sal_uInt16 nPercent /*= 100*/,
+                 const sal_uInt16 nID  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/scriptspaceitem.hxx b/editeng/inc/editeng/scriptspaceitem.hxx
index 4896b54c144d..4087bd229b25 100644
--- a/editeng/inc/editeng/scriptspaceitem.hxx
+++ b/editeng/inc/editeng/scriptspaceitem.hxx
@@ -49,8 +49,8 @@ public:
                         const sal_uInt16 nId  );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/scripttypeitem.hxx b/editeng/inc/editeng/scripttypeitem.hxx
index de4c3f94b130..10b7abcb39b8 100644
--- a/editeng/inc/editeng/scripttypeitem.hxx
+++ b/editeng/inc/editeng/scripttypeitem.hxx
@@ -41,9 +41,9 @@
     used for the user interface.
 */
 
-EDITENG_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
-USHORT GetItemScriptType( short nI18NType );
-short  GetI18NScriptType( USHORT nItemType );
+EDITENG_DLLPUBLIC sal_uInt16 GetI18NScriptTypeOfLanguage( sal_uInt16 nLang );
+sal_uInt16 GetItemScriptType( short nI18NType );
+short  GetI18NScriptType( sal_uInt16 nItemType );
 
 class EDITENG_DLLPUBLIC SvxScriptTypeItem : public SfxUInt16Item
 {
@@ -60,30 +60,30 @@ class EDITENG_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
 public:
     TYPEINFO();
 
-    SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool );
+    SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool );
 
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const;
+    virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const;
 
     static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet,
-                                                    USHORT nWhich );
-    inline const SfxPoolItem* GetItemOfScriptSet( USHORT _nWhich ) const
+                                                    sal_uInt16 nWhich );
+    inline const SfxPoolItem* GetItemOfScriptSet( sal_uInt16 _nWhich ) const
     { return SvxScriptSetItem::GetItemOfScriptSet( GetItemSet(), _nWhich ); }
 
-    static const SfxPoolItem* GetItemOfScript( USHORT nSlotId, const SfxItemSet& rSet, USHORT nScript );
+    static const SfxPoolItem* GetItemOfScript( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16 nScript );
 
-    const SfxPoolItem* GetItemOfScript( USHORT nScript ) const;
+    const SfxPoolItem* GetItemOfScript( sal_uInt16 nScript ) const;
 
-    void PutItemForScriptType( USHORT nScriptType, const SfxPoolItem& rItem );
+    void PutItemForScriptType( sal_uInt16 nScriptType, const SfxPoolItem& rItem );
 
-    static void GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHORT& rLatin, USHORT& rAsian, USHORT& rComplex);
+    static void GetWhichIds( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16& rLatin, sal_uInt16& rAsian, sal_uInt16& rComplex);
 
-    void GetWhichIds( USHORT& rLatin, USHORT& rAsian, USHORT& rComplex) const;
+    void GetWhichIds( sal_uInt16& rLatin, sal_uInt16& rAsian, sal_uInt16& rComplex) const;
 
-    static void GetSlotIds( USHORT nSlotId, USHORT& rLatin, USHORT& rAsian,
-                                            USHORT& rComplex );
-    inline void GetSlotIds( USHORT& rLatin, USHORT& rAsian,
-                                USHORT& rComplex ) const
+    static void GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin, sal_uInt16& rAsian,
+                                            sal_uInt16& rComplex );
+    inline void GetSlotIds( sal_uInt16& rLatin, sal_uInt16& rAsian,
+                                sal_uInt16& rComplex ) const
     { GetSlotIds( Which(), rLatin, rAsian, rComplex ); }
 };
 
diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index b120df3bca19..7d6d76e7f075 100644
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -46,29 +46,29 @@ namespace rtl
     Dieses Item beschreibt ein Schattenattribut (Farbe, Breite, Lage).
 */
 
-#define SHADOW_TOP      ((USHORT)0)
-#define SHADOW_BOTTOM   ((USHORT)1)
-#define SHADOW_LEFT     ((USHORT)2)
-#define SHADOW_RIGHT    ((USHORT)3)
+#define SHADOW_TOP      ((sal_uInt16)0)
+#define SHADOW_BOTTOM   ((sal_uInt16)1)
+#define SHADOW_LEFT     ((sal_uInt16)2)
+#define SHADOW_RIGHT    ((sal_uInt16)3)
 
 class EDITENG_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
 {
     Color               aShadowColor;
-    USHORT              nWidth;
+    sal_uInt16              nWidth;
     SvxShadowLocation   eLocation;
 public:
     TYPEINFO();
 
-    SvxShadowItem( const USHORT nId ,
-                 const Color *pColor = 0, const USHORT nWidth = 100 /*5pt*/,
+    SvxShadowItem( const sal_uInt16 nId ,
+                 const Color *pColor = 0, const sal_uInt16 nWidth = 100 /*5pt*/,
                  const SvxShadowLocation eLoc = SVX_SHADOW_NONE );
 
     inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -76,27 +76,27 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
 
     const Color& GetColor() const { return aShadowColor;}
     void SetColor( const Color &rNew ) { aShadowColor = rNew; }
 
-    USHORT GetWidth() const { return nWidth; }
+    sal_uInt16 GetWidth() const { return nWidth; }
     SvxShadowLocation GetLocation() const { return eLocation; }
 
-    void SetWidth( USHORT nNew ) { nWidth = nNew; }
+    void SetWidth( sal_uInt16 nNew ) { nWidth = nNew; }
     void SetLocation( SvxShadowLocation eNew ) { eLocation = eNew; }
 
         //Breite des Schattens auf der jeweiligen Seite berechnen.
-    USHORT CalcShadowSpace( USHORT nShadow ) const;
+    sal_uInt16 CalcShadowSpace( sal_uInt16 nShadow ) const;
 
-    virtual USHORT          GetValueCount() const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetEnumValue() const;
-    virtual void            SetEnumValue( USHORT nNewVal );
+    virtual sal_uInt16          GetValueCount() const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetEnumValue() const;
+    virtual void            SetEnumValue( sal_uInt16 nNewVal );
 };
 
 inline SvxShadowItem &SvxShadowItem::operator=( const SvxShadowItem& rFmtShadow )
diff --git a/editeng/inc/editeng/shdditem.hxx b/editeng/inc/editeng/shdditem.hxx
index 72c3d3f655d7..54c26a3120da 100644
--- a/editeng/inc/editeng/shdditem.hxx
+++ b/editeng/inc/editeng/shdditem.hxx
@@ -50,13 +50,13 @@ class EDITENG_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxShadowedItem( const BOOL bShadowed /*= FALSE*/,
-                     const USHORT nId  );
+    SvxShadowedItem( const sal_Bool bShadowed /*= sal_False*/,
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index e99eda7a0753..6159c68855b7 100644
--- a/editeng/inc/editeng/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.hxx
@@ -48,15 +48,15 @@ class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxSizeItem( const USHORT nId );
-    SvxSizeItem( const USHORT nId, const Size& rSize);
+    SvxSizeItem( const sal_uInt16 nId );
+    SvxSizeItem( const sal_uInt16 nId, const Size& rSize);
 
     inline SvxSizeItem& operator=( const SvxSizeItem &rCpy );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -64,8 +64,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
 
diff --git a/editeng/inc/editeng/spltitem.hxx b/editeng/inc/editeng/spltitem.hxx
index d97959626fc6..0ab4d42c5ab7 100644
--- a/editeng/inc/editeng/spltitem.hxx
+++ b/editeng/inc/editeng/spltitem.hxx
@@ -51,14 +51,14 @@ public:
     TYPEINFO();
     ~SvxFmtSplitItem();
 
-    inline SvxFmtSplitItem( const BOOL bSplit /*= TRUE*/,
-                            const USHORT nWh  );
+    inline SvxFmtSplitItem( const sal_Bool bSplit /*= sal_True*/,
+                            const sal_uInt16 nWh  );
     inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT ) const;
-    virtual SvStream&       Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&       Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -66,7 +66,7 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxFmtSplitItem::SvxFmtSplitItem( const BOOL bSplit, const USHORT nWh ) :
+inline SvxFmtSplitItem::SvxFmtSplitItem( const sal_Bool bSplit, const sal_uInt16 nWh ) :
     SfxBoolItem( nWh, bSplit )
 {}
 
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index 1ef6bad09d9b..f355a669a304 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -76,25 +76,25 @@ public:
     SvxAutoCorrDoc() {}
     virtual ~SvxAutoCorrDoc();
 
-    virtual BOOL Delete( xub_StrLen nStt, xub_StrLen nEnd ) = 0;
-    virtual BOOL Insert( xub_StrLen nPos, const String& rTxt ) = 0;
-    virtual BOOL Replace( xub_StrLen nPos, const String& rTxt ) = 0;
+    virtual sal_Bool Delete( xub_StrLen nStt, xub_StrLen nEnd ) = 0;
+    virtual sal_Bool Insert( xub_StrLen nPos, const String& rTxt ) = 0;
+    virtual sal_Bool Replace( xub_StrLen nPos, const String& rTxt ) = 0;
 
-    virtual BOOL SetAttr( xub_StrLen nStt, xub_StrLen nEnd, USHORT nSlotId,
+    virtual sal_Bool SetAttr( xub_StrLen nStt, xub_StrLen nEnd, sal_uInt16 nSlotId,
                             SfxPoolItem& ) = 0;
 
-    virtual BOOL SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const String& rURL ) = 0;
+    virtual sal_Bool SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const String& rURL ) = 0;
 
     // returne den Text eines vorherigen Absatzes.
     // Dieser darf nicht leer sein!
     // Gibt es diesen nicht oder gibt es davor nur Leere, dann returne 0
     // Das Flag gibt an:
-    //      TRUE: den, vor der normalen Einfuegeposition (TRUE)
-    //      FALSE: den, in den das korrigierte Wort eingfuegt wurde.
+    //      sal_True: den, vor der normalen Einfuegeposition (sal_True)
+    //      sal_False: den, in den das korrigierte Wort eingfuegt wurde.
     //              (Muss nicht der gleiche Absatz sein!!!!)
-    virtual const String* GetPrevPara( BOOL bAtNormalPos ) = 0;
+    virtual const String* GetPrevPara( sal_Bool bAtNormalPos ) = 0;
 
-    virtual BOOL ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos,
+    virtual sal_Bool ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos,
                                   SvxAutoCorrect& rACorrect,
                                   const String** ppPara ) = 0;
     // wird nach dem austauschen der Zeichen von den Funktionen
@@ -102,27 +102,27 @@ public:
     //  - FnCptlSttSntnc
     // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten
     // aufgenommen werden.
-    virtual void SaveCpltSttWord( ULONG nFlag, xub_StrLen nPos,
+    virtual void SaveCpltSttWord( sal_uLong nFlag, xub_StrLen nPos,
                                     const String& rExceptWord,
                                     sal_Unicode cChar );
 
     // welche Sprache gilt an der Position?
-    virtual LanguageType GetLanguage( xub_StrLen nPos, BOOL bPrevPara = FALSE ) const;
+    virtual LanguageType GetLanguage( xub_StrLen nPos, sal_Bool bPrevPara = sal_False ) const;
 };
 
 
 class EDITENG_DLLPUBLIC SvxAutocorrWord
 {
     String sShort, sLong;
-    BOOL bIsTxtOnly;                // ist reiner ASCII - Text
+    sal_Bool bIsTxtOnly;                // ist reiner ASCII - Text
 public:
-    SvxAutocorrWord( const String& rS, const String& rL, BOOL bFlag = TRUE )
+    SvxAutocorrWord( const String& rS, const String& rL, sal_Bool bFlag = sal_True )
         : sShort( rS ), sLong( rL ), bIsTxtOnly( bFlag )
     {}
 
     const String& GetShort() const                  { return sShort; }
     const String& GetLong() const                   { return sLong; }
-    BOOL IsTextOnly() const                         { return bIsTxtOnly; }
+    sal_Bool IsTextOnly() const                         { return bIsTxtOnly; }
 };
 
 typedef SvxAutocorrWord* SvxAutocorrWordPtr;
@@ -143,16 +143,16 @@ class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists
 
     long nFlags;
 
-    BOOL IsFileChanged_Imp();
+    sal_Bool IsFileChanged_Imp();
     void LoadXMLExceptList_Imp( SvStringsISortDtor*& rpLst,
                                 const sal_Char* pStrmName,
                                 SotStorageRef& rStg);
     void SaveExceptList_Imp( const SvStringsISortDtor& rLst,
                                 const sal_Char* pStrmName,
                                 SotStorageRef& rStg,
-                                BOOL bConvert = FALSE);
+                                sal_Bool bConvert = sal_False);
 
-    BOOL MakeBlocklist_Imp( SotStorage& rStg );
+    sal_Bool MakeBlocklist_Imp( SotStorage& rStg );
     void RemoveStream_Imp( const String& rName );
     void MakeUserStorage_Impl();
 
@@ -174,7 +174,7 @@ public:
     void SaveCplSttExceptList();
     void SetCplSttExceptList( SvStringsISortDtor* pList );
     SvStringsISortDtor* GetCplSttExceptList();
-    BOOL AddToCplSttExceptList(const String& rNew);
+    sal_Bool AddToCplSttExceptList(const String& rNew);
 
     // Lade, Setze, Gebe die Ausnahmeliste fuer 2 Grossbuchstaben am
     // Wortanfang
@@ -182,17 +182,17 @@ public:
     void SaveWrdSttExceptList();
     void SetWrdSttExceptList( SvStringsISortDtor* pList );
     SvStringsISortDtor* GetWrdSttExceptList();
-    BOOL AddToWrdSttExceptList(const String& rNew);
+    sal_Bool AddToWrdSttExceptList(const String& rNew);
 
     // Speichern von Wortersetzungen:
     //      Diese speichern direkt im Storage. Die Wortliste wird
     //      entsprechend aktualisiert!
     //  - purer Text
-    BOOL PutText( const String& rShort, const String& rLong );
+    sal_Bool PutText( const String& rShort, const String& rLong );
     //  - Text mit Attributierung (kann nur der SWG - SWG-Format!)
-    BOOL PutText( const String& rShort, SfxObjectShell& );
+    sal_Bool PutText( const String& rShort, SfxObjectShell& );
     //  - loesche einen Eintrag
-    BOOL DeleteText( const String& rShort );
+    sal_Bool DeleteText( const String& rShort );
 };
 
 
@@ -226,19 +226,19 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
 protected:
     //  - Text mit Attributierung (kann nur der SWG - SWG-Format!)
     //      rShort ist der Stream-Name - gecryptet!
-    virtual BOOL PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, SfxObjectShell& ,
+    virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, SfxObjectShell& ,
                             String& );
 
     // geforderte Sprache in die Tabelle eintragen gfs. nur wenn das file existiert
-    BOOL    CreateLanguageFile(LanguageType eLang, BOOL bNewFile = TRUE);
+    sal_Bool    CreateLanguageFile(LanguageType eLang, sal_Bool bNewFile = sal_True);
     //  - return den Ersetzungstext (nur fuer SWG-Format, alle anderen
     //      koennen aus der Wortliste herausgeholt werden!)
     //      rShort ist der Stream-Name - gecryptet!
 public:
     //The method below is changed from private to public by BerryJia for Bug95846 Time:2002-8-13 15:50
-    sal_Unicode GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
+    sal_Unicode GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote,
                             LanguageType eLang ) const;
-    virtual BOOL GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, String& rLong );
+    virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, String& rLong );
 
     TYPEINFO();
 
@@ -249,12 +249,12 @@ public:
 
     // fuehre eine AutoKorrektur aus.
     // returnt was ausgefuehrt wurde; entsprechend den obigen Flags
-    ULONG AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
-                        xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert );
+    sal_uLong AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
+                        xub_StrLen nPos, sal_Unicode cInsChar, sal_Bool bInsert );
 
     // return fuer die Autotext Expandierung das vorherige Wort, was dem
     // AutoCorrect - Algorythmus entspricht.
-    BOOL GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, const String& rTxt,
+    sal_Bool GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen nPos, String& rWord ) const;
 
     // suche das oder die Worte in der ErsetzungsTabelle.
@@ -280,24 +280,24 @@ public:
     void SetEndDoubleQuote( const sal_Unicode cEnd )        { cEndDQuote = cEnd; }
 
     String GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
-                    sal_Unicode cInsChar, BOOL bSttQuote );
+                    sal_Unicode cInsChar, sal_Bool bSttQuote );
     void InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
-                    sal_Unicode cInsChar, BOOL bSttQuote, BOOL bIns );
+                    sal_Unicode cInsChar, sal_Bool bSttQuote, sal_Bool bIns );
 
     // erfrage / setze den Namen der AutoKorrektur-Datei
     // defaultet auf "autocorr.dat"
     String GetAutoCorrFileName( LanguageType eLang = LANGUAGE_SYSTEM,
-                                BOOL bNewFile = FALSE,
-                                BOOL bTstUserExist = FALSE ) const;
+                                sal_Bool bNewFile = sal_False,
+                                sal_Bool bTstUserExist = sal_False ) const;
     void SetUserAutoCorrFileName( const String& rNew );
     void SetShareAutoCorrFileName( const String& rNew );
 
     // erfrage / setze die aktuellen Einstellungen der AutoKorrektur
     long GetFlags() const                       { return nFlags; }
     inline SvxSwAutoFmtFlags&   GetSwFlags()    { return aSwFlags;}
-    BOOL IsAutoCorrFlag( long nFlag ) const
-                                { return nFlags & nFlag ? TRUE : FALSE; }
-    void SetAutoCorrFlag( long nFlag, BOOL bOn = TRUE );
+    sal_Bool IsAutoCorrFlag( long nFlag ) const
+                                { return nFlags & nFlag ? sal_True : sal_False; }
+    void SetAutoCorrFlag( long nFlag, sal_Bool bOn = sal_True );
 
     // Lade, Setze, Gebe - die Ersetzungsliste
     SvxAutocorrWordList* LoadAutocorrWordList(
@@ -311,14 +311,14 @@ public:
     //      Diese speichern direkt im Storage. Die Wortliste wird
     //      entsprechend aktualisiert!
     //  - purer Text
-    BOOL PutText( const String& rShort, const String& rLong, LanguageType eLang = LANGUAGE_SYSTEM );
+    sal_Bool PutText( const String& rShort, const String& rLong, LanguageType eLang = LANGUAGE_SYSTEM );
     //  - Text mit Attributierung (kann nur der SWG - SWG-Format!)
-    BOOL PutText( const String& rShort, SfxObjectShell& rShell,
+    sal_Bool PutText( const String& rShort, SfxObjectShell& rShell,
                  LanguageType eLang = LANGUAGE_SYSTEM )
         { return _GetLanguageList( eLang ).PutText(rShort, rShell ); }
 
     //  - loesche einen Eintrag
-    BOOL DeleteText( const String& rShort, LanguageType eLang = LANGUAGE_SYSTEM);
+    sal_Bool DeleteText( const String& rShort, LanguageType eLang = LANGUAGE_SYSTEM);
 
     // Lade, Setze, Gebe - die Ausnahmeliste fuer Grossbuchstabe am
     // Satzanfang
@@ -332,7 +332,7 @@ public:
 
     // fuegt ein einzelnes Wort hinzu. Die Liste wird sofort
     // in die Datei geschrieben!
-    BOOL AddCplSttException( const String& rNew,
+    sal_Bool AddCplSttException( const String& rNew,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
 
     // Lade, Setze, Gebe die Ausnahmeliste fuer 2 Grossbuchstaben am
@@ -346,33 +346,33 @@ public:
         {   return _GetLanguageList( eLang ).GetWrdSttExceptList(); }
     // fuegt ein einzelnes Wort hinzu. Die Liste wird sofort
     // in die Datei geschrieben!
-    BOOL AddWrtSttException( const String& rNew, LanguageType eLang = LANGUAGE_SYSTEM);
+    sal_Bool AddWrtSttException( const String& rNew, LanguageType eLang = LANGUAGE_SYSTEM);
 
     //ueber die Sprachen nach dem Eintrag suchen
-    BOOL FindInWrdSttExceptList( LanguageType eLang, const String& sWord );
-    BOOL FindInCplSttExceptList( LanguageType eLang, const String& sWord,
-                                    BOOL bAbbreviation = FALSE);
+    sal_Bool FindInWrdSttExceptList( LanguageType eLang, const String& sWord );
+    sal_Bool FindInCplSttExceptList( LanguageType eLang, const String& sWord,
+                                    sal_Bool bAbbreviation = sal_False);
 
     // die einzelnen Methoden fuer die Autokorrektur
-    BOOL FnCptlSttWrd( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnCptlSttWrd( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnChgOrdinalNumber( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnChgOrdinalNumber( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnSetINetAttr( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnSetINetAttr( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnChgWeightUnderl( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnChgWeightUnderl( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnCptlSttSntnc( SvxAutoCorrDoc&, const String&, BOOL bNormalPos,
+    sal_Bool FnCptlSttSntnc( SvxAutoCorrDoc&, const String&, sal_Bool bNormalPos,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang  = LANGUAGE_SYSTEM);
 
@@ -380,7 +380,7 @@ public:
 
     static long         GetDefaultFlags();
 
-// returns TRUE for charcters where the function
+// returns sal_True for charcters where the function
 // 'SvxAutoCorrect::AutoCorrect' should be called.
 // (used to avoid occasional 'collisions' with (Thai) input-sequence-checking)
     static sal_Bool     IsAutoCorrectChar( sal_Unicode cChar );
diff --git a/editeng/inc/editeng/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx
index f1e53b31276e..498ad5f296d4 100644
--- a/editeng/inc/editeng/svxfont.hxx
+++ b/editeng/inc/editeng/svxfont.hxx
@@ -42,7 +42,7 @@ class EDITENG_DLLPUBLIC SvxFont : public Font
     LanguageType eLang;         // Language
     SvxCaseMap   eCaseMap;      // Textauszeichnung
     short nEsc;                 // Grad der Hoch-/Tiefstellung
-    BYTE  nPropr;               // Grad der Verkleinerung der Fonthoehe
+    sal_uInt8  nPropr;               // Grad der Verkleinerung der Fonthoehe
     short nKern;                // Kerning in Pt
 
 public:
@@ -54,10 +54,10 @@ public:
     inline short GetEscapement() const { return nEsc; }
     inline void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; }
 
-    inline BYTE GetPropr() const { return nPropr; }
-    inline void SetPropr( const BYTE nNewPropr ) { nPropr = nNewPropr; }
-    inline void SetProprRel( const BYTE nNewPropr )
-        { SetPropr( (BYTE)( (long)nNewPropr * (long)nPropr / 100L ) ); }
+    inline sal_uInt8 GetPropr() const { return nPropr; }
+    inline void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; }
+    inline void SetProprRel( const sal_uInt8 nNewPropr )
+        { SetPropr( (sal_uInt8)( (long)nNewPropr * (long)nPropr / 100L ) ); }
 
     // Kerning
     inline short GetFixKerning() const { return nKern; }
@@ -71,10 +71,10 @@ public:
         { eLang = eNewLan;  Font::SetLanguage(eNewLan); }
 
     // Is-Methoden:
-    inline BOOL IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; }
-    inline BOOL IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; }
-    inline BOOL IsKern() const { return 0 != nKern; }
-    inline BOOL IsEsc() const { return 0 != nEsc; }
+    inline sal_Bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; }
+    inline sal_Bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; }
+    inline sal_Bool IsKern() const { return 0 != nKern; }
+    inline sal_Bool IsEsc() const { return 0 != nEsc; }
 
     // Versalien, Gemeine etc. beruecksichtigen
     String CalcCaseMap( const String &rTxt ) const;
@@ -84,40 +84,40 @@ public:
 #ifndef REDUCEDSVXFONT
     // Kapitaelchenbearbeitung
     void DoOnCapitals( SvxDoCapitals &rDo,
-                       const USHORT nPartLen = USHRT_MAX ) const;
+                       const sal_uInt16 nPartLen = USHRT_MAX ) const;
 
     void SetPhysFont( OutputDevice *pOut ) const;
     Font ChgPhysFont( OutputDevice *pOut ) const;
 
     Size GetCapitalSize( const OutputDevice *pOut, const String &rTxt,
-                          const USHORT nIdx, const USHORT nLen) const;
+                          const sal_uInt16 nIdx, const sal_uInt16 nLen) const;
     void DrawCapital( OutputDevice *pOut, const Point &rPos, const String &rTxt,
-                      const USHORT nIdx, const USHORT nLen ) const;
+                      const sal_uInt16 nIdx, const sal_uInt16 nLen ) const;
 
     Size GetPhysTxtSize( const OutputDevice *pOut, const String &rTxt,
-                         const USHORT nIdx, const USHORT nLen ) const;
+                         const sal_uInt16 nIdx, const sal_uInt16 nLen ) const;
 
     Size GetPhysTxtSize( const OutputDevice *pOut, const String &rTxt );
 
     Size GetTxtSize( const OutputDevice *pOut, const String &rTxt,
-                      const USHORT nIdx = 0, const USHORT nLen = STRING_LEN );
+                      const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN );
 
     void DrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt,
-               const USHORT nIdx = 0, const USHORT nLen = STRING_LEN ) const;
+               const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const;
 
     void QuickDrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt,
-               const USHORT nIdx = 0, const USHORT nLen = STRING_LEN, const sal_Int32* pDXArray = NULL ) const;
+               const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN, const sal_Int32* pDXArray = NULL ) const;
 
     Size QuickGetTextSize( const OutputDevice *pOut, const String &rTxt,
-                         const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray = NULL ) const;
+                         const sal_uInt16 nIdx, const sal_uInt16 nLen, sal_Int32* pDXArray = NULL ) const;
 
     void DrawPrev( OutputDevice* pOut, Printer* pPrinter,
                    const Point &rPos, const String &rTxt,
-                   const USHORT nIdx = 0, const USHORT nLen = STRING_LEN ) const;
+                   const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const;
 
 #endif // !REDUCEDSVXFONT
     static void DrawArrow( OutputDevice &rOut, const Rectangle& rRect,
-        const Size& rSize, const Color& rCol, BOOL bLeft );
+        const Size& rSize, const Color& rCol, sal_Bool bLeft );
     SvxFont&    operator=( const SvxFont& rFont );
     SvxFont&    operator=( const Font& rFont );
 };
diff --git a/editeng/inc/editeng/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index 62bc6efcd4bf..a56c28e42a81 100644
--- a/editeng/inc/editeng/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -33,7 +33,7 @@
 #include <svl/itemset.hxx>
 #include <svtools/parrtf.hxx>
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uInt16S
 #include <svl/svstdarr.hxx>
 #include <editeng/editengdllapi.h>
 
@@ -60,14 +60,14 @@ namespace com { namespace sun { namespace star {
 
 // Mapper-Klassen fuer die verschiedenen Anforderungen an Doc-Positionen
 //        Swg - NodePosition ist ein SwIndex, der intern veraendert wird
-// EditEngine - ULONG auf Liste von Absaetzen
+// EditEngine - sal_uInt32 auf Liste von Absaetzen
 // .....
 
 class SvxNodeIdx
 {
 public:
     virtual ~SvxNodeIdx() {}
-    virtual ULONG   GetIdx() const = 0;
+    virtual sal_uLong   GetIdx() const = 0;
     virtual SvxNodeIdx* Clone() const = 0;  // erzeuge von sich eine Kopie
 };
 
@@ -76,7 +76,7 @@ class SvxPosition
 public:
     virtual ~SvxPosition() {}
 
-    virtual ULONG       GetNodeIdx() const = 0;
+    virtual sal_uLong   GetNodeIdx() const = 0;
     virtual xub_StrLen  GetCntIdx() const = 0;
 
     virtual SvxPosition* Clone() const = 0; // erzeuge von sich eine Kopie
@@ -100,12 +100,12 @@ struct SvxRTFStyleType
 {
     SfxItemSet aAttrSet;        // die Attribute vom Style (+Ableitung!)
     String sName;
-    USHORT nBasedOn, nNext;
-    BOOL bBasedOnIsSet; //$flr #117411#
-    BYTE nOutlineNo;
-    BOOL bIsCharFmt;
+    sal_uInt16 nBasedOn, nNext;
+    sal_Bool bBasedOnIsSet; //$flr #117411#
+    sal_uInt8 nOutlineNo;
+    sal_Bool bIsCharFmt;
 
-    SvxRTFStyleType( SfxItemPool& rPool, const USHORT* pWhichRange );
+    SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange );
 };
 
 
@@ -132,14 +132,14 @@ struct EDITENG_DLLPUBLIC SvxRTFPictureType
         HEX_MODE
     } nMode;
 
-    USHORT  nType;
+    sal_uInt16  nType;
     sal_uInt32 uPicLen;
-    USHORT  nWidth, nHeight;
-    USHORT  nGoalWidth, nGoalHeight;
-    USHORT  nBitsPerPixel;
-    USHORT  nPlanes;
-    USHORT  nWidthBytes;
-    USHORT  nScalX, nScalY;
+    sal_uInt16  nWidth, nHeight;
+    sal_uInt16  nGoalWidth, nGoalHeight;
+    sal_uInt16  nBitsPerPixel;
+    sal_uInt16  nPlanes;
+    sal_uInt16  nWidthBytes;
+    sal_uInt16  nScalX, nScalY;
     short   nCropT, nCropB, nCropL, nCropR;
     PictPropertyNameValuePairs aPropertyPairs;
     SvxRTFPictureType() { ResetValues(); }
@@ -152,7 +152,7 @@ struct EDITENG_DLLPUBLIC SvxRTFPictureType
 // Die Ids werden ueber die SlotIds vom POOL richtig gesetzt.
 struct RTFPlainAttrMapIds
 {
-    USHORT  nCaseMap,
+    sal_uInt16  nCaseMap,
             nBgColor,
             nColor,
             nContour,
@@ -195,7 +195,7 @@ struct RTFPlainAttrMapIds
 // Die Ids werden ueber die SlotIds vom POOL richtig gesetzt.
 struct RTFPardAttrMapIds
 {
-    USHORT  nLinespacing,
+    sal_uInt16  nLinespacing,
             nAdjust,
             nTabStop,
             nHyphenzone,
@@ -246,23 +246,23 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
     long    nVersionNo;
     int     nDfltFont;
 
-    BOOL    bNewDoc : 1;            // FALSE - in ein bestehendes lesen
-    BOOL    bNewGroup : 1;          // TRUE - es gab eine oeffnende Klammer
-    BOOL    bIsSetDfltTab : 1;      // TRUE - DefTab wurde eingelesen
-    BOOL    bChkStyleAttr : 1;      // TRUE - StyleSheets werden ausgewertet
-    BOOL    bCalcValue : 1;         // TRUE - Twipwerte an APP anpassen
-    BOOL    bPardTokenRead : 1;     // TRUE - Token \pard wurde erkannt
-    BOOL    bReadDocInfo : 1;       // TRUE - DocInfo mit einlesen
-    BOOL    bIsLeftToRightDef : 1;  // TRUE - in LeftToRight char run def.
-                                    // FALSE - in RightToLeft char run def.
-    BOOL    bIsInReadStyleTab : 1;  // TRUE - in ReadStyleTable
+    sal_Bool    bNewDoc : 1;            // sal_False - in ein bestehendes lesen
+    sal_Bool    bNewGroup : 1;          // sal_True - es gab eine oeffnende Klammer
+    sal_Bool    bIsSetDfltTab : 1;      // sal_True - DefTab wurde eingelesen
+    sal_Bool    bChkStyleAttr : 1;      // sal_True - StyleSheets werden ausgewertet
+    sal_Bool    bCalcValue : 1;         // sal_True - Twipwerte an APP anpassen
+    sal_Bool    bPardTokenRead : 1;     // sal_True - Token \pard wurde erkannt
+    sal_Bool    bReadDocInfo : 1;       // sal_True - DocInfo mit einlesen
+    sal_Bool    bIsLeftToRightDef : 1;  // sal_True - in LeftToRight char run def.
+                                    // sal_False - in RightToLeft char run def.
+    sal_Bool    bIsInReadStyleTab : 1;  // sal_True - in ReadStyleTable
 
     void ClearColorTbl();
     void ClearFontTbl();
     void ClearStyleTbl();
     void ClearAttrStack();
 
-    SvxRTFItemStackTypePtr _GetAttrSet( int bCopyAttr=FALSE );  // neue ItemStackType anlegen
+    SvxRTFItemStackTypePtr _GetAttrSet( int bCopyAttr=sal_False );  // neue ItemStackType anlegen
     void _ClearStyleAttr( SvxRTFItemStackType& rStkType );
 
     // setzt alle Attribute, die unterschiedlich zum aktuellen sind
@@ -321,7 +321,7 @@ protected:
 
 
     virtual void InsertText() = 0;
-    virtual void MovePos( int bForward = TRUE ) = 0;
+    virtual void MovePos( int bForward = sal_True ) = 0;
     virtual void SetEndPrevPara( SvxNodeIdx*& rpNodePos,
                                  xub_StrLen& rCntPos )=0;
     virtual void SetAttrInDoc( SvxRTFItemStackType &rSet );
@@ -335,7 +335,7 @@ protected:
                     SvStream& rIn,
                     ::com::sun::star::uno::Reference<
                         ::com::sun::star::document::XDocumentProperties> i_xDocProps,
-                    int bReadNewDoc = TRUE );
+                    int bReadNewDoc = sal_True );
     virtual ~SvxRTFParser();
 
     int IsNewDoc() const                { return bNewDoc; }
@@ -359,8 +359,8 @@ protected:
 
     // erfrage/setze die Mapping-Ids fuer die Pard/Plain Attribute
     // (Set: es werden sich die Pointer gemerkt, also keine Kopie erzeugt!!! )
-    void AddPardAttr( USHORT nWhich ) { aPardMap.Insert( nWhich, aPardMap.Count() ); }
-    void AddPlainAttr( USHORT nWhich ) { aPlainMap.Insert( nWhich, aPlainMap.Count() ); }
+    void AddPardAttr( sal_uInt16 nWhich ) { aPardMap.Insert( nWhich, aPardMap.Count() ); }
+    void AddPlainAttr( sal_uInt16 nWhich ) { aPlainMap.Insert( nWhich, aPlainMap.Count() ); }
 
     SvxRTFStyleTbl& GetStyleTbl()               { return aStyleTbl; }
     SvxRTFItemStack& GetAttrStack()             { return aAttrStack; }
@@ -371,8 +371,8 @@ protected:
 
         // lesen die GrafikDaten und fuelle damit die Grafik und die
         // die PicDaten.
-        // Return - TRUE: die Grafik ist gueltig
-    BOOL ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType );
+        // Return - sal_True: die Grafik ist gueltig
+    sal_Bool ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType );
         // wandel die ASCII-HexCodes in binaere Zeichen um. Werden
         // ungueltige Daten gefunden (Zeichen ausser 0-9|a-f|A-F, so
         // wird USHRT_MAX returnt, ansonsten die Anzahl der umgewandelten Ze.
@@ -383,7 +383,7 @@ public:
     virtual SvParserState CallParser(); // Aufruf des Parsers
 
     inline const Color& GetColor( size_t nId ) const;
-    const Font& GetFont( USHORT nId );      // aendert den dflt Font
+    const Font& GetFont( sal_uInt16 nId );      // aendert den dflt Font
 
     virtual int IsEndPara( SvxNodeIdx* pNd, xub_StrLen nCnt ) const = 0;
 
@@ -396,8 +396,8 @@ public:
     RTFPlainAttrMapIds& GetPlainMap()
                         { return (RTFPlainAttrMapIds&)*aPlainMap.GetData(); }
     // um diese von aussen z.B. Tabellenzellen zuordnen zu koennen
-    void ReadBorderAttr( int nToken, SfxItemSet& rSet, int bTableDef=FALSE );
-    void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=FALSE  );
+    void ReadBorderAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False );
+    void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False  );
 
     // fuers asynchrone lesen aus dem SvStream
     virtual void Continue( int nToken );
@@ -419,9 +419,9 @@ class EDITENG_DLLPUBLIC SvxRTFItemStackType
     SvxNodeIdx  *pSttNd, *pEndNd;
     xub_StrLen nSttCnt, nEndCnt;
     SvxRTFItemStackList* pChildList;
-    USHORT nStyleNo;
+    sal_uInt16 nStyleNo;
 
-    SvxRTFItemStackType( SfxItemPool&, const USHORT* pWhichRange,
+    SvxRTFItemStackType( SfxItemPool&, const sal_uInt16* pWhichRange,
                             const SvxPosition& );
     ~SvxRTFItemStackType();
 
@@ -430,7 +430,7 @@ class EDITENG_DLLPUBLIC SvxRTFItemStackType
 
 public:
     SvxRTFItemStackType( const SvxRTFItemStackType&, const SvxPosition&,
-                        int bCopyAttr = FALSE );
+                        int bCopyAttr = sal_False );
     //cmc, I'm very suspicios about SetStartPos, it doesn't change
     //its children's starting position, and the implementation looks
     //bad, consider this deprecated.
@@ -439,8 +439,8 @@ public:
     void MoveFullNode(const SvxNodeIdx &rOldNode,
         const SvxNodeIdx &rNewNode);
 
-    ULONG GetSttNodeIdx() const { return pSttNd->GetIdx(); }
-    ULONG GetEndNodeIdx() const { return pEndNd->GetIdx(); }
+    sal_uLong GetSttNodeIdx() const { return pSttNd->GetIdx(); }
+    sal_uLong GetEndNodeIdx() const { return pEndNd->GetIdx(); }
 
     const SvxNodeIdx& GetSttNode() const { return *pSttNd; }
     const SvxNodeIdx& GetEndNode() const { return *pEndNd; }
@@ -451,7 +451,7 @@ public:
           SfxItemSet& GetAttrSet()          { return aAttrSet; }
     const SfxItemSet& GetAttrSet() const    { return aAttrSet; }
 
-    USHORT StyleNo() const  { return nStyleNo; }
+    sal_uInt16 StyleNo() const  { return nStyleNo; }
 
     void SetRTFDefaults( const SfxItemSet& rDefaults );
 };
diff --git a/editeng/inc/editeng/swafopt.hxx b/editeng/inc/editeng/swafopt.hxx
index c80711725add..f777730355f9 100644
--- a/editeng/inc/editeng/swafopt.hxx
+++ b/editeng/inc/editeng/swafopt.hxx
@@ -44,54 +44,54 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
     sal_Unicode cBullet;
     sal_Unicode cByInputBullet;
 
-    USHORT nAutoCmpltWordLen, nAutoCmpltListLen;
-    USHORT nAutoCmpltExpandKey;
+    sal_uInt16 nAutoCmpltWordLen, nAutoCmpltListLen;
+    sal_uInt16 nAutoCmpltExpandKey;
 
-    BYTE nRightMargin;
+    sal_uInt8 nRightMargin;
 
-    BOOL bAutoCorrect : 1;
-    BOOL bCptlSttSntnc : 1;
-    BOOL bCptlSttWrd : 1;
-    BOOL bChkFontAttr : 1;
+    sal_Bool bAutoCorrect : 1;
+    sal_Bool bCptlSttSntnc : 1;
+    sal_Bool bCptlSttWrd : 1;
+    sal_Bool bChkFontAttr : 1;
 
-    BOOL bChgUserColl : 1;
-    BOOL bChgEnumNum : 1;
+    sal_Bool bChgUserColl : 1;
+    sal_Bool bChgEnumNum : 1;
 
-    BOOL bAFmtByInput : 1;
-    BOOL bDelEmptyNode : 1;
-    BOOL bSetNumRule : 1;
+    sal_Bool bAFmtByInput : 1;
+    sal_Bool bDelEmptyNode : 1;
+    sal_Bool bSetNumRule : 1;
 
-    BOOL bChgOrdinalNumber : 1;
-    BOOL bChgToEnEmDash : 1;
-    BOOL bAddNonBrkSpace : 1;
-    BOOL bChgWeightUnderl : 1;
-    BOOL bSetINetAttr : 1;
+    sal_Bool bChgOrdinalNumber : 1;
+    sal_Bool bChgToEnEmDash : 1;
+    sal_Bool bAddNonBrkSpace : 1;
+    sal_Bool bChgWeightUnderl : 1;
+    sal_Bool bSetINetAttr : 1;
 
-    BOOL bSetBorder : 1;
-    BOOL bCreateTable : 1;
-    BOOL bReplaceStyles : 1;
-    BOOL bDummy : 1;
+    sal_Bool bSetBorder : 1;
+    sal_Bool bCreateTable : 1;
+    sal_Bool bReplaceStyles : 1;
+    sal_Bool bDummy : 1;
 
-    BOOL bWithRedlining : 1;
+    sal_Bool bWithRedlining : 1;
 
-    BOOL bRightMargin : 1;
+    sal_Bool bRightMargin : 1;
 
-    BOOL bAutoCompleteWords : 1;
-    BOOL bAutoCmpltCollectWords : 1;
-    BOOL bAutoCmpltEndless : 1;
+    sal_Bool bAutoCompleteWords : 1;
+    sal_Bool bAutoCmpltCollectWords : 1;
+    sal_Bool bAutoCmpltEndless : 1;
 // -- under NT hier starts a new long
-    BOOL bAutoCmpltAppendBlanc : 1;
-    BOOL bAutoCmpltShowAsTip : 1;
+    sal_Bool bAutoCmpltAppendBlanc : 1;
+    sal_Bool bAutoCmpltShowAsTip : 1;
 
-    BOOL bAFmtDelSpacesAtSttEnd : 1;
-    BOOL bAFmtDelSpacesBetweenLines : 1;
-    BOOL bAFmtByInpDelSpacesAtSttEnd : 1;
-    BOOL bAFmtByInpDelSpacesBetweenLines : 1;
+    sal_Bool bAFmtDelSpacesAtSttEnd : 1;
+    sal_Bool bAFmtDelSpacesBetweenLines : 1;
+    sal_Bool bAFmtByInpDelSpacesAtSttEnd : 1;
+    sal_Bool bAFmtByInpDelSpacesBetweenLines : 1;
 
-    BOOL bAutoCmpltKeepList : 1;
+    sal_Bool bAutoCmpltKeepList : 1;
 
     // some dummies for any new options
-    BOOL bDummy6 : 1,
+    sal_Bool bDummy6 : 1,
          bDummy7 : 1,
          bDummy8 : 1
          ;
diff --git a/editeng/inc/editeng/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
index 887258c20f4f..d3554607b79c 100644
--- a/editeng/inc/editeng/tstpitem.hxx
+++ b/editeng/inc/editeng/tstpitem.hxx
@@ -83,7 +83,7 @@ public:
     String          GetValueString() const;
 
     // das "alte" operator==()
-    BOOL            IsEqual( const SvxTabStop& rTS ) const
+    sal_Bool            IsEqual( const SvxTabStop& rTS ) const
                         {
                             return ( nTabPos     == rTS.nTabPos     &&
                                      eAdjustment == rTS.eAdjustment &&
@@ -92,9 +92,9 @@ public:
                         }
 
     // Fuer das SortedArray:
-    BOOL            operator==( const SvxTabStop& rTS ) const
+    sal_Bool            operator==( const SvxTabStop& rTS ) const
                         { return nTabPos == rTS.nTabPos; }
-    BOOL            operator <( const SvxTabStop& rTS ) const
+    sal_Bool            operator <( const SvxTabStop& rTS ) const
                         { return nTabPos < rTS.nTabPos; }
 
     SvxTabStop&     operator=( const SvxTabStop& rTS )
@@ -123,27 +123,27 @@ class EDITENG_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopA
 public:
     TYPEINFO();
 
-    SvxTabStopItem( USHORT nWhich  );
-    SvxTabStopItem( const USHORT nTabs,
-                    const USHORT nDist,
+    SvxTabStopItem( sal_uInt16 nWhich  );
+    SvxTabStopItem( const sal_uInt16 nTabs,
+                    const sal_uInt16 nDist,
                     const SvxTabAdjust eAdjst /*= SVX_TAB_ADJUST_DEFAULT*/,
-                    USHORT nWhich  );
+                    sal_uInt16 nWhich  );
     SvxTabStopItem( const SvxTabStopItem& rTSI );
 
     // Liefert Index-Position des Tabs zurueck oder TAB_NOTFOUND
-    USHORT          GetPos( const SvxTabStop& rTab ) const;
+    sal_uInt16          GetPos( const SvxTabStop& rTab ) const;
 
     // Liefert Index-Position des Tabs an nPos zurueck oder TAB_NOTFOUND
-    USHORT          GetPos( const long nPos ) const;
+    sal_uInt16          GetPos( const long nPos ) const;
 
     // entprivatisiert:
-    USHORT          Count() const { return SvxTabStopArr::Count(); }
-    BOOL            Insert( const SvxTabStop& rTab );
-    void            Insert( const SvxTabStopItem* pTabs, USHORT nStart = 0,
-                            USHORT nEnd = USHRT_MAX );
+    sal_uInt16          Count() const { return SvxTabStopArr::Count(); }
+    sal_Bool            Insert( const SvxTabStop& rTab );
+    void            Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart = 0,
+                            sal_uInt16 nEnd = USHRT_MAX );
     void            Remove( SvxTabStop& rTab )
                         { SvxTabStopArr::Remove( rTab ); }
-    void            Remove( const USHORT nPos, const USHORT nLen = 1 )
+    void            Remove( const sal_uInt16 nPos, const sal_uInt16 nLen = 1 )
                         { SvxTabStopArr::Remove( nPos, nLen ); }
 
     // Zuweisungsoperator, Gleichheitsoperator (vorsicht: teuer!)
@@ -154,7 +154,7 @@ public:
     //                  { return !( operator==( rTSI ) ); }
 
     // SortedArrays liefern nur Stackobjekte zurueck!
-    const SvxTabStop& operator[]( const USHORT nPos ) const
+    const SvxTabStop& operator[]( const sal_uInt16 nPos ) const
                         {
                             DBG_ASSERT( GetStart() &&
                                         nPos < Count(), "op[]" );
@@ -165,8 +165,8 @@ public:
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -174,8 +174,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create( SvStream&, USHORT ) const;
-    virtual SvStream&        Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&        Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     using SvxTabStopArr::Insert;
     using SvxTabStopArr::Remove;
diff --git a/editeng/inc/editeng/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx
index 19ae8c976565..7f167386d5fa 100644
--- a/editeng/inc/editeng/twolinesitem.hxx
+++ b/editeng/inc/editeng/twolinesitem.hxx
@@ -43,7 +43,7 @@ class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
     sal_Bool bOn;
 public:
     TYPEINFO();
-    SvxTwoLinesItem( sal_Bool bOn /*= TRUE*/,
+    SvxTwoLinesItem( sal_Bool bOn /*= sal_True*/,
                      sal_Unicode nStartBracket /*= 0*/,
                      sal_Unicode nEndBracket /*= 0*/,
                      sal_uInt16 nId  );
@@ -53,8 +53,8 @@ public:
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream &, USHORT nIVer) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nIVer) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -62,11 +62,11 @@ public:
                                     const IntlWrapper* pIntl = 0 ) const;
 
     virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 ) const;
+                                        sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 );
+                                        sal_uInt8 nMemberId = 0 );
 
-    virtual USHORT          GetVersion( USHORT nFFVer ) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFFVer ) const;
 
     SvxTwoLinesItem&        operator=( const SvxTwoLinesItem& rCpy )
     {
diff --git a/editeng/inc/editeng/txtrange.hxx b/editeng/inc/editeng/txtrange.hxx
index 5f0c8b721aca..f6bbbfd77477 100644
--- a/editeng/inc/editeng/txtrange.hxx
+++ b/editeng/inc/editeng/txtrange.hxx
@@ -29,7 +29,7 @@
 #define _MyTXTRANGE_HXX
 
 #ifndef _TXTRANGE_HXX
-#define _SVSTDARR_BOOLS
+#define _SVSTDARR_sal_BoolS
 #define _SVSTDARR_LONGS
 #include <svl/svstdarr.hxx>
 #endif
@@ -61,56 +61,56 @@ class EDITENG_DLLPUBLIC TextRanger
     PolyPolygon *mpPolyPolygon; // Flaechenpolygon
     PolyPolygon *mpLinePolyPolygon; // Linienpolygon
     Rectangle *pBound;  // Umfassendes Rechteck
-    USHORT nCacheSize;  // Cache-Size
-    USHORT nCacheIdx;   // Cache-Index
-    USHORT nRight;      // Abstand Kontur-Text
-    USHORT nLeft;       // Abstand Text-Kontur
-    USHORT nUpper;      // Abstand Kontur-Text
-    USHORT nLower;      // Abstand Text-Kontur
+    sal_uInt16 nCacheSize;  // Cache-Size
+    sal_uInt16 nCacheIdx;   // Cache-Index
+    sal_uInt16 nRight;      // Abstand Kontur-Text
+    sal_uInt16 nLeft;       // Abstand Text-Kontur
+    sal_uInt16 nUpper;      // Abstand Kontur-Text
+    sal_uInt16 nLower;      // Abstand Text-Kontur
     sal_uInt32 nPointCount; // Anzahl der Polygonpunkte
-    BOOL bSimple : 1;   // Nur Aussenkante
-    BOOL bInner  : 1;   // TRUE: Objekt beschriften (EditEngine);
-                        // FALSE: Objekt umfliessen (StarWriter);
-    BOOL bVertical :1;  // for vertical writing mode
-    BOOL bFlag3 :1;
-    BOOL bFlag4 :1;
-    BOOL bFlag5 :1;
-    BOOL bFlag6 :1;
-    BOOL bFlag7 :1;
+    sal_Bool bSimple : 1;   // Nur Aussenkante
+    sal_Bool bInner  : 1;   // sal_True: Objekt beschriften (EditEngine);
+                        // sal_False: Objekt umfliessen (StarWriter);
+    sal_Bool bVertical :1;  // for vertical writing mode
+    sal_Bool bFlag3 :1;
+    sal_Bool bFlag4 :1;
+    sal_Bool bFlag5 :1;
+    sal_Bool bFlag6 :1;
+    sal_Bool bFlag7 :1;
     TextRanger( const TextRanger& ); // not implemented
     const Rectangle& _GetBoundRect();
 public:
     TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon,
-                USHORT nCacheSize, USHORT nLeft, USHORT nRight,
-                BOOL bSimple, BOOL bInner, BOOL bVert = sal_False );
+                sal_uInt16 nCacheSize, sal_uInt16 nLeft, sal_uInt16 nRight,
+                sal_Bool bSimple, sal_Bool bInner, sal_Bool bVert = sal_False );
     ~TextRanger();
     SvLongsPtr GetTextRanges( const Range& rRange );
-    USHORT GetRight() const { return nRight; }
-    USHORT GetLeft() const { return nLeft; }
-    USHORT GetUpper() const { return nUpper; }
-    USHORT GetLower() const { return nLower; }
+    sal_uInt16 GetRight() const { return nRight; }
+    sal_uInt16 GetLeft() const { return nLeft; }
+    sal_uInt16 GetUpper() const { return nUpper; }
+    sal_uInt16 GetLower() const { return nLower; }
     sal_uInt32 GetPointCount() const { return nPointCount; }
-    BOOL IsSimple() const { return bSimple; }
-    BOOL IsInner() const { return bInner; }
-    BOOL IsVertical() const { return bVertical; }
-    BOOL HasBorder() const { return nRight || nLeft; }
+    sal_Bool IsSimple() const { return bSimple; }
+    sal_Bool IsInner() const { return bInner; }
+    sal_Bool IsVertical() const { return bVertical; }
+    sal_Bool HasBorder() const { return nRight || nLeft; }
     const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; }
     const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; }
     const Rectangle& GetBoundRect()
         { return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); }
-    void SetUpper( USHORT nNew ){ nUpper = nNew; }
-    void SetLower( USHORT nNew ){ nLower = nNew; }
-    void SetVertical( BOOL bNew );
-    BOOL IsFlag3() const { return bFlag3; }
-    void SetFlag3( BOOL bNew ) { bFlag3 = bNew; }
-    BOOL IsFlag4() const { return bFlag4; }
-    void SetFlag4( BOOL bNew ) { bFlag4 = bNew; }
-    BOOL IsFlag5() const { return bFlag5; }
-    void SetFlag5( BOOL bNew ) { bFlag5 = bNew; }
-    BOOL IsFlag6() const { return bFlag6; }
-    void SetFlag6( BOOL bNew ) { bFlag6 = bNew; }
-    BOOL IsFlag7() const { return bFlag7; }
-    void SetFlag7( BOOL bNew ) { bFlag7 = bNew; }
+    void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; }
+    void SetLower( sal_uInt16 nNew ){ nLower = nNew; }
+    void SetVertical( sal_Bool bNew );
+    sal_Bool IsFlag3() const { return bFlag3; }
+    void SetFlag3( sal_Bool bNew ) { bFlag3 = bNew; }
+    sal_Bool IsFlag4() const { return bFlag4; }
+    void SetFlag4( sal_Bool bNew ) { bFlag4 = bNew; }
+    sal_Bool IsFlag5() const { return bFlag5; }
+    void SetFlag5( sal_Bool bNew ) { bFlag5 = bNew; }
+    sal_Bool IsFlag6() const { return bFlag6; }
+    void SetFlag6( sal_Bool bNew ) { bFlag6 = bNew; }
+    sal_Bool IsFlag7() const { return bFlag7; }
+    void SetFlag7( sal_Bool bNew ) { bFlag7 = bNew; }
 };
 
 
diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index 6d4601ab4d20..d0c76be4a5b7 100644
--- a/editeng/inc/editeng/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -51,7 +51,7 @@ public:
     TYPEINFO();
 
     SvxTextLineItem( const FontUnderline eSt,
-                     const USHORT nId );
+                     const sal_uInt16 nId );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -60,22 +60,22 @@ public:
                             String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetValueCount() const;
 
     virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 ) const;
+                                        sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 );
+                                        sal_uInt8 nMemberId = 0 );
 
     // MS VC4.0 kommt durcheinander
-    void                    SetValue( USHORT nNewVal )
+    void                    SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
     virtual int             HasBoolValue() const;
-    virtual BOOL            GetBoolValue() const;
-    virtual void            SetBoolValue( BOOL bVal );
+    virtual sal_Bool            GetBoolValue() const;
+    virtual void            SetBoolValue( sal_Bool bVal );
 
     virtual int             operator==( const SfxPoolItem& ) const;
 
@@ -90,7 +90,7 @@ public:
     FontUnderline           GetLineStyle() const
                                 { return (FontUnderline)GetValue(); }
     void                    SetLineStyle( FontUnderline eNew )
-                                { SetValue((USHORT) eNew); }
+                                { SetValue((sal_uInt16) eNew); }
 
     const Color&            GetColor() const                { return mColor; }
     void                    SetColor( const Color& rCol )   { mColor = rCol; }
@@ -106,11 +106,11 @@ public:
     TYPEINFO();
 
     SvxUnderlineItem( const FontUnderline eSt,
-                      const USHORT nId );
+                      const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
 };
 
 // class SvxOverlineItem ------------------------------------------------
@@ -123,11 +123,11 @@ public:
     TYPEINFO();
 
     SvxOverlineItem( const FontUnderline eSt,
-                     const USHORT nId );
+                     const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
 };
 
 #endif // #ifndef _SVX_UDLNITEM_HXX
diff --git a/editeng/inc/editeng/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index 29774c49ac61..adccf0c45d34 100644
--- a/editeng/inc/editeng/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -44,26 +44,26 @@ namespace rtl
 Dieses Item beschreibt den oberen und unteren Rand einer Seite oder Absatz.
 */
 
-#define ULSPACE_16_VERSION  ((USHORT)0x0001)
+#define ULSPACE_16_VERSION  ((sal_uInt16)0x0001)
 
 class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
 {
-    USHORT nUpper;  //Oberer Rand
-    USHORT nLower;  //Unterer Rand
-    USHORT nPropUpper, nPropLower;      // relativ oder absolut (=100%)
+    sal_uInt16 nUpper;  //Oberer Rand
+    sal_uInt16 nLower;  //Unterer Rand
+    sal_uInt16 nPropUpper, nPropLower;      // relativ oder absolut (=100%)
 public:
     TYPEINFO();
 
-    SvxULSpaceItem( const USHORT nId  );
-    SvxULSpaceItem( const USHORT nUp, const USHORT nLow,
-                    const USHORT nId  );
+    SvxULSpaceItem( const sal_uInt16 nId  );
+    SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
+                    const sal_uInt16 nId  );
     inline SvxULSpaceItem& operator=( const SvxULSpaceItem &rCpy );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -71,24 +71,24 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nFileVersion ) const;
     virtual int              ScaleMetrics( long nMult, long nDiv );
     virtual int              HasMetrics() const;
 
-    inline void SetUpper( const USHORT nU, const USHORT nProp = 100 );
-    inline void SetLower( const USHORT nL, const USHORT nProp = 100 );
+    inline void SetUpper( const sal_uInt16 nU, const sal_uInt16 nProp = 100 );
+    inline void SetLower( const sal_uInt16 nL, const sal_uInt16 nProp = 100 );
 
-    void SetUpperValue( const USHORT nU ) { nUpper = nU; }
-    void SetLowerValue( const USHORT nL ) { nLower = nL; }
-    void SetPropUpper( const USHORT nU ) { nPropUpper = nU; }
-    void SetPropLower( const USHORT nL ) { nPropLower = nL; }
+    void SetUpperValue( const sal_uInt16 nU ) { nUpper = nU; }
+    void SetLowerValue( const sal_uInt16 nL ) { nLower = nL; }
+    void SetPropUpper( const sal_uInt16 nU ) { nPropUpper = nU; }
+    void SetPropLower( const sal_uInt16 nL ) { nPropLower = nL; }
 
-    USHORT GetUpper() const { return nUpper; }
-    USHORT GetLower() const { return nLower; }
-    USHORT GetPropUpper() const { return nPropUpper; }
-    USHORT GetPropLower() const { return nPropLower; }
+    sal_uInt16 GetUpper() const { return nUpper; }
+    sal_uInt16 GetLower() const { return nLower; }
+    sal_uInt16 GetPropUpper() const { return nPropUpper; }
+    sal_uInt16 GetPropLower() const { return nPropLower; }
 };
 
 inline SvxULSpaceItem &SvxULSpaceItem::operator=( const SvxULSpaceItem &rCpy )
@@ -100,13 +100,13 @@ inline SvxULSpaceItem &SvxULSpaceItem::operator=( const SvxULSpaceItem &rCpy )
     return *this;
 }
 
-inline void SvxULSpaceItem::SetUpper( const USHORT nU, const USHORT nProp )
+inline void SvxULSpaceItem::SetUpper( const sal_uInt16 nU, const sal_uInt16 nProp )
 {
-    nUpper = USHORT((ULONG(nU) * nProp ) / 100); nPropUpper = nProp;
+    nUpper = sal_uInt16((sal_uInt32(nU) * nProp ) / 100); nPropUpper = nProp;
 }
-inline void SvxULSpaceItem::SetLower( const USHORT nL, const USHORT nProp )
+inline void SvxULSpaceItem::SetLower( const sal_uInt16 nL, const sal_uInt16 nProp )
 {
-    nLower = USHORT((ULONG(nL) * nProp ) / 100); nPropLower = nProp;
+    nLower = sal_uInt16((sal_uInt32(nL) * nProp ) / 100); nPropLower = nProp;
 }
 
 #endif
diff --git a/editeng/inc/editeng/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index 6f5dab8afe06..5d140f90492c 100644
--- a/editeng/inc/editeng/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -49,20 +49,20 @@ class EditEngine;
 class EDITENG_DLLPUBLIC SvxEditSourceHint : public TextHint
 {
 private:
-    ULONG   mnStart;
-    ULONG   mnEnd;
+    sal_uLong   mnStart;
+    sal_uLong   mnEnd;
 
 public:
             TYPEINFO();
-            SvxEditSourceHint( ULONG nId );
-            SvxEditSourceHint( ULONG nId, ULONG nValue, ULONG nStart=0, ULONG nEnd=0 );
-
-    ULONG   GetValue() const;
-    ULONG   GetStartValue() const;
-    ULONG   GetEndValue() const;
-    void    SetValue( ULONG n );
-    void    SetStartValue( ULONG n );
-    void    SetEndValue( ULONG n );
+            SvxEditSourceHint( sal_uLong nId );
+            SvxEditSourceHint( sal_uLong nId, sal_uLong nValue, sal_uLong nStart=0, sal_uLong nEnd=0 );
+
+    sal_uLong   GetValue() const;
+    sal_uLong   GetStartValue() const;
+    sal_uLong   GetEndValue() const;
+    void    SetValue( sal_uLong n );
+    void    SetStartValue( sal_uLong n );
+    void    SetEndValue( sal_uLong n );
 };
 
 /** Helper class for common functionality in edit sources
@@ -101,7 +101,7 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-    static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex );
+    static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex );
 
     /** Convert point from edit engine to user coordinate space
 
diff --git a/editeng/inc/editeng/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx
index 693fabe7d49f..c4de3037eb30 100644
--- a/editeng/inc/editeng/unoedprx.hxx
+++ b/editeng/inc/editeng/unoedprx.hxx
@@ -41,20 +41,20 @@ public:
     SvxAccessibleTextAdapter();
     virtual ~SvxAccessibleTextAdapter();
 
-    virtual USHORT          GetParagraphCount() const;
-    virtual USHORT          GetTextLen( USHORT nParagraph ) const;
+    virtual sal_uInt16          GetParagraphCount() const;
+    virtual sal_uInt16          GetTextLen( sal_uInt16 nParagraph ) const;
     virtual String          GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet      GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const;
-    virtual SfxItemSet      GetParaAttribs( USHORT nPara ) const;
-    virtual void            SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+    virtual SfxItemSet      GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
+    virtual SfxItemSet      GetParaAttribs( sal_uInt16 nPara ) const;
+    virtual void            SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
     virtual void            RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
-    virtual void            GetPortions( USHORT nPara, SvUShorts& rList ) const;
+    virtual void            GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const;
 
-    virtual sal_Int32       CalcLogicalIndex( USHORT nPara, USHORT nEEIndex );
-    virtual USHORT          CalcEditEngineIndex( USHORT nPara, sal_Int32 nLogicalIndex );
+    virtual sal_Int32       CalcLogicalIndex( sal_uInt16 nPara, sal_uInt16 nEEIndex );
+    virtual sal_uInt16          CalcEditEngineIndex( sal_uInt16 nPara, sal_Int32 nLogicalIndex );
 
-     virtual USHORT         GetItemState( const ESelection& rSel, USHORT nWhich ) const;
-    virtual USHORT          GetItemState( USHORT nPara, USHORT nWhich ) const;
+     virtual sal_uInt16         GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
+    virtual sal_uInt16          GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
 
     virtual void            QuickInsertText( const String& rText, const ESelection& rSel );
     virtual void            QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
@@ -63,46 +63,46 @@ public:
 
     virtual SfxItemPool*    GetPool() const;
 
-    virtual XubString       CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void            FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
+    virtual XubString       CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
+    virtual void            FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
 
-    virtual BOOL            IsValid() const;
+    virtual sal_Bool            IsValid() const;
 
-    virtual LanguageType    GetLanguage( USHORT, USHORT ) const;
-    virtual USHORT          GetFieldCount( USHORT nPara ) const;
-    virtual EFieldInfo      GetFieldInfo( USHORT nPara, USHORT nField ) const;
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const;
-    virtual Rectangle       GetCharBounds( USHORT nPara, USHORT nIndex ) const;
-    virtual Rectangle       GetParaBounds( USHORT nPara ) const;
+    virtual LanguageType    GetLanguage( sal_uInt16, sal_uInt16 ) const;
+    virtual sal_uInt16          GetFieldCount( sal_uInt16 nPara ) const;
+    virtual EFieldInfo      GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const;
+    virtual Rectangle       GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual Rectangle       GetParaBounds( sal_uInt16 nPara ) const;
     virtual MapMode         GetMapMode() const;
     virtual OutputDevice*   GetRefDevice() const;
-    virtual sal_Bool        GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
-    virtual sal_Bool        GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
-    virtual sal_Bool        GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
-    virtual USHORT          GetLineCount( USHORT nPara ) const;
-    virtual USHORT          GetLineLen( USHORT nPara, USHORT nLine ) const;
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    virtual sal_Bool        GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+    virtual sal_Bool        GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16          GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16          GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
 
     virtual sal_Bool        Delete( const ESelection& );
     virtual sal_Bool        InsertText( const String&, const ESelection& );
-    virtual sal_Bool        QuickFormatDoc( BOOL bFull=FALSE );
-    virtual sal_Int16       GetDepth( USHORT nPara ) const;
-    virtual sal_Bool        SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+    virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual sal_Int16       GetDepth( sal_uInt16 nPara ) const;
+    virtual sal_Bool        SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
 
     virtual const SfxItemSet*   GetEmptyItemSetPtr();
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     // (not needed for accessibility, only for new import API)
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
 
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource);
 
     void                    SetForwarder( SvxTextForwarder& );
-    sal_Bool                HaveImageBullet( USHORT nPara ) const;
-    sal_Bool                HaveTextBullet( USHORT nPara ) const;
+    sal_Bool                HaveImageBullet( sal_uInt16 nPara ) const;
+    sal_Bool                HaveTextBullet( sal_uInt16 nPara ) const;
 
     /** Query whether all text in given selection is editable
 
@@ -124,7 +124,7 @@ public:
     virtual             ~SvxAccessibleTextEditViewAdapter();
 
     // SvxViewForwarder interface
-    virtual BOOL        IsValid() const;
+    virtual sal_Bool        IsValid() const;
     virtual Rectangle   GetVisArea() const;
     virtual Point       LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
     virtual Point       PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index 3890bb009cae..8ce3016fa7c4 100644
--- a/editeng/inc/editeng/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -153,25 +153,25 @@ class EDITENG_DLLPUBLIC SvxTextForwarder
 public:
     virtual             ~SvxTextForwarder();
 
-    virtual USHORT      GetParagraphCount() const = 0;
-    virtual USHORT      GetTextLen( USHORT nParagraph ) const = 0;
+    virtual sal_uInt16      GetParagraphCount() const = 0;
+    virtual sal_uInt16      GetTextLen( sal_uInt16 nParagraph ) const = 0;
     virtual String      GetText( const ESelection& rSel ) const = 0;
-    virtual SfxItemSet  GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const = 0;
-    virtual SfxItemSet  GetParaAttribs( USHORT nPara ) const = 0;
-    virtual void        SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ) = 0;
+    virtual SfxItemSet  GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const = 0;
+    virtual SfxItemSet  GetParaAttribs( sal_uInt16 nPara ) const = 0;
+    virtual void        SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet ) = 0;
     virtual void        RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0;
-    virtual void        GetPortions( USHORT nPara, SvUShorts& rList ) const = 0;
+    virtual void        GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const = 0;
 
-    virtual USHORT      GetItemState( const ESelection& rSel, USHORT nWhich ) const = 0;
-    virtual USHORT      GetItemState( USHORT nPara, USHORT nWhich ) const = 0;
+    virtual sal_uInt16      GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const = 0;
+    virtual sal_uInt16      GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const = 0;
 
     virtual void        QuickInsertText( const String& rText, const ESelection& rSel ) = 0;
     virtual void        QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) = 0;
     virtual void        QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) = 0;
     virtual void        QuickInsertLineBreak( const ESelection& rSel ) = 0;
 
-    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ) = 0;
-    virtual void         FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ) = 0;
+    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) = 0;
+    virtual void         FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos ) = 0;
 
     virtual SfxItemPool* GetPool() const = 0;
 
@@ -179,7 +179,7 @@ public:
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph() = 0;
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ) = 0;
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet ) = 0;
 
     // XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource) = 0;
@@ -188,7 +188,7 @@ public:
 
         @return sal_False, if no longer valid
      */
-    virtual BOOL            IsValid() const = 0;
+    virtual sal_Bool            IsValid() const = 0;
 
     /** Query language of character at given position on the underlying edit engine
 
@@ -198,14 +198,14 @@ public:
         @param nIndex[0 .. m-1]
         Index of character to query language of
      */
-    virtual LanguageType    GetLanguage( USHORT nPara, USHORT nIndex ) const = 0;
+    virtual LanguageType    GetLanguage( sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
 
     /** Query number of fields in the underlying edit engine
 
         @param nPara[0 .. n-1]
         Index of paragraph to query field number in
      */
-    virtual USHORT          GetFieldCount( USHORT nPara ) const = 0;
+    virtual sal_uInt16          GetFieldCount( sal_uInt16 nPara ) const = 0;
 
     /** Query information for given field number in the underlying edit engine
 
@@ -215,14 +215,14 @@ public:
         @param nField[0 .. m-1]
         Index of field to query information of
      */
-    virtual EFieldInfo      GetFieldInfo( USHORT nPara, USHORT nField ) const = 0;
+    virtual EFieldInfo      GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const = 0;
 
     /** Query information regarding bullets for given paragraph on the underlying edit engine
 
         @param nPara[0 .. n-1]
         Index of paragraph to query bullet info on
      */
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const = 0;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const = 0;
 
     /** Query the bounding rectangle of the given character
 
@@ -245,7 +245,7 @@ public:
         left corner of text. The coordinates returned here are to be
         interpreted in the map mode given by GetMapMode().
     */
-    virtual Rectangle       GetCharBounds( USHORT nPara, USHORT nIndex ) const = 0;
+    virtual Rectangle       GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
 
     /** Query the bounding rectangle of the given paragraph
 
@@ -256,7 +256,7 @@ public:
         left corner of text. The coordinates returned here are to be
         interpreted in the map mode given by GetMapMode().
      */
-    virtual Rectangle       GetParaBounds( USHORT nPara ) const = 0;
+    virtual Rectangle       GetParaBounds( sal_uInt16 nPara ) const = 0;
 
     /** Query the map mode of the underlying EditEngine/Outliner
 
@@ -293,7 +293,7 @@ public:
         @return sal_True, if the point is over any text and both rPara and rIndex are valid
 
      */
-    virtual sal_Bool        GetIndexAtPoint( const Point& rPoint, USHORT& rPara, USHORT& rIndex ) const = 0;
+    virtual sal_Bool        GetIndexAtPoint( const Point& rPoint, sal_uInt16& rPara, sal_uInt16& rIndex ) const = 0;
 
     /** Get the start and the end index of the word at the given index
 
@@ -318,7 +318,7 @@ public:
 
         @return sal_True, if the result is non-empty
      */
-    virtual sal_Bool        GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& rStart, USHORT& rEnd ) const = 0;
+    virtual sal_Bool        GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& rStart, sal_uInt16& rEnd ) const = 0;
 
     /** Query range of similar attributes
 
@@ -335,7 +335,7 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-    virtual sal_Bool        GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const = 0;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
 
     /** Query number of lines in the formatted paragraph
 
@@ -345,7 +345,7 @@ public:
         @return number of lines in given paragraph
 
      */
-    virtual USHORT          GetLineCount( USHORT nPara ) const = 0;
+    virtual sal_uInt16          GetLineCount( sal_uInt16 nPara ) const = 0;
 
     /** Query line length
 
@@ -356,7 +356,7 @@ public:
         Index of line in paragraph to query line length of
 
      */
-    virtual USHORT          GetLineLen( USHORT nPara, USHORT nLine ) const = 0;
+    virtual sal_uInt16          GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const = 0;
 
     /** Query bounds of line in paragraph
 
@@ -373,7 +373,7 @@ public:
         Index of line in paragraph to query line length of
 
      */
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const = 0;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const = 0;
 
     /** Query the line number for a index in the paragraphs text
 
@@ -386,7 +386,7 @@ public:
         @returns [0 .. k-1]
         The line number of the chara in the paragraph
      */
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const = 0;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
 
     /** Delete given text range and reformat text
 
@@ -415,7 +415,7 @@ public:
 
          @return sal_True if text have been successfully reformatted
       */
-    virtual sal_Bool        QuickFormatDoc( BOOL bFull=FALSE ) = 0;
+    virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False ) = 0;
 
     /** Get the outline depth of given paragraph
 
@@ -425,7 +425,7 @@ public:
         @return the outline level of the given paragraph. The range is
         [0,n), where n is the maximal outline level.
      */
-    virtual sal_Int16       GetDepth( USHORT nPara ) const = 0;
+    virtual sal_Int16       GetDepth( sal_uInt16 nPara ) const = 0;
 
     /** Set the outline depth of given paragraph
 
@@ -436,11 +436,11 @@ public:
         The depth to set on the given paragraph. The range is
         [0,n), where n is the maximal outline level.
 
-        @return TRUE, if depth could be successfully set. Reasons for
+        @return sal_True, if depth could be successfully set. Reasons for
         failure are e.g. the text does not support outline level
         (EditEngine), or the depth range is exceeded.
      */
-    virtual sal_Bool        SetDepth( USHORT nPara, sal_Int16 nNewDepth ) = 0;
+    virtual sal_Bool        SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth ) = 0;
 
     virtual sal_Int16 GetNumberingStartValue( sal_uInt16 nPara );
     virtual void SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue );
@@ -464,7 +464,7 @@ public:
 
         @return sal_False, if no longer valid
      */
-    virtual BOOL        IsValid() const = 0;
+    virtual sal_Bool        IsValid() const = 0;
 
     /** Query visible area of the view containing the text
 
diff --git a/editeng/inc/editeng/unofored.hxx b/editeng/inc/editeng/unofored.hxx
index 1c201043511d..f13f9c4f8a2c 100644
--- a/editeng/inc/editeng/unofored.hxx
+++ b/editeng/inc/editeng/unofored.hxx
@@ -43,17 +43,17 @@ public:
                         SvxEditEngineForwarder( EditEngine& rEngine );
     virtual             ~SvxEditEngineForwarder();
 
-    virtual USHORT      GetParagraphCount() const;
-    virtual USHORT      GetTextLen( USHORT nParagraph ) const;
+    virtual sal_uInt16      GetParagraphCount() const;
+    virtual sal_uInt16      GetTextLen( sal_uInt16 nParagraph ) const;
     virtual String      GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet  GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const;
-    virtual SfxItemSet  GetParaAttribs( USHORT nPara ) const;
-    virtual void        SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+    virtual SfxItemSet  GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const;
+    virtual SfxItemSet  GetParaAttribs( sal_uInt16 nPara ) const;
+    virtual void        SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
     virtual void        RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
-    virtual void        GetPortions( USHORT nPara, SvUShorts& rList ) const;
+    virtual void        GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const;
 
-    virtual USHORT      GetItemState( const ESelection& rSel, USHORT nWhich ) const;
-    virtual USHORT      GetItemState( USHORT nPara, USHORT nWhich ) const;
+    virtual sal_uInt16      GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
+    virtual sal_uInt16      GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
 
     virtual void        QuickInsertText( const String& rText, const ESelection& rSel );
     virtual void        QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
@@ -62,36 +62,36 @@ public:
 
     virtual SfxItemPool* GetPool() const;
 
-    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void         FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual BOOL         IsValid() const;
+    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
+    virtual void         FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual sal_Bool         IsValid() const;
 
-    virtual LanguageType    GetLanguage( USHORT, USHORT ) const;
-    virtual USHORT          GetFieldCount( USHORT nPara ) const;
-    virtual EFieldInfo      GetFieldInfo( USHORT nPara, USHORT nField ) const;
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const;
-    virtual Rectangle       GetCharBounds( USHORT nPara, USHORT nIndex ) const;
-    virtual Rectangle       GetParaBounds( USHORT nPara ) const;
+    virtual LanguageType    GetLanguage( sal_uInt16, sal_uInt16 ) const;
+    virtual sal_uInt16          GetFieldCount( sal_uInt16 nPara ) const;
+    virtual EFieldInfo      GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const;
+    virtual Rectangle       GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual Rectangle       GetParaBounds( sal_uInt16 nPara ) const;
     virtual MapMode         GetMapMode() const;
     virtual OutputDevice*   GetRefDevice() const;
-    virtual sal_Bool        GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
-    virtual sal_Bool        GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
-    virtual sal_Bool        GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
-    virtual USHORT          GetLineCount( USHORT nPara ) const;
-    virtual USHORT          GetLineLen( USHORT nPara, USHORT nLine ) const;
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    virtual sal_Bool        GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+    virtual sal_Bool        GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16          GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16          GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool        Delete( const ESelection& );
     virtual sal_Bool        InsertText( const String&, const ESelection& );
-    virtual sal_Bool        QuickFormatDoc( BOOL bFull=FALSE );
-    virtual sal_Int16       GetDepth( USHORT nPara ) const;
-    virtual sal_Bool        SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+    virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual sal_Int16       GetDepth( sal_uInt16 nPara ) const;
+    virtual sal_Bool        SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
 
     virtual const SfxItemSet*   GetEmptyItemSetPtr();
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource);
 };
diff --git a/editeng/inc/editeng/unoforou.hxx b/editeng/inc/editeng/unoforou.hxx
index 10aeb5805d11..63e48e7ac189 100644
--- a/editeng/inc/editeng/unoforou.hxx
+++ b/editeng/inc/editeng/unoforou.hxx
@@ -41,7 +41,7 @@ class EDITENG_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
 {
 private:
     Outliner&           rOutliner;
-    BOOL                bOutlinerText;
+    sal_Bool                bOutlinerText;
 
     /** this pointer may be null or point to an item set for the attribs of
         the selection maAttribsSelection */
@@ -55,23 +55,23 @@ private:
     mutable SfxItemSet* mpParaAttribsCache;
 
     /** if we have a cached para attribute item set, this is the paragraph of it */
-    mutable USHORT      mnParaAttribsCache;
+    mutable sal_uInt16      mnParaAttribsCache;
 
 public:
-                        SvxOutlinerForwarder( Outliner& rOutl, BOOL bOutlText = FALSE );
+                        SvxOutlinerForwarder( Outliner& rOutl, sal_Bool bOutlText = sal_False );
     virtual             ~SvxOutlinerForwarder();
 
-    virtual USHORT      GetParagraphCount() const;
-    virtual USHORT      GetTextLen( USHORT nParagraph ) const;
+    virtual sal_uInt16      GetParagraphCount() const;
+    virtual sal_uInt16      GetTextLen( sal_uInt16 nParagraph ) const;
     virtual String      GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet  GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const;
-    virtual SfxItemSet  GetParaAttribs( USHORT nPara ) const;
-    virtual void        SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+    virtual SfxItemSet  GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
+    virtual SfxItemSet  GetParaAttribs( sal_uInt16 nPara ) const;
+    virtual void        SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
     virtual void        RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
-    virtual void        GetPortions( USHORT nPara, SvUShorts& rList ) const;
+    virtual void        GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const;
 
-    virtual USHORT      GetItemState( const ESelection& rSel, USHORT nWhich ) const;
-    virtual USHORT      GetItemState( USHORT nPara, USHORT nWhich ) const;
+    virtual sal_uInt16      GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
+    virtual sal_uInt16      GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
 
     virtual void        QuickInsertText( const String& rText, const ESelection& rSel );
     virtual void        QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
@@ -80,33 +80,33 @@ public:
 
     virtual SfxItemPool* GetPool() const;
 
-    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void         FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
+    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
+    virtual void         FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
 
-    virtual BOOL        IsValid() const;
+    virtual sal_Bool        IsValid() const;
 
     Outliner&           GetOutliner() const { return rOutliner; }
 
-    virtual LanguageType    GetLanguage( USHORT, USHORT ) const;
-    virtual USHORT          GetFieldCount( USHORT nPara ) const;
-    virtual EFieldInfo      GetFieldInfo( USHORT nPara, USHORT nField ) const;
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const;
-    virtual Rectangle       GetCharBounds( USHORT nPara, USHORT nIndex ) const;
-    virtual Rectangle       GetParaBounds( USHORT nPara ) const;
+    virtual LanguageType    GetLanguage( sal_uInt16, sal_uInt16 ) const;
+    virtual sal_uInt16          GetFieldCount( sal_uInt16 nPara ) const;
+    virtual EFieldInfo      GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const;
+    virtual Rectangle       GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual Rectangle       GetParaBounds( sal_uInt16 nPara ) const;
     virtual MapMode         GetMapMode() const;
     virtual OutputDevice*   GetRefDevice() const;
-    virtual sal_Bool        GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
-    virtual sal_Bool        GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
-    virtual sal_Bool        GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
-    virtual USHORT          GetLineCount( USHORT nPara ) const;
-    virtual USHORT          GetLineLen( USHORT nPara, USHORT nLine ) const;
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const;
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    virtual sal_Bool        GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+    virtual sal_Bool        GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16          GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16          GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool        Delete( const ESelection& );
     virtual sal_Bool        InsertText( const String&, const ESelection& );
-    virtual sal_Bool        QuickFormatDoc( BOOL bFull=FALSE );
-    virtual sal_Int16       GetDepth( USHORT nPara ) const;
-    virtual sal_Bool        SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+    virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual sal_Int16       GetDepth( sal_uInt16 nPara ) const;
+    virtual sal_Bool        SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
     virtual sal_Int16       GetNumberingStartValue( sal_uInt16 nPara );
     virtual void            SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue );
 
@@ -120,7 +120,7 @@ public:
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource);
 };
diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx
index 7ca3a2be0fce..c787bf368b8f 100644
--- a/editeng/inc/editeng/unolingu.hxx
+++ b/editeng/inc/editeng/unolingu.hxx
@@ -55,17 +55,17 @@ class Window;
 
 class SvxLinguConfigUpdate
 {
-    static INT32    nCurrentDataFilesChangedCheckValue;
-    static INT16    nNeedUpdating;  // n == -1 => needs to be checked
+    static sal_Int32    nCurrentDataFilesChangedCheckValue;
+    static sal_Int16    nNeedUpdating;  // n == -1 => needs to be checked
                                     // n ==  0 => already updated, nothing to be done
                                     // n ==  1 => needs to be updated
 
-    static INT32 CalcDataFilesChangedCheckValue();
+    static sal_Int32 CalcDataFilesChangedCheckValue();
 
 public:
 
     EDITENG_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False );
-    static BOOL IsNeedUpdateAll( sal_Bool bForceCheck = sal_False );
+    static sal_Bool IsNeedUpdateAll( sal_Bool bForceCheck = sal_False );
 };
 
 ///////////////////////////////////////////////////////////////////////////
@@ -157,15 +157,15 @@ struct SvxAlternativeSpelling
     String      aReplacement;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XHyphenatedWord >    xHyphWord;
-    INT16       nChangedPos,
+    sal_Int16       nChangedPos,
                  nChangedLength;
-    BOOL        bIsAltSpelling;
+    sal_Bool        bIsAltSpelling;
 
     inline SvxAlternativeSpelling();
 };
 
 inline SvxAlternativeSpelling::SvxAlternativeSpelling() :
-    nChangedPos(-1), nChangedLength(-1), bIsAltSpelling(FALSE)
+    nChangedPos(-1), nChangedLength(-1), bIsAltSpelling(sal_False)
 {
 }
 
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 732c2f4d17dc..3ba7e12b492d 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -190,7 +190,7 @@ public:
     virtual sal_uInt16      GetParagraphCount() const;
     virtual sal_uInt16      GetTextLen( sal_uInt16 nParagraph ) const;
     virtual String          GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet      GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const;
+    virtual SfxItemSet      GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
     virtual SfxItemSet      GetParaAttribs( sal_uInt16 nPara ) const;
     virtual void            SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
     virtual void            RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
@@ -207,37 +207,37 @@ public:
     virtual void            QuickInsertLineBreak( const ESelection& rSel );
 
     virtual XubString       CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void            FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
+    virtual void            FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
 
     virtual sal_Bool        IsValid() const;
 
     virtual void            SetNotifyHdl( const Link& );
-    virtual LanguageType    GetLanguage( USHORT, USHORT ) const;
-    virtual USHORT          GetFieldCount( USHORT nPara ) const;
-    virtual EFieldInfo      GetFieldInfo( USHORT nPara, USHORT nField ) const;
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const;
-    virtual Rectangle       GetCharBounds( USHORT nPara, USHORT nIndex ) const;
-    virtual Rectangle       GetParaBounds( USHORT nPara ) const;
+    virtual LanguageType    GetLanguage( sal_uInt16, sal_uInt16 ) const;
+    virtual sal_uInt16          GetFieldCount( sal_uInt16 nPara ) const;
+    virtual EFieldInfo      GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const;
+    virtual Rectangle       GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual Rectangle       GetParaBounds( sal_uInt16 nPara ) const;
     virtual MapMode         GetMapMode() const;
     virtual OutputDevice*   GetRefDevice() const;
-    virtual sal_Bool        GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
-    virtual sal_Bool        GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
-    virtual sal_Bool        GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
-    virtual USHORT          GetLineCount( USHORT nPara ) const;
-    virtual USHORT          GetLineLen( USHORT nPara, USHORT nLine ) const;
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    virtual sal_Bool        GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+    virtual sal_Bool        GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16          GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16          GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool        Delete( const ESelection& );
     virtual sal_Bool        InsertText( const String&, const ESelection& );
-    virtual sal_Bool        QuickFormatDoc( BOOL bFull=FALSE );
-    virtual sal_Int16       GetDepth( USHORT nPara ) const;
-    virtual sal_Bool        SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+    virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual sal_Int16       GetDepth( sal_uInt16 nPara ) const;
+    virtual sal_Bool        SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
 
     virtual const SfxItemSet*   GetEmptyItemSetPtr();
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource);
 };
diff --git a/editeng/inc/editeng/unoviwed.hxx b/editeng/inc/editeng/unoviwed.hxx
index 8fb1638e9206..0acdc6e769f4 100644
--- a/editeng/inc/editeng/unoviwed.hxx
+++ b/editeng/inc/editeng/unoviwed.hxx
@@ -44,7 +44,7 @@ public:
                         SvxEditEngineViewForwarder( EditView& rView );
     virtual             ~SvxEditEngineViewForwarder();
 
-    virtual BOOL        IsValid() const;
+    virtual sal_Bool        IsValid() const;
 
     virtual Rectangle   GetVisArea() const;
     virtual Point       LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/editeng/inc/editeng/unoviwou.hxx b/editeng/inc/editeng/unoviwou.hxx
index b20c668eb7ee..8821e812ebdc 100644
--- a/editeng/inc/editeng/unoviwou.hxx
+++ b/editeng/inc/editeng/unoviwou.hxx
@@ -47,7 +47,7 @@ public:
                         SvxDrawOutlinerViewForwarder( OutlinerView& rOutl, const Point& rShapePosTopLeft );
     virtual             ~SvxDrawOutlinerViewForwarder();
 
-    virtual BOOL        IsValid() const;
+    virtual sal_Bool        IsValid() const;
 
     virtual Rectangle   GetVisArea() const;
     virtual Point       LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index 76838f67bbd4..063c98d77059 100644
--- a/editeng/inc/editeng/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
 
     SvxWeightItem(  const FontWeight eWght /*= WEIGHT_NORMAL*/,
-                    const USHORT nId  );
+                    const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem + SfxEnumItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -61,17 +61,17 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetValueCount() const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual int             HasBoolValue() const;
-    virtual BOOL            GetBoolValue() const;
-    virtual void            SetBoolValue( BOOL bVal );
+    virtual sal_Bool            GetBoolValue() const;
+    virtual void            SetBoolValue( sal_Bool bVal );
 
     inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) {
             SetValue( rWeight.GetValue() );
@@ -82,7 +82,7 @@ public:
     FontWeight              GetWeight() const
                                 { return (FontWeight)GetValue(); }
     void                    SetWeight( FontWeight eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 #endif // #ifndef _SVX_WGHTITEM_HXX
diff --git a/editeng/inc/editeng/widwitem.hxx b/editeng/inc/editeng/widwitem.hxx
index cf0c8c9d05c7..10cfbb9e6932 100644
--- a/editeng/inc/editeng/widwitem.hxx
+++ b/editeng/inc/editeng/widwitem.hxx
@@ -51,12 +51,12 @@ class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem
 public:
     TYPEINFO();
 
-    SvxWidowsItem( const BYTE nL /*= 0*/, const USHORT nId  );
+    SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream &, USHORT ) const;
-    virtual SvStream&       Store( SvStream & , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 ) const;
+    virtual SvStream&       Store( SvStream & , sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
index 8a81f5291d27..5caf33302f13 100644
--- a/editeng/inc/editeng/writingmodeitem.hxx
+++ b/editeng/inc/editeng/writingmodeitem.hxx
@@ -41,15 +41,15 @@ public:
     TYPEINFO();
 
     SvxWritingModeItem( ::com::sun::star::text::WritingMode eValue /*= com::sun::star::text::WritingMode_LR_TB*/,
-                USHORT nWhich /*= SDRATTR_TEXTDIRECTION*/ );
+                sal_uInt16 nWhich /*= SDRATTR_TEXTDIRECTION*/ );
     virtual ~SvxWritingModeItem();
 
     SvxWritingModeItem& operator=( const SvxWritingModeItem& rItem );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -59,9 +59,9 @@ public:
                                     const IntlWrapper * = 0 ) const;
 
     virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
+                                    sal_uInt8 nMemberId );
     virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+                                sal_uInt8 nMemberId ) const;
 };
 
 #endif // #ifndef _SVX_WRITINGMODEITEM_HXX
diff --git a/editeng/inc/editeng/wrlmitem.hxx b/editeng/inc/editeng/wrlmitem.hxx
index 322d3d87cbc0..e4eeeb59127e 100644
--- a/editeng/inc/editeng/wrlmitem.hxx
+++ b/editeng/inc/editeng/wrlmitem.hxx
@@ -51,13 +51,13 @@ class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxWordLineModeItem( const BOOL bWordLineMode /*= FALSE*/,
-                     const USHORT nId  );
+    SvxWordLineModeItem( const sal_Bool bWordLineMode /*= sal_False*/,
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx
index 70c49d03c143..7c15d6aa24b6 100644
--- a/editeng/inc/editeng/xmlcnitm.hxx
+++ b/editeng/inc/editeng/xmlcnitm.hxx
@@ -62,8 +62,8 @@ public:
 
     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
     { return new SvXMLAttrContainerItem( *this ); }
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index b5a43ae8a948..ee98fe0fa356 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -191,14 +191,14 @@ namespace accessibility
                    "AccessibleEditableTextPara::getLocale: paragraph index value overflow");
 
         // return locale of first character in the paragraph
-        return SvxLanguageToLocale(aLocale, GetTextForwarder().GetLanguage( static_cast< USHORT >( GetParagraphIndex() ), 0 ));
+        return SvxLanguageToLocale(aLocale, GetTextForwarder().GetLanguage( static_cast< sal_uInt16 >( GetParagraphIndex() ), 0 ));
     }
 
     void AccessibleEditableTextPara::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
-        USHORT nStart, nEnd;
+        sal_uInt16 nStart, nEnd;
 
         if( GetSelection( nStart, nEnd ) )
         {
@@ -232,13 +232,13 @@ namespace accessibility
         DBG_ASSERT(nParaIndex >= 0 && nParaIndex <= USHRT_MAX,
                    "AccessibleEditableTextPara::implGetLineBoundary: paragraph index value overflow");
 
-        const sal_Int32 nTextLen = rCacheTF.GetTextLen( static_cast< USHORT >( nParaIndex ) );
+        const sal_Int32 nTextLen = rCacheTF.GetTextLen( static_cast< sal_uInt16 >( nParaIndex ) );
 
         CheckPosition(nIndex);
 
         rBoundary.startPos = rBoundary.endPos = -1;
 
-        const USHORT nLineCount=rCacheTF.GetLineCount( static_cast< USHORT >( nParaIndex ) );
+        const sal_uInt16 nLineCount=rCacheTF.GetLineCount( static_cast< sal_uInt16 >( nParaIndex ) );
 
         if( nIndex == nTextLen )
         {
@@ -246,7 +246,7 @@ namespace accessibility
             if( nLineCount <= 1 )
                 rBoundary.startPos = 0;
             else
-                rBoundary.startPos = nTextLen - rCacheTF.GetLineLen( static_cast< USHORT >( nParaIndex ),
+                rBoundary.startPos = nTextLen - rCacheTF.GetLineLen( static_cast< sal_uInt16 >( nParaIndex ),
                                                                      nLineCount-1 );
 
             rBoundary.endPos = nTextLen;
@@ -254,15 +254,15 @@ namespace accessibility
         else
         {
             // normal line search
-            USHORT nLine;
+            sal_uInt16 nLine;
             sal_Int32 nCurIndex;
             for( nLine=0, nCurIndex=0; nLine<nLineCount; ++nLine )
             {
-                nCurIndex += rCacheTF.GetLineLen( static_cast< USHORT >( nParaIndex ), nLine);
+                nCurIndex += rCacheTF.GetLineLen( static_cast< sal_uInt16 >( nParaIndex ), nLine);
 
                 if( nCurIndex > nIndex )
                 {
-                    rBoundary.startPos = nCurIndex - rCacheTF.GetLineLen(static_cast< USHORT >( nParaIndex ), nLine);
+                    rBoundary.startPos = nCurIndex - rCacheTF.GetLineLen(static_cast< sal_uInt16 >( nParaIndex ), nLine);
                     rBoundary.endPos = nCurIndex;
                     break;
                 }
@@ -398,9 +398,9 @@ namespace accessibility
                    GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                    "AccessibleEditableTextPara::MakeSelection: index value overflow");
 
-        USHORT nParaIndex = static_cast< USHORT >( GetParagraphIndex() );
-        return ESelection( nParaIndex, static_cast< USHORT >( nStartEEIndex ),
-                           nParaIndex, static_cast< USHORT >( nEndEEIndex ) );
+        sal_uInt16 nParaIndex = static_cast< sal_uInt16 >( GetParagraphIndex() );
+        return ESelection( nParaIndex, static_cast< sal_uInt16 >( nStartEEIndex ),
+                           nParaIndex, static_cast< sal_uInt16 >( nEndEEIndex ) );
     }
 
     ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nEEIndex )
@@ -445,12 +445,12 @@ namespace accessibility
         CheckPosition( nEnd );
     }
 
-    sal_Bool AccessibleEditableTextPara::GetSelection( USHORT& nStartPos, USHORT& nEndPos ) SAL_THROW((uno::RuntimeException))
+    sal_Bool AccessibleEditableTextPara::GetSelection( sal_uInt16& nStartPos, sal_uInt16& nEndPos ) SAL_THROW((uno::RuntimeException))
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         ESelection aSelection;
-        USHORT nPara = static_cast< USHORT > ( GetParagraphIndex() );
+        sal_uInt16 nPara = static_cast< sal_uInt16 > ( GetParagraphIndex() );
         if( !GetEditViewForwarder().GetSelection( aSelection ) )
             return sal_False;
 
@@ -504,11 +504,11 @@ namespace accessibility
         return GetTextForwarder().GetText( MakeSelection(nStartIndex, nEndIndex) );
     }
 
-    USHORT AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException))
+    sal_uInt16 AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException))
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
-        return GetTextForwarder().GetTextLen( static_cast< USHORT >( GetParagraphIndex() ) );
+        return GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
     }
 
     sal_Bool AccessibleEditableTextPara::IsVisible() const
@@ -659,7 +659,7 @@ namespace accessibility
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                    "AccessibleEditableTextPara::HaveChildren: paragraph index value overflow");
 
-        return GetTextForwarder().HaveImageBullet( static_cast< USHORT >(GetParagraphIndex()) );
+        return GetTextForwarder().HaveImageBullet( static_cast< sal_uInt16 >(GetParagraphIndex()) );
     }
 
     sal_Bool AccessibleEditableTextPara::IsActive() const SAL_THROW((uno::RuntimeException))
@@ -785,7 +785,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool AccessibleEditableTextPara::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, sal_Int32 nIndex )
+    sal_Bool AccessibleEditableTextPara::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex )
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
@@ -797,8 +797,8 @@ namespace accessibility
 
         return GetTextForwarder().GetAttributeRun( nStartIndex,
                                                    nEndIndex,
-                                                   static_cast< USHORT >(GetParagraphIndex()),
-                                                   static_cast< USHORT >(nIndex) );
+                                                   static_cast< sal_uInt16 >(GetParagraphIndex()),
+                                                   static_cast< sal_uInt16 >(nIndex) );
     }
 
     uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
@@ -1055,7 +1055,7 @@ namespace accessibility
             SvxTextForwarder& rCacheTF = GetTextForwarder();
             Point aLogPoint( GetViewForwarder().PixelToLogic( aPoint, rCacheTF.GetMapMode() ) );
 
-            EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< USHORT > (GetParagraphIndex()) );
+            EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 > (GetParagraphIndex()) );
 
             if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
                 aBulletInfo.bVisible &&
@@ -1082,7 +1082,7 @@ namespace accessibility
                    "AccessibleEditableTextPara::getBounds: index value overflow");
 
         SvxTextForwarder& rCacheTF = GetTextForwarder();
-        Rectangle aRect = rCacheTF.GetParaBounds( static_cast< USHORT >( GetParagraphIndex() ) );
+        Rectangle aRect = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
 
         // convert to screen coordinates
         Rectangle aScreenRect = AccessibleEditableTextPara::LogicToPixel( aRect,
@@ -1181,7 +1181,7 @@ namespace accessibility
 
         // #104444# Added to XAccessibleComponent interface
         svtools::ColorConfig aColorConfig;
-        UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+        sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
         return static_cast<sal_Int32>(nColor);
     }
 
@@ -1316,7 +1316,7 @@ namespace accessibility
         CheckPosition( nIndex );
 
         SvxTextForwarder& rCacheTF = GetTextForwarder();
-        Rectangle aRect = rCacheTF.GetCharBounds( static_cast< USHORT >( GetParagraphIndex() ), static_cast< USHORT >( nIndex ) );
+        Rectangle aRect = rCacheTF.GetCharBounds( static_cast< sal_uInt16 >( GetParagraphIndex() ), static_cast< sal_uInt16 >( nIndex ) );
 
         // convert to screen
         Rectangle aScreenRect = AccessibleEditableTextPara::LogicToPixel( aRect,
@@ -1355,7 +1355,7 @@ namespace accessibility
 
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
-        USHORT nPara, nIndex;
+        sal_uInt16 nPara, nIndex;
 
         // offset from surrounding cell/shape
         Point aOffset( GetEEOffset() );
@@ -1366,7 +1366,7 @@ namespace accessibility
         Point aLogPoint( GetViewForwarder().PixelToLogic( aPoint, rCacheTF.GetMapMode() ) );
 
         // re-offset to parent (paragraph)
-        Rectangle aParaRect = rCacheTF.GetParaBounds( static_cast< USHORT >( GetParagraphIndex() ) );
+        Rectangle aParaRect = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
         aLogPoint.Move( aParaRect.Left(), aParaRect.Top() );
 
         if( rCacheTF.GetIndexAtPoint( aLogPoint, nPara, nIndex ) &&
@@ -1506,7 +1506,7 @@ namespace accessibility
             // implGetAttributeRunBoundary() method there
             case AccessibleTextType::ATTRIBUTE_RUN:
             {
-                const sal_Int32 nTextLen = GetTextForwarder().GetTextLen( static_cast< USHORT >( GetParagraphIndex() ) );
+                const sal_Int32 nTextLen = GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
 
                 if( nIndex == nTextLen )
                 {
@@ -1515,7 +1515,7 @@ namespace accessibility
                 }
                 else
                 {
-                    USHORT nStartIndex, nEndIndex;
+                    sal_uInt16 nStartIndex, nEndIndex;
 
                     if( GetAttributeRun(nStartIndex, nEndIndex, nIndex) )
                     {
@@ -1554,8 +1554,8 @@ namespace accessibility
             // implGetAttributeRunBoundary() method there
             case AccessibleTextType::ATTRIBUTE_RUN:
             {
-                const sal_Int32 nTextLen = GetTextForwarder().GetTextLen( static_cast< USHORT >( GetParagraphIndex() ) );
-                USHORT nStartIndex, nEndIndex;
+                const sal_Int32 nTextLen = GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
+                sal_uInt16 nStartIndex, nEndIndex;
 
                 if( nIndex == nTextLen )
                 {
@@ -1611,7 +1611,7 @@ namespace accessibility
         {
             case AccessibleTextType::ATTRIBUTE_RUN:
             {
-                USHORT nStartIndex, nEndIndex;
+                sal_uInt16 nStartIndex, nEndIndex;
 
                 if( GetAttributeRun(nStartIndex, nEndIndex, nIndex) )
                 {
@@ -1852,7 +1852,7 @@ namespace accessibility
             // AccessibleEmptyEditSource relies on this behaviour
             GetEditViewForwarder( sal_True );
             SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder();    // MUST be after GetEditViewForwarder(), see method docs
-            USHORT nPara = static_cast< USHORT >( GetParagraphIndex() );
+            sal_uInt16 nPara = static_cast< sal_uInt16 >( GetParagraphIndex() );
 
             DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                        "AccessibleEditableTextPara::setAttributes: index value overflow");
@@ -2101,9 +2101,9 @@ namespace accessibility
         SvxAccessibleTextAdapter& rT = GetTextForwarder();
         const sal_Int32 nPara = GetParagraphIndex();
 
-        USHORT nHyperLinks = 0;
-        USHORT nFields = rT.GetFieldCount( nPara );
-        for ( USHORT n = 0; n < nFields; n++ )
+        sal_uInt16 nHyperLinks = 0;
+        sal_uInt16 nFields = rT.GetFieldCount( nPara );
+        for ( sal_uInt16 n = 0; n < nFields; n++ )
         {
             EFieldInfo aField = rT.GetFieldInfo( nPara, n );
             if ( aField.pFieldItem->GetField()->ISA( SvxURLField ) )
@@ -2119,20 +2119,20 @@ namespace accessibility
         SvxAccessibleTextAdapter& rT = GetTextForwarder();
         const sal_Int32 nPara = GetParagraphIndex();
 
-        USHORT nHyperLink = 0;
-        USHORT nFields = rT.GetFieldCount( nPara );
-        for ( USHORT n = 0; n < nFields; n++ )
+        sal_uInt16 nHyperLink = 0;
+        sal_uInt16 nFields = rT.GetFieldCount( nPara );
+        for ( sal_uInt16 n = 0; n < nFields; n++ )
         {
             EFieldInfo aField = rT.GetFieldInfo( nPara, n );
             if ( aField.pFieldItem->GetField()->ISA( SvxURLField ) )
             {
                 if ( nHyperLink == nLinkIndex )
                 {
-                    USHORT nEEStart = aField.aPosition.nIndex;
+                    sal_uInt16 nEEStart = aField.aPosition.nIndex;
 
                     // Translate EE Index to accessible index
-                    USHORT nStart = rT.CalcEditEngineIndex( nPara, nEEStart );
-                    USHORT nEnd = nStart + aField.aCurrentText.Len();
+                    sal_uInt16 nStart = rT.CalcEditEngineIndex( nPara, nEEStart );
+                    sal_uInt16 nEnd = nStart + aField.aCurrentText.Len();
                     xRef = new AccessibleHyperlink( rT, new SvxFieldItem( *aField.pFieldItem ), nPara, nEEStart, nStart, nEnd, aField.aCurrentText );
                     break;
                 }
@@ -2150,13 +2150,13 @@ namespace accessibility
 
 //        SvxAccessibleTextIndex aIndex;
 //        aIndex.SetIndex(nPara, nCharIndex, rT);
-//        const USHORT nEEIndex = aIndex.GetEEIndex();
+//        const sal_uInt16 nEEIndex = aIndex.GetEEIndex();
 
-        const USHORT nEEIndex = rT.CalcEditEngineIndex( nPara, nCharIndex );
+        const sal_uInt16 nEEIndex = rT.CalcEditEngineIndex( nPara, nCharIndex );
         sal_Int32 nHLIndex = 0;
-        USHORT nHyperLink = 0;
-        USHORT nFields = rT.GetFieldCount( nPara );
-        for ( USHORT n = 0; n < nFields; n++ )
+        sal_uInt16 nHyperLink = 0;
+        sal_uInt16 nFields = rT.GetFieldCount( nPara );
+        for ( sal_uInt16 n = 0; n < nFields; n++ )
         {
             EFieldInfo aField = rT.GetFieldInfo( nPara, n );
             if ( aField.pFieldItem->GetField()->ISA( SvxURLField ) )
@@ -2187,8 +2187,8 @@ namespace accessibility
         if (bValidPara)
         {
             // we explicitly allow for the index to point at the character right behind the text
-            if (0 <= nIndex && nIndex <= rCacheTF.GetTextLen( static_cast< USHORT >(nPara) ))
-                nRes = rCacheTF.GetLineNumberAtIndex( static_cast< USHORT >(nPara), static_cast< USHORT >(nIndex) );
+            if (0 <= nIndex && nIndex <= rCacheTF.GetTextLen( static_cast< sal_uInt16 >(nPara) ))
+                nRes = rCacheTF.GetLineNumberAtIndex( static_cast< sal_uInt16 >(nPara), static_cast< sal_uInt16 >(nIndex) );
             else
                 throw lang::IndexOutOfBoundsException();
         }
@@ -2207,10 +2207,10 @@ namespace accessibility
         DBG_ASSERT( bValidPara, "getTextAtLineNumber: current paragraph index out of range" );
         if (bValidPara)
         {
-            if (0 <= nLineNo && nLineNo < rCacheTF.GetLineCount( static_cast< USHORT >(nPara) ))
+            if (0 <= nLineNo && nLineNo < rCacheTF.GetLineCount( static_cast< sal_uInt16 >(nPara) ))
             {
-                USHORT nStart = 0, nEnd = 0;
-                rCacheTF.GetLineBoundaries( nStart, nEnd, static_cast< USHORT >(nPara), static_cast< USHORT >(nLineNo) );
+                sal_uInt16 nStart = 0, nEnd = 0;
+                rCacheTF.GetLineBoundaries( nStart, nEnd, static_cast< sal_uInt16 >(nPara), static_cast< sal_uInt16 >(nLineNo) );
                 if (nStart != 0xFFFF && nEnd != 0xFFFF)
                 {
                     try
diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx
index 52c12b08a27b..853faf690c48 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.cxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star;
 namespace accessibility
 {
 
-    AccessibleHyperlink::AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, USHORT nP, USHORT nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD )
+    AccessibleHyperlink::AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, sal_uInt16 nP, sal_uInt16 nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD )
     : rTA( r )
     {
         pFld = p;
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx
index 5192f4b5be0b..c7067654c67f 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -54,12 +54,12 @@ namespace accessibility
 
         SvxAccessibleTextAdapter& rTA;
         SvxFieldItem* pFld;
-        USHORT nPara, nRealIdx;  // EE values
+        sal_uInt16 nPara, nRealIdx;  // EE values
         sal_Int32 nStartIdx, nEndIdx;   // translated values
         ::rtl::OUString aDescription;
 
     public:
-        AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, USHORT nP, USHORT nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD );
+        AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, sal_uInt16 nP, sal_uInt16 nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD );
         ~AccessibleHyperlink();
 
         // XAccessibleAction
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 5268e14f974c..d9c727cc32fc 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -218,7 +218,7 @@ namespace accessibility
                    "AccessibleImageBullet::getLocale: paragraph index value overflow");
 
         // return locale of first character in the paragraph
-        return SvxLanguageToLocale(aLocale, GetTextForwarder().GetLanguage( static_cast< USHORT >( GetParagraphIndex() ), 0 ));
+        return SvxLanguageToLocale(aLocale, GetTextForwarder().GetLanguage( static_cast< sal_uInt16 >( GetParagraphIndex() ), 0 ));
     }
 
     void SAL_CALL AccessibleImageBullet::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
@@ -271,8 +271,8 @@ namespace accessibility
                    "AccessibleEditableTextPara::getBounds: index value overflow");
 
         SvxTextForwarder& rCacheTF = GetTextForwarder();
-        EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< USHORT > (GetParagraphIndex()) );
-        Rectangle aParentRect = rCacheTF.GetParaBounds( static_cast< USHORT >( GetParagraphIndex() ) );
+        EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 > (GetParagraphIndex()) );
+        Rectangle aParentRect = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
 
         if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
             aBulletInfo.bVisible &&
@@ -364,7 +364,7 @@ namespace accessibility
 
         // #104444# Added to XAccessibleComponent interface
         svtools::ColorConfig aColorConfig;
-        UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+        sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
         return static_cast<sal_Int32>(nColor);
     }
 
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 78b3d851900d..555448ca4aeb 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -102,8 +102,8 @@ namespace accessibility
                    nEndIndex >= 0 && nEndIndex <= USHRT_MAX ,
                    "AccessibleStaticTextBase_Impl::MakeSelection: index value overflow");
 
-        return ESelection( static_cast< USHORT >(nStartPara), static_cast< USHORT >(nStartIndex),
-                           static_cast< USHORT >(nEndPara), static_cast< USHORT >(nEndIndex) );
+        return ESelection( static_cast< sal_uInt16 >(nStartPara), static_cast< sal_uInt16 >(nStartIndex),
+                           static_cast< sal_uInt16 >(nEndPara), static_cast< sal_uInt16 >(nEndIndex) );
     }
 
     //------------------------------------------------------------------------
@@ -344,7 +344,7 @@ namespace accessibility
 
         sal_Int32 nIndex = 0;
         if( mpTextParagraph )
-            nIndex = mpTextParagraph->GetTextForwarder().GetLineCount( static_cast< USHORT >(nParagraph) );
+            nIndex = mpTextParagraph->GetTextForwarder().GetLineCount( static_cast< sal_uInt16 >(nParagraph) );
         return nIndex;
     }
 
@@ -398,7 +398,7 @@ namespace accessibility
                            nFlatIndex - nCurrIndex + nCurrCount >= 0 && nFlatIndex - nCurrIndex + nCurrCount <= USHRT_MAX ,
                            "AccessibleStaticTextBase_Impl::Index2Internal: index value overflow");
 
-                return EPosition( static_cast< USHORT >(nCurrPara), static_cast< USHORT >(nFlatIndex - nCurrIndex + nCurrCount) );
+                return EPosition( static_cast< sal_uInt16 >(nCurrPara), static_cast< sal_uInt16 >(nFlatIndex - nCurrIndex + nCurrCount) );
             }
         }
 
@@ -410,7 +410,7 @@ namespace accessibility
                        nFlatIndex - nCurrIndex + nCurrCount >= 0 && nFlatIndex - nCurrIndex + nCurrCount <= USHRT_MAX ,
                        "AccessibleStaticTextBase_Impl::Index2Internal: index value overflow");
 
-            return EPosition( static_cast< USHORT >(nCurrPara-1), static_cast< USHORT >(nFlatIndex - nCurrIndex + nCurrCount) );
+            return EPosition( static_cast< sal_uInt16 >(nCurrPara-1), static_cast< sal_uInt16 >(nFlatIndex - nCurrIndex + nCurrCount) );
         }
 
         // not found? Out of bounds
@@ -726,8 +726,8 @@ namespace accessibility
 
             // #112814# Use correct index offset
             if ( ( nIndex = rPara.getIndexAtPoint( aPoint ) ) != -1 )
-                return mpImpl->Internal2Index( EPosition(sal::static_int_cast<USHORT>(i),
-                                                         sal::static_int_cast<USHORT>(nIndex)) );
+                return mpImpl->Internal2Index( EPosition(sal::static_int_cast<sal_uInt16>(i),
+                                                         sal::static_int_cast<sal_uInt16>(nIndex)) );
         }
 
         return -1;
diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index e52ff3ae4b91..c2fe557c5be8 100644
--- a/editeng/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -67,7 +67,7 @@ sal_Bool AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle&
     else
     {
         sal_Int32 aXArray[2];
-        mrDev.GetCaretPositions( maText, aXArray, static_cast< USHORT >(nIndex), 1 );
+        mrDev.GetCaretPositions( maText, aXArray, static_cast< sal_uInt16 >(nIndex), 1 );
         rRect.Left() = 0;
         rRect.Top() = 0;
         rRect.SetSize( Size(mrDev.GetTextHeight(), labs(aXArray[0] - aXArray[1])) );
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 81e211988a09..584d3d6904d1 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -76,13 +76,13 @@ EditAttrib::~EditAttrib()
 // -------------------------------------------------------------------------
 // class EditCharAttrib
 // -------------------------------------------------------------------------
-EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, USHORT nS, USHORT nE )
+EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
                     : EditAttrib( rAttr )
 {
     nStart      = nS;
     nEnd        = nE;
-    bFeature    = FALSE;
-    bEdge       = FALSE;
+    bFeature    = sal_False;
+    bEdge       = sal_False;
 
     DBG_ASSERT( ( rAttr.Which() >= EE_ITEMS_START ) && ( rAttr.Which() <= EE_ITEMS_END ), "EditCharAttrib CTOR: Invalid id!" );
     DBG_ASSERT( ( rAttr.Which() < EE_FEATURE_START ) || ( rAttr.Which() > EE_FEATURE_END ) || ( nE == (nS+1) ), "EditCharAttrib CTOR: Invalid feature!" );
@@ -96,7 +96,7 @@ void EditCharAttrib::SetFont( SvxFont&, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribFont
 // -------------------------------------------------------------------------
-EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTINFO || rAttr.Which() == EE_CHAR_FONTINFO_CJK || rAttr.Which() == EE_CHAR_FONTINFO_CTL, "Kein Fontattribut!" );
@@ -115,7 +115,7 @@ void EditCharAttribFont::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribItalic
 // -------------------------------------------------------------------------
-EditCharAttribItalic::EditCharAttribItalic( const SvxPostureItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribItalic::EditCharAttribItalic( const SvxPostureItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_ITALIC || rAttr.Which() == EE_CHAR_ITALIC_CJK || rAttr.Which() == EE_CHAR_ITALIC_CTL, "Kein Italicattribut!" );
@@ -129,7 +129,7 @@ void EditCharAttribItalic::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribWeight
 // -------------------------------------------------------------------------
-EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_WEIGHT || rAttr.Which() == EE_CHAR_WEIGHT_CJK || rAttr.Which() == EE_CHAR_WEIGHT_CTL, "Kein Weightttribut!" );
@@ -143,7 +143,7 @@ void EditCharAttribWeight::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribUnderline
 // -------------------------------------------------------------------------
-EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_UNDERLINE, "Kein Underlineattribut!" );
@@ -159,7 +159,7 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
 // -------------------------------------------------------------------------
 // class EditCharAttribOverline
 // -------------------------------------------------------------------------
-EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_OVERLINE, "Kein Overlineattribut!" );
@@ -175,7 +175,7 @@ void EditCharAttribOverline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
 // -------------------------------------------------------------------------
 // class EditCharAttribFontHeight
 // -------------------------------------------------------------------------
-EditCharAttribFontHeight::EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribFontHeight::EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTHEIGHT || rAttr.Which() == EE_CHAR_FONTHEIGHT_CJK || rAttr.Which() == EE_CHAR_FONTHEIGHT_CTL, "Kein Heightattribut!" );
@@ -190,7 +190,7 @@ void EditCharAttribFontHeight::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribFontWidth
 // -------------------------------------------------------------------------
-EditCharAttribFontWidth::EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribFontWidth::EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTWIDTH, "Kein Widthattribut!" );
@@ -204,7 +204,7 @@ void EditCharAttribFontWidth::SetFont( SvxFont& /*rFont*/, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribStrikeout
 // -------------------------------------------------------------------------
-EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_STRIKEOUT, "Kein Sizeattribut!" );
@@ -218,7 +218,7 @@ void EditCharAttribStrikeout::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribColor
 // -------------------------------------------------------------------------
-EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_COLOR, "Kein Colorattribut!" );
@@ -232,7 +232,7 @@ void EditCharAttribColor::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribLanguage
 // -------------------------------------------------------------------------
-EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( ( rAttr.Which() == EE_CHAR_LANGUAGE ) || ( rAttr.Which() == EE_CHAR_LANGUAGE_CJK ) || ( rAttr.Which() == EE_CHAR_LANGUAGE_CTL ), "Kein Languageattribut!" );
@@ -246,7 +246,7 @@ void EditCharAttribLanguage::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribShadow
 // -------------------------------------------------------------------------
-EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_SHADOW, "Kein Shadowattribut!" );
@@ -254,13 +254,13 @@ EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT
 
 void EditCharAttribShadow::SetFont( SvxFont& rFont, OutputDevice* )
 {
-    rFont.SetShadow( (BOOL)((const SvxShadowedItem*)GetItem())->GetValue() );
+    rFont.SetShadow( (sal_Bool)((const SvxShadowedItem*)GetItem())->GetValue() );
 }
 
 // -------------------------------------------------------------------------
 // class EditCharAttribEscapement
 // -------------------------------------------------------------------------
-EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_ESCAPEMENT, "Kein Escapementattribut!" );
@@ -268,8 +268,8 @@ EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAt
 
 void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* )
 {
-    USHORT nProp = ((const SvxEscapementItem*)GetItem())->GetProp();
-    rFont.SetPropr( (BYTE)nProp );
+    sal_uInt16 nProp = ((const SvxEscapementItem*)GetItem())->GetProp();
+    rFont.SetPropr( (sal_uInt8)nProp );
 
     short nEsc = ((const SvxEscapementItem*)GetItem())->GetEsc();
     if ( nEsc == DFLT_ESC_AUTO_SUPER )
@@ -282,7 +282,7 @@ void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribOutline
 // -------------------------------------------------------------------------
-EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_OUTLINE, "Kein Outlineattribut!" );
@@ -290,16 +290,16 @@ EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, USHOR
 
 void EditCharAttribOutline::SetFont( SvxFont& rFont, OutputDevice* )
 {
-    rFont.SetOutline( (BOOL)((const SvxContourItem*)GetItem())->GetValue() );
+    rFont.SetOutline( (sal_Bool)((const SvxContourItem*)GetItem())->GetValue() );
 }
 
 // -------------------------------------------------------------------------
 // class EditCharAttribTab
 // -------------------------------------------------------------------------
-EditCharAttribTab::EditCharAttribTab( const SfxVoidItem& rAttr, USHORT nPos )
+EditCharAttribTab::EditCharAttribTab( const SfxVoidItem& rAttr, sal_uInt16 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
 {
-    SetFeature( TRUE );
+    SetFeature( sal_True );
 }
 
 void EditCharAttribTab::SetFont( SvxFont&, OutputDevice* )
@@ -309,10 +309,10 @@ void EditCharAttribTab::SetFont( SvxFont&, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribLineBreak
 // -------------------------------------------------------------------------
-EditCharAttribLineBreak::EditCharAttribLineBreak( const SfxVoidItem& rAttr, USHORT nPos )
+EditCharAttribLineBreak::EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_uInt16 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
 {
-    SetFeature( TRUE );
+    SetFeature( sal_True );
 }
 
 void EditCharAttribLineBreak::SetFont( SvxFont&, OutputDevice* )
@@ -322,10 +322,10 @@ void EditCharAttribLineBreak::SetFont( SvxFont&, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribField
 // -------------------------------------------------------------------------
-EditCharAttribField::EditCharAttribField( const SvxFieldItem& rAttr, USHORT nPos )
+EditCharAttribField::EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
 {
-    SetFeature( TRUE ); // !!!
+    SetFeature( sal_True ); // !!!
     pTxtColor = 0;
     pFldColor = 0;
 }
@@ -335,7 +335,7 @@ void EditCharAttribField::SetFont( SvxFont& rFont, OutputDevice* )
     if ( pFldColor )
     {
         rFont.SetFillColor( *pFldColor );
-        rFont.SetTransparent( FALSE );
+        rFont.SetTransparent( sal_False );
     }
     if ( pTxtColor )
         rFont.SetColor( *pTxtColor );
@@ -356,28 +356,28 @@ EditCharAttribField::~EditCharAttribField()
     Reset();
 }
 
-BOOL EditCharAttribField::operator == ( const EditCharAttribField& rAttr ) const
+sal_Bool EditCharAttribField::operator == ( const EditCharAttribField& rAttr ) const
 {
     if ( aFieldValue != rAttr.aFieldValue )
-        return FALSE;
+        return sal_False;
 
     if ( ( pTxtColor && !rAttr.pTxtColor ) || ( !pTxtColor && rAttr.pTxtColor ) )
-        return FALSE;
+        return sal_False;
     if ( ( pTxtColor && rAttr.pTxtColor ) && ( *pTxtColor != *rAttr.pTxtColor ) )
-        return FALSE;
+        return sal_False;
 
     if ( ( pFldColor && !rAttr.pFldColor ) || ( !pFldColor && rAttr.pFldColor ) )
-        return FALSE;
+        return sal_False;
     if ( ( pFldColor && rAttr.pFldColor ) && ( *pFldColor != *rAttr.pFldColor ) )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 // -------------------------------------------------------------------------
 // class EditCharAttribPairKerning
 // -------------------------------------------------------------------------
-EditCharAttribPairKerning::EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribPairKerning::EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_PAIRKERNING, "Kein PairKerning!" );
@@ -391,7 +391,7 @@ void EditCharAttribPairKerning::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribKerning
 // -------------------------------------------------------------------------
-EditCharAttribKerning::EditCharAttribKerning( const SvxKerningItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribKerning::EditCharAttribKerning( const SvxKerningItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_KERNING, "Kein Kerning!" );
@@ -405,7 +405,7 @@ void EditCharAttribKerning::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribWordLineMode
 // -------------------------------------------------------------------------
-EditCharAttribWordLineMode::EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribWordLineMode::EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_WLM, "Kein Kerning!" );
@@ -419,7 +419,7 @@ void EditCharAttribWordLineMode::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribEmphasisMark
 // -------------------------------------------------------------------------
-EditCharAttribEmphasisMark::EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribEmphasisMark::EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_EMPHASISMARK, "Kein Emphasisattribut!" );
@@ -433,7 +433,7 @@ void EditCharAttribEmphasisMark::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribRelief
 // -------------------------------------------------------------------------
-EditCharAttribRelief::EditCharAttribRelief( const SvxCharReliefItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribRelief::EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_RELIEF, "Not a relief attribute!" );
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 9f07969ee74d..3a4cd427d8eb 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -56,7 +56,7 @@ class SvxCharReliefItem;
 
 class SfxVoidItem;
 
-#define CH_FEATURE_OLD  (BYTE)          0xFF
+#define CH_FEATURE_OLD  (sal_uInt8)         0xFF
 #define CH_FEATURE      (sal_Unicode)   0x01
 
 // DEF_METRIC: Bei meinem Pool sollte immer die DefMetric bei
@@ -83,7 +83,7 @@ public:
     // RemoveFromPool muss immer vorm DTOR Aufruf erfolgen!!
     void                RemoveFromPool( SfxItemPool& rPool );
 
-    USHORT              Which() const   { return pItem->Which(); }
+    sal_uInt16              Which() const   { return pItem->Which(); }
     const SfxPoolItem*  GetItem() const { return pItem; }
 };
 
@@ -96,72 +96,72 @@ class EditCharAttrib : public EditAttrib
 {
 protected:
 
-    USHORT              nStart;
-    USHORT              nEnd;
-    BOOL                bFeature    :1;
-    BOOL                bEdge       :1;
+    sal_uInt16              nStart;
+    sal_uInt16              nEnd;
+    sal_Bool                bFeature    :1;
+    sal_Bool                bEdge       :1;
 
 public:
-            EditCharAttrib( const SfxPoolItem& rAttr, USHORT nStart, USHORT nEnd );
+            EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    USHORT&         GetStart()                  { return nStart; }
-    USHORT&         GetEnd()                    { return nEnd; }
+    sal_uInt16&         GetStart()                  { return nStart; }
+    sal_uInt16&         GetEnd()                    { return nEnd; }
 
-    USHORT          GetStart() const            { return nStart; }
-    USHORT          GetEnd() const              { return nEnd; }
+    sal_uInt16          GetStart() const            { return nStart; }
+    sal_uInt16          GetEnd() const              { return nEnd; }
 
-    inline USHORT   GetLen() const;
+    inline sal_uInt16   GetLen() const;
 
-    inline void     MoveForward( USHORT nDiff );
-    inline void     MoveBackward( USHORT nDiff );
+    inline void     MoveForward( sal_uInt16 nDiff );
+    inline void     MoveBackward( sal_uInt16 nDiff );
 
-    inline void     Expand( USHORT nDiff );
-    inline void     Collaps( USHORT nDiff );
+    inline void     Expand( sal_uInt16 nDiff );
+    inline void     Collaps( sal_uInt16 nDiff );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 
-    BOOL    IsIn( USHORT nIndex )
+    sal_Bool    IsIn( sal_uInt16 nIndex )
                 { return ( ( nStart <= nIndex ) && ( nEnd >= nIndex ) ); }
-    BOOL    IsInside( USHORT nIndex )
+    sal_Bool    IsInside( sal_uInt16 nIndex )
                 { return ( ( nStart < nIndex ) && ( nEnd > nIndex ) ); }
-    BOOL    IsEmpty()
+    sal_Bool    IsEmpty()
                 { return nStart == nEnd; }
 
-    BOOL    IsFeature() const   { return bFeature; }
-    void    SetFeature( BOOL b) { bFeature = b; }
+    sal_Bool    IsFeature() const   { return bFeature; }
+    void    SetFeature( sal_Bool b) { bFeature = b; }
 
-    BOOL    IsEdge() const      { return bEdge; }
-    void    SetEdge( BOOL b )   { bEdge = b; }
+    sal_Bool    IsEdge() const      { return bEdge; }
+    void    SetEdge( sal_Bool b )   { bEdge = b; }
 };
 
-inline USHORT EditCharAttrib::GetLen() const
+inline sal_uInt16 EditCharAttrib::GetLen() const
 {
     DBG_ASSERT( nEnd >= nStart, "EditCharAttrib: nEnd < nStart!" );
     return nEnd-nStart;
 }
 
-inline void EditCharAttrib::MoveForward( USHORT nDiff )
+inline void EditCharAttrib::MoveForward( sal_uInt16 nDiff )
 {
     DBG_ASSERT( ((long)nEnd + nDiff) <= 0xFFFF, "EditCharAttrib: MoveForward?!" );
     nStart = nStart + nDiff;
     nEnd = nEnd + nDiff;
 }
 
-inline void EditCharAttrib::MoveBackward( USHORT nDiff )
+inline void EditCharAttrib::MoveBackward( sal_uInt16 nDiff )
 {
     DBG_ASSERT( ((long)nStart - nDiff) >= 0, "EditCharAttrib: MoveBackward?!" );
     nStart = nStart - nDiff;
     nEnd = nEnd - nDiff;
 }
 
-inline void EditCharAttrib::Expand( USHORT nDiff )
+inline void EditCharAttrib::Expand( sal_uInt16 nDiff )
 {
     DBG_ASSERT( ( ((long)nEnd + nDiff) <= (long)0xFFFF ), "EditCharAttrib: Expand?!" );
     DBG_ASSERT( !bFeature, "Bitte keine Features expandieren!" );
     nEnd = nEnd + nDiff;
 }
 
-inline void EditCharAttrib::Collaps( USHORT nDiff )
+inline void EditCharAttrib::Collaps( sal_uInt16 nDiff )
 {
     DBG_ASSERT( (long)nEnd - nDiff >= (long)nStart, "EditCharAttrib: Collaps?!" );
     DBG_ASSERT( !bFeature, "Bitte keine Features schrumpfen!" );
@@ -174,7 +174,7 @@ inline void EditCharAttrib::Collaps( USHORT nDiff )
 class EditCharAttribFont: public EditCharAttrib
 {
 public:
-    EditCharAttribFont( const SvxFontItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -185,7 +185,7 @@ public:
 class EditCharAttribWeight : public EditCharAttrib
 {
 public:
-    EditCharAttribWeight( const SvxWeightItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribWeight( const SvxWeightItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -195,7 +195,7 @@ public:
 class EditCharAttribItalic : public EditCharAttrib
 {
 public:
-    EditCharAttribItalic( const SvxPostureItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribItalic( const SvxPostureItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -206,7 +206,7 @@ public:
 class EditCharAttribShadow : public EditCharAttrib
 {
 public:
-    EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -217,7 +217,7 @@ public:
 class EditCharAttribEscapement : public EditCharAttrib
 {
 public:
-    EditCharAttribEscapement( const SvxEscapementItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -228,7 +228,7 @@ public:
 class EditCharAttribOutline : public EditCharAttrib
 {
 public:
-    EditCharAttribOutline( const SvxContourItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribOutline( const SvxContourItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -239,7 +239,7 @@ public:
 class EditCharAttribStrikeout : public EditCharAttrib
 {
 public:
-    EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -250,7 +250,7 @@ public:
 class EditCharAttribUnderline : public EditCharAttrib
 {
 public:
-    EditCharAttribUnderline( const SvxUnderlineItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -261,7 +261,7 @@ public:
 class EditCharAttribOverline : public EditCharAttrib
 {
 public:
-    EditCharAttribOverline( const SvxOverlineItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -272,7 +272,7 @@ public:
 class EditCharAttribEmphasisMark : public EditCharAttrib
 {
 public:
-    EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -283,7 +283,7 @@ public:
 class EditCharAttribRelief : public EditCharAttrib
 {
 public:
-    EditCharAttribRelief( const SvxCharReliefItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -294,7 +294,7 @@ public:
 class EditCharAttribFontHeight : public EditCharAttrib
 {
 public:
-    EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -305,7 +305,7 @@ public:
 class EditCharAttribFontWidth : public EditCharAttrib
 {
 public:
-    EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -316,7 +316,7 @@ public:
 class EditCharAttribColor : public EditCharAttrib
 {
 public:
-    EditCharAttribColor( const SvxColorItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribColor( const SvxColorItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -327,7 +327,7 @@ public:
 class EditCharAttribLanguage : public EditCharAttrib
 {
 public:
-    EditCharAttribLanguage( const SvxLanguageItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -338,7 +338,7 @@ public:
 class EditCharAttribTab : public EditCharAttrib
 {
 public:
-    EditCharAttribTab( const SfxVoidItem& rAttr, USHORT nPos );
+    EditCharAttribTab( const SfxVoidItem& rAttr, sal_uInt16 nPos );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -349,7 +349,7 @@ public:
 class EditCharAttribLineBreak : public EditCharAttrib
 {
 public:
-    EditCharAttribLineBreak( const SfxVoidItem& rAttr, USHORT nPos );
+    EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_uInt16 nPos );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -366,12 +366,12 @@ class EditCharAttribField: public EditCharAttrib
     EditCharAttribField& operator = ( const EditCharAttribField& rAttr ) const;
 
 public:
-    EditCharAttribField( const SvxFieldItem& rAttr, USHORT nPos );
+    EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos );
     EditCharAttribField( const EditCharAttribField& rAttr );
     ~EditCharAttribField();
 
-    BOOL operator == ( const EditCharAttribField& rAttr ) const;
-    BOOL operator != ( const EditCharAttribField& rAttr ) const
+    sal_Bool operator == ( const EditCharAttribField& rAttr ) const;
+    sal_Bool operator != ( const EditCharAttribField& rAttr ) const
                                     { return !(operator == ( rAttr ) ); }
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
@@ -395,7 +395,7 @@ public:
 class EditCharAttribPairKerning : public EditCharAttrib
 {
 public:
-    EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -406,7 +406,7 @@ public:
 class EditCharAttribKerning : public EditCharAttrib
 {
 public:
-    EditCharAttribKerning( const SvxKerningItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribKerning( const SvxKerningItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -417,7 +417,7 @@ public:
 class EditCharAttribWordLineMode: public EditCharAttrib
 {
 public:
-    EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index a21c6ed345c6..c98472b2b279 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -87,7 +87,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         case EE_PARA_NUMBULLET:
             {
             aDebStr += "NumItem ";
-            for ( USHORT nLevel = 0; nLevel < 3; nLevel++ )
+            for ( sal_uInt16 nLevel = 0; nLevel < 3; nLevel++ )
             {
                 aDebStr += "Level";
                 aDebStr += ByteString::CreateFromInt32( nLevel );
@@ -147,14 +147,14 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
             else if ( ((SvxLineSpacingItem&)rItem).GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
             {
                 aDebStr += "Prop: ";
-                aDebStr += ByteString::CreateFromInt32( (ULONG)((SvxLineSpacingItem&)rItem).GetPropLineSpace() );
+                aDebStr += ByteString::CreateFromInt32( (sal_uLong)((SvxLineSpacingItem&)rItem).GetPropLineSpace() );
             }
             else
                 aDebStr += "Unsupported Type!";
         break;
         case EE_PARA_JUST:
             aDebStr += "SvxAdust=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxAdjustItem&)rItem).GetAdjust() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxAdjustItem&)rItem).GetAdjust() );
         break;
         case EE_PARA_TABS:
         {
@@ -164,7 +164,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
             if ( rTabs.Count() )
             {
                 aDebStr += "( ";
-                for ( USHORT i = 0; i < rTabs.Count(); i++ )
+                for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ )
                 {
                     const SvxTabStop& rTab = rTabs[i];
                     aDebStr += ByteString::CreateFromInt32( rTab.GetTabPos() );
@@ -178,17 +178,17 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         case EE_CHAR_LANGUAGE_CJK:
         case EE_CHAR_LANGUAGE_CTL:
             aDebStr += "Language=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxLanguageItem&)rItem).GetLanguage() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxLanguageItem&)rItem).GetLanguage() );
         break;
         case EE_CHAR_COLOR:
         {
             aDebStr += "Color= ";
             Color aColor( ((SvxColorItem&)rItem).GetValue() );
-            aDebStr += ByteString::CreateFromInt32( (USHORT)aColor.GetRed() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)aColor.GetRed() );
             aDebStr += ", ";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)aColor.GetGreen() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)aColor.GetGreen() );
             aDebStr += ", ";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)aColor.GetBlue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)aColor.GetBlue() );
         }
         break;
         case EE_CHAR_FONTINFO:
@@ -198,7 +198,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
             aDebStr += "Font=";
             aDebStr += ByteString( ((SvxFontItem&)rItem).GetFamilyName(), RTL_TEXTENCODING_ASCII_US );
             aDebStr += " (CharSet: ";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxFontItem&)rItem).GetCharSet() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxFontItem&)rItem).GetCharSet() );
             aDebStr += ')';
         }
         break;
@@ -228,41 +228,41 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         case EE_CHAR_WEIGHT_CJK:
         case EE_CHAR_WEIGHT_CTL:
             aDebStr += "FontWeight=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxWeightItem&)rItem).GetWeight() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxWeightItem&)rItem).GetWeight() );
         break;
         case EE_CHAR_UNDERLINE:
             aDebStr += "FontUnderline=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxUnderlineItem&)rItem).GetLineStyle() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxUnderlineItem&)rItem).GetLineStyle() );
         break;
         case EE_CHAR_OVERLINE:
             aDebStr += "FontOverline=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxOverlineItem&)rItem).GetLineStyle() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxOverlineItem&)rItem).GetLineStyle() );
         break;
         case EE_CHAR_EMPHASISMARK:
             aDebStr += "FontUnderline=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxEmphasisMarkItem&)rItem).GetEmphasisMark() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxEmphasisMarkItem&)rItem).GetEmphasisMark() );
         break;
         case EE_CHAR_RELIEF:
             aDebStr += "FontRelief=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxCharReliefItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxCharReliefItem&)rItem).GetValue() );
         break;
         case EE_CHAR_STRIKEOUT:
             aDebStr += "FontStrikeout=";
-            aDebStr +=ByteString::CreateFromInt32(  (USHORT)((SvxCrossedOutItem&)rItem).GetStrikeout() );
+            aDebStr +=ByteString::CreateFromInt32(  (sal_uInt16)((SvxCrossedOutItem&)rItem).GetStrikeout() );
         break;
         case EE_CHAR_ITALIC:
         case EE_CHAR_ITALIC_CJK:
         case EE_CHAR_ITALIC_CTL:
             aDebStr += "FontPosture=";
-            aDebStr +=ByteString::CreateFromInt32(  (USHORT)((SvxPostureItem&)rItem).GetPosture() );
+            aDebStr +=ByteString::CreateFromInt32(  (sal_uInt16)((SvxPostureItem&)rItem).GetPosture() );
         break;
         case EE_CHAR_OUTLINE:
             aDebStr += "FontOutline=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxContourItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxContourItem&)rItem).GetValue() );
         break;
         case EE_CHAR_SHADOW:
             aDebStr += "FontShadowed=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxShadowedItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxShadowedItem&)rItem).GetValue() );
         break;
         case EE_CHAR_ESCAPEMENT:
             aDebStr += "Escape=";
@@ -272,7 +272,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         break;
         case EE_CHAR_PAIRKERNING:
             aDebStr += "PairKerning=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxAutoKernItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxAutoKernItem&)rItem).GetValue() );
         break;
         case EE_CHAR_KERNING:
         {
@@ -289,7 +289,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         break;
         case EE_CHAR_WLM:
             aDebStr += "WordLineMode=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxWordLineModeItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxWordLineModeItem&)rItem).GetValue() );
         break;
         case EE_CHAR_XMLATTRIBS:
             aDebStr += "XMLAttribs=...";
@@ -298,9 +298,9 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
     return aDebStr;
 }
 
-void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL )
+void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent, sal_Bool bShowALL )
 {
-    for ( USHORT nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
+    for ( sal_uInt16 nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
     {
         fprintf( fp, "\nWhich: %i\t", nWhich );
         if ( rSet.GetItemState( nWhich, bSearchInParent ) == SFX_ITEM_OFF )
@@ -319,7 +319,7 @@ void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL
     }
 }
 
-void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
+void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
 {
 #if defined UNX
     FILE* fp = fopen( "/tmp/debug.log", "w" );
@@ -337,7 +337,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
     fprintf( fp, "================================================================================" );
     fprintf( fp, "\n==================   Dokument   ================================================" );
     fprintf( fp, "\n================================================================================" );
-    for ( USHORT nPortion = 0; nPortion < pEE->pImpEditEngine->GetParaPortions(). Count(); nPortion++)
+    for ( sal_uInt16 nPortion = 0; nPortion < pEE->pImpEditEngine->GetParaPortions(). Count(); nPortion++)
     {
 
         ParaPortion* pPPortion = pEE->pImpEditEngine->GetParaPortions().GetObject(nPortion );
@@ -347,11 +347,11 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
         if ( pStyle )
             fprintf( fp, " %s", ByteString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
         fprintf( fp, "\nAbsatzattribute:" );
-        DbgOutItemSet( fp, pPPortion->GetNode()->GetContentAttribs().GetItems(), FALSE, FALSE );
+        DbgOutItemSet( fp, pPPortion->GetNode()->GetContentAttribs().GetItems(), sal_False, sal_False );
 
         fprintf( fp, "\nZeichenattribute:" );
-        BOOL bZeroAttr = FALSE;
-        USHORT z;
+        sal_Bool bZeroAttr = sal_False;
+        sal_uInt16 z;
         for ( z = 0; z < pPPortion->GetNode()->GetCharAttribs().Count(); z++ )
         {
             EditCharAttrib* pAttr = pPPortion->GetNode()->GetCharAttribs().GetAttribs().GetObject( z );
@@ -365,7 +365,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
             aCharAttribs += '\t';
             aCharAttribs += ByteString::CreateFromInt32( pAttr->GetEnd() );
             if ( pAttr->IsEmpty() )
-                bZeroAttr = TRUE;
+                bZeroAttr = sal_True;
             fprintf( fp, "%s => ", aCharAttribs.GetBuffer() );
 
             ByteString aDebStr = DbgOutItem( rPool, *pAttr->GetItem() );
@@ -374,7 +374,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
         if ( bZeroAttr )
             fprintf( fp, "\nNULL-Attribute!" );
 
-        USHORT nTextPortions = pPPortion->GetTextPortions().Count();
+        sal_uInt16 nTextPortions = pPPortion->GetTextPortions().Count();
         ByteString aPortionStr("\nTextportions: #");
         aPortionStr += ByteString::CreateFromInt32( nTextPortions );
         aPortionStr += " \nA";
@@ -384,7 +384,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
         aPortionStr += "\nA";
         aPortionStr += ByteString::CreateFromInt32( nPortion );
         aPortionStr += ": ";
-        ULONG n = 0;
+        sal_uLong n = 0;
         for ( z = 0; z < nTextPortions; z++ )
         {
             TextPortion* pPortion = pPPortion->GetTextPortions().GetObject( z );
@@ -394,7 +394,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
             aPortionStr += ByteString::CreateFromInt32( pPortion->GetSize().Width() );
             aPortionStr += ")";
             aPortionStr += "[";
-            aPortionStr += ByteString::CreateFromInt32( (USHORT)pPortion->GetKind() );
+            aPortionStr += ByteString::CreateFromInt32( (sal_uInt16)pPortion->GetKind() );
             aPortionStr += "]";
             aPortionStr += ";";
             n += pPortion->GetLen();
@@ -410,7 +410,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
 
         fprintf( fp, "\n\nZeilen:" );
         // Erstmal die Inhalte...
-        USHORT nLine;
+        sal_uInt16 nLine;
         for ( nLine = 0; nLine < pPPortion->GetLines().Count(); nLine++ )
         {
             EditLine* pLine = pPPortion->GetLines().GetObject( nLine );
@@ -431,7 +431,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
 
     if ( pEE->pImpEditEngine->GetStyleSheetPool() )
     {
-        ULONG nStyles = pEE->pImpEditEngine->GetStyleSheetPool() ? pEE->pImpEditEngine->GetStyleSheetPool()->Count() : 0;
+        sal_uLong nStyles = pEE->pImpEditEngine->GetStyleSheetPool() ? pEE->pImpEditEngine->GetStyleSheetPool()->Count() : 0;
         fprintf( fp, "\n\n================================================================================" );
         fprintf( fp, "\n==================   Stylesheets   =============================================" );
         fprintf( fp, "\n================================================================================" );
@@ -443,7 +443,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
             fprintf( fp, "\nVorlage:   %s", ByteString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
             fprintf( fp, "\nParent:    %s", ByteString( pStyle->GetParent(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
             fprintf( fp, "\nFollow:    %s", ByteString( pStyle->GetFollow(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
-            DbgOutItemSet( fp, pStyle->GetItemSet(), FALSE, FALSE );
+            DbgOutItemSet( fp, pStyle->GetItemSet(), sal_False, sal_False );
             fprintf( fp, "\n----------------------------------" );
 
             pStyle = aIter.Next();
@@ -453,7 +453,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
     fprintf( fp, "\n\n================================================================================" );
     fprintf( fp, "\n==================   Defaults   ================================================" );
     fprintf( fp, "\n================================================================================" );
-    DbgOutItemSet( fp, pEE->pImpEditEngine->GetEmptyItemSet(), TRUE, TRUE );
+    DbgOutItemSet( fp, pEE->pImpEditEngine->GetEmptyItemSet(), sal_True, sal_True );
 
     fprintf( fp, "\n\n================================================================================" );
     fprintf( fp, "\n==================   EditEngine & Views   ======================================" );
@@ -465,7 +465,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
     fprintf( fp, "\nMinAutoPaperSize: %li x %li", pEE->GetMinAutoPaperSize().Width(), pEE->GetMinAutoPaperSize().Height() );
     fprintf( fp, "\nUpdate: %i", pEE->GetUpdateMode() );
     fprintf( fp, "\nAnzahl der Views: %i", pEE->GetViewCount() );
-    for ( USHORT nView = 0; nView < pEE->GetViewCount(); nView++ )
+    for ( sal_uInt16 nView = 0; nView < pEE->GetViewCount(); nView++ )
     {
         EditView* pV = pEE->GetView( nView );
         DBG_ASSERT( pV, "View nicht gefunden!" );
@@ -482,7 +482,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
         fprintf( fp, "\n\n================================================================================" );
         fprintf( fp, "\n==================   Aktuelle View   ===========================================" );
         fprintf( fp, "\n================================================================================" );
-        DbgOutItemSet( fp, pEE->GetActiveView()->GetAttribs(), TRUE, FALSE );
+        DbgOutItemSet( fp, pEE->GetActiveView()->GetAttribs(), sal_True, sal_False );
     }
     fclose( fp );
     if ( bInfoBox )
@@ -491,7 +491,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
 
 ByteString EditDbg::GetPortionInfo( ParaPortion* pPPortion )
 {
-    USHORT z;
+    sal_uInt16 z;
 
     ByteString aDebStr( "Absatzlaenge = " );
     aDebStr += ByteString::CreateFromInt32( pPPortion->GetNode()->Len() );
@@ -509,7 +509,7 @@ ByteString EditDbg::GetPortionInfo( ParaPortion* pPPortion )
     }
 
     aDebStr += "\nTextportions:";
-    USHORT n = 0;
+    sal_uInt16 n = 0;
     for ( z = 0; z < pPPortion->GetTextPortions().Count(); z++ )
     {
         TextPortion* pPortion = pPPortion->GetTextPortions().GetObject( z );
@@ -524,7 +524,7 @@ ByteString EditDbg::GetPortionInfo( ParaPortion* pPPortion )
     aDebStr += "\nGesamtlaenge: ";
     aDebStr += ByteString::CreateFromInt32( n );
     aDebStr += "\nSortiert nach Start:";
-    for ( USHORT x = 0; x < pPPortion->GetNode()->GetCharAttribs().Count(); x++ )
+    for ( sal_uInt16 x = 0; x < pPPortion->GetNode()->GetCharAttribs().Count(); x++ )
     {
         EditCharAttrib* pCurAttrib = pPPortion->GetNode()->GetCharAttribs().GetAttribs().GetObject( x );
         aDebStr += "\nStart: ";
@@ -538,7 +538,7 @@ ByteString EditDbg::GetPortionInfo( ParaPortion* pPPortion )
 ByteString EditDbg::GetTextPortionInfo( TextPortionList& rPortions )
 {
     ByteString aDebStr;
-    for ( USHORT z = 0; z < rPortions.Count(); z++ )
+    for ( sal_uInt16 z = 0; z < rPortions.Count(); z++ )
     {
         TextPortion* pPortion = rPortions.GetObject( z );
         aDebStr += " ";
@@ -558,28 +558,28 @@ void EditDbg::ShowPortionData( ParaPortion* pPortion )
 }
 
 
-BOOL ParaPortion::DbgCheckTextPortions()
+sal_Bool ParaPortion::DbgCheckTextPortions()
 {
     // pruefen, ob Portionlaenge ok:
-    USHORT nXLen = 0;
-    for ( USHORT nPortion = 0; nPortion < aTextPortionList.Count(); nPortion++  )
+    sal_uInt16 nXLen = 0;
+    for ( sal_uInt16 nPortion = 0; nPortion < aTextPortionList.Count(); nPortion++  )
         nXLen = nXLen + aTextPortionList[nPortion]->GetLen();
-    return nXLen == pNode->Len() ? TRUE : FALSE;
+    return nXLen == pNode->Len() ? sal_True : sal_False;
 }
 
-BOOL CheckOrderedList( CharAttribArray& rAttribs, BOOL bStart )
+sal_Bool CheckOrderedList( CharAttribArray& rAttribs, sal_Bool bStart )
 {
-    USHORT nPrev = 0;
-    for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
+    sal_uInt16 nPrev = 0;
+    for ( sal_uInt16 nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
     {
         EditCharAttrib* pAttr = rAttribs[nAttr];
-        USHORT nCur = bStart ? pAttr->GetStart() : pAttr->GetEnd();
+        sal_uInt16 nCur = bStart ? pAttr->GetStart() : pAttr->GetEnd();
         if ( nCur < nPrev )
-            return FALSE;
+            return sal_False;
 
         nPrev = nCur;
     }
-    return TRUE;
+    return sal_True;
 }
 
 #endif
diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index efe3248e9af4..ebaa60bd1306 100644
--- a/editeng/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -41,12 +41,12 @@ class SfxItemPool;
 class SfxPoolItem;
 
 ByteString  DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem );
-void        DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL );
+void        DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent, sal_Bool bShowALL );
 
 class EditDbg
 {
 public:
-    static void         ShowEditEngineData( EditEngine* pEditEngine, BOOL bInfoBox = TRUE );
+    static void         ShowEditEngineData( EditEngine* pEditEngine, sal_Bool bInfoBox = sal_True );
     static void         ShowPortionData( ParaPortion* pPortion );
     static ByteString   GetPortionInfo( ParaPortion* pPPortion );
     static ByteString   GetTextPortionInfo( TextPortionList& rPortions );
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index a8b9efd1fff7..c19bf969abbe 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -71,9 +71,9 @@ using namespace ::com::sun::star;
 
 // ------------------------------------------------------------
 
-USHORT GetScriptItemId( USHORT nItemId, short nScriptType )
+sal_uInt16 GetScriptItemId( sal_uInt16 nItemId, short nScriptType )
 {
-    USHORT nId = nItemId;
+    sal_uInt16 nId = nItemId;
 
     if ( ( nScriptType == i18n::ScriptType::ASIAN ) ||
          ( nScriptType == i18n::ScriptType::COMPLEX ) )
@@ -101,9 +101,9 @@ USHORT GetScriptItemId( USHORT nItemId, short nScriptType )
     return nId;
 }
 
-BOOL IsScriptItemValid( USHORT nItemId, short nScriptType )
+sal_Bool IsScriptItemValid( sal_uInt16 nItemId, short nScriptType )
 {
-    BOOL bValid = TRUE;
+    sal_Bool bValid = sal_True;
 
     switch ( nItemId )
     {
@@ -221,23 +221,23 @@ SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
         { SID_FIELD, SFX_ITEM_POOLABLE }
 };
 
-USHORT aV1Map[] = {
+sal_uInt16 aV1Map[] = {
     3999, 4001, 4002, 4003, 4004, 4005, 4006,
     4007, 4008, 4009, 4010, 4011, 4012, 4013, 4017, 4018, 4019 // MI: 4019?
 };
 
-USHORT aV2Map[] = {
+sal_uInt16 aV2Map[] = {
     3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009,
     4010, 4011, 4012, 4013, 4014, 4015, 4016, 4018, 4019, 4020
 };
 
-USHORT aV3Map[] = {
+sal_uInt16 aV3Map[] = {
     3997, 3998, 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007,
     4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4017, 4018, 4019,
     4020, 4021
 };
 
-USHORT aV4Map[] = {
+sal_uInt16 aV4Map[] = {
     3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
     4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
     4014, 4015, 4016, 4017, 4018,
@@ -245,7 +245,7 @@ USHORT aV4Map[] = {
     4034, 4035, 4036, 4037
 };
 
-USHORT aV5Map[] = {
+sal_uInt16 aV5Map[] = {
     3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
     4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
     4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023,
@@ -265,7 +265,7 @@ int SAL_CALL CompareStart( const void* pFirst, const void* pSecond )
     return 0;
 }
 
-EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, USHORT nS, USHORT nE )
+EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
 {
     // das neue Attribut im Pool anlegen
     const SfxPoolItem& rNew = rPool.Put( rAttr );
@@ -418,8 +418,8 @@ EditLine::EditLine()
     nTxtWidth = 0;
     nCrsrHeight = 0;
     nMaxAscent = 0;
-    bHangingPunctuation = FALSE;
-    bInvalid = TRUE;
+    bHangingPunctuation = sal_False;
+    bInvalid = sal_True;
 }
 
 EditLine::EditLine( const EditLine& r )
@@ -438,7 +438,7 @@ EditLine::EditLine( const EditLine& r )
     nTxtWidth = 0;
     nCrsrHeight = 0;
     nMaxAscent = 0;
-    bInvalid = TRUE;
+    bInvalid = sal_True;
 }
 
 EditLine::~EditLine()
@@ -467,21 +467,21 @@ EditLine* EditLine::Clone() const
     return pL;
 }
 
-BOOL operator == ( const EditLine& r1,  const EditLine& r2  )
+sal_Bool operator == ( const EditLine& r1,  const EditLine& r2  )
 {
     if ( r1.nStart != r2.nStart )
-        return FALSE;
+        return sal_False;
 
     if ( r1.nEnd != r2.nEnd )
-        return FALSE;
+        return sal_False;
 
     if ( r1.nStartPortion != r2.nStartPortion )
-        return FALSE;
+        return sal_False;
 
     if ( r1.nEndPortion != r2.nEndPortion )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 EditLine& EditLine::operator = ( const EditLine& r )
@@ -494,7 +494,7 @@ EditLine& EditLine::operator = ( const EditLine& r )
 }
 
 
-BOOL operator != ( const EditLine& r1,  const EditLine& r2  )
+sal_Bool operator != ( const EditLine& r1,  const EditLine& r2  )
 {
     return !( r1 == r2 );
 }
@@ -505,11 +505,11 @@ Size EditLine::CalcTextSize( ParaPortion& rParaPortion )
     Size aTmpSz;
     TextPortion* pPortion;
 
-    USHORT nIndex = GetStart();
+    sal_uInt16 nIndex = GetStart();
 
     DBG_ASSERT( rParaPortion.GetTextPortions().Count(), "GetTextSize vor CreatePortions !" );
 
-    for ( USHORT n = nStartPortion; n <= nEndPortion; n++ )
+    for ( sal_uInt16 n = nStartPortion; n <= nEndPortion; n++ )
     {
         pPortion = rParaPortion.GetTextPortions().GetObject(n);
         switch ( pPortion->GetKind() )
@@ -534,7 +534,7 @@ Size EditLine::CalcTextSize( ParaPortion& rParaPortion )
         nIndex = nIndex + pPortion->GetLen();
     }
 
-    SetHeight( (USHORT)aSz.Height() );
+    SetHeight( (sal_uInt16)aSz.Height() );
     return aSz;
 }
 
@@ -552,22 +552,22 @@ EditLineList::~EditLineList()
 
 void EditLineList::Reset()
 {
-    for ( USHORT nLine = 0; nLine < Count(); nLine++ )
+    for ( sal_uInt16 nLine = 0; nLine < Count(); nLine++ )
         delete GetObject(nLine);
     Remove( 0, Count() );
 }
 
-void EditLineList::DeleteFromLine( USHORT nDelFrom )
+void EditLineList::DeleteFromLine( sal_uInt16 nDelFrom )
 {
     DBG_ASSERT( nDelFrom <= (Count() - 1), "DeleteFromLine: Out of range" );
-    for ( USHORT nL = nDelFrom; nL < Count(); nL++ )
+    for ( sal_uInt16 nL = nDelFrom; nL < Count(); nL++ )
         delete GetObject(nL);
     Remove( nDelFrom, Count()-nDelFrom );
 }
 
-USHORT EditLineList::FindLine( USHORT nChar, BOOL bInclEnd )
+sal_uInt16 EditLineList::FindLine( sal_uInt16 nChar, sal_Bool bInclEnd )
 {
-    for ( USHORT nLine = 0; nLine < Count(); nLine++ )
+    for ( sal_uInt16 nLine = 0; nLine < Count(); nLine++ )
     {
         EditLine* pLine = GetObject( nLine );
         if ( ( bInclEnd && ( pLine->GetEnd() >= nChar ) ) ||
@@ -584,26 +584,26 @@ USHORT EditLineList::FindLine( USHORT nChar, BOOL bInclEnd )
 // -------------------------------------------------------------------------
 // class EditSelection
 // -------------------------------------------------------------------------
-BOOL EditPaM::DbgIsBuggy( EditDoc& rDoc )
+sal_Bool EditPaM::DbgIsBuggy( EditDoc& rDoc )
 {
     if ( !pNode )
-        return TRUE;
+        return sal_True;
     if ( rDoc.GetPos( pNode ) >= rDoc.Count() )
-        return TRUE;
+        return sal_True;
     if ( nIndex > pNode->Len() )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditSelection::DbgIsBuggy( EditDoc& rDoc )
+sal_Bool EditSelection::DbgIsBuggy( EditDoc& rDoc )
 {
     if ( aStartPaM.DbgIsBuggy( rDoc ) )
-        return TRUE;
+        return sal_True;
     if ( aEndPaM.DbgIsBuggy( rDoc ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 EditSelection::EditSelection()
@@ -632,20 +632,20 @@ EditSelection& EditSelection::operator = ( const EditPaM& rPaM )
     return *this;
 }
 
-BOOL EditSelection::IsInvalid() const
+sal_Bool EditSelection::IsInvalid() const
 {
     EditPaM aEmptyPaM;
 
     if ( aStartPaM == aEmptyPaM )
-        return TRUE;
+        return sal_True;
 
     if ( aEndPaM == aEmptyPaM )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditSelection::Adjust( const ContentList& rNodes )
+sal_Bool EditSelection::Adjust( const ContentList& rNodes )
 {
     DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index im Wald in Adjust(1)" );
     DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index im Wald in Adjust(2)" );
@@ -653,17 +653,17 @@ BOOL EditSelection::Adjust( const ContentList& rNodes )
     ContentNode* pStartNode = aStartPaM.GetNode();
     ContentNode* pEndNode = aEndPaM.GetNode();
 
-    USHORT nStartNode = rNodes.GetPos( pStartNode );
-    USHORT nEndNode = rNodes.GetPos( pEndNode );
+    sal_uInt16 nStartNode = rNodes.GetPos( pStartNode );
+    sal_uInt16 nEndNode = rNodes.GetPos( pEndNode );
 
     DBG_ASSERT( nStartNode != USHRT_MAX, "Node im Wald in Adjust(1)" );
     DBG_ASSERT( nEndNode != USHRT_MAX, "Node im Wald in Adjust(2)" );
 
-    BOOL bSwap = FALSE;
+    sal_Bool bSwap = sal_False;
     if ( nStartNode > nEndNode )
-        bSwap = TRUE;
+        bSwap = sal_True;
     else if ( ( nStartNode == nEndNode ) && ( aStartPaM.GetIndex() > aEndPaM.GetIndex() ) )
-        bSwap = TRUE;
+        bSwap = sal_True;
 
     if ( bSwap )
     {
@@ -679,15 +679,15 @@ BOOL EditSelection::Adjust( const ContentList& rNodes )
 // -------------------------------------------------------------------------
 // class EditPaM
 // -------------------------------------------------------------------------
-BOOL operator == ( const EditPaM& r1,  const EditPaM& r2  )
+sal_Bool operator == ( const EditPaM& r1,  const EditPaM& r2  )
 {
     if ( r1.GetNode() != r2.GetNode() )
-        return FALSE;
+        return sal_False;
 
     if ( r1.GetIndex() != r2.GetIndex() )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 EditPaM& EditPaM::operator = ( const EditPaM& rPaM )
@@ -697,7 +697,7 @@ EditPaM& EditPaM::operator = ( const EditPaM& rPaM )
     return *this;
 }
 
-BOOL operator != ( const EditPaM& r1,  const EditPaM& r2  )
+sal_Bool operator != ( const EditPaM& r1,  const EditPaM& r2  )
 {
     return !( r1 == r2 );
 }
@@ -727,7 +727,7 @@ ContentNode::~ContentNode()
 #endif
 }
 
-void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemPool )
+void ContentNode::ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNew, SfxItemPool& rItemPool )
 {
     if ( !nNew )
         return;
@@ -740,10 +740,10 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
     // Die wahrscheinlichste Moeglichkeit erhaelt kein bResort,
     // so dass nicht neu sortiert wird, wenn sich alle Attribute
     // gleich verhalten.
-    BOOL bResort = FALSE;
-    BOOL bExpandedEmptyAtIndexNull = FALSE;
+    sal_Bool bResort = sal_False;
+    sal_Bool bExpandedEmptyAtIndexNull = sal_False;
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttrib = GetAttrib( aCharAttribList.GetAttribs(), nAttr );
     while ( pAttrib )
     {
@@ -764,7 +764,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
 //              if ( pAttrib->GetStart() == nIndex )
                 pAttrib->Expand( nNew );
                 if ( pAttrib->GetStart() == 0 )
-                    bExpandedEmptyAtIndexNull = TRUE;
+                    bExpandedEmptyAtIndexNull = sal_True;
             }
             // 1: Attribut startet davor, geht bis Index...
             else if ( pAttrib->GetEnd() == nIndex ) // Start muss davor liegen
@@ -779,7 +779,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
                         pAttrib->Expand( nNew );
                 }
                 else
-                    bResort = TRUE;
+                    bResort = sal_True;
             }
             // 2: Attribut startet davor, geht hinter Index...
             else if ( ( pAttrib->GetStart() < nIndex ) && ( pAttrib->GetEnd() > nIndex ) )
@@ -793,24 +793,24 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
                 if ( pAttrib->IsFeature() )
                 {
                     pAttrib->MoveForward( nNew );
-                    bResort = TRUE;
+                    bResort = sal_True;
                 }
                 else
                 {
-                    BOOL bExpand = FALSE;
+                    sal_Bool bExpand = sal_False;
                     if ( nIndex == 0 )
                     {
-                        bExpand = TRUE;
+                        bExpand = sal_True;
                         if( bExpandedEmptyAtIndexNull )
                         {
                             // Check if this kind of attribut was empty and expanded here...
-                            USHORT nW = pAttrib->GetItem()->Which();
-                            for ( USHORT nA = 0; nA < nAttr; nA++ )
+                            sal_uInt16 nW = pAttrib->GetItem()->Which();
+                            for ( sal_uInt16 nA = 0; nA < nAttr; nA++ )
                             {
                                 EditCharAttrib* pA = aCharAttribList.GetAttribs()[nA];
                                 if ( ( pA->GetStart() == 0 ) && ( pA->GetItem()->Which() == nW ) )
                                 {
-                                    bExpand = FALSE;
+                                    bExpand = sal_False;
                                     break;
                                 }
                             }
@@ -820,7 +820,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
                     if ( bExpand )
                     {
                         pAttrib->Expand( nNew );
-                        bResort = TRUE;
+                        bResort = sal_True;
                     }
                     else
                     {
@@ -831,7 +831,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
         }
 
         if ( pAttrib->IsEdge() )
-            pAttrib->SetEdge( FALSE );
+            pAttrib->SetEdge( sal_False );
 
         DBG_ASSERT( !pAttrib->IsFeature() || ( pAttrib->GetLen() == 1 ), "Expand: FeaturesLen != 1" );
 
@@ -840,7 +840,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
         if ( pAttrib->IsEmpty() )
         {
             DBG_ERROR( "Leeres Attribut nach ExpandAttribs?" );
-            bResort = TRUE;
+            bResort = sal_True;
             aCharAttribList.GetAttribs().Remove( nAttr );
             rItemPool.Remove( *pAttrib->GetItem() );
             delete pAttrib;
@@ -856,32 +856,32 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
 #ifndef SVX_LIGHT
     if ( pWrongList )
     {
-        BOOL bSep = ( GetChar( nIndex ) == ' ' ) || IsFeature( nIndex );
+        sal_Bool bSep = ( GetChar( nIndex ) == ' ' ) || IsFeature( nIndex );
         pWrongList->TextInserted( nIndex, nNew, bSep );
     }
 #endif // !SVX_LIGHT
 
 #ifdef EDITDEBUG
-    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), TRUE ), "Expand: Start-Liste verdreht" );
+    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), sal_True ), "Expand: Start-Liste verdreht" );
 #endif
 }
 
-void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& rItemPool )
+void ContentNode::CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDeleted, SfxItemPool& rItemPool )
 {
     if ( !nDeleted )
         return;
 
     // Da Features anders behandelt werden als normale Zeichenattribute,
     // kann sich hier auch die Sortierung der Start-Liste aendern!
-    BOOL bResort = FALSE;
-    BOOL bDelAttr = FALSE;
-    USHORT nEndChanges = nIndex+nDeleted;
+    sal_Bool bResort = sal_False;
+    sal_Bool bDelAttr = sal_False;
+    sal_uInt16 nEndChanges = nIndex+nDeleted;
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttrib = GetAttrib( aCharAttribList.GetAttribs(), nAttr );
     while ( pAttrib )
     {
-        bDelAttr = FALSE;
+        bDelAttr = sal_False;
         if ( pAttrib->GetEnd() >= nIndex )
         {
             // Alles Attribute hinter der Einfuegeposition verschieben...
@@ -897,7 +897,7 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
                 if ( !pAttrib->IsFeature() && ( pAttrib->GetStart() == nIndex ) && ( pAttrib->GetEnd() == nEndChanges ) )
                     pAttrib->GetEnd() = nIndex; // leer
                 else
-                    bDelAttr = TRUE;
+                    bDelAttr = sal_True;
             }
             // 2. Attribut beginnt davor, endet drinnen oder dahinter...
             else if ( ( pAttrib->GetStart() <= nIndex ) && ( pAttrib->GetEnd() > nIndex ) )
@@ -915,7 +915,7 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
                 if ( pAttrib->IsFeature() )
                 {
                     pAttrib->MoveBackward( nDeleted );
-                    bResort = TRUE;
+                    bResort = sal_True;
                 }
                 else
                 {
@@ -930,14 +930,14 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
         DBG_ASSERT( ( pAttrib->GetEnd() <= Len()) || bDelAttr, "Collaps: Attrib groesser als Absatz!" );
         if ( bDelAttr /* || pAttrib->IsEmpty() */ )
         {
-            bResort = TRUE;
+            bResort = sal_True;
             aCharAttribList.GetAttribs().Remove( nAttr );
             rItemPool.Remove( *pAttrib->GetItem() );
             delete pAttrib;
             nAttr--;
         }
         else if ( pAttrib->IsEmpty() )
-            aCharAttribList.HasEmptyAttribs() = TRUE;
+            aCharAttribList.HasEmptyAttribs() = sal_True;
 
         nAttr++;
         pAttrib = GetAttrib( aCharAttribList.GetAttribs(), nAttr );
@@ -952,17 +952,17 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
 #endif // !SVX_LIGHT
 
 #ifdef EDITDEBUG
-    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), TRUE ), "Collaps: Start-Liste verdreht" );
+    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), sal_True ), "Collaps: Start-Liste verdreht" );
 #endif
 }
 
-void ContentNode::CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, BOOL bKeepEndingAttribs )
+void ContentNode::CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, sal_Bool bKeepEndingAttribs )
 {
     DBG_ASSERT( pPrevNode, "kopieren von Attributen auf einen NULL-Pointer ?" );
 
     xub_StrLen nCut = pPrevNode->Len();
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttrib = GetAttrib( pPrevNode->GetCharAttribs().GetAttribs(), nAttr );
     while ( pAttrib )
     {
@@ -1012,22 +1012,22 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
 {
     DBG_ASSERT( pNextNode, "kopieren von Attributen von einen NULL-Pointer ?" );
 
-    USHORT nNewStart = Len();
+    sal_uInt16 nNewStart = Len();
 
 #ifdef EDITDEBUG
     DBG_ASSERT( aCharAttribList.DbgCheckAttribs(), "Attribute VOR AppendAttribs kaputt" );
 #endif
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttrib = GetAttrib( pNextNode->GetCharAttribs().GetAttribs(), nAttr );
     while ( pAttrib )
     {
         // alle Attribute verschieben in den aktuellen Node (this)
-        BOOL bMelted = FALSE;
+        sal_Bool bMelted = sal_False;
         if ( ( pAttrib->GetStart() == 0 ) && ( !pAttrib->IsFeature() ) )
         {
             // Evtl koennen Attribute zusammengefasst werden:
-            USHORT nTmpAttr = 0;
+            sal_uInt16 nTmpAttr = 0;
             EditCharAttrib* pTmpAttrib = GetAttrib( aCharAttribList.GetAttribs(), nTmpAttr );
             while ( !bMelted && pTmpAttrib )
             {
@@ -1041,7 +1041,7 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
                         pNextNode->GetCharAttribs().GetAttribs().Remove( nAttr );
                         // Vom Pool abmelden ?!
                         delete pAttrib;
-                        bMelted = TRUE;
+                        bMelted = sal_True;
                     }
                 }
                 ++nTmpAttr;
@@ -1089,7 +1089,7 @@ void ContentNode::SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyl
         GetContentAttribs().GetItems(), pS == NULL );
 }
 
-void ContentNode::SetStyleSheet( SfxStyleSheet* pS, BOOL bRecalcFont )
+void ContentNode::SetStyleSheet( SfxStyleSheet* pS, sal_Bool bRecalcFont )
 {
     aContentAttribs.SetStyleSheet( pS );
     if ( bRecalcFont )
@@ -1137,10 +1137,10 @@ ContentAttribs::~ContentAttribs()
 {
 }
 
-SvxTabStop ContentAttribs::FindTabStop( long nCurPos, USHORT nDefTab )
+SvxTabStop ContentAttribs::FindTabStop( long nCurPos, sal_uInt16 nDefTab )
 {
     const SvxTabStopItem& rTabs = (const SvxTabStopItem&) GetItem( EE_PARA_TABS );
-    for ( USHORT i = 0; i < rTabs.Count(); i++ )
+    for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ )
     {
         const SvxTabStop& rTab = rTabs[i];
         if ( rTab.GetTabPos() > nCurPos  )
@@ -1156,7 +1156,7 @@ SvxTabStop ContentAttribs::FindTabStop( long nCurPos, USHORT nDefTab )
 
 void ContentAttribs::SetStyleSheet( SfxStyleSheet* pS )
 {
-    BOOL bStyleChanged = ( pStyle != pS );
+    sal_Bool bStyleChanged = ( pStyle != pS );
     pStyle = pS;
     // #104799# Only when other style sheet, not when current style sheet modified
     if ( pStyle && bStyleChanged )
@@ -1164,7 +1164,7 @@ void ContentAttribs::SetStyleSheet( SfxStyleSheet* pS )
         // Gezielt die Attribute aus der Absatzformatierung entfernen, die im Style
         // spezifiziert sind, damit die Attribute des Styles wirken koennen.
         const SfxItemSet& rStyleAttribs = pStyle->GetItemSet();
-        for ( USHORT nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
+        for ( sal_uInt16 nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
         {
             // #99635# Don't change bullet on/off
             if ( ( nWhich != EE_PARA_BULLETSTATE ) && ( rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON ) )
@@ -1173,23 +1173,23 @@ void ContentAttribs::SetStyleSheet( SfxStyleSheet* pS )
     }
 }
 
-const SfxPoolItem& ContentAttribs::GetItem( USHORT nWhich )
+const SfxPoolItem& ContentAttribs::GetItem( sal_uInt16 nWhich )
 {
     // Harte Absatzattribute haben Vorrang!
     SfxItemSet* pTakeFrom = &aAttribSet;
-    if ( pStyle && ( aAttribSet.GetItemState( nWhich, FALSE ) != SFX_ITEM_ON  ) )
+    if ( pStyle && ( aAttribSet.GetItemState( nWhich, sal_False ) != SFX_ITEM_ON  ) )
         pTakeFrom = &pStyle->GetItemSet();
 
     return pTakeFrom->Get( nWhich );
 }
 
-BOOL ContentAttribs::HasItem( USHORT nWhich )
+sal_Bool ContentAttribs::HasItem( sal_uInt16 nWhich )
 {
-    BOOL bHasItem = FALSE;
-    if ( aAttribSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_ON  )
-        bHasItem = TRUE;
+    sal_Bool bHasItem = sal_False;
+    if ( aAttribSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_ON  )
+        bHasItem = sal_True;
     else if ( pStyle && pStyle->GetItemSet().GetItemState( nWhich ) == SFX_ITEM_ON )
-        bHasItem = TRUE;
+        bHasItem = sal_True;
 
     return bHasItem;
 }
@@ -1199,7 +1199,7 @@ BOOL ContentAttribs::HasItem( USHORT nWhich )
 // ----------------------------------------------------------------------
 //  class ItemList
 //  ----------------------------------------------------------------------
-const SfxPoolItem* ItemList::FindAttrib( USHORT nWhich )
+const SfxPoolItem* ItemList::FindAttrib( sal_uInt16 nWhich )
 {
     const SfxPoolItem* pItem = First();
     while ( pItem && ( pItem->Which() != nWhich ) )
@@ -1216,21 +1216,21 @@ EditDoc::EditDoc( SfxItemPool* pPool )
     if ( pPool )
     {
         pItemPool = pPool;
-        bOwnerOfPool = FALSE;
+        bOwnerOfPool = sal_False;
     }
     else
     {
-        pItemPool = new EditEngineItemPool( FALSE );
-        bOwnerOfPool = TRUE;
+        pItemPool = new EditEngineItemPool( sal_False );
+        bOwnerOfPool = sal_True;
     }
 
     nDefTab = DEFTAB;
-    bIsVertical = FALSE;
-    bIsFixedCellHeight = FALSE;
+    bIsVertical = sal_False;
+    bIsFixedCellHeight = sal_False;
 
     // Don't create a empty node, Clear() will be called in EditEngine-CTOR
 
-    SetModified( FALSE );
+    SetModified( sal_False );
 };
 
 EditDoc::~EditDoc()
@@ -1242,14 +1242,14 @@ EditDoc::~EditDoc()
 
 void EditDoc::ImplDestroyContents()
 {
-    for ( USHORT nNode = Count(); nNode; )
+    for ( sal_uInt16 nNode = Count(); nNode; )
         RemoveItemsFromPool( GetObject( --nNode ) );
     DeleteAndDestroy( 0, Count() );
 }
 
 void EditDoc::RemoveItemsFromPool( ContentNode* pNode )
 {
-    for ( USHORT nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
+    for ( sal_uInt16 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
     {
         EditCharAttrib* pAttr = pNode->GetCharAttribs().GetAttribs()[nAttr];
         GetItemPool().Remove( *pAttr->GetItem() );
@@ -1260,13 +1260,13 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, s
 {
     Font aPrevFont( rFont );
     rFont.SetAlign( ALIGN_BASELINE );
-    rFont.SetTransparent( TRUE );
+    rFont.SetTransparent( sal_True );
 
-    USHORT nWhich_FontInfo = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
-    USHORT nWhich_Language = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType );
-    USHORT nWhich_FontHeight = GetScriptItemId( EE_CHAR_FONTHEIGHT, nScriptType );
-    USHORT nWhich_Weight = GetScriptItemId( EE_CHAR_WEIGHT, nScriptType );
-    USHORT nWhich_Italic = GetScriptItemId( EE_CHAR_ITALIC, nScriptType );
+    sal_uInt16 nWhich_FontInfo = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
+    sal_uInt16 nWhich_Language = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType );
+    sal_uInt16 nWhich_FontHeight = GetScriptItemId( EE_CHAR_FONTHEIGHT, nScriptType );
+    sal_uInt16 nWhich_Weight = GetScriptItemId( EE_CHAR_WEIGHT, nScriptType );
+    sal_uInt16 nWhich_Italic = GetScriptItemId( EE_CHAR_ITALIC, nScriptType );
 
     if ( bSearchInParent || ( rSet.GetItemState( nWhich_FontInfo ) == SFX_ITEM_ON ) )
     {
@@ -1300,8 +1300,8 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, s
     {
         const SvxEscapementItem& rEsc = (const SvxEscapementItem&) rSet.Get( EE_CHAR_ESCAPEMENT );
 
-        USHORT nProp = rEsc.GetProp();
-        rFont.SetPropr( (BYTE)nProp );
+        sal_uInt16 nProp = rEsc.GetProp();
+        rFont.SetPropr( (sal_uInt8)nProp );
 
         short nEsc = rEsc.GetEsc();
         if ( nEsc == DFLT_ESC_AUTO_SUPER )
@@ -1329,14 +1329,14 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, s
         rFont = aPrevFont;  // => Gleicher ImpPointer fuer IsSameInstance
 }
 
-void EditDoc::CreateDefFont( BOOL bUseStyles )
+void EditDoc::CreateDefFont( sal_Bool bUseStyles )
 {
     SfxItemSet aTmpSet( GetItemPool(), EE_PARA_START, EE_CHAR_END );
     CreateFont( aDefFont, aTmpSet );
     aDefFont.SetVertical( IsVertical() );
     aDefFont.SetOrientation( IsVertical() ? 2700 : 0 );
 
-    for ( USHORT nNode = 0; nNode < Count(); nNode++ )
+    for ( sal_uInt16 nNode = 0; nNode < Count(); nNode++ )
     {
         ContentNode* pNode = GetObject( nNode );
         pNode->GetCharAttribs().GetDefFont() = aDefFont;
@@ -1363,11 +1363,11 @@ XubString EditDoc::GetSepStr( LineEnd eEnd )
 
 XubString EditDoc::GetText( LineEnd eEnd ) const
 {
-    ULONG nLen = GetTextLen();
-    USHORT nNodes = Count();
+    sal_uLong nLen = GetTextLen();
+    sal_uInt16 nNodes = Count();
 
     String aSep = EditDoc::GetSepStr( eEnd );
-    USHORT nSepSize = aSep.Len();
+    sal_uInt16 nSepSize = aSep.Len();
 
     if ( nSepSize )
         nLen += nNodes * nSepSize;
@@ -1378,8 +1378,8 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
     }
     xub_Unicode* pStr = new xub_Unicode[nLen+1];
     xub_Unicode* pCur = pStr;
-    USHORT nLastNode = nNodes-1;
-    for ( USHORT nNode = 0; nNode < nNodes; nNode++ )
+    sal_uInt16 nLastNode = nNodes-1;
+    for ( sal_uInt16 nNode = 0; nNode < nNodes; nNode++ )
     {
         XubString aTmp( GetParaAsString( GetObject(nNode) ) );
         memcpy( pCur, aTmp.GetBuffer(), aTmp.Len()*sizeof(sal_Unicode) );
@@ -1396,24 +1396,24 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
     return aASCIIText;
 }
 
-XubString EditDoc::GetParaAsString( USHORT nNode ) const
+XubString EditDoc::GetParaAsString( sal_uInt16 nNode ) const
 {
     return GetParaAsString( SaveGetObject( nNode ) );
 }
 
-XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, BOOL bResolveFields ) const
+XubString EditDoc::GetParaAsString( ContentNode* pNode, sal_uInt16 nStartPos, sal_uInt16 nEndPos, sal_Bool bResolveFields ) const
 {
     if ( nEndPos > pNode->Len() )
         nEndPos = pNode->Len();
 
     DBG_ASSERT( nStartPos <= nEndPos, "Start und Ende vertauscht?" );
 
-    USHORT nIndex = nStartPos;
+    sal_uInt16 nIndex = nStartPos;
     XubString aStr;
     EditCharAttrib* pNextFeature = pNode->GetCharAttribs().FindFeature( nIndex );
     while ( nIndex < nEndPos )
     {
-        USHORT nEnd = nEndPos;
+        sal_uInt16 nEnd = nEndPos;
         if ( pNextFeature && ( pNextFeature->GetStart() < nEnd ) )
             nEnd = pNextFeature->GetStart();
         else
@@ -1445,21 +1445,21 @@ XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT
     return aStr;
 }
 
-ULONG EditDoc::GetTextLen() const
+sal_uLong EditDoc::GetTextLen() const
 {
-    ULONG nLen = 0;
-    for ( USHORT nNode = 0; nNode < Count(); nNode++ )
+    sal_uLong nLen = 0;
+    for ( sal_uInt16 nNode = 0; nNode < Count(); nNode++ )
     {
         ContentNode* pNode = GetObject( nNode );
         nLen += pNode->Len();
-        // Felder k”nnen laenger sein als der Platzhalter im Node.
+        // Felder k�nnen laenger sein als der Platzhalter im Node.
         const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
-        for ( USHORT nAttr = rAttrs.Count(); nAttr; )
+        for ( sal_uInt16 nAttr = rAttrs.Count(); nAttr; )
         {
             EditCharAttrib* pAttr = rAttrs[--nAttr];
             if ( pAttr->Which() == EE_FEATURE_FIELD )
             {
-                USHORT nFieldLen = ((EditCharAttribField*)pAttr)->GetFieldValue().Len();
+                sal_uInt16 nFieldLen = ((EditCharAttribField*)pAttr)->GetFieldValue().Len();
                 if ( !nFieldLen )
                     nLen--;
                 else
@@ -1477,15 +1477,15 @@ EditPaM EditDoc::Clear()
     ContentNode* pNode = new ContentNode( GetItemPool() );
     Insert( pNode, 0 );
 
-    CreateDefFont( FALSE );
+    CreateDefFont( sal_False );
 
-    SetModified( FALSE );
+    SetModified( sal_False );
 
     EditPaM aPaM( pNode, 0 );
     return aPaM;
 }
 
-void EditDoc::SetModified( BOOL b )
+void EditDoc::SetModified( sal_Bool b )
 {
     bModified = b;
     if ( bModified )
@@ -1507,11 +1507,11 @@ EditPaM EditDoc::RemoveText()
     ContentNode* pNode = new ContentNode( GetItemPool() );
     Insert( pNode, 0 );
 
-    pNode->SetStyleSheet( pPrevStyle, FALSE );
+    pNode->SetStyleSheet( pPrevStyle, sal_False );
     pNode->GetContentAttribs().GetItems().Set( aPrevSet );
     pNode->GetCharAttribs().GetDefFont() = aPrevFont;
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     EditPaM aPaM( pNode, 0 );
     return aPaM;
@@ -1526,7 +1526,7 @@ void EditDoc::InsertText( const EditPaM& rPaM, xub_Unicode c )
     rPaM.GetNode()->Insert( c, rPaM.GetIndex() );
     rPaM.GetNode()->ExpandAttribs( rPaM.GetIndex(), 1, GetItemPool() );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 EditPaM EditDoc::InsertText( EditPaM aPaM, const XubString& rStr )
@@ -1540,16 +1540,16 @@ EditPaM EditDoc::InsertText( EditPaM aPaM, const XubString& rStr )
     aPaM.GetNode()->ExpandAttribs( aPaM.GetIndex(), rStr.Len(), GetItemPool() );
     aPaM.GetIndex() = aPaM.GetIndex() + rStr.Len();
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     return aPaM;
 }
 
-EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs )
+EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, sal_Bool bKeepEndingAttribs )
 {
     DBG_ASSERT( aPaM.GetNode(), "Blinder PaM in EditDoc::InsertParaBreak" );
     ContentNode* pCurNode = aPaM.GetNode();
-    USHORT nPos = GetPos( pCurNode );
+    sal_uInt16 nPos = GetPos( pCurNode );
     XubString aStr = aPaM.GetNode()->Copy( aPaM.GetIndex() );
     aPaM.GetNode()->Erase( aPaM.GetIndex() );
 
@@ -1557,7 +1557,7 @@ EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs )
     ContentAttribs aContentAttribs( aPaM.GetNode()->GetContentAttribs() );
 
     // for a new paragraph we like to have the bullet/numbering visible by default
-    aContentAttribs.GetItems().Put( SfxBoolItem( EE_PARA_BULLETSTATE, TRUE), EE_PARA_BULLETSTATE );
+    aContentAttribs.GetItems().Put( SfxBoolItem( EE_PARA_BULLETSTATE, sal_True), EE_PARA_BULLETSTATE );
 
     // ContenNode-CTOR kopiert auch die Absatzattribute
     ContentNode* pNode = new ContentNode( aStr, aContentAttribs );
@@ -1580,7 +1580,7 @@ EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs )
 
     Insert( pNode, nPos+1 );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     aPaM.SetNode( pNode );
     aPaM.SetIndex( 0 );
@@ -1599,7 +1599,7 @@ EditPaM EditDoc::InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem  )
     DBG_ASSERT( pAttrib, "Warum kann ich kein Feature anlegen ?" );
     aPaM.GetNode()->GetCharAttribs().InsertAttrib( pAttrib );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     aPaM.GetIndex()++;
     return aPaM;
@@ -1616,27 +1616,27 @@ EditPaM EditDoc::ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight )
 
     // der rechte verschwindet.
     RemoveItemsFromPool( pRight );
-    USHORT nRight = GetPos( pRight );
+    sal_uInt16 nRight = GetPos( pRight );
     Remove( nRight );
     delete pRight;
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     return aPaM;
 }
 
-EditPaM EditDoc::RemoveChars( EditPaM aPaM, USHORT nChars )
+EditPaM EditDoc::RemoveChars( EditPaM aPaM, sal_uInt16 nChars )
 {
     // Evtl. Features entfernen!
     aPaM.GetNode()->Erase( aPaM.GetIndex(), nChars );
     aPaM.GetNode()->CollapsAttribs( aPaM.GetIndex(), nChars, GetItemPool() );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     return aPaM;
 }
 
-void EditDoc::InsertAttribInSelection( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem )
+void EditDoc::InsertAttribInSelection( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxPoolItem& rPoolItem )
 {
     DBG_ASSERT( pNode, "Wohin mit dem Attribut?" );
     DBG_ASSERT( nEnd <= pNode->Len(), "InsertAttrib: Attribut zu gross!" );
@@ -1671,17 +1671,17 @@ void EditDoc::InsertAttribInSelection( ContentNode* pNode, USHORT nStart, USHORT
     if ( pStartingAttrib )
         pNode->GetCharAttribs().ResortAttribs();
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
-BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, USHORT nWhich )
+sal_Bool EditDoc::RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt16 nWhich )
 {
     EditCharAttrib* pStarting;
     EditCharAttrib* pEnding;
     return RemoveAttribs( pNode, nStart, nEnd, pStarting, pEnding, nWhich );
 }
 
-BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, USHORT nWhich )
+sal_Bool EditDoc::RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, sal_uInt16 nWhich )
 {
     DBG_ASSERT( pNode, "Wohin mit dem Attribut?" );
     DBG_ASSERT( nEnd <= pNode->Len(), "InsertAttrib: Attribut zu gross!" );
@@ -1691,27 +1691,27 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
     // dieses startet am Ende der Selektion => kann erweitert werden
     rpStarting = 0;
 
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
     DBG_ASSERT( nStart <= nEnd, "Kleiner Rechenfehler in InsertAttribInSelection" );
 
     // ueber die Attribute iterieren...
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
     while ( pAttr )
     {
-        BOOL bRemoveAttrib = FALSE;
+        sal_Bool bRemoveAttrib = sal_False;
         // MT 11.9.97:
         // Ich denke dass in dieser Methode generell keine Features geloescht
         // werden sollen.
         // => Dann koennen die Feature-Abfragen weiter unten entfallen
-        USHORT nAttrWhich = pAttr->Which();
+        sal_uInt16 nAttrWhich = pAttr->Which();
         if ( ( nAttrWhich < EE_FEATURE_START ) && ( !nWhich || ( nAttrWhich == nWhich ) ) )
         {
             // Attribut beginnt in Selection
             if ( ( pAttr->GetStart() >= nStart ) && ( pAttr->GetStart() <= nEnd ) )
             {
-                bChanged = TRUE;
+                bChanged = sal_True;
                 if ( pAttr->GetEnd() > nEnd )
                 {
                     pAttr->GetStart() = nEnd;   // dann faengt es dahinter an
@@ -1722,14 +1722,14 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
                 else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) )
                 {
                     // Feature nur loeschen, wenn genau an der Stelle
-                    bRemoveAttrib = TRUE;
+                    bRemoveAttrib = sal_True;
                 }
             }
 
             // Attribut endet in Selection
             else if ( ( pAttr->GetEnd() >= nStart ) && ( pAttr->GetEnd() <= nEnd ) )
             {
-                bChanged = TRUE;
+                bChanged = sal_True;
                 if ( ( pAttr->GetStart() < nStart ) && !pAttr->IsFeature() )
                 {
                     pAttr->GetEnd() = nStart;   // dann hoert es hier auf
@@ -1738,13 +1738,13 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
                 else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) )
                 {
                     // Feature nur loeschen, wenn genau an der Stelle
-                    bRemoveAttrib = TRUE;
+                    bRemoveAttrib = sal_True;
                 }
             }
             // Attribut ueberlappt die Selektion
             else if ( ( pAttr->GetStart() <= nStart ) && ( pAttr->GetEnd() >= nEnd ) )
             {
-                bChanged = TRUE;
+                bChanged = sal_True;
                 if ( pAttr->GetStart() == nStart )
                 {
                     pAttr->GetStart() = nEnd;
@@ -1761,7 +1761,7 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
                 }
                 else // Attribut muss gesplittet werden...
                 {
-                    USHORT nOldEnd = pAttr->GetEnd();
+                    sal_uInt16 nOldEnd = pAttr->GetEnd();
                     pAttr->GetEnd() = nStart;
                     rpEnding = pAttr;
                     InsertAttrib( *pAttr->GetItem(), pNode, nEnd, nOldEnd );
@@ -1788,13 +1788,13 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
         // char attributes need to be sorted by start again
         pNode->GetCharAttribs().ResortAttribs();
 
-        SetModified( TRUE );
+        SetModified( sal_True );
     }
 
     return bChanged;
 }
 
-void EditDoc::InsertAttrib( const SfxPoolItem& rPoolItem, ContentNode* pNode, USHORT nStart, USHORT nEnd )
+void EditDoc::InsertAttrib( const SfxPoolItem& rPoolItem, ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     // Diese Methode prueft nicht mehr, ob ein entspr. Attribut
     // schon an der Stelle existiert!
@@ -1803,10 +1803,10 @@ void EditDoc::InsertAttrib( const SfxPoolItem& rPoolItem, ContentNode* pNode, US
     DBG_ASSERT( pAttrib, "MakeCharAttrib fehlgeschlagen!" );
     pNode->GetCharAttribs().InsertAttrib( pAttrib );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
-void EditDoc::InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem )
+void EditDoc::InsertAttrib( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxPoolItem& rPoolItem )
 {
     if ( nStart != nEnd )
     {
@@ -1832,7 +1832,7 @@ void EditDoc::InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, cons
                 // ???????????????????????????????
                 // eigentlich noch pruefen, ob wirklich splittet, oder return !
                 // ???????????????????????????????
-                USHORT nOldEnd = pAttr->GetEnd();
+                sal_uInt16 nOldEnd = pAttr->GetEnd();
                 pAttr->GetEnd() = nStart;
                 pAttr = MakeCharAttrib( GetItemPool(), *(pAttr->GetItem()), nStart, nOldEnd );
                 pNode->GetCharAttribs().InsertAttrib( pAttr );
@@ -1848,15 +1848,15 @@ void EditDoc::InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, cons
         InsertAttrib( rPoolItem, pNode, nStart, nStart );
     }
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
-void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet )
+void EditDoc::FindAttribs( ContentNode* pNode, sal_uInt16 nStartPos, sal_uInt16 nEndPos, SfxItemSet& rCurSet )
 {
     DBG_ASSERT( pNode, "Wo soll ich suchen ?" );
     DBG_ASSERT( nStartPos <= nEndPos, "Ungueltiger Bereich!" );
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
     // keine Selection...
     if ( nStartPos == nEndPos )
@@ -1887,7 +1887,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos,
 
             if ( pItem )
             {
-                USHORT nWhich = pItem->Which();
+                sal_uInt16 nWhich = pItem->Which();
                 if ( rCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
                 {
                     rCurSet.Put( *pItem );
@@ -1945,7 +1945,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos,
 
             if ( pItem )
             {
-                USHORT nWhich = pItem->Which();
+                sal_uInt16 nWhich = pItem->Which();
                 if ( rCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
                 {
                     rCurSet.Put( *pItem );
@@ -1973,14 +1973,14 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos,
 CharAttribList::CharAttribList()
 {
     DBG_CTOR( EE_CharAttribList, 0 );
-    bHasEmptyAttribs = FALSE;
+    bHasEmptyAttribs = sal_False;
 }
 
 CharAttribList::~CharAttribList()
 {
     DBG_DTOR( EE_CharAttribList, 0 );
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( aAttribs, nAttr );
     while ( pAttr )
     {
@@ -2004,20 +2004,20 @@ void CharAttribList::InsertAttrib( EditCharAttrib* pAttrib )
     // Hier waere auch binaere Suche nicht optimal.
     // => Wuerde einiges bringen!
 
-    const USHORT nCount = Count();
-    const USHORT nStart = pAttrib->GetStart(); // vielleicht besser fuer Comp.Opt.
+    const sal_uInt16 nCount = Count();
+    const sal_uInt16 nStart = pAttrib->GetStart(); // vielleicht besser fuer Comp.Opt.
 
     if ( pAttrib->IsEmpty() )
-        bHasEmptyAttribs = TRUE;
+        bHasEmptyAttribs = sal_True;
 
-    BOOL bInserted = FALSE;
-    for ( USHORT x = 0; x < nCount; x++ )
+    sal_Bool bInserted = sal_False;
+    for ( sal_uInt16 x = 0; x < nCount; x++ )
     {
         EditCharAttribPtr pCurAttrib = aAttribs[x];
         if ( pCurAttrib->GetStart() > nStart )
         {
             aAttribs.Insert( pAttrib, x );
-            bInserted = TRUE;
+            bInserted = sal_True;
             break;
         }
     }
@@ -2041,10 +2041,10 @@ void CharAttribList::ResortAttribs()
 
 void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool )
 {
-    for ( USHORT n = 0; n < aAttribs.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < aAttribs.Count(); n++ )
     {
         EditCharAttrib* pAttr = aAttribs.GetObject( n );
-        for ( USHORT nNext = n+1; nNext < aAttribs.Count(); nNext++ )
+        for ( sal_uInt16 nNext = n+1; nNext < aAttribs.Count(); nNext++ )
         {
             EditCharAttrib* p = aAttribs.GetObject( nNext );
             if ( !pAttr->IsFeature() && ( p->GetStart() == pAttr->GetEnd() ) && ( p->Which() == pAttr->Which() ) )
@@ -2066,11 +2066,11 @@ void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool )
     }
 }
 
-EditCharAttrib* CharAttribList::FindAttrib( USHORT nWhich, USHORT nPos )
+EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos )
 {
     // Rueckwaerts, falls eins dort endet, das naechste startet.
     // => Das startende gilt...
-    USHORT nAttr = aAttribs.Count()-1;
+    sal_uInt16 nAttr = aAttribs.Count()-1;
     EditCharAttrib* pAttr = GetAttrib( aAttribs, nAttr );
     while ( pAttr )
     {
@@ -2081,11 +2081,11 @@ EditCharAttrib* CharAttribList::FindAttrib( USHORT nWhich, USHORT nPos )
     return 0;
 }
 
-EditCharAttrib* CharAttribList::FindNextAttrib( USHORT nWhich, USHORT nFromPos ) const
+EditCharAttrib* CharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_uInt16 nFromPos ) const
 {
     DBG_ASSERT( nWhich, "FindNextAttrib: Which?" );
-    const USHORT nAttribs = aAttribs.Count();
-    for ( USHORT nAttr = 0; nAttr < nAttribs; nAttr++ )
+    const sal_uInt16 nAttribs = aAttribs.Count();
+    for ( sal_uInt16 nAttr = 0; nAttr < nAttribs; nAttr++ )
     {
         EditCharAttrib* pAttr = aAttribs[ nAttr ];
         if ( ( pAttr->GetStart() >= nFromPos ) && ( pAttr->Which() == nWhich ) )
@@ -2094,50 +2094,50 @@ EditCharAttrib* CharAttribList::FindNextAttrib( USHORT nWhich, USHORT nFromPos )
     return 0;
 }
 
-BOOL CharAttribList::HasAttrib( USHORT nWhich ) const
+sal_Bool CharAttribList::HasAttrib( sal_uInt16 nWhich ) const
 {
-    for ( USHORT nAttr = aAttribs.Count(); nAttr; )
+    for ( sal_uInt16 nAttr = aAttribs.Count(); nAttr; )
     {
         const EditCharAttrib* pAttr = aAttribs[--nAttr];
         if ( pAttr->Which() == nWhich )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL CharAttribList::HasAttrib( USHORT nStartPos, USHORT nEndPos ) const
+sal_Bool CharAttribList::HasAttrib( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) const
 {
-    BOOL bAttr = FALSE;
-    for ( USHORT nAttr = aAttribs.Count(); nAttr && !bAttr; )
+    sal_Bool bAttr = sal_False;
+    for ( sal_uInt16 nAttr = aAttribs.Count(); nAttr && !bAttr; )
     {
         const EditCharAttrib* pAttr = aAttribs[--nAttr];
         if ( ( pAttr->GetStart() < nEndPos ) && ( pAttr->GetEnd() > nStartPos ) )
-            return bAttr = TRUE;
+            return bAttr = sal_True;
     }
     return bAttr;
 }
 
 
-BOOL CharAttribList::HasBoundingAttrib( USHORT nBound )
+sal_Bool CharAttribList::HasBoundingAttrib( sal_uInt16 nBound )
 {
     // Rueckwaerts, falls eins dort endet, das naechste startet.
     // => Das startende gilt...
-    USHORT nAttr = aAttribs.Count()-1;
+    sal_uInt16 nAttr = aAttribs.Count()-1;
     EditCharAttrib* pAttr = GetAttrib( aAttribs, nAttr );
     while ( pAttr && ( pAttr->GetEnd() >= nBound ) )
     {
         if ( ( pAttr->GetStart() == nBound ) || ( pAttr->GetEnd() == nBound ) )
-            return TRUE;
+            return sal_True;
         pAttr = GetAttrib( aAttribs, --nAttr );
     }
-    return FALSE;
+    return sal_False;
 }
 
-EditCharAttrib* CharAttribList::FindEmptyAttrib( USHORT nWhich, USHORT nPos )
+EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos )
 {
     if ( !bHasEmptyAttribs )
         return 0;
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( aAttribs, nAttr );
     while ( pAttr && ( pAttr->GetStart() <= nPos ) )
     {
@@ -2149,10 +2149,10 @@ EditCharAttrib* CharAttribList::FindEmptyAttrib( USHORT nWhich, USHORT nPos )
     return 0;
 }
 
-EditCharAttrib* CharAttribList::FindFeature( USHORT nPos ) const
+EditCharAttrib* CharAttribList::FindFeature( sal_uInt16 nPos ) const
 {
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pNextAttrib = GetAttrib( aAttribs, nAttr );
 
     // erstmal zur gewuenschten Position...
@@ -2175,7 +2175,7 @@ EditCharAttrib* CharAttribList::FindFeature( USHORT nPos ) const
 
 void CharAttribList::DeleteEmptyAttribs( SfxItemPool& rItemPool )
 {
-    for ( USHORT nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
+    for ( sal_uInt16 nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
     {
         EditCharAttrib* pAttr = aAttribs[nAttr];
         if ( pAttr->IsEmpty() )
@@ -2186,30 +2186,30 @@ void CharAttribList::DeleteEmptyAttribs( SfxItemPool& rItemPool )
             nAttr--;
         }
     }
-    bHasEmptyAttribs = FALSE;
+    bHasEmptyAttribs = sal_False;
 }
 
-BOOL CharAttribList::DbgCheckAttribs()
+sal_Bool CharAttribList::DbgCheckAttribs()
 {
 #ifdef  DBG_UTIL
-    BOOL bOK = TRUE;
-    for ( USHORT nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
+    sal_Bool bOK = sal_True;
+    for ( sal_uInt16 nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
     {
         EditCharAttrib* pAttr = aAttribs[nAttr];
         if ( pAttr->GetStart() > pAttr->GetEnd() )
         {
-            bOK = FALSE;
+            bOK = sal_False;
             DBG_ERROR( "Attr verdreht" );
         }
         else if ( pAttr->IsFeature() && ( pAttr->GetLen() != 1 ) )
         {
-            bOK = FALSE;
+            bOK = sal_False;
             DBG_ERROR( "Feature, Len != 1" );
         }
     }
     return bOK;
 #else
-    return TRUE;
+    return sal_True;
 #endif
 }
 
@@ -2229,7 +2229,7 @@ SvxFontTable::~SvxFontTable()
     }
 }
 
-ULONG SvxFontTable::GetId( const SvxFontItem& rFontItem )
+sal_uLong SvxFontTable::GetId( const SvxFontItem& rFontItem )
 {
     SvxFontItem* pItem = First();
     while ( pItem )
@@ -2256,7 +2256,7 @@ SvxColorList::~SvxColorList()
     }
 }
 
-ULONG SvxColorList::GetId( const SvxColorItem& rColorItem )
+sal_uLong SvxColorList::GetId( const SvxColorItem& rColorItem )
 {
     SvxColorItem* pItem = First();
     while ( pItem )
@@ -2269,7 +2269,7 @@ ULONG SvxColorList::GetId( const SvxColorItem& rColorItem )
     return 0;
 }
 
-EditEngineItemPool::EditEngineItemPool( BOOL bPersistenRefCounts )
+EditEngineItemPool::EditEngineItemPool( sal_Bool bPersistenRefCounts )
     : SfxItemPool( String( "EditEngineItemPool", RTL_TEXTENCODING_ASCII_US ), EE_ITEMS_START, EE_ITEMS_END,
                     aItemInfos, 0, bPersistenRefCounts )
 {
@@ -2297,8 +2297,8 @@ SvStream& EditEngineItemPool::Store( SvStream& rStream ) const
     // erst die ItemSets gespeichert werden...
 
     long nVersion = rStream.GetVersion();
-    BOOL b31Format = ( nVersion && ( nVersion <= SOFFICE_FILEFORMAT_31 ) )
-                        ? TRUE : FALSE;
+    sal_Bool b31Format = ( nVersion && ( nVersion <= SOFFICE_FILEFORMAT_31 ) )
+                        ? sal_True : sal_False;
 
     EditEngineItemPool* pThis = (EditEngineItemPool*)this;
     if ( b31Format )
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 16b4da6f8429..784ac4c864ef 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -52,45 +52,45 @@ DBG_NAMEEX( EE_TextPortion )
 #define DEFTAB          720
 
 void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent = true, short nScriptType = 0 );
-USHORT GetScriptItemId( USHORT nItemId, short nScriptType );
-BOOL IsScriptItemValid( USHORT nItemId, short nScriptType );
+sal_uInt16 GetScriptItemId( sal_uInt16 nItemId, short nScriptType );
+sal_Bool IsScriptItemValid( sal_uInt16 nItemId, short nScriptType );
 
-EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, USHORT nS, USHORT nE );
+EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE );
 
 class ContentNode;
 class EditDoc;
 
 struct EPaM
 {
-    USHORT nPara;
-    USHORT nIndex;
+    sal_uInt16 nPara;
+    sal_uInt16 nIndex;
 
     EPaM()                              { nPara = 0; nIndex = 0; }
-    EPaM( USHORT nP, USHORT nI )        { nPara = nP; nIndex = nI; }
+    EPaM( sal_uInt16 nP, sal_uInt16 nI )        { nPara = nP; nIndex = nI; }
     EPaM( const EPaM& r)                { nPara = r.nPara; nIndex = r.nIndex; }
     EPaM& operator = ( const EPaM& r )  { nPara = r.nPara; nIndex = r.nIndex; return *this; }
-    inline BOOL operator == ( const EPaM& r ) const;
-    inline BOOL operator < ( const EPaM& r ) const;
+    inline sal_Bool operator == ( const EPaM& r ) const;
+    inline sal_Bool operator < ( const EPaM& r ) const;
 };
 
-inline BOOL EPaM::operator < ( const EPaM& r ) const
+inline sal_Bool EPaM::operator < ( const EPaM& r ) const
 {
     return ( ( nPara < r.nPara ) ||
-             ( ( nPara == r.nPara ) && nIndex < r.nIndex ) ) ? TRUE : FALSE;
+             ( ( nPara == r.nPara ) && nIndex < r.nIndex ) ) ? sal_True : sal_False;
 }
 
-inline BOOL EPaM::operator == ( const EPaM& r ) const
+inline sal_Bool EPaM::operator == ( const EPaM& r ) const
 {
-    return ( ( nPara == r.nPara ) && ( nIndex == r.nIndex ) ) ? TRUE : FALSE;
+    return ( ( nPara == r.nPara ) && ( nIndex == r.nIndex ) ) ? sal_True : sal_False;
 }
 
 struct ScriptTypePosInfo
 {
     short   nScriptType;
-    USHORT  nStartPos;
-    USHORT  nEndPos;
+    sal_uInt16  nStartPos;
+    sal_uInt16  nEndPos;
 
-    ScriptTypePosInfo( short _Type, USHORT _Start, USHORT _End )
+    ScriptTypePosInfo( short _Type, sal_uInt16 _Start, sal_uInt16 _End )
     {
         nScriptType = _Type;
         nStartPos = _Start;
@@ -102,11 +102,11 @@ typedef std::deque< ScriptTypePosInfo > ScriptTypePosInfos;
 
 struct WritingDirectionInfo
 {
-    BYTE    nType;
-    USHORT  nStartPos;
-    USHORT  nEndPos;
+    sal_uInt8   nType;
+    sal_uInt16  nStartPos;
+    sal_uInt16  nEndPos;
 
-    WritingDirectionInfo( BYTE _Type, USHORT _Start, USHORT _End )
+    WritingDirectionInfo( sal_uInt8 _Type, sal_uInt16 _Start, sal_uInt16 _End )
     {
         nType = _Type;
         nStartPos = _Start;
@@ -148,7 +148,7 @@ public:
             SvxFontTable();
             ~SvxFontTable();
 
-    ULONG   GetId( const SvxFontItem& rFont );
+    sal_uLong   GetId( const SvxFontItem& rFont );
 };
 
 //  ----------------------------------------------------------------------
@@ -162,7 +162,7 @@ public:
             SvxColorList();
             ~SvxColorList();
 
-    ULONG   GetId( const SvxColorItem& rColor );
+    sal_uLong   GetId( const SvxColorItem& rColor );
 };
 
 //  ----------------------------------------------------------------------
@@ -173,7 +173,7 @@ DECLARE_LIST( DummyItemList, ConstPoolItemPtr )
 class ItemList : public DummyItemList
 {
 public:
-    const SfxPoolItem*  FindAttrib( USHORT nWhich );
+    const SfxPoolItem*  FindAttrib( sal_uInt16 nWhich );
 };
 
 // -------------------------------------------------------------------------
@@ -190,13 +190,13 @@ public:
                     ContentAttribs( const ContentAttribs& );
                     ~ContentAttribs();  // erst bei umfangreicheren Tabs
 
-    SvxTabStop      FindTabStop( long nCurPos, USHORT nDefTab );
+    SvxTabStop      FindTabStop( long nCurPos, sal_uInt16 nDefTab );
     SfxItemSet&     GetItems()                          { return aAttribSet; }
     SfxStyleSheet*  GetStyleSheet() const               { return pStyle; }
     void            SetStyleSheet( SfxStyleSheet* pS );
 
-    const SfxPoolItem&  GetItem( USHORT nWhich );
-    BOOL                HasItem( USHORT nWhich );
+    const SfxPoolItem&  GetItem( sal_uInt16 nWhich );
+    sal_Bool                HasItem( sal_uInt16 nWhich );
 };
 
 // -------------------------------------------------------------------------
@@ -207,7 +207,7 @@ class CharAttribList
 private:
     CharAttribArray aAttribs;
     SvxFont         aDefFont;               // schneller, als jedesmal vom Pool!
-    BOOL            bHasEmptyAttribs;
+    sal_Bool            bHasEmptyAttribs;
 
                     CharAttribList( const CharAttribList& ) {;}
 
@@ -218,32 +218,32 @@ public:
     void            DeleteEmptyAttribs(  SfxItemPool& rItemPool );
     void            RemoveItemsFromPool( SfxItemPool* pItemPool );
 
-    EditCharAttrib* FindAttrib( USHORT nWhich, USHORT nPos );
-    EditCharAttrib* FindNextAttrib( USHORT nWhich, USHORT nFromPos ) const;
-    EditCharAttrib* FindEmptyAttrib( USHORT nWhich, USHORT nPos );
-    EditCharAttrib* FindFeature( USHORT nPos ) const;
+    EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos );
+    EditCharAttrib* FindNextAttrib( sal_uInt16 nWhich, sal_uInt16 nFromPos ) const;
+    EditCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos );
+    EditCharAttrib* FindFeature( sal_uInt16 nPos ) const;
 
 
     void            ResortAttribs();
     void            OptimizeRanges( SfxItemPool& rItemPool );
 
-    USHORT          Count()                 { return aAttribs.Count(); }
+    sal_uInt16          Count()                 { return aAttribs.Count(); }
     void            Clear()                 { aAttribs.Remove( 0, aAttribs.Count()); }
     void            InsertAttrib( EditCharAttrib* pAttrib );
 
     SvxFont&        GetDefFont()            { return aDefFont; }
 
-    BOOL            HasEmptyAttribs() const { return bHasEmptyAttribs; }
-    BOOL&           HasEmptyAttribs()       { return bHasEmptyAttribs; }
-    BOOL            HasBoundingAttrib( USHORT nBound );
-    BOOL            HasAttrib( USHORT nWhich ) const;
-    BOOL            HasAttrib( USHORT nStartPos, USHORT nEndPos ) const;
+    sal_Bool            HasEmptyAttribs() const { return bHasEmptyAttribs; }
+    sal_Bool&           HasEmptyAttribs()       { return bHasEmptyAttribs; }
+    sal_Bool            HasBoundingAttrib( sal_uInt16 nBound );
+    sal_Bool            HasAttrib( sal_uInt16 nWhich ) const;
+    sal_Bool            HasAttrib( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) const;
 
     CharAttribArray&        GetAttribs()        { return aAttribs; }
     const CharAttribArray&  GetAttribs() const  { return aAttribs; }
 
     // Debug:
-    BOOL            DbgCheckAttribs();
+    sal_Bool            DbgCheckAttribs();
 };
 
 // -------------------------------------------------------------------------
@@ -264,12 +264,12 @@ public:
     ContentAttribs& GetContentAttribs()     { return aContentAttribs; }
     CharAttribList& GetCharAttribs()        { return aCharAttribList; }
 
-    void            ExpandAttribs( USHORT nIndex, USHORT nNewChars, SfxItemPool& rItemPool );
-    void            CollapsAttribs( USHORT nIndex, USHORT nDelChars, SfxItemPool& rItemPool );
+    void            ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNewChars, SfxItemPool& rItemPool );
+    void            CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDelChars, SfxItemPool& rItemPool );
     void            AppendAttribs( ContentNode* pNextNode );
-    void            CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, BOOL bKeepEndingAttribs );
+    void            CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, sal_Bool bKeepEndingAttribs );
 
-    void            SetStyleSheet( SfxStyleSheet* pS, BOOL bRecalcFont = TRUE );
+    void            SetStyleSheet( SfxStyleSheet* pS, sal_Bool bRecalcFont = sal_True );
     void            SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle );
     SfxStyleSheet*  GetStyleSheet() { return aContentAttribs.GetStyleSheet(); }
 
@@ -281,7 +281,7 @@ public:
     void            CreateWrongList();
     void            DestroyWrongList();
 
-    BOOL            IsFeature( USHORT nPos ) const { return ( GetChar( nPos ) == CH_FEATURE ); }
+    sal_Bool            IsFeature( sal_uInt16 nPos ) const { return ( GetChar( nPos ) == CH_FEATURE ); }
 };
 
 typedef ContentNode* ContentNodePtr;
@@ -289,10 +289,10 @@ SV_DECL_PTRARR( DummyContentList, ContentNodePtr, 0, 4 )
 
 class ContentList : public DummyContentList
 {
-  USHORT nLastCache;
+  sal_uInt16 nLastCache;
 public:
   ContentList() : DummyContentList( 0, 4 ), nLastCache(0) {}
-  USHORT GetPos( const ContentNodePtr &rPtr ) const;
+  sal_uInt16 GetPos( const ContentNodePtr &rPtr ) const;
 };
 
 // -------------------------------------------------------------------------
@@ -302,27 +302,27 @@ class EditPaM
 {
 private:
     ContentNode*    pNode;
-    USHORT          nIndex;
+    sal_uInt16          nIndex;
 
 public:
                     EditPaM()                           { pNode = NULL; nIndex = 0; }
-                    EditPaM( ContentNode* p, USHORT n ) { pNode = p; nIndex = n; }
+                    EditPaM( ContentNode* p, sal_uInt16 n ) { pNode = p; nIndex = n; }
 
     ContentNode*    GetNode() const                 { return pNode; }
     void            SetNode( ContentNode* p)        { pNode = p; }
 
-    USHORT          GetIndex() const                { return nIndex; }
-    USHORT&         GetIndex()                      { return nIndex; }
-    void            SetIndex( USHORT n )            { nIndex = n; }
+    sal_uInt16          GetIndex() const                { return nIndex; }
+    sal_uInt16&         GetIndex()                      { return nIndex; }
+    void            SetIndex( sal_uInt16 n )            { nIndex = n; }
 
-    BOOL            IsParaStart() const             { return nIndex == 0; }
-    BOOL            IsParaEnd() const               { return nIndex == pNode->Len(); }
+    sal_Bool            IsParaStart() const             { return nIndex == 0; }
+    sal_Bool            IsParaEnd() const               { return nIndex == pNode->Len(); }
 
-    BOOL            DbgIsBuggy( EditDoc& rDoc );
+    sal_Bool            DbgIsBuggy( EditDoc& rDoc );
 
     EditPaM&    operator = ( const EditPaM& rPaM );
-    friend BOOL operator == ( const EditPaM& r1,  const EditPaM& r2  );
-    friend BOOL operator != ( const EditPaM& r1,  const EditPaM& r2  );
+    friend sal_Bool operator == ( const EditPaM& r1,  const EditPaM& r2  );
+    friend sal_Bool operator != ( const EditPaM& r1,  const EditPaM& r2  );
 };
 
 #define PORTIONKIND_TEXT        0
@@ -351,11 +351,11 @@ struct ExtraPortionInfo
 
     long    nPortionOffsetX;
 
-    USHORT  nMaxCompression100thPercent;
+    sal_uInt16  nMaxCompression100thPercent;
 
-    BYTE    nAsianCompressionTypes;
-    BOOL    bFirstCharIsRightPunktuation;
-    BOOL    bCompressed;
+    sal_uInt8    nAsianCompressionTypes;
+    sal_Bool    bFirstCharIsRightPunktuation;
+    sal_Bool    bCompressed;
 
     sal_Int32*    pOrgDXArray;
 
@@ -363,7 +363,7 @@ struct ExtraPortionInfo
             ExtraPortionInfo();
             ~ExtraPortionInfo();
 
-    void    SaveOrgDXArray( const sal_Int32* pDXArray, USHORT nLen );
+    void    SaveOrgDXArray( const sal_Int32* pDXArray, sal_uInt16 nLen );
     void    DestroyOrgDXArray();
 };
 
@@ -375,44 +375,44 @@ class TextPortion
 {
 private:
     ExtraPortionInfo*   pExtraInfos;
-    USHORT              nLen;
+    sal_uInt16              nLen;
     Size                aOutSz;
-    BYTE                nKind;
-    BYTE                nRightToLeft;
+    sal_uInt8               nKind;
+    sal_uInt8                nRightToLeft;
     sal_Unicode         nExtraValue;
 
 
                 TextPortion()               { DBG_CTOR( EE_TextPortion, 0 );
-                                              pExtraInfos = NULL; nLen = 0; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = FALSE;}
+                                              pExtraInfos = NULL; nLen = 0; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = sal_False;}
 
 public:
-                TextPortion( USHORT nL ) : aOutSz( -1, -1 )
+                TextPortion( sal_uInt16 nL ) : aOutSz( -1, -1 )
                                             {   DBG_CTOR( EE_TextPortion, 0 );
-                                                pExtraInfos = NULL; nLen = nL; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = FALSE;}
+                                                pExtraInfos = NULL; nLen = nL; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = sal_False;}
                 TextPortion( const TextPortion& r ) : aOutSz( r.aOutSz )
                                             { DBG_CTOR( EE_TextPortion, 0 );
                                                 pExtraInfos = NULL; nLen = r.nLen; nKind = r.nKind; nExtraValue = r.nExtraValue; nRightToLeft = r.nRightToLeft; }
 
                 ~TextPortion()              {   DBG_DTOR( EE_TextPortion, 0 ); delete pExtraInfos; }
 
-    USHORT      GetLen() const              { return nLen; }
-    USHORT&     GetLen()                    { return nLen; }
-    void        SetLen( USHORT nL )         { nLen = nL; }
+    sal_uInt16      GetLen() const              { return nLen; }
+    sal_uInt16&     GetLen()                    { return nLen; }
+    void        SetLen( sal_uInt16 nL )         { nLen = nL; }
 
     Size&       GetSize()                   { return aOutSz; }
     Size        GetSize() const             { return aOutSz; }
 
-    BYTE&       GetKind()                   { return nKind; }
-    BYTE        GetKind() const             { return nKind; }
+    sal_uInt8&      GetKind()                   { return nKind; }
+    sal_uInt8       GetKind() const             { return nKind; }
 
-    void        SetRightToLeft( BYTE b )    { nRightToLeft = b; }
-    BYTE        GetRightToLeft() const      { return nRightToLeft; }
-    BOOL        IsRightToLeft() const       { return (nRightToLeft&1); }
+    void        SetRightToLeft( sal_uInt8 b )    { nRightToLeft = b; }
+    sal_uInt8        GetRightToLeft() const      { return nRightToLeft; }
+    sal_Bool        IsRightToLeft() const       { return (nRightToLeft&1); }
 
     sal_Unicode GetExtraValue() const       { return nExtraValue; }
     void        SetExtraValue( sal_Unicode n )  { nExtraValue = n; }
 
-    BOOL        HasValidSize() const        { return aOutSz.Width() != (-1); }
+    sal_Bool        HasValidSize() const        { return aOutSz.Width() != (-1); }
 
     ExtraPortionInfo*   GetExtraInfos() const { return pExtraInfos; }
     void                SetExtraInfos( ExtraPortionInfo* p ) { delete pExtraInfos; pExtraInfos = p; }
@@ -431,9 +431,9 @@ public:
             ~TextPortionList();
 
     void    Reset();
-    USHORT  FindPortion( USHORT nCharPos, USHORT& rPortionStart, BOOL bPreferStartingPortion = FALSE );
-    USHORT  GetStartPos( USHORT nPortion );
-    void    DeleteFromPortion( USHORT nDelFrom );
+    sal_uInt16  FindPortion( sal_uInt16 nCharPos, sal_uInt16& rPortionStart, sal_Bool bPreferStartingPortion = sal_False );
+    sal_uInt16  GetStartPos( sal_uInt16 nPortion );
+    void    DeleteFromPortion( sal_uInt16 nDelFrom );
 };
 
 class ParaPortion;
@@ -448,84 +448,84 @@ class EditLine
 private:
     CharPosArray    aPositions;
     long            nTxtWidth;
-    USHORT          nStartPosX;
-    USHORT          nStart;     // koennte durch nStartPortion ersetzt werden
-    USHORT          nEnd;       // koennte durch nEndPortion ersetzt werden
-    USHORT          nStartPortion;
-    USHORT          nEndPortion;
-    USHORT          nHeight;    // Gesamthoehe der Zeile
-    USHORT          nTxtHeight; // Reine Texthoehe
-    USHORT          nCrsrHeight;    // Bei Konturfluss hohe Zeilen => Cursor zu groá.
-    USHORT          nMaxAscent;
-    BOOL            bHangingPunctuation;
-    BOOL            bInvalid;   // fuer geschickte Formatierung
+    sal_uInt16          nStartPosX;
+    sal_uInt16          nStart;     // koennte durch nStartPortion ersetzt werden
+    sal_uInt16          nEnd;       // koennte durch nEndPortion ersetzt werden
+    sal_uInt16          nStartPortion;
+    sal_uInt16          nEndPortion;
+    sal_uInt16          nHeight;    // Gesamthoehe der Zeile
+    sal_uInt16          nTxtHeight; // Reine Texthoehe
+    sal_uInt16          nCrsrHeight;    // Bei Konturfluss hohe Zeilen => Cursor zu gro�.
+    sal_uInt16          nMaxAscent;
+    sal_Bool            bHangingPunctuation;
+    sal_Bool            bInvalid;   // fuer geschickte Formatierung
 
 public:
                     EditLine();
                     EditLine( const EditLine& );
                     ~EditLine();
 
-    BOOL            IsIn( USHORT nIndex ) const
+    sal_Bool            IsIn( sal_uInt16 nIndex ) const
                         { return ( (nIndex >= nStart ) && ( nIndex < nEnd ) ); }
 
-    BOOL            IsIn( USHORT nIndex, BOOL bInclEnd ) const
+    sal_Bool            IsIn( sal_uInt16 nIndex, sal_Bool bInclEnd ) const
                         { return ( ( nIndex >= nStart ) && ( bInclEnd ? ( nIndex <= nEnd ) : ( nIndex < nEnd ) ) ); }
 
-    void            SetStart( USHORT n )            { nStart = n; }
-    USHORT          GetStart() const                { return nStart; }
-    USHORT&         GetStart()                      { return nStart; }
+    void            SetStart( sal_uInt16 n )            { nStart = n; }
+    sal_uInt16          GetStart() const                { return nStart; }
+    sal_uInt16&         GetStart()                      { return nStart; }
 
-    void            SetEnd( USHORT n )              { nEnd = n; }
-    USHORT          GetEnd() const                  { return nEnd; }
-    USHORT&         GetEnd()                        { return nEnd; }
+    void            SetEnd( sal_uInt16 n )              { nEnd = n; }
+    sal_uInt16          GetEnd() const                  { return nEnd; }
+    sal_uInt16&         GetEnd()                        { return nEnd; }
 
-    void            SetStartPortion( USHORT n )     { nStartPortion = n; }
-    USHORT          GetStartPortion() const         { return nStartPortion; }
-    USHORT&         GetStartPortion()               { return nStartPortion; }
+    void            SetStartPortion( sal_uInt16 n )     { nStartPortion = n; }
+    sal_uInt16          GetStartPortion() const         { return nStartPortion; }
+    sal_uInt16&         GetStartPortion()               { return nStartPortion; }
 
-    void            SetEndPortion( USHORT n )       { nEndPortion = n; }
-    USHORT          GetEndPortion() const           { return nEndPortion; }
-    USHORT&         GetEndPortion()                 { return nEndPortion; }
+    void            SetEndPortion( sal_uInt16 n )       { nEndPortion = n; }
+    sal_uInt16          GetEndPortion() const           { return nEndPortion; }
+    sal_uInt16&         GetEndPortion()                 { return nEndPortion; }
 
-    void            SetHeight( USHORT nH, USHORT nTxtH = 0, USHORT nCrsrH = 0 )
+    void            SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16 nCrsrH = 0 )
                     {   nHeight = nH;
                         nTxtHeight = ( nTxtH ? nTxtH : nH );
                         nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight );
                     }
-    USHORT          GetHeight() const               { return nHeight; }
-    USHORT          GetTxtHeight() const            { return nTxtHeight; }
-    USHORT          GetCrsrHeight() const           { return nCrsrHeight; }
+    sal_uInt16          GetHeight() const               { return nHeight; }
+    sal_uInt16          GetTxtHeight() const            { return nTxtHeight; }
+    sal_uInt16          GetCrsrHeight() const           { return nCrsrHeight; }
 
     void            SetTextWidth( long n )          { nTxtWidth = n; }
     long            GetTextWidth() const            { return nTxtWidth; }
 
-    void            SetMaxAscent( USHORT n )        { nMaxAscent = n; }
-    USHORT          GetMaxAscent() const            { return nMaxAscent; }
+    void            SetMaxAscent( sal_uInt16 n )        { nMaxAscent = n; }
+    sal_uInt16          GetMaxAscent() const            { return nMaxAscent; }
 
-    void            SetHangingPunctuation( BOOL b )     { bHangingPunctuation = b; }
-    BOOL            IsHangingPunctuation() const        { return bHangingPunctuation; }
+    void            SetHangingPunctuation( sal_Bool b )     { bHangingPunctuation = b; }
+    sal_Bool            IsHangingPunctuation() const        { return bHangingPunctuation; }
 
-    USHORT          GetLen() const                  { return nEnd - nStart; }
+    sal_uInt16          GetLen() const                  { return nEnd - nStart; }
 
-    USHORT          GetStartPosX() const            { return nStartPosX; }
-    void            SetStartPosX( USHORT start )    { nStartPosX = start; }
+    sal_uInt16          GetStartPosX() const            { return nStartPosX; }
+    void            SetStartPosX( sal_uInt16 start )    { nStartPosX = start; }
 
     Size            CalcTextSize( ParaPortion& rParaPortion );
 
-    BOOL            IsInvalid() const               { return bInvalid; }
-    BOOL            IsValid() const                 { return !bInvalid; }
-    void            SetInvalid()                    { bInvalid = TRUE; }
-    void            SetValid()                      { bInvalid = FALSE; }
+    sal_Bool            IsInvalid() const               { return bInvalid; }
+    sal_Bool            IsValid() const                 { return !bInvalid; }
+    void            SetInvalid()                    { bInvalid = sal_True; }
+    void            SetValid()                      { bInvalid = sal_False; }
 
-    BOOL            IsEmpty() const                 { return (nEnd > nStart) ? FALSE : TRUE; }
+    sal_Bool            IsEmpty() const                 { return (nEnd > nStart) ? sal_False : sal_True; }
 
     CharPosArray&   GetCharPosArray()               { return aPositions; }
 
     EditLine*       Clone() const;
 
     EditLine&   operator = ( const EditLine& rLine );
-    friend BOOL operator == ( const EditLine& r1,  const EditLine& r2  );
-    friend BOOL operator != ( const EditLine& r1,  const EditLine& r2  );
+    friend sal_Bool operator == ( const EditLine& r1,  const EditLine& r2  );
+    friend sal_Bool operator != ( const EditLine& r1,  const EditLine& r2  );
 };
 
 
@@ -542,8 +542,8 @@ public:
             ~EditLineList();
 
     void    Reset();
-    void    DeleteFromLine( USHORT nDelFrom );
-    USHORT  FindLine( USHORT nChar, BOOL bInclEnd );
+    void    DeleteFromLine( sal_uInt16 nDelFrom );
+    sal_uInt16  FindLine( sal_uInt16 nChar, sal_Bool bInclEnd );
 };
 
 // -------------------------------------------------------------------------
@@ -561,15 +561,15 @@ private:
     ScriptTypePosInfos      aScriptInfos;
     WritingDirectionInfos   aWritingDirectionInfos;
 
-    USHORT              nInvalidPosStart;
-    USHORT              nFirstLineOffset;   // Fuer Writer-LineSpacing-Interpretation
-    USHORT              nBulletX;
+    sal_uInt16              nInvalidPosStart;
+    sal_uInt16              nFirstLineOffset;   // Fuer Writer-LineSpacing-Interpretation
+    sal_uInt16              nBulletX;
     short               nInvalidDiff;
 
-    BOOL                bInvalid            : 1;
-    BOOL                bSimple             : 1;    // nur lineares Tippen
-    BOOL                bVisible            : 1;    // MT 05/00: Gehoert an den Node!!!
-    BOOL                bForceRepaint       : 1;
+    sal_Bool                bInvalid            : 1;
+    sal_Bool                bSimple             : 1;    // nur lineares Tippen
+    sal_Bool                bVisible            : 1;    // MT 05/00: Gehoert an den Node!!!
+    sal_Bool                bForceRepaint       : 1;
 
                         ParaPortion( const ParaPortion& );
 
@@ -577,39 +577,39 @@ public:
                         ParaPortion( ContentNode* pNode );
                         ~ParaPortion();
 
-    USHORT              GetLineNumber( USHORT nIndex );
+    sal_uInt16              GetLineNumber( sal_uInt16 nIndex );
 
     EditLineList&       GetLines()                  { return aLineList; }
 
-    BOOL                IsInvalid() const           { return bInvalid; }
-    BOOL                IsSimpleInvalid()   const   { return bSimple; }
-    void                SetValid()                  { bInvalid = FALSE; bSimple = TRUE;}
+    sal_Bool                IsInvalid() const           { return bInvalid; }
+    sal_Bool                IsSimpleInvalid()   const   { return bSimple; }
+    void                SetValid()                  { bInvalid = sal_False; bSimple = sal_True;}
 
-    BOOL                MustRepaint() const         { return bForceRepaint; }
-    void                SetMustRepaint( BOOL bRP )  { bForceRepaint = bRP; }
+    sal_Bool                MustRepaint() const         { return bForceRepaint; }
+    void                SetMustRepaint( sal_Bool bRP )  { bForceRepaint = bRP; }
 
-    USHORT              GetBulletX() const          { return nBulletX; }
-    void                SetBulletX( USHORT n )      { nBulletX = n; }
+    sal_uInt16              GetBulletX() const          { return nBulletX; }
+    void                SetBulletX( sal_uInt16 n )      { nBulletX = n; }
 
-    void                MarkInvalid( USHORT nStart, short nDiff);
-    void                MarkSelectionInvalid( USHORT nStart, USHORT nEnd );
+    void                MarkInvalid( sal_uInt16 nStart, short nDiff);
+    void                MarkSelectionInvalid( sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    void                SetVisible( BOOL bVisible );
-    BOOL                IsVisible()                 { return bVisible; }
+    void                SetVisible( sal_Bool bVisible );
+    sal_Bool                IsVisible()                 { return bVisible; }
 
     long                GetHeight() const           { return ( bVisible ? nHeight : 0 ); }
-    USHORT              GetFirstLineOffset() const  { return ( bVisible ? nFirstLineOffset : 0 ); }
+    sal_uInt16              GetFirstLineOffset() const  { return ( bVisible ? nFirstLineOffset : 0 ); }
     void                ResetHeight()   { nHeight = 0; nFirstLineOffset = 0; }
 
     ContentNode*        GetNode() const             { return pNode; }
     TextPortionList&    GetTextPortions()           { return aTextPortionList; }
 
-    USHORT              GetInvalidPosStart() const  { return nInvalidPosStart; }
+    sal_uInt16              GetInvalidPosStart() const  { return nInvalidPosStart; }
     short               GetInvalidDiff() const      { return nInvalidDiff; }
 
-    void                CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine );
+    void                CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine );
 
-    BOOL                DbgCheckTextPortions();
+    sal_Bool                DbgCheckTextPortions();
 };
 
 typedef ParaPortion* ParaPortionPtr;
@@ -620,19 +620,19 @@ SV_DECL_PTRARR( DummyParaPortionList, ParaPortionPtr, 0, 4 )
 // -------------------------------------------------------------------------
 class ParaPortionList : public DummyParaPortionList
 {
-    USHORT nLastCache;
+    sal_uInt16 nLastCache;
 public:
                     ParaPortionList();
                     ~ParaPortionList();
 
     void            Reset();
     long            GetYOffset( ParaPortion* pPPortion );
-    USHORT          FindParagraph( long nYOffset );
+    sal_uInt16          FindParagraph( long nYOffset );
 
-    inline ParaPortion* SaveGetObject( USHORT nPos ) const
+    inline ParaPortion* SaveGetObject( sal_uInt16 nPos ) const
         { return ( nPos < Count() ) ? GetObject( nPos ) : 0; }
 
-    USHORT                  GetPos( const ParaPortionPtr &rPtr ) const;
+    sal_uInt16                  GetPos( const ParaPortionPtr &rPtr ) const;
 
     // temporaer:
     void            DbgCheck( EditDoc& rDoc );
@@ -658,17 +658,17 @@ public:
     const EditPaM&  Min() const         { return aStartPaM; }
     const EditPaM&  Max() const         { return aEndPaM; }
 
-    BOOL            HasRange() const    { return aStartPaM != aEndPaM; }
-    BOOL            IsInvalid() const;
-    BOOL            DbgIsBuggy( EditDoc& rDoc );
+    sal_Bool            HasRange() const    { return aStartPaM != aEndPaM; }
+    sal_Bool            IsInvalid() const;
+    sal_Bool            DbgIsBuggy( EditDoc& rDoc );
 
-    BOOL            Adjust( const ContentList& rNodes );
+    sal_Bool            Adjust( const ContentList& rNodes );
 
     EditSelection&  operator = ( const EditPaM& r );
-    BOOL            operator == ( const EditSelection& r ) const
+    sal_Bool            operator == ( const EditSelection& r ) const
                     { return ( ( aStartPaM == r.aStartPaM ) && ( aEndPaM == r.aEndPaM ) )
-                            ? TRUE : FALSE; }
-    BOOL            operator != ( const EditSelection& r ) const { return !( r == *this ); }
+                            ? sal_True : sal_False; }
+    sal_Bool            operator != ( const EditSelection& r ) const { return !( r == *this ); }
 };
 
 // -------------------------------------------------------------------------
@@ -677,16 +677,16 @@ public:
 class DeletedNodeInfo
 {
 private:
-    ULONG   nInvalidAdressPtr;
-    USHORT  nInvalidParagraph;
+    sal_uIntPtr     nInvalidAdressPtr;
+    sal_uInt16  nInvalidParagraph;
 
 public:
-            DeletedNodeInfo( ULONG nInvAdr, USHORT nPos )
+            DeletedNodeInfo( sal_uIntPtr nInvAdr, sal_uInt16 nPos )
                                             {   nInvalidAdressPtr = nInvAdr;
                                                 nInvalidParagraph = nPos; }
 
-    ULONG   GetInvalidAdress()              {   return nInvalidAdressPtr; }
-    USHORT  GetPosition()                   {   return nInvalidParagraph; }
+    sal_uIntPtr GetInvalidAdress()              {   return nInvalidAdressPtr; }
+    sal_uInt16  GetPosition()                   {   return nInvalidParagraph; }
 };
 
 typedef DeletedNodeInfo* DeletedNodeInfoPtr;
@@ -702,12 +702,12 @@ private:
     Link            aModifyHdl;
 
     SvxFont         aDefFont;           //schneller, als jedesmal vom Pool!
-    USHORT          nDefTab;
-    BOOL            bIsVertical;
-    BOOL            bIsFixedCellHeight;
+    sal_uInt16          nDefTab;
+    sal_Bool            bIsVertical;
+    sal_Bool            bIsFixedCellHeight;
 
-    BOOL            bOwnerOfPool;
-    BOOL            bModified;
+    sal_Bool            bOwnerOfPool;
+    sal_Bool            bModified;
 
 protected:
     void            ImplDestroyContents();
@@ -716,38 +716,38 @@ public:
                     EditDoc( SfxItemPool* pItemPool );
                     ~EditDoc();
 
-    BOOL            IsModified() const      { return bModified; }
-    void            SetModified( BOOL b );
+    sal_Bool            IsModified() const      { return bModified; }
+    void            SetModified( sal_Bool b );
 
     void            SetModifyHdl( const Link& rLink ) { aModifyHdl = rLink; }
     Link            GetModifyHdl() const { return aModifyHdl; }
 
-    void            CreateDefFont( BOOL bUseStyles );
+    void            CreateDefFont( sal_Bool bUseStyles );
     const SvxFont&  GetDefFont() { return aDefFont; }
 
-    void            SetDefTab( USHORT nTab )    { nDefTab = nTab ? nTab : DEFTAB; }
-    USHORT          GetDefTab() const           { return nDefTab; }
+    void            SetDefTab( sal_uInt16 nTab )    { nDefTab = nTab ? nTab : DEFTAB; }
+    sal_uInt16          GetDefTab() const           { return nDefTab; }
 
-    void            SetVertical( BOOL bVertical )   { bIsVertical = bVertical; }
-    BOOL            IsVertical() const              { return bIsVertical; }
+    void            SetVertical( sal_Bool bVertical )   { bIsVertical = bVertical; }
+    sal_Bool            IsVertical() const              { return bIsVertical; }
 
-    void            SetFixedCellHeight( BOOL bUseFixedCellHeight )  { bIsFixedCellHeight = bUseFixedCellHeight; }
-    BOOL            IsFixedCellHeight() const               { return bIsFixedCellHeight; }
+    void            SetFixedCellHeight( sal_Bool bUseFixedCellHeight )  { bIsFixedCellHeight = bUseFixedCellHeight; }
+    sal_Bool            IsFixedCellHeight() const               { return bIsFixedCellHeight; }
 
     EditPaM         Clear();
     EditPaM         RemoveText();
-    EditPaM         RemoveChars( EditPaM aPaM, USHORT nChars );
+    EditPaM         RemoveChars( EditPaM aPaM, sal_uInt16 nChars );
     void            InsertText( const EditPaM& rPaM, xub_Unicode c );
     EditPaM         InsertText( EditPaM aPaM, const XubString& rStr );
-    EditPaM         InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs );
+    EditPaM         InsertParaBreak( EditPaM aPaM, sal_Bool bKeepEndingAttribs );
     EditPaM         InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem );
     EditPaM         ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight );
 
     String          GetText( LineEnd eEnd ) const;
-    ULONG           GetTextLen() const;
+    sal_uLong           GetTextLen() const;
 
-    XubString       GetParaAsString( USHORT nNode ) const;
-    XubString       GetParaAsString( ContentNode* pNode, USHORT nStartPos = 0, USHORT nEndPos = 0xFFFF, BOOL bResolveFields = TRUE ) const;
+    XubString       GetParaAsString( sal_uInt16 nNode ) const;
+    XubString       GetParaAsString( ContentNode* pNode, sal_uInt16 nStartPos = 0, sal_uInt16 nEndPos = 0xFFFF, sal_Bool bResolveFields = sal_True ) const;
 
     inline EditPaM  GetStartPaM() const;
     inline EditPaM  GetEndPaM() const;
@@ -757,15 +757,15 @@ public:
 
     void            RemoveItemsFromPool( ContentNode* pNode );
 
-    void            InsertAttrib( const SfxPoolItem& rItem, ContentNode* pNode, USHORT nStart, USHORT nEnd );
-    void            InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem );
-    void            InsertAttribInSelection( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem );
-    BOOL            RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, USHORT nWhich = 0 );
-    BOOL            RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, USHORT nWhich = 0 );
-    void            FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet );
+    void            InsertAttrib( const SfxPoolItem& rItem, ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd );
+    void            InsertAttrib( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxPoolItem& rPoolItem );
+    void            InsertAttribInSelection( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxPoolItem& rPoolItem );
+    sal_Bool            RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt16 nWhich = 0 );
+    sal_Bool            RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, sal_uInt16 nWhich = 0 );
+    void            FindAttribs( ContentNode* pNode, sal_uInt16 nStartPos, sal_uInt16 nEndPos, SfxItemSet& rCurSet );
 
-    USHORT          GetPos( ContentNode* pNode ) const { return ContentList::GetPos(pNode); }
-    ContentNode*    SaveGetObject( USHORT nPos ) const { return ( nPos < Count() ) ? GetObject( nPos ) : 0; }
+    sal_uInt16          GetPos( ContentNode* pNode ) const { return ContentList::GetPos(pNode); }
+    ContentNode*    SaveGetObject( sal_uInt16 nPos ) const { return ( nPos < Count() ) ? GetObject( nPos ) : 0; }
 
     static XubString    GetSepStr( LineEnd eEnd );
 };
@@ -781,12 +781,12 @@ inline EditPaM EditDoc::GetEndPaM() const
     return EditPaM( pLastNode, pLastNode->Len() );
 }
 
-inline EditCharAttrib* GetAttrib( const CharAttribArray& rAttribs, USHORT nAttr )
+inline EditCharAttrib* GetAttrib( const CharAttribArray& rAttribs, sal_uInt16 nAttr )
 {
     return ( nAttr < rAttribs.Count() ) ? rAttribs[nAttr] : 0;
 }
 
-BOOL CheckOrderedList( CharAttribArray& rAttribs, BOOL bStart );
+sal_Bool CheckOrderedList( CharAttribArray& rAttribs, sal_Bool bStart );
 
 // -------------------------------------------------------------------------
 // class EditEngineItemPool
@@ -794,7 +794,7 @@ BOOL CheckOrderedList( CharAttribArray& rAttribs, BOOL bStart );
 class EditEngineItemPool : public SfxItemPool
 {
 public:
-                        EditEngineItemPool( BOOL bPersistenRefCounts );
+                        EditEngineItemPool( sal_Bool bPersistenRefCounts );
 protected:
                         virtual ~EditEngineItemPool();
 public:
diff --git a/editeng/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx
index 3610423ba3c0..20b13778a025 100644
--- a/editeng/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -70,10 +70,10 @@ SV_IMPL_VARARR( CharPosArray, sal_Int32 );
 
 /*
 
-BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
+sal_Bool EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
 {
     if ( GetParent() == rStyle.GetName() )
-        return TRUE;
+        return sal_True;
 
     if ( GetParent().Len() && ( GetParent() != GetName() ) )
     {
@@ -81,7 +81,7 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
         if ( pS )
             return pS->HasStyleAsAnyParent( rStyle );
     }
-    return FALSE;
+    return sal_False;
 }
 
 */
@@ -100,24 +100,24 @@ TextPortionList::~TextPortionList()
 
 void TextPortionList::Reset()
 {
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
         delete GetObject( nPortion );
     Remove( 0, Count() );
 }
 
-void TextPortionList::DeleteFromPortion( USHORT nDelFrom )
+void TextPortionList::DeleteFromPortion( sal_uInt16 nDelFrom )
 {
     DBG_ASSERT( ( nDelFrom < Count() ) || ( (nDelFrom == 0) && (Count() == 0) ), "DeleteFromPortion: Out of range" );
-    for ( USHORT nP = nDelFrom; nP < Count(); nP++ )
+    for ( sal_uInt16 nP = nDelFrom; nP < Count(); nP++ )
         delete GetObject( nP );
     Remove( nDelFrom, Count()-nDelFrom );
 }
 
-USHORT TextPortionList::FindPortion( USHORT nCharPos, USHORT& nPortionStart, BOOL bPreferStartingPortion )
+sal_uInt16 TextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPortionStart, sal_Bool bPreferStartingPortion )
 {
     // Bei nCharPos an Portion-Grenze wird die linke Portion gefunden
-    USHORT nTmpPos = 0;
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    sal_uInt16 nTmpPos = 0;
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
     {
         TextPortion* pPortion = GetObject( nPortion );
         nTmpPos = nTmpPos + pPortion->GetLen();
@@ -135,10 +135,10 @@ USHORT TextPortionList::FindPortion( USHORT nCharPos, USHORT& nPortionStart, BOO
     return ( Count() - 1 );
 }
 
-USHORT TextPortionList::GetStartPos( USHORT nPortion )
+sal_uInt16 TextPortionList::GetStartPos( sal_uInt16 nPortion )
 {
-    USHORT nPos = 0;
-    for ( USHORT n = 0; n < nPortion; n++ )
+    sal_uInt16 nPos = 0;
+    for ( sal_uInt16 n = 0; n < nPortion; n++ )
     {
         TextPortion* pPortion = GetObject( n );
         nPos = nPos + pPortion->GetLen();
@@ -158,8 +158,8 @@ ExtraPortionInfo::ExtraPortionInfo()
     nMaxCompression100thPercent = 0;
     nAsianCompressionTypes = 0;
     nPortionOffsetX = 0;
-    bFirstCharIsRightPunktuation = FALSE;
-    bCompressed = FALSE;
+    bFirstCharIsRightPunktuation = sal_False;
+    bCompressed = sal_False;
     pOrgDXArray = NULL;
 }
 
@@ -168,7 +168,7 @@ ExtraPortionInfo::~ExtraPortionInfo()
     delete[] pOrgDXArray;
 }
 
-void ExtraPortionInfo::SaveOrgDXArray( const sal_Int32* pDXArray, USHORT nLen )
+void ExtraPortionInfo::SaveOrgDXArray( const sal_Int32* pDXArray, sal_uInt16 nLen )
 {
     delete[] pOrgDXArray;
     pOrgDXArray = new sal_Int32[nLen];
@@ -190,10 +190,10 @@ ParaPortion::ParaPortion( ContentNode* pN )
     DBG_CTOR( EE_ParaPortion, 0 );
 
     pNode               = pN;
-    bInvalid            = TRUE;
-    bVisible            = TRUE;
-    bSimple             = FALSE;
-    bForceRepaint       = FALSE;
+    bInvalid            = sal_True;
+    bVisible            = sal_True;
+    bSimple             = sal_False;
+    bForceRepaint       = sal_False;
     nInvalidPosStart    = 0;
     nInvalidDiff        = 0;
     nHeight             = 0;
@@ -206,9 +206,9 @@ ParaPortion::~ParaPortion()
     DBG_DTOR( EE_ParaPortion, 0 );
 }
 
-void ParaPortion::MarkInvalid( USHORT nStart, short nDiff )
+void ParaPortion::MarkInvalid( sal_uInt16 nStart, short nDiff )
 {
-    if ( bInvalid == FALSE )
+    if ( bInvalid == sal_False )
     {
 //      nInvalidPosEnd = nStart;    // ??? => CreateLines
         nInvalidPosStart = ( nDiff >= 0 ) ? nStart : ( nStart + nDiff );
@@ -232,19 +232,19 @@ void ParaPortion::MarkInvalid( USHORT nStart, short nDiff )
         {
 //          nInvalidPosEnd = pNode->Len();
             DBG_ASSERT( ( nDiff >= 0 ) || ( (nStart+nDiff) >= 0 ), "MarkInvalid: Diff out of Range" );
-            nInvalidPosStart = Min( nInvalidPosStart, (USHORT) ( nDiff < 0 ? nStart+nDiff : nDiff ) );
+            nInvalidPosStart = Min( nInvalidPosStart, (sal_uInt16) ( nDiff < 0 ? nStart+nDiff : nDiff ) );
             nInvalidDiff = 0;
-            bSimple = FALSE;
+            bSimple = sal_False;
         }
     }
-    bInvalid = TRUE;
+    bInvalid = sal_True;
     aScriptInfos.clear();
     aWritingDirectionInfos.clear();
 }
 
-void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /* nEnd */ )
+void ParaPortion::MarkSelectionInvalid( sal_uInt16 nStart, sal_uInt16 /* nEnd */ )
 {
-    if ( bInvalid == FALSE )
+    if ( bInvalid == sal_False )
     {
         nInvalidPosStart = nStart;
 //      nInvalidPosEnd = nEnd;
@@ -255,18 +255,18 @@ void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /* nEnd */ )
 //      nInvalidPosEnd = pNode->Len();
     }
     nInvalidDiff = 0;
-    bInvalid = TRUE;
-    bSimple = FALSE;
+    bInvalid = sal_True;
+    bSimple = sal_False;
     aScriptInfos.clear();
     aWritingDirectionInfos.clear();
 }
 
-USHORT ParaPortion::GetLineNumber( USHORT nIndex )
+sal_uInt16 ParaPortion::GetLineNumber( sal_uInt16 nIndex )
 {
     DBG_ASSERTWARNING( aLineList.Count(), "Leere ParaPortion in GetLine!" );
     DBG_ASSERT( bVisible, "Wozu GetLine() bei einem unsichtbaren Absatz?" );
 
-    for ( USHORT nLine = 0; nLine < aLineList.Count(); nLine++ )
+    for ( sal_uInt16 nLine = 0; nLine < aLineList.Count(); nLine++ )
     {
         if ( aLineList[nLine]->IsIn( nIndex ) )
             return nLine;
@@ -277,14 +277,14 @@ USHORT ParaPortion::GetLineNumber( USHORT nIndex )
     return (aLineList.Count()-1);
 }
 
-void ParaPortion::SetVisible( BOOL bMakeVisible )
+void ParaPortion::SetVisible( sal_Bool bMakeVisible )
 {
     bVisible = bMakeVisible;
 }
 
-void ParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine )
+void ParaPortion::CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine )
 {
-    USHORT nLines = aLineList.Count();
+    sal_uInt16 nLines = aLineList.Count();
     DBG_ASSERT( nLines, "CorrectPortionNumbersFromLine: Leere Portion?" );
     if ( nLastFormattedLine < ( nLines - 1 ) )
     {
@@ -302,18 +302,18 @@ void ParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLin
         int nTDiff = -( nTextDiff-1 );
         if ( nPDiff || nTDiff )
         {
-            for ( USHORT nL = nLastFormattedLine+1; nL < nLines; nL++ )
+            for ( sal_uInt16 nL = nLastFormattedLine+1; nL < nLines; nL++ )
             {
                 EditLine* pLine = aLineList[ nL ];
 
-                pLine->GetStartPortion() = sal::static_int_cast< USHORT >(
+                pLine->GetStartPortion() = sal::static_int_cast< sal_uInt16 >(
                     pLine->GetStartPortion() + nPDiff);
-                pLine->GetEndPortion() = sal::static_int_cast< USHORT >(
+                pLine->GetEndPortion() = sal::static_int_cast< sal_uInt16 >(
                     pLine->GetEndPortion() + nPDiff);
 
-                pLine->GetStart() = sal::static_int_cast< USHORT >(
+                pLine->GetStart() = sal::static_int_cast< sal_uInt16 >(
                     pLine->GetStart() + nTDiff);
-                pLine->GetEnd() = sal::static_int_cast< USHORT >(
+                pLine->GetEnd() = sal::static_int_cast< sal_uInt16 >(
                     pLine->GetEnd() + nTDiff);
 
                 pLine->SetValid();
@@ -325,21 +325,21 @@ void ParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLin
 
 // Shared reverse lookup acceleration pieces ...
 
-static USHORT FastGetPos( const VoidPtr *pPtrArray, USHORT nPtrArrayLen,
-                          VoidPtr pPtr, USHORT &rLastPos )
+static sal_uInt16 FastGetPos( const VoidPtr *pPtrArray, sal_uInt16 nPtrArrayLen,
+                          VoidPtr pPtr, sal_uInt16 &rLastPos )
 {
   // Through certain filter code-paths we do a lot of appends, which in
   // turn call GetPos - creating some N^2 nightmares. If we have a
   // non-trivially large list, do a few checks from the end first.
   if( rLastPos > 16 )
     {
-      USHORT nEnd;
+      sal_uInt16 nEnd;
       if (rLastPos > nPtrArrayLen - 2)
         nEnd = nPtrArrayLen;
       else
         nEnd = rLastPos + 2;
 
-      for( USHORT nIdx = rLastPos - 2; nIdx < nEnd; nIdx++ )
+      for( sal_uInt16 nIdx = rLastPos - 2; nIdx < nEnd; nIdx++ )
         {
           if( pPtrArray[ nIdx ] == pPtr )
             {
@@ -349,7 +349,7 @@ static USHORT FastGetPos( const VoidPtr *pPtrArray, USHORT nPtrArrayLen,
         }
     }
   // The world's lamest linear search from svarray ...
-  for( USHORT nIdx = 0; nIdx < nPtrArrayLen; nIdx++ )
+  for( sal_uInt16 nIdx = 0; nIdx < nPtrArrayLen; nIdx++ )
     if (pPtrArray[ nIdx ] == pPtr )
       return rLastPos = nIdx;
   return USHRT_MAX;
@@ -367,14 +367,14 @@ ParaPortionList::~ParaPortionList()
     Reset();
 }
 
-USHORT ParaPortionList::GetPos( const ParaPortionPtr &rPtr ) const
+sal_uInt16 ParaPortionList::GetPos( const ParaPortionPtr &rPtr ) const
 {
     return FastGetPos( reinterpret_cast<const VoidPtr *>( GetData() ),
                        Count(), static_cast<VoidPtr>( rPtr ),
                        ((ParaPortionList *)this)->nLastCache );
 }
 
-USHORT ContentList::GetPos( const ContentNodePtr &rPtr ) const
+sal_uInt16 ContentList::GetPos( const ContentNodePtr &rPtr ) const
 {
     return FastGetPos( reinterpret_cast<const VoidPtr *>( GetData() ),
                        Count(), static_cast<VoidPtr>( rPtr ),
@@ -383,7 +383,7 @@ USHORT ContentList::GetPos( const ContentNodePtr &rPtr ) const
 
 void ParaPortionList::Reset()
 {
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
         delete GetObject( nPortion );
     Remove( 0, Count() );
 }
@@ -391,7 +391,7 @@ void ParaPortionList::Reset()
 long ParaPortionList::GetYOffset( ParaPortion* pPPortion )
 {
     long nHeight = 0;
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
     {
         ParaPortion* pTmpPortion = GetObject(nPortion);
         if ( pTmpPortion == pPPortion )
@@ -402,10 +402,10 @@ long ParaPortionList::GetYOffset( ParaPortion* pPPortion )
     return nHeight;
 }
 
-USHORT ParaPortionList::FindParagraph( long nYOffset )
+sal_uInt16 ParaPortionList::FindParagraph( long nYOffset )
 {
     long nY = 0;
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
     {
         nY += GetObject(nPortion)->GetHeight(); // sollte auch bei !bVisible richtig sein!
         if ( nY > nYOffset )
@@ -422,7 +422,7 @@ void ParaPortionList::DbgCheck( EditDoc&
 {
 #ifdef DBG_UTIL
     DBG_ASSERT( Count() == rDoc.Count(), "ParaPortionList::DbgCheck() - Count() ungleich!" );
-    for ( USHORT i = 0; i < Count(); i++ )
+    for ( sal_uInt16 i = 0; i < Count(); i++ )
     {
         DBG_ASSERT( SaveGetObject(i), "ParaPortionList::DbgCheck() - Null-Pointer in Liste!" );
         DBG_ASSERT( GetObject(i)->GetNode(), "ParaPortionList::DbgCheck() - Null-Pointer in Liste(2)!" );
@@ -458,8 +458,8 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
         {
             DBG_ASSERT( rPoolItem.IsA( TYPE( SvxULSpaceItem ) ), "ConvertItem: Ungueltiges Item!" );
             SvxULSpaceItem& rItem = (SvxULSpaceItem&)rPoolItem;
-            rItem.SetUpper( sal::static_int_cast< USHORT >( OutputDevice::LogicToLogic( rItem.GetUpper(), eSourceUnit, eDestUnit ) ) );
-            rItem.SetLower( sal::static_int_cast< USHORT >( OutputDevice::LogicToLogic( rItem.GetLower(), eSourceUnit, eDestUnit ) ) );
+            rItem.SetUpper( sal::static_int_cast< sal_uInt16 >( OutputDevice::LogicToLogic( rItem.GetUpper(), eSourceUnit, eDestUnit ) ) );
+            rItem.SetLower( sal::static_int_cast< sal_uInt16 >( OutputDevice::LogicToLogic( rItem.GetLower(), eSourceUnit, eDestUnit ) ) );
         }
         break;
         case EE_PARA_SBL:
@@ -468,7 +468,7 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
             SvxLineSpacingItem& rItem = (SvxLineSpacingItem&)rPoolItem;
             // #96298# SetLineHeight changes also eLineSpace!
             if ( rItem.GetLineSpaceRule() == SVX_LINE_SPACE_MIN )
-                rItem.SetLineHeight( sal::static_int_cast< USHORT >( OutputDevice::LogicToLogic( rItem.GetLineHeight(), eSourceUnit, eDestUnit ) ) );
+                rItem.SetLineHeight( sal::static_int_cast< sal_uInt16 >( OutputDevice::LogicToLogic( rItem.GetLineHeight(), eSourceUnit, eDestUnit ) ) );
         }
         break;
         case EE_PARA_TABS:
@@ -476,7 +476,7 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
             DBG_ASSERT( rPoolItem.IsA( TYPE( SvxTabStopItem ) ), "ConvertItem: Ungueltiges Item!" );
             SvxTabStopItem& rItem = (SvxTabStopItem&)rPoolItem;
             SvxTabStopItem aNewItem( EE_PARA_TABS );
-            for ( USHORT i = 0; i < rItem.Count(); i++ )
+            for ( sal_uInt16 i = 0; i < rItem.Count(); i++ )
             {
                 const SvxTabStop& rTab = rItem[i];
                 SvxTabStop aNewStop( OutputDevice::LogicToLogic( rTab.GetTabPos(), eSourceUnit, eDestUnit ), rTab.GetAdjustment(), rTab.GetDecimal(), rTab.GetFill() );
@@ -502,20 +502,20 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map
     const SfxItemPool* pSourcePool = rSource.GetPool();
     const SfxItemPool* pDestPool = rDest.GetPool();
 
-    for ( USHORT nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
+    for ( sal_uInt16 nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
     {
         // Wenn moeglich ueber SlotID gehen...
 
-        USHORT nSourceWhich = nWhich;
-        USHORT nSlot = pDestPool->GetTrueSlotId( nWhich );
+        sal_uInt16 nSourceWhich = nWhich;
+        sal_uInt16 nSlot = pDestPool->GetTrueSlotId( nWhich );
         if ( nSlot )
         {
-            USHORT nW = pSourcePool->GetTrueWhich( nSlot );
+            sal_uInt16 nW = pSourcePool->GetTrueWhich( nSlot );
             if ( nW )
                 nSourceWhich = nW;
         }
 
-        if ( rSource.GetItemState( nSourceWhich, FALSE ) == SFX_ITEM_ON )
+        if ( rSource.GetItemState( nSourceWhich, sal_False ) == SFX_ITEM_ON )
         {
             MapUnit eSourceUnit = pSourceUnit ? *pSourceUnit : (MapUnit)pSourcePool->GetMetric( nSourceWhich );
             MapUnit eDestUnit = pDestUnit ? *pDestUnit : (MapUnit)pDestPool->GetMetric( nWhich );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 74527ec2b86f..812625b69771 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -35,7 +35,7 @@
 
 #define USE_SVXFONT
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uInt16S
 #include <svl/svstdarr.hxx>
 #include <svl/ctloptions.hxx>
 #include <svtools/ctrltool.hxx>
@@ -167,7 +167,7 @@ void EditEngine::UndoActionEnd( sal_uInt16 nId )
         pImpEditEngine->UndoActionEnd( nId );
 }
 
-BOOL EditEngine::HasTriedMergeOnLastAddUndo() const
+sal_Bool EditEngine::HasTriedMergeOnLastAddUndo() const
 {
     return pImpEditEngine->mbLastTryMerge;
 }
@@ -214,25 +214,25 @@ Color EditEngine::GetAutoColor() const
     return pImpEditEngine->GetAutoColor();
 }
 
-void EditEngine::EnableAutoColor( BOOL b )
+void EditEngine::EnableAutoColor( sal_Bool b )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->EnableAutoColor( b );
 }
 
-BOOL EditEngine::IsAutoColorEnabled() const
+sal_Bool EditEngine::IsAutoColorEnabled() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsAutoColorEnabled();
 }
 
-void EditEngine::ForceAutoColor( BOOL b )
+void EditEngine::ForceAutoColor( sal_Bool b )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->ForceAutoColor( b );
 }
 
-BOOL EditEngine::IsForceAutoColor() const
+sal_Bool EditEngine::IsForceAutoColor() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsForceAutoColor();
@@ -333,7 +333,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
              ( rOutRect.GetHeight() >= (long)GetTextHeight() ) &&
              ( rOutRect.GetWidth() >= (long)CalcTextWidth() ) )
         {
-            bClip = FALSE;
+            bClip = sal_False;
         }
         else
         {
@@ -513,25 +513,25 @@ const Size& EditEngine::GetPaperSize() const
     return pImpEditEngine->GetPaperSize();
 }
 
-void EditEngine::SetVertical( BOOL bVertical )
+void EditEngine::SetVertical( sal_Bool bVertical )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetVertical( bVertical );
 }
 
-BOOL EditEngine::IsVertical() const
+sal_Bool EditEngine::IsVertical() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsVertical();
 }
 
-void EditEngine::SetFixedCellHeight( BOOL bUseFixedCellHeight )
+void EditEngine::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
 }
 
-BOOL EditEngine::IsFixedCellHeight() const
+sal_Bool EditEngine::IsFixedCellHeight() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsFixedCellHeight();
@@ -549,14 +549,14 @@ EEHorizontalTextDirection EditEngine::GetDefaultHorizontalTextDirection() const
     return pImpEditEngine->GetDefaultHorizontalTextDirection();
 }
 
-USHORT EditEngine::GetScriptType( const ESelection& rSelection ) const
+sal_uInt16 EditEngine::GetScriptType( const ESelection& rSelection ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->CreateSel( rSelection ) );
     return pImpEditEngine->GetScriptType( aSel );
 }
 
-LanguageType EditEngine::GetLanguage( USHORT nPara, USHORT nPos ) const
+LanguageType EditEngine::GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara );
@@ -571,37 +571,37 @@ void EditEngine::TransliterateText( const ESelection& rSelection, sal_Int32 nTra
     pImpEditEngine->TransliterateText( pImpEditEngine->CreateSel( rSelection ), nTransliterationMode );
 }
 
-void EditEngine::SetAsianCompressionMode( USHORT n )
+void EditEngine::SetAsianCompressionMode( sal_uInt16 n )
 {
     DBG_CHKTHIS( EditView, 0 );
     pImpEditEngine->SetAsianCompressionMode( n );
 }
 
-USHORT EditEngine::GetAsianCompressionMode() const
+sal_uInt16 EditEngine::GetAsianCompressionMode() const
 {
     DBG_CHKTHIS( EditView, 0 );
     return pImpEditEngine->GetAsianCompressionMode();
 }
 
-void EditEngine::SetKernAsianPunctuation( BOOL b )
+void EditEngine::SetKernAsianPunctuation( sal_Bool b )
 {
     DBG_CHKTHIS( EditView, 0 );
     pImpEditEngine->SetKernAsianPunctuation( b );
 }
 
-BOOL EditEngine::IsKernAsianPunctuation() const
+sal_Bool EditEngine::IsKernAsianPunctuation() const
 {
     DBG_CHKTHIS( EditView, 0 );
     return pImpEditEngine->IsKernAsianPunctuation();
 }
 
-void EditEngine::SetAddExtLeading( BOOL b )
+void EditEngine::SetAddExtLeading( sal_Bool b )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetAddExtLeading( b );
 }
 
-BOOL EditEngine::IsAddExtLeading() const
+sal_Bool EditEngine::IsAddExtLeading() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsAddExtLeading();
@@ -710,7 +710,7 @@ sal_uInt16 EditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) con
     return pImpEditEngine->GetLineLen( nParagraph, nLine );
 }
 
-void EditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const
+void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->IsFormatted() )
@@ -718,7 +718,7 @@ void EditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd,
     return pImpEditEngine->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
 }
 
-USHORT EditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->IsFormatted() )
@@ -763,7 +763,7 @@ XubString EditEngine::GetWord( sal_uInt16 nPara, sal_uInt16 nIndex )
     return pImpEditEngine->GetSelected( aSel );
 }
 
-ESelection EditEngine::GetWord( const ESelection& rSelection, USHORT nWordType  ) const
+ESelection EditEngine::GetWord( const ESelection& rSelection, sal_uInt16 nWordType  ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -773,7 +773,7 @@ ESelection EditEngine::GetWord( const ESelection& rSelection, USHORT nWordType
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
-ESelection EditEngine::WordLeft( const ESelection& rSelection, USHORT nWordType  ) const
+ESelection EditEngine::WordLeft( const ESelection& rSelection, sal_uInt16 nWordType  ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -783,7 +783,7 @@ ESelection EditEngine::WordLeft( const ESelection& rSelection, USHORT nWordType
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
-ESelection EditEngine::WordRight( const ESelection& rSelection, USHORT nWordType  ) const
+ESelection EditEngine::WordRight( const ESelection& rSelection, sal_uInt16 nWordType  ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -793,7 +793,7 @@ ESelection EditEngine::WordRight( const ESelection& rSelection, USHORT nWordType
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
-ESelection EditEngine::CursorLeft( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const
+ESelection EditEngine::CursorLeft( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -803,7 +803,7 @@ ESelection EditEngine::CursorLeft( const ESelection& rSelection, USHORT nCharact
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
-ESelection EditEngine::CursorRight( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const
+ESelection EditEngine::CursorRight( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -834,8 +834,8 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
     sal_Bool bAllowIdle = sal_True;
     sal_Bool bReadOnly  = pEditView->IsReadOnly();
 
-    USHORT nNewCursorFlags = 0;
-    BOOL bSetCursorFlags = TRUE;
+    sal_uInt16 nNewCursorFlags = 0;
+    sal_Bool bSetCursorFlags = sal_True;
 
     EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
     DBG_ASSERT( !aCurSel.IsInvalid(), "Blinde Selection in EditEngine::PostKeyEvent" );
@@ -888,11 +888,11 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
             {
                 if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
                 {
-                    USHORT nParas = GetParagraphCount();
+                    sal_uInt16 nParas = GetParagraphCount();
                     Point aPos;
                     Point aViewStart( pEditView->GetOutputArea().TopLeft() );
                     long n20 = 40 * pImpEditEngine->nOnePixelInRef;
-                    for ( USHORT n = 0; n < nParas; n++ )
+                    for ( sal_uInt16 n = 0; n < nParas; n++ )
                     {
                         long nH = GetTextHeight( n );
                         Point P1( aViewStart.X() + n20 + n20*(n%2), aViewStart.Y() + aPos.Y() );
@@ -905,7 +905,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                         aPos.Y() += nH;
                     }
                 }
-                bDone = FALSE;
+                bDone = sal_False;
             }
             break;
             case KEY_F11:
@@ -917,7 +917,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                     aInfo += bDebugPaint ? "On" : "Off";
                     InfoBox( NULL, String( aInfo, RTL_TEXTENCODING_ASCII_US ) ).Execute();
                 }
-                bDone = FALSE;
+                bDone = sal_False;
             }
             break;
             case KEY_F12:
@@ -937,7 +937,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                         aLog << endl;
                     #endif
                 }
-                bDone = FALSE;
+                bDone = sal_False;
             }
             break;
            #endif
@@ -969,13 +969,13 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                 if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) )
                 {
                     if ( pImpEditEngine->DoVisualCursorTraveling( aCurSel.Max().GetNode() ) && ( ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) /* || ( nCode == KEY_HOME ) || ( nCode == KEY_END ) */ ) )
-                        bSetCursorFlags = FALSE;    // Will be manipulated within visual cursor move
+                        bSetCursorFlags = sal_False;    // Will be manipulated within visual cursor move
 
                     aCurSel = pImpEditEngine->MoveCursor( rKeyEvent, pEditView );
 
                     if ( aCurSel.HasRange() ) {
                         Reference<com::sun::star::datatransfer::clipboard::XClipboard> aSelection(pEditView->GetWindow()->GetPrimarySelection());
-                        pEditView->pImpEditView->CutCopy( aSelection, FALSE );
+                        pEditView->pImpEditView->CutCopy( aSelection, sal_False );
                     }
 
                     bMoved = sal_True;
@@ -1009,7 +1009,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                         // now on and that will be all. Otherwise continue as usual.
                         // ...
 
-                        USHORT nPara = pImpEditEngine->GetEditDoc().GetPos( pNode );
+                        sal_uInt16 nPara = pImpEditEngine->GetEditDoc().GetPos( pNode );
                         SfxBoolItem aBulletState( (const SfxBoolItem&) pImpEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE ) );
                         bool bBulletIsVisible = aBulletState.GetValue() ? true : false;
 
@@ -1029,7 +1029,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                             break;
                     }
 
-                    BYTE nDel = 0, nMode = 0;
+                    sal_uInt8 nDel = 0, nMode = 0;
                     switch( nCode )
                     {
                     case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
@@ -1297,7 +1297,7 @@ sal_uInt32 EditEngine::GetTextHeight() const
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
 
-    sal_uInt32 nHeight = !IsVertical() ? pImpEditEngine->GetTextHeight() : pImpEditEngine->CalcTextWidth( TRUE );
+    sal_uInt32 nHeight = !IsVertical() ? pImpEditEngine->GetTextHeight() : pImpEditEngine->CalcTextWidth( sal_True );
     return nHeight;
 }
 
@@ -1308,7 +1308,7 @@ sal_uInt32 EditEngine::CalcTextWidth()
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
 
-    sal_uInt32 nWidth = !IsVertical() ? pImpEditEngine->CalcTextWidth( TRUE ) : pImpEditEngine->GetTextHeight();
+    sal_uInt32 nWidth = !IsVertical() ? pImpEditEngine->CalcTextWidth( sal_True ) : pImpEditEngine->GetTextHeight();
      return nWidth;
 }
 
@@ -1340,7 +1340,7 @@ void EditEngine::SetText( const XubString& rText )
         pImpEditEngine->FormatAndUpdate();
 }
 
-ULONG EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
+sal_uLong EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
@@ -1352,7 +1352,7 @@ ULONG EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFormat e
     return rInput.GetError();
 }
 
-ULONG EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
+sal_uLong EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     EditPaM aStartPaM( pImpEditEngine->GetEditDoc().GetStartPaM() );
@@ -1662,7 +1662,7 @@ void EditEngine::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) con
     pImpEditEngine->GetCharAttribs( nPara, rLst );
 }
 
-SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib )
+SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->
@@ -1670,7 +1670,7 @@ SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib
     return pImpEditEngine->GetAttribs( aSel, bOnlyHardAttrib );
 }
 
-SfxItemSet EditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags ) const
+SfxItemSet EditEngine::GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetAttribs( nPara, nStart, nEnd, nFlags );
@@ -1888,7 +1888,7 @@ Point EditEngine::GetDocPosTopLeft( sal_uInt16 nParagraph )
     return aPoint;
 }
 
-const SvxNumberFormat* EditEngine::GetNumberFormat( USHORT nPara ) const
+const SvxNumberFormat* EditEngine::GetNumberFormat( sal_uInt16 nPara ) const
 {
     // derived objects may overload this function to give access to
     // bullet information (see Outliner)
@@ -1896,7 +1896,7 @@ const SvxNumberFormat* EditEngine::GetNumberFormat( USHORT nPara ) const
     return 0;
 }
 
-BOOL EditEngine::IsRightToLeft( USHORT nPara ) const
+sal_Bool EditEngine::IsRightToLeft( sal_uInt16 nPara ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsRightToLeft( nPara );
@@ -2153,7 +2153,7 @@ void EditEngine::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable>
 vos::ORef<SvxForbiddenCharactersTable> EditEngine::GetForbiddenCharsTable() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
-    return pImpEditEngine->GetForbiddenCharsTable( FALSE );
+    return pImpEditEngine->GetForbiddenCharsTable( sal_False );
 }
 
 
@@ -2286,9 +2286,9 @@ sal_Bool EditEngine::ShouldCreateBigTextObject() const
     return ( nTextPortions >= pImpEditEngine->GetBigTextObjectStart() ) ? sal_True : sal_False;
 }
 
-USHORT EditEngine::GetFieldCount( USHORT nPara ) const
+sal_uInt16 EditEngine::GetFieldCount( sal_uInt16 nPara ) const
 {
-    USHORT nFields = 0;
+    sal_uInt16 nFields = 0;
     ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara );
     if ( pNode )
     {
@@ -2304,12 +2304,12 @@ USHORT EditEngine::GetFieldCount( USHORT nPara ) const
     return nFields;
 }
 
-EFieldInfo EditEngine::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo EditEngine::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
 {
     ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara );
     if ( pNode )
     {
-        USHORT nCurrentField = 0;
+        sal_uInt16 nCurrentField = 0;
         const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
         for ( sal_uInt16 nAttr = 0; nAttr < rAttrs.Count(); nAttr++ )
         {
@@ -2396,7 +2396,7 @@ void EditEngine::CompleteOnlineSpelling()
     }
 }
 
-USHORT EditEngine::FindParagraph( long nDocPosY )
+sal_uInt16 EditEngine::FindParagraph( long nDocPosY )
 {
     return pImpEditEngine->GetParaPortions().FindParagraph( nDocPosY );
 }
@@ -2405,7 +2405,7 @@ EPosition EditEngine::FindDocPosition( const Point& rDocPos ) const
 {
     EPosition aPos;
     // From the point of the API, this is const....
-    EditPaM aPaM = ((EditEngine*)this)->pImpEditEngine->GetPaM( rDocPos, FALSE );
+    EditPaM aPaM = ((EditEngine*)this)->pImpEditEngine->GetPaM( rDocPos, sal_False );
     if ( aPaM.GetNode() )
     {
         aPos.nPara = pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
@@ -2448,7 +2448,7 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_uInt16 nPara )
         DBG_ASSERT( pParaPortion && pLine, "GetParagraphInfos - Paragraph out of range" );
         if ( pParaPortion && pLine )
         {
-            aInfos.nParaHeight = (USHORT)pParaPortion->GetHeight();
+            aInfos.nParaHeight = (sal_uInt16)pParaPortion->GetHeight();
             aInfos.nLines = pParaPortion->GetLines().Count();
             aInfos.nFirstLineStartX = pLine->GetStartPosX();
             aInfos.nFirstLineOffset = pParaPortion->GetFirstLineOffset();
@@ -2471,8 +2471,8 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_uInt16 nPara )
 // =====================================================================
 // ======================   Virtuelle Methoden   =======================
 // =====================================================================
-void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, USHORT, USHORT,
-    const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, BYTE,
+void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, sal_uInt16, sal_uInt16,
+    const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, sal_uInt8,
     const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool,
     const ::com::sun::star::lang::Locale*, const Color&, const Color&)
 
@@ -2510,7 +2510,7 @@ void __EXPORT EditEngine::ParagraphDeleted( sal_uInt16 nPara )
         pImpEditEngine->CallNotify( aNotify );
     }
 }
-void EditEngine::ParagraphConnected( USHORT /*nLeftParagraph*/, USHORT /*nRightParagraph*/ )
+void EditEngine::ParagraphConnected( sal_uInt16 /*nLeftParagraph*/, sal_uInt16 /*nRightParagraph*/ )
 {
     DBG_CHKTHIS( EditEngine, 0 );
 }
@@ -2680,7 +2680,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const SvxFont& rFont )
     rSet.Put( SvxCharReliefItem( rFont.GetRelief(), EE_CHAR_RELIEF ) );
 }
 
-Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, USHORT nScriptType )
+Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType )
 {
     SvxFont aFont;
     CreateFont( aFont, rItemSet, true, nScriptType );
@@ -2865,9 +2865,9 @@ void EditEngine::ImportBulletItem( SvxNumBulletItem& /*rNumBullet*/, sal_uInt16
 */
 }
 
-BOOL EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable )
+sal_Bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable )
 {
-    BOOL bValidData = FALSE;
+    sal_Bool bValidData = sal_False;
 
     if ( rTransferable.is() )
     {
@@ -2902,12 +2902,12 @@ Link EditEngine::GetEndDropHdl() const
     return pImpEditEngine->GetEndDropHdl();
 }
 
-void EditEngine::SetFirstWordCapitalization( BOOL bCapitalize )
+void EditEngine::SetFirstWordCapitalization( sal_Bool bCapitalize )
 {
     pImpEditEngine->SetFirstWordCapitalization( bCapitalize );
 }
 
-BOOL EditEngine::IsFirstWordCapitalization() const
+sal_Bool EditEngine::IsFirstWordCapitalization() const
 {
     return pImpEditEngine->IsFirstWordCapitalization();
 }
@@ -2922,7 +2922,7 @@ EFieldInfo::EFieldInfo()
 }
 
 
-EFieldInfo::EFieldInfo( const SvxFieldItem& rFieldItem, USHORT nPara, USHORT nPos ) : aPosition( nPara, nPos )
+EFieldInfo::EFieldInfo( const SvxFieldItem& rFieldItem, sal_uInt16 nPara, sal_uInt16 nPos ) : aPosition( nPara, nPos )
 {
     pFieldItem = new SvxFieldItem( rFieldItem );
 }
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 7cd009cc52be..cda87dea9f7d 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -58,7 +58,7 @@ DBG_NAME( XEditAttribute )
 
 //--------------------------------------------------------------
 
-BOOL lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, USHORT nLevel, SvxBulletItem& rBullet )
+sal_Bool lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, SvxBulletItem& rBullet )
 {
     const SvxNumberFormat* pFmt = rNumBullet.GetNumRule()->Get( nLevel );
     if ( pFmt )
@@ -135,11 +135,11 @@ BOOL lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, USHORT nLevel, Sv
                 DBG_ERROR( "Unknown or invalid NumAdjust" );
         }
     }
-    return pFmt ? TRUE : FALSE;
+    return pFmt ? sal_True : sal_False;
 }
 
 
-XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd )
+XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     // das neue Attribut im Pool anlegen
     const SfxPoolItem& rNew = rPool.Put( rItem );
@@ -157,7 +157,7 @@ XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr )
     nEnd = 0;
 }
 
-XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, USHORT nS, USHORT nE )
+XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
 {
     DBG_CTOR( XEditAttribute, 0 );
     pItem = &rAttr;
@@ -171,9 +171,9 @@ XEditAttribute::~XEditAttribute()
     pItem = 0;  // Gehoert dem Pool.
 }
 
-XEditAttribute* XEditAttributeList::FindAttrib( USHORT _nWhich, USHORT nChar ) const
+XEditAttribute* XEditAttributeList::FindAttrib( sal_uInt16 _nWhich, sal_uInt16 nChar ) const
 {
-    for ( USHORT n = Count(); n; )
+    for ( sal_uInt16 n = Count(); n; )
     {
         XEditAttribute* pAttr = GetObject( --n );
         if( ( pAttr->GetItem()->Which() == _nWhich ) && ( pAttr->GetStart() <= nChar ) && ( pAttr->GetEnd() > nChar ) )
@@ -208,7 +208,7 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse
     eFamily = rCopyFrom.GetFamily();
 
     // Attribute kopieren...
-    for ( USHORT n = 0; n < rCopyFrom.GetAttribs().Count(); n++  )
+    for ( sal_uInt16 n = 0; n < rCopyFrom.GetAttribs().Count(); n++  )
     {
         XEditAttribute* pAttr = rCopyFrom.GetAttribs().GetObject( n );
         XEditAttribute* pMyAttr = MakeXEditAttribute( rPoolToUse, *pAttr->GetItem(), pAttr->GetStart(), pAttr->GetEnd() );
@@ -225,7 +225,7 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse
 
 ContentInfo::~ContentInfo()
 {
-    for ( USHORT nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
+    for ( sal_uInt16 nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
     {
         XEditAttribute* pAttr = aAttribs.GetObject(nAttr);
         // Item aus Pool entfernen!
@@ -272,10 +272,10 @@ bool ContentInfo::operator==( const ContentInfo& rCompare ) const
             (eFamily == rCompare.eFamily ) &&
             (aParaAttribs == rCompare.aParaAttribs ) )
     {
-        const USHORT nCount = aAttribs.Count();
+        const sal_uInt16 nCount = aAttribs.Count();
         if( nCount == rCompare.aAttribs.Count() )
         {
-            USHORT n;
+            sal_uInt16 n;
             for( n = 0; n < nCount; n++ )
             {
                 if( !(*aAttribs.GetObject(n) == *rCompare.aAttribs.GetObject(n)) )
@@ -289,7 +289,7 @@ bool ContentInfo::operator==( const ContentInfo& rCompare ) const
     return false;
 }
 
-EditTextObject::EditTextObject( USHORT n)
+EditTextObject::EditTextObject( sal_uInt16 n)
 {
     DBG_CTOR( EE_EditTextObject, 0 );
     nWhich = n;
@@ -306,38 +306,38 @@ __EXPORT EditTextObject::~EditTextObject()
     DBG_DTOR( EE_EditTextObject, 0 );
 }
 
-USHORT EditTextObject::GetParagraphCount() const
+sal_uInt16 EditTextObject::GetParagraphCount() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     return 0;
 }
 
-XubString EditTextObject::GetText( USHORT /* nParagraph */ ) const
+XubString EditTextObject::GetText( sal_uInt16 /* nParagraph */ ) const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     return XubString();
 }
 
-void EditTextObject::Insert( const EditTextObject& /* rObj */, USHORT /* nPara */)
+void EditTextObject::Insert( const EditTextObject& /* rObj */, sal_uInt16 /* nPara */)
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-EditTextObject* EditTextObject::CreateTextObject( USHORT /*nPara*/, USHORT /*nParas*/ ) const
+EditTextObject* EditTextObject::CreateTextObject( sal_uInt16 /*nPara*/, sal_uInt16 /*nParas*/ ) const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     return 0;
 }
 
-void EditTextObject::RemoveParagraph( USHORT /*nPara*/ )
+void EditTextObject::RemoveParagraph( sal_uInt16 /*nPara*/ )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-BOOL EditTextObject::HasPortionInfo() const
+sal_Bool EditTextObject::HasPortionInfo() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
 void EditTextObject::ClearPortionInfo()
@@ -345,32 +345,32 @@ void EditTextObject::ClearPortionInfo()
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-BOOL EditTextObject::HasOnlineSpellErrors() const
+sal_Bool EditTextObject::HasOnlineSpellErrors() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditTextObject::HasCharAttribs( USHORT ) const
+sal_Bool EditTextObject::HasCharAttribs( sal_uInt16 ) const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-void EditTextObject::GetCharAttribs( USHORT /*nPara*/, EECharAttribArray& /*rLst*/ ) const
+void EditTextObject::GetCharAttribs( sal_uInt16 /*nPara*/, EECharAttribArray& /*rLst*/ ) const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-void EditTextObject::MergeParaAttribs( const SfxItemSet& /*rAttribs*/, USHORT /*nStart*/, USHORT /*nEnd*/ )
+void EditTextObject::MergeParaAttribs( const SfxItemSet& /*rAttribs*/, sal_uInt16 /*nStart*/, sal_uInt16 /*nEnd*/ )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-BOOL EditTextObject::IsFieldObject() const
+sal_Bool EditTextObject::IsFieldObject() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
 const SvxFieldItem* EditTextObject::GetField() const
@@ -379,56 +379,56 @@ const SvxFieldItem* EditTextObject::GetField() const
     return 0;
 }
 
-BOOL EditTextObject::HasField( TypeId /*aType*/ ) const
+sal_Bool EditTextObject::HasField( TypeId /*aType*/ ) const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-SfxItemSet EditTextObject::GetParaAttribs( USHORT /*nPara*/ ) const
+SfxItemSet EditTextObject::GetParaAttribs( sal_uInt16 /*nPara*/ ) const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     return SfxItemSet( *(SfxItemPool*)NULL );
 }
 
-void EditTextObject::SetParaAttribs( USHORT /*nPara*/, const SfxItemSet& /*rAttribs*/ )
+void EditTextObject::SetParaAttribs( sal_uInt16 /*nPara*/, const SfxItemSet& /*rAttribs*/ )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-BOOL EditTextObject::RemoveCharAttribs( USHORT /*nWhich*/ )
+sal_Bool EditTextObject::RemoveCharAttribs( sal_uInt16 /*nWhich*/ )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditTextObject::RemoveParaAttribs( USHORT /*nWhich*/ )
+sal_Bool EditTextObject::RemoveParaAttribs( sal_uInt16 /*nWhich*/ )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditTextObject::HasStyleSheet( const XubString& /*rName*/, SfxStyleFamily /*eFamily*/ ) const
+sal_Bool EditTextObject::HasStyleSheet( const XubString& /*rName*/, SfxStyleFamily /*eFamily*/ ) const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-void EditTextObject::GetStyleSheet( USHORT /*nPara*/, XubString& /*rName*/, SfxStyleFamily& /*eFamily*/ ) const
+void EditTextObject::GetStyleSheet( sal_uInt16 /*nPara*/, XubString& /*rName*/, SfxStyleFamily& /*eFamily*/ ) const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-void EditTextObject::SetStyleSheet( USHORT /*nPara*/, const XubString& /*rName*/, const SfxStyleFamily& /*eFamily*/ )
+void EditTextObject::SetStyleSheet( sal_uInt16 /*nPara*/, const XubString& /*rName*/, const SfxStyleFamily& /*eFamily*/ )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-BOOL __EXPORT EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
+sal_Bool __EXPORT EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
                                             const XubString&, SfxStyleFamily )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
 void __EXPORT EditTextObject::ChangeStyleSheetName( SfxStyleFamily /*eFamily*/,
@@ -437,56 +437,56 @@ void __EXPORT EditTextObject::ChangeStyleSheetName( SfxStyleFamily /*eFamily*/,
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-USHORT EditTextObject::GetUserType() const
+sal_uInt16 EditTextObject::GetUserType() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     return 0;
 }
 
-void EditTextObject::SetUserType( USHORT )
+void EditTextObject::SetUserType( sal_uInt16 )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-ULONG EditTextObject::GetObjectSettings() const
+sal_uLong EditTextObject::GetObjectSettings() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     return 0;
 }
 
-void EditTextObject::SetObjectSettings( ULONG )
+void EditTextObject::SetObjectSettings( sal_uLong )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 }
 
-BOOL EditTextObject::IsVertical() const
+sal_Bool EditTextObject::IsVertical() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-void EditTextObject::SetVertical( BOOL bVertical )
+void EditTextObject::SetVertical( sal_Bool bVertical )
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     ((BinTextObject*)this)->SetVertical( bVertical );
 }
 
-USHORT EditTextObject::GetScriptType() const
+sal_uInt16 EditTextObject::GetScriptType() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     return ((const BinTextObject*)this)->GetScriptType();
 }
 
 
-BOOL EditTextObject::Store( SvStream& rOStream ) const
+sal_Bool EditTextObject::Store( SvStream& rOStream ) const
 {
     if ( rOStream.GetError() )
-        return FALSE;
+        return sal_False;
 
     // Vorspann:
     sal_Size nStartPos = rOStream.Tell();
 
-    rOStream << (USHORT)Which();
+    rOStream << (sal_uInt16)Which();
 
     sal_uInt32 nStructSz = 0;
     rOStream << nStructSz;
@@ -501,15 +501,15 @@ BOOL EditTextObject::Store( SvStream& rOStream ) const
     rOStream << nStructSz;
     rOStream.Seek( nEndPos );
 
-    return rOStream.GetError() ? FALSE : TRUE;
+    return rOStream.GetError() ? sal_False : sal_True;
 }
 
 EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool )
 {
-    ULONG nStartPos = rIStream.Tell();
+    sal_uLong nStartPos = rIStream.Tell();
 
     // Ertmal sehen, was fuer ein Object...
-    USHORT nWhich;
+    sal_uInt16 nWhich;
     rIStream >> nWhich;
 
     sal_uInt32 nStructSz;
@@ -546,7 +546,7 @@ void EditTextObject::Skip( SvStream& rIStream )
 {
     sal_Size nStartPos = rIStream.Tell();
 
-    USHORT _nWhich;
+    sal_uInt16 _nWhich;
     rIStream >> _nWhich;
 
     sal_uInt32 nStructSz;
@@ -566,7 +566,7 @@ void __EXPORT EditTextObject::CreateData( SvStream& )
     DBG_ERROR( "CreateData: Basisklasse!" );
 }
 
-USHORT EditTextObject::GetVersion() const
+sal_uInt16 EditTextObject::GetVersion() const
 {
     DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
     return 0;
@@ -612,7 +612,7 @@ void BinTextObject::ObjectInDestruction(const SfxItemPool& rSfxItemPool)
 
         // set local variables
         pPool = pNewPool;
-        bOwnerOfPool = TRUE;
+        bOwnerOfPool = sal_True;
     }
 }
 
@@ -653,12 +653,12 @@ BinTextObject::BinTextObject( SfxItemPool* pP ) :
 
     if ( pPool )
     {
-        bOwnerOfPool = FALSE;
+        bOwnerOfPool = sal_False;
     }
     else
     {
         pPool = EditEngine::CreatePool();
-        bOwnerOfPool =  TRUE;
+        bOwnerOfPool =  sal_True;
     }
 
     if(!bOwnerOfPool && pPool)
@@ -667,8 +667,8 @@ BinTextObject::BinTextObject( SfxItemPool* pP ) :
         pPool->AddSfxItemPoolUser(*this);
     }
 
-    bVertical = FALSE;
-    bStoreUnicodeStrings = FALSE;
+    bVertical = sal_False;
+    bStoreUnicodeStrings = sal_False;
     nScriptType = 0;
 }
 
@@ -683,7 +683,7 @@ BinTextObject::BinTextObject( const BinTextObject& r ) :
     bVertical = r.bVertical;
     nScriptType = r.nScriptType;
     pPortionInfo = NULL;    // PortionInfo nicht kopieren
-    bStoreUnicodeStrings = FALSE;
+    bStoreUnicodeStrings = sal_False;
 
     if ( !r.bOwnerOfPool )
     {
@@ -691,12 +691,12 @@ BinTextObject::BinTextObject( const BinTextObject& r ) :
         // since there is no other way to construct a BinTextObject
         // than it's regular constructor where that is ensured
         pPool = r.pPool;
-        bOwnerOfPool = FALSE;
+        bOwnerOfPool = sal_False;
     }
     else
     {
         pPool = EditEngine::CreatePool();
-        bOwnerOfPool =  TRUE;
+        bOwnerOfPool =  sal_True;
 
     }
 
@@ -709,7 +709,7 @@ BinTextObject::BinTextObject( const BinTextObject& r ) :
     if ( bOwnerOfPool && pPool && r.pPool )
         pPool->SetDefaultMetric( r.pPool->GetMetric( DEF_METRIC ) );
 
-    for ( USHORT n = 0; n < r.aContents.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < r.aContents.Count(); n++ )
     {
         ContentInfo* pOrg = r.aContents.GetObject( n );
         DBG_ASSERT( pOrg, "NULL-Pointer in ContentList!" );
@@ -731,37 +731,37 @@ __EXPORT BinTextObject::~BinTextObject()
     {
         // Nicht mehr, wegen 1xDefItems.
         // siehe auch ~EditDoc().
-//      pPool->ReleaseDefaults( TRUE /* bDelete */ );
+//      pPool->ReleaseDefaults( sal_True /* bDelete */ );
         SfxItemPool::Free(pPool);
     }
 }
 
-USHORT BinTextObject::GetUserType() const
+sal_uInt16 BinTextObject::GetUserType() const
 {
     return nUserType;
 }
 
-void BinTextObject::SetUserType( USHORT n )
+void BinTextObject::SetUserType( sal_uInt16 n )
 {
     nUserType = n;
 }
 
-ULONG BinTextObject::GetObjectSettings() const
+sal_uLong BinTextObject::GetObjectSettings() const
 {
     return nObjSettings;
 }
 
-void BinTextObject::SetObjectSettings( ULONG n )
+void BinTextObject::SetObjectSettings( sal_uLong n )
 {
     nObjSettings = n;
 }
 
-BOOL BinTextObject::IsVertical() const
+sal_Bool BinTextObject::IsVertical() const
 {
     return bVertical;
 }
 
-void BinTextObject::SetVertical( BOOL b )
+void BinTextObject::SetVertical( sal_Bool b )
 {
     if ( b != bVertical )
     {
@@ -770,12 +770,12 @@ void BinTextObject::SetVertical( BOOL b )
     }
 }
 
-USHORT BinTextObject::GetScriptType() const
+sal_uInt16 BinTextObject::GetScriptType() const
 {
     return nScriptType;
 }
 
-void BinTextObject::SetScriptType( USHORT nType )
+void BinTextObject::SetScriptType( sal_uInt16 nType )
 {
     nScriptType = nType;
 }
@@ -783,7 +783,7 @@ void BinTextObject::SetScriptType( USHORT nType )
 
 void BinTextObject::DeleteContents()
 {
-    for ( USHORT n = 0; n < aContents.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < aContents.Count(); n++ )
     {
         ContentInfo* p = aContents.GetObject( n );
         DBG_ASSERT( p, "NULL-Pointer in ContentList!" );
@@ -797,7 +797,7 @@ EditTextObject* __EXPORT BinTextObject::Clone() const
     return new BinTextObject( *this );
 }
 
-XEditAttribute* BinTextObject::CreateAttrib( const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd )
+XEditAttribute* BinTextObject::CreateAttrib( const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     return MakeXEditAttribute( *pPool, rItem, nStart, nEnd );
 }
@@ -815,12 +815,12 @@ ContentInfo* BinTextObject::CreateAndInsertContent()
     return pC;
 }
 
-USHORT BinTextObject::GetParagraphCount() const
+sal_uInt16 BinTextObject::GetParagraphCount() const
 {
     return aContents.Count();
 }
 
-XubString BinTextObject::GetText( USHORT nPara ) const
+XubString BinTextObject::GetText( sal_uInt16 nPara ) const
 {
     DBG_ASSERT( nPara < aContents.Count(), "BinTextObject::GetText: Absatz existiert nicht!" );
     if ( nPara < aContents.Count() )
@@ -831,7 +831,7 @@ XubString BinTextObject::GetText( USHORT nPara ) const
     return XubString();
 }
 
-void BinTextObject::Insert( const EditTextObject& rObj, USHORT nDestPara )
+void BinTextObject::Insert( const EditTextObject& rObj, sal_uInt16 nDestPara )
 {
     DBG_ASSERT( rObj.Which() == EE_FORMAT_BIN, "UTO: Unbekanntes Textobjekt" );
 
@@ -840,8 +840,8 @@ void BinTextObject::Insert( const EditTextObject& rObj, USHORT nDestPara )
     if ( nDestPara > aContents.Count() )
         nDestPara = aContents.Count();
 
-    const USHORT nParas = rBinObj.GetContents().Count();
-    for ( USHORT nP = 0; nP < nParas; nP++ )
+    const sal_uInt16 nParas = rBinObj.GetContents().Count();
+    for ( sal_uInt16 nP = 0; nP < nParas; nP++ )
     {
         ContentInfo* pC = rBinObj.GetContents()[ nP ];
         ContentInfo* pNew = new ContentInfo( *pC, *GetPool() );
@@ -850,7 +850,7 @@ void BinTextObject::Insert( const EditTextObject& rObj, USHORT nDestPara )
     ClearPortionInfo();
 }
 
-EditTextObject* BinTextObject::CreateTextObject( USHORT nPara, USHORT nParas ) const
+EditTextObject* BinTextObject::CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas ) const
 {
     if ( ( nPara >= aContents.Count() ) || !nParas )
         return NULL;
@@ -864,8 +864,8 @@ EditTextObject* BinTextObject::CreateTextObject( USHORT nPara, USHORT nParas ) c
     // If text contains different ScriptTypes, this shouldn't be a problem...
     pObj->nScriptType = nScriptType;
 
-    const USHORT nEndPara = nPara+nParas-1;
-    for ( USHORT nP = nPara; nP <= nEndPara; nP++ )
+    const sal_uInt16 nEndPara = nPara+nParas-1;
+    for ( sal_uInt16 nP = nPara; nP <= nEndPara; nP++ )
     {
         ContentInfo* pC = aContents[ nP ];
         ContentInfo* pNew = new ContentInfo( *pC, *pObj->GetPool() );
@@ -874,7 +874,7 @@ EditTextObject* BinTextObject::CreateTextObject( USHORT nPara, USHORT nParas ) c
     return pObj;
 }
 
-void BinTextObject::RemoveParagraph( USHORT nPara )
+void BinTextObject::RemoveParagraph( sal_uInt16 nPara )
 {
     DBG_ASSERT( nPara < aContents.Count(), "BinTextObject::GetText: Absatz existiert nicht!" );
     if ( nPara < aContents.Count() )
@@ -886,63 +886,63 @@ void BinTextObject::RemoveParagraph( USHORT nPara )
     }
 }
 
-BOOL BinTextObject::HasPortionInfo() const
+sal_Bool BinTextObject::HasPortionInfo() const
 {
-    return pPortionInfo ? TRUE : FALSE;
+    return pPortionInfo ? sal_True : sal_False;
 }
 
 void BinTextObject::ClearPortionInfo()
 {
     if ( pPortionInfo )
     {
-        for ( USHORT n = pPortionInfo->Count(); n; )
+        for ( sal_uInt16 n = pPortionInfo->Count(); n; )
             delete pPortionInfo->GetObject( --n );
         delete pPortionInfo;
         pPortionInfo = NULL;
     }
 }
 
-BOOL BinTextObject::HasOnlineSpellErrors() const
+sal_Bool BinTextObject::HasOnlineSpellErrors() const
 {
 #ifndef SVX_LIGHT
-    for ( USHORT n = 0; n < aContents.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < aContents.Count(); n++ )
     {
         ContentInfo* p = aContents.GetObject( n );
         if ( p->GetWrongList() && p->GetWrongList()->Count() )
-            return TRUE;
+            return sal_True;
     }
 #endif // !SVX_LIGHT
-    return FALSE;
+    return sal_False;
 
 }
 
-BOOL BinTextObject::HasCharAttribs( USHORT _nWhich ) const
+sal_Bool BinTextObject::HasCharAttribs( sal_uInt16 _nWhich ) const
 {
-    for ( USHORT nPara = GetContents().Count(); nPara; )
+    for ( sal_uInt16 nPara = GetContents().Count(); nPara; )
     {
         ContentInfo* pC = GetContents().GetObject( --nPara );
 
-        USHORT nAttribs = pC->GetAttribs().Count();
+        sal_uInt16 nAttribs = pC->GetAttribs().Count();
         if ( nAttribs && !_nWhich )
-            return TRUE;
+            return sal_True;
 
-        for ( USHORT nAttr = nAttribs; nAttr; )
+        for ( sal_uInt16 nAttr = nAttribs; nAttr; )
         {
             XEditAttribute* pX = pC->GetAttribs().GetObject( --nAttr );
             if ( pX->GetItem()->Which() == _nWhich )
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-void BinTextObject::GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const
+void BinTextObject::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const
 {
     rLst.Remove( 0, rLst.Count() );
     ContentInfo* pC = GetContents().GetObject( nPara );
     if ( pC )
     {
-        for ( USHORT nAttr = 0; nAttr < pC->GetAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pC->GetAttribs().Count(); nAttr++ )
         {
             XEditAttribute* pAttr = pC->GetAttribs().GetObject( nAttr );
             EECharAttrib aEEAttr;
@@ -955,21 +955,21 @@ void BinTextObject::GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) cons
     }
 }
 
-void BinTextObject::MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart, USHORT nEnd )
+void BinTextObject::MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
-    for ( USHORT nPara = GetContents().Count(); nPara; )
+    for ( sal_uInt16 nPara = GetContents().Count(); nPara; )
     {
         ContentInfo* pC = GetContents().GetObject( --nPara );
 
-        for ( USHORT nW = nStart; nW <= nEnd; nW++ )
+        for ( sal_uInt16 nW = nStart; nW <= nEnd; nW++ )
         {
-            if ( ( pC->GetParaAttribs().GetItemState( nW, FALSE ) != SFX_ITEM_ON )
-                    && ( rAttribs.GetItemState( nW, FALSE ) == SFX_ITEM_ON ) )
+            if ( ( pC->GetParaAttribs().GetItemState( nW, sal_False ) != SFX_ITEM_ON )
+                    && ( rAttribs.GetItemState( nW, sal_False ) == SFX_ITEM_ON ) )
             {
                 pC->GetParaAttribs().Put( rAttribs.Get( nW ) );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
         }
     }
@@ -978,9 +978,9 @@ void BinTextObject::MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart,
         ClearPortionInfo();
 }
 
-BOOL BinTextObject::IsFieldObject() const
+sal_Bool BinTextObject::IsFieldObject() const
 {
-    return BinTextObject::GetField() ? TRUE : FALSE;
+    return BinTextObject::GetField() ? sal_True : sal_False;
 }
 
 const SvxFieldItem* BinTextObject::GetField() const
@@ -990,8 +990,8 @@ const SvxFieldItem* BinTextObject::GetField() const
         ContentInfo* pC = GetContents()[0];
         if ( pC->GetText().Len() == 1 )
         {
-            USHORT nAttribs = pC->GetAttribs().Count();
-            for ( USHORT nAttr = nAttribs; nAttr; )
+            sal_uInt16 nAttribs = pC->GetAttribs().Count();
+            for ( sal_uInt16 nAttr = nAttribs; nAttr; )
             {
                 XEditAttribute* pX = pC->GetAttribs().GetObject( --nAttr );
                 if ( pX->GetItem()->Which() == EE_FEATURE_FIELD )
@@ -1002,59 +1002,59 @@ const SvxFieldItem* BinTextObject::GetField() const
     return 0;
 }
 
-BOOL BinTextObject::HasField( TypeId aType ) const
+sal_Bool BinTextObject::HasField( TypeId aType ) const
 {
-    USHORT nParagraphs = GetContents().Count();
-    for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+    sal_uInt16 nParagraphs = GetContents().Count();
+    for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = GetContents().GetObject( nPara );
-        USHORT nAttrs = pC->GetAttribs().Count();
-        for ( USHORT nAttr = 0; nAttr < nAttrs; nAttr++ )
+        sal_uInt16 nAttrs = pC->GetAttribs().Count();
+        for ( sal_uInt16 nAttr = 0; nAttr < nAttrs; nAttr++ )
         {
             XEditAttribute* pAttr = pC->GetAttribs()[nAttr];
             if ( pAttr->GetItem()->Which() == EE_FEATURE_FIELD )
             {
                 if ( !aType )
-                    return TRUE;
+                    return sal_True;
 
                 const SvxFieldData* pFldData = ((const SvxFieldItem*)pAttr->GetItem())->GetField();
                 if ( pFldData && pFldData->IsA( aType ) )
-                    return TRUE;
+                    return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-SfxItemSet BinTextObject::GetParaAttribs( USHORT nPara ) const
+SfxItemSet BinTextObject::GetParaAttribs( sal_uInt16 nPara ) const
 {
     ContentInfo* pC = GetContents().GetObject( nPara );
     return pC->GetParaAttribs();
 }
 
-void BinTextObject::SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs )
+void BinTextObject::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rAttribs )
 {
     ContentInfo* pC = GetContents().GetObject( nPara );
     pC->GetParaAttribs().Set( rAttribs );
     ClearPortionInfo();
 }
 
-BOOL BinTextObject::RemoveCharAttribs( USHORT _nWhich )
+sal_Bool BinTextObject::RemoveCharAttribs( sal_uInt16 _nWhich )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
-    for ( USHORT nPara = GetContents().Count(); nPara; )
+    for ( sal_uInt16 nPara = GetContents().Count(); nPara; )
     {
         ContentInfo* pC = GetContents().GetObject( --nPara );
 
-        for ( USHORT nAttr = pC->GetAttribs().Count(); nAttr; )
+        for ( sal_uInt16 nAttr = pC->GetAttribs().Count(); nAttr; )
         {
             XEditAttribute* pAttr = pC->GetAttribs().GetObject( --nAttr );
             if ( !_nWhich || ( pAttr->GetItem()->Which() == _nWhich ) )
             {
                 pC->GetAttribs().Remove( nAttr );
                 DestroyAttrib( pAttr );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
         }
     }
@@ -1065,18 +1065,18 @@ BOOL BinTextObject::RemoveCharAttribs( USHORT _nWhich )
     return bChanged;
 }
 
-BOOL BinTextObject::RemoveParaAttribs( USHORT _nWhich )
+sal_Bool BinTextObject::RemoveParaAttribs( sal_uInt16 _nWhich )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
-    for ( USHORT nPara = GetContents().Count(); nPara; )
+    for ( sal_uInt16 nPara = GetContents().Count(); nPara; )
     {
         ContentInfo* pC = GetContents().GetObject( --nPara );
 
         if ( !_nWhich )
         {
             if( pC->GetParaAttribs().Count() )
-                bChanged = TRUE;
+                bChanged = sal_True;
             pC->GetParaAttribs().ClearItem();
         }
         else
@@ -1084,7 +1084,7 @@ BOOL BinTextObject::RemoveParaAttribs( USHORT _nWhich )
             if ( pC->GetParaAttribs().GetItemState( _nWhich ) == SFX_ITEM_ON )
             {
                 pC->GetParaAttribs().ClearItem( _nWhich );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
         }
     }
@@ -1095,19 +1095,19 @@ BOOL BinTextObject::RemoveParaAttribs( USHORT _nWhich )
     return bChanged;
 }
 
-BOOL BinTextObject::HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const
+sal_Bool BinTextObject::HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const
 {
-    USHORT nParagraphs = GetContents().Count();
-    for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+    sal_uInt16 nParagraphs = GetContents().Count();
+    for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = GetContents().GetObject( nPara );
         if ( ( pC->GetFamily() == eFamily ) && ( pC->GetStyle() == rName ) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-void BinTextObject::GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& rFamily ) const
+void BinTextObject::GetStyleSheet( sal_uInt16 nPara, XubString& rName, SfxStyleFamily& rFamily ) const
 {
     if ( nPara < aContents.Count() )
     {
@@ -1117,7 +1117,7 @@ void BinTextObject::GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamil
     }
 }
 
-void BinTextObject::SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& rFamily )
+void BinTextObject::SetStyleSheet( sal_uInt16 nPara, const XubString& rName, const SfxStyleFamily& rFamily )
 {
     if ( nPara < aContents.Count() )
     {
@@ -1127,14 +1127,14 @@ void BinTextObject::SetStyleSheet( USHORT nPara, const XubString& rName, const S
     }
 }
 
-BOOL BinTextObject::ImpChangeStyleSheets(
+sal_Bool BinTextObject::ImpChangeStyleSheets(
                     const XubString& rOldName, SfxStyleFamily eOldFamily,
                     const XubString& rNewName, SfxStyleFamily eNewFamily )
 {
-    const USHORT nParagraphs = GetContents().Count();
-    BOOL bChanges = FALSE;
+    const sal_uInt16 nParagraphs = GetContents().Count();
+    sal_Bool bChanges = sal_False;
 
-    for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+    for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = GetContents().GetObject( nPara );
         if ( pC->GetFamily() == eOldFamily )
@@ -1143,18 +1143,18 @@ BOOL BinTextObject::ImpChangeStyleSheets(
             {
                 pC->GetStyle() = rNewName;
                 pC->GetFamily() = eNewFamily;
-                bChanges = TRUE;
+                bChanges = sal_True;
             }
         }
     }
     return bChanges;
 }
 
-BOOL __EXPORT BinTextObject::ChangeStyleSheets(
+sal_Bool __EXPORT BinTextObject::ChangeStyleSheets(
                     const XubString& rOldName, SfxStyleFamily eOldFamily,
                     const XubString& rNewName, SfxStyleFamily eNewFamily )
 {
-    BOOL bChanges = ImpChangeStyleSheets( rOldName, eOldFamily, rNewName, eNewFamily );
+    sal_Bool bChanges = ImpChangeStyleSheets( rOldName, eOldFamily, rNewName, eNewFamily );
     if ( bChanges )
         ClearPortionInfo();
 
@@ -1169,7 +1169,7 @@ void __EXPORT BinTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
 
 void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
 {
-    USHORT nVer = 602;
+    sal_uInt16 nVer = 602;
     rOStream << nVer;
 
     rOStream << bOwnerOfPool;
@@ -1183,17 +1183,17 @@ void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
 
     // Aktuelle Zeichensatz speichern...
     // #90477# GetSOStoreTextEncoding: Bug in 5.2, when default char set is multi byte text encoding
-    rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( gsl_getSystemTextEncoding(), (USHORT) rOStream.GetVersion() );
-    rOStream << (USHORT) eEncoding;
+    rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( gsl_getSystemTextEncoding(), (sal_uInt16) rOStream.GetVersion() );
+    rOStream << (sal_uInt16) eEncoding;
 
     // Die Anzahl der Absaetze...
-    USHORT nParagraphs = GetContents().Count();
+    sal_uInt16 nParagraphs = GetContents().Count();
     rOStream << nParagraphs;
 
     char cFeatureConverted = ByteString( CH_FEATURE, eEncoding ).GetChar(0);
 
     // Die einzelnen Absaetze...
-    for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+    for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = GetContents().GetObject( nPara );
 
@@ -1201,17 +1201,17 @@ void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
         ByteString aText( pC->GetText(), eEncoding );
 
         // Symbols?
-        BOOL bSymbolPara = FALSE;
+        sal_Bool bSymbolPara = sal_False;
         if ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) == SFX_ITEM_ON )
         {
             const SvxFontItem& rFontItem = (const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO );
             if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
             {
                 aText = ByteString( pC->GetText(), RTL_TEXTENCODING_SYMBOL );
-                bSymbolPara = TRUE;
+                bSymbolPara = sal_True;
             }
         }
-        for ( USHORT nA = 0; nA < pC->GetAttribs().Count(); nA++ )
+        for ( sal_uInt16 nA = 0; nA < pC->GetAttribs().Count(); nA++ )
         {
             XEditAttribute* pAttr = pC->GetAttribs().GetObject( nA );
 
@@ -1234,7 +1234,7 @@ void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
                 {
                     // Don't create a new Attrib with StarBats font, MBR changed the
                     // SvxFontItem::Store() to store StarBats instead of StarSymbol!
-                    for ( USHORT nChar = pAttr->GetStart(); nChar < pAttr->GetEnd(); nChar++ )
+                    for ( sal_uInt16 nChar = pAttr->GetStart(); nChar < pAttr->GetEnd(); nChar++ )
                     {
                         sal_Unicode cOld = pC->GetText().GetChar( nChar );
                         char cConv = ByteString::ConvertFromUnicode( ConvertFontToSubsFontChar( hConv, cOld ), RTL_TEXTENCODING_SYMBOL );
@@ -1264,7 +1264,7 @@ void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
 */
         if ( hConv )
         {
-            for ( USHORT nChar = 0; nChar < pC->GetText().Len(); nChar++ )
+            for ( sal_uInt16 nChar = 0; nChar < pC->GetText().Len(); nChar++ )
             {
                 if ( !pC->GetAttribs().FindAttrib( EE_CHAR_FONTINFO, nChar ) )
                 {
@@ -1286,19 +1286,19 @@ void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
 
         // StyleName und Family...
         rOStream.WriteByteString( ByteString( pC->GetStyle(), eEncoding ) );
-        rOStream << (USHORT)pC->GetFamily();
+        rOStream << (sal_uInt16)pC->GetFamily();
 
         // Absatzattribute...
         pC->GetParaAttribs().Store( rOStream );
 
         // Die Anzahl der Attribute...
-        USHORT nAttribs = pC->GetAttribs().Count();
+        sal_uInt16 nAttribs = pC->GetAttribs().Count();
         rOStream << nAttribs;
 
         // Und die einzelnen Attribute
         // Items als Surregate => immer 8 Byte pro Attrib
         // Which = 2; Surregat = 2; Start = 2; End = 2;
-        for ( USHORT nAttr = 0; nAttr < nAttribs; nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < nAttribs; nAttr++ )
         {
             XEditAttribute* pX = pC->GetAttribs().GetObject( nAttr );
 
@@ -1325,16 +1325,16 @@ void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
     rOStream << bStoreUnicodeStrings;
     if ( bStoreUnicodeStrings )
     {
-        for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+        for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
         {
             ContentInfo* pC = GetContents().GetObject( nPara );
-            USHORT nL = pC->GetText().Len();
+            sal_uInt16 nL = pC->GetText().Len();
             rOStream << nL;
             rOStream.Write( pC->GetText().GetBuffer(), nL*sizeof(sal_Unicode) );
 
             // #91575# StyleSheetName must be Unicode too!
             // Copy/Paste from EA3 to BETA or from BETA to EA3 not possible, not needed...
-            // If needed, change nL back to ULONG and increase version...
+            // If needed, change nL back to sal_uLong and increase version...
             nL = pC->GetStyle().Len();
             rOStream << nL;
             rOStream.Write( pC->GetStyle().GetBuffer(), nL*sizeof(sal_Unicode) );
@@ -1348,7 +1348,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
 
     // Das Textobject wurde erstmal mit der aktuellen Einstellung
     // von pTextObjectPool erzeugt.
-    BOOL bOwnerOfCurrent = bOwnerOfPool;
+    sal_Bool bOwnerOfCurrent = bOwnerOfPool;
     rIStream >> bOwnerOfPool;
 
     if ( bOwnerOfCurrent && !bOwnerOfPool )
@@ -1369,17 +1369,17 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
         GetPool()->Load( rIStream );
 
     // CharSet, in dem gespeichert wurde:
-    USHORT nCharSet;
+    sal_uInt16 nCharSet;
     rIStream >> nCharSet;
 
-    rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet, (USHORT)rIStream.GetVersion() );
+    rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet, (sal_uInt16)rIStream.GetVersion() );
 
     // Die Anzahl der Absaetze...
-    USHORT nParagraphs;
+    sal_uInt16 nParagraphs;
     rIStream >> nParagraphs;
 
     // Die einzelnen Absaetze...
-    for ( ULONG nPara = 0; nPara < nParagraphs; nPara++ )
+    for ( sal_uLong nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = CreateAndInsertContent();
 
@@ -1390,7 +1390,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
 
         // StyleName und Family...
         rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding );
-        USHORT nStyleFamily;
+        sal_uInt16 nStyleFamily;
         rIStream >> nStyleFamily;
         pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
 
@@ -1398,16 +1398,16 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
         pC->GetParaAttribs().Load( rIStream );
 
         // Die Anzahl der Attribute...
-        USHORT nAttribs;
+        sal_uInt16 nAttribs;
         rIStream >> nAttribs;
 
         // Und die einzelnen Attribute
         // Items als Surregate => immer 8 Byte pro Attrib
         // Which = 2; Surregat = 2; Start = 2; End = 2;
-        USHORT nAttr;
+        sal_uInt16 nAttr;
         for ( nAttr = 0; nAttr < nAttribs; nAttr++ )
         {
-            USHORT _nWhich, nStart, nEnd;
+            sal_uInt16 _nWhich, nStart, nEnd;
             const SfxPoolItem* pItem;
 
             rIStream >> _nWhich;
@@ -1429,8 +1429,8 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
                     if ( ( _nWhich >= EE_FEATURE_START ) && ( _nWhich <= EE_FEATURE_END ) )
                     {
                         // Convert CH_FEATURE to CH_FEATURE_OLD
-                        DBG_ASSERT( (BYTE) aByteString.GetChar( nStart ) == CH_FEATURE_OLD, "CreateData: CH_FEATURE expected!" );
-                        if ( (BYTE) aByteString.GetChar( nStart ) == CH_FEATURE_OLD )
+                        DBG_ASSERT( (sal_uInt8) aByteString.GetChar( nStart ) == CH_FEATURE_OLD, "CreateData: CH_FEATURE expected!" );
+                        if ( (sal_uInt8) aByteString.GetChar( nStart ) == CH_FEATURE_OLD )
                             pC->GetText().SetChar( nStart, CH_FEATURE );
                     }
                 }
@@ -1440,14 +1440,14 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
         // But check for paragraph and character symbol attribs here,
         // FinishLoad will not be called in OpenOffice Calc, no StyleSheets...
 
-        BOOL bSymbolPara = FALSE;
+        sal_Bool bSymbolPara = sal_False;
         if ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) == SFX_ITEM_ON )
         {
             const SvxFontItem& rFontItem = (const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO );
             if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
             {
                 pC->GetText() = String( aByteString, RTL_TEXTENCODING_SYMBOL );
-                bSymbolPara = TRUE;
+                bSymbolPara = sal_True;
             }
         }
 
@@ -1479,7 +1479,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
                     pC->GetAttribs().Insert( pNewAttr, nAttr );
                     DestroyAttrib( pAttr );
 
-                    for ( USHORT nChar = pNewAttr->GetStart(); nChar < pNewAttr->GetEnd(); nChar++ )
+                    for ( sal_uInt16 nChar = pNewAttr->GetStart(); nChar < pNewAttr->GetEnd(); nChar++ )
                     {
                         sal_Unicode cOld = pC->GetText().GetChar( nChar );
                         DBG_ASSERT( cOld >= 0xF000, "cOld not converted?!" );
@@ -1506,7 +1506,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
                 aNewFontItem.GetFamilyName() = GetFontToSubsFontName( hConv );
                 pC->GetParaAttribs().Put( aNewFontItem );
 
-                for ( USHORT nChar = 0; nChar < pC->GetText().Len(); nChar++ )
+                for ( sal_uInt16 nChar = 0; nChar < pC->GetText().Len(); nChar++ )
                 {
                     if ( !pC->GetAttribs().FindAttrib( EE_CHAR_FONTINFO, nChar ) )
                     {
@@ -1526,7 +1526,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
     // Ab 400 auch die DefMetric:
     if ( nVersion >= 400 )
     {
-        USHORT nTmpMetric;
+        sal_uInt16 nTmpMetric;
         rIStream >> nTmpMetric;
         if ( nVersion >= 401 )
         {
@@ -1553,14 +1553,14 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
     {
         rIStream >> nScriptType;
 
-        BOOL bUnicodeStrings;
+        sal_Bool bUnicodeStrings;
         rIStream >> bUnicodeStrings;
         if ( bUnicodeStrings )
         {
-            for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+            for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
             {
                 ContentInfo* pC = GetContents().GetObject( nPara );
-                USHORT nL;
+                sal_uInt16 nL;
 
                 // Text
                 rIStream >> nL;
@@ -1568,7 +1568,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
                 {
                     pC->GetText().AllocBuffer( nL );
                     rIStream.Read( pC->GetText().GetBufferAccess(), nL*sizeof(sal_Unicode) );
-                    pC->GetText().ReleaseBufferAccess( (USHORT)nL );
+                    pC->GetText().ReleaseBufferAccess( (sal_uInt16)nL );
                 }
 
                 // StyleSheetName
@@ -1577,7 +1577,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
                 {
                     pC->GetStyle().AllocBuffer( nL );
                     rIStream.Read( pC->GetStyle().GetBufferAccess(), nL*sizeof(sal_Unicode) );
-                    pC->GetStyle().ReleaseBufferAccess( (USHORT)nL );
+                    pC->GetStyle().ReleaseBufferAccess( (sal_uInt16)nL );
                 }
             }
         }
@@ -1588,7 +1588,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
     // Wirkt nur wenn auch Tab-Positionen eingestellt wurden, nicht beim DefTab.
     if ( nVersion < 500 )
     {
-        for ( USHORT n = 0; n < aContents.Count(); n++ )
+        for ( sal_uInt16 n = 0; n < aContents.Count(); n++ )
         {
             ContentInfo* pC = aContents.GetObject( n );
             const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&) pC->GetParaAttribs().Get( EE_PARA_LRSPACE );
@@ -1596,7 +1596,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
             {
                 const SvxTabStopItem& rTabs = (const SvxTabStopItem&) pC->GetParaAttribs().Get( EE_PARA_TABS );
                 SvxTabStopItem aNewTabs( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
-                for ( USHORT t = 0; t < rTabs.Count(); t++ )
+                for ( sal_uInt16 t = 0; t < rTabs.Count(); t++ )
                 {
                     const SvxTabStop& rT = rTabs[ t ];
                     aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTxtLeft(),
@@ -1608,7 +1608,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
     }
 }
 
-USHORT BinTextObject::GetVersion() const
+sal_uInt16 BinTextObject::GetVersion() const
 {
     return nVersion;
 }
@@ -1626,7 +1626,7 @@ bool BinTextObject::operator==( const BinTextObject& rCompare ) const
             ( bVertical != rCompare.bVertical ) )
         return false;
 
-    USHORT n;
+    sal_uInt16 n;
     for( n = 0; n < aContents.Count(); n++ )
     {
         if( !( *aContents.GetObject( n ) == *rCompare.aContents.GetObject( n ) ) )
@@ -1644,7 +1644,7 @@ bool BinTextObject::isWrongListEqual(const BinTextObject& rCompare) const
         return false;
     }
 
-    for(USHORT a(0); a < GetContents().Count(); a++)
+    for(sal_uInt16 a(0); a < GetContents().Count(); a++)
     {
         const ContentInfo& rCandA(*GetContents().GetObject(a));
         const ContentInfo& rCandB(*rCompare.GetContents().GetObject(a));
@@ -1673,7 +1673,7 @@ void __EXPORT BinTextObject::CreateData300( SvStream& rIStream )
     rIStream >> nParagraphs;
 
     // Die einzelnen Absaetze...
-    for ( ULONG nPara = 0; nPara < nParagraphs; nPara++ )
+    for ( sal_uLong nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = CreateAndInsertContent();
 
@@ -1682,7 +1682,7 @@ void __EXPORT BinTextObject::CreateData300( SvStream& rIStream )
 
         // StyleName und Family...
         rIStream.ReadByteString( pC->GetStyle() );
-        USHORT nStyleFamily;
+        sal_uInt16 nStyleFamily;
         rIStream >> nStyleFamily;
         pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
 
@@ -1696,9 +1696,9 @@ void __EXPORT BinTextObject::CreateData300( SvStream& rIStream )
         // Und die einzelnen Attribute
         // Items als Surregate => immer 8 Byte pro Attrib
         // Which = 2; Surregat = 2; Start = 2; End = 2;
-        for ( ULONG nAttr = 0; nAttr < nAttribs; nAttr++ )
+        for ( sal_uLong nAttr = 0; nAttr < nAttribs; nAttr++ )
         {
-            USHORT _nWhich, nStart, nEnd;
+            sal_uInt16 _nWhich, nStart, nEnd;
             const SfxPoolItem* pItem;
 
             rIStream >> _nWhich;
@@ -1715,11 +1715,11 @@ void __EXPORT BinTextObject::CreateData300( SvStream& rIStream )
     }
 
     // Prueffen, ob ein Zeichensatz gespeichert wurde
-    USHORT nCharSetMarker;
+    sal_uInt16 nCharSetMarker;
     rIStream >> nCharSetMarker;
     if ( nCharSetMarker == CHARSETMARKER )
     {
-        USHORT nCharSet;
+        sal_uInt16 nCharSet;
         rIStream >> nCharSet;
     }
 }
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 6ef3ce359d49..5bf719c44d76 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -43,8 +43,8 @@ class XEditAttribute
 
 private:
     const SfxPoolItem*  pItem;
-    USHORT              nStart;
-    USHORT              nEnd;
+    sal_uInt16              nStart;
+    sal_uInt16              nEnd;
 
                         XEditAttribute();
                         XEditAttribute( const XEditAttribute& rCopyFrom );
@@ -53,19 +53,19 @@ private:
 
 public:
                         XEditAttribute( const SfxPoolItem& rAttr );
-                        XEditAttribute( const SfxPoolItem& rAttr, USHORT nStart, USHORT nEnd );
+                        XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     const SfxPoolItem*  GetItem() const             { return pItem; }
 
-    USHORT&             GetStart()                  { return nStart; }
-    USHORT&             GetEnd()                    { return nEnd; }
+    sal_uInt16&             GetStart()                  { return nStart; }
+    sal_uInt16&             GetEnd()                    { return nEnd; }
 
-    USHORT              GetStart() const            { return nStart; }
-    USHORT              GetEnd() const              { return nEnd; }
+    sal_uInt16              GetStart() const            { return nStart; }
+    sal_uInt16              GetEnd() const              { return nEnd; }
 
-    USHORT              GetLen() const              { return nEnd-nStart; }
+    sal_uInt16              GetLen() const              { return nEnd-nStart; }
 
-    inline BOOL         IsFeature();
+    inline sal_Bool         IsFeature();
 
     inline bool         operator==( const XEditAttribute& rCompare );
 };
@@ -79,9 +79,9 @@ inline bool XEditAttribute::operator==( const XEditAttribute& rCompare )
             (*pItem == *rCompare.pItem));
 }
 
-inline BOOL XEditAttribute::IsFeature()
+inline sal_Bool XEditAttribute::IsFeature()
 {
-    USHORT nWhich = pItem->Which();
+    sal_uInt16 nWhich = pItem->Which();
     return  ( ( nWhich >= EE_FEATURE_START ) &&
               ( nWhich <=  EE_FEATURE_END ) );
 }
@@ -92,13 +92,13 @@ SV_DECL_PTRARR( XEditAttributeListImpl, XEditAttributePtr, 0, 4 )
 class XEditAttributeList : public XEditAttributeListImpl
 {
 public:
-    XEditAttribute* FindAttrib( USHORT nWhich, USHORT nChar ) const;
+    XEditAttribute* FindAttrib( sal_uInt16 nWhich, sal_uInt16 nChar ) const;
 };
 
 struct XParaPortion
 {
     long                nHeight;
-    USHORT              nFirstLineOffset;
+    sal_uInt16              nFirstLineOffset;
 
     EditLineList        aLines;
     TextPortionList     aTextPortions;
@@ -109,22 +109,22 @@ SV_DECL_PTRARR( XBaseParaPortionList, XParaPortionPtr, 0, 4 )
 
 class XParaPortionList : public  XBaseParaPortionList
 {
-    ULONG       nRefDevPtr;
+    sal_uIntPtr         nRefDevPtr;
     OutDevType  eRefDevType;
     MapMode     aRefMapMode;
-    ULONG       nPaperWidth;
+    sal_uLong       nPaperWidth;
 
 
 public:
-            XParaPortionList( OutputDevice* pRefDev, ULONG nPW ) :
+            XParaPortionList( OutputDevice* pRefDev, sal_uLong nPW ) :
                 aRefMapMode( pRefDev->GetMapMode() )
                 {
-                    nRefDevPtr = (ULONG)pRefDev; nPaperWidth = nPW;
+                    nRefDevPtr = (sal_uIntPtr)pRefDev; nPaperWidth = nPW;
                     eRefDevType = pRefDev->GetOutDevType();
                 }
 
-    ULONG           GetRefDevPtr() const        { return nRefDevPtr; }
-    ULONG           GetPaperWidth() const       { return nPaperWidth; }
+    sal_uIntPtr         GetRefDevPtr() const        { return nRefDevPtr; }
+    sal_uLong           GetPaperWidth() const       { return nPaperWidth; }
     OutDevType      GetRefDevType() const       { return eRefDevType; }
     const MapMode&  GetRefMapMode() const       { return aRefMapMode; }
 };
@@ -135,10 +135,10 @@ struct LoadStoreTempInfos
     ByteString              aOrgString_Load;
 
     FontToSubsFontConverter hOldSymbolConv_Store;
-    BOOL                    bSymbolParagraph_Store;
+    sal_Bool                    bSymbolParagraph_Store;
 
 
-    LoadStoreTempInfos() { bSymbolParagraph_Store = FALSE; hOldSymbolConv_Store = NULL; }
+    LoadStoreTempInfos() { bSymbolParagraph_Store = sal_False; hOldSymbolConv_Store = NULL; }
 };
 */
 
@@ -197,23 +197,23 @@ class BinTextObject : public EditTextObject, public SfxItemPoolUser
 private:
     ContentInfoList         aContents;
     SfxItemPool*            pPool;
-    BOOL                    bOwnerOfPool;
+    sal_Bool                    bOwnerOfPool;
     XParaPortionList*       pPortionInfo;
 
     sal_uInt32              nObjSettings;
-    USHORT                  nMetric;
-    USHORT                  nVersion;
-    USHORT                  nUserType;
-    USHORT                  nScriptType;
+    sal_uInt16                  nMetric;
+    sal_uInt16                  nVersion;
+    sal_uInt16                  nUserType;
+    sal_uInt16                  nScriptType;
 
-    BOOL                    bVertical;
-    BOOL                    bStoreUnicodeStrings;
+    sal_Bool                    bVertical;
+    sal_Bool                    bStoreUnicodeStrings;
 
 protected:
     void                    DeleteContents();
     virtual void            StoreData( SvStream& rOStream ) const;
     virtual void            CreateData( SvStream& rIStream );
-    BOOL                    ImpChangeStyleSheets( const String& rOldName, SfxStyleFamily eOldFamily,
+    sal_Bool                    ImpChangeStyleSheets( const String& rOldName, SfxStyleFamily eOldFamily,
                                         const String& rNewName, SfxStyleFamily eNewFamily );
 
 public:
@@ -223,22 +223,22 @@ public:
 
     virtual EditTextObject* Clone() const;
 
-    USHORT                  GetUserType() const;
-    void                    SetUserType( USHORT n );
+    sal_uInt16                  GetUserType() const;
+    void                    SetUserType( sal_uInt16 n );
 
-    ULONG                   GetObjectSettings() const;
-    void                    SetObjectSettings( ULONG n );
+    sal_uLong                   GetObjectSettings() const;
+    void                    SetObjectSettings( sal_uLong n );
 
-    BOOL                    IsVertical() const;
-    void                    SetVertical( BOOL b );
+    sal_Bool                    IsVertical() const;
+    void                    SetVertical( sal_Bool b );
 
-    USHORT                  GetScriptType() const;
-    void                    SetScriptType( USHORT nType );
+    sal_uInt16                  GetScriptType() const;
+    void                    SetScriptType( sal_uInt16 nType );
 
-    USHORT                  GetVersion() const; // Solange der Outliner keine Recordlaenge speichert
+    sal_uInt16                  GetVersion() const; // Solange der Outliner keine Recordlaenge speichert
 
     ContentInfo*            CreateAndInsertContent();
-    XEditAttribute*         CreateAttrib( const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd );
+    XEditAttribute*         CreateAttrib( const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd );
     void                    DestroyAttrib( XEditAttribute* pAttr );
 
     ContentInfoList&        GetContents()           { return aContents; }
@@ -248,47 +248,47 @@ public:
     void                    SetPortionInfo( XParaPortionList* pP )
                                 { pPortionInfo = pP; }
 
-    virtual USHORT          GetParagraphCount() const;
-    virtual String          GetText( USHORT nParagraph ) const;
-    virtual void            Insert( const EditTextObject& rObj, USHORT nPara );
-    virtual EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 ) const;
-    virtual void            RemoveParagraph( USHORT nPara );
+    virtual sal_uInt16          GetParagraphCount() const;
+    virtual String          GetText( sal_uInt16 nParagraph ) const;
+    virtual void            Insert( const EditTextObject& rObj, sal_uInt16 nPara );
+    virtual EditTextObject* CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas = 1 ) const;
+    virtual void            RemoveParagraph( sal_uInt16 nPara );
 
-    virtual BOOL            HasPortionInfo() const;
+    virtual sal_Bool            HasPortionInfo() const;
     virtual void            ClearPortionInfo();
 
-    virtual BOOL            HasOnlineSpellErrors() const;
+    virtual sal_Bool            HasOnlineSpellErrors() const;
 
-    virtual BOOL            HasCharAttribs( USHORT nWhich = 0 ) const;
-    virtual void            GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const;
+    virtual sal_Bool            HasCharAttribs( sal_uInt16 nWhich = 0 ) const;
+    virtual void            GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
 
-    virtual BOOL            RemoveCharAttribs( USHORT nWhich = 0 );
-    virtual BOOL            RemoveParaAttribs( USHORT nWhich = 0 );
+    virtual sal_Bool            RemoveCharAttribs( sal_uInt16 nWhich = 0 );
+    virtual sal_Bool            RemoveParaAttribs( sal_uInt16 nWhich = 0 );
 
-    virtual void            MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart, USHORT nEnd );
+    virtual void            MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual BOOL            IsFieldObject() const;
+    virtual sal_Bool            IsFieldObject() const;
     virtual const SvxFieldItem* GetField() const;
-    virtual BOOL            HasField( TypeId Type = NULL ) const;
+    virtual sal_Bool            HasField( TypeId Type = NULL ) const;
 
-    SfxItemSet              GetParaAttribs( USHORT nPara ) const;
-    void                    SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs );
+    SfxItemSet              GetParaAttribs( sal_uInt16 nPara ) const;
+    void                    SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rAttribs );
 
-    virtual BOOL            HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
-    virtual void            GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
-    virtual void            SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily );
-    virtual BOOL            ChangeStyleSheets(  const XubString& rOldName, SfxStyleFamily eOldFamily,
+    virtual sal_Bool            HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
+    virtual void            GetStyleSheet( sal_uInt16 nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
+    virtual void            SetStyleSheet( sal_uInt16 nPara, const XubString& rName, const SfxStyleFamily& eFamily );
+    virtual sal_Bool            ChangeStyleSheets(  const XubString& rOldName, SfxStyleFamily eOldFamily,
                                                 const String& rNewName, SfxStyleFamily eNewFamily );
     virtual void            ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName );
 
     void                    CreateData300( SvStream& rIStream );
 
-    BOOL                    HasMetric() const           { return nMetric != 0xFFFF; }
-    USHORT                  GetMetric() const           { return nMetric; }
-    void                    SetMetric( USHORT n )       { nMetric = n; }
+    sal_Bool                    HasMetric() const           { return nMetric != 0xFFFF; }
+    sal_uInt16                  GetMetric() const           { return nMetric; }
+    void                    SetMetric( sal_uInt16 n )       { nMetric = n; }
 
-    BOOL                    IsOwnerOfPool() const       { return bOwnerOfPool; }
-    void                    StoreUnicodeStrings( BOOL b ) { bStoreUnicodeStrings = b; }
+    sal_Bool                    IsOwnerOfPool() const       { return bOwnerOfPool; }
+    void                    StoreUnicodeStrings( sal_Bool b ) { bStoreUnicodeStrings = b; }
 
 /* cl removed because not needed anymore since binfilter
     void                    PrepareStore( SfxStyleSheetPool* pStyleSheetPool );
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 3ea9e9b3e290..089e82a4e48f 100644
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -53,20 +53,20 @@ void __EXPORT EditSelFunctionSet::DestroyAnchor()
     // Nur bei Mehrfachselektion
 }
 
-BOOL __EXPORT EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL )
+sal_Bool __EXPORT EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool )
 {
     if ( pCurView )
         return pCurView->pImpEditView->SetCursorAtPoint( rPointPixel );
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL __EXPORT EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
+sal_Bool __EXPORT EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
 {
     if ( pCurView )
         return pCurView->pImpEditView->IsSelectionAtPoint( rPointPixel );
 
-    return FALSE;
+    return sal_False;
 }
 
 void __EXPORT EditSelFunctionSet::DeselectAtPoint( const Point& )
@@ -96,7 +96,7 @@ EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (Window*)0 )
     // Wegen Bug OV: (1994)
     // 1995: RangeSelection lassen, SingleSelection nur fuer ListBoxen geeignet!
     SetSelectionMode( RANGE_SELECTION );
-    EnableDrag( TRUE );
+    EnableDrag( sal_True );
 }
 
 void EditSelectionEngine::SetCurView( EditView* pNewView )
diff --git a/editeng/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx
index e4d5b9d71b05..05f28be24006 100644
--- a/editeng/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
@@ -48,9 +48,9 @@ public:
     virtual void    CreateAnchor();
     virtual void    DestroyAnchor();
 
-    virtual BOOL    SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
+    virtual sal_Bool    SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False );
 
-    virtual BOOL    IsSelectionAtPoint( const Point& rPointPixel );
+    virtual sal_Bool    IsSelectionAtPoint( const Point& rPointPixel );
     virtual void    DeselectAtPoint( const Point& rPointPixel );
     virtual void    DeselectAll();
 
diff --git a/editeng/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx
index 40c53634b5ce..c2a4deac97f4 100644
--- a/editeng/source/editeng/editstt2.hxx
+++ b/editeng/source/editeng/editstt2.hxx
@@ -36,93 +36,93 @@ class InternalEditStatus : public EditStatus
 public:
             InternalEditStatus() { ; }
 
-    void    TurnOnFlags( ULONG nFlags )
+    void    TurnOnFlags( sal_uLong nFlags )
                 { nControlBits |= nFlags; }
 
-    void    TurnOffFlags( ULONG nFlags )
+    void    TurnOffFlags( sal_uLong nFlags )
                 { nControlBits &= ~nFlags; }
 
-    void    TurnOnStatusBits( ULONG nBits )
+    void    TurnOnStatusBits( sal_uLong nBits )
                 { nStatusBits |= nBits; }
 
-    void    TurnOffStatusBits( ULONG nBits )
+    void    TurnOffStatusBits( sal_uLong nBits )
                 { nStatusBits &= ~nBits; }
 
 
-    BOOL    UseCharAttribs() const
+    sal_Bool    UseCharAttribs() const
                 { return ( ( nControlBits & EE_CNTRL_USECHARATTRIBS ) != 0 ); }
 
-    BOOL    NotifyCursorMovements() const
+    sal_Bool    NotifyCursorMovements() const
                 { return ( ( nControlBits & EE_CNTRL_CRSRLEFTPARA ) != 0 ); }
 
-    BOOL    UseIdleFormatter() const
+    sal_Bool    UseIdleFormatter() const
                 { return ( ( nControlBits & EE_CNTRL_DOIDLEFORMAT) != 0 ); }
 
-    BOOL    AllowPasteSpecial() const
+    sal_Bool    AllowPasteSpecial() const
                 { return ( ( nControlBits & EE_CNTRL_PASTESPECIAL ) != 0 ); }
 
-    BOOL    DoAutoIndenting() const
+    sal_Bool    DoAutoIndenting() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOINDENTING ) != 0 ); }
 
-    BOOL    DoUndoAttribs() const
+    sal_Bool    DoUndoAttribs() const
                 { return ( ( nControlBits & EE_CNTRL_UNDOATTRIBS ) != 0 ); }
 
-    BOOL    OneCharPerLine() const
+    sal_Bool    OneCharPerLine() const
                 { return ( ( nControlBits & EE_CNTRL_ONECHARPERLINE ) != 0 ); }
 
-    BOOL    IsOutliner() const
+    sal_Bool    IsOutliner() const
                 { return ( ( nControlBits & EE_CNTRL_OUTLINER ) != 0 ); }
 
-    BOOL    IsOutliner2() const
+    sal_Bool    IsOutliner2() const
                 { return ( ( nControlBits & EE_CNTRL_OUTLINER2 ) != 0 ); }
 
-    BOOL    IsAnyOutliner() const
+    sal_Bool    IsAnyOutliner() const
                 { return IsOutliner() || IsOutliner2(); }
 
-    BOOL    DoNotUseColors() const
+    sal_Bool    DoNotUseColors() const
                 { return ( ( nControlBits & EE_CNTRL_NOCOLORS ) != 0 ); }
 
-    BOOL    AllowBigObjects() const
+    sal_Bool    AllowBigObjects() const
                 { return ( ( nControlBits & EE_CNTRL_ALLOWBIGOBJS ) != 0 ); }
 
-    BOOL    DoOnlineSpelling() const
+    sal_Bool    DoOnlineSpelling() const
                 { return ( ( nControlBits & EE_CNTRL_ONLINESPELLING ) != 0 ); }
 
-    BOOL    DoStretch() const
+    sal_Bool    DoStretch() const
                 { return ( ( nControlBits & EE_CNTRL_STRETCHING ) != 0 ); }
 
-    BOOL    AutoPageSize() const
+    sal_Bool    AutoPageSize() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZE ) != 0 ); }
-    BOOL    AutoPageWidth() const
+    sal_Bool    AutoPageWidth() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZEX ) != 0 ); }
-    BOOL    AutoPageHeight() const
+    sal_Bool    AutoPageHeight() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZEY ) != 0 ); }
 
-    BOOL    MarkFields() const
+    sal_Bool    MarkFields() const
                 { return ( ( nControlBits & EE_CNTRL_MARKFIELDS ) != 0 ); }
 
-    BOOL    DoRestoreFont() const
+    sal_Bool    DoRestoreFont() const
                 { return ( ( nControlBits & EE_CNTRL_RESTOREFONT ) != 0 ); }
 
-    BOOL    DoImportRTFStyleSheets() const
+    sal_Bool    DoImportRTFStyleSheets() const
                 { return ( ( nControlBits & EE_CNTRL_RTFSTYLESHEETS ) != 0 ); }
 
-    BOOL    DoAutoCorrect() const
+    sal_Bool    DoAutoCorrect() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOCORRECT ) != 0 ); }
 
-    BOOL    DoAutoComplete() const
+    sal_Bool    DoAutoComplete() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOCOMPLETE ) != 0 ); }
 
-    BOOL    DoTabIndenting() const
+    sal_Bool    DoTabIndenting() const
                 { return ( ( nControlBits & EE_CNTRL_TABINDENTING ) != 0 ); }
 
-    BOOL    DoFormat100() const
+    sal_Bool    DoFormat100() const
                 { return ( ( nControlBits & EE_CNTRL_FORMAT100 ) != 0 ); }
 
-    BOOL    ULSpaceSummation() const
+    sal_Bool    ULSpaceSummation() const
                 { return ( ( nControlBits & EE_CNTRL_ULSPACESUMMATION ) != 0 ); }
 
-    BOOL    ULSpaceFirstParagraph() const
+    sal_Bool    ULSpaceFirstParagraph() const
                 { return ( ( nControlBits & EE_CNTRL_ULSPACEFIRSTPARA ) != 0 ); }
 };
 
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index f2f28642209c..4b173f39082d 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -57,7 +57,7 @@ TYPEINIT1( EditUndoSetAttribs, EditUndo );
 TYPEINIT1( EditUndoTransliteration, EditUndo );
 TYPEINIT1( EditUndoMarkSelection, EditUndo );
 
-void lcl_DoSetSelection( EditView* pView, USHORT nPara )
+void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
 {
     EPaM aEPaM( nPara, 0 );
     EditPaM aPaM( pView->GetImpEditEngine()->CreateEditPaM( aEPaM ) );
@@ -74,10 +74,10 @@ EditUndoManager::EditUndoManager( ImpEditEngine* p )
     pImpEE = p;
 }
 
-BOOL __EXPORT EditUndoManager::Undo()
+sal_Bool __EXPORT EditUndoManager::Undo()
 {
     if ( GetUndoActionCount() == 0 )
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT( pImpEE->GetActiveView(), "Active View?" );
 
@@ -88,15 +88,15 @@ BOOL __EXPORT EditUndoManager::Undo()
         else
         {
             DBG_ERROR( "Undo in Engine ohne View nicht moeglich!" );
-            return FALSE;
+            return sal_False;
         }
     }
 
     pImpEE->GetActiveView()->GetImpEditView()->DrawSelection(); // alte Selektion entfernen
 
-    pImpEE->SetUndoMode( TRUE );
-    BOOL bDone = SfxUndoManager::Undo();
-    pImpEE->SetUndoMode( FALSE );
+    pImpEE->SetUndoMode( sal_True );
+    sal_Bool bDone = SfxUndoManager::Undo();
+    pImpEE->SetUndoMode( sal_False );
 
     EditSelection aNewSel( pImpEE->GetActiveView()->GetImpEditView()->GetEditSelection() );
     DBG_ASSERT( !aNewSel.IsInvalid(), "Ungueltige Selektion nach Undo()" );
@@ -109,10 +109,10 @@ BOOL __EXPORT EditUndoManager::Undo()
     return bDone;
 }
 
-BOOL __EXPORT EditUndoManager::Redo()
+sal_Bool __EXPORT EditUndoManager::Redo()
 {
     if ( GetRedoActionCount() == 0 )
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT( pImpEE->GetActiveView(), "Active View?" );
 
@@ -123,15 +123,15 @@ BOOL __EXPORT EditUndoManager::Redo()
         else
         {
             DBG_ERROR( "Redo in Engine ohne View nicht moeglich!" );
-            return FALSE;
+            return sal_False;
         }
     }
 
     pImpEE->GetActiveView()->GetImpEditView()->DrawSelection(); // alte Selektion entfernen
 
-    pImpEE->SetUndoMode( TRUE );
-    BOOL bDone = SfxUndoManager::Redo();
-    pImpEE->SetUndoMode( FALSE );
+    pImpEE->SetUndoMode( sal_True );
+    sal_Bool bDone = SfxUndoManager::Redo();
+    pImpEE->SetUndoMode( sal_False );
 
     EditSelection aNewSel( pImpEE->GetActiveView()->GetImpEditView()->GetEditSelection() );
     DBG_ASSERT( !aNewSel.IsInvalid(), "Ungueltige Selektion nach Undo()" );
@@ -147,7 +147,7 @@ BOOL __EXPORT EditUndoManager::Redo()
 // -----------------------------------------------------------------------
 // EditUndo
 // ------------------------------------------------------------------------
-EditUndo::EditUndo( USHORT nI, ImpEditEngine* p )
+EditUndo::EditUndo( sal_uInt16 nI, ImpEditEngine* p )
 {
     DBG_CTOR( EditUndo, 0 );
     nId = nI;
@@ -159,15 +159,15 @@ EditUndo::~EditUndo()
     DBG_DTOR( EditUndo, 0 );
 }
 
-USHORT __EXPORT EditUndo::GetId() const
+sal_uInt16 __EXPORT EditUndo::GetId() const
 {
     DBG_CHKTHIS( EditUndo, 0 );
     return nId;
 }
 
-BOOL __EXPORT EditUndo::CanRepeat(SfxRepeatTarget&) const
+sal_Bool __EXPORT EditUndo::CanRepeat(SfxRepeatTarget&) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 XubString __EXPORT EditUndo::GetComment() const
@@ -184,12 +184,12 @@ XubString __EXPORT EditUndo::GetComment() const
 // -----------------------------------------------------------------------
 // EditUndoDelContent
 // ------------------------------------------------------------------------
-EditUndoDelContent::EditUndoDelContent( ImpEditEngine* _pImpEE, ContentNode* pNode, USHORT n )
+EditUndoDelContent::EditUndoDelContent( ImpEditEngine* _pImpEE, ContentNode* pNode, sal_uInt16 n )
                     : EditUndo( EDITUNDO_DELCONTENT, _pImpEE )
 {
     pContentNode = pNode;
     nNode = n;
-    bDelObject = TRUE;
+    bDelObject = sal_True;
 }
 
 EditUndoDelContent::~EditUndoDelContent()
@@ -202,7 +202,7 @@ void __EXPORT EditUndoDelContent::Undo()
 {
     DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
     GetImpEditEngine()->InsertContent( pContentNode, nNode );
-    bDelObject = FALSE; // gehoert wieder der Engine
+    bDelObject = sal_False; // gehoert wieder der Engine
     EditSelection aSel( EditPaM( pContentNode, 0 ), EditPaM( pContentNode, pContentNode->Len() ) );
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel );
 }
@@ -226,7 +226,7 @@ void __EXPORT EditUndoDelContent::Redo()
     if( _pImpEE->IsCallParaInsertedOrDeleted() )
         _pImpEE->GetEditEnginePtr()->ParagraphDeleted( nNode );
 
-    DeletedNodeInfo* pInf = new DeletedNodeInfo( (ULONG)pContentNode, nNode );
+    DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pContentNode, nNode );
     _pImpEE->aDeletedNodes.Insert( pInf, _pImpEE->aDeletedNodes.Count() );
     _pImpEE->UpdateSelections();
 
@@ -236,7 +236,7 @@ void __EXPORT EditUndoDelContent::Redo()
     DBG_ASSERT( pN && ( pN != pContentNode ), "?! RemoveContent !? " );
     EditPaM aPaM( pN, pN->Len() );
 
-    bDelObject = TRUE;  // gehoert wieder dem Undo
+    bDelObject = sal_True;  // gehoert wieder dem Undo
 
     _pImpEE->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) );
 }
@@ -244,9 +244,9 @@ void __EXPORT EditUndoDelContent::Redo()
 // -----------------------------------------------------------------------
 // EditUndoConnectParas
 // ------------------------------------------------------------------------
-EditUndoConnectParas::EditUndoConnectParas( ImpEditEngine* _pImpEE, USHORT nN, USHORT nSP,
+EditUndoConnectParas::EditUndoConnectParas( ImpEditEngine* _pImpEE, sal_uInt16 nN, sal_uInt16 nSP,
                                             const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs,
-                                            const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, BOOL bBkwrd )
+                                            const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, sal_Bool bBkwrd )
                     :   EditUndo( EDITUNDO_CONNECTPARAS, _pImpEE ),
                         aLeftParaAttribs( rLeftParaAttribs ),
                         aRightParaAttribs( rRightParaAttribs )
@@ -280,8 +280,8 @@ void __EXPORT EditUndoConnectParas::Undo()
     // weil der Outliner sich auf die Attribute verlaesst um die Tiefe
     // des Absatzes zu initialisieren
 
-    BOOL bCall = GetImpEditEngine()->IsCallParaInsertedOrDeleted();
-    GetImpEditEngine()->SetCallParaInsertedOrDeleted( FALSE );
+    sal_Bool bCall = GetImpEditEngine()->IsCallParaInsertedOrDeleted();
+    GetImpEditEngine()->SetCallParaInsertedOrDeleted( sal_False );
 
     EditPaM aPaM = GetImpEditEngine()->SplitContent( nNode, nSepPos );
     GetImpEditEngine()->SetParaAttribs( nNode, aLeftParaAttribs );
@@ -294,7 +294,7 @@ void __EXPORT EditUndoConnectParas::Undo()
     if ( GetImpEditEngine()->GetStyleSheetPool() )
     {
         if ( aLeftStyleName.Len() )
-            GetImpEditEngine()->SetStyleSheet( (USHORT)nNode, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aLeftStyleName, eLeftStyleFamily ) );
+            GetImpEditEngine()->SetStyleSheet( (sal_uInt16)nNode, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aLeftStyleName, eLeftStyleFamily ) );
         if ( aRightStyleName.Len() )
             GetImpEditEngine()->SetStyleSheet( nNode+1, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aRightStyleName, eRightStyleFamily ) );
     }
@@ -313,7 +313,7 @@ void __EXPORT EditUndoConnectParas::Redo()
 // -----------------------------------------------------------------------
 // EditUndoSplitPara
 // ------------------------------------------------------------------------
-EditUndoSplitPara::EditUndoSplitPara( ImpEditEngine* _pImpEE, USHORT nN, USHORT nSP )
+EditUndoSplitPara::EditUndoSplitPara( ImpEditEngine* _pImpEE, sal_uInt16 nN, sal_uInt16 nSP )
                     : EditUndo( EDITUNDO_SPLITPARA, _pImpEE )
 {
     nNode   = nN;
@@ -327,7 +327,7 @@ EditUndoSplitPara::~EditUndoSplitPara()
 void __EXPORT EditUndoSplitPara::Undo()
 {
     DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
-    EditPaM aPaM = GetImpEditEngine()->ConnectContents( nNode, FALSE );
+    EditPaM aPaM = GetImpEditEngine()->ConnectContents( nNode, sal_False );
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) );
 }
 
@@ -367,22 +367,22 @@ void __EXPORT EditUndoInsertChars::Redo()
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aNewPaM ) );
 }
 
-BOOL __EXPORT EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
+sal_Bool __EXPORT EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
 {
     if ( !pNextAction->ISA( EditUndoInsertChars ) )
-        return FALSE;
+        return sal_False;
 
     EditUndoInsertChars* pNext = (EditUndoInsertChars*)pNextAction;
 
     if ( aEPaM.nPara != pNext->aEPaM.nPara )
-        return FALSE;
+        return sal_False;
 
     if ( ( aEPaM.nIndex + aText.Len() ) == pNext->aEPaM.nIndex )
     {
         aText += pNext->aText;
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -457,7 +457,7 @@ void __EXPORT EditUndoInsertFeature::Redo()
 // EditUndoMoveParagraphs
 // ------------------------------------------------------------------------
 EditUndoMoveParagraphs::EditUndoMoveParagraphs
-                            ( ImpEditEngine* _pImpEE, const Range& rParas, USHORT n )
+                            ( ImpEditEngine* _pImpEE, const Range& rParas, sal_uInt16 n )
                             :   EditUndo( EDITUNDO_MOVEPARAGRAPHS, _pImpEE ),
                                 nParagraphs( rParas )
 {
@@ -487,7 +487,7 @@ void __EXPORT EditUndoMoveParagraphs::Undo()
     else
         nTmpDest += aTmpRange.Len();
 
-    EditSelection aNewSel( GetImpEditEngine()->MoveParagraphs( aTmpRange, (USHORT)nTmpDest, 0 ) );
+    EditSelection aNewSel( GetImpEditEngine()->MoveParagraphs( aTmpRange, (sal_uInt16)nTmpDest, 0 ) );
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
 }
 
@@ -501,7 +501,7 @@ void __EXPORT EditUndoMoveParagraphs::Redo()
 // -----------------------------------------------------------------------
 // EditUndoSetStyleSheet
 // ------------------------------------------------------------------------
-EditUndoSetStyleSheet::EditUndoSetStyleSheet( ImpEditEngine* _pImpEE, USHORT nP,
+EditUndoSetStyleSheet::EditUndoSetStyleSheet( ImpEditEngine* _pImpEE, sal_uInt16 nP,
                         const XubString& rPrevName, SfxStyleFamily ePrevFam,
                         const XubString& rNewName, SfxStyleFamily eNewFam,
                         const SfxItemSet& rPrevParaAttribs )
@@ -535,7 +535,7 @@ void __EXPORT EditUndoSetStyleSheet::Redo()
 // -----------------------------------------------------------------------
 // EditUndoSetParaAttribs
 // ------------------------------------------------------------------------
-EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* _pImpEE, USHORT nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems )
+EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* _pImpEE, sal_uInt16 nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems )
     : EditUndo( EDITUNDO_PARAATTRIBS, _pImpEE ),
       aPrevItems( rPrevItems ),
       aNewItems(rNewItems )
@@ -574,8 +574,8 @@ EditUndoSetAttribs::EditUndoSetAttribs( ImpEditEngine* _pImpEE, const ESelection
     // an einigen Stellen abgefangen werden, das ggf. ein SetAttribs mit einem
     // leeren ItemSet gemacht wird.
     // => Ich habe lieber diesen Member spendiert...
-    bSetIsRemove = FALSE;
-    bRemoveParaAttribs = FALSE;
+    bSetIsRemove = sal_False;
+    bRemoveParaAttribs = sal_False;
     nRemoveWhich = 0;
     nSpecial = 0;
 }
@@ -584,12 +584,12 @@ EditUndoSetAttribs::~EditUndoSetAttribs()
 {
     // Items aus Pool holen...
     SfxItemPool* pPool = aNewAttribs.GetPool();
-    USHORT nContents = aPrevAttribs.Count();
-    for ( USHORT n = 0; n < nContents; n++ )
+    sal_uInt16 nContents = aPrevAttribs.Count();
+    for ( sal_uInt16 n = 0; n < nContents; n++ )
     {
         ContentAttribsInfo* pInf = aPrevAttribs[n];
         DBG_ASSERT( pInf, "Undo_DTOR (SetAttribs): pInf = NULL!" );
-        for ( USHORT nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
         {
             EditCharAttrib* pX = pInf->GetPrevCharAttribs()[nAttr];
             DBG_ASSERT( pX, "Undo_DTOR (SetAttribs): pX = NULL!" );
@@ -604,10 +604,10 @@ void __EXPORT EditUndoSetAttribs::Undo()
 {
     DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
     ImpEditEngine* _pImpEE = GetImpEditEngine();
-    BOOL bFields = FALSE;
-    for ( USHORT nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
+    sal_Bool bFields = sal_False;
+    for ( sal_uInt16 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
     {
-        ContentAttribsInfo* pInf = aPrevAttribs[ (USHORT)(nPara-aESel.nStartPara) ];
+        ContentAttribsInfo* pInf = aPrevAttribs[ (sal_uInt16)(nPara-aESel.nStartPara) ];
         DBG_ASSERT( pInf, "Undo (SetAttribs): pInf = NULL!" );
 
         // erstmal die Absatzattribute...
@@ -615,17 +615,17 @@ void __EXPORT EditUndoSetAttribs::Undo()
 
         // Dann die Zeichenattribute...
         // Alle Attribute inkl. Features entfernen, werden wieder neu eingestellt.
-        _pImpEE->RemoveCharAttribs( nPara, 0, TRUE );
+        _pImpEE->RemoveCharAttribs( nPara, 0, sal_True );
         DBG_ASSERT( _pImpEE->GetEditDoc().SaveGetObject( nPara ), "Undo (SetAttribs): pNode = NULL!" );
         ContentNode* pNode = _pImpEE->GetEditDoc().GetObject( nPara );
-        for ( USHORT nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
         {
             EditCharAttrib* pX = pInf->GetPrevCharAttribs()[nAttr];
             DBG_ASSERT( pX, "Redo (SetAttribs): pX = NULL!" );
             // wird autom. 'eingepoolt'.
             _pImpEE->GetEditDoc().InsertAttrib( pNode, pX->GetStart(), pX->GetEnd(), *pX->GetItem() );
             if ( pX->Which() == EE_FEATURE_FIELD )
-                bFields = TRUE;
+                bFields = sal_True;
         }
     }
     if ( bFields )
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 4c54c553c353..210a18ca0ae4 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -47,14 +47,14 @@ class EditView;
 class EditUndoDelContent : public EditUndo
 {
 private:
-    BOOL            bDelObject;
-    USHORT          nNode;
+    sal_Bool            bDelObject;
+    sal_uInt16          nNode;
     ContentNode*    pContentNode;   // Zeigt auf das gueltige,
                                     // nicht zerstoerte Objekt!
 
 public:
                     TYPEINFO();
-                    EditUndoDelContent( ImpEditEngine* pImpEE, ContentNode* pNode, USHORT nPortio );
+                    EditUndoDelContent( ImpEditEngine* pImpEE, ContentNode* pNode, sal_uInt16 nPortio );
                     ~EditUndoDelContent();
 
     virtual void    Undo();
@@ -67,8 +67,8 @@ public:
 class EditUndoConnectParas : public EditUndo
 {
 private:
-    USHORT          nNode;
-    USHORT          nSepPos;
+    sal_uInt16          nNode;
+    sal_uInt16          nSepPos;
     SfxItemSet      aLeftParaAttribs;
     SfxItemSet      aRightParaAttribs;
 
@@ -78,13 +78,13 @@ private:
     SfxStyleFamily  eLeftStyleFamily;
     SfxStyleFamily  eRightStyleFamily;
 
-    BOOL            bBackward;
+    sal_Bool            bBackward;
 
 public:
                     TYPEINFO();
-                    EditUndoConnectParas( ImpEditEngine* pImpEE, USHORT nNode, USHORT nSepPos,
+                    EditUndoConnectParas( ImpEditEngine* pImpEE, sal_uInt16 nNode, sal_uInt16 nSepPos,
                                             const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs,
-                                            const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, BOOL bBackward );
+                                            const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, sal_Bool bBackward );
                     ~EditUndoConnectParas();
 
     virtual void    Undo();
@@ -97,12 +97,12 @@ public:
 class EditUndoSplitPara : public EditUndo
 {
 private:
-    USHORT          nNode;
-    USHORT          nSepPos;
+    sal_uInt16          nNode;
+    sal_uInt16          nSepPos;
 
 public:
                     TYPEINFO();
-                    EditUndoSplitPara( ImpEditEngine* pImpEE, USHORT nNode, USHORT nSepPos );
+                    EditUndoSplitPara( ImpEditEngine* pImpEE, sal_uInt16 nNode, sal_uInt16 nSepPos );
                     ~EditUndoSplitPara();
 
     virtual void    Undo();
@@ -128,7 +128,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
 
-    virtual BOOL    Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool    Merge( SfxUndoAction *pNextAction );
 };
 
 // -----------------------------------------------------------------------
@@ -177,11 +177,11 @@ class EditUndoMoveParagraphs: public EditUndo
 {
 private:
     Range           nParagraphs;
-    USHORT          nDest;
+    sal_uInt16          nDest;
 
 public:
                     TYPEINFO();
-                    EditUndoMoveParagraphs( ImpEditEngine* pImpEE, const Range& rParas, USHORT nDest );
+                    EditUndoMoveParagraphs( ImpEditEngine* pImpEE, const Range& rParas, sal_uInt16 nDest );
                     ~EditUndoMoveParagraphs();
 
     virtual void    Undo();
@@ -194,7 +194,7 @@ public:
 class EditUndoSetStyleSheet: public EditUndo
 {
 private:
-    USHORT          nPara;
+    sal_uInt16          nPara;
     XubString       aPrevName;
     XubString       aNewName;
     SfxStyleFamily  ePrevFamily;
@@ -204,7 +204,7 @@ private:
 public:
                     TYPEINFO();
 
-                    EditUndoSetStyleSheet( ImpEditEngine* pImpEE, USHORT nPara,
+                    EditUndoSetStyleSheet( ImpEditEngine* pImpEE, sal_uInt16 nPara,
                         const XubString& rPrevName, SfxStyleFamily ePrevFamily,
                         const XubString& rNewName, SfxStyleFamily eNewFamily,
                         const SfxItemSet& rPrevParaAttribs );
@@ -220,13 +220,13 @@ public:
 class EditUndoSetParaAttribs: public EditUndo
 {
 private:
-    USHORT          nPara;
+    sal_uInt16          nPara;
     SfxItemSet      aPrevItems;
     SfxItemSet      aNewItems;
 
 public:
                     TYPEINFO();
-                    EditUndoSetParaAttribs( ImpEditEngine* pImpEE, USHORT nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems );
+                    EditUndoSetParaAttribs( ImpEditEngine* pImpEE, sal_uInt16 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems );
                     ~EditUndoSetParaAttribs();
 
     virtual void    Undo();
@@ -243,10 +243,10 @@ private:
     SfxItemSet          aNewAttribs;
     ContentInfoArray    aPrevAttribs;
 
-    BYTE                nSpecial;
-    BOOL                bSetIsRemove;
-    BOOL                bRemoveParaAttribs;
-    USHORT              nRemoveWhich;
+    sal_uInt8               nSpecial;
+    sal_Bool                bSetIsRemove;
+    sal_Bool                bRemoveParaAttribs;
+    sal_uInt16              nRemoveWhich;
 
     void                ImpSetSelection( EditView* pView );
 
@@ -259,10 +259,10 @@ public:
     ContentInfoArray&   GetContentInfos()   { return aPrevAttribs; }
     SfxItemSet&         GetNewAttribs()     { return aNewAttribs; }
 
-    void                SetSpecial( BYTE n )            { nSpecial = n; }
-    void                SetRemoveAttribs( BOOL b )      { bSetIsRemove = b; }
-    void                SetRemoveParaAttribs( BOOL b )  { bRemoveParaAttribs = b; }
-    void                SetRemoveWhich( USHORT n )      { nRemoveWhich = n; }
+    void                SetSpecial( sal_uInt8 n )           { nSpecial = n; }
+    void                SetRemoveAttribs( sal_Bool b )      { bSetIsRemove = b; }
+    void                SetRemoveParaAttribs( sal_Bool b )  { bRemoveParaAttribs = b; }
+    void                SetRemoveWhich( sal_uInt16 n )      { nRemoveWhich = n; }
 
     virtual void        Undo();
     virtual void        Redo();
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 664512df414e..f36f22365361 100755
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -44,7 +44,7 @@
 
 #include <svl/srchitem.hxx>
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uIt16S
 #include <svl/svstdarr.hxx>
 
 #include <impedit.hxx>
@@ -146,10 +146,10 @@ LanguageType lcl_CheckLanguage(
         lang::Locale a3( SvxCreateLocale( aLangList[3] ) );
 #endif
 
-        INT32   nCount = sizeof(aLangList) / sizeof(aLangList[0]);
-        for (INT32 i = 0;  i < nCount;  i++)
+        sal_Int32   nCount = sizeof(aLangList) / sizeof(aLangList[0]);
+        for (sal_Int32 i = 0;  i < nCount;  i++)
         {
-            INT16 nTmpLang = aLangList[i];
+            sal_Int16 nTmpLang = aLangList[i];
             if (nTmpLang != LANGUAGE_NONE  &&  nTmpLang != LANGUAGE_DONTKNOW)
             {
                 if (xSpell->hasLanguage( nTmpLang ) &&
@@ -293,7 +293,7 @@ void EditView::DeleteSelected()
     pImpEditView->DeleteSelected();
 }
 
-USHORT EditView::GetSelectedScriptType() const
+sal_uInt16 EditView::GetSelectedScriptType() const
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -478,7 +478,7 @@ void EditView::HideCursor()
     pImpEditView->GetCursor()->Hide();
 }
 
-Pair EditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
+Pair EditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -580,7 +580,7 @@ void EditView::Redo()
     PIMPEE->Redo( this );
 }
 
-ULONG EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -604,7 +604,7 @@ ULONG EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFo
 }
 
 #ifndef SVX_LIGHT
-ULONG EditView::Write( SvStream& rOutput, EETextFormat eFormat )
+sal_uLong EditView::Write( SvStream& rOutput, EETextFormat eFormat )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -737,7 +737,7 @@ void EditView::MoveParagraphs( long nDiff )
         nDest++;
     DBG_ASSERT( ( nDest >= 0 ) && ( nDest <= pImpEditView->pEditEngine->GetParagraphCount() ), "MoveParagraphs - wrong Parameters!" );
     MoveParagraphs( aRange,
-        sal::static_int_cast< USHORT >( nDest ) );
+        sal::static_int_cast< sal_uInt16 >( nDest ) );
 }
 
 void EditView::SetBackgroundColor( const Color& rColor )
@@ -788,7 +788,7 @@ void EditView::InsertText( const EditTextObject& rTextObject )
     PIMPEE->FormatAndUpdate( this );
 }
 
-void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, BOOL bUseSpecial )
+void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, sal_Bool bUseSpecial )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -805,7 +805,7 @@ void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::d
 
 sal_Bool EditView::Drop( const DropEvent& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 ESelection EditView::GetDropPos()
@@ -816,7 +816,7 @@ ESelection EditView::GetDropPos()
 
 sal_Bool EditView::QueryDrop( DropEvent& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 void EditView::SetEditEngineUpdateMode( sal_Bool bUpdate )
@@ -968,7 +968,7 @@ EESpellState EditView::StartThesaurus()
 
 void EditView::StartTextConversion(
         LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
-        INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc )
+        sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
 {
 #ifdef SVX_LIGHT
 #else
@@ -1066,7 +1066,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
         Sequence< PropertyValue > aPropVals(1);
         PropertyValue &rVal = aPropVals.getArray()[0];
         rVal.Name = OUString::createFromAscii( UPN_MAX_NUMBER_OF_SUGGESTIONS );
-        rVal.Value <<= (INT16) 7;
+        rVal.Value <<= (sal_Int16) 7;
         //
         // Gibt es Replace-Vorschlaege?
         Reference< XSpellAlternatives >  xSpellAlt =
@@ -1126,7 +1126,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
         if (xSpellAlt.is())
             aAlt = xSpellAlt->getAlternatives();
         const OUString *pAlt = aAlt.getConstArray();
-        sal_uInt16 nWords = (USHORT) aAlt.getLength();
+        sal_uInt16 nWords = (sal_uInt16) aAlt.getLength();
         if ( nWords )
         {
             for ( sal_uInt16 nW = 0; nW < nWords; nW++ )
@@ -1158,7 +1158,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
             aDics = xDicList->getDictionaries();
             pDic  = aDics.getConstArray();
             sal_uInt16 nCheckedLanguage = PIMPEE->GetLanguage( aPaM2 );
-            sal_uInt16 nDicCount = (USHORT)aDics.getLength();
+            sal_uInt16 nDicCount = (sal_uInt16)aDics.getLength();
             for (sal_uInt16 i = 0; i < nDicCount; i++)
             {
                 uno::Reference< linguistic2::XDictionary >  xDicTmp( pDic[i], uno::UNO_QUERY );
@@ -1174,7 +1174,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
                 {
                     // the extra 1 is because of the (possible) external
                     // linguistic entry above
-                    USHORT nPos = MN_DICTSTART + i;
+                    sal_uInt16 nPos = MN_DICTSTART + i;
                     pInsertMenu->InsertItem( nPos, xDicTmp->getName() );
 
                     uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY );
@@ -1480,7 +1480,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList )
 
     if( aSel.HasRange() )
     {
-        for( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+        for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
         {
             SvUShorts aPortions;
             rEditEngine.GetPortions( nPara, aPortions );
@@ -1488,13 +1488,13 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList )
             if( aPortions.Count() == 0 )
                 aPortions.Insert( rEditEngine.GetTextLen(nPara), 0 );
 
-            const USHORT nBeginPos = (nPara == aSel.nStartPara) ? aSel.nStartPos : 0;
-            const USHORT nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : 0xffff;
+            const sal_uInt16 nBeginPos = (nPara == aSel.nStartPara) ? aSel.nStartPos : 0;
+            const sal_uInt16 nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : 0xffff;
 
-            for ( USHORT nPos = 0; nPos < aPortions.Count(); ++nPos )
+            for ( sal_uInt16 nPos = 0; nPos < aPortions.Count(); ++nPos )
             {
-                USHORT nPortionEnd   = aPortions.GetObject( nPos );
-                USHORT nPortionStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
+                sal_uInt16 nPortionEnd   = aPortions.GetObject( nPos );
+                sal_uInt16 nPortionStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
 
                 if( (nPortionEnd < nBeginPos) || (nPortionStart > nEndPos) )
                     continue;
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index f01381a4ae62..afc329040e29 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -223,7 +223,7 @@ WrongList::~WrongList()
 {
 }
 
-void WrongList::MarkInvalid( USHORT nS, USHORT nE )
+void WrongList::MarkInvalid( sal_uInt16 nS, sal_uInt16 nE )
 {
     if ( ( nInvalidStart == NOT_INVALID ) || ( nInvalidStart > nS ) )
         nInvalidStart = nS;
@@ -498,7 +498,7 @@ bool WrongList::operator==(const WrongList& rCompare) const
         return false;
     }
 
-    for(USHORT a(0); a < Count(); a++)
+    for(sal_uInt16 a(0); a < Count(); a++)
     {
         const WrongRange& rCandA(GetObject(a));
         const WrongRange& rCandB(rCompare.GetObject(a));
@@ -649,8 +649,8 @@ sal_Bool EdtAutoCorrDoc::SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
 
 sal_Bool EdtAutoCorrDoc::HasSymbolChars( sal_uInt16 nStt, sal_uInt16 nEnd )
 {
-    USHORT nScriptType = pImpEE->GetScriptType( EditPaM( pCurNode, nStt ) );
-    USHORT nScriptFontInfoItemId = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
+    sal_uInt16 nScriptType = pImpEE->GetScriptType( EditPaM( pCurNode, nStt ) );
+    sal_uInt16 nScriptFontInfoItemId = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
 
     CharAttribArray& rAttribs = pCurNode->GetCharAttribs().GetAttribs();
     sal_uInt16 nAttrs = rAttribs.Count();
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 851848c5ede0..3ed82ac367f1 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -52,13 +52,13 @@ private:
 
 protected:
     virtual void            SpellStart( SvxSpellArea eArea );
-    virtual BOOL            SpellContinue();    // Bereich pruefen
-    virtual void            ReplaceAll( const String &rNewText, INT16 nLanguage );
+    virtual sal_Bool            SpellContinue();    // Bereich pruefen
+    virtual void            ReplaceAll( const String &rNewText, sal_Int16 nLanguage );
     virtual void            SpellEnd();
-    virtual BOOL            SpellMore();
-    virtual BOOL            HasOtherCnt();
+    virtual sal_Bool            SpellMore();
+    virtual sal_Bool            HasOtherCnt();
     virtual void            ScrollArea();
-    virtual void            ChangeWord( const String& rNewWord, const USHORT nLang );
+    virtual void            ChangeWord( const String& rNewWord, const sal_uInt16 nLang );
     virtual void            ChangeThesWord( const String& rNewWord );
     virtual void            AutoCorrect( const String& rOldWord, const String& rNewWord );
 
@@ -66,18 +66,18 @@ public:
     EditSpellWrapper( Window* pWin,
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker,
-            BOOL bIsStart,
-            BOOL bIsAllRight, EditView* pView );
+            sal_Bool bIsStart,
+            sal_Bool bIsAllRight, EditView* pView );
 
 };
 
 
 struct WrongRange
 {
-    USHORT nStart;
-    USHORT nEnd;
+    sal_uInt16 nStart;
+    sal_uInt16 nEnd;
 
-    WrongRange( USHORT nS, USHORT nE ) { nStart = nS; nEnd = nE; }
+    WrongRange( sal_uInt16 nS, sal_uInt16 nE ) { nStart = nS; nEnd = nE; }
 };
 
 SV_DECL_VARARR( WrongRanges, WrongRange, 4, 4 )
@@ -86,41 +86,41 @@ SV_DECL_VARARR( WrongRanges, WrongRange, 4, 4 )
 class WrongList : private WrongRanges
 {
 private:
-    USHORT  nInvalidStart;
-    USHORT  nInvalidEnd;
+    sal_uInt16  nInvalidStart;
+    sal_uInt16  nInvalidEnd;
 
-    BOOL    DbgIsBuggy() const;
+    sal_Bool    DbgIsBuggy() const;
 
 public:
             WrongList();
             ~WrongList();
 
-    BOOL    IsInvalid() const       { return nInvalidStart != NOT_INVALID; }
+    sal_Bool    IsInvalid() const       { return nInvalidStart != NOT_INVALID; }
     void    SetValid()              { nInvalidStart = NOT_INVALID; nInvalidEnd = 0; }
-    void    MarkInvalid( USHORT nS, USHORT nE );
+    void    MarkInvalid( sal_uInt16 nS, sal_uInt16 nE );
 
-    USHORT          Count() const               { return WrongRanges::Count(); }
+    sal_uInt16          Count() const               { return WrongRanges::Count(); }
 
     // Wenn man weiss was man tut:
-    WrongRange&     GetObject( USHORT n ) const { return WrongRanges::GetObject( n ); }
-    void            InsertWrong( const WrongRange& rWrong, USHORT nPos );
+    WrongRange&     GetObject( sal_uInt16 n ) const { return WrongRanges::GetObject( n ); }
+    void            InsertWrong( const WrongRange& rWrong, sal_uInt16 nPos );
 
-    USHORT  GetInvalidStart() const { return nInvalidStart; }
-    USHORT& GetInvalidStart()       { return nInvalidStart; }
+    sal_uInt16  GetInvalidStart() const { return nInvalidStart; }
+    sal_uInt16& GetInvalidStart()       { return nInvalidStart; }
 
-    USHORT  GetInvalidEnd() const   { return nInvalidEnd; }
-    USHORT& GetInvalidEnd()         { return nInvalidEnd; }
+    sal_uInt16  GetInvalidEnd() const   { return nInvalidEnd; }
+    sal_uInt16& GetInvalidEnd()         { return nInvalidEnd; }
 
-    void    TextInserted( USHORT nPos, USHORT nChars, BOOL bPosIsSep );
-    void    TextDeleted( USHORT nPos, USHORT nChars );
+    void    TextInserted( sal_uInt16 nPos, sal_uInt16 nChars, sal_Bool bPosIsSep );
+    void    TextDeleted( sal_uInt16 nPos, sal_uInt16 nChars );
 
     void    ResetRanges()           { Remove( 0, Count() ); }
-    BOOL    HasWrongs() const       { return Count() != 0; }
-    void    InsertWrong( USHORT nStart, USHORT nEnd, BOOL bClearRange );
-    BOOL    NextWrong( USHORT& rnStart, USHORT& rnEnd ) const;
-    BOOL    HasWrong( USHORT nStart, USHORT nEnd ) const;
-    BOOL    HasAnyWrong( USHORT nStart, USHORT nEnd ) const;
-    void    ClearWrongs( USHORT nStart, USHORT nEnd, const ContentNode* pNode );
+    sal_Bool    HasWrongs() const       { return Count() != 0; }
+    void    InsertWrong( sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bClearRange );
+    sal_Bool    NextWrong( sal_uInt16& rnStart, sal_uInt16& rnEnd ) const;
+    sal_Bool    HasWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const;
+    sal_Bool    HasAnyWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const;
+    void    ClearWrongs( sal_uInt16 nStart, sal_uInt16 nEnd, const ContentNode* pNode );
     void    MarkWrongsInvalid();
 
     WrongList*  Clone() const;
@@ -129,7 +129,7 @@ public:
     bool operator==(const WrongList& rCompare) const;
 };
 
-inline void WrongList::InsertWrong( const WrongRange& rWrong, USHORT nPos )
+inline void WrongList::InsertWrong( const WrongRange& rWrong, sal_uInt16 nPos )
 {
     WrongRanges::Insert( rWrong, nPos );
 #ifdef DBG_UTIL
@@ -143,35 +143,35 @@ class EdtAutoCorrDoc : public SvxAutoCorrDoc
 {
     ImpEditEngine*  pImpEE;
     ContentNode*    pCurNode;
-    USHORT          nCursor;
+    sal_uInt16          nCursor;
 
-    BOOL            bAllowUndoAction;
-    BOOL            bUndoAction;
+    sal_Bool            bAllowUndoAction;
+    sal_Bool            bUndoAction;
 
 protected:
     void            ImplStartUndoAction();
 
 public:
-                    EdtAutoCorrDoc( ImpEditEngine* pImpEE, ContentNode* pCurNode, USHORT nCrsr, xub_Unicode cIns );
+                    EdtAutoCorrDoc( ImpEditEngine* pImpEE, ContentNode* pCurNode, sal_uInt16 nCrsr, xub_Unicode cIns );
                     ~EdtAutoCorrDoc();
 
-    virtual BOOL    Delete( USHORT nStt, USHORT nEnd );
-    virtual BOOL    Insert( USHORT nPos, const String& rTxt );
-    virtual BOOL    Replace( USHORT nPos, const String& rTxt );
+    virtual sal_Bool    Delete( sal_uInt16 nStt, sal_uInt16 nEnd );
+    virtual sal_Bool    Insert( sal_uInt16 nPos, const String& rTxt );
+    virtual sal_Bool    Replace( sal_uInt16 nPos, const String& rTxt );
 
-    virtual BOOL    SetAttr( USHORT nStt, USHORT nEnd, USHORT nSlotId, SfxPoolItem& );
-    virtual BOOL    SetINetAttr( USHORT nStt, USHORT nEnd, const String& rURL );
+    virtual sal_Bool    SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, sal_uInt16 nSlotId, SfxPoolItem& );
+    virtual sal_Bool    SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, const String& rURL );
 
-    virtual BOOL    HasSymbolChars( USHORT nStt, USHORT nEnd );
+    virtual sal_Bool    HasSymbolChars( sal_uInt16 nStt, sal_uInt16 nEnd );
 
-    virtual const String* GetPrevPara( BOOL bAtNormalPos );
+    virtual const String* GetPrevPara( sal_Bool bAtNormalPos );
 
-    virtual BOOL    ChgAutoCorrWord( USHORT& rSttPos, USHORT nEndPos,
+    virtual sal_Bool    ChgAutoCorrWord( sal_uInt16& rSttPos, sal_uInt16 nEndPos,
                                   SvxAutoCorrect& rACorrect, const String** ppPara );
 
-    virtual LanguageType GetLanguage( USHORT nPos, BOOL bPrevPara = FALSE ) const;
+    virtual LanguageType GetLanguage( sal_uInt16 nPos, sal_Bool bPrevPara = sal_False ) const;
 
-    USHORT          GetCursor() const { return nCursor; }
+    sal_uInt16          GetCursor() const { return nCursor; }
 
 };
 
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index e8a2aaad22e2..6a7a5eb1bb5e 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -56,15 +56,15 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValu
 {
     pImpEditEngine = 0;
     pCurAnchor = 0;
-    bInPara = FALSE;
-    bWasInPara = FALSE;
+    bInPara = sal_False;
+    bWasInPara = sal_False;
     nInTable = 0;
     nInCell = 0;
-    bInTitle = FALSE;
+    bInTitle = sal_False;
     nDefListLevel = 0;
     nBulletLevel = 0;
     nNumberingLevel = 0;
-    bFieldsInserted = FALSE;
+    bFieldsInserted = sal_False;
 
     DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW == GetSrcEncoding( ), "EditHTMLParser::EditHTMLParser: Where does the encoding come from?" );
     DBG_ASSERT( !IsSwitchToUCS2(), "EditHTMLParser::::EditHTMLParser: Switch to UCS2?" );
@@ -74,7 +74,7 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValu
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
 
     // If the file starts with a BOM, switch to UCS2.
-    SetSwitchToUCS2( TRUE );
+    SetSwitchToUCS2( sal_True );
 
     if ( pHTTPHeaderAttrs )
         SetEncodingByHTTPHeader( pHTTPHeaderAttrs );
@@ -128,16 +128,16 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_META:
     {
         const HTMLOptions *_pOptions = GetOptions();
-        USHORT nArrLen = _pOptions->Count();
-        BOOL bEquiv = FALSE;
-        for ( USHORT i = 0; i < nArrLen; i++ )
+        sal_uInt16 nArrLen = _pOptions->Count();
+        sal_Bool bEquiv = sal_False;
+        for ( sal_uInt16 i = 0; i < nArrLen; i++ )
         {
             const HTMLOption *pOption = (*_pOptions)[i];
             switch( pOption->GetToken() )
             {
                 case HTML_O_HTTPEQUIV:
                 {
-                    bEquiv = TRUE;
+                    bEquiv = sal_True;
                 }
                 break;
                 case HTML_O_CONTENT:
@@ -157,11 +157,11 @@ void EditHTMLParser::NextToken( int nToken )
     break;
     case HTML_PLAINTEXT_ON:
     case HTML_PLAINTEXT2_ON:
-        bInPara = TRUE;
+        bInPara = sal_True;
     break;
     case HTML_PLAINTEXT_OFF:
     case HTML_PLAINTEXT2_OFF:
-        bInPara = FALSE;
+        bInPara = sal_False;
     break;
 
     case HTML_LINEBREAK:
@@ -194,7 +194,7 @@ void EditHTMLParser::NextToken( int nToken )
         if (!bInTitle)
         {
             if ( !bInPara )
-                StartPara( FALSE );
+                StartPara( sal_False );
 
             // if ( bInPara || pCurAnchor )
 
@@ -212,7 +212,7 @@ void EditHTMLParser::NextToken( int nToken )
                 // Nur bis HTML mit 319 geschrieben ?!
                 if ( IsReadPRE() )
                 {
-                    USHORT nTabPos = aText.Search( '\t', 0 );
+                    sal_uInt16 nTabPos = aText.Search( '\t', 0 );
                     while ( nTabPos != STRING_NOTFOUND )
                     {
                         aText.Erase( nTabPos, 1 );
@@ -229,7 +229,7 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_CENTER_ON:
     case HTML_CENTER_OFF:   // if ( bInPara )
                             {
-                                USHORT nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
+                                sal_uInt16 nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
                                 SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
                                 aItems.ClearItem( EE_PARA_JUST );
                                 if ( nToken == HTML_CENTER_ON )
@@ -245,13 +245,13 @@ void EditHTMLParser::NextToken( int nToken )
 
     case HTML_PARABREAK_ON:
         if( bInPara && HasTextInCurrentPara() )
-            EndPara( TRUE );
-        StartPara( TRUE );
+            EndPara( sal_True );
+        StartPara( sal_True );
         break;
 
     case HTML_PARABREAK_OFF:
         if( bInPara )
-            EndPara( TRUE );
+            EndPara( sal_True );
         break;
 
     case HTML_HEAD1_ON:
@@ -280,7 +280,7 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_XMP_ON:
     case HTML_LISTING_ON:
     {
-        StartPara( TRUE );
+        StartPara( sal_True );
         ImpSetStyleSheet( STYLE_PRE );
     }
     break;
@@ -319,10 +319,10 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_ORDERLIST_ON:
     case HTML_UNORDERLIST_ON:
     {
-        BOOL bHasText = HasTextInCurrentPara();
+        sal_Bool bHasText = HasTextInCurrentPara();
         if ( bHasText )
             ImpInsertParaBreak();
-        StartPara( FALSE );
+        StartPara( sal_False );
     }
     break;
 
@@ -338,7 +338,7 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_DD_OFF:
     case HTML_DT_OFF:
     case HTML_ORDERLIST_OFF:
-    case HTML_UNORDERLIST_OFF:  EndPara( FALSE );
+    case HTML_UNORDERLIST_OFF:  EndPara( sal_False );
                                 break;
 
     case HTML_TABLEROW_ON:
@@ -357,10 +357,10 @@ void EditHTMLParser::NextToken( int nToken )
     // #58335# kein SkipGroup on/off auf inline markup etc.
 
     case HTML_TITLE_ON:
-        bInTitle = TRUE;
+        bInTitle = sal_True;
         break;
     case HTML_TITLE_OFF:
-        bInTitle = FALSE;
+        bInTitle = sal_False;
         break;
 
     // globals
@@ -555,7 +555,7 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe
     }
 
     ContentNode* pSN = aStartPaM.GetNode();
-    USHORT nStartNode = pImpEditEngine->GetEditDoc().GetPos( pSN );
+    sal_uInt16 nStartNode = pImpEditEngine->GetEditDoc().GetPos( pSN );
 
     // Wenn ein Attribut von 0 bis aktuelle Absatzlaenge geht,
     // soll es ein Absatz-Attribut sein!
@@ -566,12 +566,12 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe
     // HTML eigentlich nicht:
 #ifdef DBG_UTIL
     ContentNode* pEN = aEndPaM.GetNode();
-    USHORT nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
+    sal_uInt16 nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
     DBG_ASSERT( nStartNode == nEndNode, "ImpSetAttribs: Mehrere Absaetze?" );
 #endif
 
 /*
-    for ( USHORT z = nStartNode+1; z < nEndNode; z++ )
+    for ( sal_uInt16 z = nStartNode+1; z < nEndNode; z++ )
     {
         DBG_ASSERT( pImpEditEngine->GetEditDoc().SaveGetObject( z ), "Node existiert noch nicht(RTF)" );
         pImpEditEngine->SetParaAttribs( z, rSet.GetAttrSet() );
@@ -606,7 +606,7 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe
     }
 }
 
-void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel )
+void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
 {
     /*
         nHLevel:    0:          Ausschalten
@@ -628,7 +628,7 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel )
             // dass diese auch in der App liegen sollten, damit sie beim
             // fuettern in eine andere Engine auch noch da sind...
 
-            USHORT nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
+            sal_uInt16 nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
 //          SfxItemSet aItems( pImpEditEngine->GetEmptyItemSet() );
             SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
 
@@ -667,8 +667,8 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel )
                 if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) )
                 {
                     SvxULSpaceItem aULSpaceItem( EE_PARA_ULSPACE );
-                    aULSpaceItem.SetUpper( (USHORT)OutputDevice::LogicToLogic( 42, MAP_10TH_MM, eUnit ) );
-                    aULSpaceItem.SetLower( (USHORT)OutputDevice::LogicToLogic( 35, MAP_10TH_MM, eUnit ) );
+                    aULSpaceItem.SetUpper( (sal_uInt16)OutputDevice::LogicToLogic( 42, MAP_10TH_MM, eUnit ) );
+                    aULSpaceItem.SetLower( (sal_uInt16)OutputDevice::LogicToLogic( 35, MAP_10TH_MM, eUnit ) );
                     aItems.Put( aULSpaceItem );
                 }
             }
@@ -704,7 +704,7 @@ void EditHTMLParser::SkipGroup( int nEndToken )
     // #69109# groups in cells are closed upon leaving the cell, because those
     // ******* web authors don't know their job
     // for example: <td><form></td>   lacks a closing </form>
-    BYTE nCellLevel = nInCell;
+    sal_uInt8 nCellLevel = nInCell;
     int nToken;
     while( nCellLevel <= nInCell && ( (nToken = GetNextToken() ) != nEndToken ) && nToken )
     {
@@ -723,14 +723,14 @@ void EditHTMLParser::SkipGroup( int nEndToken )
     }
 }
 
-void EditHTMLParser::StartPara( BOOL bReal )
+void EditHTMLParser::StartPara( sal_Bool bReal )
 {
     if ( bReal )
     {
         const HTMLOptions *_pOptions = GetOptions();
-        USHORT nArrLen = _pOptions->Count();
+        sal_uInt16 nArrLen = _pOptions->Count();
         SvxAdjust eAdjust = SVX_ADJUST_LEFT;
-        for ( USHORT i = 0; i < nArrLen; i++ )
+        for ( sal_uInt16 i = 0; i < nArrLen; i++ )
         {
             const HTMLOption *pOption = (*_pOptions)[i];
             switch( pOption->GetToken() )
@@ -753,37 +753,37 @@ void EditHTMLParser::StartPara( BOOL bReal )
         aItemSet.Put( SvxAdjustItem( eAdjust, EE_PARA_JUST ) );
         ImpSetAttribs( aItemSet );
     }
-    bInPara = TRUE;
+    bInPara = sal_True;
 }
 
-void EditHTMLParser::EndPara( BOOL )
+void EditHTMLParser::EndPara( sal_Bool )
 {
     if ( bInPara )
     {
-        BOOL bHasText = HasTextInCurrentPara();
+        sal_Bool bHasText = HasTextInCurrentPara();
         if ( bHasText )
             ImpInsertParaBreak();
         // Nur, wenn ohne Absatzabstaende gearbeitet wird...
 //      if ( !nInTable && bReal && (nNumberingLevel<=1) && (nBulletLevel<=1) )
 //          ImpInsertParaBreak();
     }
-    bInPara = FALSE;
+    bInPara = sal_False;
 }
 
-BOOL EditHTMLParser::ThrowAwayBlank()
+sal_Bool EditHTMLParser::ThrowAwayBlank()
 {
     // Ein Blank muss weggeschmissen werden, wenn der neue Text mit einem
     // Blank beginnt und der aktuelle Absatz leer ist oder mit einem
     // Blank endet...
     ContentNode* pNode = aCurSel.Max().GetNode();
     if ( pNode->Len() && ( pNode->GetChar( pNode->Len()-1 ) != ' ' ) )
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
-BOOL EditHTMLParser::HasTextInCurrentPara()
+sal_Bool EditHTMLParser::HasTextInCurrentPara()
 {
-    return aCurSel.Max().GetNode()->Len() ? TRUE : FALSE;
+    return aCurSel.Max().GetNode()->Len() ? sal_True : sal_False;
 }
 
 void EditHTMLParser::AnchorStart()
@@ -792,11 +792,11 @@ void EditHTMLParser::AnchorStart()
     if ( !pCurAnchor )
     {
         const HTMLOptions* _pOptions = GetOptions();
-        USHORT nArrLen = _pOptions->Count();
+        sal_uInt16 nArrLen = _pOptions->Count();
 
         String aRef;
 
-        for ( USHORT i = 0; i < nArrLen; i++ )
+        for ( sal_uInt16 i = 0; i < nArrLen; i++ )
         {
             const HTMLOption* pOption = (*_pOptions)[i];
             switch( pOption->GetToken() )
@@ -830,7 +830,7 @@ void EditHTMLParser::AnchorEnd()
         // Als URL-Feld einfuegen...
         SvxFieldItem aFld( SvxURLField( pCurAnchor->aHRef, pCurAnchor->aText, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD  );
         aCurSel = pImpEditEngine->InsertField( aCurSel, aFld );
-        bFieldsInserted = TRUE;
+        bFieldsInserted = sal_True;
         delete pCurAnchor;
         pCurAnchor = 0;
 
@@ -845,12 +845,12 @@ void EditHTMLParser::AnchorEnd()
 void EditHTMLParser::HeadingStart( int nToken )
 {
     bWasInPara = bInPara;
-    StartPara( FALSE );
+    StartPara( sal_False );
 
     if ( bWasInPara && HasTextInCurrentPara() )
         ImpInsertParaBreak();
 
-    USHORT nId = sal::static_int_cast< USHORT >(
+    sal_uInt16 nId = sal::static_int_cast< sal_uInt16 >(
         1 + ( ( nToken - HTML_HEAD1_ON ) / 2 ) );
     DBG_ASSERT( (nId >= 1) && (nId <= 9), "HeadingStart: ID kann nicht stimmen!" );
     ImpSetStyleSheet( nId );
@@ -858,12 +858,12 @@ void EditHTMLParser::HeadingStart( int nToken )
 
 void EditHTMLParser::HeadingEnd( int )
 {
-    EndPara( FALSE );
+    EndPara( sal_False );
     ImpSetStyleSheet( 0 );
 
     if ( bWasInPara )
     {
-        bInPara = TRUE;
-        bWasInPara = FALSE;
+        bInPara = sal_True;
+        bWasInPara = sal_False;
     }
 }
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index 8d11e743755a..fbdb6570d8da 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -52,34 +52,34 @@ private:
     ImpEditEngine*          pImpEditEngine;
     AnchorInfo*             pCurAnchor;
 
-    BOOL                    bInPara;
-    BOOL                    bWasInPara; // bInPara vor HeadingStart merken, weil sonst hinterher weg
-    BOOL                    bFieldsInserted;
-    BYTE                    nInTable;
-    BYTE                    nInCell;
-    BOOL                    bInTitle;
+    sal_Bool                    bInPara;
+    sal_Bool                    bWasInPara; // bInPara vor HeadingStart merken, weil sonst hinterher weg
+    sal_Bool                    bFieldsInserted;
+    sal_uInt8                   nInTable;
+    sal_uInt8                   nInCell;
+    sal_Bool                    bInTitle;
 
-    BYTE                    nDefListLevel;
-    BYTE                    nBulletLevel;
-    BYTE                    nNumberingLevel;
+    sal_uInt8                   nDefListLevel;
+    sal_uInt8                   nBulletLevel;
+    sal_uInt8                   nNumberingLevel;
 
-    BYTE                    nLastAction;
+    sal_uInt8                   nLastAction;
 
-    void                    StartPara( BOOL bReal );
-    void                    EndPara( BOOL bReal );
+    void                    StartPara( sal_Bool bReal );
+    void                    EndPara( sal_Bool bReal );
     void                    AnchorStart();
     void                    AnchorEnd();
     void                    HeadingStart( int nToken );
     void                    HeadingEnd( int nToken );
     void                    SkipGroup( int nEndToken );
-    BOOL                    ThrowAwayBlank();
-    BOOL                    HasTextInCurrentPara();
-    void                    ProcessUnknownControl( BOOL bOn );
+    sal_Bool                    ThrowAwayBlank();
+    sal_Bool                    HasTextInCurrentPara();
+    void                    ProcessUnknownControl( sal_Bool bOn );
 
     void                    ImpInsertParaBreak();
     void                    ImpInsertText( const String& rText );
     void                    ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel = 0 );
-    void                    ImpSetStyleSheet( USHORT nHeadingLevel );
+    void                    ImpSetStyleSheet( sal_uInt16 nHeadingLevel );
 
 protected:
     virtual void            NextToken( int nToken );
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index a275f8b5d372..10e30e6a9908 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -61,7 +61,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
 {
     uno::Any aAny;
 
-    ULONG nT = SotExchange::GetFormat( rFlavor );
+    sal_uLong nT = SotExchange::GetFormat( rFlavor );
     if ( nT == SOT_FORMAT_STRING )
     {
         aAny <<= (::rtl::OUString)GetString();
@@ -74,7 +74,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
 
         SvMemoryStream* pStream = ( nT == SOT_FORMATSTR_ID_EDITENGINE ) ? &GetStream() : &GetRTFStream();
         pStream->Seek( STREAM_SEEK_TO_END );
-        ULONG nLen = pStream->Tell();
+        sal_uLong nLen = pStream->Tell();
         pStream->Seek(0);
 
         uno::Sequence< sal_Int8 > aSeq( nLen );
@@ -104,7 +104,7 @@ sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor&
 {
     sal_Bool bSupported = sal_False;
 
-    ULONG nT = SotExchange::GetFormat( rFlavor );
+    sal_uLong nT = SotExchange::GetFormat( rFlavor );
     if ( ( nT == SOT_FORMAT_STRING ) || ( nT == SOT_FORMAT_RTF ) /* || ( nT == SOT_FORMAT_XML ) */ || ( nT == SOT_FORMATSTR_ID_EDITENGINE ) )
         bSupported = sal_True;
 
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 7d6df3f0fab4..0146e9af30f2 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -97,7 +97,7 @@ GlobalEditData::~GlobalEditData()
     // DefItems zerstoeren...
     // Oder einfach stehen lassen, da sowieso App-Ende?!
     if ( ppDefItems )
-        SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, TRUE );
+        SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, sal_True );
     delete pStdRefDevice;
 }
 
@@ -108,16 +108,16 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems = new SfxPoolItem*[EDITITEMCOUNT];
 
         // Absatzattribute:
-        SvxNumRule aTmpNumRule( 0, 0, FALSE );
+        SvxNumRule aTmpNumRule( 0, 0, sal_False );
 
         ppDefItems[0]  = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR );
         ppDefItems[1]  = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
-        ppDefItems[2]  = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, FALSE );
-        ppDefItems[3]  = new SfxBoolItem( EE_PARA_FORBIDDENRULES, TRUE );
-        ppDefItems[4]  = new SvxScriptSpaceItem( TRUE, EE_PARA_ASIANCJKSPACING );
+        ppDefItems[2]  = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, sal_False );
+        ppDefItems[3]  = new SfxBoolItem( EE_PARA_FORBIDDENRULES, sal_True );
+        ppDefItems[4]  = new SvxScriptSpaceItem( sal_True, EE_PARA_ASIANCJKSPACING );
         ppDefItems[5]  = new SvxNumBulletItem( aTmpNumRule, EE_PARA_NUMBULLET );
-        ppDefItems[6]  = new SfxBoolItem( EE_PARA_HYPHENATE, FALSE );
-        ppDefItems[7]  = new SfxBoolItem( EE_PARA_BULLETSTATE, TRUE );
+        ppDefItems[6]  = new SfxBoolItem( EE_PARA_HYPHENATE, sal_False );
+        ppDefItems[7]  = new SfxBoolItem( EE_PARA_BULLETSTATE, sal_True );
         ppDefItems[8]  = new SvxLRSpaceItem( EE_PARA_OUTLLRSPACE );
         ppDefItems[9]  = new SfxInt16Item( EE_PARA_OUTLLEVEL, -1 );
         ppDefItems[10]  = new SvxBulletItem( EE_PARA_BULLET );
@@ -136,12 +136,12 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems[21] = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE );
         ppDefItems[22] = new SvxCrossedOutItem( STRIKEOUT_NONE, EE_CHAR_STRIKEOUT );
         ppDefItems[23] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
-        ppDefItems[24] = new SvxContourItem( FALSE, EE_CHAR_OUTLINE );
-        ppDefItems[25] = new SvxShadowedItem( FALSE, EE_CHAR_SHADOW );
+        ppDefItems[24] = new SvxContourItem( sal_False, EE_CHAR_OUTLINE );
+        ppDefItems[25] = new SvxShadowedItem( sal_False, EE_CHAR_SHADOW );
         ppDefItems[26] = new SvxEscapementItem( 0, 100, EE_CHAR_ESCAPEMENT );
-        ppDefItems[27] = new SvxAutoKernItem( FALSE, EE_CHAR_PAIRKERNING );
+        ppDefItems[27] = new SvxAutoKernItem( sal_False, EE_CHAR_PAIRKERNING );
         ppDefItems[28] = new SvxKerningItem( 0, EE_CHAR_KERNING );
-        ppDefItems[29] = new SvxWordLineModeItem( FALSE, EE_CHAR_WLM );
+        ppDefItems[29] = new SvxWordLineModeItem( sal_False, EE_CHAR_WLM );
         ppDefItems[30] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE );
         ppDefItems[31] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CJK );
         ppDefItems[32] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CTL );
@@ -217,7 +217,7 @@ OutputDevice* GlobalEditData::GetStdRefDevice()
     return pStdRefDevice;
 }
 
-EditResId::EditResId( USHORT nId ):
+EditResId::EditResId( sal_uInt16 nId ):
     ResId( nId, *EE_DLL()->GetResMgr() )
 {
 }
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 817949294444..a2e82b6a8844 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -87,9 +87,9 @@ EditRTFParser::EditRTFParser( SvStream& rIn, EditSelection aSel, SfxItemPool& rA
     SetInsPos( EditPosition( pImpEditEngine, &aCurSel ) );
 
     // Umwandeln der Twips-Werte...
-    SetCalcValue( TRUE );
+    SetCalcValue( sal_True );
     SetChkStyleAttr( pImpEE->GetStatus().DoImportRTFStyleSheets() );
-    SetNewDoc( FALSE );     // damit die Pool-Defaults nicht
+    SetNewDoc( sal_False );     // damit die Pool-Defaults nicht
                             // ueberschrieben werden...
     aEditMapMode = MapMode( pImpEE->GetRefDevice()->GetMapMode().GetMapUnit() );
 }
@@ -133,7 +133,7 @@ SvParserState __EXPORT EditRTFParser::CallParser()
     if ( nLastAction == ACTION_INSERTPARABRK )
     {
         ContentNode* pCurNode = aCurSel.Max().GetNode();
-        USHORT nPara = pImpEditEngine->GetEditDoc().GetPos( pCurNode );
+        sal_uInt16 nPara = pImpEditEngine->GetEditDoc().GetPos( pCurNode );
         ContentNode* pPrevNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara-1 );
         DBG_ASSERT( pPrevNode, "Ungueltiges RTF-Dokument ?!" );
         EditSelection aSel;
@@ -143,17 +143,17 @@ SvParserState __EXPORT EditRTFParser::CallParser()
     }
     EditPaM aEnd2PaM( aCurSel.Max() );
     //AddRTFDefaultValues( aStart2PaM, aEnd2PaM );
-    BOOL bOnlyOnePara = ( aEnd2PaM.GetNode() == aStart2PaM.GetNode() );
+    sal_Bool bOnlyOnePara = ( aEnd2PaM.GetNode() == aStart2PaM.GetNode() );
     // Den Brocken wieder einfuegen...
     // Problem: Absatzattribute duerfen ggf. nicht uebernommen werden
     // => Zeichenattribute machen.
 
-    BOOL bSpecialBackward = aStart1PaM.GetNode()->Len() ? FALSE : TRUE;
+    sal_Bool bSpecialBackward = aStart1PaM.GetNode()->Len() ? sal_False : sal_True;
     if ( bOnlyOnePara || aStart1PaM.GetNode()->Len() )
         pImpEditEngine->ParaAttribsToCharAttribs( aStart2PaM.GetNode() );
     aCurSel.Min() = pImpEditEngine->ImpConnectParagraphs(
         aStart1PaM.GetNode(), aStart2PaM.GetNode(), bSpecialBackward );
-    bSpecialBackward = aEnd1PaM.GetNode()->Len() ? TRUE : FALSE;
+    bSpecialBackward = aEnd1PaM.GetNode()->Len() ? sal_True : sal_False;
     // wenn bOnlyOnePara, dann ist der Node beim Connect verschwunden.
     if ( !bOnlyOnePara && aEnd1PaM.GetNode()->Len() )
         pImpEditEngine->ParaAttribsToCharAttribs( aEnd2PaM.GetNode() );
@@ -176,9 +176,9 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r
     SvxFontItem aFontItem( aDefFont.GetFamily(), aDefFont.GetName(),
                     aDefFont.GetStyleName(), aDefFont.GetPitch(), aDefFont.GetCharSet(), EE_CHAR_FONTINFO );
 
-    USHORT nStartPara = pImpEditEngine->GetEditDoc().GetPos( rStart.GetNode() );
-    USHORT nEndPara = pImpEditEngine->GetEditDoc().GetPos( rEnd.GetNode() );
-    for ( USHORT nPara = nStartPara; nPara <= nEndPara; nPara++ )
+    sal_uInt16 nStartPara = pImpEditEngine->GetEditDoc().GetPos( rStart.GetNode() );
+    sal_uInt16 nEndPara = pImpEditEngine->GetEditDoc().GetPos( rEnd.GetNode() );
+    for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
     {
         ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara );
         DBG_ASSERT( pNode, "AddRTFDefaultValues - Kein Absatz ?!" );
@@ -195,12 +195,12 @@ void __EXPORT EditRTFParser::NextToken( int nToken )
     {
         case RTF_DEFF:
         {
-            nDefFont = USHORT(nTokenValue);
+            nDefFont = sal_uInt16(nTokenValue);
         }
         break;
         case RTF_DEFTAB:
         {
-            nDefTab = USHORT(nTokenValue);
+            nDefTab = sal_uInt16(nTokenValue);
         }
         break;
         case RTF_CELL:
@@ -287,7 +287,7 @@ void __EXPORT EditRTFParser::MovePos( int bForward )
 }
 
 void __EXPORT EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
-                                    USHORT& rCntPos )
+                                    sal_uInt16& rCntPos )
 {
     //    Gewollt ist: von der aktuellen Einfuegeposition den vorherigen
     //              Absatz bestimmen und von dem das Ende setzen.
@@ -295,7 +295,7 @@ void __EXPORT EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
     //              angewendet.
 
     ContentNode* pN = aCurSel.Max().GetNode();
-    USHORT nCurPara = pImpEditEngine->GetEditDoc().GetPos( pN );
+    sal_uInt16 nCurPara = pImpEditEngine->GetEditDoc().GetPos( pN );
     DBG_ASSERT( nCurPara != 0, "Absatz gleich 0: SetEnfPrevPara" );
     if ( nCurPara )
         nCurPara--;
@@ -305,7 +305,7 @@ void __EXPORT EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
     rCntPos = pPrevNode->Len();
 }
 
-int __EXPORT EditRTFParser::IsEndPara( SvxNodeIdx* pNd, USHORT nCnt ) const
+int __EXPORT EditRTFParser::IsEndPara( SvxNodeIdx* pNd, sal_uInt16 nCnt ) const
 {
     return ( nCnt == ( ((EditNodeIdx*)pNd)->GetNode()->Len()) );
 }
@@ -326,12 +326,12 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
     const MapUnit eSrcUnit  = aRTFMapMode.GetMapUnit();
     if (eDestUnit != eSrcUnit)
     {
-        USHORT aFntHeightIems[3] = { EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT_CJK, EE_CHAR_FONTHEIGHT_CTL };
+        sal_uInt16 aFntHeightIems[3] = { EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT_CJK, EE_CHAR_FONTHEIGHT_CTL };
         for (int i = 0; i < 2; ++i)
         {
-            if (SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( aFntHeightIems[i], FALSE, &pItem ))
+            if (SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( aFntHeightIems[i], sal_False, &pItem ))
             {
-                UINT32 nHeight  = ((SvxFontHeightItem*)pItem)->GetHeight();
+                sal_uInt32 nHeight  = ((SvxFontHeightItem*)pItem)->GetHeight();
                 long nNewHeight;
                 nNewHeight = pImpEditEngine->GetRefDevice()->LogicToLogic( (long)nHeight, eSrcUnit, eDestUnit );
 
@@ -341,7 +341,7 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
         }
     }
 
-    if( SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( EE_CHAR_ESCAPEMENT, FALSE, &pItem ))
+    if( SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( EE_CHAR_ESCAPEMENT, sal_False, &pItem ))
     {
         // die richtige
         long nEsc = ((SvxEscapementItem*)pItem)->GetEsc();
@@ -368,8 +368,8 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
 
     ContentNode* pSN = aStartPaM.GetNode();
     ContentNode* pEN = aEndPaM.GetNode();
-    USHORT nStartNode = pImpEditEngine->GetEditDoc().GetPos( pSN );
-    USHORT nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
+    sal_uInt16 nStartNode = pImpEditEngine->GetEditDoc().GetPos( pSN );
+    sal_uInt16 nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
     sal_Int16 nOutlLevel = 0xff;
 
     if ( rSet.StyleNo() && pImpEditEngine->GetStyleSheetPool() && pImpEditEngine->GetStatus().DoImportRTFStyleSheets() )
@@ -388,7 +388,7 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
 
     // Achtung: Selektion kann ueber mehrere Absaetze gehen.
     // Alle vollstaendigen Absaetze sind Absatzattribute...
-    for ( USHORT z = nStartNode+1; z < nEndNode; z++ )
+    for ( sal_uInt16 z = nStartNode+1; z < nEndNode; z++ )
     {
         DBG_ASSERT( pImpEditEngine->GetEditDoc().SaveGetObject( z ), "Node existiert noch nicht(RTF)" );
         pImpEditEngine->SetParaAttribs( z, rSet.GetAttrSet() );
@@ -426,7 +426,7 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
     // OutlLevel...
     if ( nOutlLevel != 0xff )
     {
-        for ( USHORT n = nStartNode; n <= nEndNode; n++ )
+        for ( sal_uInt16 n = nStartNode; n <= nEndNode; n++ )
         {
             ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( n );
             pNode->GetContentAttribs().GetItems().Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nOutlLevel ) );
@@ -510,8 +510,8 @@ void EditRTFParser::ReadField()
 {
     // Aus SwRTFParser::ReadField()
     int _nOpenBrakets = 1;      // die erste wurde schon vorher erkannt
-    BOOL bFldInst = FALSE;
-    BOOL bFldRslt = FALSE;
+    sal_Bool bFldInst = sal_False;
+    sal_Bool bFldRslt = sal_False;
     String aFldInst;
     String aFldRslt;
 
@@ -524,8 +524,8 @@ void EditRTFParser::ReadField()
                 _nOpenBrakets--;
                 if ( _nOpenBrakets == 1 )
                 {
-                    bFldInst = FALSE;
-                    bFldRslt = FALSE;
+                    bFldInst = sal_False;
+                    bFldRslt = sal_False;
                 }
             }
             break;
@@ -536,10 +536,10 @@ void EditRTFParser::ReadField()
             case RTF_FIELD:     SkipGroup();
                                 break;
 
-            case RTF_FLDINST:   bFldInst = TRUE;
+            case RTF_FLDINST:   bFldInst = sal_True;
                                 break;
 
-            case RTF_FLDRSLT:   bFldRslt = TRUE;
+            case RTF_FLDRSLT:   bFldRslt = sal_True;
                                 break;
 
             case RTF_TEXTTOKEN:
@@ -601,7 +601,7 @@ void EditRTFParser::SkipGroup()
     SkipToken( -1 );        // die schliesende Klammer wird "oben" ausgewertet
 }
 
-ULONG __EXPORT EditNodeIdx::GetIdx() const
+sal_uLong __EXPORT EditNodeIdx::GetIdx() const
 {
     return pImpEditEngine->GetEditDoc().GetPos( pNode );
 }
@@ -621,13 +621,13 @@ SvxNodeIdx* __EXPORT EditPosition::MakeNodeIdx() const
     return new EditNodeIdx( pImpEditEngine, pCurSel->Max().GetNode() );
 }
 
-ULONG __EXPORT EditPosition::GetNodeIdx() const
+sal_uLong __EXPORT EditPosition::GetNodeIdx() const
 {
     ContentNode* pN = pCurSel->Max().GetNode();
     return pImpEditEngine->GetEditDoc().GetPos( pN );
 }
 
-USHORT __EXPORT EditPosition::GetCntIdx() const
+sal_uInt16 __EXPORT EditPosition::GetCntIdx() const
 {
     return pCurSel->Max().GetIndex();
 }
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 42c75b811f33..189f97b332ee 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -43,7 +43,7 @@ private:
 public:
                         EditNodeIdx( ImpEditEngine* pIEE, ContentNode* pNd = 0)
                             { pImpEditEngine = pIEE; pNode = pNd; }
-    virtual ULONG       GetIdx() const;
+    virtual sal_uLong       GetIdx() const;
     virtual SvxNodeIdx* Clone() const;
     ContentNode*        GetNode() { return pNode; }
 };
@@ -58,8 +58,8 @@ public:
                     EditPosition( ImpEditEngine* pIEE, EditSelection* pSel )
                             { pImpEditEngine = pIEE; pCurSel = pSel; }
 
-    virtual ULONG   GetNodeIdx() const;
-    virtual USHORT  GetCntIdx() const;
+    virtual sal_uLong   GetNodeIdx() const;
+    virtual sal_uInt16  GetCntIdx() const;
 
     // erzeuge von sich selbst eine Kopie
     virtual SvxPosition* Clone() const;
@@ -80,22 +80,22 @@ private:
     MapMode             aRTFMapMode;
     MapMode             aEditMapMode;
 
-    USHORT              nDefFont;
-    USHORT              nDefTab;
-    USHORT              nDefFontHeight;
-    BYTE                nLastAction;
+    sal_uInt16              nDefFont;
+    sal_uInt16              nDefTab;
+    sal_uInt16              nDefFontHeight;
+    sal_uInt8               nLastAction;
 
 protected:
     virtual void        InsertPara();
     virtual void        InsertText();
-    virtual void        MovePos( int bForward = TRUE );
+    virtual void        MovePos( int bForward = sal_True );
     virtual void        SetEndPrevPara( SvxNodeIdx*& rpNodePos,
-                                            USHORT& rCntPos );
+                                            sal_uInt16& rCntPos );
 
     virtual void        UnknownAttrToken( int nToken, SfxItemSet* pSet );
     virtual void        NextToken( int nToken );
     virtual void        SetAttrInDoc( SvxRTFItemStackType &rSet );
-    virtual int         IsEndPara( SvxNodeIdx* pNd, USHORT nCnt ) const;
+    virtual int         IsEndPara( SvxNodeIdx* pNd, sal_uInt16 nCnt ) const;
     virtual void        CalcValue();
     void                CreateStyleSheets();
     SfxStyleSheet*      CreateStyleSheet( SvxRTFStyleType* pRTFStyle );
@@ -114,7 +114,7 @@ public:
     void        SetDestCharSet( CharSet eCharSet )  { eDestCharSet = eCharSet; }
     CharSet     GetDestCharSet() const              { return eDestCharSet; }
 
-    USHORT      GetDefTab() const                   { return nDefTab; }
+    sal_uInt16      GetDefTab() const                   { return nDefTab; }
     Font        GetDefFont()                        { return GetFont( nDefFont ); }
 
     EditPaM     GetCurPaM() const                   { return aCurSel.Max(); }
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 9ac7de8e2b7d..d2a25f327fd9 100644..100755
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -95,7 +95,7 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) :
     nInvMore            = 1;
     nTravelXPos         = TRAVEL_X_DONTKNOW;
     nControl            = EV_CNTRL_AUTOSCROLL | EV_CNTRL_ENABLEPASTE;
-    bActiveDragAndDropListener = FALSE;
+    bActiveDragAndDropListener = sal_False;
 
     aEditSelection.Min() = pEng->pImpEditEngine->GetEditDoc().GetStartPaM();
     aEditSelection.Max() = pEng->pImpEditEngine->GetEditDoc().GetEndPaM();
@@ -212,18 +212,18 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
             EditLine* pLine = pTmpPortion->GetLines().GetObject( nLine );
             DBG_ASSERT( pLine, "Zeile nicht gefunden: DrawSelection()" );
 
-            BOOL bPartOfLine = FALSE;
+            sal_Bool bPartOfLine = sal_False;
             sal_uInt16 nStartIndex = pLine->GetStart();
             sal_uInt16 nEndIndex = pLine->GetEnd();
             if ( ( nPara == nStartPara ) && ( nLine == nStartLine ) && ( nStartIndex != aTmpSel.Min().GetIndex() ) )
             {
                 nStartIndex = aTmpSel.Min().GetIndex();
-                bPartOfLine = TRUE;
+                bPartOfLine = sal_True;
             }
             if ( ( nPara == nEndPara ) && ( nLine == nEndLine ) && ( nEndIndex != aTmpSel.Max().GetIndex() ) )
             {
                 nEndIndex = aTmpSel.Max().GetIndex();
-                bPartOfLine = TRUE;
+                bPartOfLine = sal_True;
             }
 
             // Kann passieren, wenn am Anfang einer umgebrochenen Zeile.
@@ -254,8 +254,8 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
             }
             else
             {
-                USHORT nTmpStartIndex = nStartIndex;
-                USHORT nWritingDirStart, nTmpEndIndex;
+                sal_uInt16 nTmpStartIndex = nStartIndex;
+                sal_uInt16 nWritingDirStart, nTmpEndIndex;
 
                 while ( nTmpStartIndex < nEndIndex )
                 {
@@ -265,7 +265,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
 
                     DBG_ASSERT( nTmpEndIndex > nTmpStartIndex, "DrawSelection, Start >= End?" );
 
-                    long nX1 = pEditEngine->pImpEditEngine->GetXPos( pTmpPortion, pLine, nTmpStartIndex, TRUE );
+                    long nX1 = pEditEngine->pImpEditEngine->GetXPos( pTmpPortion, pLine, nTmpStartIndex, sal_True );
                     long nX2 = pEditEngine->pImpEditEngine->GetXPos( pTmpPortion, pLine, nTmpEndIndex );
 
                     Point aPt1( Min( nX1, nX2 ), aTopLeft.Y() );
@@ -335,7 +335,7 @@ void ImpEditView::ImplDrawHighlightRect( Window* _pOutWin, const Point& rDocPosT
 }
 
 
-BOOL ImpEditView::IsVertical() const
+sal_Bool ImpEditView::IsVertical() const
 {
     return pEditEngine->pImpEditEngine->IsVertical();
 }
@@ -634,7 +634,7 @@ void ImpEditView::CalcAnchorPoint()
     }
 }
 
-void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, USHORT nShowCursorFlags )
+void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_uInt16 nShowCursorFlags )
 {
     // Kein ShowCursor bei einer leeren View...
     if ( ( aOutArea.Left() >= aOutArea.Right() ) && ( aOutArea.Top() >= aOutArea.Bottom() ) )
@@ -658,8 +658,8 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
 
     EditPaM aPaM( aEditSelection.Max() );
 
-    USHORT nTextPortionStart = 0;
-    USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
+    sal_uInt16 nTextPortionStart = 0;
+    sal_uInt16 nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
     if (nPara == USHRT_MAX) // #i94322
         return;
     ParaPortion* pParaPortion = pEditEngine->pImpEditEngine->GetParaPortions().GetObject( nPara );
@@ -685,7 +685,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
             // If we are behind a portion, and the next portion has other direction, we must change position...
             aEditCursor.Left() = aEditCursor.Right() = pEditEngine->pImpEditEngine->PaMtoEditCursor( aPaM, GETCRSR_TXTONLY|GETCRSR_PREFERPORTIONSTART ).Left();
 
-            USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, TRUE );
+            sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, sal_True );
             TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
             if ( pTextPortion->GetKind() == PORTIONKIND_TAB )
             {
@@ -693,7 +693,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
             }
             else
             {
-                EditPaM aNext = pEditEngine->pImpEditEngine->CursorRight( aPaM, (USHORT)i18n::CharacterIteratorMode::SKIPCELL );
+                EditPaM aNext = pEditEngine->pImpEditEngine->CursorRight( aPaM, (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL );
                 Rectangle aTmpRect = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY );
                 if ( aTmpRect.Top() != aEditCursor.Top() )
                     aTmpRect = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY|GETCRSR_ENDOFLINE );
@@ -856,9 +856,9 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
         unsigned char nCursorDir = CURSOR_DIRECTION_NONE;
         if ( IsInsertMode() && !aEditSelection.HasRange() && ( pEditEngine->pImpEditEngine->HasDifferentRTLLevels( aPaM.GetNode() ) ) )
         {
-            USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, nShowCursorFlags & GETCRSR_PREFERPORTIONSTART ? TRUE : FALSE );
+            sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, nShowCursorFlags & GETCRSR_PREFERPORTIONSTART ? sal_True : sal_False );
             TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
-            USHORT nRTLLevel = pTextPortion->GetRightToLeft();
+            sal_uInt16 nRTLLevel = pTextPortion->GetRightToLeft();
             if ( nRTLLevel%2 )
                 nCursorDir = CURSOR_DIRECTION_RTL;
             else
@@ -875,7 +875,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
         {
             SvxFont aFont;
             pEditEngine->pImpEditEngine->SeekCursor( aPaM.GetNode(), aPaM.GetIndex()+1, aFont );
-            ULONG nContextFlags = INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT;
+            sal_uLong nContextFlags = INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT;
             GetWindow()->SetInputContext( InputContext( aFont, nContextFlags ) );
         }
     }
@@ -888,7 +888,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
     }
 }
 
-Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
+Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
 {
     DBG_ASSERT( pEditEngine->pImpEditEngine->IsFormatted(), "Scroll: Nicht formatiert!" );
     if ( !ndX && !ndY )
@@ -935,9 +935,9 @@ Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
         aNewVisArea.Left() -= ndY;
         aNewVisArea.Right() -= ndY;
     }
-    if ( ( nRangeCheck == RGCHK_PAPERSZ1 ) && ( aNewVisArea.Right() > (long)pEditEngine->pImpEditEngine->CalcTextWidth( FALSE ) ) )
+    if ( ( nRangeCheck == RGCHK_PAPERSZ1 ) && ( aNewVisArea.Right() > (long)pEditEngine->pImpEditEngine->CalcTextWidth( sal_False ) ) )
     {
-        long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( FALSE ) - aNewVisArea.Right();     // negativ
+        long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( sal_False ) - aNewVisArea.Right();     // negativ
         aNewVisArea.Move( nDiff, 0 );   // koennte im neg. Bereich landen...
     }
     if ( ( aNewVisArea.Left() < 0 ) && ( nRangeCheck != RGCHK_NONE ) )
@@ -995,7 +995,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
 
 sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     KeyFuncType eFunc = rKeyEvent.GetKeyCode().GetFunction();
     if ( eFunc != KEYFUNC_DONTKNOW )
@@ -1016,7 +1016,7 @@ sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent )
             {
                 Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
                 CutCopy( aClipBoard, sal_False );
-                bDone = TRUE;
+                bDone = sal_True;
             }
             break;
             case KEYFUNC_PASTE:
@@ -1066,7 +1066,7 @@ sal_Bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent )
     else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
     {
         Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection());
-        CutCopy( aClipBoard, FALSE );
+        CutCopy( aClipBoard, sal_False );
     }
 
     return pEditEngine->pImpEditEngine->MouseButtonUp( rMouseEvent, GetEditViewPtr() );
@@ -1184,7 +1184,7 @@ void ImpEditView::DeleteSelected()
 
     SetEditSelection( EditSelection( aPaM, aPaM ) );
     pEditEngine->pImpEditEngine->FormatAndUpdate( GetEditViewPtr() );
-    ShowCursor( DoAutoScroll(), TRUE );
+    ShowCursor( DoAutoScroll(), sal_True );
 }
 
 const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_uInt16* pPara, sal_uInt16* pPos ) const
@@ -1220,20 +1220,20 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_uInt16* pPara,
     return NULL;
 }
 
-BOOL ImpEditView::IsBulletArea( const Point& rPos, sal_uInt16* pPara )
+sal_Bool ImpEditView::IsBulletArea( const Point& rPos, sal_uInt16* pPara )
 {
     if ( pPara )
         *pPara = 0xFFFF;
 
     if( !GetOutputArea().IsInside( rPos ) )
-        return FALSE;
+        return sal_False;
 
     Point aDocPos( GetDocPos( rPos ) );
     EditPaM aPaM = pEditEngine->pImpEditEngine->GetPaM( aDocPos, sal_False );
 
     if ( aPaM.GetIndex() == 0 )
     {
-        USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
+        sal_uInt16 nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
         Rectangle aBulletArea = pEditEngine->GetBulletArea( nPara );
         long nY = pEditEngine->GetDocPosTopLeft( nPara ).Y();
         ParaPortion* pParaPortion = pEditEngine->pImpEditEngine->GetParaPortions().GetObject( nPara );
@@ -1245,14 +1245,14 @@ BOOL ImpEditView::IsBulletArea( const Point& rPos, sal_uInt16* pPara )
         {
             if ( pPara )
                 *pPara = nPara;
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, BOOL bCut )
+void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, sal_Bool bCut )
 {
     if ( rxClipboard.is() && GetEditSelection().HasRange() )
     {
@@ -1285,7 +1285,7 @@ void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::d
     }
 }
 
-void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, BOOL bUseSpecial )
+void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, sal_Bool bUseSpecial )
 {
     if ( rxClipboard.is() )
     {
@@ -1353,58 +1353,58 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat
             SetEditSelection( aSel );
             pEditEngine->pImpEditEngine->UpdateSelections();
             pEditEngine->pImpEditEngine->FormatAndUpdate( GetEditViewPtr() );
-            ShowCursor( DoAutoScroll(), TRUE );
+            ShowCursor( DoAutoScroll(), sal_True );
         }
     }
 }
 
 
-BOOL ImpEditView::IsInSelection( const EditPaM& rPaM )
+sal_Bool ImpEditView::IsInSelection( const EditPaM& rPaM )
 {
     EditSelection aSel = GetEditSelection();
     if ( !aSel.HasRange() )
-        return FALSE;
+        return sal_False;
 
     aSel.Adjust( pEditEngine->pImpEditEngine->GetEditDoc() );
 
-    USHORT nStartNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( aSel.Max().GetNode() );
-    USHORT nCurNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( rPaM.GetNode() );
+    sal_uInt16 nStartNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nCurNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( rPaM.GetNode() );
 
     if ( ( nCurNode > nStartNode ) && ( nCurNode < nEndNode ) )
-        return TRUE;
+        return sal_True;
 
     if ( nStartNode == nEndNode )
     {
         if ( nCurNode == nStartNode )
             if ( ( rPaM.GetIndex() >= aSel.Min().GetIndex() ) && ( rPaM.GetIndex() < aSel.Max().GetIndex() ) )
-                return TRUE;
+                return sal_True;
     }
     else if ( ( nCurNode == nStartNode ) && ( rPaM.GetIndex() >= aSel.Min().GetIndex() ) )
-        return TRUE;
+        return sal_True;
     else if ( ( nCurNode == nEndNode ) && ( rPaM.GetIndex() < aSel.Max().GetIndex() ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 void ImpEditView::CreateAnchor()
 {
-    pEditEngine->pImpEditEngine->bInSelection = TRUE;
+    pEditEngine->pImpEditEngine->bInSelection = sal_True;
     GetEditSelection().Min() = GetEditSelection().Max();
 }
 
 void ImpEditView::DeselectAll()
 {
-    pEditEngine->pImpEditEngine->bInSelection = FALSE;
+    pEditEngine->pImpEditEngine->bInSelection = sal_False;
     DrawSelection();
     GetEditSelection().Min() = GetEditSelection().Max();
 }
 
-BOOL ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
+sal_Bool ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
 {
     if ( pDragAndDropInfo && pDragAndDropInfo->pField )
-        return TRUE;
+        return sal_True;
 
     Point aMousePos( rPosPixel );
 
@@ -1413,15 +1413,15 @@ BOOL ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
 
     if ( ( !GetOutputArea().IsInside( aMousePos ) ) && !pEditEngine->pImpEditEngine->IsInSelectionMode() )
     {
-        return FALSE;
+        return sal_False;
     }
 
     Point aDocPos( GetDocPos( aMousePos ) );
-    EditPaM aPaM = pEditEngine->pImpEditEngine->GetPaM( aDocPos, FALSE );
+    EditPaM aPaM = pEditEngine->pImpEditEngine->GetPaM( aDocPos, sal_False );
     return IsInSelection( aPaM );
 }
 
-BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
+sal_Bool ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
 {
     pEditEngine->pImpEditEngine->CheckIdleFormatter();
 
@@ -1432,7 +1432,7 @@ BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
 
     if ( ( !GetOutputArea().IsInside( aMousePos ) ) && !pEditEngine->pImpEditEngine->IsInSelectionMode() )
     {
-        return FALSE;
+        return sal_False;
     }
 
     Point aDocPos( GetDocPos( aMousePos ) );
@@ -1443,7 +1443,7 @@ BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
     // Das muss doch nicht sein !
 
     EditPaM aPaM = pEditEngine->pImpEditEngine->GetPaM( aDocPos );
-    BOOL bGotoCursor = DoAutoScroll();
+    sal_Bool bGotoCursor = DoAutoScroll();
 
     // aTmpNewSel: Diff zwischen alt und neu, nicht die neue Selektion
     EditSelection aTmpNewSel( GetEditSelection().Max(), aPaM );
@@ -1471,9 +1471,9 @@ BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
     }
     // <--
 
-    BOOL bForceCursor = ( pDragAndDropInfo ? FALSE : TRUE ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
+    sal_Bool bForceCursor = ( pDragAndDropInfo ? sal_False : sal_True ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
     ShowCursor( bGotoCursor, bForceCursor );
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1558,7 +1558,7 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
     else
     {
         // Field?!
-        USHORT nPara, nPos;
+        sal_uInt16 nPara, nPos;
         Point aMousePos = GetWindow()->PixelToLogic( aMousePosPixel );
         const SvxFieldItem* pField = GetField( aMousePos, &nPara, &nPos );
         if ( pField )
@@ -1569,18 +1569,18 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
             aCopySel = EditSelection( EditPaM( pNode, nPos ), EditPaM( pNode, nPos+1 ) );
             GetEditSelection() = aCopySel;
             DrawSelection();
-            BOOL bGotoCursor = DoAutoScroll();
-            BOOL bForceCursor = ( pDragAndDropInfo ? FALSE : TRUE ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
+            sal_Bool bGotoCursor = DoAutoScroll();
+            sal_Bool bForceCursor = ( pDragAndDropInfo ? sal_False : sal_True ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
             ShowCursor( bGotoCursor, bForceCursor );
         }
         else if ( IsBulletArea( aMousePos, &nPara ) )
         {
             pDragAndDropInfo = new DragAndDropInfo();
-            pDragAndDropInfo->bOutlinerMode = TRUE;
+            pDragAndDropInfo->bOutlinerMode = sal_True;
             EditPaM aStartPaM( pEditEngine->pImpEditEngine->GetEditDoc().GetObject( nPara ), 0 );
             EditPaM aEndPaM( aStartPaM );
             const SfxInt16Item& rLevel = (const SfxInt16Item&) pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL );
-            for ( USHORT n = nPara +1; n < pEditEngine->pImpEditEngine->GetEditDoc().Count(); n++ )
+            for ( sal_uInt16 n = nPara +1; n < pEditEngine->pImpEditEngine->GetEditDoc().Count(); n++ )
             {
                 const SfxInt16Item& rL = (const SfxInt16Item&) pEditEngine->GetParaAttrib( n, EE_PARA_OUTLLEVEL );
                 if ( rL.GetValue() > rLevel.GetValue() )
@@ -1706,7 +1706,7 @@ void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSo
             pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_DRAGANDDROP );
 
         HideDDCursor();
-        ShowCursor( DoAutoScroll(), TRUE );
+        ShowCursor( DoAutoScroll(), sal_True );
         delete pDragAndDropInfo;
         pDragAndDropInfo = NULL;
         pEditEngine->GetEndDropHdl().Call(GetEditViewPtr());
@@ -1722,19 +1722,19 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro
     if ( pDragAndDropInfo && pDragAndDropInfo->bDragAccepted )
     {
         pEditEngine->GetBeginDropHdl().Call(GetEditViewPtr());
-        BOOL bChanges = FALSE;
+        sal_Bool bChanges = sal_False;
 
         HideDDCursor();
 
         if ( pDragAndDropInfo->bStarterOfDD )
         {
             pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_DRAGANDDROP );
-            pDragAndDropInfo->bUndoAction = TRUE;
+            pDragAndDropInfo->bUndoAction = sal_True;
         }
 
         if ( pDragAndDropInfo->bOutlinerMode )
         {
-            bChanges = TRUE;
+            bChanges = sal_True;
             GetEditViewPtr()->MoveParagraphs( Range( pDragAndDropInfo->aBeginDragSel.nStartPara, pDragAndDropInfo->aBeginDragSel.nEndPara ), pDragAndDropInfo->nOutlinerDropDest );
         }
         else
@@ -1742,7 +1742,7 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro
             uno::Reference< datatransfer::XTransferable > xDataObj = rDTDE.Transferable;
             if ( xDataObj.is() )
             {
-                bChanges = TRUE;
+                bChanges = sal_True;
                 // Selektion wegmalen...
                 DrawSelection();
                 EditPaM aPaM( pDragAndDropInfo->aDropDest );
@@ -1871,7 +1871,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
             pDragAndDropInfo->aDropDest = aPaM;
             if ( pDragAndDropInfo->bOutlinerMode )
             {
-                USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
+                sal_uInt16 nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
                 ParaPortion* pPPortion = pEditEngine->pImpEditEngine->GetParaPortions().SaveGetObject( nPara );
                 long nDestParaStartY = pEditEngine->pImpEditEngine->GetParaPortions().GetYOffset( pPPortion );
                 long nRel = aDocPos.Y() - nDestParaStartY;
@@ -1887,7 +1887,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
                 if( ( pDragAndDropInfo->nOutlinerDropDest >= pDragAndDropInfo->aBeginDragSel.nStartPara ) &&
                     ( pDragAndDropInfo->nOutlinerDropDest <= (pDragAndDropInfo->aBeginDragSel.nEndPara+1) ) )
                 {
-                    bAccept = FALSE;
+                    bAccept = sal_False;
                 }
             }
             else if ( HasSelection() )
@@ -1899,7 +1899,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
                 aCurSel.Adjust();
                 if ( !aDestSel.IsLess( aCurSel ) && !aDestSel.IsGreater( aCurSel ) )
                 {
-                    bAccept = FALSE;
+                    bAccept = sal_False;
                 }
             }
             if ( bAccept )
@@ -1950,7 +1950,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
                     HideDDCursor();
                     ShowDDCursor(aEditCursor );
                 }
-                pDragAndDropInfo->bDragAccepted = TRUE;
+                pDragAndDropInfo->bDragAccepted = sal_True;
                 rDTDE.Context->acceptDrag( rDTDE.DropAction );
             }
         }
@@ -1960,7 +1960,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
     {
         HideDDCursor();
         if (pDragAndDropInfo)
-            pDragAndDropInfo->bDragAccepted = FALSE;
+            pDragAndDropInfo->bDragAccepted = sal_False;
         rDTDE.Context->rejectDrag();
     }
 }
@@ -1980,7 +1980,7 @@ void ImpEditView::AddDragAndDropListeners()
         pWindow->GetDropTarget()->setActive( sal_True );
         pWindow->GetDropTarget()->setDefaultActions( datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE );
 
-        bActiveDragAndDropListener = TRUE;
+        bActiveDragAndDropListener = sal_True;
     }
 }
 
@@ -2000,6 +2000,6 @@ void ImpEditView::RemoveDragAndDropListeners()
             mxDnDListener.clear();
         }
 
-        bActiveDragAndDropListener = FALSE;
+        bActiveDragAndDropListener = sal_False;
     }
 }
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index c8f5e2948665..1ac4c32f4af8 100755
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -120,7 +120,7 @@ struct DragAndDropInfo
     sal_uInt16          nCursorWidth;
     ESelection          aBeginDragSel;
     EditPaM             aDropDest;
-    USHORT              nOutlinerDropDest;
+    sal_uInt16              nOutlinerDropDest;
     ESelection          aDropSel;
     VirtualDevice*      pBackground;
     const SvxFieldItem* pField;
@@ -236,7 +236,7 @@ private:
 
 
     long                nInvMore;
-    ULONG               nControl;
+    sal_uLong               nControl;
     sal_uInt32          nTravelXPos;
     sal_uInt16          nExtraCursorFlags;
     sal_uInt16          nCursorBidiLevel;
@@ -287,13 +287,13 @@ public:
     void                ResetOutputArea( const Rectangle& rRec );
     const Rectangle&    GetOutputArea() const   { return aOutArea; }
 
-    BOOL            IsVertical() const;
+    sal_Bool            IsVertical() const;
 
-    BOOL            PostKeyEvent( const KeyEvent& rKeyEvent );
+    sal_Bool            PostKeyEvent( const KeyEvent& rKeyEvent );
 
-    BOOL            MouseButtonUp( const MouseEvent& rMouseEvent );
-    BOOL            MouseButtonDown( const MouseEvent& rMouseEvent );
-    BOOL            MouseMove( const MouseEvent& rMouseEvent );
+    sal_Bool            MouseButtonUp( const MouseEvent& rMouseEvent );
+    sal_Bool            MouseButtonDown( const MouseEvent& rMouseEvent );
+    sal_Bool            MouseMove( const MouseEvent& rMouseEvent );
     void            Command( const CommandEvent& rCEvt );
 
     void            CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, sal_Bool bCut );
@@ -330,7 +330,7 @@ public:
     void            AddDragAndDropListeners();
     void            RemoveDragAndDropListeners();
 
-    BOOL            IsBulletArea( const Point& rPos, sal_uInt16* pPara );
+    sal_Bool            IsBulletArea( const Point& rPos, sal_uInt16* pPara );
 
 //  Fuer die SelectionEngine...
     void            CreateAnchor();
@@ -345,9 +345,9 @@ public:
     void            CalcAnchorPoint();
     void            RecalcOutputArea();
 
-    void            ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, BOOL test );
-    void            ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, USHORT nShowCursorFlags = 0 );
-    Pair            Scroll( long ndX, long ndY, BYTE nRangeCheck = RGCHK_NEG );
+    void            ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_Bool test );
+    void            ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_uInt16 nShowCursorFlags = 0 );
+    Pair            Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck = RGCHK_NEG );
 
     void            SetInsertMode( sal_Bool bInsert );
     sal_Bool            IsInsertMode() const            { return ( ( nControl & EV_CNTRL_OVERWRITE ) == 0 ); }
@@ -453,9 +453,9 @@ private:
     sal_uInt16          nStretchX;
     sal_uInt16          nStretchY;
 
-    USHORT              nAsianCompressionMode;
-    BOOL                bKernAsianPunctuation;
-    BOOL                bAddExtLeading;
+    sal_uInt16              nAsianCompressionMode;
+    sal_Bool                bKernAsianPunctuation;
+    sal_Bool                bAddExtLeading;
 
     EEHorizontalTextDirection eDefaultHorizontalTextDirection;
 
@@ -538,14 +538,14 @@ private:
 
     EditPaM             GetPaM( Point aDocPos, sal_Bool bSmart = sal_True );
     EditPaM             GetPaM( ParaPortion* pPortion, Point aPos, sal_Bool bSmart = sal_True );
-    long                GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT nIndex, BOOL bPreferPortionStart = FALSE );
-    long                GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, USHORT nTextPortion );
-    USHORT              GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nX, BOOL bSmart = TRUE );
+    long                GetXPos( ParaPortion* pParaPortion, EditLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart = sal_False );
+    long                GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, sal_uInt16 nTextPortion );
+    sal_uInt16              GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nX, sal_Bool bSmart = sal_True );
     Range               GetInvalidYOffsets( ParaPortion* pPortion );
     Range               GetLineXPosStartEnd( ParaPortion* pParaPortion, EditLine* pLine );
 
-    void                SetParaAttrib( BYTE nFunc, EditSelection aSel, sal_uInt16 nValue );
-    sal_uInt16          GetParaAttrib( BYTE nFunc, EditSelection aSel );
+    void                SetParaAttrib( sal_uInt8 nFunc, EditSelection aSel, sal_uInt16 nValue );
+    sal_uInt16          GetParaAttrib( sal_uInt8 nFunc, EditSelection aSel );
     void                SetCharAttrib( EditSelection aSel, const SfxPoolItem& rItem );
     void                ParaAttribsToCharAttribs( ContentNode* pNode );
     void                GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
@@ -553,12 +553,12 @@ private:
     EditTextObject*     CreateBinTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 ) const;
     void                StoreBinTextObject( SvStream& rOStream, BinTextObject& rTextObject );
     EditSelection       InsertBinTextObject( BinTextObject&, EditPaM aPaM );
-    EditSelection       InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, BOOL bUseSpecial );
+    EditSelection       InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial );
 
     EditPaM             Clear();
     EditPaM             RemoveText();
     EditPaM             RemoveText( EditSelection aEditSelection );
-    sal_Bool            CreateLines( USHORT nPara, sal_uInt32 nStartPosY );
+    sal_Bool            CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY );
     void                CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY );
     sal_Bool            FinishCreateLines( ParaPortion* pParaPortion );
     void                CalcCharPositions( ParaPortion* pParaPortion );
@@ -586,9 +586,9 @@ private:
 
     sal_Bool            ImpCheckRefMapMode();
 
-    BOOL                ImplHasText() const;
+    sal_Bool                ImplHasText() const;
 
-    void                ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT nEnd, SvUShorts& rArray );
+    void                ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, SvUShorts& rArray );
 
     void                InsertContent( ContentNode* pNode, sal_uInt16 nPos );
     EditPaM             SplitContent( sal_uInt16 nNode, sal_uInt16 nSepPos );
@@ -601,8 +601,8 @@ private:
     EditPaM             PageDown( const EditPaM& rPaM, EditView* pView);
     EditPaM             CursorUp( const EditPaM& rPaM, EditView* pEditView );
     EditPaM             CursorDown( const EditPaM& rPaM, EditView* pEditView );
-    EditPaM             CursorLeft( const EditPaM& rPaM, USHORT nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
-    EditPaM             CursorRight( const EditPaM& rPaM, USHORT nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
+    EditPaM             CursorLeft( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
+    EditPaM             CursorRight( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
     EditPaM             CursorStartOfLine( const EditPaM& rPaM );
     EditPaM             CursorEndOfLine( const EditPaM& rPaM );
     EditPaM             CursorStartOfParagraph( const EditPaM& rPaM );
@@ -613,22 +613,22 @@ private:
     EditPaM             WordRight( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
     EditPaM             StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
     EditPaM             EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
-    EditSelection       SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, BOOL bAcceptStartOfWord = TRUE );
+    EditSelection       SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_Bool bAcceptStartOfWord = sal_True );
     EditSelection       SelectSentence( const EditSelection& rCurSel );
-    EditPaM             CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, USHORT nCharacterIteratorMode, BOOL bToLeft );
-    EditPaM             CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, BOOL bStart );
+    EditPaM             CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode, sal_Bool bToLeft );
+    EditPaM             CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, sal_Bool bStart );
 
 
-    void                InitScriptTypes( USHORT nPara );
-    USHORT              GetScriptType( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const;
-    USHORT              GetScriptType( const EditSelection& rSel ) const;
-    BOOL                IsScriptChange( const EditPaM& rPaM ) const;
-    BOOL                HasScriptType( USHORT nPara, USHORT nType ) const;
+    void                InitScriptTypes( sal_uInt16 nPara );
+    sal_uInt16              GetScriptType( const EditPaM& rPaM, sal_uInt16* pEndPos = NULL ) const;
+    sal_uInt16              GetScriptType( const EditSelection& rSel ) const;
+    sal_Bool                IsScriptChange( const EditPaM& rPaM ) const;
+    sal_Bool                HasScriptType( sal_uInt16 nPara, sal_uInt16 nType ) const;
 
-    BOOL                ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, USHORT nStartPos, sal_Int32* pDXArray, USHORT n100thPercentFromMax, BOOL bManipulateDXArray );
+    sal_Bool                ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray );
     void                ImplExpandCompressedPortions( EditLine* pLine, ParaPortion* pParaPortion, long nRemainingWidth );
 
-    void                ImplInitLayoutMode( OutputDevice* pOutDev, USHORT nPara, USHORT nIndex );
+    void                ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uInt16 nIndex );
     void                ImplInitDigitMode( OutputDevice* pOutDev, String* pString, xub_StrLen nStt, xub_StrLen nLen, LanguageType eLang );
 
     EditPaM             ReadText( SvStream& rInput, EditSelection aSel );
@@ -640,7 +640,7 @@ private:
     sal_uInt32          WriteRTF( SvStream& rOutput, EditSelection aSel );
     sal_uInt32          WriteXML( SvStream& rOutput, EditSelection aSel );
     sal_uInt32          WriteHTML( SvStream& rOutput, EditSelection aSel );
-    sal_uInt32          WriteBin( SvStream& rOutput, EditSelection aSel, BOOL bStoreUnicode = FALSE ) const;
+    sal_uInt32          WriteBin( SvStream& rOutput, EditSelection aSel, sal_Bool bStoreUnicode = sal_False ) const;
 
     void                WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
                         SvxFontTable& rFontTable, SvxColorList& rColorList );
@@ -665,12 +665,12 @@ private:
     Color               GetBackgroundColor() const { return maBackgroundColor; }
 
     Color               GetAutoColor() const;
-    void                EnableAutoColor( BOOL b ) { bUseAutoColor = b; }
-    BOOL                IsAutoColorEnabled() const { return bUseAutoColor; }
-    void                ForceAutoColor( BOOL b ) { bForceAutoColor = b; }
-    BOOL                IsForceAutoColor() const { return bForceAutoColor; }
+    void                EnableAutoColor( sal_Bool b ) { bUseAutoColor = b; }
+    sal_Bool                IsAutoColorEnabled() const { return bUseAutoColor; }
+    void                ForceAutoColor( sal_Bool b ) { bForceAutoColor = b; }
+    sal_Bool                IsForceAutoColor() const { return bForceAutoColor; }
 
-    inline VirtualDevice*   GetVirtualDevice( const MapMode& rMapMode, ULONG nDrawMode );
+    inline VirtualDevice*   GetVirtualDevice( const MapMode& rMapMode, sal_uLong nDrawMode );
     inline void             EraseVirtualDevice();
 
     DECL_LINK( StatusTimerHdl, Timer * );
@@ -697,7 +697,7 @@ private:
         the output string at hand. This is necessary for slideshow
         text effects.
      */
-    void ImplFillTextMarkingVector(const ::com::sun::star::lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const USHORT nIdx, const USHORT nLen) const;
+    void ImplFillTextMarkingVector(const ::com::sun::star::lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen) const;
 
     SpellInfo *     CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs );
 
@@ -708,7 +708,7 @@ public:
                             ImpEditEngine( EditEngine* pEditEngine, SfxItemPool* pPool );
                             ~ImpEditEngine();
 
-    void                    InitDoc( BOOL bKeepParaAttribs );
+    void                    InitDoc( sal_Bool bKeepParaAttribs );
     EditDoc&                GetEditDoc()            { return aEditDoc; }
     const EditDoc&          GetEditDoc() const      { return aEditDoc; }
 
@@ -724,20 +724,20 @@ public:
     const Size&             GetPaperSize() const                    { return aPaperSize; }
     void                    SetPaperSize( const Size& rSz )         { aPaperSize = rSz; }
 
-    void                    SetVertical( BOOL bVertical );
-    BOOL                    IsVertical() const                      { return GetEditDoc().IsVertical(); }
+    void                    SetVertical( sal_Bool bVertical );
+    sal_Bool                    IsVertical() const                      { return GetEditDoc().IsVertical(); }
 
-    void                    SetFixedCellHeight( BOOL bUseFixedCellHeight );
-    BOOL                    IsFixedCellHeight() const { return GetEditDoc().IsFixedCellHeight(); }
+    void                    SetFixedCellHeight( sal_Bool bUseFixedCellHeight );
+    sal_Bool                    IsFixedCellHeight() const { return GetEditDoc().IsFixedCellHeight(); }
 
     void                        SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ) { eDefaultHorizontalTextDirection = eHTextDir; }
     EEHorizontalTextDirection   GetDefaultHorizontalTextDirection() const { return eDefaultHorizontalTextDirection; }
 
 
-    void                    InitWritingDirections( USHORT nPara );
-    BOOL                    IsRightToLeft( USHORT nPara ) const;
-    BYTE                    GetRightToLeft( USHORT nPara, USHORT nChar, USHORT* pStart = NULL, USHORT* pEnd = NULL );
-    BOOL                    HasDifferentRTLLevels( const ContentNode* pNode );
+    void                    InitWritingDirections( sal_uInt16 nPara );
+    sal_Bool                    IsRightToLeft( sal_uInt16 nPara ) const;
+    sal_uInt8                    GetRightToLeft( sal_uInt16 nPara, sal_uInt16 nChar, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL );
+    sal_Bool                    HasDifferentRTLLevels( const ContentNode* pNode );
 
     void                    SetTextRanger( TextRanger* pRanger );
     TextRanger*             GetTextRanger() const { return pTextRanger; }
@@ -782,7 +782,7 @@ public:
     EditPaM         InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput = sal_False );
     EditPaM         InsertText( EditSelection aCurEditSelection, const String& rStr );
     EditPaM         AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite );
-    EditPaM         DeleteLeftOrRight( const EditSelection& rEditSelection, BYTE nMode, BYTE nDelMode = DELMODE_SIMPLE );
+    EditPaM         DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode = DELMODE_SIMPLE );
     EditPaM         InsertParaBreak( EditSelection aEditSelection );
     EditPaM         InsertLineBreak( EditSelection aEditSelection );
     EditPaM         InsertTab( EditSelection aEditSelection );
@@ -803,18 +803,18 @@ public:
 
     sal_uInt32      CalcTextHeight();
     sal_uInt32      GetTextHeight() const;
-    sal_uInt32      CalcTextWidth( BOOL bIgnoreExtraSpace );
-    sal_uInt32      CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace );
+    sal_uInt32      CalcTextWidth( sal_Bool bIgnoreExtraSpace );
+    sal_uInt32      CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, sal_Bool bIgnoreExtraSpace );
     sal_uInt16      GetLineCount( sal_uInt16 nParagraph ) const;
     sal_uInt16      GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
-    void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     sal_uInt16      GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine );
     sal_uInt32      GetParaHeight( sal_uInt16 nParagraph );
 
-    SfxItemSet      GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags = 0xFF ) const;
-    SfxItemSet      GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib = FALSE  );
-    void            SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE nSpecial = 0 );
+    SfxItemSet      GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags = 0xFF ) const;
+    SfxItemSet      GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib = sal_False  );
+    void            SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0 );
     void            RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich = 0 );
     void            RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0, sal_Bool bRemoveFeatures = sal_False );
     void            SetFlatMode( sal_Bool bFlat );
@@ -859,8 +859,8 @@ public:
     inline void     IdleFormatAndUpdate( EditView* pCurView = 0 );
 
     svtools::ColorConfig& GetColorConfig();
-    BOOL            IsVisualCursorTravelingEnabled();
-    BOOL            DoVisualCursorTraveling( const ContentNode* pNode );
+    sal_Bool            IsVisualCursorTravelingEnabled();
+    sal_Bool            DoVisualCursorTraveling( const ContentNode* pNode );
 
     EditSelection           ConvertSelection( sal_uInt16 nStartPara, sal_uInt16 nStartPos, sal_uInt16 nEndPara, sal_uInt16 nEndPos ) const;
     inline EPaM             CreateEPaM( const EditPaM& rPaM );
@@ -922,7 +922,7 @@ public:
 
 
     LanguageType        GetLanguage( const EditSelection rSelection ) const;
-    LanguageType        GetLanguage( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const;
+    LanguageType        GetLanguage( const EditPaM& rPaM, sal_uInt16* pEndPos = NULL ) const;
     ::com::sun::star::lang::Locale GetLocale( const EditPaM& rPaM ) const;
 
     void                DoOnlineSpelling( ContentNode* pThisNodeOnly = 0, sal_Bool bSpellAtCursorPos = sal_False, sal_Bool bInteruptable = sal_True );
@@ -934,14 +934,14 @@ public:
                         ImpSpell( EditView* pEditView );
 
     // text conversion functions
-    void                Convert( EditView* pEditView, LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, INT32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc );
+    void                Convert( EditView* pEditView, LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc );
     void                ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange,
                                     sal_Bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const Font *pTargetFont );
     ConvInfo *          GetConvInfo() const { return pConvInfo; }
     sal_Bool            HasConvertibleTextPortion( LanguageType nLang );
     void                SetLanguageAndFont( const ESelection &rESel,
-                                LanguageType nLang, USHORT nLangWhichId,
-                                const Font *pFont,  USHORT nFontWhichId );
+                                LanguageType nLang, sal_uInt16 nLangWhichId,
+                                const Font *pFont,  sal_uInt16 nFontWhichId );
 
     // returns true if input sequence checking should be applied
     sal_Bool            IsInputSequenceCheckingRequired( sal_Unicode nChar, const EditSelection& rCurSel ) const;
@@ -985,7 +985,7 @@ public:
     sal_Int32               GetSpaceBeforeAndMinLabelWidth( const ContentNode *pNode, sal_Int32 *pnSpaceBefore = 0, sal_Int32 *pnMinLabelWidth = 0 ) const;
 
     const SvxLRSpaceItem&   GetLRSpaceItem( ContentNode* pNode );
-    SvxAdjust               GetJustification( USHORT nPara ) const;
+    SvxAdjust               GetJustification( sal_uInt16 nPara ) const;
 
     void                SetCharStretching( sal_uInt16 nX, sal_uInt16 nY );
     inline void         GetCharStretching( sal_uInt16& rX, sal_uInt16& rY );
@@ -1003,22 +1003,22 @@ public:
     void                SetAutoCompleteText( const String& rStr, sal_Bool bUpdateTipWindow );
 
     EditSelection       TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode );
-    short               ReplaceTextOnly( ContentNode* pNode, USHORT nCurrentStart, xub_StrLen nLen, const String& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rOffsets );
+    short               ReplaceTextOnly( ContentNode* pNode, sal_uInt16 nCurrentStart, xub_StrLen nLen, const String& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rOffsets );
 
 
-    void                SetAsianCompressionMode( USHORT n );
-    USHORT              GetAsianCompressionMode() const { return nAsianCompressionMode; }
+    void                SetAsianCompressionMode( sal_uInt16 n );
+    sal_uInt16              GetAsianCompressionMode() const { return nAsianCompressionMode; }
 
-    void                SetKernAsianPunctuation( BOOL b );
-    BOOL                IsKernAsianPunctuation() const { return bKernAsianPunctuation; }
+    void                SetKernAsianPunctuation( sal_Bool b );
+    sal_Bool                IsKernAsianPunctuation() const { return bKernAsianPunctuation; }
 
-    void                SetAddExtLeading( BOOL b );
-    BOOL                IsAddExtLeading() const { return bAddExtLeading; }
+    void                SetAddExtLeading( sal_Bool b );
+    sal_Bool                IsAddExtLeading() const { return bAddExtLeading; }
 
-    vos::ORef<SvxForbiddenCharactersTable>  GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const;
+    vos::ORef<SvxForbiddenCharactersTable>  GetForbiddenCharsTable( sal_Bool bGetInternal = sal_True ) const;
     void                SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
 
-    BOOL                mbLastTryMerge;
+    sal_Bool                mbLastTryMerge;
 
     /** sets a link that is called at the beginning of a drag operation at an edit view */
     void                SetBeginDropHdl( const Link& rLink ) { maBeginDropHdl = rLink; }
@@ -1029,8 +1029,8 @@ public:
     Link            GetEndDropHdl() const { return maEndDropHdl; }
 
     /// specifies if auto-correction should capitalize the first word or not (default is on)
-    void            SetFirstWordCapitalization( BOOL bCapitalize )  { bFirstWordCapitalization = bCapitalize; }
-    BOOL            IsFirstWordCapitalization() const   { return bFirstWordCapitalization; }
+    void            SetFirstWordCapitalization( sal_Bool bCapitalize )  { bFirstWordCapitalization = bCapitalize; }
+    sal_Bool            IsFirstWordCapitalization() const   { return bFirstWordCapitalization; }
 };
 
 inline EPaM ImpEditEngine::CreateEPaM( const EditPaM& rPaM )
@@ -1071,7 +1071,7 @@ inline EditSelection ImpEditEngine::CreateSel( const ESelection& rSel )
     return aSel;
 }
 
-inline VirtualDevice* ImpEditEngine::GetVirtualDevice( const MapMode& rMapMode, ULONG nDrawMode )
+inline VirtualDevice* ImpEditEngine::GetVirtualDevice( const MapMode& rMapMode, sal_uLong nDrawMode )
 {
     if ( !pVirtDev )
         pVirtDev = new VirtualDevice;
@@ -1206,7 +1206,7 @@ inline Cursor* ImpEditView::GetCursor()
 
 void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit );
 void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const MapUnit* pSourceUnit = NULL, const MapUnit* pDestUnit = NULL );
-BYTE GetCharTypeForCompression( xub_Unicode cChar );
+sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar );
 Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin );
 
 #endif // _IMPEDIT_HXX
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index fe20464eb905..f2a94c2dd1a6 100755
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -75,19 +75,19 @@
 
 using namespace ::com::sun::star;
 
-USHORT lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem )
+sal_uInt16 lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem )
 {
-    USHORT nExtra = 0;
+    sal_uInt16 nExtra = 0;
     /* if ( ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
             && ( rLSItem.GetPropLineSpace() != 100 ) )
     {
-        // ULONG nH = pPortion->GetNode()->GetCharAttribs().GetDefFont().GetSize().Height();
-        ULONG nH = pPortion->GetLines().GetObject( 0 )->GetHeight();
+        // sal_uLong nH = pPortion->GetNode()->GetCharAttribs().GetDefFont().GetSize().Height();
+        sal_uLong nH = pPortion->GetLines().GetObject( 0 )->GetHeight();
         long n = nH * rLSItem.GetPropLineSpace();
         n /= 100;
         n -= nH;    // nur den Abstand
         if ( n > 0 )
-            nExtra = (USHORT)n;
+            nExtra = (sal_uInt16)n;
     }
     else */
     if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
@@ -133,26 +133,26 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
     nStretchX           = 100;
     nStretchY           = 100;
 
-    bInSelection        = FALSE;
-    bOwnerOfRefDev      = FALSE;
-    bDowning            = FALSE;
-    bIsInUndo           = FALSE;
-    bIsFormatting       = FALSE;
-    bFormatted          = FALSE;
-    bUpdate             = TRUE;
-    bUseAutoColor       = TRUE;
-    bForceAutoColor     = FALSE;
-    bAddExtLeading      = FALSE;
-    bUndoEnabled        = TRUE;
-    bCallParaInsertedOrDeleted = FALSE;
-    bImpConvertFirstCall= FALSE;
-    bFirstWordCapitalization    = TRUE;
+    bInSelection        = sal_False;
+    bOwnerOfRefDev      = sal_False;
+    bDowning            = sal_False;
+    bIsInUndo           = sal_False;
+    bIsFormatting       = sal_False;
+    bFormatted          = sal_False;
+    bUpdate             = sal_True;
+    bUseAutoColor       = sal_True;
+    bForceAutoColor     = sal_False;
+    bAddExtLeading      = sal_False;
+    bUndoEnabled        = sal_True;
+    bCallParaInsertedOrDeleted = sal_False;
+    bImpConvertFirstCall= sal_False;
+    bFirstWordCapitalization    = sal_True;
 
     eDefLanguage        = LANGUAGE_DONTKNOW;
     maBackgroundColor   = COL_AUTO;
 
     nAsianCompressionMode = text::CharacterCompressionType::NONE;
-    bKernAsianPunctuation = FALSE;
+    bKernAsianPunctuation = sal_False;
 
     eDefaultHorizontalTextDirection = EE_HTEXTDIR_DEFAULT;
 
@@ -177,13 +177,13 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
 
     // Ab hier wird schon auf Daten zugegriffen!
     SetRefDevice( pRefDev );
-    InitDoc( FALSE );
+    InitDoc( sal_False );
 
-    bCallParaInsertedOrDeleted = TRUE;
+    bCallParaInsertedOrDeleted = sal_True;
 
     aEditDoc.SetModifyHdl( LINK( this, ImpEditEngine, DocModified ) );
 
-    mbLastTryMerge = FALSE;
+    mbLastTryMerge = sal_False;
 }
 
 ImpEditEngine::~ImpEditEngine()
@@ -195,8 +195,8 @@ ImpEditEngine::~ImpEditEngine()
     // das Zerstoeren von Vorlagen kann sonst unnoetiges Formatieren ausloesen,
     // wenn eine Parent-Vorlage zerstoert wird.
     // Und das nach dem Zerstoeren der Daten!
-    bDowning = TRUE;
-    SetUpdateMode( FALSE );
+    bDowning = sal_True;
+    SetUpdateMode( sal_False );
 
     delete pVirtDev;
     delete pEmptyItemSet;
@@ -216,12 +216,12 @@ void ImpEditEngine::SetRefDevice( OutputDevice* pRef )
         delete pRefDev;
 
     pRefDev = pRef;
-    bOwnerOfRefDev = FALSE;
+    bOwnerOfRefDev = sal_False;
 
     if ( !pRef )
         pRefDev = EE_DLL()->GetGlobalData()->GetStdRefDevice();
 
-    nOnePixelInRef = (USHORT)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
+    nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
 
     if ( IsFormatted() )
     {
@@ -241,10 +241,10 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode )
         pRefDev = new VirtualDevice;
         pRefDev->SetMapMode( MAP_TWIP );
         SetRefDevice( pRefDev );
-        bOwnerOfRefDev = TRUE;
+        bOwnerOfRefDev = sal_True;
     }
     pRefDev->SetMapMode( rMapMode );
-    nOnePixelInRef = (USHORT)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
+    nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
     if ( IsFormatted() )
     {
         FormatFullDoc();
@@ -252,13 +252,13 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode )
     }
 }
 
-void ImpEditEngine::InitDoc( BOOL bKeepParaAttribs )
+void ImpEditEngine::InitDoc( sal_Bool bKeepParaAttribs )
 {
-    USHORT nParas = aEditDoc.Count();
-    for ( USHORT n = bKeepParaAttribs ? 1 : 0; n < nParas; n++ )
+    sal_uInt16 nParas = aEditDoc.Count();
+    for ( sal_uInt16 n = bKeepParaAttribs ? 1 : 0; n < nParas; n++ )
     {
         if ( aEditDoc[n]->GetStyleSheet() )
-            EndListening( *aEditDoc[n]->GetStyleSheet(), FALSE );
+            EndListening( *aEditDoc[n]->GetStyleSheet(), sal_False );
     }
 
     if ( bKeepParaAttribs )
@@ -271,7 +271,7 @@ void ImpEditEngine::InitDoc( BOOL bKeepParaAttribs )
     ParaPortion* pIniPortion = new ParaPortion( aEditDoc[0] );
     GetParaPortions().Insert( pIniPortion, 0 );
 
-    bFormatted = FALSE;
+    bFormatted = sal_False;
 
     if ( IsCallParaInsertedOrDeleted() )
     {
@@ -304,13 +304,13 @@ XubString ImpEditEngine::GetSelected( const EditSelection& rSel, const LineEnd e
 
     ContentNode* pStartNode = aSel.Min().GetNode();
     ContentNode* pEndNode = aSel.Max().GetNode();
-    USHORT nStartNode = aEditDoc.GetPos( pStartNode );
-    USHORT nEndNode = aEditDoc.GetPos( pEndNode );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( pStartNode );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( pEndNode );
 
     DBG_ASSERT( nStartNode <= nEndNode, "Selektion nicht sortiert ?" );
 
     // ueber die Absaetze iterieren...
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ )
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
     {
         DBG_ASSERT( aEditDoc.SaveGetObject( nNode ), "Node nicht gefunden: GetSelected" );
         ContentNode* pNode = aEditDoc.GetObject( nNode );
@@ -329,13 +329,13 @@ XubString ImpEditEngine::GetSelected( const EditSelection& rSel, const LineEnd e
     return aText;
 }
 
-BOOL ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
 {
     GetSelEngine().SetCurView( pView );
     SetActiveView( pView );
 
     if ( GetAutoCompleteText().Len() )
-        SetAutoCompleteText( String(), TRUE );
+        SetAutoCompleteText( String(), sal_True );
 
     GetSelEngine().SelMouseButtonDown( rMEvt );
     // Sonderbehandlungen
@@ -345,18 +345,18 @@ BOOL ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
         if ( rMEvt.GetClicks() == 2 )
         {
             // damit die SelectionEngine weiss, dass Anker.
-            aSelEngine.CursorPosChanging( TRUE, FALSE );
+            aSelEngine.CursorPosChanging( sal_True, sal_False );
 
             EditSelection aNewSelection( SelectWord( aCurSel ) );
             pView->pImpEditView->DrawSelection();
             pView->pImpEditView->SetEditSelection( aNewSelection );
             pView->pImpEditView->DrawSelection();
-            pView->ShowCursor( TRUE, TRUE );
+            pView->ShowCursor( sal_True, sal_True );
         }
         else if ( rMEvt.GetClicks() == 3 )
         {
             // damit die SelectionEngine weiss, dass Anker.
-            aSelEngine.CursorPosChanging( TRUE, FALSE );
+            aSelEngine.CursorPosChanging( sal_True, sal_False );
 
             EditSelection aNewSelection( aCurSel );
             aNewSelection.Min().SetIndex( 0 );
@@ -364,10 +364,10 @@ BOOL ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
             pView->pImpEditView->DrawSelection();
             pView->pImpEditView->SetEditSelection( aNewSelection );
             pView->pImpEditView->DrawSelection();
-            pView->ShowCursor( TRUE, TRUE );
+            pView->ShowCursor( sal_True, sal_True );
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
@@ -484,7 +484,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
         delete mpIMEInfos;
         EditPaM aPaM = pView->GetImpEditView()->GetEditSelection().Max();
         String aOldTextAfterStartPos = aPaM.GetNode()->Copy( aPaM.GetIndex() );
-        USHORT nMax = aOldTextAfterStartPos.Search( CH_FEATURE );
+        sal_uInt16 nMax = aOldTextAfterStartPos.Search( CH_FEATURE );
         if ( nMax != STRING_NOTFOUND )  // don't overwrite features!
             aOldTextAfterStartPos.Erase( nMax );
         mpIMEInfos = new ImplIMEInfos( aPaM, aOldTextAfterStartPos );
@@ -521,7 +521,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
             ParaPortion* pPortion = FindParaPortion( mpIMEInfos->aPos.GetNode() );
             pPortion->MarkSelectionInvalid( mpIMEInfos->aPos.GetIndex(), 0 );
 
-            BOOL bWasCursorOverwrite = mpIMEInfos->bWasCursorOverwrite;
+            sal_Bool bWasCursorOverwrite = mpIMEInfos->bWasCursorOverwrite;
 
             delete mpIMEInfos;
             mpIMEInfos = NULL;
@@ -549,14 +549,14 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
 
                 if ( mpIMEInfos->bWasCursorOverwrite )
                 {
-                    USHORT nOldIMETextLen = mpIMEInfos->nLen;
-                    USHORT nNewIMETextLen = pData->GetText().Len();
+                    sal_uInt16 nOldIMETextLen = mpIMEInfos->nLen;
+                    sal_uInt16 nNewIMETextLen = pData->GetText().Len();
 
                     if ( ( nOldIMETextLen > nNewIMETextLen ) &&
                          ( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.Len() ) )
                     {
                         // restore old characters
-                        USHORT nRestore = nOldIMETextLen - nNewIMETextLen;
+                        sal_uInt16 nRestore = nOldIMETextLen - nNewIMETextLen;
                         EditPaM aPaM( mpIMEInfos->aPos );
                         aPaM.GetIndex() = aPaM.GetIndex() + nNewIMETextLen;
                         ImpInsertText( aPaM, mpIMEInfos->aOldTextAfterStartPos.Copy( nNewIMETextLen, nRestore ) );
@@ -565,7 +565,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
                               ( nOldIMETextLen < mpIMEInfos->aOldTextAfterStartPos.Len() ) )
                     {
                         // overwrite
-                        USHORT nOverwrite = nNewIMETextLen - nOldIMETextLen;
+                        sal_uInt16 nOverwrite = nNewIMETextLen - nOldIMETextLen;
                         if ( ( nOldIMETextLen + nOverwrite ) > mpIMEInfos->aOldTextAfterStartPos.Len() )
                             nOverwrite = mpIMEInfos->aOldTextAfterStartPos.Len() - nOldIMETextLen;
                         DBG_ASSERT( nOverwrite && (nOverwrite < 0xFF00), "IME Overwrite?!" );
@@ -613,13 +613,13 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
             EditPaM aPaM( pView->pImpEditView->GetEditSelection().Max() );
             Rectangle aR1 = PaMtoEditCursor( aPaM, 0 );
 
-            USHORT nInputEnd = mpIMEInfos->aPos.GetIndex() + mpIMEInfos->nLen;
+            sal_uInt16 nInputEnd = mpIMEInfos->aPos.GetIndex() + mpIMEInfos->nLen;
 
             if ( !IsFormatted() )
                 FormatDoc();
 
             ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( GetEditDoc().GetPos( aPaM.GetNode() ) );
-            USHORT nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_True );
+            sal_uInt16 nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_True );
             EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
             if ( pLine && ( nInputEnd > pLine->GetEnd() ) )
                 nInputEnd = pLine->GetEnd();
@@ -672,11 +672,11 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
     GetSelEngine().Command( rCEvt );
 }
 
-BOOL ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView )
 {
     GetSelEngine().SetCurView( pView );
     GetSelEngine().SelMouseButtonUp( rMEvt );
-    bInSelection = FALSE;
+    bInSelection = sal_False;
     // Sonderbehandlungen
     EditSelection aCurSel( pView->pImpEditView->GetEditSelection() );
     if ( !aCurSel.HasRange() )
@@ -687,22 +687,22 @@ BOOL ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView )
             if ( pFld )
             {
                 EditPaM aPaM( aCurSel.Max() );
-                USHORT nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+                sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
                 GetEditEnginePtr()->FieldClicked( *pFld, nPara, aPaM.GetIndex() );
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
 {
     // MouseMove wird sofort nach ShowQuickHelp() gerufen!
 //  if ( GetAutoCompleteText().Len() )
-//      SetAutoCompleteText( String(), TRUE );
+//      SetAutoCompleteText( String(), sal_True );
     GetSelEngine().SetCurView( pView );
     GetSelEngine().SelMouseMove( rMEvt );
-    return TRUE;
+    return sal_True;
 }
 
 EditPaM ImpEditEngine::InsertText( EditSelection aSel, const XubString& rStr )
@@ -713,7 +713,7 @@ EditPaM ImpEditEngine::InsertText( EditSelection aSel, const XubString& rStr )
 
 EditPaM ImpEditEngine::Clear()
 {
-    InitDoc( FALSE );
+    InitDoc( sal_False );
 
     EditPaM aPaM = aEditDoc.GetStartPaM();
     EditSelection aSel( aPaM );
@@ -722,7 +722,7 @@ EditPaM ImpEditEngine::Clear()
 
     ResetUndoManager();
 
-    for ( USHORT nView = aEditViews.Count(); nView; )
+    for ( sal_uInt16 nView = aEditViews.Count(); nView; )
     {
         EditView* pView = aEditViews[--nView];
         DBG_CHKOBJ( pView, EditView, 0 );
@@ -734,11 +734,11 @@ EditPaM ImpEditEngine::Clear()
 
 EditPaM ImpEditEngine::RemoveText()
 {
-    InitDoc( TRUE );
+    InitDoc( sal_True );
 
     EditPaM aStartPaM = aEditDoc.GetStartPaM();
     EditSelection aEmptySel( aStartPaM, aStartPaM );
-    for ( USHORT nView = 0; nView < aEditViews.Count(); nView++ )
+    for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ )
     {
         EditView* pView = aEditViews.GetObject(nView);
         DBG_CHKOBJ( pView, EditView, 0 );
@@ -753,16 +753,16 @@ void ImpEditEngine::SetText( const XubString& rText )
 {
     // RemoveText loescht die Undo-Liste!
     EditPaM aStartPaM = RemoveText();
-    BOOL bUndoCurrentlyEnabled = IsUndoEnabled();
+    sal_Bool bUndoCurrentlyEnabled = IsUndoEnabled();
     // Der von Hand reingesteckte Text kann nicht vom Anwender rueckgaengig gemacht werden.
-    EnableUndo( FALSE );
+    EnableUndo( sal_False );
 
     EditSelection aEmptySel( aStartPaM, aStartPaM );
     EditPaM aPaM = aStartPaM;
     if ( rText.Len() )
         aPaM = ImpInsertText( aEmptySel, rText );
 
-    for ( USHORT nView = 0; nView < aEditViews.Count(); nView++ )
+    for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ )
     {
         EditView* pView = aEditViews[nView];
         DBG_CHKOBJ( pView, EditView, 0 );
@@ -791,7 +791,7 @@ const SfxItemSet& ImpEditEngine::GetEmptyItemSet()
     if ( !pEmptyItemSet )
     {
         pEmptyItemSet = new SfxItemSet( aEditDoc.GetItemPool(), EE_ITEMS_START, EE_ITEMS_END );
-        for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
+        for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
         {
             pEmptyItemSet->ClearItem( nWhich );
         }
@@ -811,7 +811,7 @@ void ImpEditEngine::CursorMoved( ContentNode* pPrevNode )
 
 void ImpEditEngine::TextModified()
 {
-    bFormatted = FALSE;
+    bFormatted = sal_False;
 
     if ( GetNotifyHdl().IsSet() )
     {
@@ -826,14 +826,14 @@ void ImpEditEngine::ParaAttribsChanged( ContentNode* pNode )
 {
     DBG_ASSERT( pNode, "ParaAttribsChanged: Welcher?" );
 
-    aEditDoc.SetModified( TRUE );
-    bFormatted = FALSE;
+    aEditDoc.SetModified( sal_True );
+    bFormatted = sal_False;
 
     ParaPortion* pPortion = FindParaPortion( pNode );
     DBG_ASSERT( pPortion, "ParaAttribsChanged: Portion?" );
     pPortion->MarkSelectionInvalid( 0, pNode->Len() );
 
-    USHORT nPara = aEditDoc.GetPos( pNode );
+    sal_uInt16 nPara = aEditDoc.GetPos( pNode );
     pEditEngine->ParaAttribsChanged( nPara );
 
     ParaPortion* pNextPortion = GetParaPortions().SaveGetObject( nPara+1 );
@@ -863,8 +863,8 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
 
     KeyEvent aTranslatedKeyEvent = rKeyEvent.LogicalTextDirectionality( eTextDirection );
 
-    BOOL bCtrl = aTranslatedKeyEvent.GetKeyCode().IsMod1() ? TRUE : FALSE;
-    USHORT nCode = aTranslatedKeyEvent.GetKeyCode().GetCode();
+    sal_Bool bCtrl = aTranslatedKeyEvent.GetKeyCode().IsMod1() ? sal_True : sal_False;
+    sal_uInt16 nCode = aTranslatedKeyEvent.GetKeyCode().GetCode();
 
     if ( DoVisualCursorTraveling( aPaM.GetNode() ) )
     {
@@ -1025,23 +1025,23 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
     return pEditView->pImpEditView->GetEditSelection();
 }
 
-EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, BOOL bStart )
+EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, sal_Bool bStart )
 {
     EditPaM aPaM( rPaM );
 
-    USHORT nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+    sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
 
-    USHORT nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
+    sal_uInt16 nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
     EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
-    BOOL bEmptyLine = pLine->GetStart() == pLine->GetEnd();
+    sal_Bool bEmptyLine = pLine->GetStart() == pLine->GetEnd();
 
     pEditView->pImpEditView->nExtraCursorFlags = 0;
 
     if ( !bEmptyLine )
     {
         String aLine( *aPaM.GetNode(), pLine->GetStart(), pLine->GetEnd() - pLine->GetStart() );
-//        USHORT nPosInLine = aPaM.GetIndex() - pLine->GetStart();
+//        sal_uInt16 nPosInLine = aPaM.GetIndex() - pLine->GetStart();
 
         const sal_Unicode* pLineString = aLine.GetBuffer();
 
@@ -1051,19 +1051,19 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM&
         const UBiDiLevel  nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/;
         ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.Len(), nBidiLevel, NULL, &nError );   // UChar != sal_Unicode in MinGW
 
-        USHORT nVisPos = bStart ? 0 : aLine.Len()-1;
-        USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+        sal_uInt16 nVisPos = bStart ? 0 : aLine.Len()-1;
+        sal_uInt16 nLogPos = (sal_uInt16)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
 
         ubidi_close( pBidi );
 
         aPaM.GetIndex() = nLogPos + pLine->GetStart();
 
-        USHORT nTmp;
-        USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTmp, TRUE );
+        sal_uInt16 nTmp;
+        sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTmp, sal_True );
         TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
-        USHORT nRTLLevel = pTextPortion->GetRightToLeft();
-//        BOOL bParaRTL = IsRightToLeft( nPara );
-        BOOL bPortionRTL = nRTLLevel%2 ? TRUE : FALSE;
+        sal_uInt16 nRTLLevel = pTextPortion->GetRightToLeft();
+//        sal_Bool bParaRTL = IsRightToLeft( nPara );
+        sal_Bool bPortionRTL = nRTLLevel%2 ? sal_True : sal_False;
 
         if ( bStart )
         {
@@ -1083,23 +1083,23 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM&
     return aPaM;
 }
 
-EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, USHORT nCharacterIteratorMode, BOOL bVisualToLeft )
+EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode, sal_Bool bVisualToLeft )
 {
     EditPaM aPaM( rPaM );
 
-    USHORT nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+    sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
 
-    USHORT nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
+    sal_uInt16 nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
     EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
-    BOOL bEmptyLine = pLine->GetStart() == pLine->GetEnd();
+    sal_Bool bEmptyLine = pLine->GetStart() == pLine->GetEnd();
 
-//    USHORT nCurrentCursorFlags = pEditView->pImpEditView->nExtraCursorFlags;
+//    sal_uInt16 nCurrentCursorFlags = pEditView->pImpEditView->nExtraCursorFlags;
     pEditView->pImpEditView->nExtraCursorFlags = 0;
 
-    BOOL bParaRTL = IsRightToLeft( nPara );
+    sal_Bool bParaRTL = IsRightToLeft( nPara );
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     if ( bEmptyLine )
     {
@@ -1107,36 +1107,36 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
         {
             aPaM = CursorUp( aPaM, pEditView );
             if ( aPaM != rPaM )
-                aPaM = CursorVisualStartEnd( pEditView, aPaM, FALSE );
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, sal_False );
         }
         else
         {
             aPaM = CursorDown( aPaM, pEditView );
             if ( aPaM != rPaM )
-                aPaM = CursorVisualStartEnd( pEditView, aPaM, TRUE );
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, sal_True );
         }
 
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
-    BOOL bLogicalBackward = bParaRTL ? !bVisualToLeft : bVisualToLeft;
+    sal_Bool bLogicalBackward = bParaRTL ? !bVisualToLeft : bVisualToLeft;
 
     if ( !bDone && pEditView->IsInsertMode() )
     {
         // Check if we are within a portion and don't have overwrite mode, then it's easy...
-        USHORT nPortionStart;
-        USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, FALSE );
+        sal_uInt16 nPortionStart;
+        sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, sal_False );
         TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
 
-        BOOL bPortionBoundary = ( aPaM.GetIndex() == nPortionStart ) || ( aPaM.GetIndex() == (nPortionStart+pTextPortion->GetLen()) );
-        USHORT nRTLLevel = pTextPortion->GetRightToLeft();
+        sal_Bool bPortionBoundary = ( aPaM.GetIndex() == nPortionStart ) || ( aPaM.GetIndex() == (nPortionStart+pTextPortion->GetLen()) );
+        sal_uInt16 nRTLLevel = pTextPortion->GetRightToLeft();
 
         // Portion boundary doesn't matter if both have same RTL level
-        USHORT nRTLLevelNextPortion = 0xFFFF;
+        sal_uInt16 nRTLLevelNextPortion = 0xFFFF;
         if ( bPortionBoundary && aPaM.GetIndex() && ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) )
         {
-            USHORT nTmp;
-            USHORT nNextTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex()+1, nTmp, bLogicalBackward ? FALSE : TRUE );
+            sal_uInt16 nTmp;
+            sal_uInt16 nNextTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex()+1, nTmp, bLogicalBackward ? sal_False : sal_True );
             TextPortion* pNextTextPortion = pParaPortion->GetTextPortions().GetObject( nNextTextPortion );
             nRTLLevelNextPortion = pNextTextPortion->GetRightToLeft();
         }
@@ -1153,17 +1153,17 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
                 aPaM = CursorRight( aPaM, nCharacterIteratorMode );
                 pEditView->pImpEditView->SetCursorBidiLevel( 0 );
             }
-            bDone = TRUE;
+            bDone = sal_True;
         }
     }
 
     if ( !bDone )
     {
-        BOOL bGotoStartOfNextLine = FALSE;
-        BOOL bGotoEndOfPrevLine = FALSE;
+        sal_Bool bGotoStartOfNextLine = sal_False;
+        sal_Bool bGotoEndOfPrevLine = sal_False;
 
         String aLine( *aPaM.GetNode(), pLine->GetStart(), pLine->GetEnd() - pLine->GetStart() );
-        USHORT nPosInLine = aPaM.GetIndex() - pLine->GetStart();
+        sal_uInt16 nPosInLine = aPaM.GetIndex() - pLine->GetStart();
 
         const sal_Unicode* pLineString = aLine.GetBuffer();
 
@@ -1175,8 +1175,8 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
 
         if ( !pEditView->IsInsertMode() )
         {
-            BOOL bEndOfLine = nPosInLine == aLine.Len();
-            USHORT nVisPos = (USHORT)ubidi_getVisualIndex( pBidi, !bEndOfLine ? nPosInLine : nPosInLine-1, &nError );
+            sal_Bool bEndOfLine = nPosInLine == aLine.Len();
+            sal_uInt16 nVisPos = (sal_uInt16)ubidi_getVisualIndex( pBidi, !bEndOfLine ? nPosInLine : nPosInLine-1, &nError );
             if ( bVisualToLeft )
             {
                 bGotoEndOfPrevLine = nVisPos == 0;
@@ -1192,22 +1192,22 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
 
             if ( !bGotoEndOfPrevLine && !bGotoStartOfNextLine )
             {
-                USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+                sal_uInt16 nLogPos = (sal_uInt16)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
                 aPaM.GetIndex() = pLine->GetStart() + nLogPos;
                 pEditView->pImpEditView->SetCursorBidiLevel( 0 );
             }
         }
         else
         {
-            BOOL bWasBehind = FALSE;
-            BOOL bBeforePortion = !nPosInLine || pEditView->pImpEditView->GetCursorBidiLevel() == 1;
+            sal_Bool bWasBehind = sal_False;
+            sal_Bool bBeforePortion = !nPosInLine || pEditView->pImpEditView->GetCursorBidiLevel() == 1;
             if ( nPosInLine && ( !bBeforePortion ) ) // before the next portion
-                bWasBehind = TRUE;  // step one back, otherwise visual will be unusable when rtl portion follows.
+                bWasBehind = sal_True;  // step one back, otherwise visual will be unusable when rtl portion follows.
 
-            USHORT nPortionStart;
-            USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, bBeforePortion );
+            sal_uInt16 nPortionStart;
+            sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, bBeforePortion );
             TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
-            BOOL bRTLPortion = (pTextPortion->GetRightToLeft() % 2) != 0;
+            sal_Bool bRTLPortion = (pTextPortion->GetRightToLeft() % 2) != 0;
 
             // -1: We are 'behind' the character
             long nVisPos = (long)ubidi_getVisualIndex( pBidi, bWasBehind ? nPosInLine-1 : nPosInLine, &nError );
@@ -1229,15 +1229,15 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
 
             if ( !bGotoEndOfPrevLine && !bGotoStartOfNextLine )
             {
-                USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+                sal_uInt16 nLogPos = (sal_uInt16)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
 
 /*
                 if ( nLogPos == aPaM.GetIndex() )
                 {
                     if ( bVisualToLeft )
-                        bGotoEndOfPrevLine = TRUE;
+                        bGotoEndOfPrevLine = sal_True;
                     else
-                        bGotoStartOfNextLine = TRUE;
+                        bGotoStartOfNextLine = sal_True;
                 }
                 else
 */
@@ -1245,9 +1245,9 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
                     aPaM.GetIndex() = pLine->GetStart() + nLogPos;
 
                     // RTL portion, stay visually on the left side.
-                    USHORT _nPortionStart;
-                    // USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, !bRTLPortion );
-                    USHORT _nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), _nPortionStart, TRUE );
+                    sal_uInt16 _nPortionStart;
+                    // sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, !bRTLPortion );
+                    sal_uInt16 _nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), _nPortionStart, sal_True );
                     TextPortion* _pTextPortion = pParaPortion->GetTextPortions().GetObject( _nTextPortion );
                     if ( bVisualToLeft && !bRTLPortion && ( _pTextPortion->GetRightToLeft() % 2 ) )
                         aPaM.GetIndex()++;
@@ -1265,20 +1265,20 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
         {
             aPaM = CursorUp( aPaM, pEditView );
             if ( aPaM != rPaM )
-                aPaM = CursorVisualStartEnd( pEditView, aPaM, FALSE );
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, sal_False );
         }
         else if ( bGotoStartOfNextLine )
         {
             aPaM = CursorDown( aPaM, pEditView );
             if ( aPaM != rPaM )
-                aPaM = CursorVisualStartEnd( pEditView, aPaM, TRUE );
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, sal_True );
         }
     }
     return aPaM;
 }
 
 
-EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, USHORT nCharacterIteratorMode )
+EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode )
 {
     EditPaM aCurPaM( rPaM );
     EditPaM aNewPaM( aCurPaM );
@@ -1287,7 +1287,7 @@ EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, USHORT nCharacterIterato
     {
         sal_Int32 nCount = 1;
         uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
-         aNewPaM.SetIndex( (USHORT)_xBI->previousCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
+         aNewPaM.SetIndex( (sal_uInt16)_xBI->previousCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
     }
     else
     {
@@ -1303,7 +1303,7 @@ EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, USHORT nCharacterIterato
     return aNewPaM;
 }
 
-EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM, USHORT nCharacterIteratorMode )
+EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode )
 {
     EditPaM aCurPaM( rPaM );
     EditPaM aNewPaM( aCurPaM );
@@ -1312,7 +1312,7 @@ EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM, USHORT nCharacterIterat
     {
         uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
         sal_Int32 nCount = 1;
-        aNewPaM.SetIndex( (USHORT)_xBI->nextCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
+        aNewPaM.SetIndex( (sal_uInt16)_xBI->nextCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
     }
     else
     {
@@ -1334,7 +1334,7 @@ EditPaM ImpEditEngine::CursorUp( const EditPaM& rPaM, EditView* pView )
 
     ParaPortion* pPPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pPPortion, "Keine passende Portion gefunden: CursorUp" );
-    USHORT nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
+    sal_uInt16 nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
     EditLine* pLine = pPPortion->GetLines().GetObject( nLine );
 
     long nX;
@@ -1378,7 +1378,7 @@ EditPaM ImpEditEngine::CursorDown( const EditPaM& rPaM, EditView* pView )
 
     ParaPortion* pPPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pPPortion, "Keine passende Portion gefunden: CursorDown" );
-    USHORT nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
+    sal_uInt16 nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
 
     long nX;
     if ( pView->pImpEditView->nTravelXPos == TRAVEL_X_DONTKNOW )
@@ -1422,7 +1422,7 @@ EditPaM ImpEditEngine::CursorStartOfLine( const EditPaM& rPaM )
 {
     ParaPortion* pCurPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pCurPortion, "Keine Portion fuer den PaM ?" );
-    USHORT nLine = pCurPortion->GetLineNumber( rPaM.GetIndex() );
+    sal_uInt16 nLine = pCurPortion->GetLineNumber( rPaM.GetIndex() );
     EditLine* pLine = pCurPortion->GetLines().GetObject(nLine);
     DBG_ASSERT( pLine, "Aktuelle Zeile nicht gefunden ?!" );
 
@@ -1435,7 +1435,7 @@ EditPaM ImpEditEngine::CursorEndOfLine( const EditPaM& rPaM )
 {
     ParaPortion* pCurPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pCurPortion, "Keine Portion fuer den PaM ?" );
-    USHORT nLine = pCurPortion->GetLineNumber( rPaM.GetIndex() );
+    sal_uInt16 nLine = pCurPortion->GetLineNumber( rPaM.GetIndex() );
     EditLine* pLine = pCurPortion->GetLines().GetObject(nLine);
     DBG_ASSERT( pLine, "Aktuelle Zeile nicht gefunden ?!" );
 
@@ -1527,12 +1527,12 @@ EditPaM ImpEditEngine::PageDown( const EditPaM& rPaM, EditView* pView )
 
 EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM, sal_Int16 nWordType )
 {
-    USHORT nCurrentPos = rPaM.GetIndex();
+    sal_uInt16 nCurrentPos = rPaM.GetIndex();
     EditPaM aNewPaM( rPaM );
     if ( nCurrentPos == 0 )
     {
         // Vorheriger Absatz...
-        USHORT nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
+        sal_uInt16 nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
         ContentNode* pPrevNode = aEditDoc.SaveGetObject( --nCurPara );
         if ( pPrevNode )
         {
@@ -1554,7 +1554,7 @@ EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM, sal_Int16 nWordType )
         i18n::Boundary aBoundary = _xBI->getWordBoundary( *aNewPaM.GetNode(), nCurrentPos, aLocale, nWordType, sal_True );
         if ( aBoundary.startPos >= nCurrentPos )
             aBoundary = _xBI->previousWord( *aNewPaM.GetNode(), nCurrentPos, aLocale, nWordType );
-        aNewPaM.SetIndex( ( aBoundary.startPos != (-1) ) ? (USHORT)aBoundary.startPos : 0 );
+        aNewPaM.SetIndex( ( aBoundary.startPos != (-1) ) ? (sal_uInt16)aBoundary.startPos : 0 );
     }
 
     return aNewPaM;
@@ -1574,13 +1574,13 @@ EditPaM ImpEditEngine::WordRight( const EditPaM& rPaM, sal_Int16 nWordType )
 
         uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
         i18n::Boundary aBoundary = _xBI->nextWord( *aNewPaM.GetNode(), aNewPaM.GetIndex(), aLocale, nWordType );
-        aNewPaM.SetIndex( (USHORT)aBoundary.startPos );
+        aNewPaM.SetIndex( (sal_uInt16)aBoundary.startPos );
     }
     // not 'else', maybe the index reached nMax now...
     if ( aNewPaM.GetIndex() >= nMax )
     {
         // Naechster Absatz...
-        USHORT nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
+        sal_uInt16 nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
         ContentNode* pNextNode = aEditDoc.SaveGetObject( ++nCurPara );
         if ( pNextNode )
         {
@@ -1605,7 +1605,7 @@ EditPaM ImpEditEngine::StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
 
     uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
     i18n::Boundary aBoundary = _xBI->getWordBoundary( *rPaM.GetNode(), rPaM.GetIndex(), aLocale, nWordType, sal_True );
-    aNewPaM.SetIndex( (USHORT)aBoundary.startPos );
+    aNewPaM.SetIndex( (sal_uInt16)aBoundary.startPos );
     return aNewPaM;
 }
 
@@ -1623,11 +1623,11 @@ EditPaM ImpEditEngine::EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
 
     uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
     i18n::Boundary aBoundary = _xBI->getWordBoundary( *rPaM.GetNode(), rPaM.GetIndex(), aLocale, nWordType, sal_True );
-    aNewPaM.SetIndex( (USHORT)aBoundary.endPos );
+    aNewPaM.SetIndex( (sal_uInt16)aBoundary.endPos );
     return aNewPaM;
 }
 
-EditSelection ImpEditEngine::SelectWord( const EditSelection& rCurSel, sal_Int16 nWordType, BOOL bAcceptStartOfWord )
+EditSelection ImpEditEngine::SelectWord( const EditSelection& rCurSel, sal_Int16 nWordType, sal_Bool bAcceptStartOfWord )
 {
     EditSelection aNewSel( rCurSel );
     EditPaM aPaM( rCurSel.Max() );
@@ -1649,8 +1649,8 @@ EditSelection ImpEditEngine::SelectWord( const EditSelection& rCurSel, sal_Int16
         if ( ( aBoundary.endPos > aPaM.GetIndex() ) &&
              ( ( aBoundary.startPos < aPaM.GetIndex() ) || ( bAcceptStartOfWord && ( aBoundary.startPos == aPaM.GetIndex() ) ) ) )
         {
-            aNewSel.Min().SetIndex( (USHORT)aBoundary.startPos );
-            aNewSel.Max().SetIndex( (USHORT)aBoundary.endPos );
+            aNewSel.Min().SetIndex( (sal_uInt16)aBoundary.startPos );
+            aNewSel.Max().SetIndex( (sal_uInt16)aBoundary.endPos );
         }
     }
 
@@ -1671,8 +1671,8 @@ EditSelection ImpEditEngine::SelectSentence( const EditSelection& rCurSel )
     long nEnd = _xBI->endOfSentence( *pNode, rPaM.GetIndex(), GetLocale( rPaM ) );
     EditSelection aNewSel( rCurSel );
     DBG_ASSERT(nStart < pNode->Len() && nEnd <= pNode->Len(), "sentence indices out of range");
-    aNewSel.Min().SetIndex( (USHORT)nStart );
-    aNewSel.Max().SetIndex( (USHORT)nEnd );
+    aNewSel.Min().SetIndex( (sal_uInt16)nStart );
+    aNewSel.Max().SetIndex( (sal_uInt16)nEnd );
     return aNewSel;
 }
 
@@ -1683,8 +1683,8 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired( sal_Unicode nChar, cons
         pCTLOptions = new SvtCTLOptions;
 
     // get the index that really is first
-    USHORT nFirstPos = rCurSel.Min().GetIndex();
-    USHORT nMaxPos   = rCurSel.Max().GetIndex();
+    sal_uInt16 nFirstPos = rCurSel.Min().GetIndex();
+    sal_uInt16 nMaxPos   = rCurSel.Max().GetIndex();
     if (nMaxPos < nFirstPos)
         nFirstPos = nMaxPos;
 
@@ -1715,7 +1715,7 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired( sal_Unicode nChar, cons
 
 
 
-void ImpEditEngine::InitScriptTypes( USHORT nPara )
+void ImpEditEngine::InitScriptTypes( sal_uInt16 nPara )
 {
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
     ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
@@ -1739,7 +1739,7 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
                 aText.SetChar( pField->GetStart(), aFldText.getStr()[0] );
                 short nFldScriptType = _xBI->getScriptType( aFldText, 0 );
 
-                for ( USHORT nCharInField = 1; nCharInField < aFldText.getLength(); nCharInField++ )
+                for ( sal_uInt16 nCharInField = 1; nCharInField < aFldText.getLength(); nCharInField++ )
                 {
                     short nTmpType = _xBI->getScriptType( aFldText, nCharInField );
 
@@ -1764,15 +1764,15 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
         }
 
         ::rtl::OUString aOUText( aText );
-        USHORT nTextLen = (USHORT)aOUText.getLength();
+        sal_uInt16 nTextLen = (sal_uInt16)aOUText.getLength();
 
         sal_Int32 nPos = 0;
         short nScriptType = _xBI->getScriptType( aOUText, nPos );
-        rTypes.push_back( ScriptTypePosInfo( nScriptType, (USHORT)nPos, nTextLen ) );
+        rTypes.push_back( ScriptTypePosInfo( nScriptType, (sal_uInt16)nPos, nTextLen ) );
         nPos = _xBI->endOfScript( aOUText, nPos, nScriptType );
         while ( ( nPos != (-1) ) && ( nPos < nTextLen ) )
         {
-            rTypes.back().nEndPos = (USHORT)nPos;
+            rTypes.back().nEndPos = (sal_uInt16)nPos;
 
             nScriptType = _xBI->getScriptType( aOUText, nPos );
             long nEndPos = _xBI->endOfScript( aOUText, nPos, nScriptType );
@@ -1780,7 +1780,7 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
             if ( ( nScriptType == i18n::ScriptType::WEAK ) || ( nScriptType == rTypes.back().nScriptType ) )
             {
                 // Expand last ScriptTypePosInfo, don't create weak or unecessary portions
-                rTypes.back().nEndPos = (USHORT)nEndPos;
+                rTypes.back().nEndPos = (sal_uInt16)nEndPos;
             }
             else
             {
@@ -1795,7 +1795,7 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
                         break;
                     }
                 }
-                rTypes.push_back( ScriptTypePosInfo( nScriptType, (USHORT)nPos, nTextLen ) );
+                rTypes.push_back( ScriptTypePosInfo( nScriptType, (sal_uInt16)nPos, nTextLen ) );
             }
 
             nPos = nEndPos;
@@ -1814,7 +1814,7 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
         {
             const xub_StrLen nStart = rDirInfos[n].nStartPos;
             const xub_StrLen nEnd   = rDirInfos[n].nEndPos;
-            const BYTE nCurrDirType = rDirInfos[n].nType;
+            const sal_uInt8 nCurrDirType = rDirInfos[n].nType;
 
             if ( nCurrDirType % 2 == UBIDI_RTL  || // text in RTL run
                 ( nCurrDirType > UBIDI_LTR && !lcl_HasStrongLTR( aText, nStart, nEnd ) ) ) // non-strong text in embedded LTR run
@@ -1832,14 +1832,14 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
                 // special case:
                 if(nIdx < rTypes.size() && rTypes[nIdx].nStartPos < nStart && rTypes[nIdx].nEndPos > nEnd)
                 {
-                    rTypes.insert( rTypes.begin()+nIdx, ScriptTypePosInfo( rTypes[nIdx].nScriptType, (USHORT)nEnd, rTypes[nIdx].nEndPos ) );
+                    rTypes.insert( rTypes.begin()+nIdx, ScriptTypePosInfo( rTypes[nIdx].nScriptType, (sal_uInt16)nEnd, rTypes[nIdx].nEndPos ) );
                     rTypes[nIdx].nEndPos = nStart;
                 }
 
                 if( nIdx )
                     rTypes[nIdx - 1].nEndPos = nStart;
 
-                rTypes.insert( rTypes.begin()+nIdx, ScriptTypePosInfo( i18n::ScriptType::COMPLEX, (USHORT)nStart, (USHORT)nEnd) );
+                rTypes.insert( rTypes.begin()+nIdx, ScriptTypePosInfo( i18n::ScriptType::COMPLEX, (sal_uInt16)nStart, (sal_uInt16)nEnd) );
                 ++nIdx;
 
                 if( nIdx < rTypes.size() )
@@ -1848,8 +1848,8 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
         }
 
 #if OSL_DEBUG_LEVEL > 1
-        USHORT nDebugStt = 0;
-        USHORT nDebugEnd = 0;
+        sal_uInt16 nDebugStt = 0;
+        sal_uInt16 nDebugEnd = 0;
         short nDebugType = 0;
         for ( size_t n = 0; n < rTypes.size(); ++n )
         {
@@ -1861,22 +1861,22 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
     }
 }
 
-USHORT ImpEditEngine::GetScriptType( const EditPaM& rPaM, USHORT* pEndPos ) const
+sal_uInt16 ImpEditEngine::GetScriptType( const EditPaM& rPaM, sal_uInt16* pEndPos ) const
 {
-    USHORT nScriptType = 0;
+    sal_uInt16 nScriptType = 0;
 
     if ( pEndPos )
         *pEndPos = rPaM.GetNode()->Len();
 
     if ( rPaM.GetNode()->Len() )
     {
-         USHORT nPara = GetEditDoc().GetPos( rPaM.GetNode() );
+         sal_uInt16 nPara = GetEditDoc().GetPos( rPaM.GetNode() );
         ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
         if ( pParaPortion->aScriptInfos.empty() )
             ((ImpEditEngine*)this)->InitScriptTypes( nPara );
 
         ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
-        USHORT nPos = rPaM.GetIndex();
+        sal_uInt16 nPos = rPaM.GetIndex();
         for ( size_t n = 0; n < rTypes.size(); n++ )
         {
             if ( ( rTypes[n].nStartPos <= nPos ) && ( rTypes[n].nEndPos >= nPos ) )
@@ -1891,17 +1891,17 @@ USHORT ImpEditEngine::GetScriptType( const EditPaM& rPaM, USHORT* pEndPos ) cons
     return nScriptType ? nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
 }
 
-USHORT ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
+sal_uInt16 ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
 {
     EditSelection aSel( rSel );
     aSel.Adjust( aEditDoc );
 
     short nScriptType = 0;
 
-     USHORT nStartPara = GetEditDoc().GetPos( aSel.Min().GetNode() );
-     USHORT nEndPara = GetEditDoc().GetPos( aSel.Max().GetNode() );
+     sal_uInt16 nStartPara = GetEditDoc().GetPos( aSel.Min().GetNode() );
+     sal_uInt16 nEndPara = GetEditDoc().GetPos( aSel.Max().GetNode() );
 
-    for ( USHORT nPara = nStartPara; nPara <= nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
     {
         ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
         if ( pParaPortion->aScriptInfos.empty() )
@@ -1912,8 +1912,8 @@ USHORT ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
         // find the first(!) script type position that holds the
         // complete selection. Thus it will work for selections as
         // well as with just moving the cursor from char to char.
-        USHORT nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0;
-        USHORT nE = ( nPara == nEndPara ) ? aSel.Max().GetIndex() : pParaPortion->GetNode()->Len();
+        sal_uInt16 nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0;
+        sal_uInt16 nE = ( nPara == nEndPara ) ? aSel.Max().GetIndex() : pParaPortion->GetNode()->Len();
         for ( size_t n = 0; n < rTypes.size(); n++ )
         {
             if (rTypes[n].nStartPos <= nS  &&  nE <= rTypes[n].nEndPos)
@@ -1937,24 +1937,24 @@ USHORT ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
     return nScriptType ? nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
 }
 
-BOOL ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const
+sal_Bool ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const
 {
-    BOOL bScriptChange = FALSE;
+    sal_Bool bScriptChange = sal_False;
 
     if ( rPaM.GetNode()->Len() )
     {
-        USHORT nPara = GetEditDoc().GetPos( rPaM.GetNode() );
+        sal_uInt16 nPara = GetEditDoc().GetPos( rPaM.GetNode() );
         ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
         if ( pParaPortion->aScriptInfos.empty() )
             ((ImpEditEngine*)this)->InitScriptTypes( nPara );
 
         ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
-        USHORT nPos = rPaM.GetIndex();
+        sal_uInt16 nPos = rPaM.GetIndex();
         for ( size_t n = 0; n < rTypes.size(); n++ )
         {
             if ( rTypes[n].nStartPos == nPos )
                {
-                bScriptChange = TRUE;
+                bScriptChange = sal_True;
                 break;
             }
         }
@@ -1962,9 +1962,9 @@ BOOL ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const
     return bScriptChange;
 }
 
-BOOL ImpEditEngine::HasScriptType( USHORT nPara, USHORT nType ) const
+sal_Bool ImpEditEngine::HasScriptType( sal_uInt16 nPara, sal_uInt16 nType ) const
 {
-    BOOL bTypeFound = FALSE;
+    sal_Bool bTypeFound = sal_False;
 
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
     if ( pParaPortion->aScriptInfos.empty() )
@@ -1974,24 +1974,24 @@ BOOL ImpEditEngine::HasScriptType( USHORT nPara, USHORT nType ) const
     for ( size_t n = rTypes.size(); n && !bTypeFound; )
     {
         if ( rTypes[--n].nScriptType == nType )
-                bTypeFound = TRUE;
+                bTypeFound = sal_True;
     }
     return bTypeFound;
 }
 
-void ImpEditEngine::InitWritingDirections( USHORT nPara )
+void ImpEditEngine::InitWritingDirections( sal_uInt16 nPara )
 {
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
     WritingDirectionInfos& rInfos = pParaPortion->aWritingDirectionInfos;
     rInfos.clear();
 
-    BOOL bCTL = FALSE;
+    sal_Bool bCTL = sal_False;
     ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
     for ( size_t n = 0; n < rTypes.size(); n++ )
     {
         if ( rTypes[n].nScriptType == i18n::ScriptType::COMPLEX )
            {
-            bCTL = TRUE;
+            bCTL = sal_True;
             break;
         }
     }
@@ -2021,7 +2021,7 @@ void ImpEditEngine::InitWritingDirections( USHORT nPara )
         for ( size_t nIdx = 0; nIdx < nCount; ++nIdx )
         {
             ubidi_getLogicalRun( pBidi, nStart, &nEnd, &nCurrDir );
-            rInfos.push_back( WritingDirectionInfo( nCurrDir, (USHORT)nStart, (USHORT)nEnd ) );
+            rInfos.push_back( WritingDirectionInfo( nCurrDir, (sal_uInt16)nStart, (sal_uInt16)nEnd ) );
             nStart = nEnd;
         }
 
@@ -2030,13 +2030,13 @@ void ImpEditEngine::InitWritingDirections( USHORT nPara )
 
     // No infos mean no CTL and default dir is L2R...
     if ( rInfos.empty() )
-        rInfos.push_back( WritingDirectionInfo( 0, 0, (USHORT)pParaPortion->GetNode()->Len() ) );
+        rInfos.push_back( WritingDirectionInfo( 0, 0, (sal_uInt16)pParaPortion->GetNode()->Len() ) );
 
 }
 
-BOOL ImpEditEngine::IsRightToLeft( USHORT nPara ) const
+sal_Bool ImpEditEngine::IsRightToLeft( sal_uInt16 nPara ) const
 {
-    BOOL bR2L = FALSE;
+    sal_Bool bR2L = sal_False;
     const SvxFrameDirectionItem* pFrameDirItem = NULL;
 
     if ( !IsVertical() )
@@ -2064,20 +2064,20 @@ BOOL ImpEditEngine::IsRightToLeft( USHORT nPara ) const
     return bR2L;
 }
 
-BOOL ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
+sal_Bool ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
 {
-    USHORT nPara = GetEditDoc().GetPos( (ContentNode*)pNode );
+    sal_uInt16 nPara = GetEditDoc().GetPos( (ContentNode*)pNode );
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
 
-    BOOL bHasDifferentRTLLevels = FALSE;
+    sal_Bool bHasDifferentRTLLevels = sal_False;
 
-    USHORT nRTLLevel = IsRightToLeft( nPara ) ? 1 : 0;
-    for ( USHORT n = 0; n < pParaPortion->GetTextPortions().Count(); n++ )
+    sal_uInt16 nRTLLevel = IsRightToLeft( nPara ) ? 1 : 0;
+    for ( sal_uInt16 n = 0; n < pParaPortion->GetTextPortions().Count(); n++ )
     {
         TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( n );
         if ( pTextPortion->GetRightToLeft() != nRTLLevel )
         {
-            bHasDifferentRTLLevels = TRUE;
+            bHasDifferentRTLLevels = sal_True;
             break;
         }
     }
@@ -2085,10 +2085,10 @@ BOOL ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
 }
 
 
-BYTE ImpEditEngine::GetRightToLeft( USHORT nPara, USHORT nPos, USHORT* pStart, USHORT* pEnd )
+sal_uInt8 ImpEditEngine::GetRightToLeft( sal_uInt16 nPara, sal_uInt16 nPos, sal_uInt16* pStart, sal_uInt16* pEnd )
 {
-//    BYTE nRightToLeft = IsRightToLeft( nPara ) ? 1 : 0;
-    BYTE nRightToLeft = 0;
+//    sal_uInt8 nRightToLeft = IsRightToLeft( nPara ) ? 1 : 0;
+    sal_uInt8 nRightToLeft = 0;
 
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     if ( pNode && pNode->Len() )
@@ -2097,7 +2097,7 @@ BYTE ImpEditEngine::GetRightToLeft( USHORT nPara, USHORT nPos, USHORT* pStart, U
         if ( pParaPortion->aWritingDirectionInfos.empty() )
             InitWritingDirections( nPara );
 
-//        BYTE nType = 0;
+//        sal_uInt8 nType = 0;
         WritingDirectionInfos& rDirInfos = pParaPortion->aWritingDirectionInfos;
         for ( size_t n = 0; n < rDirInfos.size(); n++ )
         {
@@ -2115,7 +2115,7 @@ BYTE ImpEditEngine::GetRightToLeft( USHORT nPara, USHORT nPos, USHORT* pStart, U
     return nRightToLeft;
 }
 
-SvxAdjust ImpEditEngine::GetJustification( USHORT nPara ) const
+SvxAdjust ImpEditEngine::GetJustification( sal_uInt16 nPara ) const
 {
     SvxAdjust eJustification = SVX_ADJUST_LEFT;
 
@@ -2139,18 +2139,18 @@ SvxAdjust ImpEditEngine::GetJustification( USHORT nPara ) const
 //  Textaenderung
 //  ----------------------------------------------------------------------
 
-void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndoRemoveChars* pCurUndo )
+void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, EditUndoRemoveChars* pCurUndo )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
         XubString aStr( rPaM.GetNode()->Copy( rPaM.GetIndex(), nChars ) );
 
         // Pruefen, ob Attribute geloescht oder geaendert werden:
-        USHORT nStart = rPaM.GetIndex();
-        USHORT nEnd = nStart + nChars;
+        sal_uInt16 nStart = rPaM.GetIndex();
+        sal_uInt16 nEnd = nStart + nChars;
         CharAttribArray& rAttribs = rPaM.GetNode()->GetCharAttribs().GetAttribs();
-//      USHORT nAttrs = rAttribs.Count();
-        for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
+//      sal_uInt16 nAttrs = rAttribs.Count();
+        for ( sal_uInt16 nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
         {
             EditCharAttrib* pAttr = rAttribs[nAttr];
             if ( ( pAttr->GetEnd() >= nStart ) && ( pAttr->GetStart() < nEnd ) )
@@ -2176,10 +2176,10 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndo
     TextModified();
 }
 
-EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNewPos )
+EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16 nNewPos )
 {
     aOldPositions.Justify();
-    BOOL bValidAction = ( (long)nNewPos < aOldPositions.Min() ) || ( (long)nNewPos > aOldPositions.Max() );
+    sal_Bool bValidAction = ( (long)nNewPos < aOldPositions.Min() ) || ( (long)nNewPos > aOldPositions.Max() );
     DBG_ASSERT( bValidAction, "Move in sich selbst ?" );
     DBG_ASSERT( aOldPositions.Max() <= (long)GetParaPortions().Count(), "Voll drueber weg: MoveParagraphs" );
 
@@ -2191,7 +2191,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
         return aSelection;
     }
 
-    ULONG nParaCount = GetParaPortions().Count();
+    sal_uLong nParaCount = GetParaPortions().Count();
 
     if ( nNewPos >= nParaCount )
         nNewPos = GetParaPortions().Count();
@@ -2205,28 +2205,28 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
     if ( nNewPos == 0 ) // Move to Start
     {
         pRecalc1 = GetParaPortions().GetObject( 0 );
-        pRecalc2 = GetParaPortions().GetObject( (USHORT)aOldPositions.Min() );
+        pRecalc2 = GetParaPortions().GetObject( (sal_uInt16)aOldPositions.Min() );
 
     }
     else if ( nNewPos == nParaCount )
     {
-        pRecalc1 = GetParaPortions().GetObject( (USHORT)(nParaCount-1) );
-        pRecalc2 = GetParaPortions().GetObject( (USHORT)aOldPositions.Max() );
+        pRecalc1 = GetParaPortions().GetObject( (sal_uInt16)(nParaCount-1) );
+        pRecalc2 = GetParaPortions().GetObject( (sal_uInt16)aOldPositions.Max() );
     }
 
     if ( aOldPositions.Min() == 0 ) // Move from Start
     {
         pRecalc3 = GetParaPortions().GetObject( 0 );
         pRecalc4 = GetParaPortions().GetObject(
-            sal::static_int_cast< USHORT >( aOldPositions.Max()+1 ) );
+            sal::static_int_cast< sal_uInt16 >( aOldPositions.Max()+1 ) );
     }
-    else if ( (USHORT)aOldPositions.Max() == (nParaCount-1) )
+    else if ( (sal_uInt16)aOldPositions.Max() == (nParaCount-1) )
     {
-        pRecalc3 = GetParaPortions().GetObject( (USHORT)aOldPositions.Max() );
-        pRecalc4 = GetParaPortions().GetObject( (USHORT)(aOldPositions.Min()-1) );
+        pRecalc3 = GetParaPortions().GetObject( (sal_uInt16)aOldPositions.Max() );
+        pRecalc4 = GetParaPortions().GetObject( (sal_uInt16)(aOldPositions.Min()-1) );
     }
 
-    MoveParagraphsInfo aMoveParagraphsInfo( sal::static_int_cast< USHORT >(aOldPositions.Min()), sal::static_int_cast< USHORT >(aOldPositions.Max()), nNewPos );
+    MoveParagraphsInfo aMoveParagraphsInfo( sal::static_int_cast< sal_uInt16 >(aOldPositions.Min()), sal::static_int_cast< sal_uInt16 >(aOldPositions.Max()), nNewPos );
     aBeginMovingParagraphsHdl.Call( &aMoveParagraphsInfo );
 
     if ( IsUndoEnabled() && !IsInUndo())
@@ -2236,20 +2236,20 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
     ParaPortion* pDestPortion = GetParaPortions().SaveGetObject( nNewPos );
 
     ParaPortionList aTmpPortionList;
-    USHORT i;
-    for ( i = (USHORT)aOldPositions.Min(); i <= (USHORT)aOldPositions.Max(); i++  )
+    sal_uInt16 i;
+    for ( i = (sal_uInt16)aOldPositions.Min(); i <= (sal_uInt16)aOldPositions.Max(); i++  )
     {
         // Immer aOldPositions.Min(), da Remove().
-        ParaPortion* pTmpPortion = GetParaPortions().GetObject( (USHORT)aOldPositions.Min() );
-        GetParaPortions().Remove( (USHORT)aOldPositions.Min() );
-        aEditDoc.Remove( (USHORT)aOldPositions.Min() );
+        ParaPortion* pTmpPortion = GetParaPortions().GetObject( (sal_uInt16)aOldPositions.Min() );
+        GetParaPortions().Remove( (sal_uInt16)aOldPositions.Min() );
+        aEditDoc.Remove( (sal_uInt16)aOldPositions.Min() );
         aTmpPortionList.Insert( pTmpPortion, aTmpPortionList.Count() );
     }
 
-    USHORT nRealNewPos = pDestPortion ? GetParaPortions().GetPos( pDestPortion ) : GetParaPortions().Count();
+    sal_uInt16 nRealNewPos = pDestPortion ? GetParaPortions().GetPos( pDestPortion ) : GetParaPortions().Count();
     DBG_ASSERT( nRealNewPos != USHRT_MAX, "ImpMoveParagraphs: Ungueltige Position!" );
 
-    for ( i = 0; i < (USHORT)aTmpPortionList.Count(); i++  )
+    for ( i = 0; i < (sal_uInt16)aTmpPortionList.Count(); i++  )
     {
         ParaPortion* pTmpPortion = aTmpPortionList.GetObject( i );
         if ( i == 0 )
@@ -2271,12 +2271,12 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
         EENotify aNotify( EE_NOTIFY_PARAGRAPHSMOVED );
         aNotify.pEditEngine = GetEditEnginePtr();
         aNotify.nParagraph = nNewPos;
-        aNotify.nParam1 = sal::static_int_cast< USHORT >(aOldPositions.Min());
-        aNotify.nParam2 = sal::static_int_cast< USHORT >(aOldPositions.Max());
+        aNotify.nParam1 = sal::static_int_cast< sal_uInt16 >(aOldPositions.Min());
+        aNotify.nParam2 = sal::static_int_cast< sal_uInt16 >(aOldPositions.Max());
         CallNotify( aNotify );
     }
 
-    aEditDoc.SetModified( TRUE );
+    aEditDoc.SetModified( sal_True );
 
     if ( pRecalc1 )
         CalcHeight( pRecalc1 );
@@ -2296,14 +2296,14 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
 }
 
 
-EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pRight, BOOL bBackward )
+EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pRight, sal_Bool bBackward )
 {
     DBG_ASSERT( pLeft != pRight, "Den gleichen Absatz zusammenfuegen ?" );
     DBG_ASSERT( aEditDoc.GetPos( pLeft ) != USHRT_MAX, "Einzufuegenden Node nicht gefunden(1)" );
     DBG_ASSERT( aEditDoc.GetPos( pRight ) != USHRT_MAX, "Einzufuegenden Node nicht gefunden(2)" );
 
-    USHORT nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
-    DeletedNodeInfo* pInf = new DeletedNodeInfo( (ULONG)pRight, nParagraphTobeDeleted );
+    sal_uInt16 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
+    DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pRight, nParagraphTobeDeleted );
     aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
 
     GetEditEnginePtr()->ParagraphConnected( aEditDoc.GetPos( pLeft ), aEditDoc.GetPos( pRight ) );
@@ -2320,7 +2320,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
 
     if ( bBackward )
     {
-        pLeft->SetStyleSheet( pRight->GetStyleSheet(), TRUE );
+        pLeft->SetStyleSheet( pRight->GetStyleSheet(), sal_True );
         pLeft->GetContentAttribs().GetItems().Set( pRight->GetContentAttribs().GetItems() );
         pLeft->GetCharAttribs().GetDefFont() = pRight->GetCharAttribs().GetDefFont();
     }
@@ -2342,8 +2342,8 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
         pLeft->GetWrongList()->ClearWrongs( nInv, 0xFFFF, pLeft );  // Evtl. einen wegnehmen
         pLeft->GetWrongList()->MarkInvalid( nInv, nEnd+1 );
         // Falschgeschriebene Woerter ruebernehmen:
-        USHORT nRWrongs = pRight->GetWrongList()->Count();
-        for ( USHORT nW = 0; nW < nRWrongs; nW++ )
+        sal_uInt16 nRWrongs = pRight->GetWrongList()->Count();
+        for ( sal_uInt16 nW = 0; nW < nRWrongs; nW++ )
         {
             WrongRange aWrong = pRight->GetWrongList()->GetObject( nW );
             if ( aWrong.nStart != 0 )   // Nicht ein anschliessender
@@ -2372,7 +2372,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
         // Durch das zusammenfuegen wird der linke zwar neu formatiert, aber
         // wenn sich dessen Hoehe nicht aendert bekommt die Formatierung die
         // Aenderung der Gesaamthoehe des Textes zu spaet mit...
-        for ( USHORT n = nParagraphTobeDeleted; n < GetParaPortions().Count(); n++ )
+        for ( sal_uInt16 n = nParagraphTobeDeleted; n < GetParaPortions().Count(); n++ )
         {
             ParaPortion* pPP = GetParaPortions().GetObject( n );
             pPP->MarkSelectionInvalid( 0, pPP->GetNode()->Len() );
@@ -2385,7 +2385,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
     return aPaM;
 }
 
-EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, BYTE nMode, BYTE nDelMode )
+EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 nMode, sal_uInt8 nDelMode )
 {
     DBG_ASSERT( !EditSelection( rSel ).DbgIsBuggy( aEditDoc ), "Index im Wald in DeleteLeftOrRight" );
 
@@ -2462,10 +2462,10 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, BYTE nMode,
         return ImpDeleteSelection( EditSelection( aDelStart, aDelEnd ) );
 
     // Jetzt entscheiden, ob noch Selektion loeschen (RESTOFCONTENTS)
-    BOOL bSpecialBackward = ( ( nMode == DEL_LEFT ) && ( nDelMode == DELMODE_SIMPLE ) )
-                                ? TRUE : FALSE;
+    sal_Bool bSpecialBackward = ( ( nMode == DEL_LEFT ) && ( nDelMode == DELMODE_SIMPLE ) )
+                                ? sal_True : sal_False;
     if ( aStatus.IsAnyOutliner() )
-        bSpecialBackward = FALSE;
+        bSpecialBackward = sal_False;
 
     return ImpConnectParagraphs( aDelStart.GetNode(), aDelEnd.GetNode(), bSpecialBackward );
 }
@@ -2485,14 +2485,14 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel )
     DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" );
     DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" );
 
-    USHORT nStartNode = aEditDoc.GetPos( aStartPaM.GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aEndPaM.GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aStartPaM.GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aEndPaM.GetNode() );
 
     DBG_ASSERT( nEndNode != USHRT_MAX, "Start > End ?!" );
     DBG_ASSERT( nStartNode <= nEndNode, "Start > End ?!" );
 
     // Alle Nodes dazwischen entfernen....
-    for ( ULONG z = nStartNode+1; z < nEndNode; z++ )
+    for ( sal_uLong z = nStartNode+1; z < nEndNode; z++ )
     {
         // Immer nStartNode+1, wegen Remove()!
         ImpRemoveParagraph( nStartNode+1 );
@@ -2501,7 +2501,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel )
     if ( aStartPaM.GetNode() != aEndPaM.GetNode() )
     {
         // Den Rest des StartNodes...
-        USHORT nChars;
+        sal_uInt16 nChars;
         nChars = aStartPaM.GetNode()->Len() - aStartPaM.GetIndex();
         ImpRemoveChars( aStartPaM, nChars );
         ParaPortion* pPortion = FindParaPortion( aStartPaM.GetNode() );
@@ -2520,7 +2520,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel )
     }
     else
     {
-        USHORT nChars;
+        sal_uInt16 nChars;
         nChars = aEndPaM.GetIndex() - aStartPaM.GetIndex();
         ImpRemoveChars( aStartPaM, nChars );
         ParaPortion* pPortion = FindParaPortion( aStartPaM.GetNode() );
@@ -2533,7 +2533,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel )
     return aStartPaM;
 }
 
-void ImpEditEngine::ImpRemoveParagraph( USHORT nPara )
+void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara )
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     ContentNode* pNextNode = aEditDoc.SaveGetObject( nPara+1 );
@@ -2542,7 +2542,7 @@ void ImpEditEngine::ImpRemoveParagraph( USHORT nPara )
     DBG_ASSERT( pNode, "Blinder Node in ImpRemoveParagraph" );
     DBG_ASSERT( pPortion, "Blinde Portion in ImpRemoveParagraph(2)" );
 
-    DeletedNodeInfo* pInf = new DeletedNodeInfo( (ULONG)pNode, nPara );
+    DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pNode, nPara );
     aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
 
     // Der Node wird vom Undo verwaltet und ggf. zerstoert!
@@ -2569,12 +2569,12 @@ void ImpEditEngine::ImpRemoveParagraph( USHORT nPara )
     {
         aEditDoc.RemoveItemsFromPool( pNode );
         if ( pNode->GetStyleSheet() )
-            EndListening( *pNode->GetStyleSheet(), FALSE );
+            EndListening( *pNode->GetStyleSheet(), sal_False );
         delete pNode;
     }
 }
 
-EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, BOOL bOverwrite )
+EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, sal_Bool bOverwrite )
 {
     EditSelection aSel( rCurSel );
 #ifndef SVX_LIGHT
@@ -2586,8 +2586,8 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
 
         // #i78661 allow application to turn off capitalization of
         // start sentence explicitly.
-        // (This is done by setting IsFirstWordCapitalization to FALSE.)
-        BOOL bOldCptlSttSntnc = pAutoCorrect->IsAutoCorrFlag( CptlSttSntnc );
+        // (This is done by setting IsFirstWordCapitalization to sal_False.)
+        sal_Bool bOldCptlSttSntnc = pAutoCorrect->IsAutoCorrFlag( CptlSttSntnc );
         if (!IsFirstWordCapitalization())
         {
             ESelection aESel( CreateESel(aSel) );
@@ -2613,7 +2613,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
                 EditPaM aRight2Word( WordRight( aFirstWordSel.Max(), 1 ) );
                 aSecondWordSel = SelectWord( EditSelection( aRight2Word ) );
             }
-            BOOL bIsFirstWordInFirstPara = aESel.nEndPara == 0 &&
+            sal_Bool bIsFirstWordInFirstPara = aESel.nEndPara == 0 &&
                     aFirstWordSel.Max().GetIndex() <= aSel.Max().GetIndex() &&
                     aSel.Max().GetIndex() <= aSecondWordSel.Min().GetIndex();
 
@@ -2622,7 +2622,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
         }
 
         ContentNode* pNode = aSel.Max().GetNode();
-        USHORT nIndex = aSel.Max().GetIndex();
+        sal_uInt16 nIndex = aSel.Max().GetIndex();
         EdtAutoCorrDoc aAuto( this, pNode, nIndex, c );
         pAutoCorrect->AutoCorrect( aAuto, *pNode, nIndex, c, !bOverwrite );
         aSel.Max().SetIndex( aAuto.GetCursor() );
@@ -2637,17 +2637,17 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
 
 
 EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
-        xub_Unicode c, BOOL bOverwrite, sal_Bool bIsUserInput )
+        xub_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput )
 {
     DBG_ASSERT( c != '\t', "Tab bei InsertText ?" );
     DBG_ASSERT( c != '\n', "Zeilenumbruch bei InsertText ?" );
 
     EditPaM aPaM( rCurSel.Min() );
 
-    BOOL bDoOverwrite = ( bOverwrite &&
-            ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) ) ? TRUE : FALSE;
+    sal_Bool bDoOverwrite = ( bOverwrite &&
+            ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) ) ? sal_True : sal_False;
 
-    BOOL bUndoAction = ( rCurSel.HasRange() || bDoOverwrite );
+    sal_Bool bUndoAction = ( rCurSel.HasRange() || bDoOverwrite );
 
     if ( bUndoAction )
         UndoActionStart( EDITUNDO_INSERT );
@@ -2701,7 +2701,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
                     String aChgText( aNewText.copy( nChgPos ), nChgLen );
 
                     // select text from first pos to be changed to current pos
-                    EditSelection aSel( EditPaM( aPaM.GetNode(), (USHORT) nChgPos ), aPaM );
+                    EditSelection aSel( EditPaM( aPaM.GetNode(), (sal_uInt16) nChgPos ), aPaM );
 
                     if (aChgText.Len())
                         return InsertText( aSel, aChgText ); // implicitly handles undo
@@ -2722,7 +2722,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
         if ( IsUndoEnabled() && !IsInUndo() )
         {
             EditUndoInsertChars* pNewUndo = new EditUndoInsertChars( this, CreateEPaM( aPaM ), c );
-            BOOL bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? TRUE : FALSE;
+            sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False;
             InsertUndo( pNewUndo, bTryMerge );
         }
 
@@ -2766,10 +2766,10 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
     // Token mit LINE_SEP abfragen,
     // da der MAC-Compiler aus \n etwas anderes macht!
 
-    USHORT nStart = 0;
+    sal_uInt16 nStart = 0;
     while ( nStart < aText.Len() )
     {
-        USHORT nEnd = aText.Search( LINE_SEP, nStart );
+        sal_uInt16 nEnd = aText.Search( LINE_SEP, nStart );
         if ( nEnd == STRING_NOTFOUND )
             nEnd = aText.Len(); // nicht dereferenzieren!
 
@@ -2780,7 +2780,7 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
             xub_StrLen nChars = aPaM.GetNode()->Len() + aLine.Len();
             if ( nChars > MAXCHARSINPARA )
             {
-                USHORT nMaxNewChars = MAXCHARSINPARA-aPaM.GetNode()->Len();
+                sal_uInt16 nMaxNewChars = MAXCHARSINPARA-aPaM.GetNode()->Len();
                 nEnd -= ( aLine.Len() - nMaxNewChars ); // Dann landen die Zeichen im naechsten Absatz.
                 aLine.Erase( nMaxNewChars );            // Del Rest...
             }
@@ -2793,10 +2793,10 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
                 aPaM = aEditDoc.InsertText( aPaM, aLine );
             else
             {
-                USHORT nStart2 = 0;
+                sal_uInt16 nStart2 = 0;
                 while ( nStart2 < aLine.Len() )
                 {
-                    USHORT nEnd2 = aLine.Search( '\t', nStart2 );
+                    sal_uInt16 nEnd2 = aLine.Search( '\t', nStart2 );
                     if ( nEnd2 == STRING_NOTFOUND )
                         nEnd2 = aLine.Len();    // nicht dereferenzieren!
 
@@ -2882,7 +2882,7 @@ EditPaM ImpEditEngine::ImpInsertFeature( EditSelection aCurSel, const SfxPoolIte
     return aPaM;
 }
 
-EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection& rCurSel, BOOL bKeepEndingAttribs )
+EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection& rCurSel, sal_Bool bKeepEndingAttribs )
 {
     EditPaM aPaM;
     if ( rCurSel.HasRange() )
@@ -2893,7 +2893,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection& rCurSel, BOOL bK
     return ImpInsertParaBreak( aPaM, bKeepEndingAttribs );
 }
 
-EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEndingAttribs )
+EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, sal_Bool bKeepEndingAttribs )
 {
     if ( aEditDoc.Count() >= 0xFFFE )
     {
@@ -2916,8 +2916,8 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
         WrongList* pLWrongs = rPaM.GetNode()->GetWrongList();
         WrongList* pRWrongs = aPaM.GetNode()->GetWrongList();
         // Falschgeschriebene Woerter ruebernehmen:
-        USHORT nLWrongs = pLWrongs->Count();
-        for ( USHORT nW = 0; nW < nLWrongs; nW++ )
+        sal_uInt16 nLWrongs = pLWrongs->Count();
+        for ( sal_uInt16 nW = 0; nW < nLWrongs; nW++ )
         {
             WrongRange& rWrong = pLWrongs->GetObject( nW );
             // Nur wenn wirklich dahinter, ein ueberlappendes wird beim Spell korrigiert
@@ -2931,7 +2931,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
             else if ( ( rWrong.nStart < nEnd ) && ( rWrong.nEnd > nEnd ) )
                 rWrong.nEnd = nEnd;
         }
-        USHORT nInv = nEnd ? nEnd-1 : nEnd;
+        sal_uInt16 nInv = nEnd ? nEnd-1 : nEnd;
         if ( nEnd )
             pLWrongs->MarkInvalid( nInv, nEnd );
         else
@@ -2948,7 +2948,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
 
     // Optimieren: Nicht unnoetig viele GetPos auf die Listen ansetzen!
     // Hier z.B. bei Undo, aber auch in allen anderen Methoden.
-    USHORT nPos = GetParaPortions().GetPos( pPortion );
+    sal_uInt16 nPos = GetParaPortions().GetPos( pPortion );
     ParaPortion* pNewPortion = new ParaPortion( aPaM.GetNode() );
     GetParaPortions().Insert( pNewPortion, nPos + 1 );
     ParaAttribsChanged( pNewPortion->GetNode() );
@@ -2960,7 +2960,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
     return aPaM;
 }
 
-EditPaM ImpEditEngine::ImpFastInsertParagraph( USHORT nPara )
+EditPaM ImpEditEngine::ImpFastInsertParagraph( sal_uInt16 nPara )
 {
 #ifndef SVX_LIGHT
     if ( IsUndoEnabled() && !IsInUndo() )
@@ -2999,10 +2999,10 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel )
     EditPaM aPaM( ImpInsertParaBreak( aCurSel ) );
     if ( aStatus.DoAutoIndenting() )
     {
-        USHORT nPara = aEditDoc.GetPos( aPaM.GetNode() );
+        sal_uInt16 nPara = aEditDoc.GetPos( aPaM.GetNode() );
         DBG_ASSERT( nPara > 0, "AutoIndenting: Fehler!" );
         XubString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) );
-        USHORT n = 0;
+        sal_uInt16 n = 0;
         while ( ( n < aPrevParaText.Len() ) &&
                 ( ( aPrevParaText.GetChar(n) == ' ' ) || ( aPrevParaText.GetChar(n) == '\t' ) ) )
         {
@@ -3029,18 +3029,18 @@ EditPaM ImpEditEngine::InsertField( EditSelection aCurSel, const SvxFieldItem& r
     return aPaM;
 }
 
-BOOL ImpEditEngine::UpdateFields()
+sal_Bool ImpEditEngine::UpdateFields()
 {
-    BOOL bChanges = FALSE;
-    USHORT nParas = GetEditDoc().Count();
-    for ( USHORT nPara = 0; nPara < nParas; nPara++ )
+    sal_Bool bChanges = sal_False;
+    sal_uInt16 nParas = GetEditDoc().Count();
+    for ( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
     {
-        BOOL bChangesInPara = FALSE;
+        sal_Bool bChangesInPara = sal_False;
         ContentNode* pNode = GetEditDoc().GetObject( nPara );
         DBG_ASSERT( pNode, "NULL-Pointer im Doc" );
         CharAttribArray& rAttribs = pNode->GetCharAttribs().GetAttribs();
-//      USHORT nAttrs = rAttribs.Count();
-        for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
+//      sal_uInt16 nAttrs = rAttribs.Count();
+        for ( sal_uInt16 nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
         {
             EditCharAttrib* pAttr = rAttribs[nAttr];
             if ( pAttr->Which() == EE_FEATURE_FIELD )
@@ -3059,8 +3059,8 @@ BOOL ImpEditEngine::UpdateFields()
                 pField->GetFieldValue() = aFldValue;
                 if ( *pField != *pCurrent )
                 {
-                    bChanges = TRUE;
-                    bChangesInPara = TRUE;
+                    bChanges = sal_True;
+                    bChangesInPara = sal_True;
                 }
                 delete pCurrent;
             }
@@ -3085,13 +3085,13 @@ EditPaM ImpEditEngine::InsertLineBreak( EditSelection aCurSel )
 //  ----------------------------------------------------------------------
 //  Hilfsfunktionen
 //  ----------------------------------------------------------------------
-Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, USHORT nFlags )
+Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, sal_uInt16 nFlags )
 {
-    DBG_ASSERT( GetUpdateMode(), "Darf bei Update=FALSE nicht erreicht werden: PaMtoEditCursor" );
+    DBG_ASSERT( GetUpdateMode(), "Darf bei Update=sal_False nicht erreicht werden: PaMtoEditCursor" );
 
     Rectangle aEditCursor;
     long nY = 0;
-    for ( USHORT nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
     {
         ParaPortion* pPortion = GetParaPortions().GetObject(nPortion);
         ContentNode* pNode = pPortion->GetNode();
@@ -3112,14 +3112,14 @@ Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, USHORT nFlags )
     return aEditCursor;
 }
 
-EditPaM ImpEditEngine::GetPaM( Point aDocPos, BOOL bSmart )
+EditPaM ImpEditEngine::GetPaM( Point aDocPos, sal_Bool bSmart )
 {
-    DBG_ASSERT( GetUpdateMode(), "Darf bei Update=FALSE nicht erreicht werden: GetPaM" );
+    DBG_ASSERT( GetUpdateMode(), "Darf bei Update=sal_False nicht erreicht werden: GetPaM" );
 
     long nY = 0;
     long nTmpHeight;
     EditPaM aPaM;
-    USHORT nPortion;
+    sal_uInt16 nPortion;
     for ( nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
     {
         ParaPortion* pPortion = GetParaPortions().GetObject(nPortion);
@@ -3154,12 +3154,12 @@ EditPaM ImpEditEngine::GetPaM( Point aDocPos, BOOL bSmart )
 
 sal_uInt32 ImpEditEngine::GetTextHeight() const
 {
-    DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: GetTextHeight" );
+    DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=sal_False nicht verwendet werden: GetTextHeight" );
     DBG_ASSERT( IsFormatted() || IsFormatting(), "GetTextHeight: Nicht formatiert" );
     return nCurTextHeight;
 }
 
-sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
+sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace )
 {
     // Wenn noch nicht formatiert und nicht gerade dabei.
     // Wird in der Formatierung bei AutoPageSize gerufen.
@@ -3174,10 +3174,10 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
     // --------------------------------------------------
     // Ueber alle Absaetze...
     // --------------------------------------------------
-    USHORT nParas = GetParaPortions().Count();
-//  USHORT nBiggestPara = 0;
-//  USHORT nBiggestLine = 0;
-    for ( USHORT nPara = 0; nPara < nParas; nPara++ )
+    sal_uInt16 nParas = GetParaPortions().Count();
+//  sal_uInt16 nBiggestPara = 0;
+//  sal_uInt16 nBiggestLine = 0;
+    for ( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
     {
         ParaPortion* pPortion = GetParaPortions().GetObject( nPara );
         if ( pPortion->IsVisible() )
@@ -3188,8 +3188,8 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
             // --------------------------------------------------
             // Ueber die Zeilen des Absatzes...
             // --------------------------------------------------
-            ULONG nLines = pPortion->GetLines().Count();
-            for ( USHORT nLine = 0; nLine < nLines; nLine++ )
+            sal_uLong nLines = pPortion->GetLines().Count();
+            for ( sal_uInt16 nLine = 0; nLine < nLines; nLine++ )
             {
                 pLine = pPortion->GetLines().GetObject( nLine );
                 DBG_ASSERT( pLine, "NULL-Pointer im Zeileniterator in CalcWidth" );
@@ -3226,9 +3226,9 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
     return (sal_uInt32)nMaxWidth;
 }
 
-sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace )
+sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, sal_Bool bIgnoreExtraSpace )
 {
-    USHORT nPara = GetEditDoc().GetPos( pPortion->GetNode() );
+    sal_uInt16 nPara = GetEditDoc().GetPos( pPortion->GetNode() );
 
     // #114278# Saving both layout mode and language (since I'm
     // potentially changing both)
@@ -3240,8 +3240,8 @@ sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine,
 
     // Berechnung der Breite ohne die Indents...
     sal_uInt32 nWidth = 0;
-    USHORT nPos = pLine->GetStart();
-    for ( USHORT nTP = pLine->GetStartPortion(); nTP <= pLine->GetEndPortion(); nTP++ )
+    sal_uInt16 nPos = pLine->GetStart();
+    for ( sal_uInt16 nTP = pLine->GetStartPortion(); nTP <= pLine->GetEndPortion(); nTP++ )
     {
         TextPortion* pTextPortion = pPortion->GetTextPortions().GetObject( nTP );
         switch ( pTextPortion->GetKind() )
@@ -3280,14 +3280,14 @@ sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine,
 
 sal_uInt32 ImpEditEngine::CalcTextHeight()
 {
-    DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: CalcTextHeight" );
+    DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=sal_False nicht verwendet werden: CalcTextHeight" );
     sal_uInt32 nY = 0;
-    for ( USHORT nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
         nY += GetParaPortions()[nPortion]->GetHeight();
     return nY;
 }
 
-USHORT ImpEditEngine::GetLineCount( USHORT nParagraph ) const
+sal_uInt16 ImpEditEngine::GetLineCount( sal_uInt16 nParagraph ) const
 {
     DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
     ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
@@ -3298,7 +3298,7 @@ USHORT ImpEditEngine::GetLineCount( USHORT nParagraph ) const
     return 0xFFFF;
 }
 
-xub_StrLen ImpEditEngine::GetLineLen( USHORT nParagraph, USHORT nLine ) const
+xub_StrLen ImpEditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const
 {
     DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineLen: Out of range" );
     ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
@@ -3313,7 +3313,7 @@ xub_StrLen ImpEditEngine::GetLineLen( USHORT nParagraph, USHORT nLine ) const
     return 0xFFFF;
 }
 
-void ImpEditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const
+void ImpEditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const
 {
     DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
     ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
@@ -3328,9 +3328,9 @@ void ImpEditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEn
     }
 }
 
-USHORT ImpEditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 ImpEditEngine::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
-    USHORT nLineNo = 0xFFFF;
+    sal_uInt16 nLineNo = 0xFFFF;
     ContentNode* pNode = GetEditDoc().SaveGetObject( nPara );
     DBG_ASSERT( pNode, "GetLineNumberAtIndex: invalid paragraph index" );
     if (pNode)
@@ -3338,13 +3338,13 @@ USHORT ImpEditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
         // we explicitly allow for the index to point at the character right behind the text
         const bool bValidIndex = /*0 <= nIndex &&*/ nIndex <= pNode->Len();
         DBG_ASSERT( bValidIndex, "GetLineNumberAtIndex: invalid index" );
-        const USHORT nLineCount = GetLineCount( nPara );
+        const sal_uInt16 nLineCount = GetLineCount( nPara );
         if (nIndex == pNode->Len())
             nLineNo = nLineCount > 0 ? nLineCount - 1 : 0;
         else if (bValidIndex)   // nIndex < pNode->Len()
         {
-            USHORT nStart = USHRT_MAX, nEnd = USHRT_MAX;
-            for (USHORT i = 0;  i < nLineCount && nLineNo == 0xFFFF;  ++i)
+            sal_uInt16 nStart = USHRT_MAX, nEnd = USHRT_MAX;
+            for (sal_uInt16 i = 0;  i < nLineCount && nLineNo == 0xFFFF;  ++i)
             {
                 GetLineBoundaries( nStart, nEnd, nPara, i );
                 if (nStart <= nIndex && nIndex < nEnd)
@@ -3355,7 +3355,7 @@ USHORT ImpEditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
     return nLineNo;
 }
 
-USHORT ImpEditEngine::GetLineHeight( USHORT nParagraph, USHORT nLine )
+sal_uInt16 ImpEditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine )
 {
     DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
     ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
@@ -3370,7 +3370,7 @@ USHORT ImpEditEngine::GetLineHeight( USHORT nParagraph, USHORT nLine )
     return 0xFFFF;
 }
 
-sal_uInt32 ImpEditEngine::GetParaHeight( USHORT nParagraph )
+sal_uInt32 ImpEditEngine::GetParaHeight( sal_uInt16 nParagraph )
 {
     sal_uInt32 nHeight = 0;
 
@@ -3385,25 +3385,25 @@ sal_uInt32 ImpEditEngine::GetParaHeight( USHORT nParagraph )
 
 void ImpEditEngine::UpdateSelections()
 {
-    USHORT nInvNodes = aDeletedNodes.Count();
+    sal_uInt16 nInvNodes = aDeletedNodes.Count();
 
     // Pruefen, ob eine der Selektionen auf einem geloeschten Node steht...
     // Wenn der Node gueltig ist, muss noch der Index geprueft werden!
-    for ( USHORT nView = 0; nView < aEditViews.Count(); nView++ )
+    for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ )
     {
         EditView* pView = aEditViews.GetObject(nView);
         DBG_CHKOBJ( pView, EditView, 0 );
         EditSelection aCurSel( pView->pImpEditView->GetEditSelection() );
-        BOOL bChanged = FALSE;
-        for ( USHORT n = 0; n < nInvNodes; n++ )
+        sal_Bool bChanged = sal_False;
+        for ( sal_uInt16 n = 0; n < nInvNodes; n++ )
         {
             DeletedNodeInfo* pInf = aDeletedNodes.GetObject( n );
-            if ( ( ( ULONG )(aCurSel.Min().GetNode()) == pInf->GetInvalidAdress() ) ||
-                 ( ( ULONG )(aCurSel.Max().GetNode()) == pInf->GetInvalidAdress() ) )
+            if ( ( ( sal_uLong )(aCurSel.Min().GetNode()) == pInf->GetInvalidAdress() ) ||
+                 ( ( sal_uLong )(aCurSel.Max().GetNode()) == pInf->GetInvalidAdress() ) )
             {
                 // ParaPortions verwenden, da jetzt auch versteckte
                 // Absaetze beruecksichtigt werden muessen!
-                USHORT nPara = pInf->GetPosition();
+                sal_uInt16 nPara = pInf->GetPosition();
                 ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nPara );
                 if ( !pPPortion ) // letzter Absatz
                 {
@@ -3412,8 +3412,8 @@ void ImpEditEngine::UpdateSelections()
                 }
                 DBG_ASSERT( pPPortion, "Leeres Document in UpdateSelections ?" );
                 // Nicht aus einem verstecktem Absatz landen:
-                USHORT nCurPara = nPara;
-                USHORT nLastPara = GetParaPortions().Count()-1;
+                sal_uInt16 nCurPara = nPara;
+                sal_uInt16 nLastPara = GetParaPortions().Count()-1;
                 while ( nPara <= nLastPara && !GetParaPortions()[nPara]->IsVisible() )
                     nPara++;
                 if ( nPara > nLastPara ) // dann eben rueckwaerts...
@@ -3427,7 +3427,7 @@ void ImpEditEngine::UpdateSelections()
                 ParaPortion* pParaPortion = GetParaPortions()[nPara];
                 EditSelection aTmpSelection( EditPaM( pParaPortion->GetNode(), 0 ) );
                 pView->pImpEditView->SetEditSelection( aTmpSelection );
-                bChanged=TRUE;
+                bChanged=sal_True;
                 break;  // for-Schleife
             }
         }
@@ -3448,7 +3448,7 @@ void ImpEditEngine::UpdateSelections()
     }
 
     // Loeschen...
-    for ( USHORT n = 0; n < nInvNodes; n++ )
+    for ( sal_uInt16 n = 0; n < nInvNodes; n++ )
     {
         DeletedNodeInfo* pInf = aDeletedNodes.GetObject( n );
         delete pInf;
@@ -3456,14 +3456,14 @@ void ImpEditEngine::UpdateSelections()
     aDeletedNodes.Remove( 0, aDeletedNodes.Count() );
 }
 
-EditSelection ImpEditEngine::ConvertSelection( USHORT nStartPara, USHORT nStartPos,
-                             USHORT nEndPara, USHORT nEndPos ) const
+EditSelection ImpEditEngine::ConvertSelection( sal_uInt16 nStartPara, sal_uInt16 nStartPos,
+                             sal_uInt16 nEndPara, sal_uInt16 nEndPos ) const
 {
     EditSelection aNewSelection;
 
     // Start...
     ContentNode* pNode = aEditDoc.SaveGetObject( nStartPara );
-    USHORT nIndex = nStartPos;
+    sal_uInt16 nIndex = nStartPos;
     if ( !pNode )
     {
         pNode = aEditDoc[ aEditDoc.Count()-1 ];
@@ -3503,15 +3503,15 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel )
         return aMatchSel;
     }
 
-    USHORT nPos = aTmpSel.Min().GetIndex();
+    sal_uInt16 nPos = aTmpSel.Min().GetIndex();
     ContentNode* pNode = aTmpSel.Min().GetNode();
     if ( nPos >= pNode->Len() )
         return aMatchSel;
 
-    USHORT nMatchChar = aGroupChars.Search( pNode->GetChar( nPos ) );
+    sal_uInt16 nMatchChar = aGroupChars.Search( pNode->GetChar( nPos ) );
     if ( nMatchChar != STRING_NOTFOUND )
     {
-        USHORT nNode = aEditDoc.GetPos( pNode );
+        sal_uInt16 nNode = aEditDoc.GetPos( pNode );
         if ( ( nMatchChar % 2 ) == 0 )
         {
             // Vorwaerts suchen...
@@ -3519,8 +3519,8 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel )
             DBG_ASSERT( aGroupChars.Len() > (nMatchChar+1), "Ungueltige Gruppe von MatchChars!" );
             xub_Unicode nEC = aGroupChars.GetChar( nMatchChar+1 );
 
-            USHORT nCur = aTmpSel.Min().GetIndex()+1;
-            USHORT nLevel = 1;
+            sal_uInt16 nCur = aTmpSel.Min().GetIndex()+1;
+            sal_uInt16 nLevel = 1;
             while ( pNode && nLevel )
             {
                 XubString& rStr = *pNode;
@@ -3556,8 +3556,8 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel )
             xub_Unicode nEC = aGroupChars.GetChar( nMatchChar );
             xub_Unicode nSC = aGroupChars.GetChar( nMatchChar-1 );
 
-            USHORT nCur = aTmpSel.Min().GetIndex()-1;
-            USHORT nLevel = 1;
+            sal_uInt16 nCur = aTmpSel.Min().GetIndex()-1;
+            sal_uInt16 nLevel = 1;
             while ( pNode && nLevel )
             {
                 if ( pNode->Len() )
@@ -3607,7 +3607,7 @@ void ImpEditEngine::StopSelectionMode()
         pActiveView->pImpEditView->SetEditSelection( aSel );
         pActiveView->ShowCursor();
         aSelEngine.Reset();
-        bInSelection = FALSE;
+        bInSelection = sal_False;
     }
 }
 
@@ -3656,10 +3656,10 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable(
     aText.ConvertLineEnd(); // Systemspezifisch
     pDataObj->GetString() = aText;
 
-    SvxFontItem::EnableStoreUnicodeNames( TRUE );
-    WriteBin( pDataObj->GetStream(), aSelection, TRUE );
+    SvxFontItem::EnableStoreUnicodeNames( sal_True );
+    WriteBin( pDataObj->GetStream(), aSelection, sal_True );
     pDataObj->GetStream().Seek( 0 );
-    SvxFontItem::EnableStoreUnicodeNames( FALSE );
+    SvxFontItem::EnableStoreUnicodeNames( sal_False );
 
     ((ImpEditEngine*)this)->WriteRTF( pDataObj->GetRTFStream(), aSelection );
     pDataObj->GetRTFStream().Seek( 0 );
@@ -3691,14 +3691,14 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable(
 #endif
 }
 
-EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, BOOL bUseSpecial )
+EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial )
 {
     EditSelection aNewSelection( rPaM );
 
     if ( rxDataObj.is() )
     {
         datatransfer::DataFlavor aFlavor;
-        BOOL bDone = FALSE;
+        sal_Bool bDone = sal_False;
 
         if ( bUseSpecial )
         {
@@ -3715,7 +3715,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
                         SvMemoryStream aBinStream( aSeq.getArray(), aSeq.getLength(), STREAM_READ );
                         aNewSelection = Read( aBinStream, rBaseURL, EE_FORMAT_BIN, rPaM );
                     }
-                    bDone = TRUE;
+                    bDone = sal_True;
                 }
                 catch( const ::com::sun::star::uno::Exception& )
                 {
@@ -3755,7 +3755,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
                             SvMemoryStream aRTFStream( aSeq.getArray(), aSeq.getLength(), STREAM_READ );
                             aNewSelection = Read( aRTFStream, rBaseURL, EE_FORMAT_RTF, rPaM );
                         }
-                        bDone = TRUE;
+                        bDone = sal_True;
                     }
                     catch( const ::com::sun::star::uno::Exception& )
                     {
@@ -3779,7 +3779,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
                     ::rtl::OUString aText;
                     aData >>= aText;
                     aNewSelection = ImpInsertText( rPaM, aText );
-                       bDone = TRUE;
+                       bDone = sal_True;
                 }
                 catch( ... )
                 {
@@ -3800,12 +3800,12 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion )
     {
         const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
         const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
-        USHORT nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
+        sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
                             ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
         // erst von vorne...
-        USHORT nFirstInvalid = 0xFFFF;
-        USHORT nLine;
+        sal_uInt16 nFirstInvalid = 0xFFFF;
+        sal_uInt16 nLine;
         for ( nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
         {
             EditLine* pL = pPortion->GetLines().GetObject( nLine );
@@ -3827,7 +3827,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion )
         if ( nFirstInvalid != 0 )   // Nur wenn nicht die erste Zeile ungueltig
             aRange.Min() = aRange.Max();
 
-        USHORT nLastInvalid = pPortion->GetLines().Count()-1;
+        sal_uInt16 nLastInvalid = pPortion->GetLines().Count()-1;
         for ( nLine = nFirstInvalid; nLine < pPortion->GetLines().Count(); nLine++ )
         {
             EditLine* pL = pPortion->GetLines().GetObject( nLine );
@@ -3859,17 +3859,17 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion )
     return aRange;
 }
 
-EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, BOOL bSmart )
+EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, sal_Bool bSmart )
 {
     DBG_ASSERT( pPortion->IsVisible(), "Wozu GetPaM() bei einem unsichtbaren Absatz?" );
     DBG_ASSERT( IsFormatted(), "GetPaM: Nicht formatiert" );
 
-    USHORT nCurIndex = 0;
+    sal_uInt16 nCurIndex = 0;
     EditPaM aPaM;
     aPaM.SetNode( pPortion->GetNode() );
 
     const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
-    USHORT nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
+    sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
                         ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
     long nY = pPortion->GetFirstLineOffset();
@@ -3877,7 +3877,7 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, BOOL bSmart
     DBG_ASSERT( pPortion->GetLines().Count(), "Leere ParaPortion in GetPaM!" );
 
     EditLine* pLine = 0;
-    for ( USHORT nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
+    for ( sal_uInt16 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
     {
         EditLine* pTmpLine = pPortion->GetLines().GetObject( nLine );
         nY += pTmpLine->GetHeight();
@@ -3915,16 +3915,16 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, BOOL bSmart
     return aPaM;
 }
 
-USHORT ImpEditEngine::GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nXPos, BOOL bSmart )
+sal_uInt16 ImpEditEngine::GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nXPos, sal_Bool bSmart )
 {
     DBG_ASSERT( pLine, "Keine Zeile erhalten: GetChar" );
 
-    USHORT nChar = 0xFFFF;
-    USHORT nCurIndex = pLine->GetStart();
+    sal_uInt16 nChar = 0xFFFF;
+    sal_uInt16 nCurIndex = pLine->GetStart();
 
 
     // Search best matching portion with GetPortionXOffset()
-    for ( USHORT i = pLine->GetStartPortion(); i <= pLine->GetEndPortion(); i++ )
+    for ( sal_uInt16 i = pLine->GetStartPortion(); i <= pLine->GetEndPortion(); i++ )
     {
         TextPortion* pPortion = pParaPortion->GetTextPortions().GetObject( i );
         long nXLeft = GetPortionXOffset( pParaPortion, pLine, i );
@@ -3949,16 +3949,16 @@ USHORT ImpEditEngine::GetChar( ParaPortion* pParaPortion, EditLine* pLine, long
             }
             else
             {
-                USHORT nMax = pPortion->GetLen();
-                USHORT nOffset = 0xFFFF;
-                USHORT nTmpCurIndex = nChar - pLine->GetStart();
+                sal_uInt16 nMax = pPortion->GetLen();
+                sal_uInt16 nOffset = 0xFFFF;
+                sal_uInt16 nTmpCurIndex = nChar - pLine->GetStart();
 
                 long nXInPortion = nXPos - nXLeft;
                 if ( pPortion->IsRightToLeft() )
                     nXInPortion = nXRight - nXPos;
 
                 // Search in Array...
-                for ( USHORT x = 0; x < nMax; x++ )
+                for ( sal_uInt16 x = 0; x < nMax; x++ )
                 {
                     long nTmpPosMax = pLine->GetCharPosArray().GetObject( nTmpCurIndex+x );
                     if ( nTmpPosMax > nXInPortion )
@@ -3997,14 +3997,14 @@ USHORT ImpEditEngine::GetChar( ParaPortion* pParaPortion, EditLine* pLine, long
                 if ( nChar && ( nChar < pParaPortion->GetNode()->Len() ) )
                 {
                     EditPaM aPaM( pParaPortion->GetNode(), nChar+1 );
-                    USHORT nScriptType = GetScriptType( aPaM );
+                    sal_uInt16 nScriptType = GetScriptType( aPaM );
                     if ( nScriptType == i18n::ScriptType::COMPLEX )
                     {
                         uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
                         sal_Int32 nCount = 1;
                         lang::Locale aLocale = GetLocale( aPaM );
-                        USHORT nRight = (USHORT)_xBI->nextCharacters( *pParaPortion->GetNode(), nChar, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
-                        USHORT nLeft = (USHORT)_xBI->previousCharacters( *pParaPortion->GetNode(), nRight, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
+                        sal_uInt16 nRight = (sal_uInt16)_xBI->nextCharacters( *pParaPortion->GetNode(), nChar, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
+                        sal_uInt16 nLeft = (sal_uInt16)_xBI->previousCharacters( *pParaPortion->GetNode(), nRight, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
                         if ( ( nLeft != nChar ) && ( nRight != nChar ) )
                         {
                             nChar = ( Abs( nRight - nChar ) < Abs( nLeft - nChar ) ) ? nRight : nLeft;
@@ -4029,7 +4029,7 @@ Range ImpEditEngine::GetLineXPosStartEnd( ParaPortion* pParaPortion, EditLine* p
 {
     Range aLineXPosStartEnd;
 
-    USHORT nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
+    sal_uInt16 nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
     if ( !IsRightToLeft( nPara ) )
     {
         aLineXPosStartEnd.Min() = pLine->GetStartPosX();
@@ -4045,11 +4045,11 @@ Range ImpEditEngine::GetLineXPosStartEnd( ParaPortion* pParaPortion, EditLine* p
     return aLineXPosStartEnd;
 }
 
-long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, USHORT nTextPortion )
+long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, sal_uInt16 nTextPortion )
 {
     long nX = pLine->GetStartPosX();
 
-    for ( USHORT i = pLine->GetStartPortion(); i < nTextPortion; i++ )
+    for ( sal_uInt16 i = pLine->GetStartPortion(); i < nTextPortion; i++ )
     {
         TextPortion* pPortion = pParaPortion->GetTextPortions().GetObject( i );
         switch ( pPortion->GetKind() )
@@ -4066,8 +4066,8 @@ long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLin
         }
     }
 
-    USHORT nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
-    BOOL bR2LPara = IsRightToLeft( nPara );
+    sal_uInt16 nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
+    sal_Bool bR2LPara = IsRightToLeft( nPara );
 
     TextPortion* pDestPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
     if ( pDestPortion->GetKind() != PORTIONKIND_TAB )
@@ -4135,20 +4135,20 @@ long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLin
     return nX;
 }
 
-long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT nIndex, BOOL bPreferPortionStart )
+long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart )
 {
     DBG_ASSERT( pLine, "Keine Zeile erhalten: GetXPos" );
     DBG_ASSERT( ( nIndex >= pLine->GetStart() ) && ( nIndex <= pLine->GetEnd() ) , "GetXPos muss richtig gerufen werden!" );
 
-    BOOL bDoPreferPortionStart = bPreferPortionStart;
+    sal_Bool bDoPreferPortionStart = bPreferPortionStart;
     // Assure that the portion belongs to this line:
     if ( nIndex == pLine->GetStart() )
-        bDoPreferPortionStart = TRUE;
+        bDoPreferPortionStart = sal_True;
     else if ( nIndex == pLine->GetEnd() )
-        bDoPreferPortionStart = FALSE;
+        bDoPreferPortionStart = sal_False;
 
-    USHORT nTextPortionStart = 0;
-    USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( nIndex, nTextPortionStart, bDoPreferPortionStart );
+    sal_uInt16 nTextPortionStart = 0;
+    sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( nIndex, nTextPortionStart, bDoPreferPortionStart );
 
     DBG_ASSERT( ( nTextPortion >= pLine->GetStartPortion() ) && ( nTextPortion <= pLine->GetEndPortion() ), "GetXPos: Portion not in current line! " );
 
@@ -4178,7 +4178,7 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
                         // DBG_ASSERT( !bPreferPortionStart, "GetXPos - How can we this tab portion here???" );
                         // #109879# We loop if nIndex == pLine->GetEnd, because bPreferPortionStart will be reset
                         if ( !bPreferPortionStart )
-                            nX = GetXPos( pParaPortion, pLine, nIndex, TRUE );
+                            nX = GetXPos( pParaPortion, pLine, nIndex, sal_True );
                         else if ( !IsRightToLeft( GetEditDoc().GetPos( pParaPortion->GetNode() ) ) )
                             nX += nPortionTextWidth;
                     }
@@ -4200,7 +4200,7 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
 
             if( pLine->GetCharPosArray().Count() )
             {
-                USHORT nPos = nIndex - 1 - pLine->GetStart();
+                sal_uInt16 nPos = nIndex - 1 - pLine->GetStart();
                 if( nPos >= pLine->GetCharPosArray().Count() )
                 {
                     nPos = pLine->GetCharPosArray().Count()-1;
@@ -4224,10 +4224,10 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
                     nX += pPortion->GetExtraInfos()->nPortionOffsetX;
                     if ( pPortion->GetExtraInfos()->nAsianCompressionTypes & CHAR_PUNCTUATIONRIGHT )
                     {
-                        BYTE nType = GetCharTypeForCompression( pParaPortion->GetNode()->GetChar( nIndex ) );
+                        sal_uInt8 nType = GetCharTypeForCompression( pParaPortion->GetNode()->GetChar( nIndex ) );
                         if ( nType == CHAR_PUNCTUATIONRIGHT )
                         {
-                            USHORT n = nIndex - nTextPortionStart;
+                            sal_uInt16 n = nIndex - nTextPortionStart;
                             const sal_Int32* pDXArray = pLine->GetCharPosArray().GetData()+( nTextPortionStart-pLine->GetStart() );
                             sal_Int32 nCharWidth = ( ( (n+1) < pPortion->GetLen() ) ? pDXArray[n] : pPortion->GetSize().Width() )
                                                             - ( n ? pDXArray[n-1] : 0 );
@@ -4275,14 +4275,14 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
     if ( pPortion->IsVisible() )
     {
         DBG_ASSERT( pPortion->GetLines().Count(), "Absatz ohne Zeilen in ParaPortion::CalcHeight" );
-        for ( USHORT nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
+        for ( sal_uInt16 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
             pPortion->nHeight += pPortion->GetLines().GetObject( nLine )->GetHeight();
 
         if ( !aStatus.IsOutliner() )
         {
             const SvxULSpaceItem& rULItem = (const SvxULSpaceItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
             const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
-            USHORT nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
+            sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
             if ( nSBL )
             {
@@ -4292,10 +4292,10 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
                     pPortion->nHeight += nSBL;
             }
 
-            USHORT nPortion = GetParaPortions().GetPos( pPortion );
+            sal_uInt16 nPortion = GetParaPortions().GetPos( pPortion );
             if ( nPortion || aStatus.ULSpaceFirstParagraph() )
             {
-                USHORT nUpper = GetYValue( rULItem.GetUpper() );
+                sal_uInt16 nUpper = GetYValue( rULItem.GetUpper() );
                 pPortion->nHeight += nUpper;
                 pPortion->nFirstLineOffset = nUpper;
             }
@@ -4318,7 +4318,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
                 // Nur Writer3: Nicht aufaddieren, sondern Mindestabstand.
 
                 // Pruefen, ob Abstand durch LineSpacing > Upper:
-                USHORT nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPortion, rLSItem ) );
+                sal_uInt16 nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPortion, rLSItem ) );
                 if ( nExtraSpace > pPortion->nFirstLineOffset )
                 {
                     // Absatz wird 'groesser':
@@ -4327,7 +4327,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
                 }
 
                 // nFirstLineOffset jetzt f(pNode) => jetzt f(pNode, pPrev) ermitteln:
-                USHORT nPrevLower = GetYValue( rPrevULItem.GetLower() );
+                sal_uInt16 nPrevLower = GetYValue( rPrevULItem.GetLower() );
 
                 // Dieser PrevLower steckt noch in der Hoehe der PrevPortion...
                 if ( nPrevLower > pPortion->nFirstLineOffset )
@@ -4352,7 +4352,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
                     nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPrev, rPrevLSItem ) );
                     if ( nExtraSpace > nPrevLower )
                     {
-                        USHORT nMoreLower = nExtraSpace - nPrevLower;
+                        sal_uInt16 nMoreLower = nExtraSpace - nPrevLower;
                         // Absatz wird 'groesser', 'waechst' nach unten:
                         if ( nMoreLower > pPortion->nFirstLineOffset )
                         {
@@ -4366,7 +4366,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
     }
 }
 
-Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, USHORT nIndex, USHORT nFlags )
+Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex, sal_uInt16 nFlags )
 {
     DBG_ASSERT( pPortion->IsVisible(), "Wozu GetEditCursor() bei einem unsichtbaren Absatz?" );
     DBG_ASSERT( IsFormatted() || GetTextRanger(), "GetEditCursor: Nicht formatiert" );
@@ -4381,14 +4381,14 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, USHORT nIndex, US
     long nY = pPortion->GetFirstLineOffset();
 
     const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
-    USHORT nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
+    sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
                         ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
-    USHORT nCurIndex = 0;
+    sal_uInt16 nCurIndex = 0;
     DBG_ASSERT( pPortion->GetLines().Count(), "Leere ParaPortion in GetEditCursor!" );
     EditLine* pLine = 0;
-    BOOL bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? TRUE : FALSE;
-    for ( USHORT nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
+    sal_Bool bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? sal_True : sal_False;
+    for ( sal_uInt16 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
     {
         EditLine* pTmpLine = pPortion->GetLines().GetObject( nLine );
         if ( ( pTmpLine->GetStart() == nIndex ) || ( pTmpLine->IsIn( nIndex, bEOL ) ) )
@@ -4435,7 +4435,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, USHORT nIndex, US
     }
     else
     {
-        nX = GetXPos( pPortion, pLine, nIndex, ( nFlags & GETCRSR_PREFERPORTIONSTART ) ? TRUE : FALSE );
+        nX = GetXPos( pPortion, pLine, nIndex, ( nFlags & GETCRSR_PREFERPORTIONSTART ) ? sal_True : sal_False );
     }
 
     aEditCursor.Left() = aEditCursor.Right() = nX;
@@ -4470,7 +4470,7 @@ void ImpEditEngine::SetValidPaperSize( const Size& rNewSz )
         aPaperSize.Height() = nMaxHeight;
 }
 
-void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
+void ImpEditEngine::IndentBlock( EditView* pEditView, sal_Bool bRight )
 {
     ESelection aESel( CreateESel( pEditView->pImpEditView->GetEditSelection() ) );
     aESel.Adjust();
@@ -4493,7 +4493,7 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
                         pEditView->pImpEditView->GetEditSelection().Max() );
         UndoActionStart( bRight ? EDITUNDO_INDENTBLOCK : EDITUNDO_UNINDENTBLOCK );
 
-        for ( USHORT nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
+        for ( sal_uInt16 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
         {
             ContentNode* pNode = GetEditDoc().GetObject( nPara );
             if ( bRight )
@@ -4525,11 +4525,11 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
             aNewSel.nEndPos = pLastNode->Len();
         pEditView->pImpEditView->SetEditSelection( CreateSel( aNewSel ) );
         pEditView->pImpEditView->DrawSelection();
-        pEditView->pImpEditView->ShowCursor( FALSE, TRUE );
+        pEditView->pImpEditView->ShowCursor( sal_False, sal_True );
     }
 }
 
-vos::ORef<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( BOOL bGetInternal ) const
+vos::ORef<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( sal_Bool bGetInternal ) const
 {
     vos::ORef<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable;
     if ( !xF.isValid() && bGetInternal )
@@ -4550,28 +4550,28 @@ svtools::ColorConfig& ImpEditEngine::GetColorConfig()
     return *pColorConfig;
 }
 
-BOOL ImpEditEngine::IsVisualCursorTravelingEnabled()
+sal_Bool ImpEditEngine::IsVisualCursorTravelingEnabled()
 {
-    BOOL bVisualCursorTravaling = FALSE;
+    sal_Bool bVisualCursorTravaling = sal_False;
 
     if( !pCTLOptions )
         pCTLOptions = new SvtCTLOptions;
 
     if ( pCTLOptions->IsCTLFontEnabled() && ( pCTLOptions->GetCTLCursorMovement() == SvtCTLOptions::MOVEMENT_VISUAL ) )
     {
-        bVisualCursorTravaling = TRUE;
+        bVisualCursorTravaling = sal_True;
     }
 
     return bVisualCursorTravaling;
 
 }
 
-BOOL ImpEditEngine::DoVisualCursorTraveling( const ContentNode* )
+sal_Bool ImpEditEngine::DoVisualCursorTraveling( const ContentNode* )
 {
     // Don't check if it's necessary, because we also need it when leaving the paragraph
     return IsVisualCursorTravelingEnabled();
 /*
-    BOOL bDoVisualCursorTraveling = FALSE;
+    sal_Bool bDoVisualCursorTraveling = sal_False;
 
     if ( IsVisualCursorTravelingEnabled() && pNode->Len() )
     {
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 14f3f35c66b1..352fb8ace115 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -35,7 +35,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uIt16S
 #include <svl/svstdarr.hxx>
 
 #include <vcl/wrkwin.hxx>
@@ -100,15 +100,15 @@ SV_IMPL_VARARR_SORT( SortedPositions, sal_uInt32 );
 
 struct TabInfo
 {
-    BOOL        bValid;
+    sal_Bool        bValid;
 
     SvxTabStop  aTabStop;
     xub_StrLen  nCharPos;
-    USHORT      nTabPortion;
+    sal_uInt16      nTabPortion;
     long        nStartPosX;
     long        nTabPos;
 
-    TabInfo() { bValid = FALSE; }
+    TabInfo() { bValid = sal_False; }
 };
 
 Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin )
@@ -133,7 +133,7 @@ Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin )
     return aTranslatedPos;
 }
 
-BYTE GetCharTypeForCompression( xub_Unicode cChar )
+sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar )
 {
     switch ( cChar )
     {
@@ -167,8 +167,8 @@ void lcl_DrawRedLines(
     WrongList* pWrongs,
     short nOrientation,
     const Point& rOrigin,
-    BOOL bVertical,
-    BOOL bIsRightToLeft )
+    sal_Bool bVertical,
+    sal_Bool bIsRightToLeft )
 {
 #ifndef SVX_LIGHT
     // Aber nur, wenn Font nicht zu klein...
@@ -537,9 +537,9 @@ void ImpEditEngine::CheckAutoPageSize()
 {
     Size aPrevPaperSize( GetPaperSize() );
     if ( GetStatus().AutoPageWidth() )
-        aPaperSize.Width() = (long) !IsVertical() ? CalcTextWidth( TRUE ) : GetTextHeight();
+        aPaperSize.Width() = (long) !IsVertical() ? CalcTextWidth( sal_True ) : GetTextHeight();
     if ( GetStatus().AutoPageHeight() )
-        aPaperSize.Height() = (long) !IsVertical() ? GetTextHeight() : CalcTextWidth( TRUE );
+        aPaperSize.Height() = (long) !IsVertical() ? GetTextHeight() : CalcTextWidth( sal_True );
 
     SetValidPaperSize( aPaperSize );    //Min, Max beruecksichtigen
 
@@ -594,7 +594,7 @@ static sal_Int32 ImplCalculateFontIndependentLineSpacing( const sal_Int32 nFontH
     return ( nFontHeight * 12 ) / 10;   // + 20%
 }
 
-sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
+sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY )
 {
     ParaPortion* pParaPortion = GetParaPortions().GetObject( nPara );
 
@@ -603,8 +603,8 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     DBG_ASSERT( pParaPortion->IsVisible(), "Unsichtbare Absaetze nicht formatieren!" );
     DBG_ASSERT( pParaPortion->IsInvalid(), "CreateLines: Portion nicht invalid!" );
 
-    BOOL bProcessingEmptyLine = ( pParaPortion->GetNode()->Len() == 0 );
-    BOOL bEmptyNodeWithPolygon = ( pParaPortion->GetNode()->Len() == 0 ) && GetTextRanger();
+    sal_Bool bProcessingEmptyLine = ( pParaPortion->GetNode()->Len() == 0 );
+    sal_Bool bEmptyNodeWithPolygon = ( pParaPortion->GetNode()->Len() == 0 ) && GetTextRanger();
 
     // ---------------------------------------------------------------
     // Schnelle Sonderbehandlung fuer leere Absaetze...
@@ -638,7 +638,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     // ---------------------------------------------------------------
     ContentNode* const pNode = pParaPortion->GetNode();
 
-    BOOL bRightToLeftPara = IsRightToLeft( nPara );
+    sal_Bool bRightToLeftPara = IsRightToLeft( nPara );
 
     SvxAdjust eJustification = GetJustification( nPara );
     sal_Bool bHyphenatePara = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_HYPHENATE )).GetValue();
@@ -647,7 +647,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pNode, &nSpaceBefore, &nMinLabelWidth );
     const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pNode );
     const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&) pNode->GetContentAttribs().GetItem( EE_PARA_SBL );
-    const BOOL bScriptSpace = ((const SvxScriptSpaceItem&) pNode->GetContentAttribs().GetItem( EE_PARA_ASIANCJKSPACING )).GetValue();
+    const sal_Bool bScriptSpace = ((const SvxScriptSpaceItem&) pNode->GetContentAttribs().GetItem( EE_PARA_ASIANCJKSPACING )).GetValue();
 
 //  const sal_uInt16 nInvalidEnd = ( pParaPortion->GetInvalidDiff() > 0 )
 //      ? pParaPortion->GetInvalidPosStart() + pParaPortion->GetInvalidDiff()
@@ -764,12 +764,12 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     sal_Bool bSameLineAgain = sal_False;    // Fuer TextRanger, wenn sich die Hoehe aendert.
     TabInfo aCurrentTab;
 
-    BOOL bForceOneRun = bEmptyNodeWithPolygon;
-    BOOL bCompressedChars = FALSE;
+    sal_Bool bForceOneRun = bEmptyNodeWithPolygon;
+    sal_Bool bCompressedChars = sal_False;
 
     while ( ( nIndex < pNode->Len() ) || bForceOneRun )
     {
-        bForceOneRun = FALSE;
+        bForceOneRun = sal_False;
 
         sal_Bool bEOL = sal_False;
         sal_Bool bEOC = sal_False;
@@ -951,7 +951,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                         short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
                         aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );
                         aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/ ) );
-                        aCurrentTab.bValid = FALSE;
+                        aCurrentTab.bValid = sal_False;
 
                         // Switch direction in R2L para...
                         if ( bRightToLeftPara )
@@ -967,7 +967,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                              ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_DECIMAL ) )
                         {
                             // Bei LEFT/DEFAULT wird dieses Tab nicht mehr betrachtet.
-                            aCurrentTab.bValid = TRUE;
+                            aCurrentTab.bValid = sal_True;
                             aCurrentTab.nStartPosX = nTmpWidth;
                             aCurrentTab.nCharPos = nTmpPos;
                             aCurrentTab.nTabPortion = nTmpPortion;
@@ -998,7 +998,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                             bBrokenLine = sal_True;
                         }
                         pLine->GetCharPosArray().Insert( pPortion->GetSize().Width(), nTmpPos-pLine->GetStart() );
-                        bCompressedChars = FALSE;
+                        bCompressedChars = sal_False;
                     }
                     break;
                     case EE_FEATURE_LINEBR:
@@ -1008,7 +1008,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                         bEOL = sal_True;
                         bLineBreak = sal_True;
                         pPortion->GetKind() = PORTIONKIND_LINEBREAK;
-                        bCompressedChars = FALSE;
+                        bCompressedChars = sal_False;
                         pLine->GetCharPosArray().Insert( pPortion->GetSize().Width(), nTmpPos-pLine->GetStart() );
                     }
                     break;
@@ -1042,7 +1042,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                         }
                         // Compression in Fields????
                         // I think this could be a little bit difficult and is not very usefull
-                        bCompressedChars = FALSE;
+                        bCompressedChars = sal_False;
                     }
                     break;
                     default:    DBG_ERROR( "Was fuer ein Feature ?" );
@@ -1077,20 +1077,20 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
 
                 // And now check for Compression:
                 if ( pPortion->GetLen() && GetAsianCompressionMode() )
-                    bCompressedChars |= ImplCalcAsianCompression( pNode, pPortion, nTmpPos, (sal_Int32*)pLine->GetCharPosArray().GetData() + (nTmpPos-pLine->GetStart()), 10000, FALSE );
+                    bCompressedChars |= ImplCalcAsianCompression( pNode, pPortion, nTmpPos, (sal_Int32*)pLine->GetCharPosArray().GetData() + (nTmpPos-pLine->GetStart()), 10000, sal_False );
 
                 nTmpWidth += pPortion->GetSize().Width();
 
                 pPortion->SetRightToLeft( GetRightToLeft( nPara, nTmpPos+1 ) );
 
-                USHORT _nPortionEnd = nTmpPos + pPortion->GetLen();
+                sal_uInt16 _nPortionEnd = nTmpPos + pPortion->GetLen();
                 if( bScriptSpace && ( _nPortionEnd < pNode->Len() ) && ( nTmpWidth < nXWidth ) && IsScriptChange( EditPaM( pNode, _nPortionEnd ) ) )
                 {
-                    BOOL bAllow = FALSE;
-                    USHORT nScriptTypeLeft = GetScriptType( EditPaM( pNode, _nPortionEnd ) );
-                    USHORT nScriptTypeRight = GetScriptType( EditPaM( pNode, _nPortionEnd+1 ) );
+                    sal_Bool bAllow = sal_False;
+                    sal_uInt16 nScriptTypeLeft = GetScriptType( EditPaM( pNode, _nPortionEnd ) );
+                    sal_uInt16 nScriptTypeRight = GetScriptType( EditPaM( pNode, _nPortionEnd+1 ) );
                     if ( ( nScriptTypeLeft == i18n::ScriptType::ASIAN ) || ( nScriptTypeRight == i18n::ScriptType::ASIAN ) )
-                        bAllow = TRUE;
+                        bAllow = sal_True;
 
                     // No spacing within L2R/R2L nesting
                     if ( bAllow )
@@ -1106,7 +1106,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
             if ( aCurrentTab.bValid && ( nTmpPortion != aCurrentTab.nTabPortion ) )
             {
                 long nWidthAfterTab = 0;
-                for ( USHORT n = aCurrentTab.nTabPortion+1; n <= nTmpPortion; n++  )
+                for ( sal_uInt16 n = aCurrentTab.nTabPortion+1; n <= nTmpPortion; n++  )
                 {
                     TextPortion* pTP = pParaPortion->GetTextPortions().GetObject( n );
                     nWidthAfterTab += pTP->GetSize().Width();
@@ -1125,12 +1125,12 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
 //                  nW = nWidthAfterTab;
                     String aText = GetSelected( EditSelection(  EditPaM( pParaPortion->GetNode(), nTmpPos ),
                                                                 EditPaM( pParaPortion->GetNode(), nTmpPos + pPortion->GetLen() ) ) );
-                    USHORT nDecPos = aText.Search( aCurrentTab.aTabStop.GetDecimal() );
+                    sal_uInt16 nDecPos = aText.Search( aCurrentTab.aTabStop.GetDecimal() );
                     if ( nDecPos != STRING_NOTFOUND )
                     {
                         nW -= pParaPortion->GetTextPortions().GetObject( nTmpPortion )->GetSize().Width();
                         nW += aTmpFont.QuickGetTextSize( GetRefDevice(), *pParaPortion->GetNode(), nTmpPos, nDecPos, NULL ).Width();
-                        aCurrentTab.bValid = FALSE;
+                        aCurrentTab.bValid = sal_False;
                     }
                 }
                 else
@@ -1141,7 +1141,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                 if ( nW >= nMaxW )
                 {
                     nW = nMaxW;
-                    aCurrentTab.bValid = FALSE;
+                    aCurrentTab.bValid = sal_False;
                 }
                 TextPortion* pTabPortion = pParaPortion->GetTextPortions().GetObject( aCurrentTab.nTabPortion );
                 pTabPortion->GetSize().Width() = aCurrentTab.nTabPos - aCurrentTab.nStartPosX - nW - nStartX;
@@ -1157,7 +1157,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
 
         DBG_ASSERT( pPortion, "no portion!?" );
 
-        aCurrentTab.bValid = FALSE;
+        aCurrentTab.bValid = sal_False;
 
         // das war evtl. eine Portion zu weit:
         sal_Bool bFixedEnd = sal_False;
@@ -1252,7 +1252,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
             if ( bCompressedChars && pPortion && ( pPortion->GetLen() > 1 ) && pPortion->GetExtraInfos() && pPortion->GetExtraInfos()->bCompressed )
             {
                 // I need the manipulated DXArray for determining the break postion...
-                ImplCalcAsianCompression( pNode, pPortion, nPortionStart, const_cast<sal_Int32*>(( pLine->GetCharPosArray().GetData() + (nPortionStart-pLine->GetStart()) )), 10000, TRUE );
+                ImplCalcAsianCompression( pNode, pPortion, nPortionStart, const_cast<sal_Int32*>(( pLine->GetCharPosArray().GetData() + (nPortionStart-pLine->GetStart()) )), 10000, sal_True );
             }
             if( pPortion )
                 ImpBreakLine( pParaPortion, pLine, pPortion, nPortionStart,
@@ -1549,8 +1549,8 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                     pParaPortion->GetTextPortions().Insert( pDummyPortion, pParaPortion->GetTextPortions().Count() );
                     pLine = new EditLine;
                     pParaPortion->GetLines().Insert( pLine, ++nLine );
-                    bForceOneRun = TRUE;
-                    bProcessingEmptyLine = TRUE;
+                    bForceOneRun = sal_True;
+                    bProcessingEmptyLine = sal_True;
                 }
             }
             if ( pLine )
@@ -1639,7 +1639,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
 
     if ( !aStatus.IsOutliner() )
     {
-        USHORT nPara = GetParaPortions().GetPos( pParaPortion );
+        sal_uInt16 nPara = GetParaPortions().GetPos( pParaPortion );
         SvxAdjust eJustification = GetJustification( nPara );
         long nMaxLineWidth = !IsVertical() ? aPaperSize.Width() : aPaperSize.Height();
         nMaxLineWidth -= GetXValue( rLRItem.GetRight() );
@@ -1672,7 +1672,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
         }
         else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
         {
-            USHORT nPara = GetParaPortions().GetPos( pParaPortion );
+            sal_uInt16 nPara = GetParaPortions().GetPos( pParaPortion );
             if ( nPara || IsFixedCellHeight() || pTmpLine->GetStartPortion() ) // Nicht die aller erste Zeile
             {
                 // #100508# There are documents with PropLineSpace 0, why?
@@ -1763,8 +1763,8 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
     else
     {
         sal_uInt16 nMinBreakPos = pLine->GetStart();
-        USHORT nAttrs = pNode->GetCharAttribs().GetAttribs().Count();
-        for ( USHORT nAttr = nAttrs; nAttr; )
+        sal_uInt16 nAttrs = pNode->GetCharAttribs().GetAttribs().Count();
+        for ( sal_uInt16 nAttr = nAttrs; nAttr; )
         {
             EditCharAttrib* pAttr = pNode->GetCharAttribs().GetAttribs()[--nAttr];
             if ( pAttr->IsFeature() && ( pAttr->GetEnd() > nMinBreakPos ) && ( pAttr->GetEnd() <= nMaxBreakPos ) )
@@ -1784,15 +1784,15 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
         i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence< PropertyValue >(), 1 );
         i18n::LineBreakUserOptions aUserOptions;
 
-        const i18n::ForbiddenCharacters* pForbidden = GetForbiddenCharsTable()->GetForbiddenCharacters( SvxLocaleToLanguage( aLocale ), TRUE );
+        const i18n::ForbiddenCharacters* pForbidden = GetForbiddenCharsTable()->GetForbiddenCharacters( SvxLocaleToLanguage( aLocale ), sal_True );
         aUserOptions.forbiddenBeginCharacters = pForbidden->beginLine;
         aUserOptions.forbiddenEndCharacters = pForbidden->endLine;
         aUserOptions.applyForbiddenRules = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_FORBIDDENRULES )).GetValue();
         aUserOptions.allowPunctuationOutsideMargin = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_HANGINGPUNCTUATION )).GetValue();
-        aUserOptions.allowHyphenateEnglish = FALSE;
+        aUserOptions.allowHyphenateEnglish = sal_False;
 
         i18n::LineBreakResults aLBR = _xBI->getLineBreak( *pNode, nMaxBreakPos, aLocale, nMinBreakPos, aHyphOptions, aUserOptions );
-        nBreakPos = (USHORT)aLBR.breakIndex;
+        nBreakPos = (sal_uInt16)aLBR.breakIndex;
 
         // BUG in I18N - under special condition (break behind field, #87327#) breakIndex is < nMinBreakPos
         if ( nBreakPos < nMinBreakPos )
@@ -1834,10 +1834,10 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
 //          sal_uInt16 nWordStart = nBreakPos;
 //          sal_uInt16 nBreakPos_OLD = nBreakPos;
             sal_uInt16 nWordStart = nBreakPos;
-            sal_uInt16 nWordEnd = (USHORT) aBoundary.endPos;
+            sal_uInt16 nWordEnd = (sal_uInt16) aBoundary.endPos;
             DBG_ASSERT( nWordEnd > nWordStart, "ImpBreakLine: Start >= End?" );
 
-            USHORT nWordLen = nWordEnd - nWordStart;
+            sal_uInt16 nWordLen = nWordEnd - nWordStart;
             if ( ( nWordEnd >= nMaxBreakPos ) && ( nWordLen > 3 ) )
             {
                 // #104415# May happen, because getLineBreak may differ from getWordBoudary with DICTIONARY_WORD
@@ -1995,15 +1995,15 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
     if ( ( nRemainingSpace < 0 ) || pLine->IsEmpty() )
         return ;
 
-    const USHORT nFirstChar = pLine->GetStart();
-    const USHORT nLastChar = pLine->GetEnd() -1;    // Last zeigt dahinter
+    const sal_uInt16 nFirstChar = pLine->GetStart();
+    const sal_uInt16 nLastChar = pLine->GetEnd() -1;    // Last zeigt dahinter
     ContentNode* pNode = pParaPortion->GetNode();
 
     DBG_ASSERT( nLastChar < pNode->Len(), "AdjustBlocks: Out of range!" );
 
     // Search blanks or Kashidas...
     SvUShorts aPositions;
-    USHORT nChar;
+    sal_uInt16 nChar;
     for ( nChar = nFirstChar; nChar <= nLastChar; nChar++ )
     {
         if ( pNode->GetChar(nChar) == ' ' )
@@ -2028,7 +2028,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
     if ( ( pNode->GetChar( nLastChar ) == ' ' ) && ( aPositions.Count() > 1 ) && ( MsLangId::getPrimaryLanguage( GetLanguage( EditPaM( pNode, nLastChar ) ) ) != LANGUAGE_ARABIC_PRIMARY_ONLY ) )
     {
         aPositions.Remove( aPositions.Count()-1, 1 );
-        USHORT nPortionStart, nPortion;
+        sal_uInt16 nPortionStart, nPortion;
         nPortion = pParaPortion->GetTextPortions().FindPortion( nLastChar+1, nPortionStart );
         TextPortion* pLastPortion = pParaPortion->GetTextPortions()[ nPortion ];
         long nRealWidth = pLine->GetCharPosArray()[nLastChar-nFirstChar];
@@ -2047,7 +2047,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
         pLine->GetCharPosArray()[nLastChar-nFirstChar] -= nBlankWidth;
     }
 
-    USHORT nGaps = aPositions.Count();
+    sal_uInt16 nGaps = aPositions.Count();
     const long nMore4Everyone = nRemainingSpace / nGaps;
     long nSomeExtraSpace = nRemainingSpace - nMore4Everyone*nGaps;
 
@@ -2056,12 +2056,12 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
 
     // Die Positionen im Array und die Portion-Breiten korrigieren:
     // Letztes Zeichen wird schon nicht mehr beachtet...
-    for ( USHORT n = 0; n < aPositions.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < aPositions.Count(); n++ )
     {
         nChar = aPositions[n];
         if ( nChar < nLastChar )
         {
-            USHORT nPortionStart, nPortion;
+            sal_uInt16 nPortionStart, nPortion;
             nPortion = pParaPortion->GetTextPortions().FindPortion( nChar, nPortionStart );
             TextPortion* pLastPortion = pParaPortion->GetTextPortions()[ nPortion ];
 
@@ -2072,8 +2072,8 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
 
             // Correct positions in array
             // Even for kashidas just change positions, VCL will then draw the kashida automaticly
-            USHORT nPortionEnd = nPortionStart + pLastPortion->GetLen();
-            for ( USHORT _n = nChar; _n < nPortionEnd; _n++ )
+            sal_uInt16 nPortionEnd = nPortionStart + pLastPortion->GetLen();
+            for ( sal_uInt16 _n = nChar; _n < nPortionEnd; _n++ )
             {
                 pLine->GetCharPosArray()[_n-nFirstChar] += nMore4Everyone;
                 if ( nSomeExtraSpace )
@@ -2089,7 +2089,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
     pLine->SetTextWidth( pLine->GetTextWidth() + nRemainingSpace );
 }
 
-void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT nEnd, SvUShorts& rArray )
+void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, SvUShorts& rArray )
 {
     // the search has to be performed on a per word base
 
@@ -2100,7 +2100,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT n
 
     while ( ( aWordSel.Min().GetNode() == pNode ) && ( aWordSel.Min().GetIndex() < nEnd ) )
     {
-        USHORT nSavPos = aWordSel.Max().GetIndex();
+        sal_uInt16 nSavPos = aWordSel.Max().GetIndex();
         if ( aWordSel.Max().GetIndex() > nEnd )
            aWordSel.Max().GetIndex() = nEnd;
 
@@ -2255,7 +2255,7 @@ sal_uInt16 ImpEditEngine::SplitTextPortion( ParaPortion* pPortion, sal_uInt16 nP
         if ( pTextPortion->GetExtraInfos() && pTextPortion->GetExtraInfos()->bCompressed )
         {
             // We need the original size from the portion
-            USHORT nTxtPortionStart = pPortion->GetTextPortions().GetStartPos( nSplitPortion );
+            sal_uInt16 nTxtPortionStart = pPortion->GetTextPortions().GetStartPos( nSplitPortion );
                SvxFont aTmpFont( pPortion->GetNode()->GetCharAttribs().GetDefFont() );
             SeekCursor( pPortion->GetNode(), nTxtPortionStart+1, aTmpFont );
             aTmpFont.SetPhysFont( GetRefDevice() );
@@ -2393,7 +2393,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* pParaPortion, sal_uInt16 nSt
                     !pParaPortion->GetTextPortions()[nNewPortionPos]->GetLen() )
             {
                 DBG_ASSERT( pParaPortion->GetTextPortions()[nNewPortionPos]->GetKind() == PORTIONKIND_TEXT, "Leere Portion war keine TextPortion!" );
-                USHORT & r =
+                sal_uInt16 & r =
                     pParaPortion->GetTextPortions()[nNewPortionPos]->GetLen();
                 r = r + nNewChars;
             }
@@ -2442,7 +2442,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* pParaPortion, sal_uInt16 nSt
         if ( ( nPos == nStartPos ) && ( (nPos+pTP->GetLen()) == nEnd ) )
         {
             // Portion entfernen;
-            BYTE nType = pTP->GetKind();
+            sal_uInt8 nType = pTP->GetKind();
             pParaPortion->GetTextPortions().Remove( nPortion );
             delete pTP;
             if ( nType == PORTIONKIND_LINEBREAK )
@@ -2507,7 +2507,7 @@ void ImpEditEngine::SetTextRanger( TextRanger* pRanger )
     }
 }
 
-void ImpEditEngine::SetVertical( BOOL bVertical )
+void ImpEditEngine::SetVertical( sal_Bool bVertical )
 {
     if ( IsVertical() != bVertical )
     {
@@ -2522,7 +2522,7 @@ void ImpEditEngine::SetVertical( BOOL bVertical )
     }
 }
 
-void ImpEditEngine::SetFixedCellHeight( BOOL bUseFixedCellHeight )
+void ImpEditEngine::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
 {
     if ( IsFixedCellHeight() != bUseFixedCellHeight )
     {
@@ -2739,7 +2739,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rF
             const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
             rFont.SetColor( rStyleSettings.GetHighlightTextColor() );
             rFont.SetFillColor( rStyleSettings.GetHighlightColor() );
-            rFont.SetTransparent( FALSE );
+            rFont.SetTransparent( sal_False );
         }
         else if ( nAttr & EXTTEXTINPUT_ATTR_GRAYWAVELINE )
         {
@@ -2988,16 +2988,16 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                             {
                                 SeekCursor( pPortion->GetNode(), nIndex+1, aTmpFont, pOutDev );
 
-                                BOOL bDrawFrame = FALSE;
+                                sal_Bool bDrawFrame = sal_False;
 
                                 if ( ( pTextPortion->GetKind() == PORTIONKIND_FIELD ) && !aTmpFont.IsTransparent() &&
                                      ( GetBackgroundColor() != COL_AUTO ) && GetBackgroundColor().IsDark() &&
                                      ( IsAutoColorEnabled() && ( pOutDev->GetOutDevType() != OUTDEV_PRINTER ) ) )
                                 {
-                                    aTmpFont.SetTransparent( TRUE );
+                                    aTmpFont.SetTransparent( sal_True );
                                     pOutDev->SetFillColor();
                                     pOutDev->SetLineColor( GetAutoColor() );
-                                    bDrawFrame = TRUE;
+                                    bDrawFrame = sal_True;
                                 }
 
 #ifdef EDITDEBUG
@@ -3026,8 +3026,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                 ImplInitDigitMode( pOutDev, 0, 0, 0, aTmpFont.GetLanguage() );
 
                                 XubString aText;
-                                USHORT nTextStart = 0;
-                                USHORT nTextLen = 0;
+                                sal_uInt16 nTextStart = 0;
+                                sal_uInt16 nTextLen = 0;
                                 const sal_Int32* pDXArray = 0;
                                 sal_Int32* pTmpDXArray = 0;
 
@@ -3099,7 +3099,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                                 {
                                                     const String aSlash( '/' );
                                                     const short nOldEscapement = aTmpFont.GetEscapement();
-                                                    const BYTE nOldPropr = aTmpFont.GetPropr();
+                                                    const sal_uInt8 nOldPropr = aTmpFont.GetPropr();
 
                                                     aTmpFont.SetEscapement( -20 );
                                                     aTmpFont.SetPropr( 25 );
@@ -3351,7 +3351,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                             if ( bSpecialUnderline )
                                             {
                                                 Size aSz = aTmpFont.GetPhysTxtSize( pOutDev, aText, nTextStart, nTextLen );
-                                                BYTE nProp = aTmpFont.GetPropr();
+                                                sal_uInt8 nProp = aTmpFont.GetPropr();
                                                 aTmpFont.SetEscapement( 0 );
                                                 aTmpFont.SetPropr( 100 );
                                                 aTmpFont.SetPhysFont( pOutDev );
@@ -3516,7 +3516,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                         nChars = 3; // sieht besser aus
 
                                     String aText;
-                                    aText.Fill( (USHORT)nChars, pTextPortion->GetExtraValue() );
+                                    aText.Fill( (sal_uInt16)nChars, pTextPortion->GetExtraValue() );
                                     pOutDev->DrawStretchText( aTmpPos, pTextPortion->GetSize().Width(), aText );
                                 }
                             }
@@ -3628,7 +3628,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, sal_Bool b
                 }
             }
 
-            UINT8 nColorDiff = aFontColor.GetColorError( aBackgroundColor );
+            sal_uInt8 nColorDiff = aFontColor.GetColorError( aBackgroundColor );
             if( nColorDiff < 8 )
                 aBackgroundColor = aFontColor.IsDark() ? COL_WHITE : COL_BLACK;
             pVDev->SetBackground( aBackgroundColor );
@@ -4143,7 +4143,7 @@ void ImpEditEngine::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY )
             // Fonthoehe
             for ( int nItem = 0; nItem < 3; nItem++ )
             {
-                USHORT nItemId = EE_CHAR_FONTHEIGHT;
+                sal_uInt16 nItemId = EE_CHAR_FONTHEIGHT;
                 if ( nItem == 1 )
                     nItemId = EE_CHAR_FONTHEIGHT_CJK;
                 else if ( nItem == 2 )
@@ -4251,7 +4251,7 @@ const SvxNumberFormat* ImpEditEngine::GetNumberFormat( const ContentNode *pNode
     if (pNode)
     {
         // get index of paragraph
-        USHORT nPara = GetEditDoc().GetPos( const_cast< ContentNode * >(pNode) );
+        sal_uInt16 nPara = GetEditDoc().GetPos( const_cast< ContentNode * >(pNode) );
         DBG_ASSERT( nPara < USHRT_MAX, "node not found in array" );
         if (nPara < USHRT_MAX)
         {
@@ -4355,10 +4355,10 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice* pOutDev, String* pString, x
     }
 }
 
-void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, USHORT nPara, USHORT nIndex )
+void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uInt16 nIndex )
 {
-    BOOL bCTL = FALSE;
-    BYTE bR2L = FALSE;
+    sal_Bool bCTL = sal_False;
+    sal_uInt8 bR2L = sal_False;
     if ( nIndex == 0xFFFF )
     {
         bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
@@ -4373,7 +4373,7 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, USHORT nPara, USH
                                                     // it also works for issue 55927
     }
 
-    ULONG nLayoutMode = pOutDev->GetLayoutMode();
+    sal_uLong nLayoutMode = pOutDev->GetLayoutMode();
 
     // We always use the left postion for DrawText()
     nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL);
@@ -4453,7 +4453,7 @@ Color ImpEditEngine::GetAutoColor() const
 }
 
 
-BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, USHORT nStartPos, sal_Int32* pDXArray, USHORT n100thPercentFromMax, BOOL bManipulateDXArray )
+sal_Bool ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray )
 {
     DBG_ASSERT( GetAsianCompressionMode(), "ImplCalcAsianCompression - Why?" );
     DBG_ASSERT( pTextPortion->GetLen(), "ImplCalcAsianCompression - Empty Portion?" );
@@ -4463,18 +4463,18 @@ BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* p
     if ( n100thPercentFromMax == 10000 )
         pTextPortion->SetExtraInfos( NULL );
 
-    BOOL bCompressed = FALSE;
+    sal_Bool bCompressed = sal_False;
 
     if ( GetScriptType( EditPaM( pNode, nStartPos+1 ) ) == i18n::ScriptType::ASIAN )
     {
         long nNewPortionWidth = pTextPortion->GetSize().Width();
-        USHORT nPortionLen = pTextPortion->GetLen();
-        for ( USHORT n = 0; n < nPortionLen; n++ )
+        sal_uInt16 nPortionLen = pTextPortion->GetLen();
+        for ( sal_uInt16 n = 0; n < nPortionLen; n++ )
         {
-            BYTE nType = GetCharTypeForCompression( pNode->GetChar( n+nStartPos ) );
+            sal_uInt8 nType = GetCharTypeForCompression( pNode->GetChar( n+nStartPos ) );
 
-            BOOL bCompressPunctuation = ( nType == CHAR_PUNCTUATIONLEFT ) || ( nType == CHAR_PUNCTUATIONRIGHT );
-            BOOL bCompressKana = ( nType == CHAR_KANA ) && ( GetAsianCompressionMode() == text::CharacterCompressionType::PUNCTUATION_AND_KANA );
+            sal_Bool bCompressPunctuation = ( nType == CHAR_PUNCTUATIONLEFT ) || ( nType == CHAR_PUNCTUATIONRIGHT );
+            sal_Bool bCompressKana = ( nType == CHAR_KANA ) && ( GetAsianCompressionMode() == text::CharacterCompressionType::PUNCTUATION_AND_KANA );
 
             // create Extra infos only if needed...
             if ( bCompressPunctuation || bCompressKana )
@@ -4525,9 +4525,9 @@ BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* p
 
                 if ( nCompress )
                 {
-                    bCompressed = TRUE;
+                    bCompressed = sal_True;
                     nNewPortionWidth -= nCompress;
-                    pTextPortion->GetExtraInfos()->bCompressed = TRUE;
+                    pTextPortion->GetExtraInfos()->bCompressed = sal_True;
 
 
                     // Special handling for rightpunctuation: For the 'compression' we must
@@ -4543,19 +4543,19 @@ BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* p
                             if ( n )
                             {
                                 // -1: No entry for the last character
-                                for ( USHORT i = n-1; i < (nPortionLen-1); i++ )
+                                for ( sal_uInt16 i = n-1; i < (nPortionLen-1); i++ )
                                     pDXArray[i] -= nCompress;
                             }
                             else
                             {
-                                pTextPortion->GetExtraInfos()->bFirstCharIsRightPunktuation = TRUE;
+                                pTextPortion->GetExtraInfos()->bFirstCharIsRightPunktuation = sal_True;
                                 pTextPortion->GetExtraInfos()->nPortionOffsetX = -nCompress;
                             }
                         }
                         else
                         {
                             // -1: No entry for the last character
-                            for ( USHORT i = n; i < (nPortionLen-1); i++ )
+                            for ( sal_uInt16 i = n; i < (nPortionLen-1); i++ )
                                 pDXArray[i] -= nCompress;
                         }
                     }
@@ -4585,18 +4585,18 @@ BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* p
 
 void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion* pParaPortion, long nRemainingWidth )
 {
-    BOOL bFoundCompressedPortion = FALSE;
+    sal_Bool bFoundCompressedPortion = sal_False;
     long nCompressed = 0;
 //    long nCompressWeight = 0;
     TextPortionList aCompressedPortions;
 
-    USHORT nPortion = pLine->GetEndPortion();
+    sal_uInt16 nPortion = pLine->GetEndPortion();
     TextPortion* pTP = pParaPortion->GetTextPortions()[ nPortion ];
     while ( pTP && ( pTP->GetKind() == PORTIONKIND_TEXT ) )
     {
         if ( pTP->GetExtraInfos() && pTP->GetExtraInfos()->bCompressed )
         {
-            bFoundCompressedPortion = TRUE;
+            bFoundCompressedPortion = sal_True;
             nCompressed += pTP->GetExtraInfos()->nOrgWidth - pTP->GetSize().Width();
             aCompressedPortions.Insert( pTP, aCompressedPortions.Count() );
         }
@@ -4614,20 +4614,20 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
             nCompressPercent /= nCompressed;
         }
 
-        for ( USHORT n = 0; n < aCompressedPortions.Count(); n++ )
+        for ( sal_uInt16 n = 0; n < aCompressedPortions.Count(); n++ )
         {
             pTP = aCompressedPortions[n];
-            pTP->GetExtraInfos()->bCompressed = FALSE;
+            pTP->GetExtraInfos()->bCompressed = sal_False;
             pTP->GetSize().Width() = pTP->GetExtraInfos()->nOrgWidth;
             if ( nCompressPercent )
             {
-                USHORT nTxtPortion = pParaPortion->GetTextPortions().GetPos( pTP );
-                USHORT nTxtPortionStart = pParaPortion->GetTextPortions().GetStartPos( nTxtPortion );
+                sal_uInt16 nTxtPortion = pParaPortion->GetTextPortions().GetPos( pTP );
+                sal_uInt16 nTxtPortionStart = pParaPortion->GetTextPortions().GetStartPos( nTxtPortion );
                 DBG_ASSERT( nTxtPortionStart >= pLine->GetStart(), "Portion doesn't belong to the line!!!" );
                 sal_Int32* pDXArray = const_cast< sal_Int32* >( pLine->GetCharPosArray().GetData()+( nTxtPortionStart-pLine->GetStart() ) );
                 if ( pTP->GetExtraInfos()->pOrgDXArray )
                     memcpy( pDXArray, pTP->GetExtraInfos()->pOrgDXArray, (pTP->GetLen()-1)*sizeof(sal_Int32) );
-                ImplCalcAsianCompression( pParaPortion->GetNode(), pTP, nTxtPortionStart, pDXArray, (USHORT)nCompressPercent, TRUE );
+                ImplCalcAsianCompression( pParaPortion->GetNode(), pTP, nTxtPortionStart, pDXArray, (sal_uInt16)nCompressPercent, sal_True );
             }
         }
     }
@@ -4636,7 +4636,7 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
 }
 
 // redesigned to work with TextMarkingVector
-void ImpEditEngine::ImplFillTextMarkingVector(const lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const USHORT nIdx, const USHORT nLen) const
+void ImpEditEngine::ImplFillTextMarkingVector(const lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen) const
 {
     // determine relevant logical text elements for the just-rendered
     // string of characters.
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index b5225751a8cb..4b4b5e4514a8 100755
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -93,7 +93,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
 
-void SwapUSHORTs( sal_uInt16& rX, sal_uInt16& rY )
+void Swapsal_uIt16s( sal_uInt16& rX, sal_uInt16& rY )
 {
     sal_uInt16 n = rX;
     rX = rY;
@@ -311,7 +311,7 @@ sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, s
     return ( rLst.Count() ? sal_True : sal_False );
 }
 
-void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex, USHORT nScriptType )
+void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex, sal_uInt16 nScriptType )
 {
     sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
@@ -328,7 +328,7 @@ void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex
     }
 }
 
-sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel, BOOL bStoreUnicodeStrings ) const
+sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel, sal_Bool bStoreUnicodeStrings ) const
 {
     BinTextObject* pObj = (BinTextObject*)CreateBinTextObject( aSel, NULL );
     pObj->StoreUnicodeStrings( bStoreUnicodeStrings );
@@ -389,9 +389,9 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
     aFontTable.Insert( 0, new SvxFontItem( (const SvxFontItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO ) ) );
     aFontTable.Insert( 1, new SvxFontItem( (const SvxFontItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CJK ) ) );
     aFontTable.Insert( 2, new SvxFontItem( (const SvxFontItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CTL ) ) );
-    for ( USHORT nScriptType = 0; nScriptType < 3; nScriptType++ )
+    for ( sal_uInt16 nScriptType = 0; nScriptType < 3; nScriptType++ )
     {
-        USHORT nWhich = EE_CHAR_FONTINFO;
+        sal_uInt16 nWhich = EE_CHAR_FONTINFO;
         if ( nScriptType == 1 )
             nWhich = EE_CHAR_FONTINFO_CJK;
         else if ( nScriptType == 2 )
@@ -402,8 +402,8 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
         while ( pFontItem )
         {
             bool bAlreadyExist = false;
-            ULONG nTestMax = nScriptType ? aFontTable.Count() : 1;
-            for ( ULONG nTest = 0; !bAlreadyExist && ( nTest < nTestMax ); nTest++ )
+            sal_uLong nTestMax = nScriptType ? aFontTable.Count() : 1;
+            for ( sal_uLong nTest = 0; !bAlreadyExist && ( nTest < nTestMax ); nTest++ )
             {
                 bAlreadyExist = *aFontTable.Get( nTest ) == *pFontItem;
             }
@@ -680,7 +680,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
             else
             {
                 aAttribItems.Clear();
-                USHORT nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
+                sal_uInt16 nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
                 if ( !n || IsScriptChange( EditPaM( pNode, nIndex ) ) )
                 {
                     SfxItemSet aAttribs = GetAttribs( nNode, nIndex+1, nIndex+1 );
@@ -697,8 +697,8 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
                 if ( WriteItemListAsRTF( aAttribItems, rOutput, nNode, nIndex, aFontTable, aColorList ) )
                     rOutput << ' ';
 
-                USHORT nS = nIndex;
-                USHORT nE = nIndex + pTextPortion->GetLen();
+                sal_uInt16 nS = nIndex;
+                sal_uInt16 nE = nIndex + pTextPortion->GetLen();
                 if ( n == nStartPortion )
                     nS = nStartPos;
                 if ( n == nEndPortion )
@@ -727,7 +727,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
 #if defined (EDITDEBUG) && !defined( UNX )
     {
         SvFileStream aStream( String( RTL_CONSTASCII_USTRINGPARAM ( "d:\\rtf_out.rtf" ) ), STREAM_WRITE|STREAM_TRUNC );
-        ULONG nP = rOutput.Tell();
+        sal_uLong nP = rOutput.Tell();
         rOutput.Seek( 0 );
         aStream << rOutput;
         rOutput.Seek( nP );
@@ -947,7 +947,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         break;
         case EE_CHAR_RELIEF:
         {
-            USHORT nRelief = ((const SvxCharReliefItem&)rItem).GetValue();
+            sal_uInt16 nRelief = ((const SvxCharReliefItem&)rItem).GetValue();
             if ( nRelief == RELIEF_EMBOSSED )
                 rOutput << OOO_STRING_SVTOOLS_RTF_EMBO;
             if ( nRelief == RELIEF_ENGRAVED )
@@ -956,7 +956,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         break;
         case EE_CHAR_EMPHASISMARK:
         {
-            USHORT nMark = ((const SvxEmphasisMarkItem&)rItem).GetValue();
+            sal_uInt16 nMark = ((const SvxEmphasisMarkItem&)rItem).GetValue();
             if ( nMark == EMPHASISMARK_NONE )
                 rOutput << OOO_STRING_SVTOOLS_RTF_ACCNONE;
             else if ( nMark == EMPHASISMARK_SIDE_DOTS )
@@ -1189,7 +1189,7 @@ EditTextObject* ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemP
                 pX->aLines.Insert( pNew, pX->aLines.Count() );
             }
 #ifdef DBG_UTIL
-            USHORT nTest;
+            sal_uInt16 nTest;
             int nTPLen = 0, nTxtLen = 0;
             for ( nTest = pParaPortion->GetTextPortions().Count(); nTest; )
                 nTPLen += pParaPortion->GetTextPortions().GetObject( --nTest )->GetLen();
@@ -1288,7 +1288,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
         sal_uInt16 nNewAttribs = pC->GetAttribs().Count();
         if ( nNewAttribs )
         {
-            BOOL bUpdateFields = FALSE;
+            sal_Bool bUpdateFields = sal_False;
             for ( sal_uInt16 nAttr = 0; nAttr < nNewAttribs; nAttr++ )
             {
                 XEditAttribute* pX = pC->GetAttribs().GetObject( nAttr );
@@ -1314,7 +1314,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
                         DBG_ASSERT( pAttr->GetEnd() <= aPaM.GetNode()->Len(), "InsertBinTextObject: Attribut passt nicht! (1)" );
                         aPaM.GetNode()->GetCharAttribs().InsertAttrib( pAttr );
                         if ( pAttr->Which() == EE_FEATURE_FIELD )
-                            bUpdateFields = TRUE;
+                            bUpdateFields = sal_True;
                     }
                     else
                     {
@@ -1391,7 +1391,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
                     pParaPortion->GetLines().Insert( pNew, m );
                 }
 #ifdef DBG_UTIL
-                USHORT nTest;
+                sal_uInt16 nTest;
                 int nTPLen = 0, nTxtLen = 0;
                 for ( nTest = pParaPortion->GetTextPortions().Count(); nTest; )
                     nTPLen += pParaPortion->GetTextPortions().GetObject( --nTest )->GetLen();
@@ -1431,10 +1431,10 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
     return aSel;
 }
 
-LanguageType ImpEditEngine::GetLanguage( const EditPaM& rPaM, USHORT* pEndPos ) const
+LanguageType ImpEditEngine::GetLanguage( const EditPaM& rPaM, sal_uInt16* pEndPos ) const
 {
     short nScriptType = GetScriptType( rPaM, pEndPos ); // pEndPos will be valid now, pointing to ScriptChange or NodeLen
-    USHORT nLangId = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType );
+    sal_uInt16 nLangId = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType );
     const SvxLanguageItem* pLangItem = &(const SvxLanguageItem&)rPaM.GetNode()->GetContentAttribs().GetItem( nLangId );
     EditCharAttrib* pAttr = rPaM.GetNode()->GetCharAttribs().FindAttrib( nLangId, rPaM.GetIndex() );
     if ( pAttr )
@@ -1539,15 +1539,15 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
 #else
     sal_Bool    bHasConvTxt = sal_False;
 
-    USHORT nParas = pEditEngine->GetParagraphCount();
-    for (USHORT k = 0;  k < nParas;  ++k)
+    sal_uInt16 nParas = pEditEngine->GetParagraphCount();
+    for (sal_uInt16 k = 0;  k < nParas;  ++k)
     {
         SvUShorts aPortions;
         pEditEngine->GetPortions( k, aPortions );
-        for ( USHORT nPos = 0; nPos < aPortions.Count(); ++nPos )
+        for ( sal_uInt16 nPos = 0; nPos < aPortions.Count(); ++nPos )
         {
-            USHORT nEnd   = aPortions.GetObject( nPos );
-            USHORT nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
+            sal_uInt16 nEnd   = aPortions.GetObject( nPos );
+            sal_uInt16 nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
 
             // if the paragraph is not empty we need to increase the index
             // by one since the attribute of the character left to the
@@ -1573,7 +1573,7 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
 
 void ImpEditEngine::Convert( EditView* pEditView,
         LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
-        INT32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
+        sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
 {
     // modified version of ImpEditEngine::Spell
 
@@ -1609,7 +1609,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
         // not work. Thus since chinese conversion is not interactive we start
         // at the begin of the paragraph to solve the problem, i.e. have the
         // TextConversion service get those characters together in the same call.
-        USHORT nStartIdx = ( editeng::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
+        sal_uInt16 nStartIdx = ( editeng::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
                                 0 : aWordStartPaM.GetIndex();
         pConvInfo->aConvStart.nIndex = nStartIdx;
     }
@@ -1641,12 +1641,12 @@ void ImpEditEngine::Convert( EditView* pEditView,
     // disallow formatting, updating the view, ... while
     // non-interactively converting the document. (saves time)
     //if (!bIsInteractive)
-    //  SetUpdateMode( FALSE );
+    //  SetUpdateMode( sal_False );
 
     aWrp.Convert();
 
     //if (!bIsInteractive)
-    //SetUpdateMode( TRUE, 0, TRUE );
+    //SetUpdateMode( sal_True, 0, sal_True );
 
     if ( !bMultipleDoc )
     {
@@ -1666,8 +1666,8 @@ void ImpEditEngine::Convert( EditView* pEditView,
 
 void ImpEditEngine::SetLanguageAndFont(
     const ESelection &rESel,
-    LanguageType nLang, USHORT nLangWhichId,
-    const Font *pFont,  USHORT nFontWhichId )
+    LanguageType nLang, sal_uInt16 nLangWhichId,
+    const Font *pFont,  sal_uInt16 nFontWhichId )
 {
     ESelection aOldSel = pActiveView->GetSelection();
     pActiveView->SetSelection( rESel );
@@ -1727,7 +1727,7 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
         if (bAllowImplicitChangesForNotConvertibleText &&
             !pEditEngine->GetText( pConvInfo->aConvContinue.nPara ).Len())
         {
-            USHORT nPara = pConvInfo->aConvContinue.nPara;
+            sal_uInt16 nPara = pConvInfo->aConvContinue.nPara;
             ESelection aESel( nPara, 0, nPara, 0 );
             // see comment for below same function call
             SetLanguageAndFont( aESel,
@@ -1752,22 +1752,22 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
         }
 */
 
-        USHORT nAttribStart = USHRT_MAX;
-        USHORT nAttribEnd   = USHRT_MAX;
-        USHORT nCurPos      = USHRT_MAX;
+        sal_uInt16 nAttribStart = USHRT_MAX;
+        sal_uInt16 nAttribEnd   = USHRT_MAX;
+        sal_uInt16 nCurPos      = USHRT_MAX;
         EPaM aCurStart = CreateEPaM( aCurSel.Min() );
         SvUShorts aPortions;
-        pEditEngine->GetPortions( (USHORT)aCurStart.nPara, aPortions );
-        for ( USHORT nPos = 0; nPos < aPortions.Count(); ++nPos )
+        pEditEngine->GetPortions( (sal_uInt16)aCurStart.nPara, aPortions );
+        for ( sal_uInt16 nPos = 0; nPos < aPortions.Count(); ++nPos )
         {
-            USHORT nEnd   = aPortions.GetObject( nPos );
-            USHORT nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
+            sal_uInt16 nEnd   = aPortions.GetObject( nPos );
+            sal_uInt16 nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
 
             // the language attribute is obtained from the left character
             // (like usually all other attributes)
             // thus we usually have to add 1 in order to get the language
             // of the text right to the cursor position
-            USHORT nLangIdx = nEnd > nStart ? nStart + 1 : nStart;
+            sal_uInt16 nLangIdx = nEnd > nStart ? nStart + 1 : nStart;
             LanguageType nLangFound = pEditEngine->GetLanguage( aCurStart.nPara, nLangIdx );
 #ifdef DEBUG
             lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
@@ -2152,7 +2152,7 @@ void ImpEditEngine::AddPortionIterated(
                     pFieldAttr->GetStart() == aCursor.GetIndex() &&
                     pFieldAttr->GetStart() != pFieldAttr->GetEnd() &&
                     pFieldAttr->Which() == EE_FEATURE_FIELD;
-            USHORT nEndField = bIsField ? pFieldAttr->GetEnd() : USHRT_MAX;
+            sal_uInt16 nEndField = bIsField ? pFieldAttr->GetEnd() : USHRT_MAX;
             bool bIsEndField = false;
             do
             {
@@ -2237,10 +2237,10 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
                     rEditView.pImpEditView->SetEditSelection( aCurrentOldPosition->Max() );
                 }
 
-                USHORT nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion->eLanguage );
+                sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion->eLanguage );
 //                LanguageType eTextLanguage = GetLanguage( aCurrentOldPosition->Min() );
 
-                USHORT nLangWhichId = EE_CHAR_LANGUAGE;
+                sal_uInt16 nLangWhichId = EE_CHAR_LANGUAGE;
                 switch(nScriptType)
                 {
                     case SCRIPTTYPE_ASIAN : nLangWhichId = EE_CHAR_LANGUAGE_CJK; break;
@@ -2286,8 +2286,8 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
                 LanguageType eCurLanguage = GetLanguage( aCurrentPaM );
                 if(eCurLanguage != aCurrentNewPortion->eLanguage)
                 {
-                    USHORT nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion->eLanguage );
-                    USHORT nLangWhichId = EE_CHAR_LANGUAGE;
+                    sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion->eLanguage );
+                    sal_uInt16 nLangWhichId = EE_CHAR_LANGUAGE;
                     switch(nScriptType)
                     {
                         case SCRIPTTYPE_ASIAN : nLangWhichId = EE_CHAR_LANGUAGE_CJK; break;
@@ -2319,7 +2319,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
         rEditView.pImpEditView->SetEditSelection( aNext );
 
         FormatAndUpdate();
-        aEditDoc.SetModified(TRUE);
+        aEditDoc.SetModified(sal_True);
     }
 #endif
 }
@@ -2685,7 +2685,7 @@ sal_uInt16 ImpEditEngine::StartSearchAndReplace( EditView* pEditView, const SvxS
     return nFound;
 }
 
-BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditView )
+sal_Bool ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditView )
 {
     EditSelection aSel( pEditView->pImpEditView->GetEditSelection() );
     aSel.Adjust( aEditDoc );
@@ -2694,7 +2694,7 @@ BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditVie
         aStartPaM = aSel.Min();
 
     EditSelection aFoundSel;
-    BOOL bFound = ImpSearch( rSearchItem, aSel, aStartPaM, aFoundSel );
+    sal_Bool bFound = ImpSearch( rSearchItem, aSel, aStartPaM, aFoundSel );
     if ( bFound && ( aFoundSel == aSel ) )  // Bei Rueckwaetssuche
     {
         aStartPaM = aSel.Min();
@@ -2706,14 +2706,14 @@ BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditVie
     {
         // Erstmal das Min einstellen, damit das ganze Wort in den sichtbaren Bereich kommt.
         pEditView->pImpEditView->SetEditSelection( aFoundSel.Min() );
-        pEditView->ShowCursor( TRUE, FALSE );
+        pEditView->ShowCursor( sal_True, sal_False );
         pEditView->pImpEditView->SetEditSelection( aFoundSel );
     }
     else
         pEditView->pImpEditView->SetEditSelection( aSel.Max() );
 
     pEditView->pImpEditView->DrawSelection();
-    pEditView->ShowCursor( TRUE, FALSE );
+    pEditView->ShowCursor( sal_True, sal_False );
     return bFound;
 }
 
@@ -2772,7 +2772,7 @@ sal_Bool ImpEditEngine::ImpSearch( const SvxSearchItem& rSearchItem,
         bool bFound = false;
         if ( bBack )
         {
-            SwapUSHORTs( nStartPos, nEndPos );
+            Swapsal_uIt16s( nStartPos, nEndPos );
             bFound = aSearcher.SearchBkwrd( aParaStr, &nStartPos, &nEndPos);
         }
         else
@@ -2819,7 +2819,7 @@ void ImpEditEngine::SetAutoCompleteText( const String& rStr, sal_Bool bClearTipW
 
 struct TransliterationChgData
 {
-    USHORT                      nStart;
+    sal_uInt16                      nStart;
     xub_StrLen                  nLen;
     EditSelection               aSelection;
     String                      aNewText;
@@ -2841,17 +2841,17 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
 
     EditSelection aNewSel( aSel );
 
-    const USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    const USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    const sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    const sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
-    BOOL bChanges = FALSE;
-    BOOL bLenChanged = FALSE;
+    sal_Bool bChanges = sal_False;
+    sal_Bool bLenChanged = sal_False;
     EditUndoTransliteration* pUndo = NULL;
 
     utl::TransliterationWrapper aTranslitarationWrapper( ::comphelper::getProcessServiceFactory(), nTransliterationMode );
-    BOOL bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode();
+    sal_Bool bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode();
 
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ )
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
     {
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         xub_StrLen nStartPos = 0;
@@ -2861,8 +2861,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
         if ( nNode == nEndNode ) // kann auch == nStart sein!
             nEndPos = aSel.Max().GetIndex();
 
-        USHORT nCurrentStart = nStartPos;
-        USHORT nCurrentEnd = nEndPos;
+        sal_uInt16 nCurrentStart = nStartPos;
+        sal_uInt16 nCurrentEnd = nEndPos;
         sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
 
         // since we don't use Hiragana/Katakana or half-width/full-width transliterations here
@@ -2890,11 +2890,11 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
             aSttBndry = _xBI->getWordBoundary(
                         *pNode, nStartPos,
                         SvxCreateLocale( GetLanguage( EditPaM( pNode, nStartPos + 1 ) ) ),
-                        nWordType, TRUE /*prefer forward direction*/);
+                        nWordType, sal_True /*prefer forward direction*/);
             aEndBndry = _xBI->getWordBoundary(
                         *pNode, nEndPos,
                         SvxCreateLocale( GetLanguage( EditPaM( pNode, nEndPos + 1 ) ) ),
-                        nWordType, FALSE /*prefer backward direction*/);
+                        nWordType, sal_False /*prefer backward direction*/);
 
             // prevent backtracking to the previous word if selection is at word boundary
             if (aSttBndry.endPos <= nStartPos)
@@ -3106,22 +3106,22 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
             {
                 const TransliterationChgData &rData = aChanges[ aChanges.size() - 1 - i ];
 
-                bChanges = TRUE;
+                bChanges = sal_True;
                 if (rData.nLen != rData.aNewText.Len())
-                    bLenChanged = TRUE;
+                    bLenChanged = sal_True;
 
                 // Change text without loosing the attributes
-                USHORT nDiffs = ReplaceTextOnly( rData.aSelection.Min().GetNode(),
+                sal_uInt16 nDiffs = ReplaceTextOnly( rData.aSelection.Min().GetNode(),
                         rData.nStart, rData.nLen, rData.aNewText, rData.aOffsets );
 
                 // adjust selection in end node to possibly changed size
                 if (aSel.Max().GetNode() == rData.aSelection.Max().GetNode())
                     aNewSel.Max().GetIndex() = aNewSel.Max().GetIndex() + nDiffs;
 
-                USHORT nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() );
+                sal_uInt16 nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() );
                 ParaPortion* pParaPortion = GetParaPortions()[nSelNode];
                 pParaPortion->MarkSelectionInvalid( rData.nStart,
-                        std::max< USHORT >( rData.nStart + rData.nLen,
+                        std::max< sal_uInt16 >( rData.nStart + rData.nLen,
                                             rData.nStart + rData.aNewText.Len() ) );
             }
         } // if (aChanges.size() > 0)
@@ -3151,20 +3151,20 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
 
 short ImpEditEngine::ReplaceTextOnly(
     ContentNode* pNode,
-    USHORT nCurrentStart, xub_StrLen nLen,
+    sal_uInt16 nCurrentStart, xub_StrLen nLen,
     const String& rNewText,
     const uno::Sequence< sal_Int32 >& rOffsets )
 {
     (void)  nLen;
 
     // Change text without loosing the attributes
-    USHORT nCharsAfterTransliteration =
-        sal::static_int_cast< USHORT >(rOffsets.getLength());
+    sal_uInt16 nCharsAfterTransliteration =
+        sal::static_int_cast< sal_uInt16 >(rOffsets.getLength());
     const sal_Int32* pOffsets = rOffsets.getConstArray();
     short nDiffs = 0;
-    for ( USHORT n = 0; n < nCharsAfterTransliteration; n++ )
+    for ( sal_uInt16 n = 0; n < nCharsAfterTransliteration; n++ )
     {
-        USHORT nCurrentPos = nCurrentStart+n;
+        sal_uInt16 nCurrentPos = nCurrentStart+n;
         sal_Int32 nDiff = (nCurrentPos-nDiffs) - pOffsets[n];
 
         if ( !nDiff )
@@ -3179,7 +3179,7 @@ short ImpEditEngine::ReplaceTextOnly(
             pNode->SetChar( nCurrentPos, rNewText.GetChar(n) );
 
             DBG_ASSERT( (nCurrentPos+1) < pNode->Len(), "TransliterateText - String smaller than expected!" );
-            GetEditDoc().RemoveChars( EditPaM( pNode, nCurrentPos+1 ), sal::static_int_cast< USHORT >(-nDiff) );
+            GetEditDoc().RemoveChars( EditPaM( pNode, nCurrentPos+1 ), sal::static_int_cast< sal_uInt16 >(-nDiff) );
         }
         else
         {
@@ -3194,7 +3194,7 @@ short ImpEditEngine::ReplaceTextOnly(
 }
 
 
-void ImpEditEngine::SetAsianCompressionMode( USHORT n )
+void ImpEditEngine::SetAsianCompressionMode( sal_uInt16 n )
 {
     if ( n != nAsianCompressionMode )
     {
@@ -3207,7 +3207,7 @@ void ImpEditEngine::SetAsianCompressionMode( USHORT n )
     }
 }
 
-void ImpEditEngine::SetKernAsianPunctuation( BOOL b )
+void ImpEditEngine::SetKernAsianPunctuation( sal_Bool b )
 {
     if ( b != bKernAsianPunctuation )
     {
@@ -3220,7 +3220,7 @@ void ImpEditEngine::SetKernAsianPunctuation( BOOL b )
     }
 }
 
-void ImpEditEngine::SetAddExtLeading( BOOL bExtLeading )
+void ImpEditEngine::SetAddExtLeading( sal_Bool bExtLeading )
 {
     if ( IsAddExtLeading() != bExtLeading )
     {
@@ -3235,7 +3235,7 @@ void ImpEditEngine::SetAddExtLeading( BOOL bExtLeading )
 
 
 
-BOOL ImpEditEngine::ImplHasText() const
+sal_Bool ImpEditEngine::ImplHasText() const
 {
     return ( ( GetEditDoc().Count() > 1 ) || GetEditDoc().GetObject(0)->Len() );
 }
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index d03f6bc40cea..9ee95bc019a1 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -44,16 +44,16 @@ void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
     if ( pStylePool != pSPool )
     {
 //      if ( pStylePool )
-//          EndListening( *pStylePool, TRUE );
+//          EndListening( *pStylePool, sal_True );
 
         pStylePool = pSPool;
 
 //      if ( pStylePool )
-//          StartListening( *pStylePool, TRUE );
+//          StartListening( *pStylePool, sal_True );
     }
 }
 
-SfxStyleSheet* ImpEditEngine::GetStyleSheet( USHORT nPara ) const
+SfxStyleSheet* ImpEditEngine::GetStyleSheet( sal_uInt16 nPara ) const
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     return pNode ? pNode->GetContentAttribs().GetStyleSheet() : NULL;
@@ -63,19 +63,19 @@ void ImpEditEngine::SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle )
 {
     aSel.Adjust( aEditDoc );
 
-    USHORT nStartPara = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndPara = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartPara = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndPara = aEditDoc.GetPos( aSel.Max().GetNode() );
 
-    BOOL _bUpdate = GetUpdateMode();
-    SetUpdateMode( FALSE );
+    sal_Bool _bUpdate = GetUpdateMode();
+    SetUpdateMode( sal_False );
 
-    for ( USHORT n = nStartPara; n <= nEndPara; n++ )
+    for ( sal_uInt16 n = nStartPara; n <= nEndPara; n++ )
         SetStyleSheet( n, pStyle );
 
     SetUpdateMode( _bUpdate, 0 );
 }
 
-void ImpEditEngine::SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle )
+void ImpEditEngine::SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle )
 {
     DBG_ASSERT( GetStyleSheetPool() || !pStyle, "SetStyleSheet: No StyleSheetPool registered!" );
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
@@ -99,10 +99,10 @@ void ImpEditEngine::SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle )
                         pNode->GetContentAttribs().GetItems() ) );
         }
         if ( pCurStyle )
-            EndListening( *pCurStyle, FALSE );
+            EndListening( *pCurStyle, sal_False );
         pNode->SetStyleSheet( pStyle, aStatus.UseCharAttribs() );
         if ( pStyle )
-            StartListening( *pStyle, FALSE );
+            StartListening( *pStyle, sal_False );
         ParaAttribsChanged( pNode );
     }
     FormatAndUpdate();
@@ -113,17 +113,17 @@ void ImpEditEngine::UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle )
     SvxFont aFontFromStyle;
     CreateFont( aFontFromStyle, pStyle->GetItemSet() );
 
-    BOOL bUsed = FALSE;
-    for ( USHORT nNode = 0; nNode < aEditDoc.Count(); nNode++ )
+    sal_Bool bUsed = sal_False;
+    for ( sal_uInt16 nNode = 0; nNode < aEditDoc.Count(); nNode++ )
     {
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         if ( pNode->GetStyleSheet() == pStyle )
         {
-            bUsed = TRUE;
+            bUsed = sal_True;
             if ( aStatus.UseCharAttribs() )
                 pNode->SetStyleSheet( pStyle, aFontFromStyle );
             else
-                pNode->SetStyleSheet( pStyle, FALSE );
+                pNode->SetStyleSheet( pStyle, sal_False );
 
             ParaAttribsChanged( pNode );
         }
@@ -137,7 +137,7 @@ void ImpEditEngine::UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle )
 
 void ImpEditEngine::RemoveStyleFromParagraphs( SfxStyleSheet* pStyle )
 {
-    for ( USHORT nNode = 0; nNode < aEditDoc.Count(); nNode++ )
+    for ( sal_uInt16 nNode = 0; nNode < aEditDoc.Count(); nNode++ )
     {
         ContentNode* pNode = aEditDoc.GetObject(nNode);
         if ( pNode->GetStyleSheet() == pStyle )
@@ -157,7 +157,7 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
 
         SfxStyleSheet* pStyle = NULL;
-        ULONG nId = 0;
+        sal_uLong nId = 0;
 
         if ( rHint.ISA( SfxStyleSheetHint ) )
         {
@@ -187,8 +187,8 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 
                 // Alle Absaetze mit EditStyles, die das geaenderte Style
                 // irgendwie als Parent haben, muessen formatiert werden.
-                // ULONG nStyles = pMyStylePool->GetStyles().Count();
-                // for ( ULONG nStyle = 0; nStyle < nStyles; nStyle++ )
+                // sal_uLong nStyles = pMyStylePool->GetStyles().Count();
+                // for ( sal_uLong nStyle = 0; nStyle < nStyles; nStyle++ )
                 // {
                 //  EditStyleSheet* pES = (EditStyleSheet*)pMyStylePool->GetStyles().GetObject( nStyle );
                 //  DBG_ASSERT( pES, "NULL-Pointer im StyleSheetPool!" );
@@ -207,8 +207,8 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
 
     ESelection aESel( CreateESel( aSel ) );
 
-    USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
     DBG_ASSERT( nStartNode <= nEndNode, "CreateAttribUndo: Start > End ?!" );
 
@@ -226,14 +226,14 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
 
     SfxItemPool* pPool = pUndo->GetNewAttribs().GetPool();
 
-    for ( USHORT nPara = nStartNode; nPara <= nEndNode; nPara++ )
+    for ( sal_uInt16 nPara = nStartNode; nPara <= nEndNode; nPara++ )
     {
         ContentNode* pNode = aEditDoc.GetObject( nPara );
         DBG_ASSERT( aEditDoc.SaveGetObject( nPara ), "Node nicht gefunden: CreateAttribUndo" );
         ContentAttribsInfo* pInf = new ContentAttribsInfo( pNode->GetContentAttribs().GetItems() );
         pUndo->GetContentInfos().Insert( pInf, pUndo->GetContentInfos().Count() );
 
-        for ( USHORT nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
         {
             EditCharAttribPtr pAttr = pNode->GetCharAttribs().GetAttribs()[ nAttr ];
             if ( pAttr->GetLen() )
@@ -246,7 +246,7 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
     return pUndo;
 }
 
-void ImpEditEngine::UndoActionStart( USHORT nId, const ESelection& aSel )
+void ImpEditEngine::UndoActionStart( sal_uInt16 nId, const ESelection& aSel )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
@@ -256,7 +256,7 @@ void ImpEditEngine::UndoActionStart( USHORT nId, const ESelection& aSel )
     }
 }
 
-void ImpEditEngine::UndoActionStart( USHORT nId )
+void ImpEditEngine::UndoActionStart( sal_uInt16 nId )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
@@ -265,7 +265,7 @@ void ImpEditEngine::UndoActionStart( USHORT nId )
     }
 }
 
-void ImpEditEngine::UndoActionEnd( USHORT )
+void ImpEditEngine::UndoActionEnd( sal_uInt16 )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
@@ -275,13 +275,13 @@ void ImpEditEngine::UndoActionEnd( USHORT )
     }
 }
 
-void ImpEditEngine::InsertUndo( EditUndo* pUndo, BOOL bTryMerge )
+void ImpEditEngine::InsertUndo( EditUndo* pUndo, sal_Bool bTryMerge )
 {
     DBG_ASSERT( !IsInUndo(), "InsertUndo im Undomodus!" );
     if ( pUndoMarkSelection )
     {
         EditUndoMarkSelection* pU = new EditUndoMarkSelection( this, *pUndoMarkSelection );
-        GetUndoManager().AddUndoAction( pU, FALSE );
+        GetUndoManager().AddUndoAction( pU, sal_False );
         delete pUndoMarkSelection;
         pUndoMarkSelection = NULL;
     }
@@ -296,7 +296,7 @@ void ImpEditEngine::ResetUndoManager()
         GetUndoManager().Clear();
 }
 
-void ImpEditEngine::EnableUndo( BOOL bEnable )
+void ImpEditEngine::EnableUndo( sal_Bool bEnable )
 {
     // Beim Umschalten des Modus Liste loeschen:
     if ( bEnable != IsUndoEnabled() )
@@ -305,39 +305,39 @@ void ImpEditEngine::EnableUndo( BOOL bEnable )
     bUndoEnabled = bEnable;
 }
 
-BOOL ImpEditEngine::Undo( EditView* pView )
+sal_Bool ImpEditEngine::Undo( EditView* pView )
 {
     if ( HasUndoManager() && GetUndoManager().GetUndoActionCount() )
     {
         SetActiveView( pView );
         GetUndoManager().Undo();
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ImpEditEngine::Redo( EditView* pView )
+sal_Bool ImpEditEngine::Redo( EditView* pView )
 {
     if ( HasUndoManager() && GetUndoManager().GetRedoActionCount() )
     {
         SetActiveView( pView );
         GetUndoManager().Redo();
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ImpEditEngine::Repeat( EditView* /* pView */ )
+sal_Bool ImpEditEngine::Repeat( EditView* /* pView */ )
 {
     if ( HasUndoManager() && GetUndoManager().GetRepeatActionCount() )
     {
         DBG_WARNING( "Repeat nicht implementiert!" );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
+SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib )
 {
     DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
 
@@ -351,11 +351,11 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
 
     SfxItemSet aCurSet( GetEmptyItemSet() );
 
-    USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
     // ueber die Absaetze iterieren...
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ )
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
     {
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         DBG_ASSERT( aEditDoc.SaveGetObject( nNode ), "Node nicht gefunden: GetAttrib" );
@@ -379,7 +379,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
         {
             // Und dann Absatzformatierung und Vorlage...
             // SfxStyleSheet* pStyle = pNode->GetStyleSheet();
-            for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
+            for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
             {
                 if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
                 {
@@ -426,7 +426,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
     // Leere Slots mit Defaults fuellen...
     if ( bOnlyHardAttrib == EditEngineAttribs_All )
     {
-        for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++ )
+        for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++ )
         {
             if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
             {
@@ -438,7 +438,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
 }
 
 
-SfxItemSet ImpEditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags ) const
+SfxItemSet ImpEditEngine::GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
 {
     // MT: #94002# Optimized function with less Puts(), which cause unnecessary cloning from default items.
     // If this works, change GetAttribs( EditSelection ) to use this for each paragraph and merge the results!
@@ -462,7 +462,7 @@ SfxItemSet ImpEditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd,
         // StyleSheet / Parattribs...
 
         if ( pNode->GetStyleSheet() && ( nFlags & GETATTRIBS_STYLESHEET ) )
-            aAttribs.Set( pNode->GetStyleSheet()->GetItemSet(), TRUE );
+            aAttribs.Set( pNode->GetStyleSheet()->GetItemSet(), sal_True );
 
         if ( nFlags & GETATTRIBS_PARAATTRIBS )
             aAttribs.Put( pNode->GetContentAttribs().GetItems() );
@@ -475,13 +475,13 @@ SfxItemSet ImpEditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd,
             pNode->GetCharAttribs().OptimizeRanges( ((ImpEditEngine*)this)->GetEditDoc().GetItemPool() );
 
             const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
-            for ( USHORT nAttr = 0; nAttr < rAttrs.Count(); nAttr++ )
+            for ( sal_uInt16 nAttr = 0; nAttr < rAttrs.Count(); nAttr++ )
             {
                 EditCharAttrib* pAttr = rAttrs.GetObject( nAttr );
 
                 if ( nStart == nEnd )
                 {
-                    USHORT nCursorPos = nStart;
+                    sal_uInt16 nCursorPos = nStart;
                     if ( ( pAttr->GetStart() <= nCursorPos ) && ( pAttr->GetEnd() >= nCursorPos ) )
                     {
                         // To be used the attribute has to start BEFORE the position, or it must be a
@@ -529,17 +529,17 @@ SfxItemSet ImpEditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd,
 }
 
 
-void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE nSpecial )
+void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_uInt8 nSpecial )
 {
     aSel.Adjust( aEditDoc );
 
     // Wenn keine Selektion => die Attribute aufs Wort anwenden.
     // ( Der RTF-Perser sollte die Methode eigentlich nie ohne Range rufen )
     if ( ( nSpecial == ATTRSPECIAL_WHOLEWORD ) && !aSel.HasRange() )
-        aSel = SelectWord( aSel, ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, FALSE );
+        aSel = SelectWord( aSel, ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_False );
 
-    USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
     if ( IsUndoEnabled() && !IsInUndo() && aStatus.DoUndoAttribs() )
     {
@@ -548,7 +548,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
         InsertUndo( pUndo );
     }
 
-    BOOL bCheckLanguage = FALSE;
+    sal_Bool bCheckLanguage = sal_False;
     if ( GetStatus().DoOnlineSpelling() )
     {
         bCheckLanguage = ( rSet.GetItemState( EE_CHAR_LANGUAGE ) == SFX_ITEM_ON ) ||
@@ -557,10 +557,10 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
     }
 
     // ueber die Absaetze iterieren...
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ )
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
     {
-        BOOL bParaAttribFound = FALSE;
-        BOOL bCharAttribFound = FALSE;
+        sal_Bool bParaAttribFound = sal_False;
+        sal_Bool bCharAttribFound = sal_False;
 
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         ParaPortion* pPortion = GetParaPortions().GetObject( nNode );
@@ -581,12 +581,12 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
 //      if ( fp )
 //      {
 //          fprintf( fp, "\n\n=> Zeichen-Attribute: Absatz %i, %i-%i\n", nNode, nStartPos, nEndPos );
-//          DbgOutItemSet( fp, rSet, TRUE, FALSE );
+//          DbgOutItemSet( fp, rSet, sal_True, sal_False );
 //          fclose( fp );
 //      }
 #endif
 
-        for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
+        for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
         {
             if ( rSet.GetItemState( nWhich ) == SFX_ITEM_ON )
             {
@@ -594,17 +594,17 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
                 if ( nWhich <= EE_PARA_END )
                 {
                     pNode->GetContentAttribs().GetItems().Put( rItem );
-                    bParaAttribFound = TRUE;
+                    bParaAttribFound = sal_True;
                 }
                 else
                 {
                     aEditDoc.InsertAttrib( pNode, nStartPos, nEndPos, rItem );
-                    bCharAttribFound = TRUE;
+                    bCharAttribFound = sal_True;
                     if ( nSpecial == ATTRSPECIAL_EDGE )
                     {
                         CharAttribArray& rAttribs = pNode->GetCharAttribs().GetAttribs();
-                        USHORT nAttrs = rAttribs.Count();
-                        for ( USHORT n = 0; n < nAttrs; n++ )
+                        sal_uInt16 nAttrs = rAttribs.Count();
+                        for ( sal_uInt16 n = 0; n < nAttrs; n++ )
                         {
                             EditCharAttrib* pAttr = rAttribs.GetObject( n );
                             if ( pAttr->GetStart() > nEndPos )
@@ -612,7 +612,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
 
                             if ( ( pAttr->GetEnd() == nEndPos ) && ( pAttr->Which() == nWhich ) )
                             {
-                                pAttr->SetEdge( TRUE );
+                                pAttr->SetEdge( sal_True );
                                 break;
                             }
                         }
@@ -627,7 +627,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
         }
         else if ( bCharAttribFound )
         {
-            bFormatted = FALSE;
+            bFormatted = sal_False;
             if ( !pNode->Len() || ( nStartPos != nEndPos  ) )
             {
                 pPortion->MarkSelectionInvalid( nStartPos, nEndPos-nStartPos );
@@ -638,12 +638,12 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
     }
 }
 
-void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttribs, USHORT nWhich )
+void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
     aSel.Adjust( aEditDoc );
 
-    USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
     const SfxItemSet* _pEmptyItemSet = bRemoveParaAttribs ? &GetEmptyItemSet() : 0;
 
@@ -651,14 +651,14 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
     {
         // Eventuel spezielles Undo, oder ItemSet*
         EditUndoSetAttribs* pUndo = CreateAttribUndo( aSel, GetEmptyItemSet() );
-        pUndo->SetRemoveAttribs( TRUE );
+        pUndo->SetRemoveAttribs( sal_True );
         pUndo->SetRemoveParaAttribs( bRemoveParaAttribs );
         pUndo->SetRemoveWhich( nWhich );
         InsertUndo( pUndo );
     }
 
     // ueber die Absaetze iterieren...
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ )
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
     {
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         ParaPortion* pPortion = GetParaPortions().GetObject( nNode );
@@ -674,7 +674,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
             nEndPos = aSel.Max().GetIndex();
 
         // Optimieren: Wenn ganzer Absatz, dann RemoveCharAttribs( nPara )?!
-        BOOL bChanged = aEditDoc.RemoveAttribs( pNode, nStartPos, nEndPos, nWhich );
+        sal_Bool bChanged = aEditDoc.RemoveAttribs( pNode, nStartPos, nEndPos, nWhich );
         if ( bRemoveParaAttribs )
         {
             SetParaAttribs( nNode, *_pEmptyItemSet );   // Invalidiert
@@ -690,7 +690,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
             if ( !nWhich )
             {
                 SfxItemSet aAttribs( GetParaAttribs( nNode ) );
-                for ( USHORT nW = EE_CHAR_START; nW <= EE_CHAR_END; nW++ )
+                for ( sal_uInt16 nW = EE_CHAR_START; nW <= EE_CHAR_END; nW++ )
                     aAttribs.ClearItem( nW );
                 SetParaAttribs( nNode, aAttribs );
             }
@@ -698,7 +698,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
 
         if ( bChanged && !bRemoveParaAttribs )
         {
-            bFormatted = FALSE;
+            bFormatted = sal_False;
             pPortion->MarkSelectionInvalid( nStartPos, nEndPos-nStartPos );
         }
     }
@@ -706,7 +706,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
 
 typedef EditCharAttrib* EditCharAttribPtr;
 
-void ImpEditEngine::RemoveCharAttribs( USHORT nPara, USHORT nWhich, BOOL bRemoveFeatures )
+void ImpEditEngine::RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich, sal_Bool bRemoveFeatures )
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     ParaPortion* pPortion = GetParaPortions().SaveGetObject( nPara );
@@ -717,7 +717,7 @@ void ImpEditEngine::RemoveCharAttribs( USHORT nPara, USHORT nWhich, BOOL bRemove
     if ( !pNode )
         return;
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttribPtr pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
     while ( pAttr )
     {
@@ -735,7 +735,7 @@ void ImpEditEngine::RemoveCharAttribs( USHORT nPara, USHORT nWhich, BOOL bRemove
     pPortion->MarkSelectionInvalid( 0, pNode->Len() );
 }
 
-void ImpEditEngine::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void ImpEditEngine::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
 
@@ -747,7 +747,7 @@ void ImpEditEngine::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
 //      if ( fp )
 //      {
 //          fprintf( fp, "\n\n=> Absatz-Attribute: Absatz %i\n", nPara );
-//          DbgOutItemSet( fp, rSet, TRUE, FALSE );
+//          DbgOutItemSet( fp, rSet, sal_True, sal_False );
 //          fclose( fp );
 //      }
 #endif
@@ -775,14 +775,14 @@ void ImpEditEngine::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
     }
 }
 
-const SfxItemSet& ImpEditEngine::GetParaAttribs( USHORT nPara ) const
+const SfxItemSet& ImpEditEngine::GetParaAttribs( sal_uInt16 nPara ) const
 {
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     DBG_ASSERT( pNode, "Node nicht gefunden: GetParaAttribs" );
     return pNode->GetContentAttribs().GetItems();
 }
 
-BOOL ImpEditEngine::HasParaAttrib( USHORT nPara, USHORT nWhich ) const
+sal_Bool ImpEditEngine::HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     DBG_ASSERT( pNode, "Node nicht gefunden: HasParaAttrib" );
@@ -790,7 +790,7 @@ BOOL ImpEditEngine::HasParaAttrib( USHORT nPara, USHORT nWhich ) const
     return pNode->GetContentAttribs().HasItem( nWhich );
 }
 
-const SfxPoolItem& ImpEditEngine::GetParaAttrib( USHORT nPara, USHORT nWhich ) const
+const SfxPoolItem& ImpEditEngine::GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     DBG_ASSERT( pNode, "Node nicht gefunden: GetParaAttrib" );
@@ -798,13 +798,13 @@ const SfxPoolItem& ImpEditEngine::GetParaAttrib( USHORT nPara, USHORT nWhich ) c
     return pNode->GetContentAttribs().GetItem( nWhich );
 }
 
-void ImpEditEngine::GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const
+void ImpEditEngine::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const
 {
     rLst.Remove( 0, rLst.Count() );
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     if ( pNode )
     {
-        for ( USHORT nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
         {
             EditCharAttribPtr pAttr = pNode->GetCharAttribs().GetAttribs()[ nAttr ];
             EECharAttrib aEEAttr;
@@ -821,13 +821,13 @@ void ImpEditEngine::ParaAttribsToCharAttribs( ContentNode* pNode )
 {
     pNode->GetCharAttribs().DeleteEmptyAttribs( GetEditDoc().GetItemPool() );
     xub_StrLen nEndPos = pNode->Len();
-    for ( USHORT nWhich = EE_CHAR_START; nWhich <= EE_CHAR_END; nWhich++ )
+    for ( sal_uInt16 nWhich = EE_CHAR_START; nWhich <= EE_CHAR_END; nWhich++ )
     {
         if ( pNode->GetContentAttribs().HasItem( nWhich ) )
         {
             const SfxPoolItem& rItem = pNode->GetContentAttribs().GetItem( nWhich );
             // Die Luecken auffuellen:
-            USHORT nLastEnd = 0;
+            sal_uInt16 nLastEnd = 0;
             EditCharAttrib* pAttr = pNode->GetCharAttribs().FindNextAttrib( nWhich, nLastEnd );
             while ( pAttr )
             {
@@ -843,7 +843,7 @@ void ImpEditEngine::ParaAttribsToCharAttribs( ContentNode* pNode )
                 aEditDoc.InsertAttrib( pNode, nLastEnd, nEndPos, rItem );
         }
     }
-    bFormatted = FALSE;
+    bFormatted = sal_False;
     // Portion braucht hier nicht invalidiert werden, geschieht woanders.
 }
 
@@ -885,9 +885,9 @@ ImplIMEInfos::ImplIMEInfos( const EditPaM& rPos, const String& rOldTextAfterStar
 {
     aPos = rPos;
     nLen = 0;
-    bCursor = TRUE;
+    bCursor = sal_True;
     pAttribs = NULL;
-    bWasCursorOverwrite = FALSE;
+    bWasCursorOverwrite = sal_False;
 }
 
 ImplIMEInfos::~ImplIMEInfos()
@@ -895,12 +895,12 @@ ImplIMEInfos::~ImplIMEInfos()
     delete[] pAttribs;
 }
 
-void ImplIMEInfos::CopyAttribs( const USHORT* pA, USHORT nL )
+void ImplIMEInfos::CopyAttribs( const sal_uInt16* pA, sal_uInt16 nL )
 {
     nLen = nL;
     delete pAttribs;
-    pAttribs = new USHORT[ nL ];
-    memcpy( pAttribs, pA, nL*sizeof(USHORT) );
+    pAttribs = new sal_uInt16[ nL ];
+    memcpy( pAttribs, pA, nL*sizeof(sal_uInt16) );
 }
 
 void ImplIMEInfos::DestroyAttribs()
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index e46a40f09e02..b92284eb60bf 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -62,7 +62,7 @@ TextConvWrapper::TextConvWrapper( Window* pWindow,
         const Font* pTargetFont,
         sal_Int32 nOptions,
         sal_Bool bIsInteractive,
-        BOOL bIsStart,
+        sal_Bool bIsStart,
         EditView* pView ) :
     HangulHanjaConversion( pWindow, rxMSF, rSourceLocale, rTargetLocale, pTargetFont, nOptions, bIsInteractive )
 {
@@ -286,8 +286,8 @@ sal_Bool TextConvWrapper::ConvContinue_impl()
 
 
 void TextConvWrapper::SetLanguageAndFont( const ESelection &rESel,
-    LanguageType nLang, USHORT nLangWhichId,
-    const Font *pFont,  USHORT nFontWhichId )
+    LanguageType nLang, sal_uInt16 nLangWhichId,
+    const Font *pFont,  sal_uInt16 nFontWhichId )
 {
     ESelection aOldSel = pEditView->GetSelection();
     pEditView->SetSelection( rESel );
@@ -321,7 +321,7 @@ void TextConvWrapper::SelectNewUnit_impl(
         const sal_Int32 nUnitStart,
         const sal_Int32 nUnitEnd )
 {
-    BOOL bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd;
+    sal_Bool bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd;
     DBG_ASSERT( bOK, "invalid arguments" );
     if (!bOK)
         return;
@@ -329,8 +329,8 @@ void TextConvWrapper::SelectNewUnit_impl(
     ESelection  aSelection = pEditView->GetSelection();
     DBG_ASSERT( aSelection.nStartPara == aSelection.nEndPara,
         "paragraph mismatch in selection" );
-    aSelection.nStartPos = (USHORT) (nLastPos + nUnitOffset + nUnitStart);
-    aSelection.nEndPos   = (USHORT) (nLastPos + nUnitOffset + nUnitEnd);
+    aSelection.nStartPos = (sal_uInt16) (nLastPos + nUnitOffset + nUnitStart);
+    aSelection.nEndPos   = (sal_uInt16) (nLastPos + nUnitOffset + nUnitEnd);
     pEditView->SetSelection( aSelection );
 }
 
@@ -372,7 +372,7 @@ void TextConvWrapper::ReplaceUnit(
         ReplacementAction eAction,
         LanguageType *pNewUnitLanguage )
 {
-    BOOL bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd;
+    sal_Bool bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd;
     DBG_ASSERT( bOK, "invalid arguments" );
     if (!bOK)
         return;
@@ -405,7 +405,7 @@ void TextConvWrapper::ReplaceUnit(
         default:
             DBG_ERROR( "unexpected case" );
     }
-    nUnitOffset = sal::static_int_cast< USHORT >(
+    nUnitOffset = sal::static_int_cast< sal_uInt16 >(
         nUnitOffset + nUnitStart + aNewTxt.getLength());
 
     // remember current original language for kater use
@@ -459,13 +459,13 @@ void TextConvWrapper::ReplaceUnit(
     {
         // Note: replacement is always done in the current paragraph
         // which is the one ConvContinue points to
-        pConvInfo->aConvContinue.nIndex = sal::static_int_cast< USHORT >(
+        pConvInfo->aConvContinue.nIndex = sal::static_int_cast< sal_uInt16 >(
             pConvInfo->aConvContinue.nIndex + nDelta);
 
         // if that is the same as the one where the conversions ends
         // the end needs to be updated also
         if (pConvInfo->aConvTo.nPara == pConvInfo->aConvContinue.nPara)
-            pConvInfo->aConvTo.nIndex = sal::static_int_cast< USHORT >(
+            pConvInfo->aConvTo.nIndex = sal::static_int_cast< sal_uInt16 >(
                 pConvInfo->aConvTo.nIndex + nDelta);
     }
 }
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index 8ffc00291fe9..89cc0484b73f 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -41,8 +41,8 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
 {
     rtl::OUString   aConvText;      // convertible text part found last time
     LanguageType    nConvTextLang;  // language of aConvText
-    USHORT          nLastPos;       // starting position of the last found text portion (word)
-    USHORT          nUnitOffset;    // offset of current unit in the current text portion (word)
+    sal_uInt16          nLastPos;       // starting position of the last found text portion (word)
+    sal_uInt16          nUnitOffset;    // offset of current unit in the current text portion (word)
 
     ESelection      aConvSel;       // selection to be converted if
                                     // 'HasRange' is true, other conversion
@@ -99,8 +99,8 @@ protected:
     virtual sal_Bool    HasRubySupport() const;
 
     void SetLanguageAndFont( const ESelection &rESel,
-                            LanguageType nLang, USHORT nLangWhichId,
-                            const Font *pFont,  USHORT nFontWhichId );
+                            LanguageType nLang, sal_uInt16 nLangWhichId,
+                            const Font *pFont,  sal_uInt16 nFontWhichId );
 
 
 public:
@@ -109,9 +109,9 @@ public:
             const ::com::sun::star::lang::Locale& rSourceLocale,
             const ::com::sun::star::lang::Locale& rTargetLocale,
             const Font* pTargetFont,
-            INT32 nOptions,
+            sal_Int32 nOptions,
             sal_Bool bIsInteractive,
-            BOOL bIsStart, EditView* pView );
+            sal_Bool bIsStart, EditView* pView );
 
     virtual ~TextConvWrapper();
 
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index bd572b059a69..a7e502297959 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -40,7 +40,7 @@
 // #90477#
 #include <tools/tenccvt.hxx>
 
-#define BULITEM_VERSION     ((USHORT)2)
+#define BULITEM_VERSION     ((sal_uInt16)2)
 
 // -----------------------------------------------------------------------
 
@@ -50,21 +50,21 @@ TYPEINIT1(SvxBulletItem,SfxPoolItem);
 
 void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
 {
-    USHORT nTemp;
+    sal_uInt16 nTemp;
 
     rStream << rFont.GetColor();
-    nTemp = (USHORT)rFont.GetFamily(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetFamily(); rStream << nTemp;
 
-    // #90477# nTemp = (USHORT)GetStoreCharSet( rFont.GetCharSet(), rStream.GetVersion() );
-    nTemp = (USHORT)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet(), (sal_uInt16)rStream.GetVersion());
+    // #90477# nTemp = (sal_uInt16)GetStoreCharSet( rFont.GetCharSet(), rStream.GetVersion() );
+    nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet(), (sal_uInt16)rStream.GetVersion());
     rStream << nTemp;
 
-    nTemp = (USHORT)rFont.GetPitch(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetAlign(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetWeight(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetUnderline(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetStrikeout(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetItalic(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetPitch(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetAlign(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetWeight(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetUnderline(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp;
 
     // UNICODE: rStream << rFont.GetName();
     rStream.WriteByteString(rFont.GetName());
@@ -76,12 +76,12 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
 
 // -----------------------------------------------------------------------
 
-Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
+Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
 {
     Font aFont;
     Color aColor;
     rStream >> aColor;    aFont.SetColor( aColor );
-    USHORT nTemp;
+    sal_uInt16 nTemp;
     rStream >> nTemp; aFont.SetFamily((FontFamily)nTemp);
 
     // #90477#
@@ -108,7 +108,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
         aFont.SetSize( aSize );
     }
 
-    BOOL bTemp;
+    sal_Bool bTemp;
     rStream >> bTemp; aFont.SetOutline( bTemp );
     rStream >> bTemp; aFont.SetShadow( bTemp );
     rStream >> bTemp; aFont.SetTransparent( bTemp );
@@ -118,7 +118,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaultFont_Impl();
     SetDefaults_Impl();
@@ -127,7 +127,7 @@ SvxBulletItem::SvxBulletItem( USHORT _nWhich ) : SfxPoolItem( _nWhich )
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( BYTE nNewStyle, const Font& rFont, USHORT /*nStart*/, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( sal_uInt8 nNewStyle, const Font& rFont, sal_uInt16 /*nStart*/, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaults_Impl();
     nStyle = nNewStyle;
@@ -137,7 +137,7 @@ SvxBulletItem::SvxBulletItem( BYTE nNewStyle, const Font& rFont, USHORT /*nStart
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaults_Impl();
     aFont   = rFont;
@@ -148,7 +148,7 @@ SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, USHORT _nWhi
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaults_Impl();
 
@@ -163,7 +163,7 @@ SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, USHORT _nWhich ) : SfxPoolItem
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaults_Impl();
 
@@ -178,7 +178,7 @@ SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, USHORT _nWhic
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) :
+SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) :
     SfxPoolItem( _nWhich ),
     pGraphicObject( NULL )
 {
@@ -190,10 +190,10 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) :
     {
         // Sicheres Laden mit Test auf leere Bitmap
         Bitmap          aBmp;
-        const UINT32    nOldPos = rStrm.Tell();
+        const sal_uInt32    nOldPos = rStrm.Tell();
         // #69345# Errorcode beim Bitmap lesen ignorieren,
         // siehe Kommentar #67581# in SvxBulletItem::Store()
-        BOOL bOldError = rStrm.GetError() ? TRUE : FALSE;
+        sal_Bool bOldError = rStrm.GetError() ? sal_True : sal_False;
         rStrm >> aBmp;
         if ( !bOldError && rStrm.GetError() )
         {
@@ -264,7 +264,7 @@ SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, USHORT /*nVersion*/ ) const
+SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const
 {
     return new SvxBulletItem( rStrm, Which() );
 }
@@ -275,7 +275,7 @@ void SvxBulletItem::SetDefaultFont_Impl()
 {
     aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
     aFont.SetAlign( ALIGN_BOTTOM);
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -293,7 +293,7 @@ void SvxBulletItem::SetDefaults_Impl()
 
 // -----------------------------------------------------------------------
 
-USHORT SvxBulletItem::GetVersion( USHORT /*nVersion*/ ) const
+sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const
 {
     return BULITEM_VERSION;
 }
@@ -371,7 +371,7 @@ int SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     // Korrektur bei leerer Bitmap
     if( ( nStyle == BS_BMP ) &&
@@ -392,16 +392,16 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
         StoreFont( rStrm, aFont );
     else
     {
-        ULONG _nStart = rStrm.Tell();
+        sal_uLong _nStart = rStrm.Tell();
 
         // Kleine Vorab-Schaetzung der Groesse...
-        USHORT nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
+        sal_uInt16 nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
         const Bitmap aBmp( pGraphicObject->GetGraphic().GetBitmap() );
-        ULONG nBytes = aBmp.GetSizeBytes();
-        if ( nBytes < ULONG(0xFF00*nFac) )
+        sal_uLong nBytes = aBmp.GetSizeBytes();
+        if ( nBytes < sal_uLong(0xFF00*nFac) )
             rStrm << aBmp;
 
-        ULONG nEnd = rStrm.Tell();
+        sal_uLong nEnd = rStrm.Tell();
         // #67581# Item darf mit Overhead nicht mehr als 64K schreiben,
         // sonst platzt der SfxMultiRecord
         // Dann lieber auf die Bitmap verzichten, ist nur fuer Outliner
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index 16b6a23111b2..0eb77694f546 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -38,7 +38,7 @@ TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(sal_Fals
 /*-- 16.12.2003 15:24:25---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-SvxCharHiddenItem::SvxCharHiddenItem( const sal_Bool bHidden, const USHORT nId ) :
+SvxCharHiddenItem::SvxCharHiddenItem( const sal_Bool bHidden, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bHidden )
 {
 }
@@ -68,7 +68,7 @@ SfxItemPresentation SvxCharHiddenItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 132a6d0ee38c..68730911c8a2 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -75,7 +75,7 @@ int SvxFieldData::operator==( const SvxFieldData& rFld ) const
 {
     DBG_ASSERT( Type() == rFld.Type(), "==: Verschiedene Typen" );
     (void)rFld;
-    return TRUE;    // Basicklasse immer gleich.
+    return sal_True;    // Basicklasse immer gleich.
 }
 
 // -----------------------------------------------------------------------
@@ -103,7 +103,7 @@ MetaAction* SvxFieldData::createEndComment() const
 
 // -----------------------------------------------------------------------
 
-SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const USHORT nId ) :
+SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     pField = pFld;  // gehoert direkt dem Item
@@ -111,7 +111,7 @@ SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const USHORT nId ) :
 
 // -----------------------------------------------------------------------
 
-SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const USHORT nId ) :
+SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     pField = rField.Clone();
@@ -141,7 +141,7 @@ SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     SvxFieldData* pData = 0;
     SvPersistStream aPStrm( GetClassManager(), &rStrm );
@@ -158,7 +158,7 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, USHORT ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxFieldItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     DBG_ASSERT( pField, "SvxFieldItem::Store: Feld?!" );
     SvPersistStream aPStrm( GetClassManager(), &rStrm );
@@ -185,10 +185,10 @@ int SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
 
     const SvxFieldData* pOtherFld = ((const SvxFieldItem&)rItem).GetField();
     if ( !pField && !pOtherFld )
-        return TRUE;
+        return sal_True;
 
     if ( ( !pField && pOtherFld ) || ( pField && !pOtherFld ) )
-        return FALSE;
+        return sal_False;
 
     return ( ( pField->Type() == pOtherFld->Type() )
                 && ( *pField == *pOtherFld ) );
@@ -230,7 +230,7 @@ SvxFieldData* SvxDateField::Clone() const
 int SvxDateField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxDateField& rOtherFld = (const SvxDateField&) rOther;
     return ( ( nFixDate == rOtherFld.nFixDate ) &&
@@ -242,7 +242,7 @@ int SvxDateField::operator==( const SvxFieldData& rOther ) const
 
 void SvxDateField::Load( SvPersistStream & rStm )
 {
-    USHORT nType, nFormat;
+    sal_uInt16 nType, nFormat;
 
     rStm >> nFixDate;
     rStm >> nType;
@@ -257,8 +257,8 @@ void SvxDateField::Load( SvPersistStream & rStm )
 void SvxDateField::Save( SvPersistStream & rStm )
 {
     rStm << nFixDate;
-    rStm << (USHORT)eType;
-    rStm << (USHORT)eFormat;
+    rStm << (sal_uInt16)eType;
+    rStm << (sal_uInt16)eFormat;
 }
 
 // -----------------------------------------------------------------------
@@ -285,7 +285,7 @@ String SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberF
         eFormat = SVXDATEFORMAT_STDSMALL;
     }
 
-    ULONG nFormatKey;
+    sal_uLong nFormatKey;
 
     switch( eFormat )
     {
@@ -366,7 +366,7 @@ SvxFieldData* SvxURLField::Clone() const
 int SvxURLField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxURLField& rOtherFld = (const SvxURLField&) rOther;
     return ( ( eFormat == rOtherFld.eFormat ) &&
@@ -379,14 +379,14 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const
 
 static void write_unicode( SvPersistStream & rStm, const String& rString )
 {
-    USHORT nL = rString.Len();
+    sal_uInt16 nL = rString.Len();
     rStm << nL;
     rStm.Write( rString.GetBuffer(), nL*sizeof(sal_Unicode) );
 }
 
 static void read_unicode( SvPersistStream & rStm, String& rString )
 {
-    USHORT nL = 0;
+    sal_uInt16 nL = 0;
     rStm >> nL;
     if ( nL )
     {
@@ -398,7 +398,7 @@ static void read_unicode( SvPersistStream & rStm, String& rString )
 
 void SvxURLField::Load( SvPersistStream & rStm )
 {
-    USHORT nFormat = 0;
+    sal_uInt16 nFormat = 0;
 
     rStm >> nFormat;
     eFormat= (SvxURLFormat)nFormat;
@@ -412,7 +412,7 @@ void SvxURLField::Load( SvPersistStream & rStm )
 
 void SvxURLField::Save( SvPersistStream & rStm )
 {
-    rStm << (USHORT)eFormat;
+    rStm << (sal_uInt16)eFormat;
 
     write_unicode( rStm, aURL );
     write_unicode( rStm, aRepresentation );
@@ -424,7 +424,7 @@ MetaAction* SvxURLField::createBeginComment() const
     // #i46618# Adding target URL to metafile comment
     return new MetaCommentAction( "FIELD_SEQ_BEGIN",
                                   0,
-                                  reinterpret_cast<const BYTE*>(aURL.GetBuffer()),
+                                  reinterpret_cast<const sal_uInt8*>(aURL.GetBuffer()),
                                   2*aURL.Len() );
 }
 
@@ -579,7 +579,7 @@ SvxFieldData* SvxExtTimeField::Clone() const
 int SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxExtTimeField& rOtherFld = (const SvxExtTimeField&) rOther;
     return ( ( nFixTime == rOtherFld.nFixTime ) &&
@@ -591,7 +591,7 @@ int SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
 
 void SvxExtTimeField::Load( SvPersistStream & rStm )
 {
-    USHORT nType, nFormat;
+    sal_uInt16 nType, nFormat;
 
     rStm >> nFixTime;
     rStm >> nType;
@@ -606,8 +606,8 @@ void SvxExtTimeField::Load( SvPersistStream & rStm )
 void SvxExtTimeField::Save( SvPersistStream & rStm )
 {
     rStm << nFixTime;
-    rStm << (USHORT) eType;
-    rStm << (USHORT) eFormat;
+    rStm << (sal_uInt16) eType;
+    rStm << (sal_uInt16) eFormat;
 }
 
 //----------------------------------------------------------------------------
@@ -647,7 +647,7 @@ String SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumb
             String aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) );
             xub_StrLen nCheckPos;
             short nType;
-            /*BOOL bInserted = */rFormatter.PutandConvertEntry( aFormatCode,
+            /*sal_Bool bInserted = */rFormatter.PutandConvertEntry( aFormatCode,
                 nCheckPos, nType, nFormatKey, LANGUAGE_ENGLISH_US, eLang );
             DBG_ASSERT( nCheckPos == 0, "SVXTIMEFORMAT_12_HMSH: could not insert format code" );
             if ( nCheckPos )
@@ -718,7 +718,7 @@ SvxFieldData* SvxExtFileField::Clone() const
 int SvxExtFileField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxExtFileField& rOtherFld = (const SvxExtFileField&) rOther;
     return ( ( aFile == rOtherFld.aFile ) &&
@@ -730,7 +730,7 @@ int SvxExtFileField::operator==( const SvxFieldData& rOther ) const
 
 void SvxExtFileField::Load( SvPersistStream & rStm )
 {
-    USHORT nType, nFormat;
+    sal_uInt16 nType, nFormat;
 
     // UNICODE: rStm >> aFile;
     rStm.ReadByteString(aFile);
@@ -749,8 +749,8 @@ void SvxExtFileField::Save( SvPersistStream & rStm )
     // UNICODE: rStm << aFile;
     rStm.WriteByteString(aFile);
 
-    rStm << (USHORT) eType;
-    rStm << (USHORT) eFormat;
+    rStm << (sal_uInt16) eType;
+    rStm << (sal_uInt16) eFormat;
 }
 
 //----------------------------------------------------------------------------
@@ -870,7 +870,7 @@ SvxFieldData* SvxAuthorField::Clone() const
 int SvxAuthorField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxAuthorField& rOtherFld = (const SvxAuthorField&) rOther;
     return ( ( aName == rOtherFld.aName ) &&
@@ -884,7 +884,7 @@ int SvxAuthorField::operator==( const SvxFieldData& rOther ) const
 
 void SvxAuthorField::Load( SvPersistStream & rStm )
 {
-    USHORT nType = 0, nFormat = 0;
+    sal_uInt16 nType = 0, nFormat = 0;
 
     read_unicode( rStm, aName );
     read_unicode( rStm, aFirstName );
@@ -905,8 +905,8 @@ void SvxAuthorField::Save( SvPersistStream & rStm )
     write_unicode( rStm, aFirstName );
     write_unicode( rStm, aShortName );
 
-    rStm << (USHORT) eType;
-    rStm << (USHORT) eFormat;
+    rStm << (sal_uInt16) eType;
+    rStm << (sal_uInt16) eFormat;
 }
 
 //----------------------------------------------------------------------------
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 5840b54a640e..3ada61c04488 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -188,7 +188,7 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            BYTE nValue = GetValue();
+            sal_uInt8 nValue = GetValue();
 
             if ( PAPERBIN_PRINTER_SETTINGS == nValue )
                 rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
@@ -218,7 +218,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -241,7 +241,7 @@ sal_Bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 // -----------------------------------------------------------------------
-sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -430,7 +430,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bRet = sal_True;
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -475,7 +475,7 @@ sal_Bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -505,12 +505,12 @@ sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX)
             {
                 if(MID_L_REL_MARGIN== nMemberId)
-                    nPropLeftMargin = (USHORT)nRel;
+                    nPropLeftMargin = (sal_uInt16)nRel;
                 else
-                    nPropRightMargin = (USHORT)nRel;
+                    nPropRightMargin = (sal_uInt16)nRel;
             }
             else
-                return FALSE;
+                return sal_False;
         }
         break;
         case MID_FIRST_LINE_INDENT     :
@@ -518,7 +518,7 @@ sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             break;
 
         case MID_FIRST_LINE_REL_INDENT:
-            SetPropTxtFirstLineOfst ( (USHORT)nVal );
+            SetPropTxtFirstLineOfst ( (sal_uInt16)nVal );
             break;
 
         case MID_FIRST_AUTO:
@@ -824,7 +824,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
 }
 
 // -----------------------------------------------------------------------
-sal_Bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -850,7 +850,7 @@ sal_Bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -875,12 +875,12 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
         case MID_UP_MARGIN :
             if(!(rVal >>= nVal) || nVal < 0)
                 return sal_False;
-            SetUpper((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
+            SetUpper((sal_uInt16)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
             break;
         case MID_LO_MARGIN :
             if(!(rVal >>= nVal) || nVal < 0)
                 return sal_False;
-            SetLower((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
+            SetLower((sal_uInt16)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
             break;
         case MID_UP_REL_MARGIN:
         case MID_LO_REL_MARGIN:
@@ -889,12 +889,12 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             if((rVal >>= nRel) && nRel > 1 )
             {
                 if(MID_UP_REL_MARGIN == nMemberId)
-                    nPropUpper = (USHORT)nRel;
+                    nPropUpper = (sal_uInt16)nRel;
                 else
-                    nPropLower = (USHORT)nRel;
+                    nPropLower = (sal_uInt16)nRel;
             }
             else
-                return FALSE;
+                return sal_False;
         }
         break;
 
@@ -1167,7 +1167,7 @@ int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
 
 /*-----------------16.03.98 12:42-------------------
 --------------------------------------------------*/
-sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1188,7 +1188,7 @@ sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------16.03.98 12:42-------------------
 
 --------------------------------------------------*/
-sal_Bool    SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool    SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1284,8 +1284,8 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
 
 // class SvxShadowItem ---------------------------------------------------
 
-SvxShadowItem::SvxShadowItem( const USHORT nId,
-                 const Color *pColor, const USHORT nW,
+SvxShadowItem::SvxShadowItem( const sal_uInt16 nId,
+                 const Color *pColor, const sal_uInt16 nW,
                  const SvxShadowLocation eLoc ) :
     SfxEnumItemInterface( nId ),
     aShadowColor(COL_GRAY),
@@ -1297,7 +1297,7 @@ SvxShadowItem::SvxShadowItem( const USHORT nId,
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1330,7 +1330,7 @@ sal_Bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 // -----------------------------------------------------------------------
-sal_Bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1707,8 +1707,8 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
 
 bool SvxBorderLine::HasPriority( const SvxBorderLine& rOtherLine ) const
 {
-    const USHORT nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
-    const USHORT nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
+    const sal_uInt16 nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
+    const sal_uInt16 nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
 
     if (nThisSize > nOtherSize)
     {
@@ -1842,7 +1842,7 @@ table::BorderLine SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Bool
     return aLine;
 }
 // -----------------------------------------------------------------------
-sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
+sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId  ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     table::BorderLine aRetLine;
@@ -1945,7 +1945,7 @@ sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rL
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     sal_uInt16 nLine = BOX_LINE_TOP;
@@ -2779,7 +2779,7 @@ void SvxBoxInfoItem::ResetFlags()
     nValidFlags = 0x7F; // alles g"ultig au/ser Disable
 }
 
-sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
+sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId  ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     table::BorderLine aRetLine;
@@ -2861,7 +2861,7 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
 //  sal_uInt16 nLine = BOX_LINE_TOP;
@@ -2905,14 +2905,14 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 else
                     return sal_False;
                 if ( aSeq[3] >>= nFlags )
-                    nValidFlags = (BYTE)nFlags;
+                    nValidFlags = (sal_uInt8)nFlags;
                 else
                     return sal_False;
                 if (( aSeq[4] >>= nVal ) && ( nVal >= 0 ))
                 {
                     if( bConvert )
                         nVal = MM100_TO_TWIP(nVal);
-                    SetDefDist( (USHORT)nVal );
+                    SetDefDist( (sal_uInt16)nVal );
                 }
             }
             return sal_True;
@@ -2997,7 +2997,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             sal_Int16 nFlags = sal_Int16();
             bRet = (rVal >>= nFlags);
             if ( bRet )
-                nValidFlags = (BYTE)nFlags;
+                nValidFlags = (sal_uInt8)nFlags;
             break;
         }
         case MID_DISTANCE:
@@ -3008,7 +3008,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             {
                 if( bConvert )
                     nVal = MM100_TO_TWIP(nVal);
-                SetDefDist( (USHORT)nVal );
+                SetDefDist( (sal_uInt16)nVal );
             }
             break;
         }
@@ -3064,7 +3064,7 @@ XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     style::BreakType eBreak = style::BreakType_NONE;
     switch ( (SvxBreak)GetValue() )
@@ -3081,7 +3081,7 @@ sal_Bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
     return sal_True;
 }
 // -----------------------------------------------------------------------
-sal_Bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     style::BreakType nBreak;
 
@@ -3266,7 +3266,7 @@ SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
     return new SvxLineItem( *this );
 }
 
-sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
+sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
 {
     sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
     nMemId &= ~CONVERT_TWIPS;
@@ -3289,12 +3289,12 @@ sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
+sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
 {
     sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
     nMemId &= ~CONVERT_TWIPS;
@@ -3320,9 +3320,9 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
         switch ( nMemId )
         {
             case MID_FG_COLOR:      pLine->SetColor( Color(nVal) ); break;
-            case MID_OUTER_WIDTH:   pLine->SetOutWidth((USHORT)nVal);   break;
-            case MID_INNER_WIDTH:   pLine->SetInWidth((USHORT)nVal);   break;
-            case MID_DISTANCE:      pLine->SetDistance((USHORT)nVal);   break;
+            case MID_OUTER_WIDTH:   pLine->SetOutWidth((sal_uInt16)nVal);   break;
+            case MID_INNER_WIDTH:   pLine->SetInWidth((sal_uInt16)nVal);   break;
+            case MID_DISTANCE:      pLine->SetDistance((sal_uInt16)nVal);   break;
             default:
                 DBG_ERROR( "Wrong MemberId" );
                 return sal_False;
@@ -3701,7 +3701,7 @@ inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans)
     return (sal_Int8)((nTrans * 100 + 127) / 254);
 }
 
-sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3763,7 +3763,7 @@ sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -4289,7 +4289,7 @@ CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const
 {
     CntWallpaperItem* pItem = new CntWallpaperItem( 0 );
     pItem->SetColor( aColor.GetColor() );
-    pItem->SetStyle( (USHORT)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
+    pItem->SetStyle( (sal_uInt16)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
     sal_Bool bLink = (pStrLink != 0);
     if( bLink )
     {
@@ -4324,14 +4324,14 @@ void  SvxBrushItem::ApplyGraphicTransparency_Impl()
 }
 // class SvxFrameDirectionItem ----------------------------------------------
 
-SvxFrameDirectionItem::SvxFrameDirectionItem( USHORT _nWhich )
-    : SfxUInt16Item( _nWhich, (UINT16)FRMDIR_HORI_LEFT_TOP )
+SvxFrameDirectionItem::SvxFrameDirectionItem( sal_uInt16 _nWhich )
+    : SfxUInt16Item( _nWhich, (sal_uInt16)FRMDIR_HORI_LEFT_TOP )
 {
 }
 
 SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
-                                            USHORT _nWhich )
-    : SfxUInt16Item( _nWhich, (UINT16)nValue )
+                                            sal_uInt16 _nWhich )
+    : SfxUInt16Item( _nWhich, (sal_uInt16)nValue )
 {
 }
 
@@ -4351,21 +4351,21 @@ SfxPoolItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const
     return new SvxFrameDirectionItem( *this );
 }
 
-SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ ) const
+SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/ ) const
 {
     sal_uInt16 nValue;
     rStrm >> nValue;
     return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
 }
 
-SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
+SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ ) const
 {
     sal_uInt16 nValue = GetValue();
     rStrm << nValue;
     return rStrm;
 }
 
-USHORT SvxFrameDirectionItem::GetVersion( USHORT nFVer ) const
+sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0;
 }
@@ -4395,7 +4395,7 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
 }
 
 sal_Bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                             BYTE )
+                                             sal_uInt8 )
 {
     sal_Int16 nVal = sal_Int16();
     sal_Bool bRet = ( rVal >>= nVal );
@@ -4429,7 +4429,7 @@ sal_Bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
 }
 
 sal_Bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                            BYTE ) const
+                                            sal_uInt8 ) const
 {
     // translate SvxFrameDirection into WritingDirection2
     sal_Int16 nVal;
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 29c3456b2af1..8c0e533a40f4 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -117,7 +117,7 @@ SvxNumberType::~SvxNumberType()
 /* -----------------------------22.02.01 11:09--------------------------------
 
  ---------------------------------------------------------------------------*/
-String SvxNumberType::GetNumStr( ULONG nNo ) const
+String SvxNumberType::GetNumStr( sal_uLong nNo ) const
 {
     LanguageType eLang = Application::GetSettings().GetLanguage();
     Locale aLocale = SvxCreateLocale(eLang);
@@ -126,7 +126,7 @@ String SvxNumberType::GetNumStr( ULONG nNo ) const
 /* -----------------28.10.98 15:56-------------------
  *
  * --------------------------------------------------*/
-String  SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const
+String  SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const
 {
     lcl_getFormatter(xFormatter);
     String aTmpStr;
@@ -231,16 +231,16 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
   mnIndentAt( 0 )
 {
 
-    USHORT nVersion;
+    sal_uInt16 nVersion;
   rStream >> nVersion;
 
-  USHORT nUSHORT;
+  sal_uInt16 nUSHORT;
   rStream >> nUSHORT;
   SetNumberingType((sal_Int16)nUSHORT);
   rStream >> nUSHORT;
   eNumAdjust      = (SvxAdjust)nUSHORT;
   rStream >> nUSHORT;
-  nInclUpperLevels = (BYTE)nUSHORT;
+  nInclUpperLevels = (sal_uInt8)nUSHORT;
   rStream >> nUSHORT;
   nStart          = nUSHORT;
   rStream >> nUSHORT;
@@ -288,7 +288,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
   rStream >> nUSHORT;
   nBulletRelSize = nUSHORT;
   rStream >> nUSHORT;
-  SetShowSymbol((BOOL)nUSHORT);
+  SetShowSymbol((sal_Bool)nUSHORT);
 
   if( nVersion < NUMITEM_VERSION_03 )
       cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet,
@@ -296,7 +296,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
                                       : RTL_TEXTENCODING_SYMBOL );
     if(pBulletFont)
     {
-        BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+        sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
         if(bConvertBulletFont)
         {
 
@@ -340,13 +340,13 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
         pBulletFont->SetName(sFontName);
     }
 
-    rStream << (USHORT)NUMITEM_VERSION_04;
+    rStream << (sal_uInt16)NUMITEM_VERSION_04;
 
-    rStream << (USHORT)GetNumberingType();
-    rStream << (USHORT)eNumAdjust;
-    rStream << (USHORT)nInclUpperLevels;
+    rStream << (sal_uInt16)GetNumberingType();
+    rStream << (sal_uInt16)eNumAdjust;
+    rStream << (sal_uInt16)nInclUpperLevels;
     rStream << nStart;
-    rStream << (USHORT)cBullet;
+    rStream << (sal_uInt16)cBullet;
 
     rStream << nFirstLineOffset;
     rStream << nAbsLSpace;
@@ -359,7 +359,7 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
     rStream.WriteByteString(sCharStyleName, eEnc);
     if(pGraphicBrush)
     {
-        rStream << (USHORT)1;
+        rStream << (sal_uInt16)1;
 
         // #75113# in SD or SI force bullet itself to be stored,
         // for that purpose throw away link when link and graphic
@@ -373,16 +373,16 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
         pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
     }
     else
-        rStream << (USHORT)0;
+        rStream << (sal_uInt16)0;
 
-    rStream << (USHORT)eVertOrient;
+    rStream << (sal_uInt16)eVertOrient;
     if(pBulletFont)
     {
-        rStream << (USHORT)1;
+        rStream << (sal_uInt16)1;
         rStream << *pBulletFont;
     }
     else
-        rStream << (USHORT)0;
+        rStream << (sal_uInt16)0;
     rStream << aGraphicSize;
 
     Color nTempColor = nBulletColor;
@@ -390,10 +390,10 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
         nTempColor = COL_BLACK;
     rStream << nTempColor;
     rStream << nBulletRelSize;
-    rStream << (USHORT)IsShowSymbol();
+    rStream << (sal_uInt16)IsShowSymbol();
 
-    rStream << ( USHORT ) mePositionAndSpaceMode;
-    rStream << ( USHORT ) meLabelFollowedBy;
+    rStream << ( sal_uInt16 ) mePositionAndSpaceMode;
+    rStream << ( sal_uInt16 ) meLabelFollowedBy;
     rStream << ( long ) mnListtabPos;
     rStream << ( long ) mnFirstLineIndent;
     rStream << ( long ) mnIndentAt;
@@ -446,7 +446,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
 /* -----------------27.10.98 10:56-------------------
  *
  * --------------------------------------------------*/
-BOOL  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
+sal_Bool  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
 {
     if( GetNumberingType()  != rFormat.GetNumberingType() ||
         eNumAdjust          != rFormat.eNumAdjust ||
@@ -475,14 +475,14 @@ BOOL  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
         IsShowSymbol()      != rFormat.IsShowSymbol() ||
         sCharStyleName      != rFormat.sCharStyleName
         )
-        return FALSE;
+        return sal_False;
     if (
         (pGraphicBrush && !rFormat.pGraphicBrush) ||
         (!pGraphicBrush && rFormat.pGraphicBrush) ||
         (pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush)
        )
     {
-        return FALSE;
+        return sal_False;
     }
     if (
         (pBulletFont && !rFormat.pBulletFont) ||
@@ -490,9 +490,9 @@ BOOL  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
         (pBulletFont && *pBulletFont != *rFormat.pBulletFont)
        )
     {
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 /* -----------------28.10.98 09:53-------------------
  *
@@ -690,7 +690,7 @@ Size SvxNumberFormat::GetGraphicSizeMM100(const Graphic* pGraphic)
 /* -----------------28.10.98 15:57-------------------
  *
  * --------------------------------------------------*/
-String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
+String SvxNumberFormat::CreateRomanString( sal_uLong nNo, sal_Bool bUpper )
 {
     nNo %= 4000;            // mehr kann nicht dargestellt werden
 //      i, ii, iii, iv, v, vi, vii, vii, viii, ix
@@ -700,11 +700,11 @@ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
                         : "mdclxvi--";  // +2 Dummy-Eintraege !!
 
     String sRet;
-    USHORT nMask = 1000;
+    sal_uInt16 nMask = 1000;
     while( nMask )
     {
-        BYTE nZahl = BYTE(nNo / nMask);
-        BYTE nDiff = 1;
+        sal_uInt8 nZahl = sal_uInt8(nNo / nMask);
+        sal_uInt8 nDiff = 1;
         nNo %= nMask;
 
         if( 5 < nZahl )
@@ -736,13 +736,13 @@ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
     return sRet;
 }
 #ifdef OLD_NUMBER_FORMATTING
-void SvxNumberFormat::GetCharStr( ULONG nNo, String& rStr ) const
+void SvxNumberFormat::GetCharStr( sal_uLong nNo, String& rStr ) const
 {
     DBG_ASSERT( nNo, "0 ist eine ungueltige Nummer !!" );
 
-    const ULONG coDiff = 'Z' - 'A' +1;
+    const sal_uLong coDiff = 'Z' - 'A' +1;
     char cAdd = (SVX_NUM_CHARS_UPPER_LETTER == eNumType ? 'A' : 'a') - 1;
-    ULONG nCalc;
+    sal_uLong nCalc;
 
     do {
         nCalc = nNo % coDiff;
@@ -755,18 +755,18 @@ void SvxNumberFormat::GetCharStr( ULONG nNo, String& rStr ) const
     } while( nNo );
 }
 
-void SvxNumberFormat::GetCharStrN( ULONG nNo, String& rStr ) const
+void SvxNumberFormat::GetCharStrN( sal_uLong nNo, String& rStr ) const
 {
     DBG_ASSERT( nNo, "0 ist eine ungueltige Nummer !!" );
 
-    const ULONG coDiff = 'Z' - 'A' +1;
+    const sal_uLong coDiff = 'Z' - 'A' +1;
     char cChar = (char)(--nNo % coDiff);
     if( SVX_NUM_CHARS_UPPER_LETTER_N == eNumType )
         cChar += 'A';
     else
         cChar += 'a';
 
-    rStr.Fill( (USHORT)(nNo / coDiff) + 1, sal_Unicode(cChar) );
+    rStr.Fill( (sal_uInt16)(nNo / coDiff) + 1, sal_Unicode(cChar) );
 }
 #endif //OLD_NUMBER_FORMATTING
 /* -----------------------------22.02.01 13:31--------------------------------
@@ -783,9 +783,9 @@ sal_Int32 SvxNumRule::nRefCount = 0;
 static SvxNumberFormat* pStdNumFmt = 0;
 static SvxNumberFormat* pStdOutlineNumFmt = 0;
 // --> OD 2008-02-11 #newlistlevelattrs#
-SvxNumRule::SvxNumRule( ULONG nFeatures,
-                        USHORT nLevels,
-                        BOOL bCont,
+SvxNumRule::SvxNumRule( sal_uLong nFeatures,
+                        sal_uInt16 nLevels,
+                        sal_Bool bCont,
                         SvxNumRuleType eType,
                         SvxNumberFormat::SvxNumPositionAndSpaceMode
                                     eDefaultNumberFormatPositionAndSpaceMode )
@@ -797,7 +797,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
     ++nRefCount;
     LanguageType eLang = Application::GetSettings().GetLanguage();
     aLocale = SvxCreateLocale(eLang);
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         if(i < nLevels)
         {
@@ -838,7 +838,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
         }
         else
             aFmts[i] = 0;
-        aFmtsSet[i] = FALSE;
+        aFmtsSet[i] = sal_False;
     }
 }
 /* -----------------27.10.98 10:41-------------------
@@ -853,7 +853,7 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
     bContinuousNumbering = rCopy.bContinuousNumbering;
     eNumberingType       = rCopy.eNumberingType;
     memset( aFmts, 0, sizeof( aFmts ));
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         if(rCopy.aFmts[i])
             aFmts[i] = new SvxNumberFormat(*rCopy.aFmts[i]);
@@ -870,31 +870,31 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
     ++nRefCount;
     LanguageType eLang = Application::GetSettings().GetLanguage();
     aLocale = SvxCreateLocale(eLang);
-    USHORT nVersion;
-    USHORT nTemp;
+    sal_uInt16 nVersion;
+    sal_uInt16 nTemp;
     rStream >> nVersion;
     rStream >> nLevelCount;
     rStream >> nTemp;
     nFeatureFlags = nTemp;
     rStream >> nTemp;
-    bContinuousNumbering = (BOOL)nTemp;
+    bContinuousNumbering = (sal_Bool)nTemp;
     rStream >> nTemp;
     eNumberingType       = (SvxNumRuleType)nTemp;
     memset( aFmts, 0, sizeof( aFmts ));
 
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
-        USHORT nSet;
+        sal_uInt16 nSet;
         rStream >> nSet;
         if(nSet)
             aFmts[i] = new SvxNumberFormat(rStream);
         else
             aFmts[i] = 0;
-        aFmtsSet[i] = aFmts[i] ? TRUE : FALSE;
+        aFmtsSet[i] = aFmts[i] ? sal_True : sal_False;
     }
     if(NUMITEM_VERSION_02 <= nVersion)
     {
-        USHORT nShort;
+        sal_uInt16 nShort;
         rStream >> nShort;
         nFeatureFlags = nShort;
     }
@@ -905,20 +905,20 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
  * --------------------------------------------------*/
 SvStream&   SvxNumRule::Store(SvStream &rStream)
 {
-    rStream<<(USHORT)NUMITEM_VERSION_03;
+    rStream<<(sal_uInt16)NUMITEM_VERSION_03;
     rStream<<nLevelCount;
     //first save of nFeatureFlags for old versions
-    rStream<<(USHORT)nFeatureFlags;
-    rStream<<(USHORT)bContinuousNumbering;
-    rStream<<(USHORT)eNumberingType;
+    rStream<<(sal_uInt16)nFeatureFlags;
+    rStream<<(sal_uInt16)bContinuousNumbering;
+    rStream<<(sal_uInt16)eNumberingType;
 
     FontToSubsFontConverter pConverter = 0;
-    BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         if(aFmts[i])
         {
-            rStream << USHORT(1);
+            rStream << sal_uInt16(1);
             if(bConvertBulletFont && aFmts[i]->GetBulletFont())
             {
                 if(!pConverter)
@@ -929,10 +929,10 @@ SvStream&   SvxNumRule::Store(SvStream &rStream)
             aFmts[i]->Store(rStream, pConverter);
         }
         else
-            rStream << USHORT(0);
+            rStream << sal_uInt16(0);
     }
     //second save of nFeatureFlags for new versions
-    rStream<<(USHORT)nFeatureFlags;
+    rStream<<(sal_uInt16)nFeatureFlags;
     if(pConverter)
         DestroyFontToSubsFontConverter(pConverter);
 
@@ -944,7 +944,7 @@ SvStream&   SvxNumRule::Store(SvStream &rStream)
  * --------------------------------------------------*/
 SvxNumRule::~SvxNumRule()
 {
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
         delete aFmts[i];
     if(!--nRefCount)
     {
@@ -961,7 +961,7 @@ SvxNumRule& SvxNumRule::operator=( const SvxNumRule& rCopy )
     nFeatureFlags        = rCopy.nFeatureFlags;
     bContinuousNumbering = rCopy.bContinuousNumbering;
     eNumberingType       = rCopy.eNumberingType;
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         delete aFmts[i];
         if(rCopy.aFmts[i])
@@ -981,8 +981,8 @@ int   SvxNumRule::operator==( const SvxNumRule& rCopy) const
         nFeatureFlags != rCopy.nFeatureFlags ||
             bContinuousNumbering != rCopy.bContinuousNumbering ||
                 eNumberingType != rCopy.eNumberingType)
-            return FALSE;
-    for(USHORT i = 0; i < nLevelCount; i++)
+            return sal_False;
+    for(sal_uInt16 i = 0; i < nLevelCount; i++)
     {
         if (
             (aFmtsSet[i] != rCopy.aFmtsSet[i]) ||
@@ -991,15 +991,15 @@ int   SvxNumRule::operator==( const SvxNumRule& rCopy) const
             (aFmts[i] && *aFmts[i] !=  *rCopy.aFmts[i])
            )
         {
-            return FALSE;
+            return sal_False;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 /* -----------------27.10.98 10:41-------------------
  *
  * --------------------------------------------------*/
-const SvxNumberFormat*  SvxNumRule::Get(USHORT nLevel)const
+const SvxNumberFormat*  SvxNumRule::Get(sal_uInt16 nLevel)const
 {
     DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" );
     if( nLevel < SVX_MAX_NUM )
@@ -1010,7 +1010,7 @@ const SvxNumberFormat*  SvxNumRule::Get(USHORT nLevel)const
 /* -----------------02.11.98 09:10-------------------
  *
  * --------------------------------------------------*/
-const SvxNumberFormat&  SvxNumRule::GetLevel(USHORT nLevel)const
+const SvxNumberFormat&  SvxNumRule::GetLevel(sal_uInt16 nLevel)const
 {
     if(!pStdNumFmt)
     {
@@ -1028,7 +1028,7 @@ const SvxNumberFormat&  SvxNumRule::GetLevel(USHORT nLevel)const
 /* -----------------29.10.98 09:08-------------------
  *
  * --------------------------------------------------*/
-void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsValid )
+void SvxNumRule::SetLevel( sal_uInt16 i, const SvxNumberFormat& rNumFmt, sal_Bool bIsValid )
 {
     DBG_ASSERT(i < SVX_MAX_NUM, "falsches Level" );
 
@@ -1037,13 +1037,13 @@ void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsVal
         delete aFmts[ i ];
         aFmts[ i ] = new SvxNumberFormat( rNumFmt );
         aFmtsSet[i] = bIsValid;
-//      bInvalidRuleFlag = TRUE;
+//      bInvalidRuleFlag = sal_True;
     }
 }
 /* -----------------30.10.98 12:44-------------------
  *
  * --------------------------------------------------*/
-void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
+void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
 {
     DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" );
 
@@ -1062,7 +1062,7 @@ void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
 /* -----------------28.10.98 15:38-------------------
  *
  * --------------------------------------------------*/
-String  SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) const
+String  SvxNumRule::MakeNumString( const SvxNodeNum& rNum, sal_Bool bInclStrings ) const
 {
     String aStr;
     if( SVX_NO_NUM > rNum.GetLevel() && !( SVX_NO_NUMLEVEL & rNum.GetLevel() ) )
@@ -1070,12 +1070,12 @@ String  SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
         const SvxNumberFormat& rMyNFmt = GetLevel( rNum.GetLevel() );
         if( SVX_NUM_NUMBER_NONE != rMyNFmt.GetNumberingType() )
         {
-            BYTE i = rNum.GetLevel();
+            sal_uInt8 i = rNum.GetLevel();
 
             if( !IsContinuousNumbering() &&
                 1 < rMyNFmt.GetIncludeUpperLevels() )       // nur der eigene Level ?
             {
-                BYTE n = rMyNFmt.GetIncludeUpperLevels();
+                sal_uInt8 n = rMyNFmt.GetIncludeUpperLevels();
                 if( 1 < n )
                 {
                     if( i+1 >= n )
@@ -1122,10 +1122,10 @@ String  SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
 /* -----------------18.08.99 10:18-------------------
     Description: changes linked to embedded bitmaps
  --------------------------------------------------*/
-BOOL SvxNumRule::UnLinkGraphics()
+sal_Bool SvxNumRule::UnLinkGraphics()
 {
-    BOOL bRet = FALSE;
-    for(USHORT i = 0; i < GetLevelCount(); i++)
+    sal_Bool bRet = sal_False;
+    for(sal_uInt16 i = 0; i < GetLevelCount(); i++)
     {
         SvxNumberFormat aFmt(GetLevel(i));
         const SvxBrushItem* pBrush = aFmt.GetBrush();
@@ -1143,7 +1143,7 @@ BOOL SvxNumRule::UnLinkGraphics()
                 aTempItem.SetGraphic(*pGraphic);
                 sal_Int16    eOrient = aFmt.GetVertOrient();
                 aFmt.SetGraphicBrush( &aTempItem, &aFmt.GetGraphicSize(), &eOrient );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
         else if((SVX_NUM_BITMAP|LINK_TOKEN) == aFmt.GetNumberingType())
@@ -1165,13 +1165,13 @@ SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule) :
 /*-----------------23.11.98 10:36-------------------
  MT: Das sind ja sehr sinnige Kommentare...
 --------------------------------------------------*/
-SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, USHORT _nWhich ) :
+SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, sal_uInt16 _nWhich ) :
     SfxPoolItem(_nWhich),
     pNumRule(new SvxNumRule(rRule))
 {
 }
 
-SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, USHORT n) const
+SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, sal_uInt16 n) const
 {
     return SfxPoolItem::Create(s, n );
 }
@@ -1209,14 +1209,14 @@ SfxPoolItem*  SvxNumBulletItem::Clone( SfxItemPool * ) const
 /* -----------------08.12.98 10:43-------------------
  *
  * --------------------------------------------------*/
-USHORT  SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
+sal_uInt16  SvxNumBulletItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
 {
     return NUMITEM_VERSION_03;
 }
 /* -----------------08.12.98 10:43-------------------
  *
  * --------------------------------------------------*/
-SvStream&   SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
+SvStream&   SvxNumBulletItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ )const
 {
     pNumRule->Store(rStream);
     return rStream;
@@ -1226,13 +1226,13 @@ SvStream&   SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )
  *
  * --------------------------------------------------*/
 
-sal_Bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= SvxCreateNumRule( pNumRule );
     return sal_True;
 }
 
-sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     uno::Reference< container::XIndexReplace > xRule;
     if( rVal >>= xRule )
@@ -1261,12 +1261,12 @@ sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
 /* -----------------08.12.98 10:43-------------------
  *
  * --------------------------------------------------*/
-SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevels, SvxNumRuleType eType )
+SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, sal_uInt16 nLevels, SvxNumRuleType eType )
 {
-    const USHORT nSrcLevels = pRule->GetLevelCount();
+    const sal_uInt16 nSrcLevels = pRule->GetLevelCount();
     SvxNumRule* pNewRule = new SvxNumRule( pRule->GetFeatureFlags(), nLevels, pRule->IsContinuousNumbering(), eType );
 
-    for( USHORT nLevel = 0; (nLevel < nLevels) && (nLevel < nSrcLevels); nLevel++ )
+    for( sal_uInt16 nLevel = 0; (nLevel < nLevels) && (nLevel < nSrcLevels); nLevel++ )
         pNewRule->SetLevel( nLevel, pRule->GetLevel( nLevel ) );
 
     return pNewRule;
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 270e188f146f..3d79b980ec1d 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -42,9 +42,9 @@
     Beschreibung:   Ist der Printer gueltig
  --------------------------------------------------------------------*/
 
-inline BOOL IsValidPrinter( const Printer* pPtr )
+inline sal_Bool IsValidPrinter( const Printer* pPtr )
 {
-    return pPtr->GetName().Len() ? TRUE : FALSE;
+    return pPtr->GetName().Len() ? sal_True : sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -135,7 +135,7 @@ Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit )
 
 String SvxPaperInfo::GetName( Paper ePaper )
 {
-    USHORT  nResId = 0;
+    sal_uInt16  nResId = 0;
 
     switch ( ePaper )
     {
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 5780134f7e0a..21149ec1e610 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -148,7 +148,7 @@ int SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
         - ein sal_uInt32 fuer alle Werte (Abstand, Hoehe, rel. Angaben)
 
 --------------------------------------------------*/
-sal_Bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -195,7 +195,7 @@ sal_Bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------18.03.98 16:32-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -246,7 +246,7 @@ sal_Bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 eLineSpace = aLSp.Mode == style::LineSpacingMode::FIX ? SVX_LINE_SPACE_FIX : SVX_LINE_SPACE_MIN;
                 nLineHeight = aLSp.Height;
                 if(bConvert)
-                    nLineHeight = (USHORT)MM100_TO_TWIP_UNSIGNED(nLineHeight);
+                    nLineHeight = (sal_uInt16)MM100_TO_TWIP_UNSIGNED(nLineHeight);
             }
             break;
         }
@@ -390,7 +390,7 @@ int SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
 /*-----------------18.03.98 16:15-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -412,7 +412,7 @@ sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 
 --------------------------------------------------*/
 
-sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
+sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -433,7 +433,7 @@ sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
                     eVal != SVX_ADJUST_LEFT &&
                     eVal != SVX_ADJUST_BLOCK &&
                     eVal != SVX_ADJUST_CENTER)
-                        return FALSE;
+                        return sal_False;
                 if(eVal < (sal_uInt16)SVX_ADJUST_END)
                     nMemberId == MID_PARA_ADJUST ?
                         SetAdjust((SvxAdjust)eVal) :
@@ -555,7 +555,7 @@ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
 
 // class SvxWidowsItem ---------------------------------------------------
 
-SvxWidowsItem::SvxWidowsItem(const BYTE nL, const USHORT nId ) :
+SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
     SfxByteItem( nId, nL )
 {
 }
@@ -627,7 +627,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
 
 // class SvxOrphansItem --------------------------------------------------
 
-SvxOrphansItem::SvxOrphansItem(const BYTE nL, const USHORT nId ) :
+SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
     SfxByteItem( nId, nL )
 {
 }
@@ -709,7 +709,7 @@ SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId
 }
 
 // -----------------------------------------------------------------------
-sal_Bool    SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool    SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -731,7 +731,7 @@ sal_Bool    SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) cons
     return sal_True;
 }
 // -----------------------------------------------------------------------
-sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -747,13 +747,13 @@ sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             bHyphen = Any2Bool(rVal);
         break;
         case MID_HYPHEN_MIN_LEAD:
-            nMinLead = (BYTE)nNewVal;
+            nMinLead = (sal_uInt8)nNewVal;
         break;
         case MID_HYPHEN_MIN_TRAIL:
-            nMinTrail = (BYTE)nNewVal;
+            nMinTrail = (sal_uInt8)nNewVal;
         break;
         case MID_HYPHEN_MAX_HYPHENS:
-            nMaxHyphens = (BYTE)nNewVal;
+            nMaxHyphens = (sal_uInt8)nNewVal;
         break;
     }
     return sal_True;
@@ -1015,7 +1015,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
 
 --------------------------------------------------*/
 
-sal_Bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxTabStopItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1059,7 +1059,7 @@ sal_Bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 
 --------------------------------------------------*/
 
-sal_Bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1380,7 +1380,7 @@ SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-sal_Bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1395,7 +1395,7 @@ sal_Bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMem
     return sal_True;
 }
 
-sal_Bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1456,14 +1456,14 @@ SfxPoolItem* SvxScriptSpaceItem::Clone( SfxItemPool * ) const
     return new SvxScriptSpaceItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxScriptSpaceItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxScriptSpaceItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool bFlag;
     rStrm >> bFlag;
     return new SvxScriptSpaceItem( bFlag, Which() );
 }
 
-USHORT  SvxScriptSpaceItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16  SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1509,14 +1509,14 @@ SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const
     return new SvxHangingPunctuationItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxHangingPunctuationItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxHangingPunctuationItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool nValue;
     rStrm >> nValue;
     return new SvxHangingPunctuationItem( nValue, Which() );
 }
 
-USHORT SvxHangingPunctuationItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1566,7 +1566,7 @@ SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const
 /* -----------------------------29.11.00 11:23--------------------------------
 
  ---------------------------------------------------------------------------*/
-SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool nValue;
     rStrm >> nValue;
@@ -1575,7 +1575,7 @@ SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, USHORT) const
 /* -----------------------------29.11.00 11:23--------------------------------
 
  ---------------------------------------------------------------------------*/
-USHORT SvxForbiddenRuleItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1626,20 +1626,20 @@ SfxPoolItem* SvxParaVertAlignItem::Clone( SfxItemPool* ) const
     return new SvxParaVertAlignItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
     rStrm >> nVal;
     return new SvxParaVertAlignItem( nVal, Which() );
 }
 
-SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, USHORT ) const
+SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, sal_uInt16 ) const
 {
     rStrm << GetValue();
     return rStrm;
 }
 
-USHORT SvxParaVertAlignItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
@@ -1657,7 +1657,7 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
-                USHORT nTmp;
+                sal_uInt16 nTmp;
                 switch( GetValue() )
                 {
                     case AUTOMATIC: nTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break;
@@ -1676,19 +1676,19 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
 }
 
 sal_Bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                           BYTE /*nMemberId*/ ) const
+                                           sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= (sal_Int16)GetValue();
     return sal_True;
 }
 
 sal_Bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                         BYTE /*nMemberId*/ )
+                                         sal_uInt8 /*nMemberId*/ )
 {
     sal_Int16 nVal = sal_Int16();
     if((rVal >>= nVal) && nVal >=0 && nVal <= BOTTOM )
     {
-        SetValue( (USHORT)nVal );
+        SetValue( (sal_uInt16)nVal );
         return sal_True;
     }
     else
@@ -1712,14 +1712,14 @@ SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool * ) const
     return new SvxParaGridItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool bFlag;
     rStrm >> bFlag;
     return new SvxParaGridItem( bFlag, Which() );
 }
 
-USHORT  SvxParaGridItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16  SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 22befecdaba3..30763ec4f925 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -51,14 +51,14 @@ int __EXPORT SdrMeasureField::operator==(const SvxFieldData& rSrc) const
 
 void __EXPORT SdrMeasureField::Load(SvPersistStream& rIn)
 {
-    UINT16 nFieldKind;
+    sal_uInt16 nFieldKind;
     rIn>>nFieldKind;
     eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
 }
 
 void __EXPORT SdrMeasureField::Save(SvPersistStream& rOut)
 {
-    rOut<<(UINT16)eMeasureFieldKind;
+    rOut<<(sal_uInt16)eMeasureFieldKind;
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 769147099ce0..bfbb994924cd 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -93,7 +93,7 @@ SvxFont::SvxFont( const SvxFont &rFont )
  *************************************************************************/
 
 void SvxFont::DrawArrow( OutputDevice &rOut, const Rectangle& rRect,
-    const Size& rSize, const Color& rCol, BOOL bLeft )
+    const Size& rSize, const Color& rCol, sal_Bool bLeft )
 {
     long nLeft = ( rRect.Left() + rRect.Right() - rSize.Width() )/ 2;
     long nRight = nLeft + rSize.Width();
@@ -161,12 +161,12 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
             // Jeder Wortbeginn wird gross geschrieben,
             // der Rest des Wortes wird unbesehen uebernommen.
             // Bug: wenn das Attribut mitten im Wort beginnt.
-            BOOL bBlank = TRUE;
+            sal_Bool bBlank = sal_True;
 
-            for( USHORT i = 0; i < aTxt.Len(); ++i )
+            for( sal_uInt16 i = 0; i < aTxt.Len(); ++i )
             {
                 if( sal_Unicode(' ') == aTxt.GetChar(i) || sal_Unicode('\t') == aTxt.GetChar(i) )
-                    bBlank = TRUE;
+                    bBlank = sal_True;
                 else
                 {
                     if( bBlank )
@@ -175,7 +175,7 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
                         aCharClass.toUpper( aTemp );
                         aTxt.Replace( i, 1, aTemp );
                     }
-                    bBlank = FALSE;
+                    bBlank = sal_False;
                 }
             }
             break;
@@ -216,11 +216,11 @@ public:
         : pOut(_pOut), rTxt(_rTxt), nIdx(_nIdx), nLen(_nLen)
         { }
 
-    virtual void DoSpace( const BOOL bDraw );
+    virtual void DoSpace( const sal_Bool bDraw );
     virtual void SetSpace();
     virtual void Do( const XubString &rTxt,
                      const xub_StrLen nIdx, const xub_StrLen nLen,
-                     const BOOL bUpper ) = 0;
+                     const sal_Bool bUpper ) = 0;
 
     inline OutputDevice *GetOut() { return pOut; }
     inline const XubString &GetTxt() const { return rTxt; }
@@ -228,12 +228,12 @@ public:
     xub_StrLen GetLen() const { return nLen; }
 };
 
-void SvxDoCapitals::DoSpace( const BOOL /*bDraw*/ ) { }
+void SvxDoCapitals::DoSpace( const sal_Bool /*bDraw*/ ) { }
 
 void SvxDoCapitals::SetSpace() { }
 
 void SvxDoCapitals::Do( const XubString &/*_rTxt*/, const xub_StrLen /*_nIdx*/,
-    const xub_StrLen /*_nLen*/, const BOOL /*bUpper*/ ) { }
+    const xub_StrLen /*_nLen*/, const sal_Bool /*bUpper*/ ) { }
 
 /*************************************************************************
  *                  SvxFont::DoOnCapitals() const
@@ -248,9 +248,9 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
     const xub_StrLen nLen = STRING_LEN == nPartLen ? rDo.GetLen() : nPartLen;
 
     const XubString aTxt( CalcCaseMap( rTxt ) );
-    const USHORT nTxtLen = Min( rTxt.Len(), nLen );
-    USHORT nPos = 0;
-    USHORT nOldPos = nPos;
+    const sal_uInt16 nTxtLen = Min( rTxt.Len(), nLen );
+    sal_uInt16 nPos = 0;
+    sal_uInt16 nOldPos = nPos;
 
     // #108210#
     // Test if string length differ between original and CaseMapped
@@ -290,11 +290,11 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
                 const XubString aSnippet(rTxt, nIdx + nOldPos, nPos-nOldPos);
                 XubString aNewText = CalcCaseMap(aSnippet);
 
-                rDo.Do( aNewText, 0, aNewText.Len(), TRUE );
+                rDo.Do( aNewText, 0, aNewText.Len(), sal_True );
             }
             else
             {
-                rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, TRUE );
+                rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, sal_True );
             }
 
             nOldPos = nPos;
@@ -320,11 +320,11 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
                 const XubString aSnippet(rTxt, nIdx + nOldPos, nPos - nOldPos);
                 XubString aNewText = CalcCaseMap(aSnippet);
 
-                rDo.Do( aNewText, 0, aNewText.Len(), FALSE );
+                rDo.Do( aNewText, 0, aNewText.Len(), sal_False );
             }
             else
             {
-                rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, FALSE );
+                rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, sal_False );
             }
 
             nOldPos = nPos;
@@ -335,7 +335,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
 
         if( nOldPos != nPos )
         {
-            rDo.DoSpace( FALSE );
+            rDo.DoSpace( sal_False );
 
             if(bCaseMapLengthDiffers)
             {
@@ -345,18 +345,18 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
                 const XubString aSnippet(rTxt, nIdx + nOldPos, nPos - nOldPos);
                 XubString aNewText = CalcCaseMap(aSnippet);
 
-                rDo.Do( aNewText, 0, aNewText.Len(), FALSE );
+                rDo.Do( aNewText, 0, aNewText.Len(), sal_False );
             }
             else
             {
-                rDo.Do( aTxt, nIdx + nOldPos, nPos - nOldPos, FALSE );
+                rDo.Do( aTxt, nIdx + nOldPos, nPos - nOldPos, sal_False );
             }
 
             nOldPos = nPos;
             rDo.SetSpace();
         }
     }
-    rDo.DoSpace( TRUE );
+    rDo.DoSpace( sal_True );
 }
 
 /**************************************************************************
@@ -456,7 +456,7 @@ Size SvxFont::GetPhysTxtSize( const OutputDevice *pOut, const XubString &rTxt )
 }
 
 Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const XubString &rTxt,
-                         const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray ) const
+                         const sal_uInt16 nIdx, const sal_uInt16 nLen, sal_Int32* pDXArray ) const
 {
     if ( !IsCaseMap() && !IsKern() )
         return Size( pOut->GetTextArray( rTxt, pDXArray, nIdx, nLen ),
@@ -696,18 +696,18 @@ public:
             { }
 
     virtual void Do( const XubString &rTxt, const xub_StrLen nIdx,
-                     const xub_StrLen nLen, const BOOL bUpper );
+                     const xub_StrLen nLen, const sal_Bool bUpper );
 
     inline const Size &GetSize() const { return aTxtSize; };
 };
 
 void SvxDoGetCapitalSize::Do( const XubString &_rTxt, const xub_StrLen _nIdx,
-                              const xub_StrLen _nLen, const BOOL bUpper )
+                              const xub_StrLen _nLen, const sal_Bool bUpper )
 {
     Size aPartSize;
     if ( !bUpper )
     {
-        BYTE nProp = pFont->GetPropr();
+        sal_uInt8 nProp = pFont->GetPropr();
         pFont->SetProprRel( KAPITAELCHENPROP );
         pFont->SetPhysFont( pOut );
         aPartSize.setWidth( pOut->GetTextWidth( _rTxt, _nIdx, _nLen ) );
@@ -769,23 +769,23 @@ public:
           aSpacePos( rPos ),
           nKern( nKrn )
         { }
-    virtual void DoSpace( const BOOL bDraw );
+    virtual void DoSpace( const sal_Bool bDraw );
     virtual void SetSpace();
     virtual void Do( const XubString &rTxt, const xub_StrLen nIdx,
-                     const xub_StrLen nLen, const BOOL bUpper );
+                     const xub_StrLen nLen, const sal_Bool bUpper );
 };
 
-void SvxDoDrawCapital::DoSpace( const BOOL bDraw )
+void SvxDoDrawCapital::DoSpace( const sal_Bool bDraw )
 {
     if ( bDraw || pFont->IsWordLineMode() )
     {
-        USHORT nDiff = (USHORT)(aPos.X() - aSpacePos.X());
+        sal_uInt16 nDiff = (sal_uInt16)(aPos.X() - aSpacePos.X());
         if ( nDiff )
         {
-            BOOL bWordWise = pFont->IsWordLineMode();
-            BOOL bTrans = pFont->IsTransparent();
-            pFont->SetWordLineMode( FALSE );
-            pFont->SetTransparent( TRUE );
+            sal_Bool bWordWise = pFont->IsWordLineMode();
+            sal_Bool bTrans = pFont->IsTransparent();
+            pFont->SetWordLineMode( sal_False );
+            pFont->SetTransparent( sal_True );
             pFont->SetPhysFont( pOut );
             pOut->DrawStretchText( aSpacePos, nDiff, XubString( sDoubleSpace,
                             RTL_TEXTENCODING_MS_1252 ), 0, 2 );
@@ -803,9 +803,9 @@ void SvxDoDrawCapital::SetSpace()
 }
 
 void SvxDoDrawCapital::Do( const XubString &_rTxt, const xub_StrLen _nIdx,
-                           const xub_StrLen _nLen, const BOOL bUpper)
+                           const xub_StrLen _nLen, const sal_Bool bUpper)
 {
-    BYTE nProp = 0;
+    sal_uInt8 nProp = 0;
     Size aPartSize;
 
     // Einstellen der gewuenschten Fonts
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index d0ecd225755d..f1dc1f6c6f85 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -124,7 +124,7 @@ using namespace ::com::sun::star::text;
 #define TWIP_TO_MM100_UNSIGNED(TWIP)     ((((TWIP)*127L+36L)/72L))
 #define MM100_TO_TWIP_UNSIGNED(MM100)    ((((MM100)*72L+63L)/127L))
 
-BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
+sal_Bool SvxFontItem::bEnableStoreUnicodeNames = sal_False;
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -169,7 +169,7 @@ TYPEINIT1(SvxScriptSetItem, SfxSetItem );
 // class SvxFontListItem -------------------------------------------------
 
 SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
-                                  const USHORT nId ) :
+                                  const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
     pFontList( pFontLst )
 {
@@ -178,7 +178,7 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
         sal_Int32 nCount = pFontList->GetFontNameCount();
         aFontNameSeq.realloc( nCount );
 
-        for ( USHORT i = 0; i < nCount; i++ )
+        for ( sal_uInt16 i = 0; i < nCount; i++ )
             aFontNameSeq[i] = pFontList->GetFontName(i).GetName();
     }
 }
@@ -209,7 +209,7 @@ int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
     return( pFontList == ((SvxFontListItem&)rAttr).pFontList );
 }
 
-sal_Bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= aFontNameSeq;
     return sal_True;
@@ -231,7 +231,7 @@ SfxItemPresentation SvxFontListItem::GetPresentation
 
 // class SvxFontItem -----------------------------------------------------
 
-SvxFontItem::SvxFontItem( const USHORT nId ) :
+SvxFontItem::SvxFontItem( const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     eFamily = FAMILY_SWISS;
@@ -243,7 +243,7 @@ SvxFontItem::SvxFontItem( const USHORT nId ) :
 
 SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
                   const XubString& aStName, const FontPitch eFontPitch,
-                  const rtl_TextEncoding eFontTextEncoding, const USHORT nId ) :
+                  const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId ) :
 
     SfxPoolItem( nId ),
 
@@ -257,7 +257,7 @@ SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -287,7 +287,7 @@ sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 // -----------------------------------------------------------------------
-sal_Bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+sal_Bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -382,17 +382,17 @@ SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    BOOL bToBats =
+    sal_Bool bToBats =
         GetFamilyName().EqualsAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) ||
         GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 );
 
-    // #90477# rStrm << (BYTE) GetFamily()
-    //    << (BYTE) GetPitch()
-    //    << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() ) );
-    rStrm << (BYTE) GetFamily() << (BYTE) GetPitch()
-          << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()));
+    // #90477# rStrm << (sal_uInt8) GetFamily()
+    //    << (sal_uInt8) GetPitch()
+    //    << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetStoreCharSet( GetCharSet(), (sal_uInt16)rStrm.GetVersion() ) );
+    rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch()
+          << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()));
 
     String aStoreFamilyName( GetFamilyName() );
     if( bToBats )
@@ -414,9 +414,9 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE _eFamily, eFontPitch, eFontTextEncoding;
+    sal_uInt8 _eFamily, eFontPitch, eFontTextEncoding;
     String aName, aStyle;
     rStrm >> _eFamily;
     rStrm >> eFontPitch;
@@ -429,7 +429,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const
     rStrm.ReadByteString(aStyle);
 
     // Task 91008/90471: set the "correct" textencoding
-    eFontTextEncoding = (BYTE)GetSOLoadTextEncoding( eFontTextEncoding, (USHORT)rStrm.GetVersion() );
+    eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding, (sal_uInt16)rStrm.GetVersion() );
 
     // irgendwann wandelte sich der StarBats vom ANSI- zum SYMBOL-Font
     if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName.EqualsAscii("StarBats") )
@@ -481,15 +481,15 @@ SfxItemPresentation SvxFontItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-void SvxFontItem::EnableStoreUnicodeNames( BOOL bEnable )
+void SvxFontItem::EnableStoreUnicodeNames( sal_Bool bEnable )
 {
     bEnableStoreUnicodeNames = bEnable;
 }
 
 // class SvxPostureItem --------------------------------------------------
 
-SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)ePosture )
+SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)ePosture )
 {
 }
 
@@ -502,24 +502,24 @@ SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-USHORT SvxPostureItem::GetValueCount() const
+sal_uInt16 SvxPostureItem::GetValueCount() const
 {
     return ITALIC_NORMAL + 1;   // auch ITALIC_NONE geh"ort dazu
 }
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxPostureItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetValue();
+    rStrm << (sal_uInt8)GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nPosture;
+    sal_uInt8 nPosture;
     rStrm >> nPosture;
     return new SvxPostureItem( (const FontItalic)nPosture, Which() );
 }
@@ -550,13 +550,13 @@ SfxItemPresentation SvxPostureItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)ITALIC_NORMAL, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" );
 
     XubString sTxt;
     FontItalic eItalic = (FontItalic)nPos;
-    USHORT nId = 0;
+    sal_uInt16 nId = 0;
 
     switch ( eItalic )
     {
@@ -575,7 +575,7 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
 /*-----------------13.03.98 14:28-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -593,7 +593,7 @@ sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------13.03.98 14:28-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -613,7 +613,7 @@ sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
                 eSlant = (awt::FontSlant)nValue;
             }
-            SetValue((USHORT)eSlant);
+            SetValue((sal_uInt16)eSlant);
         }
     }
     return sal_True;
@@ -636,13 +636,13 @@ sal_Bool SvxPostureItem::GetBoolValue() const
 
 void SvxPostureItem::SetBoolValue( sal_Bool bVal )
 {
-    SetValue( (USHORT)(bVal ? ITALIC_NORMAL : ITALIC_NONE) );
+    SetValue( (sal_uInt16)(bVal ? ITALIC_NORMAL : ITALIC_NONE) );
 }
 
 // class SvxWeightItem ---------------------------------------------------
 
-SvxWeightItem::SvxWeightItem( const FontWeight eWght, const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)eWght )
+SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)eWght )
 {
 }
 
@@ -666,12 +666,12 @@ sal_Bool SvxWeightItem::GetBoolValue() const
 
 void SvxWeightItem::SetBoolValue( sal_Bool bVal )
 {
-    SetValue( (USHORT)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) );
+    SetValue( (sal_uInt16)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) );
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxWeightItem::GetValueCount() const
+sal_uInt16 SvxWeightItem::GetValueCount() const
 {
     return WEIGHT_BLACK;    // WEIGHT_DONTKNOW geh"ort nicht dazu
 }
@@ -685,17 +685,17 @@ SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxWeightItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetValue();
+    rStrm << (sal_uInt8)GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nWeight;
+    sal_uInt8 nWeight;
     rStrm >> nWeight;
     return new SvxWeightItem( (FontWeight)nWeight, Which() );
 }
@@ -726,16 +726,16 @@ SfxItemPresentation SvxWeightItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxWeightItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)WEIGHT_BLACK, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 14:18-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -755,7 +755,7 @@ sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------13.03.98 14:18-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -774,7 +774,7 @@ sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                     return sal_False;
                 fValue = (float)nValue;
             }
-            SetValue( (USHORT)VCLUnoHelper::ConvertFontWeight((float)fValue) );
+            SetValue( (sal_uInt16)VCLUnoHelper::ConvertFontWeight((float)fValue) );
         }
         break;
     }
@@ -783,9 +783,9 @@ sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 // class SvxFontHeightItem -----------------------------------------------
 
-SvxFontHeightItem::SvxFontHeightItem( const ULONG nSz,
-                                      const USHORT nPrp,
-                                      const USHORT nId ) :
+SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
+                                      const sal_uInt16 nPrp,
+                                      const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     SetHeight( nSz,nPrp );  // mit den Prozenten rechnen
@@ -800,17 +800,17 @@ SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
-    rStrm << (USHORT)GetHeight();
+    rStrm << (sal_uInt16)GetHeight();
 
     if( FONTHEIGHT_UNIT_VERSION <= nItemVersion )
-        rStrm << GetProp() << (USHORT)GetPropUnit();
+        rStrm << GetProp() << (sal_uInt16)GetPropUnit();
     else
     {
         // JP 30.06.98: beim Export in alte Versionen geht die relative
         // Angabe verloren, wenn es keine Prozentuale ist
-        USHORT _nProp = GetProp();
+        sal_uInt16 _nProp = GetProp();
         if( SFX_MAPUNIT_RELATIVE != GetPropUnit() )
             _nProp = 100;
         rStrm << _nProp;
@@ -821,9 +821,9 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) cons
 // -----------------------------------------------------------------------
 
 SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
-                                                 USHORT nVersion ) const
+                                                 sal_uInt16 nVersion ) const
 {
-    USHORT nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
+    sal_uInt16 nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
 
     rStrm >> nsize;
 
@@ -831,9 +831,9 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
         rStrm >> nprop;
     else
     {
-        BYTE nP;
+        sal_uInt8 nP;
         rStrm  >> nP;
-        nprop = (USHORT)nP;
+        nprop = (sal_uInt16)nP;
     }
 
     if( FONTHEIGHT_UNIT_VERSION <= nVersion )
@@ -857,7 +857,7 @@ int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
 /*-----------------13.03.98 14:53-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     //  In StarOne sind im uno::Any immer 1/100mm. Ueber die MemberId wird
     //  gesteuert, ob der Wert im Item 1/100mm oder Twips sind.
@@ -995,7 +995,7 @@ sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUn
 /*-----------------13.03.98 14:53-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1122,7 +1122,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-USHORT SvxFontHeightItem::GetVersion(USHORT nFileVersion) const
+sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const
 {
     return (nFileVersion <= SOFFICE_FILEFORMAT_40)
                ? FONTHEIGHT_16_VERSION
@@ -1144,7 +1144,7 @@ int SvxFontHeightItem::HasMetrics() const
     return 1;
 }
 
-void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
+void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp,
                                     SfxMapUnit eUnit )
 {
     DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
@@ -1164,7 +1164,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
     ePropUnit = eUnit;
 }
 
-void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, USHORT nNewProp,
+void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp,
                                  SfxMapUnit eMetric, SfxMapUnit eCoreMetric )
 {
     DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
@@ -1188,7 +1188,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, USHORT nNewProp,
 
 // class SvxFontWidthItem -----------------------------------------------
 
-SvxFontWidthItem::SvxFontWidthItem( const USHORT nSz, const USHORT nPrp, const USHORT nId ) :
+SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 nPrp, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     nWidth = nSz;
@@ -1204,7 +1204,7 @@ SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxFontWidthItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << GetWidth() << GetProp();
     return rStrm;
@@ -1214,7 +1214,7 @@ SvStream& SvxFontWidthItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) c
 
 int SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv )
 {
-    nWidth = (USHORT)Scale( nWidth, nMult, nDiv );
+    nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv );
     return 1;
 }
 
@@ -1228,10 +1228,10 @@ int SvxFontWidthItem::HasMetrics() const
 // -----------------------------------------------------------------------
 
 SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm,
-                                                 USHORT /*nVersion*/ ) const
+                                                 sal_uInt16 /*nVersion*/ ) const
 {
-    USHORT nS;
-    USHORT nP;
+    sal_uInt16 nS;
+    sal_uInt16 nP;
 
     rStrm >> nS;
     rStrm >> nP;
@@ -1252,7 +1252,7 @@ int SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
 /*-----------------13.03.98 16:03-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxFontWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1270,7 +1270,7 @@ sal_Bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------13.03.98 16:03-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxFontWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1327,8 +1327,8 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
 
 // class SvxTextLineItem ------------------------------------------------
 
-SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const USHORT nId )
-    : SfxEnumItem( nId, (USHORT)eSt ), mColor( COL_TRANSPARENT )
+SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId )
+    : SfxEnumItem( nId, (sal_uInt16)eSt ), mColor( COL_TRANSPARENT )
 {
 }
 
@@ -1350,7 +1350,7 @@ sal_Bool SvxTextLineItem::GetBoolValue() const
 
 void SvxTextLineItem::SetBoolValue( sal_Bool bVal )
 {
-    SetValue( (USHORT)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
+    SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
 }
 
 // -----------------------------------------------------------------------
@@ -1364,24 +1364,24 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-USHORT SvxTextLineItem::GetValueCount() const
+sal_uInt16 SvxTextLineItem::GetValueCount() const
 {
     return UNDERLINE_DOTTED + 1;    // auch UNDERLINE_NONE geh"ort dazu
 }
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxTextLineItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetValue();
+    rStrm << (sal_uInt8)GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxTextLineItem(  (FontUnderline)nState, Which() );
 }
@@ -1416,7 +1416,7 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxTextLineItem::GetValueTextByPos( USHORT /*nPos*/ ) const
+XubString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
 {
     DBG_ERROR("SvxTextLineItem::GetValueTextByPos: Pure virtual method");
     return XubString();
@@ -1425,7 +1425,7 @@ XubString SvxTextLineItem::GetValueTextByPos( USHORT /*nPos*/ ) const
 /*-----------------13.03.98 16:25-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1450,7 +1450,7 @@ sal_Bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------13.03.98 16:28-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxTextLineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxTextLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1500,7 +1500,7 @@ int SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const
 
 // class SvxUnderlineItem ------------------------------------------------
 
-SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const USHORT nId )
+SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nId )
     : SvxTextLineItem( eSt, nId )
 {
 }
@@ -1516,24 +1516,24 @@ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxUnderlineItem(  (FontUnderline)nState, Which() );
 }
 
 // -----------------------------------------------------------------------
 
-XubString SvxUnderlineItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
 }
 
 // class SvxOverlineItem ------------------------------------------------
 
-SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const USHORT nId )
+SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId )
     : SvxTextLineItem( eSt, nId )
 {
 }
@@ -1549,25 +1549,25 @@ SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxOverlineItem(  (FontUnderline)nState, Which() );
 }
 
 // -----------------------------------------------------------------------
 
-XubString SvxOverlineItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
 }
 
 // class SvxCrossedOutItem -----------------------------------------------
 
-SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const USHORT nId )
-    : SfxEnumItem( nId, (USHORT)eSt )
+SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 nId )
+    : SfxEnumItem( nId, (sal_uInt16)eSt )
 {
 }
 
@@ -1589,12 +1589,12 @@ sal_Bool SvxCrossedOutItem::GetBoolValue() const
 
 void SvxCrossedOutItem::SetBoolValue( sal_Bool bVal )
 {
-    SetValue( (USHORT)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) );
+    SetValue( (sal_uInt16)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) );
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxCrossedOutItem::GetValueCount() const
+sal_uInt16 SvxCrossedOutItem::GetValueCount() const
 {
     return STRIKEOUT_DOUBLE + 1;    // auch STRIKEOUT_NONE geh"ort dazu
 }
@@ -1608,17 +1608,17 @@ SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetValue();
+    rStrm << (sal_uInt8)GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE eCross;
+    sal_uInt8 eCross;
     rStrm >> eCross;
     return new SvxCrossedOutItem(  (FontStrikeout)eCross, Which() );
 }
@@ -1649,16 +1649,16 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxCrossedOutItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)STRIKEOUT_X, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 16:28-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1676,7 +1676,7 @@ sal_Bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------13.03.98 16:29-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1698,7 +1698,7 @@ sal_Bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 }
 // class SvxShadowedItem -------------------------------------------------
 
-SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const USHORT nId ) :
+SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bShadowed )
 {
 }
@@ -1712,17 +1712,17 @@ SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxShadowedItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE) GetValue();
+    rStrm << (sal_uInt8) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxShadowedItem( nState, Which() );
 }
@@ -1745,7 +1745,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_SHADOWED_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_SHADOWED_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_SHADOWED_TRUE;
@@ -1759,7 +1759,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation
 
 // class SvxAutoKernItem -------------------------------------------------
 
-SvxAutoKernItem::SvxAutoKernItem( const sal_Bool bAutoKern, const USHORT nId ) :
+SvxAutoKernItem::SvxAutoKernItem( const sal_Bool bAutoKern, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bAutoKern )
 {
 }
@@ -1773,17 +1773,17 @@ SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxAutoKernItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE) GetValue();
+    rStrm << (sal_uInt8) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxAutoKernItem( nState, Which() );
 }
@@ -1806,7 +1806,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_AUTOKERN_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_AUTOKERN_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_AUTOKERN_TRUE;
@@ -1821,7 +1821,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
 // class SvxWordLineModeItem ---------------------------------------------
 
 SvxWordLineModeItem::SvxWordLineModeItem( const sal_Bool bWordLineMode,
-                                          const USHORT nId ) :
+                                          const sal_uInt16 nId ) :
     SfxBoolItem( nId, bWordLineMode )
 {
 }
@@ -1835,7 +1835,7 @@ SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_Bool) GetValue();
     return rStrm;
@@ -1843,7 +1843,7 @@ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
     rStrm >> bValue;
@@ -1868,7 +1868,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_WORDLINE_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_WORDLINE_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_WORDLINE_TRUE;
@@ -1882,7 +1882,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation
 
 // class SvxContourItem --------------------------------------------------
 
-SvxContourItem::SvxContourItem( const sal_Bool bContoured, const USHORT nId ) :
+SvxContourItem::SvxContourItem( const sal_Bool bContoured, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bContoured )
 {
 }
@@ -1896,7 +1896,7 @@ SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_Bool) GetValue();
     return rStrm;
@@ -1904,7 +1904,7 @@ SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) con
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
     rStrm >> bValue;
@@ -1929,7 +1929,7 @@ SfxItemPresentation SvxContourItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_CONTOUR_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_CONTOUR_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_CONTOUR_TRUE;
@@ -1943,7 +1943,7 @@ SfxItemPresentation SvxContourItem::GetPresentation
 
 // class SvxPropSizeItem -------------------------------------------------
 
-SvxPropSizeItem::SvxPropSizeItem( const USHORT nPercent, const USHORT nId ) :
+SvxPropSizeItem::SvxPropSizeItem( const sal_uInt16 nPercent, const sal_uInt16 nId ) :
     SfxUInt16Item( nId, nPercent )
 {
 }
@@ -1957,17 +1957,17 @@ SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxPropSizeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (USHORT) GetValue();
+    rStrm << (sal_uInt16) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    USHORT nSize;
+    sal_uInt16 nSize;
     rStrm >> nSize;
     return new SvxPropSizeItem( nSize, Which() );
 }
@@ -1988,7 +1988,7 @@ SfxItemPresentation SvxPropSizeItem::GetPresentation
 
 // class SvxColorItem ----------------------------------------------------
 
-SvxColorItem::SvxColorItem( const USHORT nId ) :
+SvxColorItem::SvxColorItem( const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
     mColor( COL_BLACK )
 {
@@ -1996,7 +1996,7 @@ SvxColorItem::SvxColorItem( const USHORT nId ) :
 
 // -----------------------------------------------------------------------
 
-SvxColorItem::SvxColorItem( const Color& rCol, const USHORT nId ) :
+SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
     mColor( rCol )
 {
@@ -2004,7 +2004,7 @@ SvxColorItem::SvxColorItem( const Color& rCol, const USHORT nId ) :
 
 // -----------------------------------------------------------------------
 
-SvxColorItem::SvxColorItem( SvStream &rStrm, const USHORT nId ) :
+SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     Color aColor;
@@ -2027,7 +2027,7 @@ SvxColorItem::~SvxColorItem()
 }
 
 // -----------------------------------------------------------------------
-USHORT SvxColorItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -2047,7 +2047,7 @@ int SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= (sal_Int32)(mColor.GetColor());
     return sal_True;
@@ -2055,7 +2055,7 @@ sal_Bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     sal_Int32 nColor = 0;
     if(!(rVal >>= nColor))
@@ -2074,7 +2074,7 @@ SfxPoolItem* SvxColorItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
     if( VERSION_USEAUTOCOLOR == nItemVersion &&
         COL_AUTO == mColor.GetColor() )
@@ -2086,7 +2086,7 @@ SvStream& SvxColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, USHORT /*nVer*/ ) const
+SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, sal_uInt16 /*nVer*/ ) const
 {
     return new SvxColorItem( rStrm, Which() );
 }
@@ -2126,7 +2126,7 @@ void SvxColorItem::SetValue( const Color& rNewCol )
 
 // class SvxCharSetColorItem ---------------------------------------------
 
-SvxCharSetColorItem::SvxCharSetColorItem( const USHORT nId ) :
+SvxCharSetColorItem::SvxCharSetColorItem( const sal_uInt16 nId ) :
     SvxColorItem( nId ),
 
     eFrom( RTL_TEXTENCODING_DONTKNOW )
@@ -2137,7 +2137,7 @@ SvxCharSetColorItem::SvxCharSetColorItem( const USHORT nId ) :
 
 SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol,
                                           const rtl_TextEncoding _eFrom,
-                                          const USHORT nId ) :
+                                          const sal_uInt16 nId ) :
     SvxColorItem( rCol, nId ),
 
     eFrom( _eFrom )
@@ -2154,20 +2154,20 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    // #90477# rStrm << (BYTE) GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() )
+    // #90477# rStrm << (sal_uInt8) GetStoreCharSet( GetCharSet(), (sal_uInt16)rStrm.GetVersion() )
     //    << GetValue();
-    rStrm << (BYTE)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())
+    rStrm << (sal_uInt8)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())
           << GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE cSet;
+    sal_uInt8 cSet;
     Color aColor;
     rStrm >> cSet >> aColor;
     return new SvxCharSetColorItem( aColor,  (rtl_TextEncoding)cSet, Which() );
@@ -2189,7 +2189,7 @@ SfxItemPresentation SvxCharSetColorItem::GetPresentation
 
 // class SvxKerningItem --------------------------------------------------
 
-SvxKerningItem::SvxKerningItem( const short nKern, const USHORT nId ) :
+SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) :
     SfxInt16Item( nId, nKern )
 {
 }
@@ -2203,7 +2203,7 @@ SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxKerningItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (short) GetValue();
     return rStrm;
@@ -2226,7 +2226,7 @@ int SvxKerningItem::HasMetrics() const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     short nValue;
     rStrm >> nValue;
@@ -2256,7 +2256,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             rText = EE_RESSTR(RID_SVXITEMS_KERNING_COMPLETE);
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
             if ( GetValue() > 0 )
                 nId = RID_SVXITEMS_KERNING_EXPANDED;
@@ -2277,7 +2277,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
 /* -----------------------------19.02.01 12:21--------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxKerningItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Int16 nVal = GetValue();
     if(nMemberId & CONVERT_TWIPS)
@@ -2286,7 +2286,7 @@ sal_Bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 // -----------------------------------------------------------------------
-sal_Bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+sal_Bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
 {
     sal_Int16 nVal = sal_Int16();
     if(!(rVal >>= nVal))
@@ -2299,14 +2299,14 @@ sal_Bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
 
 // class SvxCaseMapItem --------------------------------------------------
 
-SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)eMap )
+SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)eMap )
 {
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxCaseMapItem::GetValueCount() const
+sal_uInt16 SvxCaseMapItem::GetValueCount() const
 {
     return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1
 }
@@ -2320,17 +2320,17 @@ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxCaseMapItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE) GetValue();
+    rStrm << (sal_uInt8) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE cMap;
+    sal_uInt8 cMap;
     rStrm >> cMap;
     return new SvxCaseMapItem( (const SvxCaseMap)cMap, Which() );
 }
@@ -2361,16 +2361,16 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxCaseMapItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (USHORT)SVX_CASEMAP_END, "enum overflow!" );
+    DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 16:29-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     sal_Int16 nRet = style::CaseMap::NONE;
     switch( GetValue() )
@@ -2387,7 +2387,7 @@ sal_Bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
 /*-----------------13.03.98 16:29-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     sal_uInt16 nVal = sal_uInt16();
     if(!(rVal >>= nVal))
@@ -2407,7 +2407,7 @@ sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
 
 // class SvxEscapementItem -----------------------------------------------
 
-SvxEscapementItem::SvxEscapementItem( const USHORT nId ) :
+SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) :
     SfxEnumItemInterface( nId ),
 
     nEsc    ( 0 ),
@@ -2418,7 +2418,7 @@ SvxEscapementItem::SvxEscapementItem( const USHORT nId ) :
 // -----------------------------------------------------------------------
 
 SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
-                                      const USHORT nId ) :
+                                      const sal_uInt16 nId ) :
     SfxEnumItemInterface( nId ),
     nProp( 100 )
 {
@@ -2430,8 +2430,8 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
 // -----------------------------------------------------------------------
 
 SvxEscapementItem::SvxEscapementItem( const short _nEsc,
-                                      const BYTE _nProp,
-                                      const USHORT nId ) :
+                                      const sal_uInt8 _nProp,
+                                      const sal_uInt16 nId ) :
     SfxEnumItemInterface( nId ),
     nEsc    ( _nEsc ),
     nProp   ( _nProp )
@@ -2457,7 +2457,7 @@ SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     short _nEsc = GetEsc();
     if( SOFFICE_FILEFORMAT_31 == rStrm.GetVersion() )
@@ -2467,16 +2467,16 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ )
         else if( DFLT_ESC_AUTO_SUB == _nEsc )
             _nEsc = DFLT_ESC_SUB;
     }
-    rStrm << (BYTE) GetProp()
+    rStrm << (sal_uInt8) GetProp()
           << (short) _nEsc;
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE _nProp;
+    sal_uInt8 _nProp;
     short _nEsc;
     rStrm >> _nProp >> _nEsc;
     return new SvxEscapementItem( _nEsc, _nProp, Which() );
@@ -2484,7 +2484,7 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const
 
 // -----------------------------------------------------------------------
 
-USHORT SvxEscapementItem::GetValueCount() const
+sal_uInt16 SvxEscapementItem::GetValueCount() const
 {
     return SVX_ESCAPEMENT_END;  // SVX_ESCAPEMENT_SUBSCRIPT + 1
 }
@@ -2525,15 +2525,15 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxEscapementItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (USHORT)SVX_ESCAPEMENT_END, "enum overflow!" );
+    DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" );
     return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxEscapementItem::GetEnumValue() const
+sal_uInt16 SvxEscapementItem::GetEnumValue() const
 {
     if ( nEsc < 0 )
         return SVX_ESCAPEMENT_SUBSCRIPT;
@@ -2544,7 +2544,7 @@ USHORT SvxEscapementItem::GetEnumValue() const
 
 // -----------------------------------------------------------------------
 
-void SvxEscapementItem::SetEnumValue( USHORT nVal )
+void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal )
 {
     SetEscapement( (const SvxEscapement)nVal );
 }
@@ -2552,7 +2552,7 @@ void SvxEscapementItem::SetEnumValue( USHORT nVal )
 /*-----------------13.03.98 17:05-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxEscapementItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2573,7 +2573,7 @@ sal_Bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------13.03.98 17:05-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxEscapementItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2599,7 +2599,7 @@ sal_Bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
         break;
         case MID_AUTO_ESC:
         {
-            BOOL bVal = Any2Bool(rVal);
+            sal_Bool bVal = Any2Bool(rVal);
             if(bVal)
             {
                 if(nEsc < 0)
@@ -2620,14 +2620,14 @@ sal_Bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 // class SvxLanguageItem -------------------------------------------------
 
-SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const USHORT nId )
+SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId )
     : SfxEnumItem( nId , eLang )
 {
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxLanguageItem::GetValueCount() const
+sal_uInt16 SvxLanguageItem::GetValueCount() const
 {
     // #i50205# got rid of class International
     DBG_ERRORFILE("SvxLanguageItem::GetValueCount: supposed to return a count of what?");
@@ -2646,17 +2646,17 @@ SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxLanguageItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (USHORT) GetValue();
+    rStrm << (sal_uInt16) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    USHORT nValue;
+    sal_uInt16 nValue;
     rStrm >> nValue;
     return new SvxLanguageItem( (LanguageType)nValue, Which() );
 }
@@ -2693,7 +2693,7 @@ SfxItemPresentation SvxLanguageItem::GetPresentation
 /*-----------------14.03.98 14:13-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLanguageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2712,7 +2712,7 @@ sal_Bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*-----------------14.03.98 14:13-------------------
 
 --------------------------------------------------*/
-sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2744,7 +2744,7 @@ sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 }
 
 // class SvxNoLinebreakItem ----------------------------------------------
-SvxNoLinebreakItem::SvxNoLinebreakItem( const sal_Bool bBreak, const USHORT nId ) :
+SvxNoLinebreakItem::SvxNoLinebreakItem( const sal_Bool bBreak, const sal_uInt16 nId ) :
       SfxBoolItem( nId, bBreak )
 {
 }
@@ -2758,7 +2758,7 @@ SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_Bool)GetValue();
     return rStrm;
@@ -2766,7 +2766,7 @@ SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ )
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
     rStrm >> bValue;
@@ -2789,7 +2789,7 @@ SfxItemPresentation SvxNoLinebreakItem::GetPresentation
 
 // class SvxNoHyphenItem -------------------------------------------------
 
-SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const USHORT nId ) :
+SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const sal_uInt16 nId ) :
     SfxBoolItem( nId , bHyphen )
 {
 }
@@ -2803,7 +2803,7 @@ SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_Bool) GetValue();
     return rStrm;
@@ -2811,7 +2811,7 @@ SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) co
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Bool bValue;
     rStrm >> bValue;
@@ -2841,21 +2841,21 @@ SfxItemPresentation SvxNoHyphenItem::GetPresentation
 // class SvxLineColorItem (== SvxColorItem)
 // -----------------------------------------------------------------------
 
-SvxLineColorItem::SvxLineColorItem( const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) :
     SvxColorItem( nId )
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxLineColorItem::SvxLineColorItem( const Color& rCol, const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( const Color& rCol, const sal_uInt16 nId ) :
     SvxColorItem( rCol, nId )
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxLineColorItem::SvxLineColorItem( SvStream &rStrm, const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
     SvxColorItem( rStrm, nId )
 {
 }
@@ -2891,7 +2891,7 @@ SfxItemPresentation SvxLineColorItem::GetPresentation
 // class SvxBlinkItem -------------------------------------------------
 
 
-SvxBlinkItem::SvxBlinkItem( const sal_Bool bBlink, const USHORT nId ) :
+SvxBlinkItem::SvxBlinkItem( const sal_Bool bBlink, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bBlink )
 {
 }
@@ -2905,17 +2905,17 @@ SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxBlinkItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE) GetValue();
+    rStrm << (sal_uInt8) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxBlinkItem( nState, Which() );
 }
@@ -2938,7 +2938,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_BLINK_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_BLINK_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_BLINK_TRUE;
@@ -2953,7 +2953,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation
 // class SvxEmphaisMarkItem ---------------------------------------------------
 
 SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue,
-                                        const USHORT nId )
+                                        const sal_uInt16 nId )
     : SfxUInt16Item( nId, nValue )
 {
 }
@@ -2968,7 +2968,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const
 // -----------------------------------------------------------------------
 
 SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
-                                     USHORT /*nItemVersion*/ ) const
+                                     sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_uInt16)GetValue();
     return rStrm;
@@ -2976,7 +2976,7 @@ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nValue;
     rStrm >> nValue;
@@ -3005,7 +3005,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
                 sal_uInt16 nVal = GetValue();
                 rText = EE_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE +
                                         ( EMPHASISMARK_STYLE & nVal ));
-                USHORT nId = ( EMPHASISMARK_POS_ABOVE & nVal )
+                sal_uInt16 nId = ( EMPHASISMARK_POS_ABOVE & nVal )
                                 ? RID_SVXITEMS_EMPHASIS_ABOVE_POS
                                 : ( EMPHASISMARK_POS_BELOW & nVal )
                                     ? RID_SVXITEMS_EMPHASIS_BELOW_POS
@@ -3021,7 +3021,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3048,7 +3048,7 @@ sal_Bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 
-sal_Bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3079,7 +3079,7 @@ sal_Bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
     return bRet;
 }
 
-USHORT SvxEmphasisMarkItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxEmphasisMarkItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -3127,7 +3127,7 @@ SfxPoolItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const
 }
 
 sal_Bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const
+                                sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3161,7 +3161,7 @@ sal_Bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
 }
 
 sal_Bool SvxTwoLinesItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId )
+                                    sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3221,7 +3221,7 @@ SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres,
 }
 
 
-SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, USHORT /*nVer*/) const
+SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/) const
 {
     sal_Bool _bOn;
     sal_Unicode cStart, cEnd;
@@ -3229,13 +3229,13 @@ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, USHORT /*nVer*/) const
     return new SvxTwoLinesItem( _bOn, cStart, cEnd, Which() );
 }
 
-SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const
+SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
 {
     rStrm << GetValue() << GetStartBracket() << GetEndBracket();
     return rStrm;
 }
 
-USHORT SvxTwoLinesItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxTwoLinesItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -3262,7 +3262,7 @@ SfxPoolItem* SvxCharRotateItem::Clone( SfxItemPool* ) const
     return new SvxCharRotateItem( GetValue(), IsFitToLine(), Which() );
 }
 
-SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
     sal_Bool b;
@@ -3270,14 +3270,14 @@ SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, USHORT ) const
     return new SvxCharRotateItem( nVal, b, Which() );
 }
 
-SvStream& SvxCharRotateItem::Store( SvStream & rStrm, USHORT ) const
+SvStream& SvxCharRotateItem::Store( SvStream & rStrm, sal_uInt16 ) const
 {
     sal_Bool bFlag = IsFitToLine();
     rStrm << GetValue() << bFlag;
     return rStrm;
 }
 
-USHORT SvxCharRotateItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
@@ -3313,7 +3313,7 @@ SfxItemPresentation SvxCharRotateItem::GetPresentation(
 }
 
 sal_Bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const
+                                sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3334,7 +3334,7 @@ sal_Bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
 }
 
 sal_Bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId )
+                                    sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3345,7 +3345,7 @@ sal_Bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
         {
             sal_Int16 nVal = 0;
             if((rVal >>= nVal) && (0 == nVal || 900 == nVal || 2700 == nVal))
-                SetValue( (USHORT)nVal );
+                SetValue( (sal_uInt16)nVal );
             else
                 bRet = sal_False;
             break;
@@ -3383,7 +3383,7 @@ SfxPoolItem* SvxCharScaleWidthItem::Clone( SfxItemPool* ) const
     return new SvxCharScaleWidthItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
     rStrm >> nVal;
@@ -3392,10 +3392,10 @@ SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
     if ( Which() == EE_CHAR_FONTWIDTH )
     {
         // #87271#: Was a SvxFontWidthItem in 5.2
-        // USHORT nFixWidth, USHORT nPropWidth.
+        // sal_uInt16 nFixWidth, sal_uInt16 nPropWidth.
         // nFixWidth has never been used...
         rStrm >> nVal;
-        USHORT nTest;
+        sal_uInt16 nTest;
         rStrm >> nTest;
         if ( nTest == 0x1234 )
             pItem->SetValue( nVal );
@@ -3406,23 +3406,23 @@ SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
     return pItem;
 }
 
-SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, USHORT nVer ) const
+SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, sal_uInt16 nVer ) const
 {
     SvStream& rRet = SfxUInt16Item::Store( rStream, nVer );
     if ( Which() == EE_CHAR_FONTWIDTH )
     {
         // see comment in Create()....
-        rRet.SeekRel( -1*(long)sizeof(USHORT) );
-        rRet << (USHORT)0;
+        rRet.SeekRel( -1*(long)sizeof(sal_uInt16) );
+        rRet << (sal_uInt16)0;
         rRet << GetValue();
         // Really ugly, but not a problem for reading the doc in 5.2
-        rRet << (USHORT)0x1234;
+        rRet << (sal_uInt16)0x1234;
     }
     return rRet;
 }
 
 
-USHORT SvxCharScaleWidthItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
@@ -3455,27 +3455,27 @@ SfxItemPresentation SvxCharScaleWidthItem::GetPresentation(
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-sal_Bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
     // where we still want this to be a sal_Int16
     sal_Int16 nValue = sal_Int16();
     if (rVal >>= nValue)
     {
-        SetValue( (UINT16) nValue );
-        return TRUE;
+        SetValue( (sal_uInt16) nValue );
+        return sal_True;
     }
 
     DBG_ERROR( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
-    return FALSE;
+    return sal_False;
 }
 
-sal_Bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
     // where we still want this to be a sal_Int16
     rVal <<= (sal_Int16)GetValue();
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -3484,7 +3484,7 @@ sal_Bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ )
 
 SvxCharReliefItem::SvxCharReliefItem( FontRelief eValue,
                                          const sal_uInt16 nId )
-    : SfxEnumItem( nId, (USHORT)eValue )
+    : SfxEnumItem( nId, (sal_uInt16)eValue )
 {
 }
 
@@ -3493,33 +3493,33 @@ SfxPoolItem* SvxCharReliefItem::Clone( SfxItemPool * ) const
     return new SvxCharReliefItem( *this );
 }
 
-SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_uInt16 nVal;
     rStrm >> nVal;
     return new SvxCharReliefItem( (FontRelief)nVal, Which() );
 }
 
-SvStream& SvxCharReliefItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const
+SvStream& SvxCharReliefItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
 {
     sal_uInt16 nVal = GetValue();
     rStrm << nVal;
     return rStrm;
 }
 
-USHORT SvxCharReliefItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
 
-String SvxCharReliefItem::GetValueTextByPos( USHORT nPos ) const
+String SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
                     "enum overflow" );
     return String( EditResId( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
 }
 
-USHORT SvxCharReliefItem::GetValueCount() const
+sal_uInt16 SvxCharReliefItem::GetValueCount() const
 {
     return RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE;
 }
@@ -3551,7 +3551,7 @@ SfxItemPresentation SvxCharReliefItem::GetPresentation
 }
 
 sal_Bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId )
+                                        sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3563,7 +3563,7 @@ sal_Bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
             sal_Int16 nVal = -1;
             rVal >>= nVal;
             if(nVal >= 0 && nVal <= RELIEF_ENGRAVED)
-                SetValue( (USHORT)nVal );
+                SetValue( (sal_uInt16)nVal );
             else
                 bRet = sal_False;
         }
@@ -3576,7 +3576,7 @@ sal_Bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
 }
 
 sal_Bool SvxCharReliefItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId ) const
+                                        sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3610,14 +3610,14 @@ SfxPoolItem* SvxScriptTypeItem::Clone( SfxItemPool * ) const
 |*    class SvxScriptSetItem
 *************************************************************************/
 
-SvxScriptSetItem::SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool )
+SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool )
     : SfxSetItem( nSlotId, new SfxItemSet( rPool,
                         SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT ))
 {
-    USHORT nLatin, nAsian, nComplex;
+    sal_uInt16 nLatin, nAsian, nComplex;
     GetWhichIds( nLatin, nAsian, nComplex );
 
-    USHORT aIds[ 9 ] = { 0 };
+    sal_uInt16 aIds[ 9 ] = { 0 };
     aIds[ 0 ] = aIds[ 1 ] = nLatin;
     aIds[ 2 ] = aIds[ 3 ] = nAsian;
     aIds[ 4 ] = aIds[ 5 ] = nComplex;
@@ -3630,28 +3630,28 @@ SvxScriptSetItem::SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool )
 SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool * ) const
 {
     SvxScriptSetItem* p = new SvxScriptSetItem( Which(), *GetItemSet().GetPool() );
-    p->GetItemSet().Put( GetItemSet(), FALSE );
+    p->GetItemSet().Put( GetItemSet(), sal_False );
     return p;
 }
 
-SfxPoolItem* SvxScriptSetItem::Create( SvStream &, USHORT ) const
+SfxPoolItem* SvxScriptSetItem::Create( SvStream &, sal_uInt16 ) const
 {
     return 0;
 }
 
 const SfxPoolItem* SvxScriptSetItem::GetItemOfScriptSet(
-                            const SfxItemSet& rSet, USHORT nId )
+                            const SfxItemSet& rSet, sal_uInt16 nId )
 {
     const SfxPoolItem* pI;
-    SfxItemState eSt = rSet.GetItemState( nId, FALSE, &pI );
+    SfxItemState eSt = rSet.GetItemState( nId, sal_False, &pI );
     if( SFX_ITEM_SET != eSt )
         pI = SFX_ITEM_DEFAULT == eSt ? &rSet.Get( nId ) : 0;
     return pI;
 }
 
-const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nSlotId, const SfxItemSet& rSet, USHORT nScript )
+const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16 nScript )
 {
-    USHORT nLatin, nAsian, nComplex;
+    sal_uInt16 nLatin, nAsian, nComplex;
     GetWhichIds( nSlotId, rSet, nLatin, nAsian, nComplex );
 
     const SfxPoolItem *pRet, *pAsn, *pCmplx;
@@ -3700,15 +3700,15 @@ const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nSlotId, const SfxI
     return pRet;
 }
 
-const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nScript ) const
+const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( sal_uInt16 nScript ) const
 {
     return GetItemOfScript( Which(), GetItemSet(), nScript );
 }
 
-void SvxScriptSetItem::PutItemForScriptType( USHORT nScriptType,
+void SvxScriptSetItem::PutItemForScriptType( sal_uInt16 nScriptType,
                                              const SfxPoolItem& rItem )
 {
-    USHORT nLatin, nAsian, nComplex;
+    sal_uInt16 nLatin, nAsian, nComplex;
     GetWhichIds( nLatin, nAsian, nComplex );
 
     SfxPoolItem* pCpy = rItem.Clone();
@@ -3730,7 +3730,7 @@ void SvxScriptSetItem::PutItemForScriptType( USHORT nScriptType,
     delete pCpy;
 }
 
-void SvxScriptSetItem::GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHORT& rLatin, USHORT& rAsian, USHORT& rComplex )
+void SvxScriptSetItem::GetWhichIds( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16& rLatin, sal_uInt16& rAsian, sal_uInt16& rComplex )
 {
     const SfxItemPool& rPool = *rSet.GetPool();
     GetSlotIds( nSlotId, rLatin, rAsian, rComplex );
@@ -3739,19 +3739,19 @@ void SvxScriptSetItem::GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHO
     rComplex = rPool.GetWhich( rComplex );
 }
 
-void SvxScriptSetItem::GetWhichIds( USHORT& rLatin, USHORT& rAsian,
-                                    USHORT& rComplex ) const
+void SvxScriptSetItem::GetWhichIds( sal_uInt16& rLatin, sal_uInt16& rAsian,
+                                    sal_uInt16& rComplex ) const
 {
     GetWhichIds( Which(), GetItemSet(), rLatin, rAsian, rComplex );
 }
 
-void SvxScriptSetItem::GetSlotIds( USHORT nSlotId, USHORT& rLatin,
-                                    USHORT& rAsian, USHORT& rComplex )
+void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
+                                    sal_uInt16& rAsian, sal_uInt16& rComplex )
 {
     switch( nSlotId )
     {
     default:
-        DBG_ASSERT( FALSE, "wrong SlotId for class SvxScriptSetItem" );
+        DBG_ASSERT( sal_False, "wrong SlotId for class SvxScriptSetItem" );
         // no break - default to font - Id Range !!
 
     case SID_ATTR_CHAR_FONT:
@@ -3784,12 +3784,12 @@ void SvxScriptSetItem::GetSlotIds( USHORT nSlotId, USHORT& rLatin,
 
 void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex )
 {
-    const USHORT nItemCnt = 3;
+    const sal_uInt16 nItemCnt = 3;
 
     static struct
     {
-        USHORT nFontType;
-        USHORT nLanguage;
+        sal_uInt16 nFontType;
+        sal_uInt16 nLanguage;
     }
     aOutTypeArr[ nItemCnt ] =
     {
@@ -3800,7 +3800,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
 
     SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
 
-    for ( USHORT n = 0; n < nItemCnt; ++n )
+    for ( sal_uInt16 n = 0; n < nItemCnt; ++n )
     {
         Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType,
                                                   aOutTypeArr[ n ].nLanguage,
@@ -3815,12 +3815,12 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
 }
 
 
-USHORT GetI18NScriptTypeOfLanguage( USHORT nLang )
+sal_uInt16 GetI18NScriptTypeOfLanguage( sal_uInt16 nLang )
 {
     return GetI18NScriptType( SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ) );
 }
 
-USHORT GetItemScriptType( short nI18NType )
+sal_uInt16 GetItemScriptType( short nI18NType )
 {
     switch ( nI18NType )
     {
@@ -3831,7 +3831,7 @@ USHORT GetItemScriptType( short nI18NType )
     return 0;
 }
 
-short GetI18NScriptType( USHORT nItemType )
+short GetI18NScriptType( sal_uInt16 nItemType )
 {
     switch ( nItemType )
     {
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 13c8ec32c9d2..e65ba8df5d05 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::text;
 
 TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(com::sun::star::text::WritingMode_LR_TB, 0));
 
-SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, USHORT _nWhich )
+SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich )
     : SfxUInt16Item( _nWhich, (sal_uInt16)eValue )
 {
 }
@@ -63,19 +63,19 @@ SfxPoolItem* SvxWritingModeItem::Clone( SfxItemPool * ) const
     return new SvxWritingModeItem( *this );
 }
 
-SfxPoolItem* SvxWritingModeItem::Create( SvStream & , USHORT  ) const
+SfxPoolItem* SvxWritingModeItem::Create( SvStream & , sal_uInt16  ) const
 {
     DBG_ERROR("SvxWritingModeItem should not be streamed!");
     return NULL;
 }
 
-SvStream& SvxWritingModeItem::Store( SvStream & rStrm, USHORT  ) const
+SvStream& SvxWritingModeItem::Store( SvStream & rStrm, sal_uInt16  ) const
 {
     DBG_ERROR("SvxWritingModeItem should not be streamed!");
     return rStrm;
 }
 
-USHORT SvxWritingModeItem::GetVersion( USHORT /*nFVer*/ ) const
+sal_uInt16 SvxWritingModeItem::GetVersion( sal_uInt16 /*nFVer*/ ) const
 {
     return USHRT_MAX;
 }
@@ -104,7 +104,7 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr
     return eRet;
 }
 
-sal_Bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+sal_Bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
 {
     sal_Int32 nVal = 0;
     sal_Bool bRet = ( rVal >>= nVal );
@@ -140,7 +140,7 @@ sal_Bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
 }
 
 sal_Bool SvxWritingModeItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                            BYTE ) const
+                                            sal_uInt8 ) const
 {
     rVal <<= (WritingMode)GetValue();
     return true;
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index d2384331ee22..3b6866bdbb21 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::xml;
 
 TYPEINIT1(SvXMLAttrContainerItem, SfxPoolItem);
 
-SvXMLAttrContainerItem::SvXMLAttrContainerItem( USHORT _nWhich ) :
+SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) :
     SfxPoolItem( _nWhich )
 {
     pImpl = new SvXMLAttrContainerData;
@@ -84,21 +84,21 @@ SfxItemPresentation SvXMLAttrContainerItem::GetPresentation(
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-USHORT SvXMLAttrContainerItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
+sal_uInt16 SvXMLAttrContainerItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
 {
     // This item should never be stored
     return USHRT_MAX;
 }
 
-BOOL  SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool  SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     Reference<XNameContainer> xContainer =
         new SvUnoAttributeContainer( new SvXMLAttrContainerData( *pImpl ) );
 
     rVal.setValue( &xContainer, ::getCppuType((Reference<XNameContainer>*)0) );
-    return TRUE;
+    return sal_True;
 }
-BOOL SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     Reference<XInterface> xRef;
     SvUnoAttributeContainer* pContainer = NULL;
@@ -108,7 +108,7 @@ BOOL SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
         xRef = *(Reference<XInterface>*)rVal.getValue();
         Reference<XUnoTunnel> xTunnel(xRef, UNO_QUERY);
         if( xTunnel.is() )
-            pContainer = (SvUnoAttributeContainer*)(ULONG)xTunnel->getSomething(SvUnoAttributeContainer::getUnoTunnelId());
+            pContainer = (SvUnoAttributeContainer*)(sal_uLong)xTunnel->getSomething(SvUnoAttributeContainer::getUnoTunnelId());
     }
 
     if( pContainer )
@@ -124,14 +124,14 @@ BOOL SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
         {
             Reference<XNameContainer> xContainer( xRef, UNO_QUERY );
             if( !xContainer.is() )
-                return FALSE;
+                return sal_False;
 
             const Sequence< ::rtl::OUString > aNameSequence( xContainer->getElementNames() );
             const ::rtl::OUString* pNames = aNameSequence.getConstArray();
-            const INT32 nCount = aNameSequence.getLength();
+            const sal_Int32 nCount = aNameSequence.getLength();
             Any aAny;
             AttributeData* pData;
-            INT32 nAttr;
+            sal_Int32 nAttr;
 
             for( nAttr = 0; nAttr < nCount; nAttr++ )
             {
@@ -139,7 +139,7 @@ BOOL SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
 
                 aAny = xContainer->getByName( aName );
                 if( aAny.getValue() == NULL || aAny.getValueType() != ::getCppuType((AttributeData*)0) )
-                    return FALSE;
+                    return sal_False;
 
                 pData = (AttributeData*)aAny.getValue();
                 sal_Int32 pos = aName.indexOf( sal_Unicode(':') );
@@ -174,74 +174,74 @@ BOOL SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
             else
             {
                 delete pNewImpl;
-                return FALSE;
+                return sal_False;
             }
         }
         catch(...)
         {
             delete pNewImpl;
-            return FALSE;
+            return sal_False;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName,
+sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName,
                                         const ::rtl::OUString& rValue )
 {
     return pImpl->AddAttr( rLName, rValue );
 }
 
-BOOL SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix,
+sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix,
           const ::rtl::OUString& rNamespace, const ::rtl::OUString& rLName,
           const ::rtl::OUString& rValue )
 {
     return pImpl->AddAttr( rPrefix, rNamespace, rLName, rValue );
 }
 
-USHORT SvXMLAttrContainerItem::GetAttrCount() const
+sal_uInt16 SvXMLAttrContainerItem::GetAttrCount() const
 {
-    return (USHORT)pImpl->GetAttrCount();
+    return (sal_uInt16)pImpl->GetAttrCount();
 }
 
-::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( USHORT i ) const
+::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const
 {
     return pImpl->GetAttrNamespace( i );
 }
 
-::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( USHORT i ) const
+::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const
 {
     return pImpl->GetAttrPrefix( i );
 }
 
-const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const
 {
     return pImpl->GetAttrLName( i );
 }
 
-const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const
 {
     return pImpl->GetAttrValue( i );
 }
 
 
-USHORT SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
+sal_uInt16 SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
 {
     return pImpl->GetFirstNamespaceIndex();
 }
 
-USHORT SvXMLAttrContainerItem::GetNextNamespaceIndex( USHORT nIdx ) const
+sal_uInt16 SvXMLAttrContainerItem::GetNextNamespaceIndex( sal_uInt16 nIdx ) const
 {
     return pImpl->GetNextNamespaceIndex( nIdx );
 }
 
-const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const
 {
     return pImpl->GetNamespace( i );
 }
 
-const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const
 {
     return pImpl->GetPrefix( i );
 }
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 65f4bbb11ddc..aeb9d2be23b1 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -143,8 +143,8 @@ SvXMLWordContext::SvXMLWordContext(
         return;
 
 //  const International& rInter = Application::GetAppInternational();
-//  BOOL bOnlyTxt = COMPARE_EQUAL != rInter.Compare( sRight, sWrong, INTN_COMPARE_IGNORECASE );
-    BOOL bOnlyTxt = sRight != sWrong;
+//  sal_Bool bOnlyTxt = COMPARE_EQUAL != rInter.Compare( sRight, sWrong, INTN_COMPARE_IGNORECASE );
+    sal_Bool bOnlyTxt = sRight != sWrong;
     if( !bOnlyTxt )
     {
         String sLongSave( sRight );
@@ -152,7 +152,7 @@ SvXMLWordContext::SvXMLWordContext(
             sLongSave.Len() )
         {
             sRight = sLongSave;
-            bOnlyTxt = TRUE;
+            bOnlyTxt = sal_True;
         }
     }
     SvxAutocorrWordPtr pNew = new SvxAutocorrWord( sWrong, sRight, bOnlyTxt );
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 966a0876fa30..f804c4b39329 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -53,18 +53,18 @@ static SvxAutoCorrCfg* pAutoCorrCfg = 0;
 SvxAutoCorrCfg::SvxAutoCorrCfg() :
     aBaseConfig(*this),
     aSwConfig(*this),
-    bFileRel(TRUE),
-    bNetRel(TRUE),
-    bAutoTextTip(TRUE),
-    bAutoTextPreview(FALSE),
-    bAutoFmtByInput(TRUE),
-    bSearchInAllCategories(FALSE)
+    bFileRel(sal_True),
+    bNetRel(sal_True),
+    bAutoTextTip(sal_True),
+    bAutoTextPreview(sal_False),
+    bAutoFmtByInput(sal_True),
+    bSearchInAllCategories(sal_False)
 {
     SvtPathOptions aPathOpt;
     String sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
 
     String* pS = &sSharePath;
-    for( USHORT n = 0; n < 2; ++n, pS = &sUserPath )
+    for( sal_uInt16 n = 0; n < 2; ++n, pS = &sUserPath )
     {
         *pS = sAutoPath.GetToken( n, ';' );
         INetURLObject aPath( *pS );
@@ -224,8 +224,8 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
             }
         }
         if( nFlags )
-            rParent.pAutoCorrect->SetAutoCorrFlag( nFlags, TRUE );
-        rParent.pAutoCorrect->SetAutoCorrFlag( ( 0xffff & ~nFlags ), FALSE );
+            rParent.pAutoCorrect->SetAutoCorrFlag( nFlags, sal_True );
+        rParent.pAutoCorrect->SetAutoCorrFlag( ( 0xffff & ~nFlags ), sal_False );
 
     }
 }
@@ -254,7 +254,7 @@ void SvxBaseAutoCorrCfg::Commit()
     Any* pValues = aValues.getArray();
 
     const Type& rType = ::getBooleanCppuType();
-    BOOL bVal;
+    sal_Bool bVal;
     const long nFlags = rParent.pAutoCorrect->GetFlags();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
@@ -470,7 +470,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nRightMargin =
-                            sal::static_int_cast< BYTE >(nVal);
+                            sal::static_int_cast< sal_uInt8 >(nVal);
                     }
                     break; // "Format/Option/CombineValue",
                     case  23: rSwFlags.bAFmtDelSpacesAtSttEnd =  *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/DelSpacesAtStartEnd",
@@ -488,14 +488,14 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltWordLen =
-                            sal::static_int_cast< USHORT >(nVal);
+                            sal::static_int_cast< sal_uInt16 >(nVal);
                     }
                     break; // "Completion/MinWordLen",
                     case  35:
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltListLen =
-                            sal::static_int_cast< USHORT >(nVal);
+                            sal::static_int_cast< sal_uInt16 >(nVal);
                     }
                     break; // "Completion/MaxListLen",
                     case  36: rSwFlags.bAutoCmpltCollectWords = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/CollectWords",
@@ -506,7 +506,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltExpandKey =
-                            sal::static_int_cast< USHORT >(nVal);
+                            sal::static_int_cast< sal_uInt16 >(nVal);
                     }
                     break; // "Completion/AcceptKey"
                     case 41 :rSwFlags.bAutoCmpltKeepList = *(sal_Bool*)pValues[nProp].getValue(); break;//"Completion/KeepList"
@@ -571,7 +571,7 @@ void SvxSwAutoCorrCfg::Commit()
     Any* pValues = aValues.getArray();
 
     const Type& rType = ::getBooleanCppuType();
-    BOOL bVal;
+    sal_Bool bVal;
     SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 52b439838ce0..b7bd2959719d 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -35,7 +35,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, USHORT nISize, USHORT nGrow )
+SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, sal_uInt16 nISize, sal_uInt16 nGrow )
  : SvxForbiddenCharactersTableImpl( nISize, nGrow )
 {
     mxMSF = xMSF;
@@ -44,13 +44,13 @@ SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno:
 
 SvxForbiddenCharactersTable::~SvxForbiddenCharactersTable()
 {
-    for ( ULONG n = Count(); n; )
+    for ( sal_uLong n = Count(); n; )
         delete GetObject( --n );
 }
 
 
 
-const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( USHORT nLanguage, BOOL bGetDefault ) const
+const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, sal_Bool bGetDefault ) const
 {
     ForbiddenCharactersInfo* pInf = Get( nLanguage );
     if ( !pInf && bGetDefault && mxMSF.is() )
@@ -60,7 +60,7 @@ const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::Ge
          pInf = new ForbiddenCharactersInfo;
         pImpl->Insert( nLanguage, pInf );
 
-        pInf->bTemporary = TRUE;
+        pInf->bTemporary = sal_True;
         LocaleDataWrapper aWrapper( mxMSF, SvxCreateLocale( nLanguage ) );
         pInf->aForbiddenChars = aWrapper.getForbiddenCharacters();
     }
@@ -69,7 +69,7 @@ const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::Ge
 
 
 
-void SvxForbiddenCharactersTable::SetForbiddenCharacters( USHORT nLanguage, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenChars )
+void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16 nLanguage, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenChars )
 {
     ForbiddenCharactersInfo* pInf = Get( nLanguage );
     if ( !pInf )
@@ -77,11 +77,11 @@ void SvxForbiddenCharactersTable::SetForbiddenCharacters( USHORT nLanguage, cons
         pInf = new ForbiddenCharactersInfo;
         Insert( nLanguage, pInf );
     }
-    pInf->bTemporary = FALSE;
+    pInf->bTemporary = sal_False;
     pInf->aForbiddenChars = rForbiddenChars;
 }
 
-void SvxForbiddenCharactersTable::ClearForbiddenCharacters( USHORT nLanguage )
+void SvxForbiddenCharactersTable::ClearForbiddenCharacters( sal_uInt16 nLanguage )
 {
     ForbiddenCharactersInfo* pInf = Get( nLanguage );
     if ( pInf )
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 378ffb705300..87f115474bf7 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -686,7 +686,7 @@ namespace editeng
 
                         // determine if it's Hangul
                         CharClass aCharClassificaton( m_xORB, m_aSourceLocale );
-                        sal_Int16 nScript = aCharClassificaton.getScript( m_sCurrentPortion, sal::static_int_cast< USHORT >(nNextAsianScript) );
+                        sal_Int16 nScript = aCharClassificaton.getScript( m_sCurrentPortion, sal::static_int_cast< sal_uInt16 >(nNextAsianScript) );
                         if  (   ( UnicodeScript_kHangulJamo == nScript )
                             ||  ( UnicodeScript_kHangulCompatibilityJamo == nScript )
                             ||  ( UnicodeScript_kHangulSyllable == nScript )
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 3df64c26a594..af6b029b3001 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -105,7 +105,7 @@ struct lt_LanguageType
     }
 };
 
-typedef std::map< LanguageType, USHORT, lt_LanguageType >   LangCheckState_map_t;
+typedef std::map< LanguageType, sal_uInt16, lt_LanguageType >   LangCheckState_map_t;
 
 static LangCheckState_map_t & GetLangCheckState()
 {
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f2481e79eb22..e15e92200e0c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -139,7 +139,7 @@ inline int IsUpperLetter( sal_Int32 nCharType )
             0 == ( ::com::sun::star::i18n::KCharacterType::LOWER & nCharType);
 }
 
-BOOL lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
+sal_Bool lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
                            xub_StrLen nStt, xub_StrLen nEnd )
 {
     for( ; nStt < nEnd; ++nStt )
@@ -152,19 +152,19 @@ BOOL lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
 #endif
         if( ::com::sun::star::i18n::UnicodeType::PRIVATE_USE ==
                 rCC.getType( rTxt, nStt ))
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-static BOOL lcl_IsInAsciiArr( const sal_Char* pArr, const sal_Unicode c )
+static sal_Bool lcl_IsInAsciiArr( const sal_Char* pArr, const sal_Unicode c )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     for( ; *pArr; ++pArr )
         if( *pArr == c )
         {
-            bRet = TRUE;
+            bRet = sal_True;
             break;
         }
     return bRet;
@@ -180,12 +180,12 @@ SvxAutoCorrDoc::~SvxAutoCorrDoc()
     //  - FnCptlSttSntnc
     // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten
     // aufgenommen werden.
-void SvxAutoCorrDoc::SaveCpltSttWord( ULONG, xub_StrLen, const String&,
+void SvxAutoCorrDoc::SaveCpltSttWord( sal_uLong, xub_StrLen, const String&,
                                         sal_Unicode )
 {
 }
 
-LanguageType SvxAutoCorrDoc::GetLanguage( xub_StrLen , BOOL ) const
+LanguageType SvxAutoCorrDoc::GetLanguage( xub_StrLen , sal_Bool ) const
 {
     return LANGUAGE_SYSTEM;
 }
@@ -199,11 +199,11 @@ static ::com::sun::star::uno::Reference<
     return xMSF;
 }
 
-static USHORT GetAppLang()
+static sal_uInt16 GetAppLang()
 {
     return Application::GetSettings().GetLanguage();
 }
-static LocaleDataWrapper& GetLocaleDataWrapper( USHORT nLang )
+static LocaleDataWrapper& GetLocaleDataWrapper( sal_uInt16 nLang )
 {
     static LocaleDataWrapper aLclDtWrp( GetProcessFact(),
                                         SvxCreateLocale( GetAppLang() ) );
@@ -242,21 +242,21 @@ static CollatorWrapper& GetCollatorWrapper()
 }
 
 
-void SvxAutocorrWordList::DeleteAndDestroy( USHORT nP, USHORT nL )
+void SvxAutocorrWordList::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
     if( nL )
     {
         DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );
-        for( USHORT n=nP; n < nP + nL; n++ )
+        for( sal_uInt16 n=nP; n < nP + nL; n++ )
             delete *((SvxAutocorrWordPtr*)pData+n);
         SvPtrarr::Remove( nP, nL );
     }
 }
 
 
-BOOL SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE, USHORT* pP ) const
+sal_Bool SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE, sal_uInt16* pP ) const
 {
-    register USHORT nO  = SvxAutocorrWordList_SAR::Count(),
+    register sal_uInt16 nO  = SvxAutocorrWordList_SAR::Count(),
             nM,
             nU = 0;
     if( nO > 0 )
@@ -271,21 +271,21 @@ BOOL SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE, USHORT* pP )
             if( 0 == nCmp )
             {
                 if( pP ) *pP = nM;
-                return TRUE;
+                return sal_True;
             }
             else if( 0 < nCmp )
                 nU = nM + 1;
             else if( nM == 0 )
             {
                 if( pP ) *pP = nU;
-                return FALSE;
+                return sal_False;
             }
             else
                 nO = nM - 1;
         }
     }
     if( pP ) *pP = nU;
-    return FALSE;
+    return sal_False;
 }
 
 /* -----------------18.11.98 15:28-------------------
@@ -405,7 +405,7 @@ void SvxAutoCorrect::_GetCharClass( LanguageType eLang )
     eCharClassLang = eLang;
 }
 
-void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, BOOL bOn )
+void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, sal_Bool bOn )
 {
     long nOld = nFlags;
     nFlags = bOn ? nFlags | nFlag
@@ -424,11 +424,11 @@ void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, BOOL bOn )
 
 
     // Zwei Grossbuchstaben am Wort-Anfang ??
-BOOL SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
+sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
                                     LanguageType eLang )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     CharClass& rCC = GetCharClass( eLang );
 
     // loesche alle nicht alpanum. Zeichen am Wortanfang/-ende und
@@ -460,7 +460,7 @@ BOOL SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
             {
                 if( SaveWordWrdSttLst & nFlags )
                     rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord, cSave );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -468,7 +468,7 @@ BOOL SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
 }
 
 
-BOOL SvxAutoCorrect::FnChgOrdinalNumber(
+sal_Bool SvxAutoCorrect::FnChgOrdinalNumber(
                                 SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang )
@@ -477,7 +477,7 @@ BOOL SvxAutoCorrect::FnChgOrdinalNumber(
 // 201th oder 201st
 // 12th oder 12nd
     CharClass& rCC = GetCharClass( eLang );
-    BOOL bChg = FALSE;
+    sal_Bool bChg = sal_False;
 
     for( ; nSttPos < nEndPos; ++nSttPos )
         if( !lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nSttPos ) ))
@@ -536,12 +536,12 @@ BOOL SvxAutoCorrect::FnChgOrdinalNumber(
 }
 
 
-BOOL SvxAutoCorrect::FnChgToEnEmDash(
+sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
                                 SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     CharClass& rCC = GetCharClass( eLang );
     if (eLang == LANGUAGE_SYSTEM)
         eLang = GetAppLang();
@@ -574,7 +574,7 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
                     {
                         rDoc.Delete( nSttPos, nSttPos + 2 );
                         rDoc.Insert( nSttPos, bAlwaysUseEmDash ? cEmDash : cEnDash );
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -609,7 +609,7 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
                     {
                         rDoc.Delete( nTmpPos, nTmpPos + nLen );
                         rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? cEmDash : cEnDash );
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -633,13 +633,13 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
             nSttPos = nSttPos + nFndPos;
             rDoc.Delete( nSttPos, nSttPos + 2 );
             rDoc.Insert( nSttPos, (bEnDash ? cEnDash : cEmDash) );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     return bRet;
 }
 
-BOOL SvxAutoCorrect::FnAddNonBrkSpace(
+sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
                                 SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen, xub_StrLen nEndPos,
                                 LanguageType eLang )
@@ -717,20 +717,20 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
     return bRet;
 }
 
-BOOL SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
+sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
                                     LanguageType eLang )
 {
     String sURL( URIHelper::FindFirstURLInText( rTxt, nSttPos, nEndPos,
                                                 GetCharClass( eLang ) ));
-    BOOL bRet = 0 != sURL.Len();
+    sal_Bool bRet = 0 != sURL.Len();
     if( bRet )          // also Attribut setzen:
         rDoc.SetINetAttr( nSttPos, nEndPos, sURL );
     return bRet;
 }
 
 
-BOOL SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt,
+sal_Bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                         xub_StrLen, xub_StrLen nEndPos,
                                         LanguageType eLang )
 {
@@ -741,11 +741,11 @@ BOOL SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt
     sal_Unicode c, cInsChar = rTxt.GetChar( nEndPos );  // unterstreichen oder fett
     if( ++nEndPos != rTxt.Len() &&
         !IsWordDelim( rTxt.GetChar( nEndPos ) ) )
-        return FALSE;
+        return sal_False;
 
     --nEndPos;
 
-    BOOL bAlphaNum = FALSE;
+    sal_Bool bAlphaNum = sal_False;
     xub_StrLen nPos = nEndPos, nFndPos = STRING_NOTFOUND;
     CharClass& rCC = GetCharClass( eLang );
 
@@ -799,14 +799,14 @@ BOOL SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt
 }
 
 
-BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
-                                    const String& rTxt, BOOL bNormalPos,
+sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
+                                    const String& rTxt, sal_Bool bNormalPos,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
                                     LanguageType eLang )
 {
     // Grossbuchstabe am Satz-Anfang ??
     if( !rTxt.Len() || nEndPos <= nSttPos )
-        return FALSE;
+        return sal_False;
 
      CharClass& rCC = GetCharClass( eLang );
     String aText( rTxt );
@@ -815,7 +815,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
                       *pWordStt = 0,
                       *pDelim = 0;
 
-    BOOL bAtStart = FALSE, bPrevPara = FALSE;
+    sal_Bool bAtStart = sal_False, bPrevPara = sal_False;
     do {
         --pStr;
         if( rCC.isLetter(
@@ -854,14 +854,14 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
                 aText,
                 sal::static_int_cast< xub_StrLen >( pWordStt - pStart ) ) ) ||
         0x1 == *pWordStt || 0x2 == *pWordStt )
-        return FALSE;       // kein zu ersetzendes Zeichen, oder schon ok
+        return sal_False;       // kein zu ersetzendes Zeichen, oder schon ok
 
     // JP 27.10.97: wenn das Wort weniger als 3 Zeichen hat und der Trenner
     //              ein "Num"-Trenner ist, dann nicht ersetzen!
     //              Damit wird ein "a.",  "a)", "a-a" nicht ersetzt!
     if( *pDelim && 2 >= pDelim - pWordStt &&
         lcl_IsInAsciiArr( ".-)>", *pDelim ) )
-        return FALSE;
+        return sal_False;
 
     if( !bAtStart ) // noch kein Absatz Anfang ?
     {
@@ -874,7 +874,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         // and full width question marks are treated as word delimiters
         else if ( 0x3002 != *pStr && 0xFF0E != *pStr && 0xFF01 != *pStr &&
                   0xFF1F != *pStr )
-            return FALSE; // kein gueltiger Trenner -> keine Ersetzung
+            return sal_False; // kein gueltiger Trenner -> keine Ersetzung
     }
 
     if( bAtStart )  // am Absatz Anfang ?
@@ -892,8 +892,8 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         }
 
         aText = *pPrevPara;
-        bPrevPara = TRUE;
-        bAtStart = FALSE;
+        bPrevPara = sal_True;
+        bAtStart = sal_False;
         pStart = aText.GetBuffer();
         pStr = pStart + aText.Len();
 
@@ -904,7 +904,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         } while( 0 == ( bAtStart = (pStart == pStr)) );
 
         if( bAtStart )
-            return FALSE;       // kein gueltiger Trenner -> keine Ersetzung
+            return sal_False;       // kein gueltiger Trenner -> keine Ersetzung
     }
 
     // bis hierhier wurde [ \t]+[A-Z0-9]+ gefunden. Test jetzt auf den
@@ -912,7 +912,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     const sal_Unicode* pExceptStt = 0;
     if( !bAtStart )
     {
-        BOOL bWeiter = TRUE;
+        sal_Bool bWeiter = sal_True;
         int nFlag = C_NONE;
         do {
             switch( *pStr )
@@ -923,7 +923,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             case 0xFF0E :
                 {
                     if( nFlag & C_FULL_STOP )
-                        return FALSE;       // kein gueltiger Trenner -> keine Ersetzung
+                        return sal_False;       // kein gueltiger Trenner -> keine Ersetzung
                     nFlag |= C_FULL_STOP;
                     pExceptStt = pStr;
                 }
@@ -932,7 +932,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             case 0xFF01 :
                 {
                     if( nFlag & C_EXCLAMATION_MARK )
-                        return FALSE;   // kein gueltiger Trenner -> keine Ersetzung
+                        return sal_False;   // kein gueltiger Trenner -> keine Ersetzung
                     nFlag |= C_EXCLAMATION_MARK;
                 }
                 break;
@@ -940,15 +940,15 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             case 0xFF1F :
                 {
                     if( nFlag & C_QUESTION_MARK)
-                        return FALSE;       // kein gueltiger Trenner -> keine Ersetzung
+                        return sal_False;       // kein gueltiger Trenner -> keine Ersetzung
                     nFlag |= C_QUESTION_MARK;
                 }
                 break;
             default:
                 if( !nFlag )
-                    return FALSE;       // kein gueltiger Trenner -> keine Ersetzung
+                    return sal_False;       // kein gueltiger Trenner -> keine Ersetzung
                 else
-                    bWeiter = FALSE;
+                    bWeiter = sal_False;
                 break;
             }
 
@@ -956,7 +956,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             {
 // !!! wenn am Anfang, dann nie ersetzen.
 //              if( !nFlag )
-                    return FALSE;       // kein gueltiger Trenner -> keine Ersetzung
+                    return sal_False;       // kein gueltiger Trenner -> keine Ersetzung
 //              ++pStr;
 //              break;      // Schleife beenden
             }
@@ -966,12 +966,12 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     }
 
     if( 2 > ( pStr - pStart ) )
-        return FALSE;
+        return sal_False;
 
     if( !rCC.isLetterNumeric(
             aText, sal::static_int_cast< xub_StrLen >( pStr-- - pStart ) ) )
     {
-        BOOL bValid = FALSE, bAlphaFnd = FALSE;
+        sal_Bool bValid = sal_False, bAlphaFnd = sal_False;
         const sal_Unicode* pTmpStr = pStr;
         while( !bValid )
         {
@@ -979,7 +979,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
                     aText,
                     sal::static_int_cast< xub_StrLen >( pTmpStr - pStart ) ) )
             {
-                bValid = TRUE;
+                bValid = sal_True;
                 pStr = pTmpStr - 1;
             }
             else if( rCC.isLetter(
@@ -989,11 +989,11 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             {
                 if( bAlphaFnd )
                 {
-                    bValid = TRUE;
+                    bValid = sal_True;
                     pStr = pTmpStr;
                 }
                 else
-                    bAlphaFnd = TRUE;
+                    bAlphaFnd = sal_True;
             }
             else if( bAlphaFnd || IsWordDelim( *pTmpStr ) )
                 break;
@@ -1005,10 +1005,10 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         }
 
         if( !bValid )
-            return FALSE;       // kein gueltiger Trenner -> keine Ersetzung
+            return sal_False;       // kein gueltiger Trenner -> keine Ersetzung
     }
 
-    BOOL bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
+    sal_Bool bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
 
     // suche den Anfang vom Wort
     while( !IsWordDelim( *pStr ))
@@ -1016,7 +1016,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         if( bNumericOnly &&
             rCC.isLetter(
                 aText, sal::static_int_cast< xub_StrLen >( pStr - pStart ) ) )
-            bNumericOnly = FALSE;
+            bNumericOnly = sal_False;
 
         if( pStart == pStr )
             break;
@@ -1025,7 +1025,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     }
 
     if( bNumericOnly )      // besteht nur aus Zahlen, dann nicht
-        return FALSE;
+        return sal_False;
 
     if( IsWordDelim( *pStr ))
         ++pStr;
@@ -1038,7 +1038,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         sWord = String(
             pStr, sal::static_int_cast< xub_StrLen >( pExceptStt - pStr + 1 ) );
         if( FindInCplSttExceptList(eLang, sWord) )
-            return FALSE;
+            return sal_False;
 
         // loesche alle nicht alpanum. Zeichen am Wortanfang/-ende und
         // teste dann noch mal ( erkennt: "(min.", "/min.", usw.)
@@ -1057,10 +1057,10 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
 
         if( sTmp.Len() && sTmp.Len() != sWord.Len() &&
             FindInCplSttExceptList(eLang, sTmp))
-            return FALSE;
+            return sal_False;
 
-        if(FindInCplSttExceptList(eLang, sWord, TRUE))
-            return FALSE;
+        if(FindInCplSttExceptList(eLang, sWord, sal_True))
+            return sal_False;
     }
 
     // Ok, dann ersetze mal
@@ -1068,7 +1068,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() );
     String sChar( cSave );
     rCC.toUpper( sChar );
-    BOOL bRet = sChar.GetChar(0) != cSave && rDoc.Replace( nSttPos, sChar );
+    sal_Bool bRet = sChar.GetChar(0) != cSave && rDoc.Replace( nSttPos, sChar );
 
     // das Wort will vielleicht jemand haben
     if( bRet && SaveWordCplSttLst & nFlags )
@@ -1077,7 +1077,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     return bRet;
 }
 //The method below is renamed from _GetQuote to GetQuote by BerryJia for Bug95846 Time:2002-8-13 15:50
-sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
+sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote,
                                         LanguageType eLang ) const
 {
     sal_Unicode cRet = bSttQuote ? ( '\"' == cInsChar
@@ -1108,10 +1108,10 @@ sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
 }
 
 void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
-                                    sal_Unicode cInsChar, BOOL bSttQuote,
-                                    BOOL bIns )
+                                    sal_Unicode cInsChar, sal_Bool bSttQuote,
+                                    sal_Bool bIns )
 {
-    LanguageType eLang = rDoc.GetLanguage( nInsPos, FALSE );
+    LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
     sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
 
     //JP 13.02.99: damit beim Undo das "einfuegte" Zeichen wieder erscheint,
@@ -1157,9 +1157,9 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
 }
 
 String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
-                                sal_Unicode cInsChar, BOOL bSttQuote )
+                                sal_Unicode cInsChar, sal_Bool bSttQuote )
 {
-    LanguageType eLang = rDoc.GetLanguage( nInsPos, FALSE );
+    LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
     sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
 
     String sRet( cRet );
@@ -1187,11 +1187,11 @@ String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
     return sRet;
 }
 
-ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
+sal_uLong SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     xub_StrLen nInsPos, sal_Unicode cChar,
-                                    BOOL bInsert )
+                                    sal_Bool bInsert )
 {
-    ULONG nRet = 0;
+    sal_uLong nRet = 0;
     bool bIsNextRun = bRunNext;
     bRunNext = false;  // if it was set, then it has to be turned off
 
@@ -1207,14 +1207,14 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                 break;
             }
 
-            BOOL bSingle = '\'' == cChar;
-            BOOL bIsReplaceQuote =
+            sal_Bool bSingle = '\'' == cChar;
+            sal_Bool bIsReplaceQuote =
                         (IsAutoCorrFlag( ChgQuotes ) && ('\"' == cChar )) ||
                         (IsAutoCorrFlag( ChgSglQuotes ) && bSingle );
             if( bIsReplaceQuote )
             {
                 sal_Unicode cPrev;
-                BOOL bSttQuote = !nInsPos ||
+                sal_Bool bSttQuote = !nInsPos ||
                         IsWordDelim( ( cPrev = rTxt.GetChar( nInsPos-1 ))) ||
 // os: #56034# - Warum kein schliessendes Anfuehrungszeichen nach dem Bindestrich?
 //                      strchr( "-([{", cPrev ) ||
@@ -1236,7 +1236,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             if ( IsAutoCorrFlag( AddNonBrkSpace ) )
             {
                 if ( NeedsHardspaceAutocorr( cChar ) &&
-                    FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, FALSE ) ) )
+                    FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, sal_False ) ) )
                 {
                     nRet = AddNonBrkSpace;
                 }
@@ -1294,7 +1294,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
         if( !nPos && !IsWordDelim( rTxt.GetChar( 0 )))
             --nCapLttrPos;          // Absatz Anfang und kein Blank !
 
-        LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, FALSE );
+        LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, sal_False );
         if( LANGUAGE_SYSTEM == eLang )
             eLang = MsLangId::getSystemLanguage();
         CharClass& rCC = GetCharClass( eLang );
@@ -1308,7 +1308,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             const String* pPara = 0;
             const String** ppPara = IsAutoCorrFlag(CptlSttSntnc) ? &pPara : 0;
 
-            BOOL bChgWord = rDoc.ChgAutoCorrWord( nCapLttrPos, nInsPos,
+            sal_Bool bChgWord = rDoc.ChgAutoCorrWord( nCapLttrPos, nInsPos,
                                                     *this, ppPara );
             if( !bChgWord )
             {
@@ -1330,7 +1330,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                     nCapLttrPos1 < nInsPos1 &&
                     rDoc.ChgAutoCorrWord( nCapLttrPos1, nInsPos1, *this, ppPara ))
                 {
-                    bChgWord = TRUE;
+                    bChgWord = sal_True;
                     nCapLttrPos = nCapLttrPos1;
                 }
             }
@@ -1347,7 +1347,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
 
                     // Grossbuchstabe am Satz-Anfang ??
                     if( IsAutoCorrFlag( CptlSttSntnc ) &&
-                        FnCptlSttSntnc( rDoc, *pPara, FALSE,
+                        FnCptlSttSntnc( rDoc, *pPara, sal_False,
                                                 nCapLttrPos, nEnd, eLang ) )
                         nRet |= CptlSttSntnc;
 
@@ -1370,7 +1370,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             nRet = 0;
             // Grossbuchstabe am Satz-Anfang ??
             if( IsAutoCorrFlag( CptlSttSntnc ) &&
-                FnCptlSttSntnc( rDoc, rTxt, TRUE, nCapLttrPos, nInsPos, eLang ) )
+                FnCptlSttSntnc( rDoc, rTxt, sal_True, nCapLttrPos, nInsPos, eLang ) )
                 nRet |= CptlSttSntnc;
 
             // Zwei Grossbuchstaben am Wort-Anfang ??
@@ -1383,7 +1383,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                 nRet |= ChgToEnEmDash;
         }
 
-    } while( FALSE );
+    } while( sal_False );
 
     if( nRet )
     {
@@ -1413,7 +1413,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             HID_AUTOCORR_HELP_CHGORDINALNUMBER
         };
 
-        ULONG nHelpId = 0;
+        sal_uLong nHelpId = 0;
         if( nRet & ( Autocorrect|CptlSttSntnc|CptlSttWrd|ChgToEnEmDash ) )
         {
             // von 0 - 15
@@ -1451,16 +1451,16 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
 SvxAutoCorrectLanguageLists& SvxAutoCorrect::_GetLanguageList(
                                                         LanguageType eLang )
 {
-    if( !pLangTable->IsKeyValid( ULONG( eLang )))
-        CreateLanguageFile( eLang, TRUE);
-    return *pLangTable->Seek( ULONG( eLang ) );
+    if( !pLangTable->IsKeyValid( sal_uLong( eLang )))
+        CreateLanguageFile( eLang, sal_True);
+    return *pLangTable->Seek( sal_uLong( eLang ) );
 }
 
 void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
 {
-    if( pLangTable->IsKeyValid( ULONG( eLang )))
+    if( pLangTable->IsKeyValid( sal_uLong( eLang )))
     {
-        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(sal_uLong(eLang));
         if( pLists )
             pLists->SaveCplSttExceptList();
     }
@@ -1474,9 +1474,9 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
 
 void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
 {
-    if(pLangTable->IsKeyValid(ULONG(eLang)))
+    if(pLangTable->IsKeyValid(sal_uLong(eLang)))
     {
-        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(sal_uLong(eLang));
         if(pLists)
             pLists->SaveWrdSttExceptList();
     }
@@ -1491,17 +1491,17 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
 
     // fuegt ein einzelnes Wort hinzu. Die Liste wird sofort
     // in die Datei geschrieben!
-BOOL SvxAutoCorrect::AddCplSttException( const String& rNew,
+sal_Bool SvxAutoCorrect::AddCplSttException( const String& rNew,
                                         LanguageType eLang )
 {
     SvxAutoCorrectLanguageListsPtr pLists = 0;
     //entweder die richtige Sprache ist vorhanden oder es kommt in die allg. Liste
-    if( pLangTable->IsKeyValid(ULONG(eLang)))
-        pLists = pLangTable->Seek(ULONG(eLang));
-    else if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))||
-            CreateLanguageFile(LANGUAGE_DONTKNOW, TRUE))
+    if( pLangTable->IsKeyValid(sal_uLong(eLang)))
+        pLists = pLangTable->Seek(sal_uLong(eLang));
+    else if(pLangTable->IsKeyValid(sal_uLong(LANGUAGE_DONTKNOW))||
+            CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
     {
-        pLists = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW));
+        pLists = pLangTable->Seek(sal_uLong(LANGUAGE_DONTKNOW));
     }
     DBG_ASSERT(pLists, "keine Autokorrekturdatei");
     return pLists->AddToCplSttExceptList(rNew);
@@ -1510,16 +1510,16 @@ BOOL SvxAutoCorrect::AddCplSttException( const String& rNew,
 
     // fuegt ein einzelnes Wort hinzu. Die Liste wird sofort
     // in die Datei geschrieben!
-BOOL SvxAutoCorrect::AddWrtSttException( const String& rNew,
+sal_Bool SvxAutoCorrect::AddWrtSttException( const String& rNew,
                                          LanguageType eLang )
 {
     SvxAutoCorrectLanguageListsPtr pLists = 0;
     //entweder die richtige Sprache ist vorhanden oder es kommt in die allg. Liste
-    if(pLangTable->IsKeyValid(ULONG(eLang)))
-        pLists = pLangTable->Seek(ULONG(eLang));
-    else if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))||
-            CreateLanguageFile(LANGUAGE_DONTKNOW, TRUE))
-        pLists = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW));
+    if(pLangTable->IsKeyValid(sal_uLong(eLang)))
+        pLists = pLangTable->Seek(sal_uLong(eLang));
+    else if(pLangTable->IsKeyValid(sal_uLong(LANGUAGE_DONTKNOW))||
+            CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
+        pLists = pLangTable->Seek(sal_uLong(LANGUAGE_DONTKNOW));
     DBG_ASSERT(pLists, "keine Autokorrekturdatei");
     return pLists->AddToWrdSttExceptList(rNew);
 }
@@ -1554,12 +1554,12 @@ void SvxAutoCorrect::SetShareAutoCorrFileName( const String& rNew )
 }
 
 
-BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
+sal_Bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
                                         const String& rTxt, xub_StrLen nPos,
                                         String& rWord ) const
 {
     if( !nPos )
-        return FALSE;
+        return sal_False;
 
     xub_StrLen nEnde = nPos;
 
@@ -1567,7 +1567,7 @@ BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
     if( ( nPos < rTxt.Len() &&
         !IsWordDelim( rTxt.GetChar( nPos ))) ||
         IsWordDelim( rTxt.GetChar( --nPos )))
-        return FALSE;
+        return sal_False;
 
     while( nPos && !IsWordDelim( rTxt.GetChar( --nPos )))
         ;
@@ -1580,14 +1580,14 @@ BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
 
     while( lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nCapLttrPos )) )
         if( ++nCapLttrPos >= nEnde )
-            return FALSE;
+            return sal_False;
 
     // Bug 19285: Symbolzeichen nicht anfassen
     // Interresant erst ab 3 Zeichen
     if( 3 > nEnde - nCapLttrPos )
-        return FALSE;
+        return sal_False;
 
-    LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, FALSE );
+    LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, sal_False );
     if( LANGUAGE_SYSTEM == eLang )
         eLang = MsLangId::getSystemLanguage();
 
@@ -1595,24 +1595,24 @@ BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
     CharClass& rCC = pThis->GetCharClass( eLang );
 
     if( lcl_IsSymbolChar( rCC, rTxt, nCapLttrPos, nEnde ))
-        return FALSE;
+        return sal_False;
 
     rWord = rTxt.Copy( nCapLttrPos, nEnde - nCapLttrPos );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, BOOL bNewFile )
+sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFile )
 {
-    DBG_ASSERT(!pLangTable->IsKeyValid(ULONG(eLang)), "Sprache ist bereits vorhanden");
+    DBG_ASSERT(!pLangTable->IsKeyValid(sal_uLong(eLang)), "Sprache ist bereits vorhanden");
 
-    String sUserDirFile( GetAutoCorrFileName( eLang, TRUE, FALSE )),
+    String sUserDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False )),
            sShareDirFile( sUserDirFile );
     SvxAutoCorrectLanguageListsPtr pLists = 0;
 
     Time nMinTime( 0, 2 ), nAktTime, nLastCheckTime;
-    ULONG nFndPos;
+    sal_uLong nFndPos;
     if( TABLE_ENTRY_NOTFOUND !=
-                    pLastFileTable->SearchKey( ULONG( eLang ), &nFndPos ) &&
+                    pLastFileTable->SearchKey( sal_uLong( eLang ), &nFndPos ) &&
         ( nLastCheckTime.SetTime( pLastFileTable->GetObject( nFndPos )),
             nLastCheckTime < nAktTime ) &&
         ( nAktTime - nLastCheckTime ) < nMinTime )
@@ -1624,60 +1624,60 @@ BOOL SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, BOOL bNewFile )
             sShareDirFile = sUserDirFile;
             pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile,
                                                         sUserDirFile, eLang );
-            pLangTable->Insert( ULONG(eLang), pLists );
-            pLastFileTable->Remove( ULONG( eLang ) );
+            pLangTable->Insert( sal_uLong(eLang), pLists );
+            pLastFileTable->Remove( sal_uLong( eLang ) );
         }
     }
     else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
                 FStatHelper::IsDocument( sShareDirFile =
-                              GetAutoCorrFileName( eLang, FALSE, FALSE ) ) ) ||
+                              GetAutoCorrFileName( eLang, sal_False, sal_False ) ) ) ||
         ( sShareDirFile = sUserDirFile, bNewFile ))
     {
         pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile,
                                                     sUserDirFile, eLang );
-        pLangTable->Insert( ULONG(eLang), pLists );
-        pLastFileTable->Remove( ULONG( eLang ) );
+        pLangTable->Insert( sal_uLong(eLang), pLists );
+        pLastFileTable->Remove( sal_uLong( eLang ) );
     }
     else if( !bNewFile )
     {
-        if( !pLastFileTable->Insert( ULONG( eLang ), nAktTime.GetTime() ))
-            pLastFileTable->Replace( ULONG( eLang ), nAktTime.GetTime() );
+        if( !pLastFileTable->Insert( sal_uLong( eLang ), nAktTime.GetTime() ))
+            pLastFileTable->Replace( sal_uLong( eLang ), nAktTime.GetTime() );
     }
     return pLists != 0;
 }
 
-BOOL SvxAutoCorrect::PutText( const String& rShort, const String& rLong,
+sal_Bool SvxAutoCorrect::PutText( const String& rShort, const String& rLong,
                                 LanguageType eLang )
 {
-    BOOL bRet = FALSE;
-    if( pLangTable->IsKeyValid( ULONG(eLang)) || CreateLanguageFile(eLang) )
-        bRet = pLangTable->Seek( ULONG(eLang) )->PutText(rShort, rLong);
+    sal_Bool bRet = sal_False;
+    if( pLangTable->IsKeyValid( sal_uLong(eLang)) || CreateLanguageFile(eLang) )
+        bRet = pLangTable->Seek( sal_uLong(eLang) )->PutText(rShort, rLong);
     return bRet;
 }
 
 
     //  - loesche einen Eintrag
-BOOL SvxAutoCorrect::DeleteText( const String& rShort, LanguageType eLang )
+sal_Bool SvxAutoCorrect::DeleteText( const String& rShort, LanguageType eLang )
 {
-    BOOL bRet = FALSE;
-    if( pLangTable->IsKeyValid( ULONG( eLang )) )
-        bRet = pLangTable->Seek( ULONG( eLang ))->DeleteText( rShort );
+    sal_Bool bRet = sal_False;
+    if( pLangTable->IsKeyValid( sal_uLong( eLang )) )
+        bRet = pLangTable->Seek( sal_uLong( eLang ))->DeleteText( rShort );
     return bRet;
 }
 
 
     //  - return den Ersetzungstext (nur fuer SWG-Format, alle anderen
     //      koennen aus der Wortliste herausgeholt werden!)
-BOOL SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String& , String& )
+sal_Bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String& , String& )
 {
-    return FALSE;
+    return sal_False;
 }
 
     //  - Text mit Attributierung (kann nur der SWG - SWG-Format!)
-BOOL SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String&, SfxObjectShell&,
+sal_Bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String&, SfxObjectShell&,
                                 String& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 void EncryptBlockName_Imp( String& rName )
@@ -1773,11 +1773,11 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
     // zuerst nach eLang suchen, dann nach der Obersprache
     // US-Englisch -> Englisch und zuletzt in LANGUAGE_DONTKNOW
 
-    if( pLangTable->IsKeyValid( ULONG( eLang ) ) ||
-        CreateLanguageFile( eLang, FALSE ))
+    if( pLangTable->IsKeyValid( sal_uLong( eLang ) ) ||
+        CreateLanguageFile( eLang, sal_False ))
     {
         //die Sprache ist vorhanden - also her damit
-        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(sal_uLong(eLang));
         pRet = lcl_SearchWordsInList(  pList, rTxt, rStt, nEndPos, rDoc );
         if( pRet )
         {
@@ -1787,16 +1787,16 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
     }
 
     // wenn es hier noch nicht gefunden werden konnte, dann weitersuchen
-    ULONG nTmpKey1 = eLang & 0x7ff, // die Hauptsprache in vielen Faellen u.B. DE
+    sal_uLong nTmpKey1 = eLang & 0x7ff, // die Hauptsprache in vielen Faellen u.B. DE
           nTmpKey2 = eLang & 0x3ff, // sonst z.B. EN
           nTmp;
 
-    if( ((nTmp = nTmpKey1) != (ULONG)eLang &&
+    if( ((nTmp = nTmpKey1) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey1 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey1 ), FALSE ) )) ||
-        (( nTmp = nTmpKey2) != (ULONG)eLang &&
+           CreateLanguageFile( LanguageType( nTmpKey1 ), sal_False ) )) ||
+        (( nTmp = nTmpKey2) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey2 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey2 ), FALSE ) )) )
+           CreateLanguageFile( LanguageType( nTmpKey2 ), sal_False ) )) )
     {
         //die Sprache ist vorhanden - also her damit
         SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek( nTmp );
@@ -1807,11 +1807,11 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
             return pRet;
         }
     }
-    if( pLangTable->IsKeyValid( ULONG( LANGUAGE_DONTKNOW ) ) ||
-        CreateLanguageFile( LANGUAGE_DONTKNOW, FALSE ) )
+    if( pLangTable->IsKeyValid( sal_uLong( LANGUAGE_DONTKNOW ) ) ||
+        CreateLanguageFile( LANGUAGE_DONTKNOW, sal_False ) )
     {
         //die Sprache ist vorhanden - also her damit
-        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW));
+        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(sal_uLong(LANGUAGE_DONTKNOW));
         pRet = lcl_SearchWordsInList( pList, rTxt, rStt, nEndPos, rDoc);
         if( pRet )
         {
@@ -1824,60 +1824,60 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
 /* -----------------18.11.98 13:46-------------------
  *
  * --------------------------------------------------*/
-BOOL SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
+sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
                                              const String& sWord )
 {
     //zuerst nach eLang suchen, dann nach der Obersprace US-Englisch -> Englisch
     //und zuletzt in LANGUAGE_DONTKNOW
-    ULONG nTmpKey1 = eLang & 0x7ff; // die Hauptsprache in vielen Faellen u.B. DE
-    ULONG nTmpKey2 = eLang & 0x3ff; // sonst z.B. EN
+    sal_uLong nTmpKey1 = eLang & 0x7ff; // die Hauptsprache in vielen Faellen u.B. DE
+    sal_uLong nTmpKey2 = eLang & 0x3ff; // sonst z.B. EN
     String sTemp(sWord);
-    if( pLangTable->IsKeyValid( ULONG( eLang )) ||
-        CreateLanguageFile( eLang, FALSE ) )
+    if( pLangTable->IsKeyValid( sal_uLong( eLang )) ||
+        CreateLanguageFile( eLang, sal_False ) )
     {
         //die Sprache ist vorhanden - also her damit
-        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(sal_uLong(eLang));
         String _sTemp(sWord);
         if(pList->GetWrdSttExceptList()->Seek_Entry(&_sTemp))
-            return TRUE;
+            return sal_True;
 
     }
     // wenn es hier noch nicht gefunden werden konnte, dann weitersuchen
-    ULONG nTmp;
-    if( ((nTmp = nTmpKey1) != (ULONG)eLang &&
+    sal_uLong nTmp;
+    if( ((nTmp = nTmpKey1) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey1 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey1 ), FALSE ) )) ||
-        (( nTmp = nTmpKey2) != (ULONG)eLang &&
+           CreateLanguageFile( LanguageType( nTmpKey1 ), sal_False ) )) ||
+        (( nTmp = nTmpKey2) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey2 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey2 ), FALSE ) )) )
+           CreateLanguageFile( LanguageType( nTmpKey2 ), sal_False ) )) )
     {
         //die Sprache ist vorhanden - also her damit
         SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(nTmp);
         if(pList->GetWrdSttExceptList()->Seek_Entry(&sTemp))
-            return TRUE;
+            return sal_True;
     }
-    if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, FALSE))
+    if(pLangTable->IsKeyValid(sal_uLong(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, sal_False))
     {
         //die Sprache ist vorhanden - also her damit
-        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW));
+        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(sal_uLong(LANGUAGE_DONTKNOW));
         if(pList->GetWrdSttExceptList()->Seek_Entry(&sTemp))
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 /* -----------------18.11.98 14:28-------------------
  *
  * --------------------------------------------------*/
-BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
+sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
 {
     String sAbk( '~' );
-    USHORT nPos;
+    sal_uInt16 nPos;
     pList->Seek_Entry( &sAbk, &nPos );
     if( nPos < pList->Count() )
     {
         String sLowerWord( sWord ); sLowerWord.ToLowerAscii();
         const String* pAbk;
-        for( USHORT n = nPos;
+        for( sal_uInt16 n = nPos;
                 n < pList->Count() &&
                 '~' == ( pAbk = (*pList)[ n ])->GetChar( 0 );
             ++n )
@@ -1889,7 +1889,7 @@ BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
                 for( xub_StrLen i = sLowerAbk.Len(), ii = sLowerWord.Len(); i; )
                 {
                     if( !--i )      // stimmt ueberein
-                        return TRUE;
+                        return sal_True;
 
                     if( sLowerAbk.GetChar( i ) != sLowerWord.GetChar( --ii ))
                         break;
@@ -1899,56 +1899,56 @@ BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
     }
     DBG_ASSERT( !(nPos && '~' == (*pList)[ --nPos ]->GetChar( 0 ) ),
             "falsch sortierte ExeptionListe?" );
-    return FALSE;
+    return sal_False;
 }
 /* -----------------18.11.98 14:49-------------------
  *
  * --------------------------------------------------*/
-BOOL SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
-                                const String& sWord, BOOL bAbbreviation)
+sal_Bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
+                                const String& sWord, sal_Bool bAbbreviation)
 {
     //zuerst nach eLang suchen, dann nach der Obersprace US-Englisch -> Englisch
     //und zuletzt in LANGUAGE_DONTKNOW
-    ULONG nTmpKey1 = eLang & 0x7ff; // die Hauptsprache in vielen Faellen u.B. DE
-    ULONG nTmpKey2 = eLang & 0x3ff; // sonst z.B. EN
+    sal_uLong nTmpKey1 = eLang & 0x7ff; // die Hauptsprache in vielen Faellen u.B. DE
+    sal_uLong nTmpKey2 = eLang & 0x3ff; // sonst z.B. EN
     String sTemp( sWord );
-    if( pLangTable->IsKeyValid( ULONG( eLang )) ||
-        CreateLanguageFile( eLang, FALSE ))
+    if( pLangTable->IsKeyValid( sal_uLong( eLang )) ||
+        CreateLanguageFile( eLang, sal_False ))
     {
         //die Sprache ist vorhanden - also her damit
-        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(sal_uLong(eLang));
         const SvStringsISortDtor* pList = pLists->GetCplSttExceptList();
         if(bAbbreviation ? lcl_FindAbbreviation( pList, sWord)
                          : pList->Seek_Entry( &sTemp ) )
-            return TRUE;
+            return sal_True;
     }
     // wenn es hier noch nicht gefunden werden konnte, dann weitersuchen
-    ULONG nTmp;
+    sal_uLong nTmp;
 
-    if( ((nTmp = nTmpKey1) != (ULONG)eLang &&
+    if( ((nTmp = nTmpKey1) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey1 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey1 ), FALSE ) )) ||
-        (( nTmp = nTmpKey2) != (ULONG)eLang &&
+           CreateLanguageFile( LanguageType( nTmpKey1 ), sal_False ) )) ||
+        (( nTmp = nTmpKey2) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey2 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey2 ), FALSE ) )) )
+           CreateLanguageFile( LanguageType( nTmpKey2 ), sal_False ) )) )
     {
         //die Sprache ist vorhanden - also her damit
         SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(nTmp);
         const SvStringsISortDtor* pList = pLists->GetCplSttExceptList();
         if(bAbbreviation ? lcl_FindAbbreviation( pList, sWord)
                          : pList->Seek_Entry( &sTemp ) )
-            return TRUE;
+            return sal_True;
     }
-    if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, FALSE))
+    if(pLangTable->IsKeyValid(sal_uLong(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, sal_False))
     {
         //die Sprache ist vorhanden - also her damit
         SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(LANGUAGE_DONTKNOW);
         const SvStringsISortDtor* pList = pLists->GetCplSttExceptList();
         if(bAbbreviation ? lcl_FindAbbreviation( pList, sWord)
                          : pList->Seek_Entry( &sTemp ) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 
 }
 
@@ -1956,7 +1956,7 @@ BOOL SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
  *
  * --------------------------------------------------*/
 String SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
-                                            BOOL bNewFile, BOOL bTst ) const
+                                            sal_Bool bNewFile, sal_Bool bTst ) const
 {
     String sRet, sExt( MsLangId::convertLanguageToIsoString( eLang ) );
     sExt.Insert('_', 0);
@@ -2007,11 +2007,11 @@ SvxAutoCorrectLanguageLists::~SvxAutoCorrectLanguageLists()
 /* -----------------18.11.98 11:26-------------------
  *
  * --------------------------------------------------*/
-BOOL SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
+sal_Bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
 {
     // nur alle 2 Minuten aufs FileSystem zugreifen um den
     // Dateistempel zu ueberpruefen
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     Time nMinTime( 0, 2 );
     Time nAktTime;
@@ -2023,7 +2023,7 @@ BOOL SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
                                             &aTstDate, &aTstTime ) &&
             ( aModifiedDate != aTstDate || aModifiedTime != aTstTime ))
         {
-            bRet = TRUE;
+            bRet = sal_True;
             // dann mal schnell alle Listen entfernen!
             if( CplSttLstLoad & nFlags && pCplStt_ExcptLst )
                 delete pCplStt_ExcptLst, pCplStt_ExcptLst = 0;
@@ -2133,7 +2133,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
                             const SvStringsISortDtor& rLst,
                             const sal_Char* pStrmName,
                             SotStorageRef &rStg,
-                            BOOL bConvert )
+                            sal_Bool bConvert )
 {
     if( rStg.Is() )
     {
@@ -2287,13 +2287,13 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::GetCplSttExceptList()
 /* -----------------18.11.98 11:26-------------------
  *
  * --------------------------------------------------*/
-BOOL SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
+sal_Bool SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
 {
     String* pNew = new String( rNew );
     if( rNew.Len() && GetCplSttExceptList()->Insert( pNew ) )
     {
         MakeUserStorage_Impl();
-        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
         SaveExceptList_Imp( *pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg );
 
@@ -2310,14 +2310,14 @@ BOOL SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
 /* -----------------18.11.98 15:20-------------------
  *
  * --------------------------------------------------*/
-BOOL SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
+sal_Bool SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
 {
     String* pNew = new String( rNew );
     SvStringsISortDtor* pExceptList = LoadWrdSttExceptList();
     if( rNew.Len() && pExceptList && pExceptList->Insert( pNew ) )
     {
         MakeUserStorage_Impl();
-        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
         SaveExceptList_Imp( *pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
 
@@ -2337,7 +2337,7 @@ BOOL SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
  * --------------------------------------------------*/
 SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadCplSttExceptList()
 {
-    SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, TRUE );
+    SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, sal_True );
     String sTemp ( RTL_CONSTASCII_USTRINGPARAM ( pXMLImplCplStt_ExcptLstStr ) );
     if( xStg.Is() && xStg->IsContained( sTemp ) )
         LoadXMLExceptList_Imp( pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg );
@@ -2351,7 +2351,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadCplSttExceptList()
 void SvxAutoCorrectLanguageLists::SaveCplSttExceptList()
 {
     MakeUserStorage_Impl();
-    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
     SaveExceptList_Imp( *pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg );
 
@@ -2384,7 +2384,7 @@ void SvxAutoCorrectLanguageLists::SetCplSttExceptList( SvStringsISortDtor* pList
  * --------------------------------------------------*/
 SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
 {
-    SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, TRUE );
+    SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, sal_True );
     String sTemp ( RTL_CONSTASCII_USTRINGPARAM ( pXMLImplWrdStt_ExcptLstStr ) );
     if( xStg.Is() && xStg->IsContained( sTemp ) )
         LoadXMLExceptList_Imp( pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
@@ -2396,7 +2396,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
 void SvxAutoCorrectLanguageLists::SaveWrdSttExceptList()
 {
     MakeUserStorage_Impl();
-    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
     SaveExceptList_Imp( *pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
 
@@ -2437,7 +2437,7 @@ void SvxAutoCorrectLanguageLists::RemoveStream_Imp( const String& rName )
 {
     if( sShareAutoCorrFile != sUserAutoCorrFile )
     {
-        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
         if( xStg.Is() && SVSTREAM_OK == xStg->GetError() &&
             xStg->IsStream( rName ) )
         {
@@ -2495,7 +2495,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
             aInfo.NameClash = NameClash::OVERWRITE;
             aInfo.NewTitle  = aDest.GetName();
             aInfo.SourceURL = aSource.GetMainURL( INetURLObject::DECODE_TO_IURI );
-            aInfo.MoveData  = FALSE;
+            aInfo.MoveData  = sal_False;
             aAny <<= aInfo;
             aNewContent.executeCommand( OUString ( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), aAny);
         }
@@ -2506,8 +2506,8 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
     }
     if (bConvert && !bError)
     {
-        SotStorageRef xSrcStg = new SotStorage( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), STREAM_READ, TRUE );
-        SotStorageRef xDstStg = new SotStorage( sUserAutoCorrFile, STREAM_WRITE, TRUE );
+        SotStorageRef xSrcStg = new SotStorage( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), STREAM_READ, sal_True );
+        SotStorageRef xDstStg = new SotStorage( sUserAutoCorrFile, STREAM_WRITE, sal_True );
 
         if( xSrcStg.Is() && xDstStg.Is() )
         {
@@ -2522,7 +2522,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
 
             if (pTmpWordList)
             {
-                SaveExceptList_Imp( *pTmpWordList, pXMLImplWrdStt_ExcptLstStr, xDstStg, TRUE );
+                SaveExceptList_Imp( *pTmpWordList, pXMLImplWrdStt_ExcptLstStr, xDstStg, sal_True );
                 pTmpWordList->DeleteAndDestroy( 0, pTmpWordList->Count() );
                 pTmpWordList = NULL;
             }
@@ -2533,7 +2533,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
 
             if (pTmpWordList)
             {
-                SaveExceptList_Imp( *pTmpWordList, pXMLImplCplStt_ExcptLstStr, xDstStg, TRUE );
+                SaveExceptList_Imp( *pTmpWordList, pXMLImplCplStt_ExcptLstStr, xDstStg, sal_True );
                 pTmpWordList->DeleteAndDestroy( 0, pTmpWordList->Count() );
             }
 
@@ -2560,10 +2560,10 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
 /* -----------------18.11.98 11:26-------------------
  *
  * --------------------------------------------------*/
-BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
+sal_Bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
 {
     String sStrmName( pXMLImplAutocorr_ListStr, RTL_TEXTENCODING_MS_1252 );
-    BOOL bRet = TRUE, bRemove = !pAutocorr_List || !pAutocorr_List->Count();
+    sal_Bool bRet = sal_True, bRemove = !pAutocorr_List || !pAutocorr_List->Count();
     if( !bRemove )
     {
         /*
@@ -2617,8 +2617,8 @@ BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
                 rStg.Commit();
                 if( SVSTREAM_OK != rStg.GetError() )
                 {
-                    bRemove = TRUE;
-                    bRet = FALSE;
+                    bRemove = sal_True;
+                    bRet = sal_False;
                 }
             }
 
@@ -2629,11 +2629,11 @@ BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
 
             String aDummy;              // Erkennungszeichen fuer neue Streams
             refList->WriteByteString( aDummy, RTL_TEXTENCODING_MS_1252 )
-                     << (BYTE)  4       // Laenge des Headers (ohne den Leerstring)
-                     << (USHORT)WORDLIST_VERSION_358    // Version des Streams
-                     << (BYTE)eEncoding;                // der Zeichensatz
+                     << (sal_uInt8) 4       // Laenge des Headers (ohne den Leerstring)
+                     << (sal_uInt16)WORDLIST_VERSION_358    // Version des Streams
+                     << (sal_uInt8)eEncoding;               // der Zeichensatz
 
-            for( USHORT i = 0; i < pAutocorr_List->Count() &&
+            for( sal_uInt16 i = 0; i < pAutocorr_List->Count() &&
                                 SVSTREAM_OK == refList->GetError(); ++i )
             {
                 SvxAutocorrWord* p = pAutocorr_List->GetObject( i );
@@ -2650,14 +2650,14 @@ BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
                 rStg.Commit();
                 if( SVSTREAM_OK != rStg.GetError() )
                 {
-                    bRemove = TRUE;
-                    bRet = FALSE;
+                    bRemove = sal_True;
+                    bRet = sal_False;
                 }
             }
             */
         }
         else
-            bRet = FALSE;
+            bRet = sal_False;
     }
 
     if( bRemove )
@@ -2672,16 +2672,16 @@ BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
 /* -----------------18.11.98 11:26-------------------
  *
  * --------------------------------------------------*/
-BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
+sal_Bool SvxAutoCorrectLanguageLists::PutText( const String& rShort,
                                            const String& rLong )
 {
     // erstmal akt. Liste besorgen!
     GetAutocorrWordList();
 
     MakeUserStorage_Impl();
-    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
-    BOOL bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError();
+    sal_Bool bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError();
 
 /*  if( bRet )
     {
@@ -2691,8 +2691,8 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
     // die Wortliste aktualisieren
     if( bRet )
     {
-        USHORT nPos;
-        SvxAutocorrWord* pNew = new SvxAutocorrWord( rShort, rLong, TRUE );
+        sal_uInt16 nPos;
+        SvxAutocorrWord* pNew = new SvxAutocorrWord( rShort, rLong, sal_True );
         if( pAutocorr_List->Seek_Entry( pNew, &nPos ) )
         {
             if( !(*pAutocorr_List)[ nPos ]->IsTextOnly() )
@@ -2718,7 +2718,7 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
         else
         {
             delete pNew;
-            bRet = FALSE;
+            bRet = sal_False;
         }
     }
     return bRet;
@@ -2727,7 +2727,7 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
  *
  * --------------------------------------------------*/
     //  - Text mit Attributierung (kann nur der SWG - SWG-Format!)
-BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
+sal_Bool SvxAutoCorrectLanguageLists::PutText( const String& rShort,
                                         SfxObjectShell& rShell )
 {
     // erstmal akt. Liste besorgen!
@@ -2735,7 +2735,7 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
 
     MakeUserStorage_Impl();
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     String sLong;
     try
     {
@@ -2749,10 +2749,10 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
         // die Wortliste aktualisieren
         if( bRet )
         {
-            SvxAutocorrWord* pNew = new SvxAutocorrWord( rShort, sLong, FALSE );
+            SvxAutocorrWord* pNew = new SvxAutocorrWord( rShort, sLong, sal_False );
             if( pAutocorr_List->Insert( pNew ) )
             {
-                SotStorageRef xStor = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+                SotStorageRef xStor = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
                 MakeBlocklist_Imp( *xStor );
             }
             else
@@ -2770,18 +2770,18 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
  *
  * --------------------------------------------------*/
     //  - loesche einen Eintrag
-BOOL SvxAutoCorrectLanguageLists::DeleteText( const String& rShort )
+sal_Bool SvxAutoCorrectLanguageLists::DeleteText( const String& rShort )
 {
     // erstmal akt. Liste besorgen!
     GetAutocorrWordList();
 
     MakeUserStorage_Impl();
 
-    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
-    BOOL bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError();
+    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
+    sal_Bool bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError();
     if( bRet )
     {
-        USHORT nPos;
+        sal_uInt16 nPos;
         SvxAutocorrWord aTmp( rShort, rShort );
         if( pAutocorr_List->Seek_Entry( &aTmp, &nPos ) )
         {
@@ -2806,7 +2806,7 @@ BOOL SvxAutoCorrectLanguageLists::DeleteText( const String& rShort )
             xStg = 0;
         }
         else
-            bRet = FALSE;
+            bRet = sal_False;
     }
     return bRet;
 }
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index f693ce0270f8..79222cad5fdc 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -56,14 +56,14 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     bAFmtDelSpacesBetweenLines =
     bAFmtByInpDelSpacesAtSttEnd =
     bAFmtByInpDelSpacesBetweenLines =
-    bDummy = TRUE;
+    bDummy = sal_True;
 
     bReplaceStyles =
     bDelEmptyNode =
     bWithRedlining =
     bAutoCmpltEndless =
     bAutoCmpltAppendBlanc =
-    bAutoCmpltShowAsTip = FALSE;
+    bAutoCmpltShowAsTip = sal_False;
 
     bSetBorder =
     bCreateTable =
@@ -72,10 +72,10 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     bRightMargin =
     bAutoCompleteWords =
     bAutoCmpltCollectWords =
-    bAutoCmpltKeepList = TRUE;
+    bAutoCmpltKeepList = sal_True;
 
     bDummy6 = bDummy7 = bDummy8 =
-         FALSE;
+         sal_False;
 
     nRightMargin = 50;      // dflt. 50 %
     nAutoCmpltExpandKey = KEY_RETURN;
@@ -84,7 +84,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     aBulletFont.SetFamily( FAMILY_DONTKNOW );
     aBulletFont.SetPitch( PITCH_DONTKNOW );
     aBulletFont.SetWeight( WEIGHT_DONTKNOW );
-    aBulletFont.SetTransparent( TRUE );
+    aBulletFont.SetTransparent( sal_True );
 
     cBullet = 0x2022;
     cByInputBullet = cBullet;
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index a69fd59439c2..5f55fcd02acf 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -46,8 +46,8 @@
 *************************************************************************/
 
 TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon,
-    USHORT nCacheSz, USHORT nLft, USHORT nRght, BOOL bSimpl, BOOL bInnr,
-    BOOL bVert ) :
+    sal_uInt16 nCacheSz, sal_uInt16 nLft, sal_uInt16 nRght, sal_Bool bSimpl, sal_Bool bInnr,
+    sal_Bool bVert ) :
     pBound( NULL ),
     nCacheSize( nCacheSz ),
     nCacheIdx( 0 ),
@@ -61,7 +61,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg
     bVertical( bVert )
 {
 #ifdef DBG_UTIL
-    bFlag3 = bFlag4 = bFlag5 = bFlag6 = bFlag7 = FALSE;
+    bFlag3 = bFlag4 = bFlag5 = bFlag6 = bFlag7 = sal_False;
 #endif
     pRangeArr = new Range[ nCacheSize ];
     pCache = new SvLongsPtr[ nCacheSize ];
@@ -105,7 +105,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg
 
 TextRanger::~TextRanger()
 {
-    for( USHORT i = 0; i < nCacheSize; ++i )
+    for( sal_uInt16 i = 0; i < nCacheSize; ++i )
         delete pCache[i];
     delete[] pCache;
     delete[] pRangeArr;
@@ -119,12 +119,12 @@ TextRanger::~TextRanger()
  * the cache has to be cleared.
  * --------------------------------------------------*/
 
-void TextRanger::SetVertical( BOOL bNew )
+void TextRanger::SetVertical( sal_Bool bNew )
 {
     if( IsVertical() != bNew )
     {
         bVertical = bNew;
-        for( USHORT i = 0; i < nCacheSize; ++i )
+        for( sal_uInt16 i = 0; i < nCacheSize; ++i )
             delete pCache[i];
         memset( pRangeArr, 0, nCacheSize * sizeof( Range ) );
         memset( pCache, 0, nCacheSize * sizeof( SvLongsPtr ) );
@@ -156,17 +156,17 @@ class SvxBoundArgs
     long nLower;
     long nStart;
     long nEnd;
-    USHORT nCut;
-    USHORT nLast;
-    USHORT nNext;
-    BYTE nAct;
-    BYTE nFirst;
-    BOOL bClosed : 1;
-    BOOL bInner : 1;
-    BOOL bMultiple : 1;
-    BOOL bConcat : 1;
-    BOOL bRotate : 1;
-    void NoteRange( BOOL bToggle );
+    sal_uInt16 nCut;
+    sal_uInt16 nLast;
+    sal_uInt16 nNext;
+    sal_uInt8 nAct;
+    sal_uInt8 nFirst;
+    sal_Bool bClosed : 1;
+    sal_Bool bInner : 1;
+    sal_Bool bMultiple : 1;
+    sal_Bool bConcat : 1;
+    sal_Bool bRotate : 1;
+    void NoteRange( sal_Bool bToggle );
     long Cut( long nY, const Point& rPt1, const Point& rPt2 );
     void Add();
     void _NoteFarPoint( long nPx, long nPyDiff, long nDiff );
@@ -181,17 +181,17 @@ public:
     void NotePoint( const long nA ) { NoteMargin( nA - nStart, nA + nEnd ); }
     void NoteMargin( const long nL, const long nR )
         { if( nMin > nL ) nMin = nL; if( nMax < nR ) nMax = nR; }
-    USHORT Area( const Point& rPt );
-    void NoteUpLow( long nA, const BYTE nArea );
+    sal_uInt16 Area( const Point& rPt );
+    void NoteUpLow( long nA, const sal_uInt8 nArea );
     void Calc( const PolyPolygon& rPoly );
     void Concat( const PolyPolygon* pPoly );
     // inlines
     void NoteLast() { if( bMultiple ) NoteRange( nAct == nFirst ); }
-    void SetClosed( const BOOL bNew ){ bClosed = bNew; }
-    BOOL IsClosed() const { return bClosed; }
-    void SetConcat( const BOOL bNew ){ bConcat = bNew; }
-    BOOL IsConcat() const { return bConcat; }
-    BYTE GetAct() const { return nAct; }
+    void SetClosed( const sal_Bool bNew ){ bClosed = bNew; }
+    sal_Bool IsClosed() const { return bClosed; }
+    void SetConcat( const sal_Bool bNew ){ bConcat = bNew; }
+    sal_Bool IsConcat() const { return bConcat; }
+    sal_uInt8 GetAct() const { return nAct; }
 };
 
 SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, SvLongs *pLong,
@@ -199,7 +199,7 @@ SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, SvLongs *pLong,
     : pLongArr( pLong ), pTextRanger( pRanger ),
     nTop( rRange.Min() ), nBottom( rRange.Max() ),
     bInner( pRanger->IsInner() ), bMultiple( bInner || !pRanger->IsSimple() ),
-    bConcat( FALSE ), bRotate( pRanger->IsVertical() )
+    bConcat( sal_False ), bRotate( pRanger->IsVertical() )
 {
     if( bRotate )
     {
@@ -236,7 +236,7 @@ long SvxBoundArgs::CalcMax( const Point& rPt1, const Point& rPt2,
     nB += nDa * nDa;
     nB = nRange + nDa * ( nFarRange - nRange ) / sqrt( nB );
 
-    BOOL bNote;
+    sal_Bool bNote;
     if( nB < B(rPt2) )
         bNote = nB > B(rPt1);
     else
@@ -282,19 +282,19 @@ void SvxBoundArgs::_NoteFarPoint( long nPa, long nPbDiff, long nDiff )
     NoteMargin( nTmpA, nPbDiff );
 }
 
-void SvxBoundArgs::NoteRange( BOOL bToggle )
+void SvxBoundArgs::NoteRange( sal_Bool bToggle )
 {
     DBG_ASSERT( nMax >= nMin || bInner, "NoteRange: Min > Max?");
     if( nMax < nMin )
         return;
     if( !bClosed )
-        bToggle = FALSE;
-    USHORT nIdx = 0;
-    USHORT nCount = pLongArr->Count();
+        bToggle = sal_False;
+    sal_uInt16 nIdx = 0;
+    sal_uInt16 nCount = pLongArr->Count();
     DBG_ASSERT( nCount == 2 * aBoolArr.size(), "NoteRange: Incompatible Sizes" );
     while( nIdx < nCount && (*pLongArr)[ nIdx ] < nMin )
         ++nIdx;
-    BOOL bOdd = nIdx % 2 ? TRUE : FALSE;
+    sal_Bool bOdd = nIdx % 2 ? sal_True : sal_False;
     // Kein Ueberlappung mit vorhandenen Intervallen?
     if( nIdx == nCount || ( !bOdd && nMax < (*pLongArr)[ nIdx ] ) )
     {   // Dann wird ein neues eingefuegt ...
@@ -304,7 +304,7 @@ void SvxBoundArgs::NoteRange( BOOL bToggle )
     }
     else
     {   // ein vorhandes Intervall erweitern ...
-        USHORT nMaxIdx = nIdx;
+        sal_uInt16 nMaxIdx = nIdx;
         // Wenn wir auf einer linken Intervallgrenze gelandet sind, muss diese
         // auf nMin gesenkt werden.
         if( bOdd )
@@ -323,14 +323,14 @@ void SvxBoundArgs::NoteRange( BOOL bToggle )
         if( nMaxIdx % 2 )
             (*pLongArr)[ nMaxIdx-- ] = nMax;
         // Jetzt werden eventuell noch Intervalle verschmolzen
-        USHORT nDiff = nMaxIdx - nIdx;
+        sal_uInt16 nDiff = nMaxIdx - nIdx;
         nMaxIdx = nIdx / 2; // Ab hier ist nMaxIdx der Index im BoolArray.
         if( nDiff )
         {
             (*pLongArr).Remove( nIdx + 1, nDiff );
             nDiff /= 2;
-            USHORT nStop = nMaxIdx + nDiff;
-            for( USHORT i = nMaxIdx; i < nStop; ++i )
+            sal_uInt16 nStop = nMaxIdx + nDiff;
+            for( sal_uInt16 i = nMaxIdx; i < nStop; ++i )
                 bToggle ^= aBoolArr[ i ];
             aBoolArr.erase( aBoolArr.begin() + nMaxIdx, aBoolArr.begin() + (nMaxIdx + nDiff) );
         }
@@ -341,9 +341,9 @@ void SvxBoundArgs::NoteRange( BOOL bToggle )
 
 void SvxBoundArgs::Calc( const PolyPolygon& rPoly )
 {
-    USHORT nCount;
+    sal_uInt16 nCount;
     nAct = 0;
-    for( USHORT i = 0; i < rPoly.Count(); ++i )
+    for( sal_uInt16 i = 0; i < rPoly.Count(); ++i )
     {
         const Polygon& rPol = rPoly[ i ];
         nCount = rPol.GetSize();
@@ -389,8 +389,8 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly )
             }
             if( nCount > 1 )
             {
-                USHORT nIdx = 1;
-                while( TRUE )
+                sal_uInt16 nIdx = 1;
+                while( sal_True )
                 {
                     const Point& rLast = rPol[ nIdx - 1 ];
                     if( nIdx == nCount )
@@ -398,7 +398,7 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly )
                     const Point& rNext = rPol[ nIdx ];
                     nNext = Area( rNext );
                     nCut = nNext ^ nLast;
-                    USHORT nOldAct = nAct;
+                    sal_uInt16 nOldAct = nAct;
                     if( nAct )
                         CheckCut( rLast, rNext );
                     if( nCut & 4 )
@@ -478,18 +478,18 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly )
 
 void SvxBoundArgs::Add()
 {
-    USHORT nLongIdx = 1;
+    sal_uInt16 nLongIdx = 1;
     size_t nCount = aBoolArr.size();
     if( nCount && ( !bInner || !pTextRanger->IsSimple() ) )
     {
-        BOOL bDelete = aBoolArr.front();
+        sal_Bool bDelete = aBoolArr.front();
         if( bInner )
             bDelete = !bDelete;
         for( size_t nBoolIdx = 1; nBoolIdx < nCount; ++nBoolIdx )
         {
             if( bDelete )
             {
-                USHORT next = 2;
+                sal_uInt16 next = 2;
                 while( nBoolIdx < nCount && !aBoolArr[ nBoolIdx++ ] &&
                        (!bInner || nBoolIdx < nCount ) )
                     next += 2;
@@ -499,7 +499,7 @@ void SvxBoundArgs::Add()
                 nCount = nCount - next;
                 aBoolArr.erase( aBoolArr.begin() + nBoolIdx, aBoolArr.begin() + (nBoolIdx + next) );
                 if( nBoolIdx )
-                    aBoolArr[ nBoolIdx - 1 ] = FALSE;
+                    aBoolArr[ nBoolIdx - 1 ] = sal_False;
 #if OSL_DEBUG_LEVEL > 1
                 else
                     ++next;
@@ -534,20 +534,20 @@ void SvxBoundArgs::Add()
 
 void SvxBoundArgs::Concat( const PolyPolygon* pPoly )
 {
-    SetConcat( TRUE );
+    SetConcat( sal_True );
     DBG_ASSERT( pPoly, "Nothing to do?" );
     SvLongs *pOld = pLongArr;
     pLongArr = new SvLongs( 2, 8 );
     aBoolArr.clear();
-    bInner = FALSE;
+    bInner = sal_False;
     Calc( *pPoly );
-    USHORT nCount = pLongArr->Count();
-    USHORT nIdx = 0;
-    USHORT i = 0;
-    BOOL bSubtract = pTextRanger->IsInner();
+    sal_uInt16 nCount = pLongArr->Count();
+    sal_uInt16 nIdx = 0;
+    sal_uInt16 i = 0;
+    sal_Bool bSubtract = pTextRanger->IsInner();
     while( i < nCount )
     {
-        USHORT nOldCount = pOld->Count();
+        sal_uInt16 nOldCount = pOld->Count();
         if( nIdx == nOldCount )
         {   // Am Ende des alten Arrays angelangt...
             if( !bSubtract )
@@ -556,7 +556,7 @@ void SvxBoundArgs::Concat( const PolyPolygon* pPoly )
         }
         long nLeft = (*pLongArr)[ i++ ];
         long nRight = (*pLongArr)[ i++ ];
-        USHORT nLeftPos = nIdx + 1;
+        sal_uInt16 nLeftPos = nIdx + 1;
         while( nLeftPos < nOldCount && nLeft > (*pOld)[ nLeftPos ] )
             nLeftPos += 2;
         if( nLeftPos >= nOldCount )
@@ -565,7 +565,7 @@ void SvxBoundArgs::Concat( const PolyPolygon* pPoly )
                 pOld->Insert( pLongArr, nOldCount, i - 2, USHRT_MAX );
             break;
         }
-        USHORT nRightPos = nLeftPos - 1;
+        sal_uInt16 nRightPos = nLeftPos - 1;
         while( nRightPos < nOldCount && nRight >= (*pOld)[ nRightPos ] )
             nRightPos += 2;
         if( nRightPos < nLeftPos )
@@ -618,7 +618,7 @@ void SvxBoundArgs::Concat( const PolyPolygon* pPoly )
  *10 = oberhalb des unteren Randes
  *************************************************************************/
 
-USHORT SvxBoundArgs::Area( const Point& rPt )
+sal_uInt16 SvxBoundArgs::Area( const Point& rPt )
 {
     long nB = B( rPt );
     if( nB >= nBottom )
@@ -658,7 +658,7 @@ long SvxBoundArgs::Cut( long nB, const Point& rPt1, const Point& rPt2 )
     return long( rPt1.X() + nQuot );
 }
 
-void SvxBoundArgs::NoteUpLow( long nA, const BYTE nArea )
+void SvxBoundArgs::NoteUpLow( long nA, const sal_uInt8 nArea )
 {
     if( nAct )
     {
@@ -682,7 +682,7 @@ void SvxBoundArgs::NoteUpLow( long nA, const BYTE nArea )
 SvLongsPtr TextRanger::GetTextRanges( const Range& rRange )
 {
     DBG_ASSERT( rRange.Min() || rRange.Max(), "Zero-Range not allowed, Bye Bye" );
-    USHORT nIndex = 0;
+    sal_uInt16 nIndex = 0;
     while( nIndex < nCacheSize && rRange != pRangeArr[ nIndex ] )
         ++nIndex;
     if( nIndex >= nCacheSize )
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index ae92fd1a01b8..f619f2fbf86b 100755
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -97,12 +97,12 @@ static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl()
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL lcl_FindEntry( const OUString &rEntry, const Sequence< OUString > &rCfgSvcs )
+sal_Bool lcl_FindEntry( const OUString &rEntry, const Sequence< OUString > &rCfgSvcs )
 {
-    INT32 nRes = -1;
-    INT32 nEntries = rCfgSvcs.getLength();
+    sal_Int32 nRes = -1;
+    sal_Int32 nEntries = rCfgSvcs.getLength();
     const OUString *pEntry = rCfgSvcs.getConstArray();
-    for (INT32 i = 0;  i < nEntries && nRes == -1;  ++i)
+    for (sal_Int32 i = 0;  i < nEntries && nRes == -1;  ++i)
     {
         if (rEntry == pEntry[i])
             nRes = i;
@@ -117,11 +117,11 @@ Sequence< OUString > lcl_RemoveMissingEntries(
 {
     Sequence< OUString > aRes( rCfgSvcs.getLength() );
     OUString *pRes = aRes.getArray();
-    INT32 nCnt = 0;
+    sal_Int32 nCnt = 0;
 
-    INT32 nEntries = rCfgSvcs.getLength();
+    sal_Int32 nEntries = rCfgSvcs.getLength();
     const OUString *pEntry = rCfgSvcs.getConstArray();
-    for (INT32 i = 0;  i < nEntries;  ++i)
+    for (sal_Int32 i = 0;  i < nEntries;  ++i)
     {
         if (pEntry[i].getLength() && lcl_FindEntry( pEntry[i], rAvailSvcs ))
             pRes[ nCnt++ ] = pEntry[i];
@@ -143,7 +143,7 @@ Sequence< OUString > lcl_GetLastFoundSvcs(
                                 SvxLocaleToLanguage( rAvailLocale ) ) );
 
     Sequence< OUString > aNodeNames( rCfg.GetNodeNames(rLastFoundList) );
-    BOOL bFound = lcl_FindEntry( aCfgLocaleStr, aNodeNames);
+    sal_Bool bFound = lcl_FindEntry( aCfgLocaleStr, aNodeNames);
 
     if (bFound)
     {
@@ -178,13 +178,13 @@ Sequence< OUString > lcl_GetNewEntries(
         const Sequence< OUString > &rLastFoundSvcs,
         const Sequence< OUString > &rAvailSvcs )
 {
-    INT32 nLen = rAvailSvcs.getLength();
+    sal_Int32 nLen = rAvailSvcs.getLength();
     Sequence< OUString > aRes( nLen );
     OUString *pRes = aRes.getArray();
-    INT32 nCnt = 0;
+    sal_Int32 nCnt = 0;
 
     const OUString *pEntry = rAvailSvcs.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         if (pEntry[i].getLength() && !lcl_FindEntry( pEntry[i], rLastFoundSvcs ))
             pRes[ nCnt++ ] = pEntry[i];
@@ -201,17 +201,17 @@ Sequence< OUString > lcl_MergeSeq(
 {
     Sequence< OUString > aRes( rCfgSvcs.getLength() + rNewSvcs.getLength() );
     OUString *pRes = aRes.getArray();
-    INT32 nCnt = 0;
+    sal_Int32 nCnt = 0;
 
-    for (INT32 k = 0;  k < 2;  ++k)
+    for (sal_Int32 k = 0;  k < 2;  ++k)
     {
         // add previously configuerd service first and append
         // new found services at the end
         const Sequence< OUString > &rSeq = k == 0 ? rCfgSvcs : rNewSvcs;
 
-        INT32 nLen = rSeq.getLength();
+        sal_Int32 nLen = rSeq.getLength();
         const OUString *pEntry = rSeq.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             if (pEntry[i].getLength() && !lcl_FindEntry( pEntry[i], aRes ))
                 pRes[ nCnt++ ] = pEntry[i];
@@ -225,8 +225,8 @@ Sequence< OUString > lcl_MergeSeq(
 ///////////////////////////////////////////////////////////////////////////
 
 // static member initialization
-INT16 SvxLinguConfigUpdate::nNeedUpdating = -1;
-INT32 SvxLinguConfigUpdate::nCurrentDataFilesChangedCheckValue = -1;
+sal_Int16 SvxLinguConfigUpdate::nNeedUpdating = -1;
+sal_Int32 SvxLinguConfigUpdate::nCurrentDataFilesChangedCheckValue = -1;
 
 void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
 {
@@ -266,13 +266,13 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
             OUString aService( A2OU( apServices[k] ) );
             OUString aActiveList( A2OU( apCurLists[k] ) );
             OUString aLastFoundList( A2OU( apLastFoundLists[k] ) );
-            INT32 i;
+            sal_Int32 i;
 
             //
             // remove configured but not available language/services entries
             //
             Sequence< OUString > aNodeNames( aCfg.GetNodeNames( aActiveList ) );   // list of configured locales
-            INT32 nNodeNames = aNodeNames.getLength();
+            sal_Int32 nNodeNames = aNodeNames.getLength();
             const OUString *pNodeName = aNodeNames.getConstArray();
             for (i = 0;  i < nNodeNames;  ++i)
             {
@@ -297,7 +297,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
             //
             uno::Reference< XAvailableLocales > xAvail( xLngSvcMgr, UNO_QUERY );
             Sequence< Locale > aAvailLocales( xAvail->getAvailableLocales(aService) );
-            INT32 nAvailLocales = aAvailLocales.getLength();
+            sal_Int32 nAvailLocales = aAvailLocales.getLength();
             const Locale *pAvailLocale = aAvailLocales.getConstArray();
             for (i = 0;  i < nAvailLocales;  ++i)
             {
@@ -341,9 +341,9 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
                         xLngSvcMgr->getAvailableServices( aService, pAvailLocale[i] ) );
 
 #if OSL_DEBUG_LEVEL > 1
-                INT32 nSvcs = aSvcImplNames.getLength();
+                sal_Int32 nSvcs = aSvcImplNames.getLength();
                 const OUString *pSvcImplName = aSvcImplNames.getConstArray();
-                for (INT32 j = 0;  j < nSvcs;  ++j)
+                for (sal_Int32 j = 0;  j < nSvcs;  ++j)
                 {
                     OUString aImplName( pSvcImplName[j] );
                 }
@@ -378,9 +378,9 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
 
 #if OSL_DEBUG_LEVEL > 1
                     Sequence< OUString > aSvcImplNames( (*aIt).second );
-                    INT32 nSvcs = aSvcImplNames.getLength();
+                    sal_Int32 nSvcs = aSvcImplNames.getLength();
                     const OUString *pSvcImplName = aSvcImplNames.getConstArray();
-                    for (INT32 j = 0;  j < nSvcs;  ++j)
+                    for (sal_Int32 j = 0;  j < nSvcs;  ++j)
                     {
                         OUString aImplName( pSvcImplName[j] );
                     }
@@ -396,7 +396,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
                 {
                     RTL_LOGFILE_CONTEXT( aLog, "svx: SvxLinguConfigUpdate::UpdateAll - ReplaceSetProperties" );
                     // add new or replace existing entries.
-                    BOOL bRes = aCfg.ReplaceSetProperties( aSubNodeName, aNewValues );
+                    sal_Bool bRes = aCfg.ReplaceSetProperties( aSubNodeName, aNewValues );
                     if (!bRes)
                     {
 #if OSL_DEBUG_LEVEL > 1
@@ -418,7 +418,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
         // not be too troublesome.
         // In OOo 3.0 we will not need the respective code anymore at all.
 //      aAny <<= nCurrentDataFilesChangedCheckValue;
-        aAny <<= (INT32) -1;    // keep the value set to 'need to check'
+        aAny <<= (sal_Int32) -1;    // keep the value set to 'need to check'
 
         aCfg.SetProperty( A2OU( "DataFilesChangedCheckValue" ), aAny );
 
@@ -435,17 +435,17 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
 }
 
 
-INT32 SvxLinguConfigUpdate::CalcDataFilesChangedCheckValue()
+sal_Int32 SvxLinguConfigUpdate::CalcDataFilesChangedCheckValue()
 {
     RTL_LOGFILE_CONTEXT( aLog, "svx: SvxLinguConfigUpdate::CalcDataFilesChangedCheckValue" );
 
-    INT32 nHashVal = 0;
+    sal_Int32 nHashVal = 0;
     // nothing to be checked anymore since those old directory paths are gone by now
     return nHashVal;
 }
 
 
-BOOL SvxLinguConfigUpdate::IsNeedUpdateAll( sal_Bool bForceCheck )
+sal_Bool SvxLinguConfigUpdate::IsNeedUpdateAll( sal_Bool bForceCheck )
 {
     RTL_LOGFILE_CONTEXT( aLog, "svx: SvxLinguConfigUpdate::IsNeedUpdateAll" );
     if (nNeedUpdating == -1 || bForceCheck )    // need to check if updating is necessary
@@ -522,10 +522,10 @@ void ThesDummy_Impl::GetCfgLocales()
         String  aNode( A2OU( "ServiceManager/ThesaurusList" ) );
         Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) );
         const OUString *pNodeNames = aNodeNames.getConstArray();
-        INT32 nLen = aNodeNames.getLength();
+        sal_Int32 nLen = aNodeNames.getLength();
         pLocaleSeq = new Sequence< Locale >( nLen );
         Locale *pLocale = pLocaleSeq->getArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             pLocale[i] = SvxCreateLocale(
                             MsLangId::convertIsoStringToLanguage( pNodeNames[i] ) );
@@ -580,8 +580,8 @@ sal_Bool SAL_CALL
     else if (!pLocaleSeq)       // if not already loaded save startup time by avoiding loading them now
         GetCfgLocales();
         GetCfgLocales();
-    BOOL bFound = FALSE;
-    INT32 nLen = pLocaleSeq->getLength();
+    sal_Bool bFound = sal_False;
+    sal_Int32 nLen = pLocaleSeq->getLength();
     const Locale *pLocale = pLocaleSeq->getConstArray();
     const Locale *pEnd = pLocale + nLen;
     for ( ;  pLocale < pEnd  &&  !bFound;  ++pLocale)
@@ -681,7 +681,7 @@ sal_Bool SAL_CALL
         throw(uno::RuntimeException)
 {
     GetSpell_Impl();
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xSpell.is())
         bRes = xSpell->hasLanguage( nLanguage );
     return bRes;
@@ -695,7 +695,7 @@ sal_Bool SAL_CALL
               uno::RuntimeException)
 {
     GetSpell_Impl();
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
     if (xSpell.is())
         bRes = xSpell->isValid( rWord, nLanguage, rProperties );
     return bRes;
@@ -800,7 +800,7 @@ sal_Bool SAL_CALL
         throw(uno::RuntimeException)
 {
     GetHyph_Impl();
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xHyph.is())
         bRes = xHyph->hasLocale( rLocale );
     return bRes;
@@ -1274,32 +1274,32 @@ SvxAlternativeSpelling SvxGetAltSpelling(
     {
         OUString aWord( rHyphWord->getWord() ),
                  aAltWord( rHyphWord->getHyphenatedWord() );
-        INT16   nHyphenationPos     = rHyphWord->getHyphenationPos(),
+        sal_Int16   nHyphenationPos     = rHyphWord->getHyphenationPos(),
                 nHyphenPos          = rHyphWord->getHyphenPos();
-        INT16   nLen    = (INT16)aWord.getLength();
-        INT16   nAltLen = (INT16)aAltWord.getLength();
+        sal_Int16   nLen    = (sal_Int16)aWord.getLength();
+        sal_Int16   nAltLen = (sal_Int16)aAltWord.getLength();
         const sal_Unicode *pWord    = aWord.getStr(),
                           *pAltWord = aAltWord.getStr();
 
         // count number of chars from the left to the
         // hyphenation pos / hyphen pos that are equal
-        INT16 nL = 0;
+        sal_Int16 nL = 0;
         while (nL <= nHyphenationPos && nL <= nHyphenPos
                && pWord[ nL ] == pAltWord[ nL ])
             ++nL;
         // count number of chars from the right to the
         // hyphenation pos / hyphen pos that are equal
-        INT16 nR = 0;
-        INT32 nIdx    = nLen - 1;
-        INT32 nAltIdx = nAltLen - 1;
+        sal_Int16 nR = 0;
+        sal_Int32 nIdx    = nLen - 1;
+        sal_Int32 nAltIdx = nAltLen - 1;
         while (nIdx > nHyphenationPos && nAltIdx > nHyphenPos
                && pWord[ nIdx-- ] == pAltWord[ nAltIdx-- ])
             ++nR;
 
         aRes.aReplacement       = OUString( aAltWord.copy( nL, nAltLen - nL - nR ) );
-        aRes.nChangedPos        = (INT16) nL;
+        aRes.nChangedPos        = (sal_Int16) nL;
         aRes.nChangedLength     = nLen - nL - nR;
-        aRes.bIsAltSpelling     = TRUE;
+        aRes.bIsAltSpelling     = sal_True;
         aRes.xHyphWord          = rHyphWord;
     }
     return aRes;
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index de0a555f004c..bebffbe5f586 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -55,7 +55,7 @@ OutlinerEditEng::~OutlinerEditEng()
 {
 }
 
-void OutlinerEditEng::PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
+void OutlinerEditEng::PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
 {
     if( GetControlWord() && EE_CNTRL_OUTLINER )
     {
@@ -66,7 +66,7 @@ void OutlinerEditEng::PaintingFirstLine( USHORT nPara, const Point& rStartPos, l
     pOwner->PaintBullet( nPara, rStartPos, rOrigin, nOrientation, pOutDev );
 }
 
-const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( USHORT nPara ) const
+const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( sal_uInt16 nPara ) const
 {
     const SvxNumberFormat* pFmt = NULL;
     if (pOwner)
@@ -75,32 +75,32 @@ const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( USHORT nPara ) const
 }
 
 
-Rectangle OutlinerEditEng::GetBulletArea( USHORT nPara )
+Rectangle OutlinerEditEng::GetBulletArea( sal_uInt16 nPara )
 {
     Rectangle aBulletArea = Rectangle( Point(), Point() );
     if ( nPara < pOwner->pParaList->GetParagraphCount() )
     {
         if ( pOwner->ImplHasBullet( nPara ) )
-            aBulletArea = pOwner->ImpCalcBulletArea( nPara, FALSE, FALSE );
+            aBulletArea = pOwner->ImpCalcBulletArea( nPara, sal_False, sal_False );
     }
     return aBulletArea;
 }
 
-void OutlinerEditEng::ParagraphInserted( USHORT nNewParagraph )
+void OutlinerEditEng::ParagraphInserted( sal_uInt16 nNewParagraph )
 {
     pOwner->ParagraphInserted( nNewParagraph );
 
     EditEngine::ParagraphInserted( nNewParagraph );
 }
 
-void OutlinerEditEng::ParagraphDeleted( USHORT nDeletedParagraph )
+void OutlinerEditEng::ParagraphDeleted( sal_uInt16 nDeletedParagraph )
 {
     pOwner->ParagraphDeleted( nDeletedParagraph );
 
     EditEngine::ParagraphDeleted( nDeletedParagraph );
 }
 
-void OutlinerEditEng::ParagraphConnected( USHORT /*nLeftParagraph*/, USHORT nRightParagraph )
+void OutlinerEditEng::ParagraphConnected( sal_uInt16 /*nLeftParagraph*/, sal_uInt16 nRightParagraph )
 {
     if( pOwner && pOwner->IsUndoEnabled() && !const_cast<EditEngine&>(pOwner->GetEditEngine()).IsInUndo() )
     {
@@ -118,22 +118,22 @@ void OutlinerEditEng::StyleSheetChanged( SfxStyleSheet* pStyle )
     pOwner->StyleSheetChanged( pStyle );
 }
 
-void OutlinerEditEng::ParaAttribsChanged( USHORT nPara )
+void OutlinerEditEng::ParaAttribsChanged( sal_uInt16 nPara )
 {
     pOwner->ParaAttribsChanged( nPara );
 }
 
-BOOL OutlinerEditEng::SpellNextDocument()
+sal_Bool OutlinerEditEng::SpellNextDocument()
 {
     return pOwner->SpellNextDocument();
 }
 
-BOOL OutlinerEditEng::ConvertNextDocument()
+sal_Bool OutlinerEditEng::ConvertNextDocument()
 {
     return pOwner->ConvertNextDocument();
 }
 
-XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
+XubString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const
 {
     switch( nUndoId )
     {
@@ -158,8 +158,8 @@ XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
 }
 
 // #101498#
-void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen,
-    const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen,
+    const sal_Int32* pDXArray, const SvxFont& rFont, sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
     const EEngineData::WrongSpellVector* pWrongSpellVector,
     const SvxFieldData* pFieldData,
     bool bEndOfLine,
@@ -204,23 +204,23 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rTex
         pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, bEndOfBullet, pLocale, rOverlineColor, rTextLineColor);
 }
 
-void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
 {
     EditEngine::FieldClicked( rField, nPara, nPos );    // Falls URL
     pOwner->FieldClicked( rField, nPara, nPos );
 }
 
-void OutlinerEditEng::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void OutlinerEditEng::FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
 {
     pOwner->FieldSelected( rField, nPara, nPos );
 }
 
-XubString OutlinerEditEng::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString OutlinerEditEng::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     return pOwner->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
 
-void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void OutlinerEditEng::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
     if( pPara )
@@ -228,13 +228,13 @@ void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
         if ( !IsInUndo() && IsUndoEnabled() )
             pOwner->UndoActionStart( OLUNDO_ATTR );
 
-        EditEngine::SetParaAttribs( (USHORT)nPara, rSet );
+        EditEngine::SetParaAttribs( (sal_uInt16)nPara, rSet );
 
-        pOwner->ImplCheckNumBulletItem( (USHORT)nPara );
+        pOwner->ImplCheckNumBulletItem( (sal_uInt16)nPara );
         // --> OD 2009-03-10 #i100014#
         // It is not a good idea to substract 1 from a count and cast the result
-        // to USHORT without check, if the count is 0.
-        pOwner->ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pOwner->pParaList->GetParagraphCount()) );
+        // to sal_uInt16 without check, if the count is 0.
+        pOwner->ImplCheckParagraphs( (sal_uInt16)nPara, (sal_uInt16) (pOwner->pParaList->GetParagraphCount()) );
         // <--
 
         if ( !IsInUndo() && IsUndoEnabled() )
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index fadbd8779eea..b66600041247 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -43,22 +43,22 @@ protected:
 
     // derived from EditEngine. Allows Outliner objetcs to provide
     // bullet access to the EditEngine.
-    virtual const SvxNumberFormat*  GetNumberFormat( USHORT nPara ) const;
+    virtual const SvxNumberFormat*  GetNumberFormat( sal_uInt16 nPara ) const;
 
 public:
                         OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool );
                         ~OutlinerEditEng();
 
-    virtual void        PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
+    virtual void        PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
 
-    virtual void        ParagraphInserted( USHORT nNewParagraph );
-    virtual void        ParagraphDeleted( USHORT nDeletedParagraph );
-    virtual void        ParagraphConnected( USHORT nLeftParagraph, USHORT nRightParagraph );
+    virtual void        ParagraphInserted( sal_uInt16 nNewParagraph );
+    virtual void        ParagraphDeleted( sal_uInt16 nDeletedParagraph );
+    virtual void        ParagraphConnected( sal_uInt16 nLeftParagraph, sal_uInt16 nRightParagraph );
 
     // #101498#
     virtual void DrawingText(
-        const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont,
-        USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+        const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont,
+        sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         bool bEndOfLine,
@@ -69,20 +69,20 @@ public:
         const Color& rTextLineColor);
 
     virtual void        StyleSheetChanged( SfxStyleSheet* pStyle );
-    virtual void        ParaAttribsChanged( USHORT nPara );
-    virtual BOOL        SpellNextDocument();
-    virtual XubString   GetUndoComment( USHORT nUndoId ) const;
+    virtual void        ParaAttribsChanged( sal_uInt16 nPara );
+    virtual sal_Bool        SpellNextDocument();
+    virtual XubString   GetUndoComment( sal_uInt16 nUndoId ) const;
 
     // for text conversion
-    virtual BOOL        ConvertNextDocument();
+    virtual sal_Bool        ConvertNextDocument();
 
-    virtual void        FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
-    virtual void        FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
-    virtual XubString   CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual void        FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos );
+    virtual void        FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos );
+    virtual XubString   CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor );
 
-    virtual Rectangle   GetBulletArea( USHORT nPara );
+    virtual Rectangle   GetBulletArea( sal_uInt16 nPara );
 
-       virtual void        SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+       virtual void        SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
 
     // belongs into class Outliner, move there before incompatible update!
     Link                aOutlinerNotifyHdl;
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 81db53b3d474..26994e7b832e 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -60,14 +60,14 @@ using namespace ::com::sun::star::linguistic2;
 // ======================   Einfache Durchreicher =======================
 // ======================================================================
 
-void Outliner::SetUpdateMode( BOOL bUpdate )
+void Outliner::SetUpdateMode( sal_Bool bUpdate )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetUpdateMode( bUpdate );
 }
 
 
-BOOL Outliner::GetUpdateMode() const
+sal_Bool Outliner::GetUpdateMode() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetUpdateMode();
@@ -79,13 +79,13 @@ const SfxItemSet& Outliner::GetEmptyItemSet() const
     return pEditEngine->GetEmptyItemSet();
 }
 
-void Outliner::EnableUndo( BOOL bEnable )
+void Outliner::EnableUndo( sal_Bool bEnable )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->EnableUndo( bEnable );
 }
 
-BOOL Outliner::IsUndoEnabled() const
+sal_Bool Outliner::IsUndoEnabled() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsUndoEnabled();
@@ -122,13 +122,13 @@ void Outliner::ClearModifyFlag()
     pEditEngine->ClearModifyFlag();
 }
 
-BOOL Outliner::IsModified() const
+sal_Bool Outliner::IsModified() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsModified();
 }
 
-ULONG Outliner::GetTextHeight() const
+sal_uLong Outliner::GetTextHeight() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetTextHeight();
@@ -176,31 +176,31 @@ Link Outliner::GetStatusEventHdl() const
     return pEditEngine->GetStatusEventHdl();
 }
 
-void Outliner::SetDefTab( USHORT nTab )
+void Outliner::SetDefTab( sal_uInt16 nTab )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetDefTab( nTab );
 }
 
-USHORT Outliner::GetDefTab() const
+sal_uInt16 Outliner::GetDefTab() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetDefTab();
 }
 
-BOOL Outliner::IsFlatMode() const
+sal_Bool Outliner::IsFlatMode() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsFlatMode();
 }
 
-BOOL Outliner::UpdateFields()
+sal_Bool Outliner::UpdateFields()
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->UpdateFields();
 }
 
-void Outliner::RemoveFields( BOOL bKeepFieldText, TypeId aType )
+void Outliner::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->RemoveFields( bKeepFieldText, aType );
@@ -218,7 +218,7 @@ String Outliner::GetWordDelimiters() const
     return pEditEngine->GetWordDelimiters();
 }
 
-String Outliner::GetWord( USHORT nPara, USHORT nIndex )
+String Outliner::GetWord( sal_uInt16 nPara, sal_uInt16 nIndex )
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetWord( nPara, nIndex );
@@ -303,7 +303,7 @@ void Outliner::SetMaxAutoPaperSize( const Size& rSz )
     pEditEngine->SetMaxAutoPaperSize( rSz );
 }
 
-BOOL Outliner::IsExpanded( Paragraph* pPara ) const
+sal_Bool Outliner::IsExpanded( Paragraph* pPara ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->HasVisibleChilds( pPara );
@@ -315,7 +315,7 @@ Paragraph* Outliner::GetParent( Paragraph* pParagraph ) const
     return pParaList->GetParent( pParagraph );
 }
 
-ULONG Outliner::GetChildCount( Paragraph* pParent ) const
+sal_uLong Outliner::GetChildCount( Paragraph* pParent ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->GetChildCount( pParent );
@@ -330,7 +330,7 @@ Size Outliner::CalcTextSize()
 Point Outliner::GetDocPos( Paragraph* pPara )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetDocPosTopLeft( (USHORT)pParaList->GetAbsPos( pPara ) );
+    return pEditEngine->GetDocPosTopLeft( (sal_uInt16)pParaList->GetAbsPos( pPara ) );
 }
 
 void Outliner::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
@@ -345,73 +345,73 @@ SfxStyleSheetPool* Outliner::GetStyleSheetPool()
     return pEditEngine->GetStyleSheetPool();
 }
 
-SfxStyleSheet* Outliner::GetStyleSheet( ULONG nPara )
+SfxStyleSheet* Outliner::GetStyleSheet( sal_uLong nPara )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetStyleSheet( (USHORT)nPara );
+    return pEditEngine->GetStyleSheet( (sal_uInt16)nPara );
 }
 
-BOOL Outliner::IsInSelectionMode() const
+sal_Bool Outliner::IsInSelectionMode() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsInSelectionMode();
 }
 
-void Outliner::SetControlWord( ULONG nWord )
+void Outliner::SetControlWord( sal_uLong nWord )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetControlWord( nWord );
 }
 
-ULONG Outliner::GetControlWord() const
+sal_uLong Outliner::GetControlWord() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetControlWord();
 }
 
-void Outliner::SetAsianCompressionMode( USHORT n )
+void Outliner::SetAsianCompressionMode( sal_uInt16 n )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetAsianCompressionMode( n );
 }
 
-USHORT Outliner::GetAsianCompressionMode() const
+sal_uInt16 Outliner::GetAsianCompressionMode() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetAsianCompressionMode();
 }
 
-void Outliner::SetKernAsianPunctuation( BOOL b )
+void Outliner::SetKernAsianPunctuation( sal_Bool b )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetKernAsianPunctuation( b );
 }
 
-BOOL Outliner::IsKernAsianPunctuation() const
+sal_Bool Outliner::IsKernAsianPunctuation() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsKernAsianPunctuation();
 }
 
-void Outliner::SetAddExtLeading( BOOL bExtLeading )
+void Outliner::SetAddExtLeading( sal_Bool bExtLeading )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetAddExtLeading( bExtLeading );
 }
 
-BOOL Outliner::IsAddExtLeading() const
+sal_Bool Outliner::IsAddExtLeading() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsAddExtLeading();
 }
 
-void Outliner::UndoActionStart( USHORT nId )
+void Outliner::UndoActionStart( sal_uInt16 nId )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->UndoActionStart( nId );
 }
 
-void Outliner::UndoActionEnd( USHORT nId )
+void Outliner::UndoActionEnd( sal_uInt16 nId )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->UndoActionEnd( nId );
@@ -421,35 +421,35 @@ void Outliner::InsertUndo( EditUndo* pUndo )
 {
 #ifndef SVX_LIGHT
     DBG_CHKTHIS(Outliner,0);
-    pEditEngine->GetUndoManager().AddUndoAction( pUndo, FALSE );
+    pEditEngine->GetUndoManager().AddUndoAction( pUndo, sal_False );
 #endif
 }
 
-BOOL Outliner::IsInUndo()
+sal_Bool Outliner::IsInUndo()
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsInUndo();
 }
 
-ULONG Outliner::GetLineCount( ULONG nParagraph ) const
+sal_uLong Outliner::GetLineCount( sal_uLong nParagraph ) const
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetLineCount( (USHORT)nParagraph );
+    return pEditEngine->GetLineCount( (sal_uInt16)nParagraph );
 }
 
-USHORT Outliner::GetLineLen( ULONG nParagraph, USHORT nLine ) const
+sal_uInt16 Outliner::GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetLineLen( (USHORT)nParagraph, nLine );
+    return pEditEngine->GetLineLen( (sal_uInt16)nParagraph, nLine );
 }
 
-ULONG Outliner::GetLineHeight( ULONG nParagraph, ULONG nLine )
+sal_uLong Outliner::GetLineHeight( sal_uLong nParagraph, sal_uLong nLine )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetLineHeight( (USHORT)nParagraph, (USHORT)nLine );
+    return pEditEngine->GetLineHeight( (sal_uInt16)nParagraph, (sal_uInt16)nLine );
 }
 
-void Outliner::QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich )
+void Outliner::QuickRemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->QuickRemoveCharAttribs( nPara, nWhich );
@@ -467,10 +467,10 @@ sal_Bool Outliner::HasConvertibleTextPortion( LanguageType nLang )
     return pEditEngine->HasConvertibleTextPortion( nLang );
 }
 
-BOOL Outliner::ConvertNextDocument()
+sal_Bool Outliner::ConvertNextDocument()
 {
     DBG_CHKTHIS(Outliner,0);
-    return FALSE;
+    return sal_False;
 }
 
 void Outliner::SetDefaultLanguage( LanguageType eLang )
@@ -485,7 +485,7 @@ LanguageType Outliner::GetDefaultLanguage() const
     return pEditEngine->GetDefaultLanguage();
 }
 
-BOOL Outliner::HasOnlineSpellErrors() const
+sal_Bool Outliner::HasOnlineSpellErrors() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->HasOnlineSpellErrors();
@@ -497,7 +497,7 @@ void Outliner::CompleteOnlineSpelling()
     pEditEngine->CompleteOnlineSpelling();
 }
 
-BOOL Outliner::HasText( const SvxSearchItem& rSearchItem )
+sal_Bool Outliner::HasText( const SvxSearchItem& rSearchItem )
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->HasText( rSearchItem );
@@ -515,10 +515,10 @@ SfxItemPool* Outliner::GetEditTextObjectPool() const
     return pEditEngine->GetEditTextObjectPool();
 }
 
-BOOL Outliner::SpellNextDocument()
+sal_Bool Outliner::SpellNextDocument()
 {
     DBG_CHKTHIS(Outliner,0);
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -564,16 +564,16 @@ OutputDevice* Outliner::GetRefDevice() const
     return pEditEngine->GetRefDevice();
 }
 
-USHORT Outliner::GetFirstLineOffset( ULONG nParagraph )
+sal_uInt16 Outliner::GetFirstLineOffset( sal_uLong nParagraph )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetFirstLineOffset( (USHORT)nParagraph );
+    return pEditEngine->GetFirstLineOffset( (sal_uInt16)nParagraph );
 }
 
-ULONG Outliner::GetTextHeight( ULONG nParagraph ) const
+sal_uLong Outliner::GetTextHeight( sal_uLong nParagraph ) const
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetTextHeight((USHORT)nParagraph );
+    return pEditEngine->GetTextHeight((sal_uInt16)nParagraph );
 }
 
 Point Outliner::GetDocPos( const Point& rPaperPos ) const
@@ -582,35 +582,35 @@ Point Outliner::GetDocPos( const Point& rPaperPos ) const
     return pEditEngine->GetDocPos( rPaperPos );
 }
 
-Point Outliner::GetDocPosTopLeft( ULONG nParagraph )
+Point Outliner::GetDocPosTopLeft( sal_uLong nParagraph )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetDocPosTopLeft( (USHORT)nParagraph );
+    return pEditEngine->GetDocPosTopLeft( (sal_uInt16)nParagraph );
 }
 
-BOOL Outliner::IsTextPos( const Point& rPaperPos, USHORT nBorder )
+sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
 {
     return IsTextPos( rPaperPos, nBorder, NULL );
 }
 
-BOOL Outliner::IsTextPos( const Point& rPaperPos, USHORT nBorder, BOOL* pbBullet )
+sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBullet )
 {
     DBG_CHKTHIS(Outliner,0);
     if ( pbBullet)
-        *pbBullet = FALSE;
-    BOOL bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder );
+        *pbBullet = sal_False;
+    sal_Bool bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder );
     if ( !bTextPos )
     {
         Point aDocPos = GetDocPos( rPaperPos );
-        USHORT nPara = pEditEngine->FindParagraph( aDocPos.Y() );
+        sal_uInt16 nPara = pEditEngine->FindParagraph( aDocPos.Y() );
         if ( ( nPara != EE_PARA_NOT_FOUND ) && ImplHasBullet( nPara ) )
         {
-            Rectangle aBulArea = ImpCalcBulletArea( nPara, TRUE, TRUE );
+            Rectangle aBulArea = ImpCalcBulletArea( nPara, sal_True, sal_True );
             if ( aBulArea.IsInside( rPaperPos ) )
             {
-                bTextPos = TRUE;
+                bTextPos = sal_True;
                 if ( pbBullet)
-                    *pbBullet = TRUE;
+                    *pbBullet = sal_True;
             }
         }
     }
@@ -626,50 +626,50 @@ void Outliner::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel )
 
 void Outliner::QuickInsertText( const XubString& rText, const ESelection& rSel )
 {
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickInsertText( rText, rSel );
 }
 
 void Outliner::QuickDelete( const ESelection& rSel )
 {
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickDelete( rSel );
 }
 
 void Outliner::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel )
 {
     DBG_CHKTHIS(Outliner,0);
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickInsertField( rFld, rSel );
 }
 
 void Outliner::QuickInsertLineBreak( const ESelection& rSel )
 {
     DBG_CHKTHIS(Outliner,0);
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickInsertLineBreak( rSel );
 }
 
-void Outliner::QuickFormatDoc( BOOL bFull )
+void Outliner::QuickFormatDoc( sal_Bool bFull )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->QuickFormatDoc( bFull );
 }
 
-void Outliner::SetGlobalCharStretching( USHORT nX, USHORT nY )
+void Outliner::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetGlobalCharStretching( nX, nY );
 }
 
-void Outliner::GetGlobalCharStretching( USHORT& rX, USHORT& rY )
+void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->GetGlobalCharStretching( rX, rY );
 }
 
 
-void Outliner::DoStretchChars( USHORT nX, USHORT nY )
+void Outliner::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->DoStretchChars( nX, nY );
@@ -681,43 +681,43 @@ void Outliner::EraseVirtualDevice()
     pEditEngine->EraseVirtualDevice();
 }
 
-void Outliner::SetBigTextObjectStart( USHORT nStartAtPortionCount )
+void Outliner::SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetBigTextObjectStart( nStartAtPortionCount );
 }
 
-USHORT Outliner::GetBigTextObjectStart() const
+sal_uInt16 Outliner::GetBigTextObjectStart() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetBigTextObjectStart();
 }
 
-BOOL Outliner::ShouldCreateBigTextObject() const
+sal_Bool Outliner::ShouldCreateBigTextObject() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->ShouldCreateBigTextObject();
 }
 
-void Outliner::SetVertical( BOOL b )
+void Outliner::SetVertical( sal_Bool b )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetVertical( b );
 }
 
-BOOL Outliner::IsVertical() const
+sal_Bool Outliner::IsVertical() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsVertical();
 }
 
-void Outliner::SetFixedCellHeight( BOOL bUseFixedCellHeight )
+void Outliner::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
 }
 
-BOOL Outliner::IsFixedCellHeight() const
+sal_Bool Outliner::IsFixedCellHeight() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsFixedCellHeight();
@@ -735,13 +735,13 @@ EEHorizontalTextDirection Outliner::GetDefaultHorizontalTextDirection() const
     return pEditEngine->GetDefaultHorizontalTextDirection();
 }
 
-USHORT Outliner::GetScriptType( const ESelection& rSelection ) const
+sal_uInt16 Outliner::GetScriptType( const ESelection& rSelection ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetScriptType( rSelection );
 }
 
-LanguageType Outliner::GetLanguage( USHORT nPara, USHORT nPos ) const
+LanguageType Outliner::GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetLanguage( nPara, nPos );
@@ -753,25 +753,25 @@ void Outliner::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemovePara
     pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
 }
 
-void Outliner::EnableAutoColor( BOOL b )
+void Outliner::EnableAutoColor( sal_Bool b )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->EnableAutoColor( b );
 }
 
-BOOL Outliner::IsAutoColorEnabled() const
+sal_Bool Outliner::IsAutoColorEnabled() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsAutoColorEnabled();
 }
 
-void Outliner::ForceAutoColor( BOOL b )
+void Outliner::ForceAutoColor( sal_Bool b )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->ForceAutoColor( b );
 }
 
-BOOL Outliner::IsForceAutoColor() const
+sal_Bool Outliner::IsForceAutoColor() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsForceAutoColor();
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 19b5b67e28d4..9d749b20e6f1 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -67,20 +67,20 @@
 
 #define DEFAULT_SCALE   75
 
-static const USHORT nDefStyles = 3; // Sonderbehandlung fuer die ersten 3 Ebenen
-static const USHORT nDefBulletIndent = 800;
-static const USHORT nDefBulletWidth = 700;
-static const USHORT pDefBulletIndents[nDefStyles]=  { 1400, 800, 800 };
-static const USHORT pDefBulletWidths[nDefStyles] =  { 1000, 850, 700 };
+static const sal_uInt16 nDefStyles = 3; // Sonderbehandlung fuer die ersten 3 Ebenen
+static const sal_uInt16 nDefBulletIndent = 800;
+static const sal_uInt16 nDefBulletWidth = 700;
+static const sal_uInt16 pDefBulletIndents[nDefStyles]=  { 1400, 800, 800 };
+static const sal_uInt16 pDefBulletWidths[nDefStyles] =  { 1000, 850, 700 };
 
-USHORT lcl_ImplGetDefBulletWidth( sal_Int16 nDepth )
+sal_uInt16 lcl_ImplGetDefBulletWidth( sal_Int16 nDepth )
 {
     return ( nDepth < nDefStyles ) ? pDefBulletWidths[nDepth] : nDefBulletWidth;
 }
 
-USHORT lcl_ImplGetDefBulletIndent( sal_Int16 nDepth )
+sal_uInt16 lcl_ImplGetDefBulletIndent( sal_Int16 nDepth )
 {
-    USHORT nI = 0;
+    sal_uInt16 nI = 0;
 
     if( nDepth >= 0 )
     {
@@ -105,7 +105,7 @@ void Outliner::ImplCheckDepth( sal_Int16& rnDepth ) const
         rnDepth = nMaxDepth;
 }
 
-Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDepth)
+Paragraph* Outliner::Insert(const XubString& rText, sal_uLong nAbsPos, sal_Int16 nDepth)
 {
     DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pParaList->GetParagraphCount(),"Insert:No Paras");
@@ -114,7 +114,7 @@ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDe
 
     ImplCheckDepth( nDepth );
 
-    ULONG nParagraphCount = pParaList->GetParagraphCount();
+    sal_uLong nParagraphCount = pParaList->GetParagraphCount();
     if( nAbsPos > nParagraphCount )
         nAbsPos = nParagraphCount;
 
@@ -134,28 +134,28 @@ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDe
     }
     else
     {
-        BOOL bUpdate = pEditEngine->GetUpdateMode();
-        pEditEngine->SetUpdateMode( FALSE );
-        ImplBlockInsertionCallbacks( TRUE );
+        sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+        pEditEngine->SetUpdateMode( sal_False );
+        ImplBlockInsertionCallbacks( sal_True );
         pPara = new Paragraph( nDepth );
         pParaList->Insert( pPara, nAbsPos );
-        pEditEngine->InsertParagraph( (USHORT)nAbsPos, String() );
+        pEditEngine->InsertParagraph( (sal_uInt16)nAbsPos, String() );
         DBG_ASSERT(pPara==pParaList->GetParagraph(nAbsPos),"Insert:Failed");
-        ImplInitDepth( (USHORT)nAbsPos, nDepth, FALSE );
+        ImplInitDepth( (sal_uInt16)nAbsPos, nDepth, sal_False );
         pHdlParagraph = pPara;
         ParagraphInsertedHdl();
         pPara->nFlags |= PARAFLAG_HOLDDEPTH;
         SetText( rText, pPara );
-        ImplBlockInsertionCallbacks( FALSE );
+        ImplBlockInsertionCallbacks( sal_False );
         pEditEngine->SetUpdateMode( bUpdate );
     }
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     DBG_ASSERT(pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(),"SetText failed");
     return pPara;
 }
 
 
-void Outliner::ParagraphInserted( USHORT nPara )
+void Outliner::ParagraphInserted( sal_uInt16 nPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -169,7 +169,7 @@ void Outliner::ParagraphInserted( USHORT nPara )
         if( pEditEngine->IsInUndo() )
         {
             pPara->nFlags = PARAFLAG_SETBULLETTEXT;
-            pPara->bVisible = TRUE;
+            pPara->bVisible = sal_True;
             const SfxInt16Item& rLevel = (const SfxInt16Item&) pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL );
             pPara->SetDepth( rLevel.GetValue() );
         }
@@ -186,14 +186,14 @@ void Outliner::ParagraphInserted( USHORT nPara )
 
         if( !pEditEngine->IsInUndo() )
         {
-            ImplCalcBulletText( nPara, TRUE, FALSE );
+            ImplCalcBulletText( nPara, sal_True, sal_False );
             pHdlParagraph = pPara;
             ParagraphInsertedHdl();
         }
     }
 }
 
-void Outliner::ParagraphDeleted( USHORT nPara )
+void Outliner::ParagraphDeleted( sal_uInt16 nPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -220,24 +220,24 @@ void Outliner::ParagraphDeleted( USHORT nPara )
         pPara = pParaList->GetParagraph( nPara );
         if ( pPara && ( pPara->GetDepth() > nDepth ) )
         {
-            ImplCalcBulletText( nPara, TRUE, FALSE );
+            ImplCalcBulletText( nPara, sal_True, sal_False );
             // naechsten auf gleicher Ebene suchen...
             while ( pPara && pPara->GetDepth() > nDepth )
                 pPara = pParaList->GetParagraph( ++nPara );
         }
 
         if ( pPara && ( pPara->GetDepth() == nDepth ) )
-            ImplCalcBulletText( nPara, TRUE, FALSE );
+            ImplCalcBulletText( nPara, sal_True, sal_False );
     }
 }
 
-void Outliner::Init( USHORT nMode )
+void Outliner::Init( sal_uInt16 nMode )
 {
     nOutlinerMode = nMode;
 
     Clear();
 
-    ULONG nCtrl = pEditEngine->GetControlWord();
+    sal_uLong nCtrl = pEditEngine->GetControlWord();
     nCtrl &= ~(EE_CNTRL_OUTLINER|EE_CNTRL_OUTLINER2);
 
     SetMaxDepth( 9 );
@@ -260,12 +260,12 @@ void Outliner::Init( USHORT nMode )
 
     pEditEngine->SetControlWord( nCtrl );
 
-    ImplInitDepth( 0, GetMinDepth(), FALSE );
+    ImplInitDepth( 0, GetMinDepth(), sal_False );
 
     GetUndoManager().Clear();
 }
 
-void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
+void Outliner::SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParagraphs )
 {
     if( nMaxDepth != nDepth )
     {
@@ -273,8 +273,8 @@ void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
 
         if( bCheckParagraphs )
         {
-            USHORT nParagraphs = (USHORT)pParaList->GetParagraphCount();
-            for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+            sal_uInt16 nParagraphs = (sal_uInt16)pParaList->GetParagraphCount();
+            for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
             {
                 Paragraph* pPara = pParaList->GetParagraph( nPara );
                 if( pPara && pPara->GetDepth() > nMaxDepth )
@@ -286,7 +286,7 @@ void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
     }
 }
 
-sal_Int16 Outliner::GetDepth( ULONG nPara ) const
+sal_Int16 Outliner::GetDepth( sal_uLong nPara ) const
 {
     Paragraph* pPara = pParaList->GetParagraph( nPara );
     DBG_ASSERT( pPara, "Outliner::GetDepth - Paragraph not found!" );
@@ -305,9 +305,9 @@ void Outliner::SetDepth( Paragraph* pPara, sal_Int16 nNewDepth )
         mnDepthChangeHdlPrevFlags = pPara->nFlags;
         pHdlParagraph = pPara;
 
-        USHORT nPara = (USHORT)GetAbsPos( pPara );
-        ImplInitDepth( nPara, nNewDepth, TRUE );
-        ImplCalcBulletText( nPara, FALSE, FALSE );
+        sal_uInt16 nPara = (sal_uInt16)GetAbsPos( pPara );
+        ImplInitDepth( nPara, nNewDepth, sal_True );
+        ImplCalcBulletText( nPara, sal_False, sal_False );
 
         if ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
             ImplSetLevelDependendStyleSheet( nPara );
@@ -337,8 +337,8 @@ void Outliner::SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingSta
         pPara->SetNumberingStartValue( nNumberingStartValue );
         // --> OD 2009-03-10 #i100014#
         // It is not a good idea to substract 1 from a count and cast the result
-        // to USHORT without check, if the count is 0.
-        ImplCheckParagraphs( nPara, (USHORT) (pParaList->GetParagraphCount()) );
+        // to sal_uInt16 without check, if the count is 0.
+        ImplCheckParagraphs( nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
         // <--
         pEditEngine->SetModified();
     }
@@ -365,20 +365,20 @@ void Outliner::SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumb
         pPara->SetParaIsNumberingRestart( bParaIsNumberingRestart );
         // --> OD 2009-03-10 #i100014#
         // It is not a good idea to substract 1 from a count and cast the result
-        // to USHORT without check, if the count is 0.
-        ImplCheckParagraphs( nPara, (USHORT) (pParaList->GetParagraphCount()) );
+        // to sal_uInt16 without check, if the count is 0.
+        ImplCheckParagraphs( nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
         // <--
         pEditEngine->SetModified();
     }
 }
 
-OutlinerParaObject* Outliner::CreateParaObject( USHORT nStartPara, USHORT nCount ) const
+OutlinerParaObject* Outliner::CreateParaObject( sal_uInt16 nStartPara, sal_uInt16 nCount ) const
 {
     DBG_CHKTHIS(Outliner,0);
 
-    if ( sal::static_int_cast< ULONG >( nStartPara + nCount ) >
+    if ( sal::static_int_cast< sal_uLong >( nStartPara + nCount ) >
          pParaList->GetParagraphCount() )
-        nCount = sal::static_int_cast< USHORT >(
+        nCount = sal::static_int_cast< sal_uInt16 >(
             pParaList->GetParagraphCount() - nStartPara );
 
     // When a new OutlinerParaObject is created because a paragraph is just beeing deleted,
@@ -411,16 +411,16 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
     DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pPara,"SetText:No Para");
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
-    ImplBlockInsertionCallbacks( TRUE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
+    ImplBlockInsertionCallbacks( sal_True );
 
-    USHORT nPara = (USHORT)pParaList->GetAbsPos( pPara );
+    sal_uInt16 nPara = (sal_uInt16)pParaList->GetAbsPos( pPara );
 
     if( !rText.Len() )
     {
         pEditEngine->SetText( nPara, rText );
-        ImplInitDepth( nPara, pPara->GetDepth(), FALSE );
+        ImplInitDepth( nPara, pPara->GetDepth(), sal_False );
     }
     else
     {
@@ -430,9 +430,9 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
         if( aText.GetChar( aText.Len()-1 ) == '\x0A' )
             aText.Erase( aText.Len()-1, 1 ); // letzten Umbruch loeschen
 
-        USHORT nCount = aText.GetTokenCount( '\x0A' );
-        USHORT nPos = 0;
-        USHORT nInsPos = nPara+1;
+        sal_uInt16 nCount = aText.GetTokenCount( '\x0A' );
+        sal_uInt16 nPos = 0;
+        sal_uInt16 nInsPos = nPara+1;
         while( nCount > nPos )
         {
             XubString aStr = aText.GetToken( nPos, '\x0A' );
@@ -453,7 +453,7 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
                 ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW ) )
             {
                 // Tabs raus
-                USHORT nTabs = 0;
+                sal_uInt16 nTabs = 0;
                 while ( ( nTabs < aStr.Len() ) && ( aStr.GetChar( nTabs ) == '\t' ) )
                     nTabs++;
                 if ( nTabs )
@@ -480,15 +480,15 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
                 nInsPos--;
                 pEditEngine->SetText( nInsPos, aStr );
             }
-            ImplInitDepth( nInsPos, nCurDepth, FALSE );
+            ImplInitDepth( nInsPos, nCurDepth, sal_False );
             nInsPos++;
             nPos++;
         }
     }
 
     DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"SetText failed!");
-    bFirstParaIsEmpty = FALSE;
-    ImplBlockInsertionCallbacks( FALSE );
+    bFirstParaIsEmpty = sal_False;
+    ImplBlockInsertionCallbacks( sal_False );
     pEditEngine->SetUpdateMode( bUpdate );
 }
 
@@ -499,7 +499,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
     DBG_CHKTHIS(Outliner,0);
 
     bool bConverted = false;
-    USHORT nTabs = 0;
+    sal_uInt16 nTabs = 0;
     ESelection aDelSel;
 
 //  const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (sal_uInt16)nPara );
@@ -509,16 +509,16 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
     XubString aHeading_US( RTL_CONSTASCII_USTRINGPARAM( "heading" ) );
     XubString aNumber_US( RTL_CONSTASCII_USTRINGPARAM( "Numbering" ) );
 
-    XubString aStr( pEditEngine->GetText( (USHORT)nPara ) );
+    XubString aStr( pEditEngine->GetText( (sal_uInt16)nPara ) );
     xub_Unicode* pPtr = (xub_Unicode*)aStr.GetBuffer();
 
-    USHORT nHeadingNumberStart = 0;
-    USHORT nNumberingNumberStart = 0;
-    SfxStyleSheet* pStyle= pEditEngine->GetStyleSheet( (USHORT)nPara );
+    sal_uInt16 nHeadingNumberStart = 0;
+    sal_uInt16 nNumberingNumberStart = 0;
+    SfxStyleSheet* pStyle= pEditEngine->GetStyleSheet( (sal_uInt16)nPara );
     if( pStyle )
     {
         aName = pStyle->GetName();
-        USHORT nSearch;
+        sal_uInt16 nSearch;
         if ( ( nSearch = aName.Search( aHeading_US ) ) != STRING_NOTFOUND )
             nHeadingNumberStart = nSearch + aHeading_US.Len();
         else if ( ( nSearch = aName.Search( aNumber_US ) ) != STRING_NOTFOUND )
@@ -532,16 +532,16 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
                 ( pPtr[0] != '\t' ) && ( pPtr[1] == '\t' ) )
         {
             // Bullet & Tab raus
-            aDelSel = ESelection( (USHORT)nPara, 0, (USHORT)nPara, 2 );
+            aDelSel = ESelection( (sal_uInt16)nPara, 0, (sal_uInt16)nPara, 2 );
         }
 
-        USHORT nPos = nHeadingNumberStart ? nHeadingNumberStart : nNumberingNumberStart;
+        sal_uInt16 nPos = nHeadingNumberStart ? nHeadingNumberStart : nNumberingNumberStart;
         String aLevel = aName.Copy( nPos );
         aLevel.EraseLeadingChars( ' ' );
-        nTabs = sal::static_int_cast< USHORT >(aLevel.ToInt32());
+        nTabs = sal::static_int_cast< sal_uInt16 >(aLevel.ToInt32());
         if( nTabs )
             nTabs--; // ebene 0 = "heading 1"
-        bConverted = TRUE;
+        bConverted = sal_True;
     }
     else
     {
@@ -553,7 +553,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
         }
         // Tabulatoren aus dem Text entfernen
         if( nTabs )
-            aDelSel = ESelection( (USHORT)nPara, 0, (USHORT)nPara, nTabs );
+            aDelSel = ESelection( (sal_uInt16)nPara, 0, (sal_uInt16)nPara, nTabs );
     }
 
     if ( aDelSel.HasRange() )
@@ -571,7 +571,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
     sal_Int16 nOutlLevel = rLevel.GetValue();
 
     ImplCheckDepth( nOutlLevel );
-    ImplInitDepth( sal::static_int_cast< sal_uInt16 >(nPara), nOutlLevel, FALSE );
+    ImplInitDepth( sal::static_int_cast< sal_uInt16 >(nPara), nOutlLevel, sal_False );
 
     return bConverted;
 }
@@ -580,25 +580,25 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
-    BOOL bUndo = pEditEngine->IsUndoEnabled();
-    EnableUndo( FALSE );
+    sal_Bool bUndo = pEditEngine->IsUndoEnabled();
+    EnableUndo( sal_False );
 
     Init( rPObj.GetOutlinerMode() );
 
-    ImplBlockInsertionCallbacks( TRUE );
+    ImplBlockInsertionCallbacks( sal_True );
     pEditEngine->SetText(rPObj.GetTextObject());
     if( rPObj.Count() != pEditEngine->GetParagraphCount() )
     {
         int nop=0;nop++;
     }
 
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
 
-    pParaList->Clear( TRUE );
-    for( USHORT nCurPara = 0; nCurPara < rPObj.Count(); nCurPara++ )
+    pParaList->Clear( sal_True );
+    for( sal_uInt16 nCurPara = 0; nCurPara < rPObj.Count(); nCurPara++ )
     {
         Paragraph* pPara = new Paragraph( rPObj.GetParagraphData(nCurPara));
         ImplCheckDepth( pPara->nDepth );
@@ -609,12 +609,12 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
 
     // --> OD 2009-03-10 #i100014#
     // It is not a good idea to substract 1 from a count and cast the result
-    // to USHORT without check, if the count is 0.
-    ImplCheckParagraphs( 0, (USHORT) (pParaList->GetParagraphCount()) );
+    // to sal_uInt16 without check, if the count is 0.
+    ImplCheckParagraphs( 0, (sal_uInt16) (pParaList->GetParagraphCount()) );
     // <--
 
     EnableUndo( bUndo );
-    ImplBlockInsertionCallbacks( FALSE );
+    ImplBlockInsertionCallbacks( sal_False );
     pEditEngine->SetUpdateMode( bUpdate );
 
     DBG_ASSERT( pParaList->GetParagraphCount()==rPObj.Count(),"SetText failed");
@@ -626,14 +626,14 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
     DBG_CHKTHIS(Outliner,0);
     Paragraph* pPara;
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
-    ImplBlockInsertionCallbacks( TRUE );
-    ULONG nPara;
+    ImplBlockInsertionCallbacks( sal_True );
+    sal_uLong nPara;
     if( bFirstParaIsEmpty )
     {
-        pParaList->Clear( TRUE );
+        pParaList->Clear( sal_True );
         pEditEngine->SetText(rPObj.GetTextObject());
         nPara = 0;
     }
@@ -642,54 +642,54 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
         nPara = pParaList->GetParagraphCount();
         pEditEngine->InsertParagraph( EE_PARA_APPEND, rPObj.GetTextObject() );
     }
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
 
-    for( USHORT n = 0; n < rPObj.Count(); n++ )
+    for( sal_uInt16 n = 0; n < rPObj.Count(); n++ )
     {
         pPara = new Paragraph( rPObj.GetParagraphData(n) );
         pParaList->Insert( pPara, LIST_APPEND );
-        USHORT nP = sal::static_int_cast< USHORT >(nPara+n);
+        sal_uInt16 nP = sal::static_int_cast< sal_uInt16 >(nPara+n);
         DBG_ASSERT(pParaList->GetAbsPos(pPara)==nP,"AddText:Out of sync");
-        ImplInitDepth( nP, pPara->GetDepth(), FALSE );
+        ImplInitDepth( nP, pPara->GetDepth(), sal_False );
     }
     DBG_ASSERT( pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(), "SetText: OutOfSync" );
 
     // --> OD 2009-03-10 #i100014#
     // It is not a good idea to substract 1 from a count and cast the result
-    // to USHORT without check, if the count is 0.
-    ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pParaList->GetParagraphCount()) );
+    // to sal_uInt16 without check, if the count is 0.
+    ImplCheckParagraphs( (sal_uInt16)nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
     // <--
 
-    ImplBlockInsertionCallbacks( FALSE );
+    ImplBlockInsertionCallbacks( sal_False );
     pEditEngine->SetUpdateMode( bUpdate );
 }
 
-void __EXPORT Outliner::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void __EXPORT Outliner::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
 {
     DBG_CHKTHIS(Outliner,0);
 
     if ( aFieldClickedHdl.IsSet() )
     {
         EditFieldInfo aFldInfo( this, rField, nPara, nPos );
-        aFldInfo.SetSimpleClick( TRUE );
+        aFldInfo.SetSimpleClick( sal_True );
         aFieldClickedHdl.Call( &aFldInfo );
     }
 }
 
 
-void __EXPORT Outliner::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void __EXPORT Outliner::FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
 {
     DBG_CHKTHIS(Outliner,0);
     if ( !aFieldClickedHdl.IsSet() )
         return;
 
     EditFieldInfo aFldInfo( this, rField, nPara, nPos );
-    aFldInfo.SetSimpleClick( FALSE );
+    aFldInfo.SetSimpleClick( sal_False );
     aFieldClickedHdl.Call( &aFldInfo );
 }
 
 
-XubString __EXPORT Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString __EXPORT Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     DBG_CHKTHIS(Outliner,0);
     if ( !aCalcFieldValueHdl.IsSet() )
@@ -713,19 +713,19 @@ XubString __EXPORT Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT
     return aFldInfo.GetRepresentation();
 }
 
-void Outliner::SetStyleSheet( ULONG nPara, SfxStyleSheet* pStyle )
+void Outliner::SetStyleSheet( sal_uLong nPara, SfxStyleSheet* pStyle )
 {
     DBG_CHKTHIS(Outliner,0);
     Paragraph* pPara = pParaList->GetParagraph( nPara );
         if (pPara)
         {
-            pEditEngine->SetStyleSheet( (USHORT)nPara, pStyle );
+            pEditEngine->SetStyleSheet( (sal_uInt16)nPara, pStyle );
             pPara->nFlags |= PARAFLAG_SETBULLETTEXT;
-            ImplCheckNumBulletItem( (USHORT) nPara );
+            ImplCheckNumBulletItem( (sal_uInt16) nPara );
         }
 }
 
-void Outliner::SetVisible( Paragraph* pPara, BOOL bVisible )
+void Outliner::SetVisible( Paragraph* pPara, sal_Bool bVisible )
 {
     DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT( pPara, "SetVisible: pPara = NULL" );
@@ -733,19 +733,19 @@ void Outliner::SetVisible( Paragraph* pPara, BOOL bVisible )
         if (pPara)
         {
             pPara->bVisible = bVisible;
-            ULONG nPara = pParaList->GetAbsPos( pPara );
-            pEditEngine->ShowParagraph( (USHORT)nPara, bVisible );
+            sal_uLong nPara = pParaList->GetAbsPos( pPara );
+            pEditEngine->ShowParagraph( (sal_uInt16)nPara, bVisible );
         }
 }
 
-void Outliner::ImplCheckNumBulletItem( USHORT nPara )
+void Outliner::ImplCheckNumBulletItem( sal_uInt16 nPara )
 {
     Paragraph* pPara = pParaList->GetParagraph( nPara );
         if (pPara)
             pPara->aBulSize.Width() = -1;
 }
 
-void Outliner::ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLevelStyle )
+void Outliner::ImplSetLevelDependendStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pLevelStyle )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -780,7 +780,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLe
     }
 }
 
-void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo, BOOL bUndoAction )
+void Outliner::ImplInitDepth( sal_uInt16 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -797,10 +797,10 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
 
     if( !IsInUndo() )
     {
-        BOOL bUpdate = pEditEngine->GetUpdateMode();
-        pEditEngine->SetUpdateMode( FALSE );
+        sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+        pEditEngine->SetUpdateMode( sal_False );
 
-        BOOL bUndo = bCreateUndo && IsUndoEnabled();
+        sal_Bool bUndo = bCreateUndo && IsUndoEnabled();
         if ( bUndo && bUndoAction )
             UndoActionStart( OLUNDO_DEPTH );
 
@@ -808,7 +808,7 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
         aAttrs.Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nDepth ) );
         pEditEngine->SetParaAttribs( nPara, aAttrs );
         ImplCheckNumBulletItem( nPara );
-        ImplCalcBulletText( nPara, FALSE, FALSE );
+        ImplCalcBulletText( nPara, sal_False, sal_False );
 
         if ( bUndo )
         {
@@ -821,30 +821,30 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
     }
 }
 
-void Outliner::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void Outliner::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     DBG_CHKTHIS(Outliner,0);
 
     pEditEngine->SetParaAttribs( nPara, rSet );
 }
 
-BOOL Outliner::Expand( Paragraph* pPara )
+sal_Bool Outliner::Expand( Paragraph* pPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
     if ( pParaList->HasHiddenChilds( pPara ) )
     {
         OLUndoExpand* pUndo = 0;
-        BOOL bUndo = IsUndoEnabled() && !IsInUndo();
+        sal_Bool bUndo = IsUndoEnabled() && !IsInUndo();
         if( bUndo )
         {
             UndoActionStart( OLUNDO_EXPAND );
             pUndo = new OLUndoExpand( this, OLUNDO_EXPAND );
             pUndo->pParas = 0;
-            pUndo->nCount = (USHORT)pParaList->GetAbsPos( pPara );
+            pUndo->nCount = (sal_uInt16)pParaList->GetAbsPos( pPara );
         }
         pHdlParagraph = pPara;
-        bIsExpanding = TRUE;
+        bIsExpanding = sal_True;
         pParaList->Expand( pPara );
         ExpandHdl();
         InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) );
@@ -853,32 +853,32 @@ BOOL Outliner::Expand( Paragraph* pPara )
             InsertUndo( pUndo );
             UndoActionEnd( OLUNDO_EXPAND );
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL Outliner::Collapse( Paragraph* pPara )
+sal_Bool Outliner::Collapse( Paragraph* pPara )
 {
     DBG_CHKTHIS(Outliner,0);
     if ( pParaList->HasVisibleChilds( pPara ) ) // expandiert
     {
         OLUndoExpand* pUndo = 0;
-        BOOL bUndo = FALSE;
+        sal_Bool bUndo = sal_False;
 
         if( !IsInUndo() && IsUndoEnabled() )
-            bUndo = TRUE;
+            bUndo = sal_True;
         if( bUndo )
         {
             UndoActionStart( OLUNDO_COLLAPSE );
             pUndo = new OLUndoExpand( this, OLUNDO_COLLAPSE );
             pUndo->pParas = 0;
-            pUndo->nCount = (USHORT)pParaList->GetAbsPos( pPara );
+            pUndo->nCount = (sal_uInt16)pParaList->GetAbsPos( pPara );
         }
 
         pHdlParagraph = pPara;
-        bIsExpanding = FALSE;
+        bIsExpanding = sal_False;
         pParaList->Collapse( pPara );
         ExpandHdl();
         InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) );
@@ -887,13 +887,13 @@ BOOL Outliner::Collapse( Paragraph* pPara )
             InsertUndo( pUndo );
             UndoActionEnd( OLUNDO_COLLAPSE );
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
+Font Outliner::ImpCalcBulletFont( sal_uInt16 nPara ) const
 {
     const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
     DBG_ASSERT( pFmt && ( pFmt->GetNumberingType() != SVX_NUM_BITMAP ) && ( pFmt->GetNumberingType() != SVX_NUM_NUMBER_NONE ), "ImpCalcBulletFont: Missing or BitmapBullet!" );
@@ -925,14 +925,14 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
     }
 
     // #107508# Use original scale...
-    USHORT nScale = /* pEditEngine->IsFlatMode() ? DEFAULT_SCALE : */ pFmt->GetBulletRelSize();
-    ULONG nScaledLineHeight = aStdFont.GetSize().Height();
+    sal_uInt16 nScale = /* pEditEngine->IsFlatMode() ? DEFAULT_SCALE : */ pFmt->GetBulletRelSize();
+    sal_uLong nScaledLineHeight = aStdFont.GetSize().Height();
     nScaledLineHeight *= nScale*10;
     nScaledLineHeight /= 1000;
 
     aBulletFont.SetAlign( ALIGN_BOTTOM );
     aBulletFont.SetSize( Size( 0, nScaledLineHeight ) );
-    BOOL bVertical = IsVertical();
+    sal_Bool bVertical = IsVertical();
     aBulletFont.SetVertical( bVertical );
     aBulletFont.SetOrientation( bVertical ? 2700 : 0 );
 
@@ -949,7 +949,7 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
     return aBulletFont;
 }
 
-void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
+void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
     const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
 {
     DBG_CHKTHIS(Outliner,0);
@@ -963,11 +963,11 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
 
     if ( ImplHasBullet( nPara ) && bDrawBullet)
     {
-        BOOL bVertical = IsVertical();
+        sal_Bool bVertical = IsVertical();
 
-        BOOL bRightToLeftPara = pEditEngine->IsRightToLeft( nPara );
+        sal_Bool bRightToLeftPara = pEditEngine->IsRightToLeft( nPara );
 
-        Rectangle aBulletArea( ImpCalcBulletArea( nPara, TRUE, FALSE ) );
+        Rectangle aBulletArea( ImpCalcBulletArea( nPara, sal_True, sal_False ) );
 
         Paragraph* pPara = pParaList->GetParagraph( nPara );
         const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
@@ -977,7 +977,7 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
             {
                 Font aBulletFont( ImpCalcBulletFont( nPara ) );
                 // #2338# Use base line
-                BOOL bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
+                sal_Bool bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
                 aBulletFont.SetAlign( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE );
                 Font aOldFont = pOutDev->GetFont();
                 pOutDev->SetFont( aBulletFont );
@@ -1022,7 +1022,7 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
                 }
 
                 // #105803# VCL will care for brackets and so on...
-                ULONG nLayoutMode = pOutDev->GetLayoutMode();
+                sal_uLong nLayoutMode = pOutDev->GetLayoutMode();
                 nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
                 if ( bRightToLeftPara )
                     nLayoutMode |= TEXT_LAYOUT_BIDI_RTL;
@@ -1130,15 +1130,15 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
     }
 }
 
-void Outliner::InvalidateBullet( Paragraph* /*pPara*/, ULONG nPara )
+void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_uLong nPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    long nLineHeight = (long)pEditEngine->GetLineHeight((USHORT)nPara );
+    long nLineHeight = (long)pEditEngine->GetLineHeight((sal_uInt16)nPara );
     OutlinerView* pView = aViewList.First();
     while( pView )
     {
-        Point aPos( pView->pEditView->GetWindowPosTopLeft((USHORT)nPara ) );
+        Point aPos( pView->pEditView->GetWindowPosTopLeft((sal_uInt16)nPara ) );
         Rectangle aRect( pView->GetOutputArea() );
         aRect.Right() = aPos.X();
         aRect.Top() = aPos.Y();
@@ -1150,26 +1150,26 @@ void Outliner::InvalidateBullet( Paragraph* /*pPara*/, ULONG nPara )
     }
 }
 
-ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong Outliner::Read( SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    BOOL bOldUndo = pEditEngine->IsUndoEnabled();
-    EnableUndo( FALSE );
+    sal_Bool bOldUndo = pEditEngine->IsUndoEnabled();
+    EnableUndo( sal_False );
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
     Clear();
 
-    ImplBlockInsertionCallbacks( TRUE );
-    ULONG nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs );
+    ImplBlockInsertionCallbacks( sal_True );
+    sal_uLong nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs );
 
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
 
-    USHORT nParas = pEditEngine->GetParagraphCount();
-     pParaList->Clear( TRUE );
-    USHORT n;
+    sal_uInt16 nParas = pEditEngine->GetParagraphCount();
+     pParaList->Clear( sal_True );
+    sal_uInt16 n;
     for ( n = 0; n < nParas; n++ )
     {
         Paragraph* pPara = new Paragraph( 0 );
@@ -1180,7 +1180,7 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
             const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( n );
             const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
             sal_Int16 nDepth = rLevel.GetValue();
-            ImplInitDepth( n, nDepth, FALSE );
+            ImplInitDepth( n, nDepth, sal_False );
         }
     }
 
@@ -1189,7 +1189,7 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
         ImpFilterIndents( 0, nParas-1 );
     }
 
-    ImplBlockInsertionCallbacks( FALSE );
+    ImplBlockInsertionCallbacks( sal_False );
     pEditEngine->SetUpdateMode( bUpdate );
     EnableUndo( bOldUndo );
 
@@ -1197,15 +1197,15 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
 }
 
 
-void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara )
+void Outliner::ImpFilterIndents( sal_uLong nFirstPara, sal_uLong nLastPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
     Paragraph* pLastConverted = NULL;
-    for( ULONG nPara = nFirstPara; nPara <= nLastPara; nPara++ )
+    for( sal_uLong nPara = nFirstPara; nPara <= nLastPara; nPara++ )
     {
         Paragraph* pPara = pParaList->GetParagraph( nPara );
                 if (pPara)
@@ -1220,7 +1220,7 @@ void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara )
                             pPara->SetDepth( pLastConverted->GetDepth() );
                     }
 
-                    ImplInitDepth( (USHORT)nPara, pPara->GetDepth(), FALSE );
+                    ImplInitDepth( (sal_uInt16)nPara, pPara->GetDepth(), sal_False );
         }
     }
 
@@ -1233,14 +1233,14 @@ void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara )
     return pEditEngine->GetUndoManager();
 }
 
-void Outliner::ImpTextPasted( ULONG nStartPara, USHORT nCount )
+void Outliner::ImpTextPasted( sal_uLong nStartPara, sal_uInt16 nCount )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
-    const ULONG nStart = nStartPara;
+    const sal_uLong nStart = nStartPara;
 
     Paragraph* pPara = pParaList->GetParagraph( nStartPara );
 //  Paragraph* pLastConverted = NULL;
@@ -1267,14 +1267,14 @@ void Outliner::ImpTextPasted( ULONG nStartPara, USHORT nCount )
         else // EditEngine-Modus
         {
             sal_Int16 nDepth = -1;
-            const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (USHORT)nStartPara );
+            const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (sal_uInt16)nStartPara );
             if ( rAttrs.GetItemState( EE_PARA_OUTLLEVEL ) == SFX_ITEM_ON )
             {
                 const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
                 nDepth = rLevel.GetValue();
             }
             if ( nDepth != GetDepth( nStartPara ) )
-                ImplInitDepth( (USHORT)nStartPara, nDepth, FALSE );
+                ImplInitDepth( (sal_uInt16)nStartPara, nDepth, sal_False );
         }
 
         nCount--;
@@ -1295,7 +1295,7 @@ long Outliner::IndentingPagesHdl( OutlinerView* pView )
     return aIndentingPagesHdl.Call( pView );
 }
 
-BOOL Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
+sal_Bool Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
 {
     DBG_CHKTHIS(Outliner,0);
     // Die selektierten Seiten muessen vorher durch ImpCalcSelectedPages
@@ -1306,32 +1306,32 @@ BOOL Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
     if ( ( mnFirstSelPage == 0 ) && ( ImplGetOutlinerMode() != OUTLINERMODE_TEXTOBJECT ) )
     {
         if ( nDepthChangedHdlPrevDepth == 1 )   // ist die einzige Seite
-            return FALSE;
+            return sal_False;
         else
-            pCurView->ImpCalcSelectedPages( FALSE );    // ohne die erste
+            pCurView->ImpCalcSelectedPages( sal_False );    // ohne die erste
     }
-    return (BOOL)IndentingPagesHdl( pCurView );
+    return (sal_Bool)IndentingPagesHdl( pCurView );
 }
 
 
-BOOL Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView )
+sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView )
 {
     DBG_CHKTHIS(Outliner,0);
     // Die selektierten Seiten muessen vorher durch ImpCalcSelectedPages
     // schon eingestellt sein
-    return (BOOL)RemovingPagesHdl( pCurView );
+    return (sal_Bool)RemovingPagesHdl( pCurView );
 }
 
-Outliner::Outliner( SfxItemPool* pPool, USHORT nMode )
+Outliner::Outliner( SfxItemPool* pPool, sal_uInt16 nMode )
 : nMinDepth( -1 )
 {
     DBG_CTOR( Outliner, 0 );
 
-    bStrippingPortions  = FALSE;
-    bPasting            = FALSE;
+    bStrippingPortions  = sal_False;
+    bPasting            = sal_False;
 
     nFirstPage          = 1;
-    bBlockInsCallback   = FALSE;
+    bBlockInsCallback   = sal_False;
 
     nMaxDepth           = 9;
 
@@ -1339,7 +1339,7 @@ Outliner::Outliner( SfxItemPool* pPool, USHORT nMode )
     pParaList->SetVisibleStateChangedHdl( LINK( this, Outliner, ParaVisibleStateChangedHdl ) );
     Paragraph* pPara = new Paragraph( 0 );
     pParaList->Insert( pPara, LIST_APPEND );
-    bFirstParaIsEmpty = TRUE;
+    bFirstParaIsEmpty = sal_True;
 
     pEditEngine = new OutlinerEditEng( this, pPool );
     pEditEngine->SetBeginMovingParagraphsHdl( LINK( this, Outliner, BeginMovingParagraphsHdl ) );
@@ -1354,17 +1354,17 @@ Outliner::~Outliner()
 {
     DBG_DTOR(Outliner,0);
 
-    pParaList->Clear( TRUE );
+    pParaList->Clear( sal_True );
     delete pParaList;
     delete pEditEngine;
 }
 
-ULONG Outliner::InsertView( OutlinerView* pView, ULONG nIndex )
+sal_uLong Outliner::InsertView( OutlinerView* pView, sal_uLong nIndex )
 {
     DBG_CHKTHIS(Outliner,0);
 
     aViewList.Insert( pView, nIndex );
-    pEditEngine->InsertView(  pView->pEditView, (USHORT)nIndex );
+    pEditEngine->InsertView(  pView->pEditView, (sal_uInt16)nIndex );
     return aViewList.GetPos( pView );
 }
 
@@ -1372,7 +1372,7 @@ OutlinerView* Outliner::RemoveView( OutlinerView* pView )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    ULONG nPos = aViewList.GetPos( pView );
+    sal_uLong nPos = aViewList.GetPos( pView );
     if ( nPos != LIST_ENTRY_NOTFOUND )
     {
         pView->pEditView->HideCursor(); // HACK wg. BugId 10006
@@ -1382,26 +1382,26 @@ OutlinerView* Outliner::RemoveView( OutlinerView* pView )
     return NULL;    // MT: return ueberfluessig
 }
 
-OutlinerView* Outliner::RemoveView( ULONG nIndex )
+OutlinerView* Outliner::RemoveView( sal_uLong nIndex )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    EditView* pEditView = pEditEngine->GetView( (USHORT)nIndex );
+    EditView* pEditView = pEditEngine->GetView( (sal_uInt16)nIndex );
     pEditView->HideCursor(); // HACK wg. BugId 10006
 
-    pEditEngine->RemoveView( (USHORT)nIndex );
+    pEditEngine->RemoveView( (sal_uInt16)nIndex );
     aViewList.Remove( nIndex );
     return NULL;    // MT: return ueberfluessig
 }
 
 
-OutlinerView* Outliner::GetView( ULONG nIndex ) const
+OutlinerView* Outliner::GetView( sal_uLong nIndex ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return aViewList.GetObject( nIndex );
 }
 
-ULONG Outliner::GetViewCount() const
+sal_uLong Outliner::GetViewCount() const
 {
     DBG_CHKTHIS(Outliner,0);
     return aViewList.Count();
@@ -1431,37 +1431,37 @@ void Outliner::DepthChangedHdl()
 }
 
 
-ULONG Outliner::GetAbsPos( Paragraph* pPara )
+sal_uLong Outliner::GetAbsPos( Paragraph* pPara )
 {
     DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pPara,"GetAbsPos:No Para");
     return pParaList->GetAbsPos( pPara );
 }
 
-ULONG Outliner::GetParagraphCount() const
+sal_uLong Outliner::GetParagraphCount() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->GetParagraphCount();
 }
 
-Paragraph* Outliner::GetParagraph( ULONG nAbsPos ) const
+Paragraph* Outliner::GetParagraph( sal_uLong nAbsPos ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->GetParagraph( nAbsPos );
 }
 
-BOOL Outliner::HasChilds( Paragraph* pParagraph ) const
+sal_Bool Outliner::HasChilds( Paragraph* pParagraph ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->HasChilds( pParagraph );
 }
 
-BOOL Outliner::ImplHasBullet( USHORT nPara ) const
+sal_Bool Outliner::ImplHasBullet( sal_uInt16 nPara ) const
 {
     return GetNumberFormat(nPara) != 0;
 }
 
-const SvxNumberFormat* Outliner::GetNumberFormat( USHORT nPara ) const
+const SvxNumberFormat* Outliner::GetNumberFormat( sal_uInt16 nPara ) const
 {
     const SvxNumberFormat* pFmt = NULL;
 
@@ -1481,7 +1481,7 @@ const SvxNumberFormat* Outliner::GetNumberFormat( USHORT nPara ) const
     return pFmt;
 }
 
-Size Outliner::ImplGetBulletSize( USHORT nPara )
+Size Outliner::ImplGetBulletSize( sal_uInt16 nPara )
 {
     Paragraph* pPara = pParaList->GetParagraph( nPara );
         if (!pPara)
@@ -1516,20 +1516,20 @@ Size Outliner::ImplGetBulletSize( USHORT nPara )
     return pPara->aBulSize;
 }
 
-void Outliner::ImplCheckParagraphs( USHORT nStart, USHORT nEnd )
+void Outliner::ImplCheckParagraphs( sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     DBG_CHKTHIS( Outliner, 0 );
 
     // --> OD 2009-03-10 #i100014#
     // assure that the following for-loop does not loop forever
-    for ( USHORT n = nStart; n < nEnd; n++ )
+    for ( sal_uInt16 n = nStart; n < nEnd; n++ )
     // <--
     {
         Paragraph* pPara = pParaList->GetParagraph( n );
         if (pPara)
         {
             pPara->Invalidate();
-            ImplCalcBulletText( n, FALSE, FALSE );
+            ImplCalcBulletText( n, sal_False, sal_False );
         }
     }
 }
@@ -1538,14 +1538,14 @@ void Outliner::SetRefDevice( OutputDevice* pRefDev )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetRefDevice( pRefDev );
-    for ( USHORT n = (USHORT) pParaList->GetParagraphCount(); n; )
+    for ( sal_uInt16 n = (sal_uInt16) pParaList->GetParagraphCount(); n; )
     {
         Paragraph* pPara = pParaList->GetParagraph( --n );
         pPara->Invalidate();
     }
 }
 
-void Outliner::ParaAttribsChanged( USHORT nPara )
+void Outliner::ParaAttribsChanged( sal_uInt16 nPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -1563,7 +1563,7 @@ void Outliner::ParaAttribsChanged( USHORT nPara )
             if ( pPara && pPara->GetDepth() != rLevel.GetValue() )
             {
                 pPara->SetDepth( rLevel.GetValue() );
-                ImplCalcBulletText( nPara, TRUE, TRUE );
+                ImplCalcBulletText( nPara, sal_True, sal_True );
             }
         }
     }
@@ -1578,13 +1578,13 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle )
     // gejagt, die die besagte Vorlage haben, warum?
     // => Eigentlich kann sich nur die Bullet-Repraesentation aendern...
 
-    USHORT nParas = (USHORT)pParaList->GetParagraphCount();
-    for( USHORT nPara = 0; nPara < nParas; nPara++ )
+    sal_uInt16 nParas = (sal_uInt16)pParaList->GetParagraphCount();
+    for( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
     {
         if ( pEditEngine->GetStyleSheet( nPara ) == pStyle )
         {
             ImplCheckNumBulletItem( nPara );
-            ImplCalcBulletText( nPara, FALSE, FALSE );
+            ImplCalcBulletText( nPara, sal_False, sal_False );
             // #97333# EditEngine formats changed paragraphs before calling this method,
             // so they are not reformatted now and use wrong bullet indent
             pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) );
@@ -1592,7 +1592,7 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle )
     }
 }
 
-Rectangle Outliner::ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnPaperPos )
+Rectangle Outliner::ImpCalcBulletArea( sal_uInt16 nPara, sal_Bool bAdjust, sal_Bool bReturnPaperPos )
 {
     // Bullet-Bereich innerhalb des Absatzes...
     Rectangle aBulletArea;
@@ -1603,7 +1603,7 @@ Rectangle Outliner::ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnP
         Point aTopLeft;
         Size aBulletSize( ImplGetBulletSize( nPara ) );
 
-        BOOL bOutlineMode = ( pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER ) != 0;
+        sal_Bool bOutlineMode = ( pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER ) != 0;
 
         // the ODF attribut text:space-before which holds the spacing to add to the left of the label
         const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset();
@@ -1700,7 +1700,7 @@ void Outliner::ExpandHdl()
     aExpandHdl.Call( this );
 }
 
-EBulletInfo Outliner::GetBulletInfo( USHORT nPara )
+EBulletInfo Outliner::GetBulletInfo( sal_uInt16 nPara )
 {
     EBulletInfo aInfo;
 
@@ -1727,54 +1727,54 @@ EBulletInfo Outliner::GetBulletInfo( USHORT nPara )
 
     if ( aInfo.bVisible )
     {
-        aInfo.aBounds = ImpCalcBulletArea( nPara, TRUE, TRUE );
+        aInfo.aBounds = ImpCalcBulletArea( nPara, sal_True, sal_True );
     }
 
     return aInfo;
 }
 
-XubString Outliner::GetText( Paragraph* pParagraph, ULONG nCount ) const
+XubString Outliner::GetText( Paragraph* pParagraph, sal_uLong nCount ) const
 {
     DBG_CHKTHIS(Outliner,0);
 
     XubString aText;
-    USHORT nStartPara = (USHORT) pParaList->GetAbsPos( pParagraph );
-    for ( USHORT n = 0; n < nCount; n++ )
+    sal_uInt16 nStartPara = (sal_uInt16) pParaList->GetAbsPos( pParagraph );
+    for ( sal_uInt16 n = 0; n < nCount; n++ )
     {
         aText += pEditEngine->GetText( nStartPara + n );
-        if ( (n+1) < (USHORT)nCount )
+        if ( (n+1) < (sal_uInt16)nCount )
             aText += '\n';
     }
     return aText;
 }
 
-void Outliner::Remove( Paragraph* pPara, ULONG nParaCount )
+void Outliner::Remove( Paragraph* pPara, sal_uLong nParaCount )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    ULONG nPos = pParaList->GetAbsPos( pPara );
+    sal_uLong nPos = pParaList->GetAbsPos( pPara );
     if( !nPos && ( nParaCount >= pParaList->GetParagraphCount() ) )
     {
         Clear();
     }
     else
     {
-        for( USHORT n = 0; n < (USHORT)nParaCount; n++ )
-            pEditEngine->RemoveParagraph( (USHORT) nPos );
+        for( sal_uInt16 n = 0; n < (sal_uInt16)nParaCount; n++ )
+            pEditEngine->RemoveParagraph( (sal_uInt16) nPos );
     }
 }
 
 void Outliner::StripPortions()
 {
     DBG_CHKTHIS(Outliner,0);
-    bStrippingPortions = TRUE;
+    bStrippingPortions = sal_True;
     pEditEngine->StripPortions();
-    bStrippingPortions = FALSE;
+    bStrippingPortions = sal_False;
 }
 
 // #101498#
-void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont,
-    USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont,
+    sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
     const EEngineData::WrongSpellVector* pWrongSpellVector,
     const SvxFieldData* pFieldData,
     bool bEndOfLine,
@@ -1799,20 +1799,20 @@ void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHO
 long Outliner::RemovingPagesHdl( OutlinerView* pView )
 {
     DBG_CHKTHIS(Outliner,0);
-    return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : TRUE;
+    return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : sal_True;
 }
 
-BOOL Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, USHORT _nFirstPage, USHORT nPages )
+sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_uInt16 _nFirstPage, sal_uInt16 nPages )
 {
     DBG_CHKTHIS(Outliner,0);
 
     nDepthChangedHdlPrevDepth = nPages;
     mnFirstSelPage = _nFirstPage;
     pHdlParagraph = 0;
-    return (BOOL)RemovingPagesHdl( pCurView );
+    return (sal_Bool)RemovingPagesHdl( pCurView );
 }
 
-SfxItemSet Outliner::GetParaAttribs( USHORT nPara )
+SfxItemSet Outliner::GetParaAttribs( sal_uInt16 nPara )
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetParaAttribs( nPara );
@@ -1822,8 +1822,8 @@ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    ULONG nPara = pParaList->GetAbsPos( pPara );
-    pEditEngine->ShowParagraph( (USHORT)nPara, pPara->IsVisible() );
+    sal_uLong nPara = pParaList->GetAbsPos( pPara );
+    pEditEngine->ShowParagraph( (sal_uInt16)nPara, pPara->IsVisible() );
 
     return 0;
 }
@@ -1847,7 +1847,7 @@ IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos )
 
 IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos )
 {
-    bPasting = FALSE;
+    bPasting = sal_False;
     ImpTextPasted( pInfos->nStartPara, pInfos->nEndPara - pInfos->nStartPara + 1 );
     maEndPasteOrDropHdl.Call( pInfos );
     UndoActionEnd( EDITUNDO_DRAGANDDROP );
@@ -1859,10 +1859,10 @@ IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, pInfos )
     DBG_CHKTHIS(Outliner,0);
 
     pParaList->MoveParagraphs( pInfos->nStartPara, pInfos->nDestPara, pInfos->nEndPara - pInfos->nStartPara + 1 );
-    USHORT nChangesStart = Min( pInfos->nStartPara, pInfos->nDestPara );
-    USHORT nParas = (USHORT)pParaList->GetParagraphCount();
-    for ( USHORT n = nChangesStart; n < nParas; n++ )
-        ImplCalcBulletText( n, FALSE, FALSE );
+    sal_uInt16 nChangesStart = Min( pInfos->nStartPara, pInfos->nDestPara );
+    sal_uInt16 nParas = (sal_uInt16)pParaList->GetParagraphCount();
+    for ( sal_uInt16 n = nChangesStart; n < nParas; n++ )
+        ImplCalcBulletText( n, sal_False, sal_False );
 
     if( !IsInUndo() )
         aEndMovingHdl.Call( this );
@@ -1884,7 +1884,7 @@ static bool isSameNumbering( const SvxNumberFormat& rN1, const SvxNumberFormat&
     return true;
 }
 
-sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pParaFmt )
+sal_uInt16 Outliner::ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat* pParaFmt )
 {
     sal_uInt16 nNumber = pParaFmt->GetStart() - 1;
 
@@ -1932,12 +1932,12 @@ sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pPar
     return nNumber;
 }
 
-void Outliner::ImplCalcBulletText( USHORT nPara, BOOL bRecalcLevel, BOOL bRecalcChilds )
+void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChilds )
 {
     DBG_CHKTHIS(Outliner,0);
 
     Paragraph* pPara = pParaList->GetParagraph( nPara );
-    USHORT nRelPos = 0xFFFF;
+    sal_uInt16 nRelPos = 0xFFFF;
 
     while ( pPara )
     {
@@ -1991,12 +1991,12 @@ void Outliner::Clear()
 
     if( !bFirstParaIsEmpty )
     {
-        ImplBlockInsertionCallbacks( TRUE );
+        ImplBlockInsertionCallbacks( sal_True );
         pEditEngine->Clear();
-        pParaList->Clear( TRUE );
+        pParaList->Clear( sal_True );
         pParaList->Insert( new Paragraph( nMinDepth ), LIST_APPEND );
-        bFirstParaIsEmpty = TRUE;
-        ImplBlockInsertionCallbacks( FALSE );
+        bFirstParaIsEmpty = sal_True;
+        ImplBlockInsertionCallbacks( sal_False );
     }
     else
     {
@@ -2006,20 +2006,20 @@ void Outliner::Clear()
     }
 }
 
-void Outliner::SetFlatMode( BOOL bFlat )
+void Outliner::SetFlatMode( sal_Bool bFlat )
 {
     DBG_CHKTHIS(Outliner,0);
 
     if( bFlat != pEditEngine->IsFlatMode() )
     {
-        for ( USHORT nPara = (USHORT)pParaList->GetParagraphCount(); nPara; )
+        for ( sal_uInt16 nPara = (sal_uInt16)pParaList->GetParagraphCount(); nPara; )
             pParaList->GetParagraph( --nPara )->aBulSize.Width() = -1;
 
         pEditEngine->SetFlatMode( bFlat );
     }
 }
 
-String Outliner::ImplGetBulletText( USHORT nPara )
+String Outliner::ImplGetBulletText( sal_uInt16 nPara )
 {
         String aRes;
     Paragraph* pPara = pParaList->GetParagraph( nPara );
@@ -2027,14 +2027,14 @@ String Outliner::ImplGetBulletText( USHORT nPara )
         {
     // MT: Optimierung mal wieder aktivieren...
 //  if( pPara->nFlags & PARAFLAG_SETBULLETTEXT )
-        ImplCalcBulletText( nPara, FALSE, FALSE );
+        ImplCalcBulletText( nPara, sal_False, sal_False );
                 aRes = pPara->GetText();
         }
     return aRes;
 }
 
 // this is needed for StarOffice Api
-void Outliner::SetLevelDependendStyleSheet( USHORT nPara )
+void Outliner::SetLevelDependendStyleSheet( sal_uInt16 nPara )
 {
     SfxItemSet aOldAttrs( pEditEngine->GetParaAttribs( nPara ) );
     ImplSetLevelDependendStyleSheet( nPara );
@@ -2043,7 +2043,7 @@ void Outliner::SetLevelDependendStyleSheet( USHORT nPara )
 
 SV_IMPL_PTRARR( NotifyList, EENotifyPtr );
 
-void Outliner::ImplBlockInsertionCallbacks( BOOL b )
+void Outliner::ImplBlockInsertionCallbacks( sal_Bool b )
 {
     if ( b )
     {
@@ -2156,7 +2156,7 @@ sal_Bool DrawPortionInfo::IsRTL() const
         nError = U_ZERO_ERROR;
 
         // I do not have this info here. Is it necessary? I'll have to ask MT.
-        const BYTE nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
+        const sal_uInt8 nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
 
         ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(mrText.GetBuffer()), mrText.Len(), nDefaultDir, NULL, &nError);    // UChar != sal_Unicode in MinGW
         nError = U_ZERO_ERROR;
diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index 624776bc94e4..17e1f2ed8e1e 100644
--- a/editeng/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -41,7 +41,7 @@
 #include <outlundo.hxx>
 
 
-OutlinerUndoBase::OutlinerUndoBase( USHORT _nId, Outliner* pOutliner )
+OutlinerUndoBase::OutlinerUndoBase( sal_uInt16 _nId, Outliner* pOutliner )
     : EditUndo( _nId, NULL )
 {
     DBG_ASSERT( pOutliner, "Undo: Outliner?!" );
@@ -111,7 +111,7 @@ void OutlinerUndoChangeParaNumberingRestart::ImplApplyData( const ParaRestartDat
     pOutliner->SetParaIsNumberingRestart( mnPara, rData.mbParaIsNumberingRestart );
 }
 
-OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth )
+OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, sal_uInt16 nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth )
     : OutlinerUndoBase( OLUNDO_DEPTH, pOutliner )
 {
     mnPara = nPara;
@@ -121,12 +121,12 @@ OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nP
 
 void OutlinerUndoChangeDepth::Undo()
 {
-    GetOutliner()->ImplInitDepth( mnPara, mnOldDepth, FALSE );
+    GetOutliner()->ImplInitDepth( mnPara, mnOldDepth, sal_False );
 }
 
 void OutlinerUndoChangeDepth::Redo()
 {
-    GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, FALSE );
+    GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, sal_False );
 }
 
 void OutlinerUndoChangeDepth::Repeat()
@@ -135,7 +135,7 @@ void OutlinerUndoChangeDepth::Repeat()
 }
 
 
-OutlinerUndoCheckPara::OutlinerUndoCheckPara( Outliner* pOutliner, USHORT nPara )
+OutlinerUndoCheckPara::OutlinerUndoCheckPara( Outliner* pOutliner, sal_uInt16 nPara )
     : OutlinerUndoBase( OLUNDO_DEPTH, pOutliner )
 {
     mnPara = nPara;
@@ -145,14 +145,14 @@ void OutlinerUndoCheckPara::Undo()
 {
     Paragraph* pPara = GetOutliner()->GetParagraph( mnPara );
     pPara->Invalidate();
-    GetOutliner()->ImplCalcBulletText( mnPara, FALSE, FALSE );
+    GetOutliner()->ImplCalcBulletText( mnPara, sal_False, sal_False );
 }
 
 void OutlinerUndoCheckPara::Redo()
 {
     Paragraph* pPara = GetOutliner()->GetParagraph( mnPara );
     pPara->Invalidate();
-    GetOutliner()->ImplCalcBulletText( mnPara, FALSE, FALSE );
+    GetOutliner()->ImplCalcBulletText( mnPara, sal_False, sal_False );
 }
 
 void OutlinerUndoCheckPara::Repeat()
@@ -162,7 +162,7 @@ void OutlinerUndoCheckPara::Repeat()
 
 DBG_NAME(OLUndoExpand);
 
-OLUndoExpand::OLUndoExpand(Outliner* pOut, USHORT _nId )
+OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId )
     : EditUndo( _nId, 0 )
 {
     DBG_CTOR(OLUndoExpand,0);
@@ -180,20 +180,20 @@ OLUndoExpand::~OLUndoExpand()
 }
 
 
-void OLUndoExpand::Restore( BOOL bUndo )
+void OLUndoExpand::Restore( sal_Bool bUndo )
 {
     DBG_CHKTHIS(OLUndoExpand,0);
     DBG_ASSERT(pOutliner,"Undo:No Outliner");
     DBG_ASSERT(pOutliner->pEditEngine,"Outliner already deleted");
     Paragraph* pPara;
 
-    BOOL bExpand = FALSE;
-    USHORT _nId = GetId();
+    sal_Bool bExpand = sal_False;
+    sal_uInt16 _nId = GetId();
     if((_nId == OLUNDO_EXPAND && !bUndo) || (_nId == OLUNDO_COLLAPSE && bUndo))
-        bExpand = TRUE;
+        bExpand = sal_True;
     if( !pParas )
     {
-        pPara = pOutliner->GetParagraph( (ULONG)nCount );
+        pPara = pOutliner->GetParagraph( (sal_uLong)nCount );
         if( bExpand )
             pOutliner->Expand( pPara );
         else
@@ -201,9 +201,9 @@ void OLUndoExpand::Restore( BOOL bUndo )
     }
     else
     {
-        for( USHORT nIdx = 0; nIdx < nCount; nIdx++ )
+        for( sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++ )
         {
-            pPara = pOutliner->GetParagraph( (ULONG)(pParas[nIdx]) );
+            pPara = pOutliner->GetParagraph( (sal_uLong)(pParas[nIdx]) );
             if( bExpand )
                 pOutliner->Expand( pPara );
             else
@@ -216,14 +216,14 @@ void OLUndoExpand::Restore( BOOL bUndo )
 void OLUndoExpand::Undo()
 {
     DBG_CHKTHIS(OLUndoExpand,0);
-    Restore( TRUE );
+    Restore( sal_True );
 }
 
 
 void OLUndoExpand::Redo()
 {
     DBG_CHKTHIS(OLUndoExpand,0);
-    Restore( FALSE );
+    Restore( sal_False );
 }
 
 
diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx
index 163e4e62fd65..68a6d7c930a1 100644
--- a/editeng/source/outliner/outlundo.hxx
+++ b/editeng/source/outliner/outlundo.hxx
@@ -38,7 +38,7 @@ private:
     Outliner*   mpOutliner;
 
 public:
-                OutlinerUndoBase( USHORT nId, Outliner* pOutliner );
+                OutlinerUndoBase( sal_uInt16 nId, Outliner* pOutliner );
 
     Outliner*   GetOutliner() const { return mpOutliner; }
 };
@@ -87,12 +87,12 @@ class OutlinerUndoChangeDepth : public OutlinerUndoBase
 {
     using SfxUndoAction::Repeat;
 private:
-    USHORT          mnPara;
+    sal_uInt16          mnPara;
     sal_Int16       mnOldDepth;
     sal_Int16       mnNewDepth;
 
 public:
-                    OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
+                    OutlinerUndoChangeDepth( Outliner* pOutliner, sal_uInt16 nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
 
     virtual void    Undo();
     virtual void    Redo();
@@ -106,10 +106,10 @@ class OutlinerUndoCheckPara : public OutlinerUndoBase
 {
     using SfxUndoAction::Repeat;
 private:
-    USHORT          mnPara;
+    sal_uInt16          mnPara;
 
 public:
-                    OutlinerUndoCheckPara( Outliner* pOutliner, USHORT nPara );
+                    OutlinerUndoCheckPara( Outliner* pOutliner, sal_uInt16 nPara );
 
     virtual void    Undo();
     virtual void    Redo();
@@ -124,17 +124,17 @@ public:
 class OLUndoExpand : public EditUndo
 {
     using SfxUndoAction::Repeat;
-    void Restore( BOOL bUndo );
+    void Restore( sal_Bool bUndo );
 public:
-    OLUndoExpand( Outliner* pOut, USHORT nId );
+    OLUndoExpand( Outliner* pOut, sal_uInt16 nId );
     ~OLUndoExpand();
     virtual void Undo();
     virtual void Redo();
     virtual void Repeat();
 
-    USHORT* pParas;  // 0 == nCount enthaelt Absatznummer
+    sal_uInt16* pParas;  // 0 == nCount enthaelt Absatznummer
     Outliner* pOutliner;
-    USHORT nCount;
+    sal_uInt16 nCount;
 };
 
 #endif
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index e2a1fabea0ba..469c932061f6 100644..100755
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -75,8 +75,8 @@ OutlinerView::OutlinerView( Outliner* pOut, Window* pWin )
     DBG_CTOR( OutlinerView, 0 );
 
     pOwner                      = pOut;
-    bDDCursorVisible            = FALSE;
-    bInDragMode                 = FALSE;
+    bDDCursorVisible            = sal_False;
+    bInDragMode                 = sal_False;
     nDDScrollLRBorderWidthWin   = 0;
     nDDScrollTBBorderWidthWin   = 0;
     pHorTabArrDoc               = 0;
@@ -103,7 +103,7 @@ void OutlinerView::Paint( const Rectangle& rRect )
     pEditView->Paint( rRect );
 }
 
-BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
+sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
@@ -113,18 +113,18 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
         pOwner->Insert( String() );
 
 
-    BOOL bKeyProcessed = FALSE;
+    sal_Bool bKeyProcessed = sal_False;
     ESelection aSel( pEditView->GetSelection() );
-    BOOL bSelection = aSel.HasRange();
+    sal_Bool bSelection = aSel.HasRange();
     KeyCode aKeyCode = rKEvt.GetKeyCode();
     KeyFuncType eFunc = aKeyCode.GetFunction();
-    USHORT nCode = aKeyCode.GetCode();
-    BOOL bReadOnly = IsReadOnly();
+    sal_uInt16 nCode = aKeyCode.GetCode();
+    sal_Bool bReadOnly = IsReadOnly();
 
     if( bSelection && ( nCode != KEY_TAB ) && EditEngine::DoesKeyChangeText( rKEvt ) )
     {
-        if ( ImpCalcSelectedPages( FALSE ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
-            return TRUE;
+        if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
+            return sal_True;
     }
 
     if ( eFunc != KEYFUNC_DONTKNOW )
@@ -136,14 +136,14 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
                 if ( !bReadOnly )
                 {
                     Cut();
-                    bKeyProcessed = TRUE;
+                    bKeyProcessed = sal_True;
                 }
             }
             break;
             case KEYFUNC_COPY:
             {
                 Copy();
-                bKeyProcessed = TRUE;
+                bKeyProcessed = sal_True;
             }
             break;
             case KEYFUNC_PASTE:
@@ -151,7 +151,7 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
                 if ( !bReadOnly )
                 {
                     PasteSpecial();
-                    bKeyProcessed = TRUE;
+                    bKeyProcessed = sal_True;
                 }
             }
             break;
@@ -165,7 +165,7 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
                         if( pNext && pNext->HasFlag(PARAFLAG_ISPAGE) )
                         {
                             if( !pOwner->ImpCanDeleteSelectedPages( this, aSel.nEndPara, 1 ) )
-                                return FALSE;
+                                return sal_False;
                         }
                     }
                 }
@@ -188,13 +188,13 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
                          ( bSelection || !aSel.nStartPos ) )
                     {
                         Indent( aKeyCode.IsShift() ? (-1) : (+1) );
-                        bKeyProcessed = TRUE;
+                        bKeyProcessed = sal_True;
                     }
                     else if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) &&
                               !bSelection && !aSel.nEndPos && pOwner->ImplHasBullet( aSel.nEndPara ) )
                     {
                         Indent( aKeyCode.IsShift() ? (-1) : (+1) );
-                        bKeyProcessed = TRUE;
+                        bKeyProcessed = sal_True;
                     }
                 }
             }
@@ -206,11 +206,11 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
                     Paragraph* pPara = pOwner->pParaList->GetParagraph( aSel.nEndPara );
                     Paragraph* pPrev = pOwner->pParaList->GetParagraph( aSel.nEndPara-1 );
                     if( !pPrev->IsVisible()  )
-                        return TRUE;
+                        return sal_True;
                     if( !pPara->GetDepth() )
                     {
                         if(!pOwner->ImpCanDeleteSelectedPages(this, aSel.nEndPara , 1 ) )
-                            return TRUE;
+                            return sal_True;
                     }
                 }
             }
@@ -229,20 +229,20 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
                         if( !bSelection &&
                                 aSel.nEndPos == pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) )
                         {
-                            ULONG nChilds = pOwner->pParaList->GetChildCount(pPara);
+                            sal_uLong nChilds = pOwner->pParaList->GetChildCount(pPara);
                             if( nChilds && !pOwner->pParaList->HasVisibleChilds(pPara))
                             {
                                 pOwner->UndoActionStart( OLUNDO_INSERT );
-                                ULONG nTemp = aSel.nEndPara;
+                                sal_uLong nTemp = aSel.nEndPara;
                                 nTemp += nChilds;
                                 nTemp++; // einfuegen ueber naechstem Non-Child
                                 pOwner->Insert( String(),nTemp,pPara->GetDepth());
                                 // Cursor positionieren
-                                ESelection aTmpSel((USHORT)nTemp,0,(USHORT)nTemp,0);
+                                ESelection aTmpSel((sal_uInt16)nTemp,0,(sal_uInt16)nTemp,0);
                                 pEditView->SetSelection( aTmpSel );
-                                pEditView->ShowCursor( TRUE, TRUE );
+                                pEditView->ShowCursor( sal_True, sal_True );
                                 pOwner->UndoActionEnd( OLUNDO_INSERT );
-                                bKeyProcessed = TRUE;
+                                bKeyProcessed = sal_True;
                             }
                         }
                     }
@@ -251,16 +251,16 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
                             ( aSel.nEndPos == pOwner->pEditEngine->GetTextLen(aSel.nEndPara) ) )
                     {
                         pOwner->UndoActionStart( OLUNDO_INSERT );
-                        ULONG nTemp = aSel.nEndPara;
+                        sal_uLong nTemp = aSel.nEndPara;
                         nTemp++;
                         pOwner->Insert( String(), nTemp, pPara->GetDepth()+1 );
 
                         // Cursor positionieren
-                        ESelection aTmpSel((USHORT)nTemp,0,(USHORT)nTemp,0);
+                        ESelection aTmpSel((sal_uInt16)nTemp,0,(sal_uInt16)nTemp,0);
                         pEditView->SetSelection( aTmpSel );
-                        pEditView->ShowCursor( TRUE, TRUE );
+                        pEditView->ShowCursor( sal_True, sal_True );
                         pOwner->UndoActionEnd( OLUNDO_INSERT );
-                        bKeyProcessed = TRUE;
+                        bKeyProcessed = sal_True;
                     }
                 }
             }
@@ -268,14 +268,14 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
         }
     }
 
-    return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt );
+    return bKeyProcessed ? sal_True : pEditView->PostKeyEvent( rKEvt );
 }
 
 
-ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget)
+sal_uLong OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget)
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nPara = EE_PARA_NOT_FOUND;
+    sal_uLong nPara = EE_PARA_NOT_FOUND;
 
     Point aMousePosWin = pEditView->GetWindow()->PixelToLogic( rPosPix );
     if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
@@ -294,7 +294,7 @@ ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget
         aPaperPos.Y() -= aOutArea.Top();
         aPaperPos.Y() += aVisArea.Top();
 
-        BOOL bBullet;
+        sal_Bool bBullet;
         if ( pOwner->IsTextPos( aPaperPos, 0, &bBullet ) )
         {
             Point aDocPos = pOwner->GetDocPos( aPaperPos );
@@ -316,7 +316,7 @@ ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget
     return nPara;
 }
 
-BOOL __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt )
+sal_Bool __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
@@ -325,7 +325,7 @@ BOOL __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt )
 
     Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
     if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
-        return FALSE;
+        return sal_False;
 
     Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
     pEditView->GetWindow()->SetPointer( aPointer );
@@ -333,7 +333,7 @@ BOOL __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt )
 }
 
 
-BOOL __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
+sal_Bool __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 {
     DBG_CHKTHIS(OutlinerView,0);
     if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
@@ -341,24 +341,24 @@ BOOL __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 
     Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
     if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
-        return FALSE;
+        return sal_False;
 
     Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
     pEditView->GetWindow()->SetPointer( aPointer );
 
     MouseTarget eTarget;
-    ULONG nPara = ImpCheckMousePos( rMEvt.GetPosPixel(), eTarget );
+    sal_uLong nPara = ImpCheckMousePos( rMEvt.GetPosPixel(), eTarget );
     if ( eTarget == MouseBullet )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
-        BOOL bHasChilds = (pPara && pOwner->pParaList->HasChilds(pPara));
+        sal_Bool bHasChilds = (pPara && pOwner->pParaList->HasChilds(pPara));
         if( rMEvt.GetClicks() == 1 )
         {
-            ULONG nEndPara = nPara;
+            sal_uLong nEndPara = nPara;
             if ( bHasChilds && pOwner->pParaList->HasVisibleChilds(pPara) )
                 nEndPara += pOwner->pParaList->GetChildCount( pPara );
             // umgekehrt rum selektieren, damit EditEngine nicht scrollt
-            ESelection aSel((USHORT)nEndPara, 0xffff,(USHORT)nPara, 0 );
+            ESelection aSel((sal_uInt16)nEndPara, 0xffff,(sal_uInt16)nPara, 0 );
             pEditView->SetSelection( aSel );
         }
         else if( rMEvt.GetClicks() == 2 && bHasChilds )
@@ -366,7 +366,7 @@ BOOL __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 
         aDDStartPosPix = rMEvt.GetPosPixel();
         aDDStartPosRef=pEditView->GetWindow()->PixelToLogic( aDDStartPosPix,pOwner->GetRefMapMode());
-        return TRUE;
+        return sal_True;
     }
 
     // special case for outliner view in impress, check if double click hits the page icon for toggle
@@ -384,7 +384,7 @@ BOOL __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 }
 
 
-BOOL __EXPORT OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
+sal_Bool __EXPORT OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
 {
     DBG_CHKTHIS(OutlinerView,0);
     if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
@@ -392,7 +392,7 @@ BOOL __EXPORT OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
 
     Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
     if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
-        return FALSE;
+        return sal_False;
 
     Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
     pEditView->GetWindow()->SetPointer( aPointer );
@@ -405,7 +405,7 @@ void OutlinerView::ImpHideDDCursor()
     DBG_CHKTHIS(OutlinerView,0);
     if ( bDDCursorVisible )
     {
-        bDDCursorVisible = FALSE;
+        bDDCursorVisible = sal_False;
         ImpPaintDDCursor();
     }
 }
@@ -415,7 +415,7 @@ void OutlinerView::ImpShowDDCursor()
     DBG_CHKTHIS(OutlinerView,0);
     if ( !bDDCursorVisible )
     {
-        bDDCursorVisible = TRUE;
+        bDDCursorVisible = sal_True;
         ImpPaintDDCursor();
     }
 }
@@ -445,16 +445,16 @@ void OutlinerView::ImpPaintDDCursor()
     }
     else
     {
-        ULONG nPara = nDDCurPara;
+        sal_uLong nPara = nDDCurPara;
         if ( nDDCurPara == LIST_APPEND )
         {
             Paragraph* pTemp = pOwner->pParaList->LastVisible();
             nPara = pOwner->pParaList->GetAbsPos( pTemp );
         }
-        aStartPointWin = pEditView->GetWindowPosTopLeft((USHORT) nPara );
+        aStartPointWin = pEditView->GetWindowPosTopLeft((sal_uInt16) nPara );
         if ( nDDCurPara == LIST_APPEND )
         {
-            long nHeight = pOwner->pEditEngine->GetTextHeight((USHORT)nPara );
+            long nHeight = pOwner->pEditEngine->GetTextHeight((sal_uInt16)nPara );
             aStartPointWin.Y() += nHeight;
         }
         aStartPointWin.X() = aOutputArWin.Left();
@@ -469,10 +469,10 @@ void OutlinerView::ImpPaintDDCursor()
 
 // Berechnet, ueber welchem Absatz eingefuegt werden muss
 
-ULONG OutlinerView::ImpGetInsertionPara( const Point& rPosPixel  )
+sal_uLong OutlinerView::ImpGetInsertionPara( const Point& rPosPixel  )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nCurPara = pEditView->GetParagraph( rPosPixel );
+    sal_uLong nCurPara = pEditView->GetParagraph( rPosPixel );
     ParagraphList* pParaList = pOwner->pParaList;
 
     if ( nCurPara == EE_PARA_NOT_FOUND )
@@ -480,8 +480,8 @@ ULONG OutlinerView::ImpGetInsertionPara( const Point& rPosPixel  )
     else
     {
         Point aPosWin = pEditView->GetWindow()->PixelToLogic( rPosPixel );
-        Point aParaPosWin = pEditView->GetWindowPosTopLeft((USHORT)nCurPara);
-        long nHeightRef = pOwner->pEditEngine->GetTextHeight((USHORT)nCurPara);
+        Point aParaPosWin = pEditView->GetWindowPosTopLeft((sal_uInt16)nCurPara);
+        long nHeightRef = pOwner->pEditEngine->GetTextHeight((sal_uInt16)nCurPara);
         long nParaYOffs = aPosWin.Y() - aParaPosWin.Y();
 
         if ( nParaYOffs > nHeightRef / 2  )
@@ -499,7 +499,7 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
-    USHORT nPara = (USHORT) pOwner->pParaList->GetAbsPos( pPara );
+    sal_uInt16 nPara = (sal_uInt16) pOwner->pParaList->GetAbsPos( pPara );
     pEditView->SetSelection( ESelection( nPara, 0, nPara, 0 ) );
     ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChilds( pPara ) );
     pEditView->ShowCursor();
@@ -515,21 +515,21 @@ void OutlinerView::SetOutliner( Outliner* pOutliner )
 
 
 
-ULONG OutlinerView::Select( Paragraph* pParagraph, BOOL bSelect,
-    BOOL bWithChilds )
+sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
+    sal_Bool bWithChilds )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
-    ULONG nPara = pOwner->pParaList->GetAbsPos( pParagraph );
-    USHORT nEnd = 0;
+    sal_uLong nPara = pOwner->pParaList->GetAbsPos( pParagraph );
+    sal_uInt16 nEnd = 0;
     if ( bSelect )
         nEnd = 0xffff;
 
-    ULONG nChildCount = 0;
+    sal_uLong nChildCount = 0;
     if ( bWithChilds )
         nChildCount = pOwner->pParaList->GetChildCount( pParagraph );
 
-    ESelection aSel( (USHORT)nPara, 0,(USHORT)(nPara+nChildCount), nEnd );
+    ESelection aSel( (sal_uInt16)nPara, 0,(sal_uInt16)(nPara+nChildCount), nEnd );
     pEditView->SetSelection( aSel );
     return nChildCount+1;
 }
@@ -539,21 +539,21 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
-    BOOL bUpdate = pOwner->pEditEngine->GetUpdateMode();
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
 
     if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
         pOwner->UndoActionStart( OLUNDO_ATTR );
 
-    ParaRange aSel = ImpGetSelectedParagraphs( FALSE );
+    ParaRange aSel = ImpGetSelectedParagraphs( sal_False );
 
     pEditView->SetAttribs( rAttrs );
 
     // Bullet-Texte aktualisieren
-    for( USHORT nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    for( sal_uInt16 nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         pOwner->ImplCheckNumBulletItem( nPara );
-        pOwner->ImplCalcBulletText( nPara, FALSE, FALSE );
+        pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
 
         if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
             pOwner->InsertUndo( new OutlinerUndoCheckPara( pOwner, nPara ) );
@@ -565,7 +565,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
     pEditView->SetEditEngineUpdateMode( bUpdate );
 }
 
-ParaRange OutlinerView::ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds )
+ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds )
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
@@ -579,7 +579,7 @@ ParaRange OutlinerView::ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds )
         Paragraph* pLast = pOwner->pParaList->GetParagraph( aParas.nEndPara );
         if ( pOwner->pParaList->HasHiddenChilds( pLast ) )
             aParas.nEndPara =
-                sal::static_int_cast< USHORT >(
+                sal::static_int_cast< sal_uInt16 >(
                     aParas.nEndPara +
                     pOwner->pParaList->GetChildCount( pLast ) );
     }
@@ -596,22 +596,22 @@ void OutlinerView::Indent( short nDiff )
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
-    if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( TRUE ) && !pOwner->ImpCanIndentSelectedPages( this ) ) )
+    if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( sal_True ) && !pOwner->ImpCanIndentSelectedPages( this ) ) )
         return;
 
     const bool bOutlinerView = pOwner->pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER;
-    BOOL bUpdate = pOwner->pEditEngine->GetUpdateMode();
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
 
-    BOOL bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
+    sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
 
     if( bUndo )
         pOwner->UndoActionStart( OLUNDO_DEPTH );
 
     sal_Int16 nMinDepth = -1;   // Optimierung: Nicht unnoetig viele Absatze neu berechnen
 
-    ParaRange aSel = ImpGetSelectedParagraphs( TRUE );
-    for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    ParaRange aSel = ImpGetSelectedParagraphs( sal_True );
+    for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
 
@@ -692,8 +692,8 @@ void OutlinerView::Indent( short nDiff )
             pOwner->mnDepthChangeHdlPrevFlags = pPara->nFlags;
             pOwner->pHdlParagraph = pPara;
 
-            pOwner->ImplInitDepth( nPara, nNewDepth, TRUE, FALSE );
-            pOwner->ImplCalcBulletText( nPara, FALSE, FALSE );
+            pOwner->ImplInitDepth( nPara, nNewDepth, sal_True, sal_False );
+            pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
 
             if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
                 pOwner->ImplSetLevelDependendStyleSheet( nPara );
@@ -714,18 +714,18 @@ void OutlinerView::Indent( short nDiff )
     // pOwner->ImpSetBulletTextsFrom( aSel.nStartPara+1, nMinDepth );
     // Wird jetzt direkt in Schleife mit ImplCalcBulletText() erledigt.
     // Jetzt fehlen nur noch die folgenden Ansaetze, die davon betroffen sind.
-    USHORT nParas = (USHORT)pOwner->pParaList->GetParagraphCount();
-    for ( USHORT n = aSel.nEndPara+1; n < nParas; n++ )
+    sal_uInt16 nParas = (sal_uInt16)pOwner->pParaList->GetParagraphCount();
+    for ( sal_uInt16 n = aSel.nEndPara+1; n < nParas; n++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( n );
         if ( pPara->GetDepth() < nMinDepth )
             break;
-        pOwner->ImplCalcBulletText( n, FALSE, FALSE );
+        pOwner->ImplCalcBulletText( n, sal_False, sal_False );
     }
 
     if ( bUpdate )
     {
-        pEditView->SetEditEngineUpdateMode( TRUE );
+        pEditView->SetEditEngineUpdateMode( sal_True );
         pEditView->ShowCursor();
     }
 
@@ -733,33 +733,33 @@ void OutlinerView::Indent( short nDiff )
         pOwner->UndoActionEnd( OLUNDO_DEPTH );
 }
 
-BOOL OutlinerView::AdjustHeight( long nDY )
+sal_Bool OutlinerView::AdjustHeight( long nDY )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->MoveParagraphs( nDY );
-    return TRUE;    // remove return value...
+    return sal_True;    // remove return value...
 }
 
-void OutlinerView::AdjustDepth( Paragraph* pPara, short nDX, BOOL bWithChilds)
+void OutlinerView::AdjustDepth( Paragraph* pPara, short nDX, sal_Bool bWithChilds)
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nStartPara = pOwner->pParaList->GetAbsPos( pPara );
-    ULONG nEndPara = nStartPara;
+    sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
+    sal_uLong nEndPara = nStartPara;
     if ( bWithChilds )
         nEndPara += pOwner->pParaList->GetChildCount( pPara );
-    ESelection aSel((USHORT)nStartPara, 0,(USHORT)nEndPara, 0xffff );
+    ESelection aSel((sal_uInt16)nStartPara, 0,(sal_uInt16)nEndPara, 0xffff );
     pEditView->SetSelection( aSel );
     AdjustDepth( nDX );
 }
 
-void OutlinerView::AdjustHeight( Paragraph* pPara, long nDY, BOOL bWithChilds )
+void OutlinerView::AdjustHeight( Paragraph* pPara, long nDY, sal_Bool bWithChilds )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nStartPara = pOwner->pParaList->GetAbsPos( pPara );
-    ULONG nEndPara = nStartPara;
+    sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
+    sal_uLong nEndPara = nStartPara;
     if ( bWithChilds )
         nEndPara += pOwner->pParaList->GetChildCount( pPara );
-    ESelection aSel( (USHORT)nStartPara, 0, (USHORT)nEndPara, 0xffff );
+    ESelection aSel( (sal_uInt16)nStartPara, 0, (sal_uInt16)nEndPara, 0xffff );
     pEditView->SetSelection( aSel );
     AdjustHeight( nDY );
 }
@@ -902,47 +902,47 @@ void OutlinerView::ImpScrollUp()
 void OutlinerView::Expand()
 {
     DBG_CHKTHIS( OutlinerView, 0 );
-    ParaRange aParas = ImpGetSelectedParagraphs( FALSE );
-    ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, TRUE );
+    ParaRange aParas = ImpGetSelectedParagraphs( sal_False );
+    ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_True );
 }
 
 
 void OutlinerView::Collapse()
 {
     DBG_CHKTHIS( OutlinerView, 0 );
-    ParaRange aParas = ImpGetSelectedParagraphs( FALSE );
-    ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, FALSE );
+    ParaRange aParas = ImpGetSelectedParagraphs( sal_False );
+    ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_False );
 }
 
 
 void OutlinerView::ExpandAll()
 {
     DBG_CHKTHIS( OutlinerView, 0 );
-    ImplExpandOrCollaps( 0, (USHORT)(pOwner->pParaList->GetParagraphCount()-1), TRUE );
+    ImplExpandOrCollaps( 0, (sal_uInt16)(pOwner->pParaList->GetParagraphCount()-1), sal_True );
 }
 
 
 void OutlinerView::CollapseAll()
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ImplExpandOrCollaps( 0, (USHORT)(pOwner->pParaList->GetParagraphCount()-1), FALSE );
+    ImplExpandOrCollaps( 0, (sal_uInt16)(pOwner->pParaList->GetParagraphCount()-1), sal_False );
 }
 
-void OutlinerView::ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand )
+void OutlinerView::ImplExpandOrCollaps( sal_uInt16 nStartPara, sal_uInt16 nEndPara, sal_Bool bExpand )
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
-    BOOL bUpdate = pOwner->GetUpdateMode();
-    pOwner->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pOwner->GetUpdateMode();
+    pOwner->SetUpdateMode( sal_False );
 
-    BOOL bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
+    sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
     if( bUndo )
         pOwner->UndoActionStart( bExpand ? OLUNDO_EXPAND : OLUNDO_COLLAPSE );
 
-    for ( USHORT nPara = nStartPara; nPara <= nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
-        BOOL bDone = bExpand ? pOwner->Expand( pPara ) : pOwner->Collapse( pPara );
+        sal_Bool bDone = bExpand ? pOwner->Expand( pPara ) : pOwner->Collapse( pPara );
         if( bDone )
         {
             // Der Strich unter dem Absatz muss verschwinden...
@@ -955,7 +955,7 @@ void OutlinerView::ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL
 
     if ( bUpdate )
     {
-        pOwner->SetUpdateMode( TRUE );
+        pOwner->SetUpdateMode( sal_True );
         pEditView->ShowCursor();
     }
 }
@@ -989,22 +989,22 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
 
     DBG_CHKTHIS(OutlinerView,0);
 
-    if ( ImpCalcSelectedPages( FALSE ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
+    if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
         return;
 
     pOwner->UndoActionStart( OLUNDO_INSERT );
 
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
-    ULONG nStart, nParaCount;
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
+    sal_uLong nStart, nParaCount;
     nParaCount = pOwner->pEditEngine->GetParagraphCount();
-    USHORT nSize = ImpInitPaste( nStart );
+    sal_uInt16 nSize = ImpInitPaste( nStart );
     pEditView->InsertText( rParaObj.GetTextObject() );
     ImpPasted( nStart, nParaCount, nSize);
-    pEditView->SetEditEngineUpdateMode( TRUE );
+    pEditView->SetEditEngineUpdateMode( sal_True );
 
     pOwner->UndoActionEnd( OLUNDO_INSERT );
 
-    pEditView->ShowCursor( TRUE, TRUE );
+    pEditView->ShowCursor( sal_True, sal_True );
 }
 
 
@@ -1012,7 +1012,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
 void OutlinerView::Cut()
 {
     DBG_CHKTHIS(OutlinerView,0);
-    if ( !ImpCalcSelectedPages( FALSE ) || pOwner->ImpCanDeleteSelectedPages( this ) )
+    if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) )
         pEditView->Cut();
 }
 
@@ -1025,25 +1025,25 @@ void OutlinerView::Paste()
 void OutlinerView::PasteSpecial()
 {
     DBG_CHKTHIS(OutlinerView,0);
-    if ( !ImpCalcSelectedPages( FALSE ) || pOwner->ImpCanDeleteSelectedPages( this ) )
+    if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) )
     {
         pOwner->UndoActionStart( OLUNDO_INSERT );
 
-        pOwner->pEditEngine->SetUpdateMode( FALSE );
-        pOwner->bPasting = TRUE;
+        pOwner->pEditEngine->SetUpdateMode( sal_False );
+        pOwner->bPasting = sal_True;
         pEditView->PasteSpecial();
 
         if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
         {
-            const USHORT nParaCount = pOwner->pEditEngine->GetParagraphCount();
+            const sal_uInt16 nParaCount = pOwner->pEditEngine->GetParagraphCount();
 
-            for( USHORT nPara = 0; nPara < nParaCount; nPara++ )
+            for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ )
                 pOwner->ImplSetLevelDependendStyleSheet( nPara );
         }
 
-        pEditView->SetEditEngineUpdateMode( TRUE );
+        pEditView->SetEditEngineUpdateMode( sal_True );
         pOwner->UndoActionEnd( OLUNDO_INSERT );
-        pEditView->ShowCursor( TRUE, TRUE );
+        pEditView->ShowCursor( sal_True, sal_True );
     }
 }
 
@@ -1051,9 +1051,9 @@ List* OutlinerView::CreateSelectionList()
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
-    ParaRange aParas = ImpGetSelectedParagraphs( TRUE );
+    ParaRange aParas = ImpGetSelectedParagraphs( sal_True );
     List* pSelList = new List;
-    for ( USHORT nPara = aParas.nStartPara; nPara <= aParas.nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = aParas.nStartPara; nPara <= aParas.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
         pSelList->Insert( pPara, LIST_APPEND );
@@ -1072,11 +1072,11 @@ void OutlinerView::SetStyleSheet( SfxStyleSheet* pStyle )
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetStyleSheet( pStyle );
 
-    ParaRange aSel = ImpGetSelectedParagraphs( TRUE );
-    for( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    ParaRange aSel = ImpGetSelectedParagraphs( sal_True );
+    for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         pOwner->ImplCheckNumBulletItem( nPara );
-        pOwner->ImplCalcBulletText( nPara, FALSE, FALSE );
+        pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
     }
 }
 
@@ -1105,28 +1105,28 @@ Pointer OutlinerView::GetPointer( const Point& rPosPixel )
 }
 
 
-USHORT OutlinerView::ImpInitPaste( ULONG& rStart )
+sal_uInt16 OutlinerView::ImpInitPaste( sal_uLong& rStart )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    pOwner->bPasting = TRUE;
+    pOwner->bPasting = sal_True;
     ESelection aSelection( pEditView->GetSelection() );
     aSelection.Adjust();
     rStart = aSelection.nStartPara;
-    USHORT nSize = aSelection.nEndPara - aSelection.nStartPara + 1;
+    sal_uInt16 nSize = aSelection.nEndPara - aSelection.nStartPara + 1;
     return nSize;
 }
 
 
-void OutlinerView::ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize)
+void OutlinerView::ImpPasted( sal_uLong nStart, sal_uLong nPrevParaCount, sal_uInt16 nSize)
 {
     DBG_CHKTHIS(OutlinerView,0);
-    pOwner->bPasting = FALSE;
-    ULONG nCurParaCount = (ULONG)pOwner->pEditEngine->GetParagraphCount();
+    pOwner->bPasting = sal_False;
+    sal_uLong nCurParaCount = (sal_uLong)pOwner->pEditEngine->GetParagraphCount();
     if( nCurParaCount < nPrevParaCount )
-        nSize = sal::static_int_cast< USHORT >(
+        nSize = sal::static_int_cast< sal_uInt16 >(
             nSize - ( nPrevParaCount - nCurParaCount ) );
     else
-        nSize = sal::static_int_cast< USHORT >(
+        nSize = sal::static_int_cast< sal_uInt16 >(
             nSize + ( nCurParaCount - nPrevParaCount ) );
     pOwner->ImpTextPasted( nStart, nSize );
 }
@@ -1139,31 +1139,31 @@ void OutlinerView::Command( const CommandEvent& rCEvt )
 }
 
 
-void OutlinerView::SelectRange( ULONG nFirst, USHORT nCount )
+void OutlinerView::SelectRange( sal_uLong nFirst, sal_uInt16 nCount )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nLast = nFirst+nCount;
-    nCount = (USHORT)pOwner->pParaList->GetParagraphCount();
+    sal_uLong nLast = nFirst+nCount;
+    nCount = (sal_uInt16)pOwner->pParaList->GetParagraphCount();
     if( nLast <= nCount )
         nLast = nCount - 1;
-    ESelection aSel( (USHORT)nFirst, 0, (USHORT)nLast, 0xffff );
+    ESelection aSel( (sal_uInt16)nFirst, 0, (sal_uInt16)nLast, 0xffff );
     pEditView->SetSelection( aSel );
 }
 
 
-USHORT OutlinerView::ImpCalcSelectedPages( BOOL bIncludeFirstSelected )
+sal_uInt16 OutlinerView::ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
     ESelection aSel( pEditView->GetSelection() );
     aSel.Adjust();
 
-    USHORT nPages = 0;
-    USHORT nFirstPage = 0xFFFF;
-    USHORT nStartPara = aSel.nStartPara;
+    sal_uInt16 nPages = 0;
+    sal_uInt16 nFirstPage = 0xFFFF;
+    sal_uInt16 nStartPara = aSel.nStartPara;
     if ( !bIncludeFirstSelected )
         nStartPara++;   // alle nach StartPara kommenden Absaetze werden geloescht
-    for ( USHORT nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
         DBG_ASSERT(pPara, "ImpCalcSelectedPages: ungueltige Selection? ");
@@ -1194,11 +1194,11 @@ void OutlinerView::ToggleBullets()
     aSel.Adjust();
 
     const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
 
     sal_Int16 nDepth = -2;
 
-    for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
         DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
@@ -1225,8 +1225,8 @@ void OutlinerView::ToggleBullets()
 
     // --> OD 2009-03-10 #i100014#
     // It is not a good idea to substract 1 from a count and cast the result
-    // to USHORT without check, if the count is 0.
-    USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount());
+    // to sal_uInt16 without check, if the count is 0.
+    sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount());
     // <--
     pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
     pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
@@ -1244,9 +1244,9 @@ void OutlinerView::EnableBullets()
     aSel.Adjust();
 
     const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
 
-    for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
         DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
@@ -1259,8 +1259,8 @@ void OutlinerView::EnableBullets()
 
     // --> OD 2009-03-10 #i100014#
     // It is not a good idea to substract 1 from a count and cast the result
-    // to USHORT without check, if the count is 0.
-    USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount());
+    // to sal_uInt16 without check, if the count is 0.
+    sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount());
     // <--
     pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
     pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
@@ -1271,16 +1271,16 @@ void OutlinerView::EnableBullets()
 }
 
 
-void OutlinerView::RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs )
+void OutlinerView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
 {
-    RemoveAttribs( bRemoveParaAttribs, 0, TRUE /*keep language attribs*/ );
+    RemoveAttribs( bRemoveParaAttribs, 0, sal_True /*keep language attribs*/ );
 }
 
-void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL bKeepLanguages )
+void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich, sal_Bool bKeepLanguages )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    BOOL bUpdate = pOwner->GetUpdateMode();
-    pOwner->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pOwner->GetUpdateMode();
+    pOwner->SetUpdateMode( sal_False );
     pOwner->UndoActionStart( OLUNDO_ATTR );
     if (bKeepLanguages)
         pEditView->RemoveAttribsKeepLanguages( bRemoveParaAttribs );
@@ -1291,10 +1291,10 @@ void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL b
         // Ueber alle Absaetze, und Einrueckung und Level einstellen
         ESelection aSel = pEditView->GetSelection();
         aSel.Adjust();
-        for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+        for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
         {
             Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
-            pOwner->ImplInitDepth( nPara, pPara->GetDepth(), FALSE, FALSE );
+            pOwner->ImplInitDepth( nPara, pPara->GetDepth(), sal_False, sal_False );
         }
     }
     pOwner->UndoActionEnd( OLUNDO_ATTR );
@@ -1308,7 +1308,7 @@ void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL b
 // ======================================================================
 
 
-void OutlinerView::InsertText( const XubString& rNew, BOOL bSelect )
+void OutlinerView::InsertText( const XubString& rNew, sal_Bool bSelect )
 {
     DBG_CHKTHIS(OutlinerView,0);
     if( pOwner->bFirstParaIsEmpty )
@@ -1329,26 +1329,26 @@ void OutlinerView::SetSelection( const ESelection& rSel )
     pEditView->SetSelection( rSel );
 }
 
-void OutlinerView::SetReadOnly( BOOL bReadOnly )
+void OutlinerView::SetReadOnly( sal_Bool bReadOnly )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetReadOnly( bReadOnly );
 }
 
-BOOL OutlinerView::IsReadOnly() const
+sal_Bool OutlinerView::IsReadOnly() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsReadOnly();
 }
 
-BOOL OutlinerView::HasSelection() const
+sal_Bool OutlinerView::HasSelection() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->HasSelection();
 }
 
 
-void OutlinerView::ShowCursor( BOOL bGotoCursor )
+void OutlinerView::ShowCursor( sal_Bool bGotoCursor )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->ShowCursor( bGotoCursor );
@@ -1397,10 +1397,10 @@ XubString OutlinerView::GetSelected() const
 }
 
 
-void OutlinerView::RemoveCharAttribs( ULONG nPara, USHORT nWhich)
+void OutlinerView::RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich)
 {
     DBG_CHKTHIS(OutlinerView,0);
-    pEditView->RemoveCharAttribs( (USHORT)nPara, nWhich);
+    pEditView->RemoveCharAttribs( (sal_uInt16)nPara, nWhich);
 }
 
 
@@ -1411,7 +1411,7 @@ void OutlinerView::CompleteAutoCorrect()
 }
 
 
-EESpellState OutlinerView::StartSpeller( BOOL bMultiDoc )
+EESpellState OutlinerView::StartSpeller( sal_Bool bMultiDoc )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->StartSpeller( bMultiDoc );
@@ -1427,7 +1427,7 @@ EESpellState OutlinerView::StartThesaurus()
 
 void OutlinerView::StartTextConversion(
     LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
-    INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc )
+    sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
 {
     DBG_CHKTHIS(OutlinerView,0);
     if (
@@ -1445,7 +1445,7 @@ void OutlinerView::StartTextConversion(
 }
 
 
-USHORT OutlinerView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
+sal_uInt16 OutlinerView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->StartSearchAndReplace( rSearchItem );
@@ -1473,14 +1473,14 @@ void OutlinerView::Scroll( long nHorzScroll, long nVertScroll )
 }
 
 
-void OutlinerView::SetControlWord( ULONG nWord )
+void OutlinerView::SetControlWord( sal_uLong nWord )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetControlWord( nWord );
 }
 
 
-ULONG OutlinerView::GetControlWord() const
+sal_uLong OutlinerView::GetControlWord() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetControlWord();
@@ -1515,7 +1515,7 @@ void OutlinerView::Redo()
 }
 
 
-void OutlinerView::EnablePaste( BOOL bEnable )
+void OutlinerView::EnablePaste( sal_Bool bEnable )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->EnablePaste( bEnable );
@@ -1543,7 +1543,7 @@ const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer() const
 }
 
 
-const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer( USHORT& nPara, USHORT& nPos ) const
+const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer( sal_uInt16& nPara, sal_uInt16& nPos ) const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetFieldUnderMousePointer( nPara, nPos );
@@ -1556,28 +1556,28 @@ const SvxFieldItem* OutlinerView::GetFieldAtSelection() const
     return pEditView->GetFieldAtSelection();
 }
 
-void OutlinerView::SetInvalidateMore( USHORT nPixel )
+void OutlinerView::SetInvalidateMore( sal_uInt16 nPixel )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetInvalidateMore( nPixel );
 }
 
 
-USHORT OutlinerView::GetInvalidateMore() const
+sal_uInt16 OutlinerView::GetInvalidateMore() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetInvalidateMore();
 }
 
 
-BOOL OutlinerView::IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong )
+sal_Bool OutlinerView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsCursorAtWrongSpelledWord( bMarkIfWrong );
 }
 
 
-BOOL OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong )
+sal_Bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong );
@@ -1597,31 +1597,31 @@ void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg )
     pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg );
 }
 
-ULONG OutlinerView::Read( SvStream& rInput,  const String& rBaseURL, EETextFormat eFormat, BOOL bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong OutlinerView::Read( SvStream& rInput,  const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    USHORT nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
+    sal_uInt16 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
     ESelection aOldSel = pEditView->GetSelection();
     aOldSel.Adjust();
 
-    ULONG nRet = pEditView->Read( rInput, rBaseURL, eFormat, bSelect, pHTTPHeaderAttrs );
+    sal_uLong nRet = pEditView->Read( rInput, rBaseURL, eFormat, bSelect, pHTTPHeaderAttrs );
 
     // MT 08/00: Hier sollte eigentlich das gleiche wie in PasteSpecial passieren!
     // Mal anpassen, wenn dieses ImplInitPaste und ImpPasted-Geraffel ueberarbeitet ist.
 
     long nParaDiff = pEditView->GetEditEngine()->GetParagraphCount() - nOldParaCount;
-    USHORT nChangesStart = aOldSel.nStartPara;
-    USHORT nChangesEnd = sal::static_int_cast< USHORT >(nChangesStart + nParaDiff + (aOldSel.nEndPara-aOldSel.nStartPara));
+    sal_uInt16 nChangesStart = aOldSel.nStartPara;
+    sal_uInt16 nChangesEnd = sal::static_int_cast< sal_uInt16 >(nChangesStart + nParaDiff + (aOldSel.nEndPara-aOldSel.nStartPara));
 
-    for ( USHORT n = nChangesStart; n <= nChangesEnd; n++ )
+    for ( sal_uInt16 n = nChangesStart; n <= nChangesEnd; n++ )
     {
         if ( eFormat == EE_FORMAT_BIN )
         {
-            USHORT nDepth = 0;
+            sal_uInt16 nDepth = 0;
             const SfxItemSet& rAttrs = pOwner->GetParaAttribs( n );
             const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
             nDepth = rLevel.GetValue();
-            pOwner->ImplInitDepth( n, nDepth, FALSE );
+            pOwner->ImplInitDepth( n, nDepth, sal_False );
         }
 
         if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
@@ -1636,7 +1636,7 @@ ULONG OutlinerView::Read( SvStream& rInput,  const String& rBaseURL, EETextForma
     return nRet;
 }
 
-ULONG OutlinerView::Write( SvStream& rOutput, EETextFormat eFormat )
+sal_uLong OutlinerView::Write( SvStream& rOutput, EETextFormat eFormat )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->Write( rOutput, eFormat );
@@ -1661,7 +1661,7 @@ SfxItemSet OutlinerView::GetAttribs()
     return pEditView->GetAttribs();
 }
 
-USHORT OutlinerView::GetSelectedScriptType() const
+sal_uInt16 OutlinerView::GetSelectedScriptType() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSelectedScriptType();
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index c46f973280dc..cde4a9f36c4c 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -72,7 +72,7 @@ Paragraph::Paragraph( sal_Int16 nDDepth )
 
     nDepth = nDDepth;
     nFlags = 0;
-    bVisible = TRUE;
+    bVisible = sal_True;
 }
 
 Paragraph::Paragraph( const Paragraph& rPara )
@@ -90,7 +90,7 @@ Paragraph::Paragraph( const Paragraph& rPara )
 Paragraph::Paragraph( const ParagraphData& rData )
 : nFlags( 0 )
 , aBulSize( -1, -1)
-, bVisible( TRUE )
+, bVisible( sal_True )
 {
     DBG_CTOR( Paragraph, 0 );
 
@@ -118,11 +118,11 @@ void Paragraph::SetParaIsNumberingRestart( sal_Bool bParaIsNumberingRestart )
         mnNumberingStartValue = -1;
 }
 
-void ParagraphList::Clear( BOOL bDestroyParagraphs )
+void ParagraphList::Clear( sal_Bool bDestroyParagraphs )
 {
     if ( bDestroyParagraphs )
     {
-        for ( ULONG n = GetParagraphCount(); n; )
+        for ( sal_uLong n = GetParagraphCount(); n; )
         {
             Paragraph* pPara = GetParagraph( --n );
             delete pPara;
@@ -131,11 +131,11 @@ void ParagraphList::Clear( BOOL bDestroyParagraphs )
     List::Clear();
 }
 
-void ParagraphList::MoveParagraphs( ULONG nStart, ULONG nDest, ULONG _nCount )
+void ParagraphList::MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong _nCount )
 {
     if ( ( nDest < nStart ) || ( nDest >= ( nStart + _nCount ) ) )
     {
-        ULONG n;
+        sal_uLong n;
         ParagraphList aParas;
         for ( n = 0; n < _nCount; n++ )
         {
@@ -161,7 +161,7 @@ void ParagraphList::MoveParagraphs( ULONG nStart, ULONG nDest, ULONG _nCount )
 
 Paragraph* ParagraphList::NextVisible( Paragraph* pPara ) const
 {
-    ULONG n = GetAbsPos( pPara );
+    sal_uLong n = GetAbsPos( pPara );
 
     Paragraph* p = GetParagraph( ++n );
     while ( p && !p->IsVisible() )
@@ -172,7 +172,7 @@ Paragraph* ParagraphList::NextVisible( Paragraph* pPara ) const
 
 Paragraph* ParagraphList::PrevVisible( Paragraph* pPara ) const
 {
-    ULONG n = GetAbsPos( pPara );
+    sal_uLong n = GetAbsPos( pPara );
 
     Paragraph* p = n ? GetParagraph( --n ) : NULL;
     while ( p && !p->IsVisible() )
@@ -183,7 +183,7 @@ Paragraph* ParagraphList::PrevVisible( Paragraph* pPara ) const
 
 Paragraph* ParagraphList::LastVisible() const
 {
-    ULONG n = GetParagraphCount();
+    sal_uLong n = GetParagraphCount();
 
     Paragraph* p = n ? GetParagraph( --n ) : NULL;
     while ( p && !p->IsVisible() )
@@ -192,31 +192,31 @@ Paragraph* ParagraphList::LastVisible() const
     return p;
 }
 
-BOOL ParagraphList::HasChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasChilds( Paragraph* pParagraph ) const
 {
-    ULONG n = GetAbsPos( pParagraph );
+    sal_uLong n = GetAbsPos( pParagraph );
     Paragraph* pNext = GetParagraph( ++n );
-    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? TRUE : FALSE;
+    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? sal_True : sal_False;
 }
 
-BOOL ParagraphList::HasHiddenChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasHiddenChilds( Paragraph* pParagraph ) const
 {
-    ULONG n = GetAbsPos( pParagraph );
+    sal_uLong n = GetAbsPos( pParagraph );
     Paragraph* pNext = GetParagraph( ++n );
-    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? TRUE : FALSE;
+    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? sal_True : sal_False;
 }
 
-BOOL ParagraphList::HasVisibleChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasVisibleChilds( Paragraph* pParagraph ) const
 {
-    ULONG n = GetAbsPos( pParagraph );
+    sal_uLong n = GetAbsPos( pParagraph );
     Paragraph* pNext = GetParagraph( ++n );
-    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible() ) ? TRUE : FALSE;
+    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible() ) ? sal_True : sal_False;
 }
 
-ULONG ParagraphList::GetChildCount( Paragraph* pParent ) const
+sal_uLong ParagraphList::GetChildCount( Paragraph* pParent ) const
 {
-    ULONG nChildCount = 0;
-    ULONG n = GetAbsPos( pParent );
+    sal_uLong nChildCount = 0;
+    sal_uLong n = GetAbsPos( pParent );
     Paragraph* pPara = GetParagraph( ++n );
     while ( pPara && ( pPara->GetDepth() > pParent->GetDepth() ) )
     {
@@ -226,10 +226,10 @@ ULONG ParagraphList::GetChildCount( Paragraph* pParent ) const
     return nChildCount;
 }
 
-Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, USHORT& rRelPos */ ) const
+Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const
 {
     /* rRelPos = 0 */;
-    ULONG n = GetAbsPos( pParagraph );
+    sal_uLong n = GetAbsPos( pParagraph );
     Paragraph* pPrev = GetParagraph( --n );
     while ( pPrev && ( pPrev->GetDepth() >= pParagraph->GetDepth() ) )
     {
@@ -243,15 +243,15 @@ Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, USHORT& rRelPos *
 
 void ParagraphList::Expand( Paragraph* pParent )
 {
-    ULONG nChildCount = GetChildCount( pParent );
-    ULONG nPos = GetAbsPos( pParent );
+    sal_uLong nChildCount = GetChildCount( pParent );
+    sal_uLong nPos = GetAbsPos( pParent );
 
-    for ( ULONG n = 1; n <= nChildCount; n++  )
+    for ( sal_uLong n = 1; n <= nChildCount; n++  )
     {
         Paragraph* pPara = GetParagraph( nPos+n );
         if ( !( pPara->IsVisible() ) )
         {
-            pPara->bVisible = TRUE;
+            pPara->bVisible = sal_True;
             aVisibleStateChangedHdl.Call( pPara );
         }
     }
@@ -259,25 +259,25 @@ void ParagraphList::Expand( Paragraph* pParent )
 
 void ParagraphList::Collapse( Paragraph* pParent )
 {
-    ULONG nChildCount = GetChildCount( pParent );
-    ULONG nPos = GetAbsPos( pParent );
+    sal_uLong nChildCount = GetChildCount( pParent );
+    sal_uLong nPos = GetAbsPos( pParent );
 
-    for ( ULONG n = 1; n <= nChildCount; n++  )
+    for ( sal_uLong n = 1; n <= nChildCount; n++  )
     {
         Paragraph* pPara = GetParagraph( nPos+n );
         if ( pPara->IsVisible() )
         {
-            pPara->bVisible = FALSE;
+            pPara->bVisible = sal_False;
             aVisibleStateChangedHdl.Call( pPara );
         }
     }
 }
 
-ULONG ParagraphList::GetVisPos( Paragraph* pPara )
+sal_uLong ParagraphList::GetVisPos( Paragraph* pPara )
 {
-    ULONG nVisPos = 0;
-    ULONG nPos = GetAbsPos( pPara );
-    for ( ULONG n = 0; n < nPos; n++ )
+    sal_uLong nVisPos = 0;
+    sal_uLong nPos = GetAbsPos( pPara );
+    for ( sal_uLong n = 0; n < nPos; n++ )
     {
         Paragraph* _pPara = GetParagraph( n );
         if ( _pPara->IsVisible() )
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index c5ecf88662c8..9ae4ef7a39bc 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -39,27 +39,27 @@ private:
     Link            aVisibleStateChangedHdl;
 
 public:
-    void            Clear( BOOL bDestroyParagraphs );
+    void            Clear( sal_Bool bDestroyParagraphs );
 
-    ULONG           GetParagraphCount() const           { return List::Count(); }
-    Paragraph*      GetParagraph( ULONG nPos ) const    { return (Paragraph*)List::GetObject( nPos ); }
+    sal_uLong           GetParagraphCount() const           { return List::Count(); }
+    Paragraph*      GetParagraph( sal_uLong nPos ) const    { return (Paragraph*)List::GetObject( nPos ); }
 
-    ULONG           GetAbsPos( Paragraph* pParent ) const { return List::GetPos( pParent ); }
-    ULONG           GetVisPos( Paragraph* pParagraph );
+    sal_uLong           GetAbsPos( Paragraph* pParent ) const { return List::GetPos( pParent ); }
+    sal_uLong           GetVisPos( Paragraph* pParagraph );
 
-    void            Insert( Paragraph* pPara, ULONG nAbsPos = LIST_APPEND ) { List::Insert( pPara, nAbsPos ); }
-    void            Remove( ULONG nPara ) { List::Remove( nPara ); }
-    void            MoveParagraphs( ULONG nStart, ULONG nDest, ULONG nCount );
+    void            Insert( Paragraph* pPara, sal_uLong nAbsPos = LIST_APPEND ) { List::Insert( pPara, nAbsPos ); }
+    void            Remove( sal_uLong nPara ) { List::Remove( nPara ); }
+    void            MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong nCount );
 
     Paragraph*      NextVisible( Paragraph* ) const;
     Paragraph*      PrevVisible( Paragraph* ) const;
     Paragraph*      LastVisible() const;
 
-    Paragraph*      GetParent( Paragraph* pParagraph /*, USHORT& rRelPos */ ) const;
-    BOOL            HasChilds( Paragraph* pParagraph ) const;
-    BOOL            HasHiddenChilds( Paragraph* pParagraph ) const;
-    BOOL            HasVisibleChilds( Paragraph* pParagraph ) const;
-    ULONG           GetChildCount( Paragraph* pParagraph ) const;
+    Paragraph*      GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const;
+    sal_Bool            HasChilds( Paragraph* pParagraph ) const;
+    sal_Bool            HasHiddenChilds( Paragraph* pParagraph ) const;
+    sal_Bool            HasVisibleChilds( Paragraph* pParagraph ) const;
+    sal_uLong           GetChildCount( Paragraph* pParagraph ) const;
 
     void            Expand( Paragraph* pParent );
     void            Collapse( Paragraph* pParent );
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 4b0051cd3c81..12e9c992070a 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -73,12 +73,12 @@ void GrfWindow::Paint( const Rectangle& )
 }
 #endif
 
-static BYTE __FAR_DATA aPal1[ 2 * 4 ] = {
+static sal_uInt8 __FAR_DATA aPal1[ 2 * 4 ] = {
         0x00, 0x00, 0x00, 0x00,             // Schwarz
         0xFF, 0xFF, 0xFF, 0x00              // Weiss
 };
 
-static BYTE __FAR_DATA aPal4[ 16 * 4 ] = {
+static sal_uInt8 __FAR_DATA aPal4[ 16 * 4 ] = {
         0x00, 0x00, 0x00, 0x00,
         0x80, 0x00, 0x00, 0x00,
         0x00, 0x80, 0x00, 0x00,
@@ -97,7 +97,7 @@ static BYTE __FAR_DATA aPal4[ 16 * 4 ] = {
         0xFF, 0xFF, 0xFF, 0x00
 };
 
-static BYTE __FAR_DATA aPal8[ 256 * 4 ] =
+static sal_uInt8 __FAR_DATA aPal8[ 256 * 4 ] =
 {
 0x00, 0x00, 0x00, 0x00,   0x80, 0x00, 0x00, 0x00,   0x00, 0x92, 0x00, 0x00,
 0x80, 0x92, 0x00, 0x00,   0x00, 0x00, 0xAA, 0x00,   0x80, 0x00, 0xAA, 0x00,
@@ -213,14 +213,14 @@ inline short SwapShort( short n )
 static void WriteBMPHeader( SvStream& rStream,
                             const SvxRTFPictureType& rPicType )
 {
-    ULONG n4Width = rPicType.nWidth;
-    ULONG n4Height = rPicType.nHeight;
-    USHORT n4ColBits = rPicType.nBitsPerPixel;
+    sal_uInt32 n4Width = rPicType.nWidth;
+    sal_uInt32 n4Height = rPicType.nHeight;
+    sal_uInt16 n4ColBits = rPicType.nBitsPerPixel;
 
-    USHORT nColors = (1 << n4ColBits);  // Anzahl der Farben ( 1, 16, 256 )
-    USHORT nWdtOut = rPicType.nWidthBytes;
+    sal_uInt16 nColors = (1 << n4ColBits);  // Anzahl der Farben ( 1, 16, 256 )
+    sal_uInt16 nWdtOut = rPicType.nWidthBytes;
     if( !nWdtOut )
-        nWdtOut = (USHORT)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 );
+        nWdtOut = (sal_uInt16)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 );
 
     long nOffset = 14 + 40;     // BMP_FILE_HD_SIZ + sizeof(*pBmpInfo);
     if( 256 >= nColors )
@@ -235,7 +235,7 @@ static void WriteBMPHeader( SvStream& rStream,
     rStream << SwapLong(40)             // sizeof( BmpInfo )
             << SwapLong(n4Width)
             << SwapLong(n4Height)
-            << (USHORT)1
+            << (sal_uInt16)1
             << n4ColBits
             << SwapLong(0)
             << SwapLong(0)
@@ -271,7 +271,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
 
     xub_StrLen n, nLen;
     sal_Unicode nVal;
-    BOOL bValidData = TRUE;
+    sal_Bool bValidData = sal_True;
     const sal_Unicode* pStr = rToken.GetBufferAccess();
     sal_Char* pData = (sal_Char*)pStr;
     for( n = 0, nLen = rToken.Len(); n < nLen; ++n, ++pStr )
@@ -285,7 +285,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
         else
         {
             DBG_ASSERT( !this, "ungueltiger Hex-Wert" );
-            bValidData = FALSE;
+            bValidData = sal_False;
             break;
         }
 
@@ -298,11 +298,11 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
     return bValidData ? nLen / 2  : STRING_NOTFOUND;
 }
 
-BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
+sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
 {
     // die alten Daten loeschen
     rGrf.Clear();
-//  ULONG nBmpSize = 0;
+//  sal_uInt32 nBmpSize = 0;
 
     rtl_TextEncoding eOldEnc = GetSrcEncoding();
     SetSrcEncoding( RTL_TEXTENCODING_MS_1252 );
@@ -322,7 +322,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
     while( _nOpenBrakets && IsParserWorking() && bValidBmp )
     {
         nToken = GetNextToken();
-        USHORT nVal = USHORT( nTokenValue );
+        sal_uInt16 nVal = sal_uInt16( nTokenValue );
         switch( nToken )
         {
         case '}':
@@ -423,11 +423,11 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
             rPicType.uPicLen = nTokenValue;
             if (rPicType.uPicLen)
             {
-                ULONG nPos = rStrm.Tell();
+                sal_uInt32 nPos = rStrm.Tell();
                 nPos = nPos;
                 rStrm.SeekRel(-1);
                 sal_uInt8 aData[4096];
-                ULONG nSize = sizeof(aData);
+                sal_uInt32 nSize = sizeof(aData);
 
                 while (rPicType.uPicLen > 0)
                 {
@@ -489,14 +489,14 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
                 default:
                     break;
                 }
-                bFirstTextToken = FALSE;
+                bFirstTextToken = sal_False;
             }
 
             if( pTmpFile && SvxRTFPictureType::HEX_MODE == rPicType.nMode )
             {
                 xub_StrLen nTokenLen = HexToBin( aToken );
                 if( STRING_NOTFOUND == nTokenLen )
-                    bValidBmp = FALSE;
+                    bValidBmp = sal_False;
                 else
                 {
                     pTmpFile->Write( (sal_Char*)aToken.GetBuffer(),
@@ -517,12 +517,12 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
         if( bValidBmp )
         {
             GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
-            USHORT nImportFilter = GRFILTER_FORMAT_DONTKNOW;
+            sal_uInt16 nImportFilter = GRFILTER_FORMAT_DONTKNOW;
 
             if( pFilterNm )
             {
                 String sTmp;
-                for( USHORT n = pGF->GetImportFormatCount(); n; )
+                for( sal_uInt16 n = pGF->GetImportFormatCount(); n; )
                 {
                     sTmp = pGF->GetImportFormatShortName( --n );
                     if( sTmp.EqualsAscii( pFilterNm ))
@@ -566,8 +566,8 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
                 else
                     aSize = OutputDevice::LogicToLogic( aSize,
                                         rGrf.GetPrefMapMode(), aMap );
-                rPicType.nWidth = sal::static_int_cast< USHORT >(aSize.Width());
-                rPicType.nHeight = sal::static_int_cast< USHORT >(
+                rPicType.nWidth = sal::static_int_cast< sal_uInt16 >(aSize.Width());
+                rPicType.nHeight = sal::static_int_cast< sal_uInt16 >(
                     aSize.Height());
             }
             break;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 58789fab2106..63a8dd3aa6f6 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -99,14 +99,14 @@
 
 // einige Hilfs-Funktionen
 // char
-inline const SvxEscapementItem& GetEscapement(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxEscapementItem& GetEscapement(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
     { return (const SvxEscapementItem&)rSet.Get( nId,bInP); }
-inline const SvxLineSpacingItem& GetLineSpacing(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxLineSpacingItem& GetLineSpacing(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
     { return (const SvxLineSpacingItem&)rSet.Get( nId,bInP); }
 // frm
-inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
     { return (const SvxLRSpaceItem&)rSet.Get( nId,bInP); }
-inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
     { return (const SvxULSpaceItem&)rSet.Get( nId,bInP); }
 
 #define PARDID      ((RTFPardAttrMapIds*)aPardMap.GetData())
@@ -115,7 +115,7 @@ inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,USHORT nId,BOOL b
 void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
                                     SfxPoolItem& rItem )
 {
-    const USHORT *pNormal = 0, *pCJK = 0, *pCTL = 0;
+    const sal_uInt16 *pNormal = 0, *pCJK = 0, *pCTL = 0;
     const RTFPlainAttrMapIds* pIds = (RTFPlainAttrMapIds*)aPlainMap.GetData();
     switch( rItem.Which() )
     {
@@ -219,14 +219,14 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
 void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
 {
     DBG_ASSERT( pSet, "Es muss ein SfxItemSet uebergeben werden!" );
-    int bFirstToken = TRUE, bWeiter = TRUE;
-    USHORT nStyleNo = 0;        // default
+    int bFirstToken = sal_True, bWeiter = sal_True;
+    sal_uInt16 nStyleNo = 0;        // default
     FontUnderline eUnderline;
     FontUnderline eOverline;
     FontEmphasisMark eEmphasis;
-    bPardTokenRead = FALSE;
+    bPardTokenRead = sal_False;
     RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE;
-    USHORT nFontAlign;
+    sal_uInt16 nFontAlign;
 
     int bChkStkPos = !bNewGroup && !aAttrStack.empty();
 
@@ -235,14 +235,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
         switch( nToken )
         {
         case RTF_PARD:
-            RTFPardPlain( TRUE, &pSet );
+            RTFPardPlain( sal_True, &pSet );
             ResetPard();
             nStyleNo = 0;
-            bPardTokenRead = TRUE;
+            bPardTokenRead = sal_True;
             break;
 
         case RTF_PLAIN:
-            RTFPardPlain( FALSE, &pSet );
+            RTFPardPlain( sal_False, &pSet );
             break;
 
         default:
@@ -264,7 +264,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 {
                     // eine neue Gruppe aufmachen
                     SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
-                                                *pAkt, *pInsPos, TRUE );
+                                                *pAkt, *pInsPos, sal_True );
                     pNew->SetRTFDefaults( GetRTFDefaults() );
 
                     // alle bis hierher gueltigen Attribute "setzen"
@@ -280,7 +280,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                     pAkt->SetStartPos( *pInsPos );
 
                 pSet = &pAkt->aAttrSet;
-            } while( FALSE );
+            } while( sal_False );
 
             switch( nToken )
             {
@@ -298,18 +298,18 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 {
                     if( !bFirstToken )
                         SkipToken( -1 );
-                    bWeiter = FALSE;
+                    bWeiter = sal_False;
                 }
                 else
                 {
-                    nStyleNo = -1 == nTokenValue ? 0 : USHORT(nTokenValue);
+                    nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue);
                     // setze am akt. auf dem AttrStack stehenden Style die
                     // StyleNummer
                     SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
                     if( !pAkt )
                         break;
 
-                    pAkt->nStyleNo = USHORT( nStyleNo );
+                    pAkt->nStyleNo = sal_uInt16( nStyleNo );
 
 #if 0
 // JP 05.09.95: zuruecksetzen der Style-Attribute fuehrt nur zu Problemen.
@@ -329,8 +329,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
 
                         SfxItemIter aIter( pStyle->aAttrSet );
                         SfxItemPool* pPool = pStyle->aAttrSet.GetPool();
-                        USHORT nWh = aIter.GetCurItem()->Which();
-                        while( TRUE )
+                        sal_uInt16 nWh = aIter.GetCurItem()->Which();
+                        while( sal_True )
                         {
                             pAkt->aAttrSet.Put( pPool->GetDefaultItem( nWh ));
                             if( aIter.IsAtEnd() )
@@ -345,14 +345,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
             case RTF_KEEP:
                 if( PARDID->nSplit )
                 {
-                    pSet->Put( SvxFmtSplitItem( FALSE, PARDID->nSplit ));
+                    pSet->Put( SvxFmtSplitItem( sal_False, PARDID->nSplit ));
                 }
                 break;
 
             case RTF_KEEPN:
                 if( PARDID->nKeep )
                 {
-                    pSet->Put( SvxFmtKeepItem( TRUE, PARDID->nKeep ));
+                    pSet->Put( SvxFmtKeepItem( sal_True, PARDID->nKeep ));
                 }
                 break;
 
@@ -360,7 +360,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nOutlineLvl )
                 {
                     pSet->Put( SfxUInt16Item( PARDID->nOutlineLvl,
-                                                (UINT16)nTokenValue ));
+                                                (sal_uInt16)nTokenValue ));
                 }
                 break;
 
@@ -393,12 +393,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nLRSpace )
                 {
                     SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( -1 != nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aLR.SetTxtFirstLineOfst( nSz );
                     pSet->Put( aLR );
@@ -410,12 +410,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nLRSpace )
                 {
                     SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( 0 < nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aLR.SetTxtLeft( nSz );
                     pSet->Put( aLR );
@@ -427,12 +427,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nLRSpace )
                 {
                     SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( 0 < nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aLR.SetRight( nSz );
                     pSet->Put( aLR );
@@ -443,12 +443,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nULSpace )
                 {
                     SvxULSpaceItem aUL( GetULSpace(*pSet, PARDID->nULSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( 0 < nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aUL.SetUpper( nSz );
                     pSet->Put( aUL );
@@ -459,12 +459,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nULSpace )
                 {
                     SvxULSpaceItem aUL( GetULSpace(*pSet, PARDID->nULSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( 0 < nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aUL.SetLower( nSz );
                     pSet->Put( aUL );
@@ -476,7 +476,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 {
                     // dann wird auf mehrzeilig umgeschaltet!
                     SvxLineSpacingItem aLSpace( GetLineSpacing( *pSet,
-                                                PARDID->nLinespacing, FALSE ));
+                                                PARDID->nLinespacing, sal_False ));
 
                     // wieviel bekommt man aus dem LineHeight Wert heraus
 
@@ -491,9 +491,9 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                                             / long( nTokenValue ) );
 
                     if( nTokenValue > 200 )     // Datenwert fuer PropLnSp
-                        nTokenValue = 200;      // ist ein BYTE !!!
+                        nTokenValue = 200;      // ist ein sal_uInt8 !!!
 
-                    aLSpace.SetPropLineSpace( (const BYTE)nTokenValue );
+                    aLSpace.SetPropLineSpace( (const sal_uInt8)nTokenValue );
                     aLSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
 
                     pSet->Put( aLSpace );
@@ -531,7 +531,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                         CalcValue();
 
                     if (eLnSpc != SVX_LINE_SPACE_AUTO)
-                        aLSpace.SetLineHeight( (const USHORT)nTokenValue );
+                        aLSpace.SetLineHeight( (const sal_uInt16)nTokenValue );
 
                     aLSpace.GetLineSpaceRule() = eLnSpc;
                     pSet->Put(aLSpace);
@@ -541,14 +541,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
             case RTF_NOCWRAP:
                 if( PARDID->nForbRule )
                 {
-                    pSet->Put( SvxForbiddenRuleItem( FALSE,
+                    pSet->Put( SvxForbiddenRuleItem( sal_False,
                                                     PARDID->nForbRule ));
                 }
                 break;
             case RTF_NOOVERFLOW:
                 if( PARDID->nHangPunct )
                 {
-                    pSet->Put( SvxHangingPunctuationItem( FALSE,
+                    pSet->Put( SvxHangingPunctuationItem( sal_False,
                                                     PARDID->nHangPunct ));
                 }
                 break;
@@ -556,7 +556,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
             case RTF_ASPALPHA:
                 if( PARDID->nScriptSpace )
                 {
-                    pSet->Put( SvxScriptSpaceItem( TRUE,
+                    pSet->Put( SvxScriptSpaceItem( sal_True,
                                                 PARDID->nScriptSpace ));
                 }
                 break;
@@ -614,14 +614,14 @@ SET_FONTALIGNMENT:
             case RTF_SUB:
                 if( PLAINID->nEscapement )
                 {
-                    const USHORT nEsc = PLAINID->nEscapement;
+                    const sal_uInt16 nEsc = PLAINID->nEscapement;
                     if( -1 == nTokenValue || RTF_SUB == nToken )
                         nTokenValue = 6;
                     if( IsCalcValue() )
                         CalcValue();
-                    const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, FALSE );
+                    const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, sal_False );
                     short nEs;
-                    BYTE nProp;
+                    sal_uInt8 nProp;
                     if( DFLT_ESC_AUTO_SUPER == rOld.GetEsc() )
                     {
                         nEs = DFLT_ESC_AUTO_SUB;
@@ -639,7 +639,7 @@ SET_FONTALIGNMENT:
             case RTF_NOSUPERSUB:
                 if( PLAINID->nEscapement )
                 {
-                    const USHORT nEsc = PLAINID->nEscapement;
+                    const sal_uInt16 nEsc = PLAINID->nEscapement;
                     pSet->Put( SvxEscapementItem( nEsc ));
                 }
                 break;
@@ -685,7 +685,7 @@ SET_FONTALIGNMENT:
             case RTF_F:
             case RTF_AF:
                 {
-                    const Font& rSVFont = GetFont( USHORT(nTokenValue) );
+                    const Font& rSVFont = GetFont( sal_uInt16(nTokenValue) );
                     SvxFontItem aTmpItem( rSVFont.GetFamily(),
                                     rSVFont.GetName(), rSVFont.GetStyleName(),
                                     rSVFont.GetPitch(), rSVFont.GetCharSet(),
@@ -713,7 +713,7 @@ SET_FONTALIGNMENT:
 //                   if( IsCalcValue() )
 //                       CalcValue();
                     SvxFontHeightItem aTmpItem(
-                            (const USHORT)nTokenValue, 100,
+                            (const sal_uInt16)nTokenValue, 100,
                             SID_ATTR_CHAR_FONTHEIGHT );
                     SetScriptAttr( eCharType, *pSet, aTmpItem );
                 }
@@ -734,7 +734,7 @@ SET_FONTALIGNMENT:
                 if( PLAINID->nContour &&
                     IsAttrSttPos() )        // nicht im Textfluss ?
                 {
-                    pSet->Put( SvxContourItem( nTokenValue ? TRUE : FALSE,
+                    pSet->Put( SvxContourItem( nTokenValue ? sal_True : sal_False,
                                 PLAINID->nContour ));
                 }
                 break;
@@ -743,7 +743,7 @@ SET_FONTALIGNMENT:
                 if( PLAINID->nShadowed &&
                     IsAttrSttPos() )        // nicht im Textfluss ?
                 {
-                    pSet->Put( SvxShadowedItem( nTokenValue ? TRUE : FALSE,
+                    pSet->Put( SvxShadowedItem( nTokenValue ? sal_True : sal_False,
                                 PLAINID->nShadowed ));
                 }
                 break;
@@ -827,7 +827,7 @@ SET_FONTALIGNMENT:
 
                 if( PLAINID->nWordlineMode )
                 {
-                    pSet->Put( SvxWordLineModeItem( TRUE, PLAINID->nWordlineMode ));
+                    pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
                 }
                 goto ATTR_SETUNDERLINE;
 
@@ -844,7 +844,7 @@ ATTR_SETUNDERLINE:
                     SvxUnderlineItem aUL( UNDERLINE_SINGLE, PLAINID->nUnderline );
                     const SfxPoolItem* pItem;
                     if( SFX_ITEM_SET == pSet->GetItemState(
-                        PLAINID->nUnderline, FALSE, &pItem ) )
+                        PLAINID->nUnderline, sal_False, &pItem ) )
                     {
                         // is switched off ?
                         if( UNDERLINE_NONE ==
@@ -853,11 +853,11 @@ ATTR_SETUNDERLINE:
                         aUL = *(SvxUnderlineItem*)pItem;
                     }
                     else
-                        aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, FALSE );
+                        aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, sal_False );
 
                     if( UNDERLINE_NONE == aUL.GetLineStyle() )
                         aUL.SetLineStyle( UNDERLINE_SINGLE );
-                    aUL.SetColor( GetColor( USHORT(nTokenValue) ));
+                    aUL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
                     pSet->Put( aUL );
                 }
                 break;
@@ -922,7 +922,7 @@ ATTR_SETUNDERLINE:
 
                 if( PLAINID->nWordlineMode )
                 {
-                    pSet->Put( SvxWordLineModeItem( TRUE, PLAINID->nWordlineMode ));
+                    pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
                 }
                 goto ATTR_SETOVERLINE;
 
@@ -939,7 +939,7 @@ ATTR_SETOVERLINE:
                     SvxOverlineItem aOL( UNDERLINE_SINGLE, PLAINID->nOverline );
                     const SfxPoolItem* pItem;
                     if( SFX_ITEM_SET == pSet->GetItemState(
-                        PLAINID->nOverline, FALSE, &pItem ) )
+                        PLAINID->nOverline, sal_False, &pItem ) )
                     {
                         // is switched off ?
                         if( UNDERLINE_NONE ==
@@ -948,11 +948,11 @@ ATTR_SETOVERLINE:
                         aOL = *(SvxOverlineItem*)pItem;
                     }
                     else
-                        aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nUnderline, FALSE );
+                        aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nUnderline, sal_False );
 
                     if( UNDERLINE_NONE == aOL.GetLineStyle() )
                         aOL.SetLineStyle( UNDERLINE_SINGLE );
-                    aOL.SetColor( GetColor( USHORT(nTokenValue) ));
+                    aOL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
                     pSet->Put( aOL );
                 }
                 break;
@@ -961,14 +961,14 @@ ATTR_SETOVERLINE:
             case RTF_SUPER:
                 if( PLAINID->nEscapement )
                 {
-                    const USHORT nEsc = PLAINID->nEscapement;
+                    const sal_uInt16 nEsc = PLAINID->nEscapement;
                     if( -1 == nTokenValue || RTF_SUPER == nToken )
                         nTokenValue = 6;
                     if( IsCalcValue() )
                         CalcValue();
-                    const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, FALSE );
+                    const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, sal_False );
                     short nEs;
-                    BYTE nProp;
+                    sal_uInt8 nProp;
                     if( DFLT_ESC_AUTO_SUB == rOld.GetEsc() )
                     {
                         nEs = DFLT_ESC_AUTO_SUPER;
@@ -986,7 +986,7 @@ ATTR_SETOVERLINE:
             case RTF_CF:
                 if( PLAINID->nColor )
                 {
-                    pSet->Put( SvxColorItem( GetColor( USHORT(nTokenValue) ),
+                    pSet->Put( SvxColorItem( GetColor( sal_uInt16(nTokenValue) ),
                                 PLAINID->nColor ));
                 }
                 break;
@@ -996,7 +996,7 @@ ATTR_SETOVERLINE:
             case RTF_CB:
                 if( PLAINID->nBgColor )
                 {
-                    pSet->Put( SvxBrushItem( GetColor( USHORT(nTokenValue) ),
+                    pSet->Put( SvxBrushItem( GetColor( sal_uInt16(nTokenValue) ),
                                 PLAINID->nBgColor ));
                 }
                 break;
@@ -1025,10 +1025,10 @@ ATTR_SETOVERLINE:
                 break;
 
             case RTF_RTLCH:
-                bIsLeftToRightDef = FALSE;
+                bIsLeftToRightDef = sal_False;
                 break;
             case RTF_LTRCH:
-                bIsLeftToRightDef = TRUE;
+                bIsLeftToRightDef = sal_True;
                 break;
             case RTF_RTLPAR:
                 if (PARDID->nDirection)
@@ -1079,7 +1079,7 @@ ATTR_SETEMPHASIS:
                     default: cStt = 0, cEnd = 0; break;
                     }
 
-                    pSet->Put( SvxTwoLinesItem( TRUE, cStt, cEnd,
+                    pSet->Put( SvxTwoLinesItem( sal_True, cStt, cEnd,
                                                        PLAINID->nTwoLines ));
                 }
                 break;
@@ -1090,7 +1090,7 @@ ATTR_SETEMPHASIS:
                     //i21372
                     if (nTokenValue < 1 || nTokenValue > 600)
                         nTokenValue = 100;
-                    pSet->Put( SvxCharScaleWidthItem( USHORT(nTokenValue),
+                    pSet->Put( SvxCharScaleWidthItem( sal_uInt16(nTokenValue),
                                                        PLAINID->nCharScaleX ));
                 }
                 break;
@@ -1169,7 +1169,7 @@ ATTR_SETEMPHASIS:
                         case RTF_SWG_ESCPROP:
                             {
                                 // prozentuale Veraenderung speichern !
-                                BYTE nProp = BYTE( nTokenValue / 100 );
+                                sal_uInt8 nProp = sal_uInt8( nTokenValue / 100 );
                                 short nEsc = 0;
                                 if( 1 == ( nTokenValue % 100 ))
                                     // Erkennung unseres AutoFlags!
@@ -1184,10 +1184,10 @@ ATTR_SETEMPHASIS:
                         case RTF_HYPHEN:
                             {
                                 SvxHyphenZoneItem aHypenZone(
-                                            (nTokenValue & 1) ? TRUE : FALSE,
+                                            (nTokenValue & 1) ? sal_True : sal_False,
                                                 PARDID->nHyphenzone );
                                 aHypenZone.SetPageEnd(
-                                            (nTokenValue & 2) ? TRUE : FALSE );
+                                            (nTokenValue & 2) ? sal_True : sal_False );
 
                                 if( PARDID->nHyphenzone &&
                                     RTF_HYPHLEAD == GetNextToken() &&
@@ -1195,11 +1195,11 @@ ATTR_SETEMPHASIS:
                                     RTF_HYPHMAX == GetNextToken() )
                                 {
                                     aHypenZone.GetMinLead() =
-                                        BYTE(GetStackPtr( -2 )->nTokenValue);
+                                        sal_uInt8(GetStackPtr( -2 )->nTokenValue);
                                     aHypenZone.GetMinTrail() =
-                                            BYTE(GetStackPtr( -1 )->nTokenValue);
+                                            sal_uInt8(GetStackPtr( -1 )->nTokenValue);
                                     aHypenZone.GetMaxHyphens() =
-                                            BYTE(nTokenValue);
+                                            sal_uInt8(nTokenValue);
 
                                     pSet->Put( aHypenZone );
                                 }
@@ -1210,12 +1210,12 @@ ATTR_SETEMPHASIS:
 
                         case RTF_SHADOW:
                             {
-                                int bSkip = TRUE;
+                                int bSkip = sal_True;
                                 do {    // middle check loop
                                     SvxShadowLocation eSL = SvxShadowLocation( nTokenValue );
                                     if( RTF_SHDW_DIST != GetNextToken() )
                                         break;
-                                    USHORT nDist = USHORT( nTokenValue );
+                                    sal_uInt16 nDist = sal_uInt16( nTokenValue );
 
                                     if( RTF_SHDW_STYLE != GetNextToken() )
                                         break;
@@ -1224,11 +1224,11 @@ ATTR_SETEMPHASIS:
 
                                     if( RTF_SHDW_COL != GetNextToken() )
                                         break;
-                                    USHORT nCol = USHORT( nTokenValue );
+                                    sal_uInt16 nCol = sal_uInt16( nTokenValue );
 
                                     if( RTF_SHDW_FCOL != GetNextToken() )
                                         break;
-//                                  USHORT nFillCol = USHORT( nTokenValue );
+//                                  sal_uInt16 nFillCol = sal_uInt16( nTokenValue );
 
                                     Color aColor = GetColor( nCol );
 
@@ -1236,8 +1236,8 @@ ATTR_SETEMPHASIS:
                                         pSet->Put( SvxShadowItem( PARDID->nShadow,
                                                                   &aColor, nDist, eSL ) );
 
-                                    bSkip = FALSE;
-                                } while( FALSE );
+                                    bSkip = sal_False;
+                                } while( sal_False );
 
                                 if( bSkip )
                                     SkipGroup();        // ans Ende der Gruppe
@@ -1300,7 +1300,7 @@ ATTR_SETEMPHASIS:
                         if (!bFirstToken)
                             --nSkip;    // BRACELEFT: ist das naechste Token
                         SkipToken( nSkip );
-                        bWeiter = FALSE;
+                        bWeiter = sal_False;
                     }
                 }
                 break;
@@ -1316,7 +1316,7 @@ ATTR_SETEMPHASIS:
                     // kenne das Token nicht also das Token "in den Parser zurueck"
                     if( !bFirstToken )
                         SkipToken( -1 );
-                    bWeiter = FALSE;
+                    bWeiter = sal_False;
                 }
             }
         }
@@ -1324,7 +1324,7 @@ ATTR_SETEMPHASIS:
         {
             nToken = GetNextToken();
         }
-        bFirstToken = FALSE;
+        bFirstToken = sal_False;
     }
 
 /*
@@ -1338,11 +1338,11 @@ ATTR_SETEMPHASIS:
             // akt. Set entfernen
             const SfxPoolItem* pItem;
             SfxItemIter aIter( *pSet );
-            USHORT nWhich = aIter.GetCurItem()->Which();
-            while( TRUE )
+            sal_uInt16 nWhich = aIter.GetCurItem()->Which();
+            while( sal_True )
             {
                 if( SFX_ITEM_SET == pStyle->aAttrSet.GetItemState(
-                    nWhich, FALSE, &pItem ) && *pItem == *aIter.GetCurItem())
+                    nWhich, sal_False, &pItem ) && *pItem == *aIter.GetCurItem())
                     pSet->ClearItem( nWhich );      // loeschen
 
                 if( aIter.IsAtEnd() )
@@ -1360,7 +1360,7 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
 // dann lese doch mal alle TabStops ein
     SvxTabStop aTabStop;
     SvxTabStopItem aAttr( 0, 0, SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop );
-    int bWeiter = TRUE;
+    int bWeiter = sal_True;
     do {
         switch( nToken )
         {
@@ -1404,8 +1404,8 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
                     nSkip = -2;
                 else
                 {
-                    aTabStop.GetDecimal() = BYTE(nTokenValue & 0xff);
-                    aTabStop.GetFill() = BYTE((nTokenValue >> 8) & 0xff);
+                    aTabStop.GetDecimal() = sal_uInt8(nTokenValue & 0xff);
+                    aTabStop.GetFill() = sal_uInt8((nTokenValue >> 8) & 0xff);
                     // ueberlese noch die schliessende Klammer
                     if (bMethodOwnsToken)
                         GetNextToken();
@@ -1413,13 +1413,13 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
                 if( nSkip )
                 {
                     SkipToken( nSkip );     // Ignore wieder zurueck
-                    bWeiter = FALSE;
+                    bWeiter = sal_False;
                 }
             }
             break;
 
         default:
-            bWeiter = FALSE;
+            bWeiter = sal_False;
         }
         if( bWeiter )
         {
@@ -1468,11 +1468,11 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
     // dann lese doch mal das BoderAttribut ein
     SvxBoxItem aAttr( PARDID->nBox );
     const SfxPoolItem* pItem;
-    if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, sal_False, &pItem ) )
         aAttr = *(SvxBoxItem*)pItem;
 
     SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 );    // einfache Linien
-    int bWeiter = TRUE, nBorderTyp = 0;
+    int bWeiter = sal_True, nBorderTyp = 0;
 
     do {
         switch( nToken )
@@ -1523,23 +1523,23 @@ SETBORDER:
                 switch( nBorderTyp )
                 {
                 case RTF_BRDRB:
-                    aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_BOTTOM );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_BOTTOM );
                     break;
 
                 case RTF_BRDRT:
-                    aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_TOP );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_TOP );
                     break;
 
                 case RTF_BRDRL:
-                    aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_LEFT );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_LEFT );
                     break;
 
                 case RTF_BRDRR:
-                    aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_RIGHT );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_RIGHT );
                     break;
 
                 case RTF_BOX:
-                    aAttr.SetDistance( (USHORT)nTokenValue );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue );
                     break;
                 }
             }
@@ -1551,7 +1551,7 @@ case RTF_BRDRBAR:           break;
 
         case RTF_BRDRCF:
             {
-                aBrd.SetColor( GetColor( USHORT(nTokenValue) ) );
+                aBrd.SetColor( GetColor( sal_uInt16(nTokenValue) ) );
                 SetBorderLine( nBorderTyp, aAttr, aBrd );
             }
             break;
@@ -1642,13 +1642,13 @@ SETBORDERLINE:
                     nSkip = -1;
                 else
                 {
-                    int bSwgControl = TRUE, bFirstToken = TRUE;
+                    int bSwgControl = sal_True, bFirstToken = sal_True;
                     nToken = GetNextToken();
                     do {
                         switch( nToken )
                         {
                         case RTF_BRDBOX:
-                            aAttr.SetDistance( USHORT(nTokenValue) );
+                            aAttr.SetDistance( sal_uInt16(nTokenValue) );
                             break;
 
                         case RTF_BRDRT:
@@ -1656,46 +1656,46 @@ SETBORDERLINE:
                         case RTF_BRDRR:
                         case RTF_BRDRL:
                             nBorderTyp = nToken;
-                            bFirstToken = FALSE;
+                            bFirstToken = sal_False;
                             if( RTF_BRDLINE_COL != GetNextToken() )
                             {
-                                bSwgControl = FALSE;
+                                bSwgControl = sal_False;
                                 break;
                             }
-                            aBrd.SetColor( GetColor( USHORT(nTokenValue) ));
+                            aBrd.SetColor( GetColor( sal_uInt16(nTokenValue) ));
 
                             if( RTF_BRDLINE_IN != GetNextToken() )
                             {
-                                bSwgControl = FALSE;
+                                bSwgControl = sal_False;
                                 break;
                             }
-                            aBrd.SetInWidth( USHORT(nTokenValue));
+                            aBrd.SetInWidth( sal_uInt16(nTokenValue));
 
                             if( RTF_BRDLINE_OUT != GetNextToken() )
                             {
-                                bSwgControl = FALSE;
+                                bSwgControl = sal_False;
                                 break;
                             }
-                            aBrd.SetOutWidth( USHORT(nTokenValue));
+                            aBrd.SetOutWidth( sal_uInt16(nTokenValue));
 
                             if( RTF_BRDLINE_DIST != GetNextToken() )
                             {
-                                bSwgControl = FALSE;
+                                bSwgControl = sal_False;
                                 break;
                             }
-                            aBrd.SetDistance( USHORT(nTokenValue));
+                            aBrd.SetDistance( sal_uInt16(nTokenValue));
                             SetBorderLine( nBorderTyp, aAttr, aBrd );
                             break;
 
                         default:
-                            bSwgControl = FALSE;
+                            bSwgControl = sal_False;
                             break;
                         }
 
                         if( bSwgControl )
                         {
                             nToken = GetNextToken();
-                            bFirstToken = FALSE;
+                            bFirstToken = sal_False;
                         }
                     } while( bSwgControl );
 
@@ -1718,7 +1718,7 @@ SETBORDERLINE:
                 if( nSkip )
                 {
                     SkipToken( nSkip );     // Ignore wieder zurueck
-                    bWeiter = FALSE;
+                    bWeiter = sal_False;
                 }
             }
             break;
@@ -1733,7 +1733,7 @@ SETBORDERLINE:
     SkipToken( -1 );
 }
 
-inline ULONG CalcShading( ULONG nColor, ULONG nFillColor, BYTE nShading )
+inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading )
 {
     nColor = (nColor * nShading) / 100;
     nFillColor = (nFillColor * ( 100 - nShading )) / 100;
@@ -1744,11 +1744,11 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
                                         int bTableDef )
 {
     // dann lese doch mal das BoderAttribut ein
-    int bWeiter = TRUE;
-    USHORT nColor = USHRT_MAX, nFillColor = USHRT_MAX;
-    BYTE nFillValue = 0;
+    int bWeiter = sal_True;
+    sal_uInt16 nColor = USHRT_MAX, nFillColor = USHRT_MAX;
+    sal_uInt8 nFillValue = 0;
 
-    USHORT nWh = ( nToken & ~0xff ) == RTF_CHRFMT
+    sal_uInt16 nWh = ( nToken & ~0xff ) == RTF_CHRFMT
                     ? PLAINID->nBgColor
                     : PARDID->nBrush;
 
@@ -1758,19 +1758,19 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
         case RTF_CLCBPAT:
         case RTF_CHCBPAT:
         case RTF_CBPAT:
-            nFillColor = USHORT( nTokenValue );
+            nFillColor = sal_uInt16( nTokenValue );
             break;
 
         case RTF_CLCFPAT:
         case RTF_CHCFPAT:
         case RTF_CFPAT:
-            nColor = USHORT( nTokenValue );
+            nColor = sal_uInt16( nTokenValue );
             break;
 
         case RTF_CLSHDNG:
         case RTF_CHSHDNG:
         case RTF_SHADING:
-            nFillValue = (BYTE)( nTokenValue / 100 );
+            nFillValue = (sal_uInt8)( nTokenValue / 100 );
             break;
 
         case RTF_CLBGDKHOR:
@@ -1857,9 +1857,9 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
         aColor = aCol;
     else
         aColor = Color(
-            (BYTE)CalcShading( aCol.GetRed(), aFCol.GetRed(), nFillValue ),
-            (BYTE)CalcShading( aCol.GetGreen(), aFCol.GetGreen(), nFillValue ),
-            (BYTE)CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue ) );
+            (sal_uInt8)CalcShading( aCol.GetRed(), aFCol.GetRed(), nFillValue ),
+            (sal_uInt8)CalcShading( aCol.GetGreen(), aFCol.GetGreen(), nFillValue ),
+            (sal_uInt8)CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue ) );
 
     rSet.Put( SvxBrushItem( aColor, nWh ) );
     SkipToken( -1 );
@@ -1874,7 +1874,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
         SvxRTFItemStackType* pAkt = aAttrStack.back();
 
         int nLastToken = GetStackPtr(-1)->nTokenId;
-        int bNewStkEntry = TRUE;
+        int bNewStkEntry = sal_True;
         if( RTF_PARD != nLastToken &&
             RTF_PLAIN != nLastToken &&
             BRACELEFT != nLastToken )
@@ -1882,7 +1882,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
             if( pAkt->aAttrSet.Count() || pAkt->pChildList || pAkt->nStyleNo )
             {
                 // eine neue Gruppe aufmachen
-                SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, TRUE );
+                SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, sal_True );
                 pNew->SetRTFDefaults( GetRTFDefaults() );
 
                 // alle bis hierher gueltigen Attribute "setzen"
@@ -1896,7 +1896,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
             {
                 // diesen Eintrag als neuen weiterbenutzen
                 pAkt->SetStartPos( *pInsPos );
-                bNewStkEntry = FALSE;
+                bNewStkEntry = sal_False;
             }
         }
 
@@ -1905,8 +1905,8 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
             ( pAkt->aAttrSet.GetParent() || pAkt->aAttrSet.Count() ))
         {
             const SfxPoolItem *pItem, *pDef;
-            const USHORT* pPtr;
-            USHORT nCnt;
+            const sal_uInt16* pPtr;
+            sal_uInt16 nCnt;
             const SfxItemSet* pDfltSet = &GetRTFDefaults();
             if( bPard )
             {
@@ -1920,7 +1920,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
                 nCnt = aPlainMap.Count();
             }
 
-            for( USHORT n = 0; n < nCnt; ++n, ++pPtr )
+            for( sal_uInt16 n = 0; n < nCnt; ++n, ++pPtr )
             {
                 // Item gesetzt und unterschiedlich -> das Pooldefault setzen
                 //JP 06.04.98: bei Items die nur SlotItems sind, darf nicht
@@ -1935,19 +1935,19 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
                 else if( !pAkt->aAttrSet.GetParent() )
                 {
                     if( SFX_ITEM_SET ==
-                        pDfltSet->GetItemState( *pPtr, FALSE, &pDef ))
+                        pDfltSet->GetItemState( *pPtr, sal_False, &pDef ))
                         pAkt->aAttrSet.Put( *pDef );
                     else
                         pAkt->aAttrSet.ClearItem( *pPtr );
                 }
                 else if( SFX_ITEM_SET == pAkt->aAttrSet.GetParent()->
-                            GetItemState( *pPtr, TRUE, &pItem ) &&
+                            GetItemState( *pPtr, sal_True, &pItem ) &&
                         *( pDef = &pDfltSet->Get( *pPtr )) != *pItem )
                     pAkt->aAttrSet.Put( *pDef );
                 else
                 {
                     if( SFX_ITEM_SET ==
-                        pDfltSet->GetItemState( *pPtr, FALSE, &pDef ))
+                        pDfltSet->GetItemState( *pPtr, sal_False, &pDef ))
                         pAkt->aAttrSet.Put( *pDef );
                     else
                         pAkt->aAttrSet.ClearItem( *pPtr );
@@ -1966,7 +1966,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
             //we can fall back to the ansicpg set codeset
             if (nDfltFont != -1)
             {
-                const Font& rSVFont = GetFont(USHORT(nDfltFont));
+                const Font& rSVFont = GetFont(sal_uInt16(nDfltFont));
                 SetEncoding(rSVFont.GetCharSet());
             }
             else
@@ -1981,16 +1981,16 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
         return;
 
     SfxItemSet aTmp( *pAttrPool, aWhichMap.GetData() );
-    BOOL bOldFlag = bIsLeftToRightDef;
-    bIsLeftToRightDef = TRUE;
+    sal_Bool bOldFlag = bIsLeftToRightDef;
+    bIsLeftToRightDef = sal_True;
     switch( nToken )
     {
-    case RTF_ADEFF: bIsLeftToRightDef = FALSE;  // no break!
+    case RTF_ADEFF: bIsLeftToRightDef = sal_False;  // no break!
     case RTF_DEFF:
         {
             if( -1 == nValue )
                 nValue = 0;
-            const Font& rSVFont = GetFont( USHORT(nValue) );
+            const Font& rSVFont = GetFont( sal_uInt16(nValue) );
             SvxFontItem aTmpItem(
                                 rSVFont.GetFamily(), rSVFont.GetName(),
                                 rSVFont.GetStyleName(), rSVFont.GetPitch(),
@@ -1999,7 +1999,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
         }
         break;
 
-    case RTF_ADEFLANG:  bIsLeftToRightDef = FALSE;  // no break!
+    case RTF_ADEFLANG:  bIsLeftToRightDef = sal_False;  // no break!
     case RTF_DEFLANG:
         // default Language merken
         if( -1 != nValue )
@@ -2014,7 +2014,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
         if( PARDID->nTabStop )
         {
             // RTF definiert 720 twips als default
-            bIsSetDfltTab = TRUE;
+            bIsSetDfltTab = sal_True;
             if( -1 == nValue || !nValue )
                 nValue = 720;
 
@@ -2035,7 +2035,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
 
              e.g.
 
-            SvxTabStopItem aNewTab(1, USHORT(nValue), SVX_TAB_ADJUST_DEFAULT,
+            SvxTabStopItem aNewTab(1, sal_uInt16(nValue), SVX_TAB_ADJUST_DEFAULT,
                 PARDID->nTabStop);
             ((SvxTabStop&)aNewTab[0]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT;
 
@@ -2054,7 +2054,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
 /*-----------------14.12.94 19:32-------------------
  ?? wie kommt man auf die 13 ??
 --------------------------------------------------*/
-            USHORT nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / USHORT(nValue);
+            sal_uInt16 nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / sal_uInt16(nValue);
             /*
              cmc, make sure we have at least one, or all hell breaks loose in
              everybodies exporters, #i8247#
@@ -2063,7 +2063,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
                 nAnzTabs = 1;
 
             // wir wollen Defaulttabs
-            SvxTabStopItem aNewTab( nAnzTabs, USHORT(nValue),
+            SvxTabStopItem aNewTab( nAnzTabs, sal_uInt16(nValue),
                                 SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop );
             while( nAnzTabs )
                 ((SvxTabStop&)aNewTab[ --nAnzTabs ]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT;
@@ -2078,7 +2078,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
     {
         SfxItemIter aIter( aTmp );
         const SfxPoolItem* pItem = aIter.GetCurItem();
-        while( TRUE )
+        while( sal_True )
         {
             pAttrPool->SetPoolDefaultItem( *pItem );
             if( aIter.IsAtEnd() )
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 2788d2fd4b10..106ee9b61bbc 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -91,18 +91,18 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
 {
     bNewDoc = bReadNewDoc;
 
-    bChkStyleAttr = bCalcValue = bReadDocInfo = bIsInReadStyleTab = FALSE;
-    bIsLeftToRightDef = TRUE;
+    bChkStyleAttr = bCalcValue = bReadDocInfo = bIsInReadStyleTab = sal_False;
+    bIsLeftToRightDef = sal_True;
 
     {
         RTFPlainAttrMapIds aTmp( rPool );
-        aPlainMap.Insert( (USHORT*)&aTmp,
-                    sizeof( RTFPlainAttrMapIds ) / sizeof(USHORT), 0 );
+        aPlainMap.Insert( (sal_uInt16*)&aTmp,
+                    sizeof( RTFPlainAttrMapIds ) / sizeof(sal_uInt16), 0 );
     }
     {
         RTFPardAttrMapIds aTmp( rPool );
-        aPardMap.Insert( (USHORT*)&aTmp,
-                    sizeof( RTFPardAttrMapIds ) / sizeof(USHORT), 0 );
+        aPardMap.Insert( (sal_uInt16*)&aTmp,
+                    sizeof( RTFPardAttrMapIds ) / sizeof(sal_uInt16), 0 );
     }
     pDfltFont = new Font;
     pDfltColor = new Color;
@@ -161,8 +161,8 @@ SvParserState SvxRTFParser::CallParser()
     if( !aAttrStack.empty() )
         ClearAttrStack();
 
-    bIsSetDfltTab = FALSE;
-    bNewGroup = FALSE;
+    bIsSetDfltTab = sal_False;
+    bNewGroup = sal_False;
     nDfltFont = 0;
 
     sBaseURL.Erase();
@@ -242,7 +242,7 @@ INSINGLECHAR:
         {
             InsertText();
             // alle angesammelten Attribute setzen
-            for( USHORT n = aAttrSetList.Count(); n; )
+            for( sal_uInt16 n = aAttrSetList.Count(); n; )
             {
                 SvxRTFItemStackType* pStkSet = aAttrSetList[--n];
                 SetAttrSet( *pStkSet );
@@ -357,8 +357,8 @@ void SvxRTFParser::ReadStyleTable()
     SvxRTFStyleType* pStyle = new SvxRTFStyleType( *pAttrPool, aWhichMap.GetData() );
     pStyle->aAttrSet.Put( GetRTFDefaults() );
 
-    bIsInReadStyleTab = TRUE;
-    bChkStyleAttr = FALSE;      // Attribute nicht gegen die Styles checken
+    bIsInReadStyleTab = sal_True;
+    bChkStyleAttr = sal_False;      // Attribute nicht gegen die Styles checken
 
     while( _nOpenBrakets && IsParserWorking() )
     {
@@ -389,13 +389,13 @@ void SvxRTFParser::ReadStyleTable()
             }
             break;
 
-        case RTF_SBASEDON:  pStyle->nBasedOn = USHORT(nTokenValue); pStyle->bBasedOnIsSet=TRUE; break;
-        case RTF_SNEXT:     pStyle->nNext = USHORT(nTokenValue);    break;
+        case RTF_SBASEDON:  pStyle->nBasedOn = sal_uInt16(nTokenValue); pStyle->bBasedOnIsSet=sal_True; break;
+        case RTF_SNEXT:     pStyle->nNext = sal_uInt16(nTokenValue);    break;
         case RTF_OUTLINELEVEL:
-        case RTF_SOUTLVL:   pStyle->nOutlineNo = BYTE(nTokenValue); break;
+        case RTF_SOUTLVL:   pStyle->nOutlineNo = sal_uInt8(nTokenValue);    break;
         case RTF_S:         nStyleNo = (short)nTokenValue;          break;
         case RTF_CS:        nStyleNo = (short)nTokenValue;
-                            pStyle->bIsCharFmt = TRUE;
+                            pStyle->bIsCharFmt = sal_True;
                             break;
 
         case RTF_TEXTTOKEN:
@@ -456,21 +456,21 @@ void SvxRTFParser::ReadStyleTable()
 
     // Flag wieder auf alten Zustand
     bChkStyleAttr = bSaveChkStyleAttr;
-    bIsInReadStyleTab = FALSE;
+    bIsInReadStyleTab = sal_False;
 }
 
 void SvxRTFParser::ReadColorTable()
 {
     int nToken;
-    BYTE nRed = 0xff, nGreen = 0xff, nBlue = 0xff;
+    sal_uInt8 nRed = 0xff, nGreen = 0xff, nBlue = 0xff;
 
     while( '}' != ( nToken = GetNextToken() ) && IsParserWorking() )
     {
         switch( nToken )
         {
-        case RTF_RED:   nRed = BYTE(nTokenValue);       break;
-        case RTF_GREEN: nGreen = BYTE(nTokenValue);     break;
-        case RTF_BLUE:  nBlue = BYTE(nTokenValue);      break;
+        case RTF_RED:   nRed = sal_uInt8(nTokenValue);      break;
+        case RTF_GREEN: nGreen = sal_uInt8(nTokenValue);        break;
+        case RTF_BLUE:  nBlue = sal_uInt8(nTokenValue);     break;
 
         case RTF_TEXTTOKEN:     // oder sollte irgendein Unsin darumstehen?
             if( 1 == aToken.Len()
@@ -487,7 +487,7 @@ void SvxRTFParser::ReadColorTable()
                 // versuche die Werte auf SV interne Namen zu mappen
                 ColorPtr pColor = new Color( nRed, nGreen, nBlue );
                 if( aColorTbl.empty() &&
-                    BYTE(-1) == nRed && BYTE(-1) == nGreen && BYTE(-1) == nBlue )
+                    sal_uInt8(-1) == nRed && sal_uInt8(-1) == nGreen && sal_uInt8(-1) == nBlue )
                     pColor->SetColor( COL_AUTO );
                 aColorTbl.push_back( pColor );
                 nRed = 0, nGreen = 0, nBlue = 0;
@@ -509,7 +509,7 @@ void SvxRTFParser::ReadFontTable()
     Font* pFont = new Font();
     short nFontNo(0), nInsFontNo (0);
     String sAltNm, sFntNm;
-    BOOL bIsAltFntNm = FALSE, bCheckNewFont;
+    sal_Bool bIsAltFntNm = sal_False, bCheckNewFont;
 
     CharSet nSystemChar = lcl_GetDefaultTextEncodingForRTF();
     pFont->SetCharSet( nSystemChar );
@@ -517,16 +517,16 @@ void SvxRTFParser::ReadFontTable()
 
     while( _nOpenBrakets && IsParserWorking() )
     {
-        bCheckNewFont = FALSE;
+        bCheckNewFont = sal_False;
         switch( ( nToken = GetNextToken() ))
         {
             case '}':
-                bIsAltFntNm = FALSE;
+                bIsAltFntNm = sal_False;
                 // Style konnte vollstaendig gelesen werden,
                 // also ist das noch ein stabiler Status
                 if( --_nOpenBrakets <= 1 && IsParserWorking() )
                     SaveState( RTF_FONTTBL );
-                bCheckNewFont = TRUE;
+                bCheckNewFont = sal_True;
                 nInsFontNo = nFontNo;
                 break;
             case '{':
@@ -575,7 +575,7 @@ void SvxRTFParser::ReadFontTable()
                 if (-1 != nTokenValue)
                 {
                     CharSet nCharSet = rtl_getTextEncodingFromWindowsCharset(
-                        (BYTE)nTokenValue);
+                        (sal_uInt8)nTokenValue);
                     pFont->SetCharSet(nCharSet);
                     //When we're in a font, the fontname is in the font
                     //charset, except for symbol fonts I believe
@@ -596,12 +596,12 @@ void SvxRTFParser::ReadFontTable()
                 }
                 break;
             case RTF_F:
-                bCheckNewFont = TRUE;
+                bCheckNewFont = sal_True;
                 nInsFontNo = nFontNo;
                 nFontNo = (short)nTokenValue;
                 break;
             case RTF_FALT:
-                bIsAltFntNm = TRUE;
+                bIsAltFntNm = sal_True;
                 break;
             case RTF_TEXTTOKEN:
                 DelCharAtEnd( aToken, ';' );
@@ -689,19 +689,19 @@ String& SvxRTFParser::GetTextToEndGroup( String& rStr )
 util::DateTime SvxRTFParser::GetDateTimeStamp( )
 {
     util::DateTime aDT;
-    BOOL bWeiter = TRUE;
+    sal_Bool bWeiter = sal_True;
     int nToken;
     while( bWeiter && IsParserWorking() )
     {
         switch( nToken = GetNextToken() )
         {
-        case RTF_YR:    aDT.Year = (USHORT)nTokenValue;     break;
-        case RTF_MO:    aDT.Month = (USHORT)nTokenValue;    break;
-        case RTF_DY:    aDT.Day = (USHORT)nTokenValue;      break;
-        case RTF_HR:    aDT.Hours = (USHORT)nTokenValue;    break;
-        case RTF_MIN:   aDT.Minutes = (USHORT)nTokenValue;  break;
+        case RTF_YR:    aDT.Year = (sal_uInt16)nTokenValue;     break;
+        case RTF_MO:    aDT.Month = (sal_uInt16)nTokenValue;    break;
+        case RTF_DY:    aDT.Day = (sal_uInt16)nTokenValue;      break;
+        case RTF_HR:    aDT.Hours = (sal_uInt16)nTokenValue;    break;
+        case RTF_MIN:   aDT.Minutes = (sal_uInt16)nTokenValue;  break;
         default:
-            bWeiter = FALSE;
+            bWeiter = sal_False;
         }
     }
     SkipToken( -1 );        // die schliesende Klammer wird "oben" ausgewertet
@@ -825,13 +825,13 @@ void SvxRTFParser::ClearColorTbl()
 
 void SvxRTFParser::ClearFontTbl()
 {
-    for( ULONG nCnt = aFontTbl.Count(); nCnt; )
+    for( sal_uInt32 nCnt = aFontTbl.Count(); nCnt; )
         delete aFontTbl.GetObject( --nCnt );
 }
 
 void SvxRTFParser::ClearStyleTbl()
 {
-    for( ULONG nCnt = aStyleTbl.Count(); nCnt; )
+    for( sal_uInt32 nCnt = aStyleTbl.Count(); nCnt; )
         delete aStyleTbl.GetObject( --nCnt );
 }
 
@@ -858,7 +858,7 @@ String& SvxRTFParser::DelCharAtEnd( String& rStr, const sal_Unicode cDel )
 }
 
 
-const Font& SvxRTFParser::GetFont( USHORT nId )
+const Font& SvxRTFParser::GetFont( sal_uInt16 nId )
 {
     const Font* pFont = aFontTbl.Get( nId );
     if( !pFont )
@@ -885,7 +885,7 @@ SvxRTFItemStackType* SvxRTFParser::_GetAttrSet( int bCopyAttr )
     pNew->SetRTFDefaults( GetRTFDefaults() );
 
     aAttrStack.push_back( pNew );
-    bNewGroup = FALSE;
+    bNewGroup = sal_False;
     return pNew;
 }
 
@@ -904,10 +904,10 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType )
         !rStkType.GetAttrSet().Count() ||
         0 == ( pStyle = aStyleTbl.Get( rStkType.nStyleNo ) ))
     {
-        for( USHORT nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
+        for( sal_uInt16 nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
         {
             if( SFX_WHICH_MAX > nWhich &&
-                SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) &&
+                SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) &&
                      rPool.GetDefaultItem( nWhich ) == *pItem )
                 rSet.ClearItem( nWhich );       // loeschen
         }
@@ -918,19 +918,19 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType )
         // akt. AttrSet entfernen
         SfxItemSet &rStyleSet = pStyle->aAttrSet;
         const SfxPoolItem* pSItem;
-        for( USHORT nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
+        for( sal_uInt16 nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
         {
-            if( SFX_ITEM_SET == rStyleSet.GetItemState( nWhich, TRUE, &pSItem ))
+            if( SFX_ITEM_SET == rStyleSet.GetItemState( nWhich, sal_True, &pSItem ))
             {
                 // JP 22.06.99: im Style und im Set gleich gesetzt -> loeschen
-                if( SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem )
+                if( SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem )
                     && *pItem == *pSItem )
                     rSet.ClearItem( nWhich );       // loeschen
             }
                 // Bug 59571 - falls nicht im Style gesetzt und gleich mit
                 //              dem PoolDefault -> auch dann loeschen
             else if( SFX_WHICH_MAX > nWhich &&
-                    SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) &&
+                    SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) &&
                      rPool.GetDefaultItem( nWhich ) == *pItem )
                 rSet.ClearItem( nWhich );       // loeschen
         }
@@ -946,7 +946,7 @@ void SvxRTFParser::AttrGroupEnd()   // den akt. Bearbeiten, vom Stack loeschen
         SvxRTFItemStackType *pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
 
         do {        // middle check loop
-            ULONG nOldSttNdIdx = pOld->pSttNd->GetIdx();
+            sal_uLong nOldSttNdIdx = pOld->pSttNd->GetIdx();
             if( !pOld->pChildList &&
                 ((!pOld->aAttrSet.Count() && !pOld->nStyleNo ) ||
                 (nOldSttNdIdx == pInsPos->GetNodeIdx() &&
@@ -958,10 +958,10 @@ void SvxRTFParser::AttrGroupEnd()   // den akt. Bearbeiten, vom Stack loeschen
             {
                 SfxItemIter aIter( pOld->aAttrSet );
                 const SfxPoolItem* pItem = aIter.GetCurItem(), *pGet;
-                while( TRUE )
+                while( sal_True )
                 {
                     if( SFX_ITEM_SET == pAkt->aAttrSet.GetItemState(
-                        pItem->Which(), FALSE, &pGet ) &&
+                        pItem->Which(), sal_False, &pGet ) &&
                         *pItem == *pGet )
                         pOld->aAttrSet.ClearItem( pItem->Which() );
 
@@ -981,8 +981,8 @@ void SvxRTFParser::AttrGroupEnd()   // den akt. Bearbeiten, vom Stack loeschen
             if( bCrsrBack )
             {
                 // am Absatzanfang ? eine Position zurueck
-                ULONG nNd = pInsPos->GetNodeIdx();
-                MovePos( FALSE );
+                sal_uLong nNd = pInsPos->GetNodeIdx();
+                MovePos( sal_False );
                 // if can not move backward then later dont move forward !
                 bCrsrBack = nNd != pInsPos->GetNodeIdx();
             }
@@ -1014,7 +1014,7 @@ void SvxRTFParser::AttrGroupEnd()   // den akt. Bearbeiten, vom Stack loeschen
                         if( pOld->nSttCnt )
                         {
                             pOld->nStyleNo = 0;
-                            for( USHORT n = 0; n < aPardMap.Count() &&
+                            for( sal_uInt16 n = 0; n < aPardMap.Count() &&
                                                 pOld->aAttrSet.Count(); ++n )
                                 if( aPardMap[n] )
                                     pOld->aAttrSet.ClearItem( aPardMap[n] );
@@ -1032,11 +1032,11 @@ void SvxRTFParser::AttrGroupEnd()   // den akt. Bearbeiten, vom Stack loeschen
                         // - alle Absatz-Attribute bekommen den Bereich
                         //          bis zum vorherigen Absatz
                         SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
-                                    *pOld, *pInsPos, TRUE );
+                                    *pOld, *pInsPos, sal_True );
                         pNew->aAttrSet.SetParent( pOld->aAttrSet.GetParent() );
 
                         // loesche aus pNew alle Absatz Attribute
-                        for( USHORT n = 0; n < aPardMap.Count() &&
+                        for( sal_uInt16 n = 0; n < aPardMap.Count() &&
                                             pNew->aAttrSet.Count(); ++n )
                             if( aPardMap[n] )
                                 pNew->aAttrSet.ClearItem( aPardMap[n] );
@@ -1108,12 +1108,12 @@ void SvxRTFParser::AttrGroupEnd()   // den akt. Bearbeiten, vom Stack loeschen
                     if( bCrsrBack && 50 < pAkt->pChildList->Count() )
                     {
                         // am Absatzanfang ? eine Position zurueck
-                        MovePos( TRUE );
-                        bCrsrBack = FALSE;
+                        MovePos( sal_True );
+                        bCrsrBack = sal_False;
 
                         // eine neue Gruppe aufmachen
                         SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
-                                                *pAkt, *pInsPos, TRUE );
+                                                *pAkt, *pInsPos, sal_True );
                         pNew->SetRTFDefaults( GetRTFDefaults() );
 
                         // alle bis hierher gueltigen Attribute "setzen"
@@ -1135,14 +1135,14 @@ void SvxRTFParser::AttrGroupEnd()   // den akt. Bearbeiten, vom Stack loeschen
 
             if( bCrsrBack )
                 // am Absatzanfang ? eine Position zurueck
-                MovePos( TRUE );
+                MovePos( sal_True );
 
-        } while( FALSE );
+        } while( sal_False );
 
         if( pOld )
             delete pOld;
 
-        bNewGroup = FALSE;
+        bNewGroup = sal_False;
     }
 }
 
@@ -1152,7 +1152,7 @@ void SvxRTFParser::SetAllAttrOfStk()        // end all Attr. and set it into doc
     while( !aAttrStack.empty() )
         AttrGroupEnd();
 
-    for( USHORT n = aAttrSetList.Count(); n; )
+    for( sal_uInt16 n = aAttrSetList.Count(); n; )
     {
         SvxRTFItemStackType* pStkSet = aAttrSetList[--n];
         SetAttrSet( *pStkSet );
@@ -1174,7 +1174,7 @@ void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet )
 
     // dann mal alle Childs abarbeiten
     if( rSet.pChildList )
-        for( USHORT n = 0; n < rSet.pChildList->Count(); ++n )
+        for( sal_uInt16 n = 0; n < rSet.pChildList->Count(); ++n )
             SetAttrSet( *(*rSet.pChildList)[ n ] );
 }
 
@@ -1207,13 +1207,13 @@ void SvxRTFParser::BuildWhichTbl()
 {
     if( aWhichMap.Count() )
         aWhichMap.Remove( 0, aWhichMap.Count() );
-    aWhichMap.Insert( (USHORT)0, (USHORT)0 );
+    aWhichMap.Insert( (sal_uInt16)0, (sal_uInt16)0 );
 
     // Aufbau einer Which-Map 'rWhichMap' aus einem Array von
     // 'pWhichIds' von Which-Ids. Es hat die Lange 'nWhichIds'.
     // Die Which-Map wird nicht geloescht.
-    SvParser::BuildWhichTbl( aWhichMap, (USHORT*)aPardMap.GetData(), aPardMap.Count() );
-    SvParser::BuildWhichTbl( aWhichMap, (USHORT*)aPlainMap.GetData(), aPlainMap.Count() );
+    SvParser::BuildWhichTbl( aWhichMap, (sal_uInt16*)aPardMap.GetData(), aPardMap.Count() );
+    SvParser::BuildWhichTbl( aWhichMap, (sal_uInt16*)aPlainMap.GetData(), aPlainMap.Count() );
 }
 
 const SfxItemSet& SvxRTFParser::GetRTFDefaults()
@@ -1221,10 +1221,10 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults()
     if( !pRTFDefaults )
     {
         pRTFDefaults = new SfxItemSet( *pAttrPool, aWhichMap.GetData() );
-        USHORT nId;
+        sal_uInt16 nId;
         if( 0 != ( nId = ((RTFPardAttrMapIds*)aPardMap.GetData())->nScriptSpace ))
         {
-            SvxScriptSpaceItem aItem( FALSE, nId );
+            SvxScriptSpaceItem aItem( sal_False, nId );
             if( bNewDoc )
                 pAttrPool->SetPoolDefaultItem( aItem );
             else
@@ -1236,19 +1236,19 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults()
 
 /**/
 
-SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const USHORT* pWhichRange )
+SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange )
     : aAttrSet( rPool, pWhichRange )
 {
-    nOutlineNo = BYTE(-1);          // nicht gesetzt
+    nOutlineNo = sal_uInt8(-1);         // nicht gesetzt
     nBasedOn = 0;
-    bBasedOnIsSet = FALSE;          //$flr #117411#
+    bBasedOnIsSet = sal_False;          //$flr #117411#
     nNext = 0;
-    bIsCharFmt = FALSE;
+    bIsCharFmt = sal_False;
 }
 
 
 SvxRTFItemStackType::SvxRTFItemStackType(
-        SfxItemPool& rPool, const USHORT* pWhichRange,
+        SfxItemPool& rPool, const sal_uInt16* pWhichRange,
         const SvxPosition& rPos )
     : aAttrSet( rPool, pWhichRange ),
     pChildList( 0 ),
@@ -1337,8 +1337,8 @@ void SvxRTFItemStackType::MoveFullNode(const SvxNodeIdx &rOldNode,
     }
 
     //And the same for all the children
-    USHORT nCount = pChildList ? pChildList->Count() : 0;
-    for (USHORT i = 0; i < nCount; ++i)
+    sal_uInt16 nCount = pChildList ? pChildList->Count() : 0;
+    for (sal_uInt16 i = 0; i < nCount; ++i)
     {
         SvxRTFItemStackType* pStk = (*pChildList)[i];
         pStk->MoveFullNode(rOldNode, rNewNode);
@@ -1354,7 +1354,7 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
 {
     DBG_ASSERT( pChildList, "es gibt keine ChildListe" );
 
-    USHORT n;
+    sal_uInt16 n;
     SvxRTFItemStackType* pTmp = (*pChildList)[0];
 
     if( !pTmp->aAttrSet.Count() ||
@@ -1393,15 +1393,15 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
             SfxItemIter aIter( aMrgSet );
             const SfxPoolItem* pItem;
             do {
-                USHORT nWhich = aIter.GetCurItem()->Which();
+                sal_uInt16 nWhich = aIter.GetCurItem()->Which();
                 if( SFX_ITEM_SET != pTmp->aAttrSet.GetItemState( nWhich,
-                      FALSE, &pItem ) || *pItem != *aIter.GetCurItem() )
+                      sal_False, &pItem ) || *pItem != *aIter.GetCurItem() )
                     aMrgSet.ClearItem( nWhich );
 
                 if( aIter.IsAtEnd() )
                     break;
                 aIter.NextItem();
-            } while( TRUE );
+            } while( sal_True );
 
             if( !aMrgSet.Count() )
                 return;
@@ -1442,14 +1442,14 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults )
     {
         SfxItemIter aIter( rDefaults );
         do {
-            USHORT nWhich = aIter.GetCurItem()->Which();
-            if( SFX_ITEM_SET != aAttrSet.GetItemState( nWhich, FALSE ))
+            sal_uInt16 nWhich = aIter.GetCurItem()->Which();
+            if( SFX_ITEM_SET != aAttrSet.GetItemState( nWhich, sal_False ))
                 aAttrSet.Put( *aIter.GetCurItem() );
 
             if( aIter.IsAtEnd() )
                 break;
             aIter.NextItem();
-        } while( TRUE );
+        } while( sal_True );
     }
 }
 
@@ -1457,62 +1457,62 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults )
 
 RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool& rPool )
 {
-    nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, FALSE );
-    nBgColor = rPool.GetTrueWhich( SID_ATTR_BRUSH_CHAR, FALSE );
-    nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, FALSE );
-    nContour = rPool.GetTrueWhich( SID_ATTR_CHAR_CONTOUR, FALSE );
-    nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, FALSE );
-    nEscapement = rPool.GetTrueWhich( SID_ATTR_CHAR_ESCAPEMENT, FALSE );
-    nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, FALSE );
-    nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, FALSE );
-    nKering = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, FALSE );
-    nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, FALSE );
-    nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, FALSE );
-    nShadowed = rPool.GetTrueWhich( SID_ATTR_CHAR_SHADOWED, FALSE );
-    nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, FALSE );
-    nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, FALSE );
-    nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, FALSE );
-    nWordlineMode = rPool.GetTrueWhich( SID_ATTR_CHAR_WORDLINEMODE, FALSE );
-    nAutoKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_AUTOKERN, FALSE );
-
-    nCJKFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, FALSE );
-    nCJKFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, FALSE );
-    nCJKLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, FALSE );
-    nCJKPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, FALSE );
-    nCJKWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, FALSE );
-    nCTLFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, FALSE );
-    nCTLFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, FALSE );
-    nCTLLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, FALSE );
-    nCTLPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, FALSE );
-    nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, FALSE );
-    nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, FALSE );
-    nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, FALSE );
-    nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, FALSE );
-    nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, FALSE );
-    nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, FALSE );
-    nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, FALSE );
-    nHidden = rPool.GetTrueWhich( SID_ATTR_CHAR_HIDDEN, FALSE );
+    nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, sal_False );
+    nBgColor = rPool.GetTrueWhich( SID_ATTR_BRUSH_CHAR, sal_False );
+    nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, sal_False );
+    nContour = rPool.GetTrueWhich( SID_ATTR_CHAR_CONTOUR, sal_False );
+    nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, sal_False );
+    nEscapement = rPool.GetTrueWhich( SID_ATTR_CHAR_ESCAPEMENT, sal_False );
+    nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, sal_False );
+    nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, sal_False );
+    nKering = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, sal_False );
+    nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, sal_False );
+    nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, sal_False );
+    nShadowed = rPool.GetTrueWhich( SID_ATTR_CHAR_SHADOWED, sal_False );
+    nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, sal_False );
+    nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, sal_False );
+    nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, sal_False );
+    nWordlineMode = rPool.GetTrueWhich( SID_ATTR_CHAR_WORDLINEMODE, sal_False );
+    nAutoKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_AUTOKERN, sal_False );
+
+    nCJKFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, sal_False );
+    nCJKFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, sal_False );
+    nCJKLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, sal_False );
+    nCJKPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, sal_False );
+    nCJKWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, sal_False );
+    nCTLFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, sal_False );
+    nCTLFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, sal_False );
+    nCTLLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, sal_False );
+    nCTLPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, sal_False );
+    nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, sal_False );
+    nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, sal_False );
+    nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, sal_False );
+    nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, sal_False );
+    nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, sal_False );
+    nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, sal_False );
+    nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, sal_False );
+    nHidden = rPool.GetTrueWhich( SID_ATTR_CHAR_HIDDEN, sal_False );
 }
 
 RTFPardAttrMapIds ::RTFPardAttrMapIds ( const SfxItemPool& rPool )
 {
-    nLinespacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, FALSE );
-    nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, FALSE );
-    nTabStop = rPool.GetTrueWhich( SID_ATTR_TABSTOP, FALSE );
-    nHyphenzone = rPool.GetTrueWhich( SID_ATTR_PARA_HYPHENZONE, FALSE );
-    nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, FALSE );
-    nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, FALSE );
-    nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, FALSE );
-    nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, FALSE );
-    nShadow = rPool.GetTrueWhich( SID_ATTR_BORDER_SHADOW, FALSE );
-    nOutlineLvl = rPool.GetTrueWhich( SID_ATTR_PARA_OUTLLEVEL, FALSE );
-    nSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, FALSE );
-    nKeep = rPool.GetTrueWhich( SID_ATTR_PARA_KEEP, FALSE );
-    nFontAlign = rPool.GetTrueWhich( SID_PARA_VERTALIGN, FALSE );
-    nScriptSpace = rPool.GetTrueWhich( SID_ATTR_PARA_SCRIPTSPACE, FALSE );
-    nHangPunct = rPool.GetTrueWhich( SID_ATTR_PARA_HANGPUNCTUATION, FALSE );
-    nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, FALSE );
-    nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, FALSE );
+    nLinespacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, sal_False );
+    nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, sal_False );
+    nTabStop = rPool.GetTrueWhich( SID_ATTR_TABSTOP, sal_False );
+    nHyphenzone = rPool.GetTrueWhich( SID_ATTR_PARA_HYPHENZONE, sal_False );
+    nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, sal_False );
+    nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, sal_False );
+    nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, sal_False );
+    nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, sal_False );
+    nShadow = rPool.GetTrueWhich( SID_ATTR_BORDER_SHADOW, sal_False );
+    nOutlineLvl = rPool.GetTrueWhich( SID_ATTR_PARA_OUTLLEVEL, sal_False );
+    nSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, sal_False );
+    nKeep = rPool.GetTrueWhich( SID_ATTR_PARA_KEEP, sal_False );
+    nFontAlign = rPool.GetTrueWhich( SID_PARA_VERTALIGN, sal_False );
+    nScriptSpace = rPool.GetTrueWhich( SID_ATTR_PARA_SCRIPTSPACE, sal_False );
+    nHangPunct = rPool.GetTrueWhich( SID_ATTR_PARA_HANGPUNCTUATION, sal_False );
+    nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, sal_False );
+    nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, sal_False );
 }
 
 /* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index df33e4cda1be..cf3cce7b9adb 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -64,7 +64,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc
         throw RuntimeException();
 
     const LanguageType eLang = SvxLocaleToLanguage( rLocale );
-    const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, FALSE );
+    const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False );
     if(!pForbidden)
         throw NoSuchElementException();
 
@@ -80,7 +80,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal
         return sal_False;
 
     const LanguageType eLang = SvxLocaleToLanguage( rLocale );
-    const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, FALSE );
+    const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False );
 
     return NULL != pForbidden;
 }
@@ -128,7 +128,7 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
 
         for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
         {
-            const ULONG nLanguage = mxForbiddenChars->GetObjectKey( nIndex );
+            const sal_uLong nLanguage = mxForbiddenChars->GetObjectKey( nIndex );
             SvxLanguageToLocale ( *pLocales++, static_cast < LanguageType > (nLanguage) );
         }
     }
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index ffa3d5c5a598..e8cd841e3157 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -37,46 +37,46 @@
 
 TYPEINIT1( SvxEditSourceHint, TextHint );
 
-SvxEditSourceHint::SvxEditSourceHint( ULONG _nId ) :
+SvxEditSourceHint::SvxEditSourceHint( sal_uLong _nId ) :
     TextHint( _nId ),
     mnStart( 0 ),
     mnEnd( 0 )
 {
 }
 
-SvxEditSourceHint::SvxEditSourceHint( ULONG _nId, ULONG nValue, ULONG nStart, ULONG nEnd ) :
+SvxEditSourceHint::SvxEditSourceHint( sal_uLong _nId, sal_uLong nValue, sal_uLong nStart, sal_uLong nEnd ) :
     TextHint( _nId, nValue ),
     mnStart( nStart),
     mnEnd( nEnd )
 {
 }
 
-ULONG SvxEditSourceHint::GetValue() const
+sal_uLong SvxEditSourceHint::GetValue() const
 {
     return TextHint::GetValue();
 }
 
-ULONG SvxEditSourceHint::GetStartValue() const
+sal_uLong SvxEditSourceHint::GetStartValue() const
 {
     return mnStart;
 }
 
-ULONG SvxEditSourceHint::GetEndValue() const
+sal_uLong SvxEditSourceHint::GetEndValue() const
 {
     return mnEnd;
 }
 
-void SvxEditSourceHint::SetValue( ULONG n )
+void SvxEditSourceHint::SetValue( sal_uLong n )
 {
     TextHint::SetValue( n );
 }
 
-void SvxEditSourceHint::SetStartValue( ULONG n )
+void SvxEditSourceHint::SetStartValue( sal_uLong n )
 {
     mnStart = n;
 }
 
-void SvxEditSourceHint::SetEndValue( ULONG n )
+void SvxEditSourceHint::SetEndValue( sal_uLong n )
 {
     mnEnd = n;
 }
@@ -131,14 +131,14 @@ void SvxEditSourceHint::SetEndValue( ULONG n )
     return ::std::auto_ptr<SfxHint>( new SfxHint() );
 }
 
-sal_Bool SvxEditSourceHelper::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex )
+sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex )
 {
     EECharAttribArray aCharAttribs;
 
     rEE.GetCharAttribs( nPara, aCharAttribs );
 
     // find closest index in front of nIndex
-    USHORT nAttr, nCurrIndex;
+    sal_uInt16 nAttr, nCurrIndex;
     sal_Int32 nClosestStartIndex;
     for( nAttr=0, nClosestStartIndex=0; nAttr<aCharAttribs.Count(); ++nAttr )
     {
@@ -166,8 +166,8 @@ sal_Bool SvxEditSourceHelper::GetAttributeRun( USHORT& nStartIndex, USHORT& nEnd
         }
     }
 
-    nStartIndex = static_cast<USHORT>( nClosestStartIndex );
-    nEndIndex = static_cast<USHORT>( nClosestEndIndex );
+    nStartIndex = static_cast<sal_uInt16>( nClosestStartIndex );
+    nEndIndex = static_cast<sal_uInt16>( nClosestEndIndex );
 
     return sal_True;
 }
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 9fe556190f27..01c62014de7c 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -76,11 +76,11 @@ public:
     ~SvxAccessibleTextIndex() {};
 
     // Get/Set current paragraph
-    void SetParagraph( USHORT nPara )
+    void SetParagraph( sal_uInt16 nPara )
     {
         mnPara = nPara;
     }
-    USHORT GetParagraph() const { return mnPara; }
+    sal_uInt16 GetParagraph() const { return mnPara; }
 
     /** Set the index in the UAA semantic
 
@@ -91,7 +91,7 @@ public:
         The text forwarder to use in the calculations
      */
     void SetIndex( sal_Int32 nIndex, const SvxTextForwarder& rTF );
-    void SetIndex( USHORT nPara, sal_Int32 nIndex, const SvxTextForwarder& rTF ) { SetParagraph(nPara); SetIndex(nIndex, rTF); }
+    void SetIndex( sal_uInt16 nPara, sal_Int32 nIndex, const SvxTextForwarder& rTF ) { SetParagraph(nPara); SetIndex(nIndex, rTF); }
     sal_Int32 GetIndex() const { return mnIndex; }
 
     /** Set the index in the edit engine semantic
@@ -105,9 +105,9 @@ public:
         @param rTF
         The text forwarder to use in the calculations
      */
-    void SetEEIndex( USHORT nEEIndex, const SvxTextForwarder& rTF );
-    void SetEEIndex( USHORT nPara, USHORT nEEIndex, const SvxTextForwarder& rTF ) { SetParagraph(nPara); SetEEIndex(nEEIndex, rTF); }
-    USHORT GetEEIndex() const;
+    void SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwarder& rTF );
+    void SetEEIndex( sal_uInt16 nPara, sal_uInt16 nEEIndex, const SvxTextForwarder& rTF ) { SetParagraph(nPara); SetEEIndex(nEEIndex, rTF); }
+    sal_uInt16 GetEEIndex() const;
 
     void SetFieldOffset( sal_Int32 nOffset, sal_Int32 nLen ) { mnFieldOffset = nOffset; mnFieldLen = nLen; }
     sal_Int32 GetFieldOffset() const { return mnFieldOffset; }
@@ -128,7 +128,7 @@ public:
     sal_Bool IsEditableRange( const SvxAccessibleTextIndex& rEnd ) const;
 
 private:
-    USHORT    mnPara;
+    sal_uInt16    mnPara;
     sal_Int32 mnIndex;
     sal_Int32 mnEEIndex;
     sal_Int32 mnFieldOffset;
@@ -178,15 +178,15 @@ ESelection MakeEESelection( const SvxAccessibleTextIndex& rIndex )
                        rIndex.GetParagraph(), rIndex.GetEEIndex() + 1 );
 }
 
-USHORT SvxAccessibleTextIndex::GetEEIndex() const
+sal_uInt16 SvxAccessibleTextIndex::GetEEIndex() const
 {
     DBG_ASSERT(mnEEIndex >= 0 && mnEEIndex <= USHRT_MAX,
                "SvxAccessibleTextIndex::GetEEIndex: index value overflow");
 
-    return static_cast< USHORT > (mnEEIndex);
+    return static_cast< sal_uInt16 > (mnEEIndex);
 }
 
-void SvxAccessibleTextIndex::SetEEIndex( USHORT nEEIndex, const SvxTextForwarder& rTF )
+void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwarder& rTF )
 {
     // reset
     mnFieldOffset = 0;
@@ -200,7 +200,7 @@ void SvxAccessibleTextIndex::SetEEIndex( USHORT nEEIndex, const SvxTextForwarder
     mnEEIndex = nEEIndex;
 
     // calculate unknowns
-    USHORT                  nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
+    sal_uInt16                  nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
 
     mnIndex = nEEIndex;
 
@@ -246,7 +246,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder&
     mnIndex = nIndex;
 
     // calculate unknowns
-    USHORT                  nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
+    sal_uInt16                  nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
 
     DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
@@ -455,21 +455,21 @@ SvxAccessibleTextAdapter::~SvxAccessibleTextAdapter()
 {
 }
 
-USHORT SvxAccessibleTextAdapter::GetParagraphCount() const
+sal_uInt16 SvxAccessibleTextAdapter::GetParagraphCount() const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetParagraphCount();
 }
 
-USHORT SvxAccessibleTextAdapter::GetTextLen( USHORT nParagraph ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetTextLen( sal_uInt16 nParagraph ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     SvxAccessibleTextIndex aIndex;
     aIndex.SetEEIndex( nParagraph, mrTextForwarder->GetTextLen( nParagraph ), *this );
 
-    return static_cast< USHORT >(aIndex.GetIndex());
+    return static_cast< sal_uInt16 >(aIndex.GetIndex());
 }
 
 String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
@@ -498,7 +498,7 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    aStartIndex.GetFieldOffset() <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sStr.Erase(0, static_cast< USHORT > (aStartIndex.GetFieldOffset()) );
+        sStr.Erase(0, static_cast< sal_uInt16 > (aStartIndex.GetFieldOffset()) );
     }
     if( aEndIndex.InField() && aEndIndex.GetFieldOffset() )
     {
@@ -506,11 +506,11 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    sStr.Len() - (aEndIndex.GetFieldLen() - aEndIndex.GetFieldOffset()) <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sStr = sStr.Copy(0, static_cast< USHORT > (sStr.Len() - (aEndIndex.GetFieldLen() - aEndIndex.GetFieldOffset())) );
+        sStr = sStr.Copy(0, static_cast< sal_uInt16 > (sStr.Len() - (aEndIndex.GetFieldLen() - aEndIndex.GetFieldOffset())) );
     }
 
-    EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< USHORT >(aStartIndex.GetParagraph()) );
-    EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< USHORT >(aEndIndex.GetParagraph()) );
+    EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) );
+    EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) );
 
     if( aStartIndex.InBullet() )
     {
@@ -521,7 +521,7 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    aStartIndex.GetBulletOffset() <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sBullet.Erase(0, static_cast< USHORT > (aStartIndex.GetBulletOffset()) );
+        sBullet.Erase(0, static_cast< sal_uInt16 > (aStartIndex.GetBulletOffset()) );
 
         sBullet += sStr;
         sStr = sBullet;
@@ -536,7 +536,7 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset()) <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sStr = sStr.Copy(0, static_cast< USHORT > (sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset())) );
+        sStr = sStr.Copy(0, static_cast< sal_uInt16 > (sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset())) );
     }
     else if( aStartIndex.GetParagraph() != aEndIndex.GetParagraph() &&
              HaveTextBullet( aEndIndex.GetParagraph() ) )
@@ -547,17 +547,17 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    sBullet.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset()) <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sBullet = sBullet.Copy(0, static_cast< USHORT > (sBullet.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset())) );
+        sBullet = sBullet.Copy(0, static_cast< sal_uInt16 > (sBullet.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset())) );
 
         // insert bullet
         sStr.Insert( sBullet,
-                     static_cast< USHORT > (GetTextLen(aStartIndex.GetParagraph()) - aStartIndex.GetIndex()) );
+                     static_cast< sal_uInt16 > (GetTextLen(aStartIndex.GetParagraph()) - aStartIndex.GetIndex()) );
     }
 
     return sStr;
 }
 
-SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -571,14 +571,14 @@ SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, BOOL bO
                                         bOnlyHardAttrib );
 }
 
-SfxItemSet SvxAccessibleTextAdapter::GetParaAttribs( USHORT nPara ) const
+SfxItemSet SvxAccessibleTextAdapter::GetParaAttribs( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetParaAttribs( nPara );
 }
 
-void SvxAccessibleTextAdapter::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void SvxAccessibleTextAdapter::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -590,14 +590,14 @@ void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , sal_Bool , sal
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 }
 
-void SvxAccessibleTextAdapter::GetPortions( USHORT nPara, SvUShorts& rList ) const
+void SvxAccessibleTextAdapter::GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     mrTextForwarder->GetPortions( nPara, rList );
 }
 
-USHORT SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, USHORT nWhich ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -611,7 +611,7 @@ USHORT SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, USHORT nW
                                           nWhich );
 }
 
-USHORT SvxAccessibleTextAdapter::GetItemState( USHORT nPara, USHORT nWhich ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -680,21 +680,21 @@ SfxItemPool* SvxAccessibleTextAdapter::GetPool() const
     return mrTextForwarder->GetPool();
 }
 
-XubString SvxAccessibleTextAdapter::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString SvxAccessibleTextAdapter::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
 
-void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos )
+void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     mrTextForwarder->FieldClicked( rField, nPara, nPos );
 }
 
-sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( USHORT nPara, USHORT nEEIndex )
+sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( sal_uInt16 nPara, sal_uInt16 nEEIndex )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -703,7 +703,7 @@ sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( USHORT nPara, USHORT nEEIn
     return aIndex.GetIndex();
 }
 
-USHORT SvxAccessibleTextAdapter::CalcEditEngineIndex( USHORT nPara, sal_Int32 nLogicalIndex )
+sal_uInt16 SvxAccessibleTextAdapter::CalcEditEngineIndex( sal_uInt16 nPara, sal_Int32 nLogicalIndex )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -714,7 +714,7 @@ USHORT SvxAccessibleTextAdapter::CalcEditEngineIndex( USHORT nPara, sal_Int32 nL
 
 
 
-BOOL SvxAccessibleTextAdapter::IsValid() const
+sal_Bool SvxAccessibleTextAdapter::IsValid() const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -724,7 +724,7 @@ BOOL SvxAccessibleTextAdapter::IsValid() const
         return sal_False;
 }
 
-LanguageType SvxAccessibleTextAdapter::GetLanguage( USHORT nPara, USHORT nPos ) const
+LanguageType SvxAccessibleTextAdapter::GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -735,28 +735,28 @@ LanguageType SvxAccessibleTextAdapter::GetLanguage( USHORT nPara, USHORT nPos )
     return mrTextForwarder->GetLanguage( nPara, aIndex.GetEEIndex() );
 }
 
-USHORT SvxAccessibleTextAdapter::GetFieldCount( USHORT nPara ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetFieldCount( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetFieldCount( nPara );
 }
 
-EFieldInfo SvxAccessibleTextAdapter::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo SvxAccessibleTextAdapter::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetFieldInfo( nPara, nField );
 }
 
-EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( USHORT nPara ) const
+EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetBulletInfo( nPara );
 }
 
-Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex ) const
+Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -765,7 +765,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex )
 
     // preset if anything goes wrong below
     // n-th char in GetParagraphIndex's paragraph
-    Rectangle aRect = mrTextForwarder->GetCharBounds( nPara, static_cast< USHORT >( aIndex.GetEEIndex() ) );
+    Rectangle aRect = mrTextForwarder->GetCharBounds( nPara, static_cast< sal_uInt16 >( aIndex.GetEEIndex() ) );
 
     if( aIndex.InBullet() )
     {
@@ -803,7 +803,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex )
                                                   aFont,
                                                   mrTextForwarder->GetText( aSel ) );
 
-                Rectangle aStartRect = mrTextForwarder->GetCharBounds( nPara, static_cast< USHORT >( aIndex.GetEEIndex() ) );
+                Rectangle aStartRect = mrTextForwarder->GetCharBounds( nPara, static_cast< sal_uInt16 >( aIndex.GetEEIndex() ) );
 
                 if( !aStringWrap.GetCharacterBounds( aIndex.GetFieldOffset(), aRect ) )
                     aRect = aStartRect;
@@ -816,7 +816,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex )
     return aRect;
 }
 
-Rectangle SvxAccessibleTextAdapter::GetParaBounds( USHORT nPara ) const
+Rectangle SvxAccessibleTextAdapter::GetParaBounds( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -851,7 +851,7 @@ OutputDevice* SvxAccessibleTextAdapter::GetRefDevice() const
     return mrTextForwarder->GetRefDevice();
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT& nPara, USHORT& nIndex ) const
+sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_uInt16& nPara, sal_uInt16& nIndex ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -864,7 +864,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT&
     DBG_ASSERT(aIndex.GetIndex() >= 0 && aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
-    nIndex = static_cast< USHORT > (aIndex.GetIndex());
+    nIndex = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     EBulletInfo aBulletInfo = GetBulletInfo( nPara );
 
@@ -891,7 +891,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT&
                        aStringWrap.GetIndexAtPoint( aPoint ) <= USHRT_MAX,
                        "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
-            nIndex = static_cast< USHORT > (aStringWrap.GetIndexAtPoint( aPoint ));
+            nIndex = static_cast< sal_uInt16 > (aStringWrap.GetIndexAtPoint( aPoint ));
             return sal_True;
         }
     }
@@ -919,14 +919,14 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT&
                    aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( rPoint ) <= USHRT_MAX,
                    "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
-        nIndex = static_cast< USHORT >(aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( aPoint ));
+        nIndex = static_cast< sal_uInt16 >(aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( aPoint ));
         return sal_True;
     }
 
     return sal_True;
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const
+sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -942,7 +942,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( USHORT nPara, USHORT nIndex,
 
         // always treat bullet as separate word
         nStart = 0;
-        nEnd = static_cast< USHORT > (aIndex.GetBulletLen());
+        nEnd = static_cast< sal_uInt16 > (aIndex.GetBulletLen());
 
         return sal_True;
     }
@@ -957,8 +957,8 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( USHORT nPara, USHORT nIndex,
 
         // always treat field as separate word
         // TODO: to circumvent this, _we_ would have to do the break iterator stuff!
-        nStart = static_cast< USHORT > (aIndex.GetIndex() - aIndex.GetFieldOffset());
-        nEnd = static_cast< USHORT > (nStart + aIndex.GetFieldLen());
+        nStart = static_cast< sal_uInt16 > (aIndex.GetIndex() - aIndex.GetFieldOffset());
+        nEnd = static_cast< sal_uInt16 > (nStart + aIndex.GetFieldLen());
 
         return sal_True;
     }
@@ -970,18 +970,18 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( USHORT nPara, USHORT nIndex,
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
                aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
-    nStart = static_cast< USHORT > (aIndex.GetIndex());
+    nStart = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     aIndex.SetEEIndex( nPara, nEnd, *this );
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
                aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
-    nEnd = static_cast< USHORT > (aIndex.GetIndex());
+    nEnd = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     return sal_True;
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
+sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -997,7 +997,7 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( USHORT& nStartIndex, USHORT&
 
         // always treat bullet as distinct attribute
         nStartIndex = 0;
-        nEndIndex = static_cast< USHORT > (aIndex.GetBulletLen());
+        nEndIndex = static_cast< sal_uInt16 > (aIndex.GetBulletLen());
 
         return sal_True;
     }
@@ -1009,8 +1009,8 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( USHORT& nStartIndex, USHORT&
                    "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
         // always treat field as distinct attribute
-        nStartIndex = static_cast< USHORT > (aIndex.GetIndex() - aIndex.GetFieldOffset());
-        nEndIndex = static_cast< USHORT > (nStartIndex + aIndex.GetFieldLen());
+        nStartIndex = static_cast< sal_uInt16 > (aIndex.GetIndex() - aIndex.GetFieldOffset());
+        nEndIndex = static_cast< sal_uInt16 > (nStartIndex + aIndex.GetFieldLen());
 
         return sal_True;
     }
@@ -1022,32 +1022,32 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( USHORT& nStartIndex, USHORT&
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
                aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
-    nStartIndex = static_cast< USHORT > (aIndex.GetIndex());
+    nStartIndex = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     aIndex.SetEEIndex( nPara, nEndIndex, *this );
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
                aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
-    nEndIndex = static_cast< USHORT > (aIndex.GetIndex());
+    nEndIndex = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     return sal_True;
 }
 
-USHORT SvxAccessibleTextAdapter::GetLineCount( USHORT nPara ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetLineCount( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetLineCount( nPara );
 }
 
-USHORT SvxAccessibleTextAdapter::GetLineLen( USHORT nPara, USHORT nLine ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     SvxAccessibleTextIndex aStartIndex;
     SvxAccessibleTextIndex aEndIndex;
-    USHORT nCurrLine;
-    USHORT nCurrIndex, nLastIndex;
+    sal_uInt16 nCurrLine;
+    sal_uInt16 nCurrIndex, nLastIndex;
     for( nCurrLine=0, nCurrIndex=0, nLastIndex=0; nCurrLine<=nLine; ++nCurrLine )
     {
         nLastIndex = nCurrIndex;
@@ -1060,18 +1060,18 @@ USHORT SvxAccessibleTextAdapter::GetLineLen( USHORT nPara, USHORT nLine ) const
     {
         aStartIndex.SetEEIndex( nPara, nLastIndex, *this );
 
-        return static_cast< USHORT >(aEndIndex.GetIndex() - aStartIndex.GetIndex());
+        return static_cast< sal_uInt16 >(aEndIndex.GetIndex() - aStartIndex.GetIndex());
     }
     else
-        return static_cast< USHORT >(aEndIndex.GetIndex());
+        return static_cast< sal_uInt16 >(aEndIndex.GetIndex());
 }
 
-void SvxAccessibleTextAdapter::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const
+void SvxAccessibleTextAdapter::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const
 {
     mrTextForwarder->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
 }
 
-USHORT SvxAccessibleTextAdapter::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return mrTextForwarder->GetLineNumberAtIndex( nPara, nIndex );
 }
@@ -1102,21 +1102,21 @@ sal_Bool SvxAccessibleTextAdapter::InsertText( const String& rStr, const ESelect
     return mrTextForwarder->InsertText( rStr, MakeEESelection(aStartIndex, aEndIndex) );
 }
 
-sal_Bool SvxAccessibleTextAdapter::QuickFormatDoc( BOOL bFull )
+sal_Bool SvxAccessibleTextAdapter::QuickFormatDoc( sal_Bool bFull )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->QuickFormatDoc( bFull );
 }
 
-sal_Int16 SvxAccessibleTextAdapter::GetDepth( USHORT nPara ) const
+sal_Int16 SvxAccessibleTextAdapter::GetDepth( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetDepth( nPara );
 }
 
-sal_Bool SvxAccessibleTextAdapter::SetDepth( USHORT nPara, sal_Int16 nNewDepth )
+sal_Bool SvxAccessibleTextAdapter::SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1128,7 +1128,7 @@ void SvxAccessibleTextAdapter::SetForwarder( SvxTextForwarder& rForwarder )
     mrTextForwarder = &rForwarder;
 }
 
-sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( USHORT nPara ) const
+sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1146,7 +1146,7 @@ sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( USHORT nPara ) const
     }
 }
 
-sal_Bool SvxAccessibleTextAdapter::HaveTextBullet( USHORT nPara ) const
+sal_Bool SvxAccessibleTextAdapter::HaveTextBullet( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1195,7 +1195,7 @@ void SvxAccessibleTextAdapter::AppendParagraph()
     DBG_ERROR( "not implemented" );
 }
 
-xub_StrLen SvxAccessibleTextAdapter::AppendTextPortion( USHORT, const String &, const SfxItemSet & )
+xub_StrLen SvxAccessibleTextAdapter::AppendTextPortion( sal_uInt16, const String &, const SfxItemSet & )
 {
     DBG_ERROR( "not implemented" );
     return 0;
@@ -1217,7 +1217,7 @@ SvxAccessibleTextEditViewAdapter::~SvxAccessibleTextEditViewAdapter()
 {
 }
 
-BOOL SvxAccessibleTextEditViewAdapter::IsValid() const
+sal_Bool SvxAccessibleTextEditViewAdapter::IsValid() const
 {
     DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
 
@@ -1267,8 +1267,8 @@ sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) cons
                aEndIndex.GetIndex() >= 0 && aEndIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextEditViewAdapter::GetSelection: index value overflow");
 
-    rSel = ESelection( aStartIndex.GetParagraph(), static_cast< USHORT > (aStartIndex.GetIndex()),
-                       aEndIndex.GetParagraph(), static_cast< USHORT > (aEndIndex.GetIndex()) );
+    rSel = ESelection( aStartIndex.GetParagraph(), static_cast< sal_uInt16 > (aStartIndex.GetIndex()),
+                       aEndIndex.GetParagraph(), static_cast< sal_uInt16 > (aEndIndex.GetIndex()) );
 
     return sal_True;
 }
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 19ea7b6b302a..d81af6ccff0c 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -144,7 +144,7 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
 {
     const SfxPoolItem* pItem = NULL;
     {
-        SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, TRUE );
+        SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, sal_True );
         rDesc.Name      = pFontItem->GetFamilyName();
         rDesc.StyleName = pFontItem->GetStyleName();
         rDesc.Family    = sal::static_int_cast< sal_Int16 >(
@@ -154,37 +154,37 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
             pFontItem->GetPitch());
     }
     {
-        pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, TRUE );
+        pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, sal_True );
         uno::Any aHeight;
         if( pItem->QueryValue( aHeight, MID_FONTHEIGHT ) )
             aHeight >>= rDesc.Height;
     }
     {
-        pItem = &rSet.Get( EE_CHAR_ITALIC, TRUE );
+        pItem = &rSet.Get( EE_CHAR_ITALIC, sal_True );
         uno::Any aFontSlant;
         if(pItem->QueryValue( aFontSlant, MID_POSTURE ))
             aFontSlant >>= rDesc.Slant;
     }
     {
-        pItem = &rSet.Get( EE_CHAR_UNDERLINE, TRUE );
+        pItem = &rSet.Get( EE_CHAR_UNDERLINE, sal_True );
         uno::Any aUnderline;
         if(pItem->QueryValue( aUnderline, MID_TL_STYLE ))
             aUnderline >>= rDesc.Underline;
     }
     {
-        pItem = &rSet.Get( EE_CHAR_WEIGHT, TRUE );
+        pItem = &rSet.Get( EE_CHAR_WEIGHT, sal_True );
         uno::Any aWeight;
         if(pItem->QueryValue( aWeight, MID_WEIGHT ))
             aWeight >>= rDesc.Weight;
     }
     {
-        pItem = &rSet.Get( EE_CHAR_STRIKEOUT, TRUE );
+        pItem = &rSet.Get( EE_CHAR_STRIKEOUT, sal_True );
         uno::Any aStrikeOut;
         if(pItem->QueryValue( aStrikeOut, MID_CROSS_OUT ))
             aStrikeOut >>= rDesc.Strikeout;
     }
     {
-        SvxWordLineModeItem* pWLMItem = (SvxWordLineModeItem*)&rSet.Get( EE_CHAR_WLM, TRUE );
+        SvxWordLineModeItem* pWLMItem = (SvxWordLineModeItem*)&rSet.Get( EE_CHAR_WLM, sal_True );
         rDesc.WordLineMode = pWLMItem->GetValue();
     }
 }
@@ -202,13 +202,13 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
 
 beans::PropertyState SvxUnoFontDescriptor::getPropertyState( const SfxItemSet& rSet )
 {
-    CheckState(rSet.GetItemState( EE_CHAR_FONTINFO, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_FONTHEIGHT, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_ITALIC, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_UNDERLINE, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_WEIGHT, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_STRIKEOUT, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_WLM, FALSE ));
+    CheckState(rSet.GetItemState( EE_CHAR_FONTINFO, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_FONTHEIGHT, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_ITALIC, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_UNDERLINE, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_WEIGHT, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_STRIKEOUT, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_WLM, sal_False ));
 
     return beans::PropertyState_DEFAULT_VALUE;
 }
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 5a980ce76f98..dbf52dddc757 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -216,7 +216,7 @@ static SvxFileFormat setFileNameDisplayFormat( sal_Int16 nFormat )
     }
 }
 
-static util::DateTime getDate( ULONG nDate )
+static util::DateTime getDate( sal_uLong nDate )
 {
     util::DateTime aDate;
     memset( &aDate, 0, sizeof( util::DateTime ) );
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 2f21e88f3bfa..f7d7401d6a3f 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -56,12 +56,12 @@ SvxEditEngineForwarder::~SvxEditEngineForwarder()
     //  die EditEngine muss ggf. von aussen geloescht werden
 }
 
-USHORT SvxEditEngineForwarder::GetParagraphCount() const
+sal_uInt16 SvxEditEngineForwarder::GetParagraphCount() const
 {
     return rEditEngine.GetParagraphCount();
 }
 
-USHORT SvxEditEngineForwarder::GetTextLen( USHORT nParagraph ) const
+sal_uInt16 SvxEditEngineForwarder::GetTextLen( sal_uInt16 nParagraph ) const
 {
     return rEditEngine.GetTextLen( nParagraph );
 }
@@ -73,7 +73,7 @@ String SvxEditEngineForwarder::GetText( const ESelection& rSel ) const
     return aRet;
 }
 
-SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
 {
     if( rSel.nStartPara == rSel.nEndPara )
     {
@@ -101,14 +101,14 @@ SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, BOOL bOnl
     }
 }
 
-SfxItemSet SvxEditEngineForwarder::GetParaAttribs( USHORT nPara ) const
+SfxItemSet SvxEditEngineForwarder::GetParaAttribs( sal_uInt16 nPara ) const
 {
     SfxItemSet aSet( rEditEngine.GetParaAttribs( nPara ) );
 
-    USHORT nWhich = EE_PARA_START;
+    sal_uInt16 nWhich = EE_PARA_START;
     while( nWhich <= EE_PARA_END )
     {
-        if( aSet.GetItemState( nWhich, TRUE ) != SFX_ITEM_ON )
+        if( aSet.GetItemState( nWhich, sal_True ) != SFX_ITEM_ON )
         {
             if( rEditEngine.HasParaAttrib( nPara, nWhich ) )
                 aSet.Put( rEditEngine.GetParaAttrib( nPara, nWhich ) );
@@ -119,7 +119,7 @@ SfxItemSet SvxEditEngineForwarder::GetParaAttribs( USHORT nPara ) const
     return aSet;
 }
 
-void SvxEditEngineForwarder::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void SvxEditEngineForwarder::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     rEditEngine.SetParaAttribs( nPara, rSet );
 }
@@ -134,7 +134,7 @@ SfxItemPool* SvxEditEngineForwarder::GetPool() const
     return rEditEngine.GetEmptyItemSet().GetPool();
 }
 
-void SvxEditEngineForwarder::GetPortions( USHORT nPara, SvUShorts& rList ) const
+void SvxEditEngineForwarder::GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const
 {
     rEditEngine.GetPortions( nPara, rList );
 }
@@ -159,24 +159,24 @@ void SvxEditEngineForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESel
     rEditEngine.QuickSetAttribs( rSet, rSel );
 }
 
-BOOL SvxEditEngineForwarder::IsValid() const
+sal_Bool SvxEditEngineForwarder::IsValid() const
 {
     // cannot reliably query EditEngine state
     // while in the middle of an update
     return rEditEngine.GetUpdateMode();
 }
 
-XubString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     return rEditEngine.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
 
-void SvxEditEngineForwarder::FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos )
+void SvxEditEngineForwarder::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos )
 {
     rEditEngine.FieldClicked( rField, nPara, nPos );
 }
 
-USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, USHORT nWhich )
+sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich )
 {
     EECharAttribArray aAttribs;
 
@@ -185,16 +185,16 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
     SfxItemState eState = SFX_ITEM_DEFAULT;
 
     // check all paragraphs inside the selection
-    for( USHORT nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
+    for( sal_uInt16 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
     {
         SfxItemState eParaState = SFX_ITEM_DEFAULT;
 
         // calculate start and endpos for this paragraph
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         if( rSel.nStartPara == nPara )
             nPos = rSel.nStartPos;
 
-        USHORT nEndPos = rSel.nEndPos;
+        sal_uInt16 nEndPos = rSel.nEndPos;
         if( rSel.nEndPara != nPara )
             nEndPos = rEditEngine.GetTextLen( nPara );
 
@@ -202,13 +202,13 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
         // get list of char attribs
         rEditEngine.GetCharAttribs( nPara, aAttribs );
 
-        BOOL bEmpty = TRUE;     // we found no item inside the selektion of this paragraph
-        BOOL bGaps  = FALSE;    // we found items but theire gaps between them
-        USHORT nLastEnd = nPos;
+        sal_Bool bEmpty = sal_True;     // we found no item inside the selektion of this paragraph
+        sal_Bool bGaps  = sal_False;    // we found items but theire gaps between them
+        sal_uInt16 nLastEnd = nPos;
 
         const SfxPoolItem* pParaItem = NULL;
 
-        for( USHORT nAttrib = 0; nAttrib < aAttribs.Count(); nAttrib++ )
+        for( sal_uInt16 nAttrib = 0; nAttrib < aAttribs.Count(); nAttrib++ )
         {
             struct EECharAttrib aAttrib = aAttribs.GetObject( nAttrib );
             DBG_ASSERT( aAttrib.pAttr, "GetCharAttribs gives corrupt data" );
@@ -236,16 +236,16 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
             }
 
             if( bEmpty )
-                bEmpty = FALSE;
+                bEmpty = sal_False;
 
             if( !bGaps && aAttrib.nStart > nLastEnd )
-                bGaps = TRUE;
+                bGaps = sal_True;
 
             nLastEnd = aAttrib.nEnd;
         }
 
         if( !bEmpty && !bGaps && nLastEnd < ( nEndPos - 1 ) )
-            bGaps = TRUE;
+            bGaps = sal_True;
 /*
         // since we have no portion with our item or if there were gaps
         if( bEmpty || bGaps )
@@ -308,45 +308,45 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
     return eState;
 }
 
-USHORT SvxEditEngineForwarder::GetItemState( const ESelection& rSel, USHORT nWhich ) const
+sal_uInt16 SvxEditEngineForwarder::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
 {
     return GetSvxEditEngineItemState( rEditEngine, rSel, nWhich );
 }
 
-USHORT SvxEditEngineForwarder::GetItemState( USHORT nPara, USHORT nWhich ) const
+sal_uInt16 SvxEditEngineForwarder::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     const SfxItemSet& rSet = rEditEngine.GetParaAttribs( nPara );
     return rSet.GetItemState( nWhich );
 }
 
-LanguageType SvxEditEngineForwarder::GetLanguage( USHORT nPara, USHORT nIndex ) const
+LanguageType SvxEditEngineForwarder::GetLanguage( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return rEditEngine.GetLanguage(nPara, nIndex);
 }
 
-USHORT SvxEditEngineForwarder::GetFieldCount( USHORT nPara ) const
+sal_uInt16 SvxEditEngineForwarder::GetFieldCount( sal_uInt16 nPara ) const
 {
     return rEditEngine.GetFieldCount(nPara);
 }
 
-EFieldInfo SvxEditEngineForwarder::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo SvxEditEngineForwarder::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
 {
     return rEditEngine.GetFieldInfo( nPara, nField );
 }
 
-EBulletInfo SvxEditEngineForwarder::GetBulletInfo( USHORT ) const
+EBulletInfo SvxEditEngineForwarder::GetBulletInfo( sal_uInt16 ) const
 {
     return EBulletInfo();
 }
 
-Rectangle SvxEditEngineForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const
+Rectangle SvxEditEngineForwarder::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     // #101701#
     // EditEngine's 'internal' methods like GetCharacterBounds()
     // don't rotate for vertical text.
     Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() );
     ::std::swap( aSize.Width(), aSize.Height() );
-    bool bIsVertical( rEditEngine.IsVertical() == TRUE );
+    bool bIsVertical( rEditEngine.IsVertical() == sal_True );
 
     // #108900# Handle virtual position one-past-the end of the string
     if( nIndex >= rEditEngine.GetTextLen(nPara) )
@@ -387,12 +387,12 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) c
     }
 }
 
-Rectangle SvxEditEngineForwarder::GetParaBounds( USHORT nPara ) const
+Rectangle SvxEditEngineForwarder::GetParaBounds( sal_uInt16 nPara ) const
 {
     const Point aPnt = rEditEngine.GetDocPosTopLeft( nPara );
-    ULONG nWidth;
-    ULONG nHeight;
-    ULONG nTextWidth;
+    sal_uLong nWidth;
+    sal_uLong nHeight;
+    sal_uLong nTextWidth;
 
     if( rEditEngine.IsVertical() )
     {
@@ -425,14 +425,14 @@ OutputDevice* SvxEditEngineForwarder::GetRefDevice() const
     return rEditEngine.GetRefDevice();
 }
 
-sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara, USHORT& nIndex ) const
+sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_uInt16& nPara, sal_uInt16& nIndex ) const
 {
     // #101701#
     Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() );
     ::std::swap( aSize.Width(), aSize.Height() );
     Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos,
                                                       aSize,
-                                                      rEditEngine.IsVertical() == TRUE ));
+                                                      rEditEngine.IsVertical() == sal_True ));
 
     EPosition aDocPos = rEditEngine.FindDocPosition( aEEPos );
 
@@ -442,7 +442,7 @@ sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPa
     return sal_True;
 }
 
-sal_Bool SvxEditEngineForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const
+sal_Bool SvxEditEngineForwarder::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const
 {
     ESelection aRes = rEditEngine.GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
 
@@ -458,33 +458,33 @@ sal_Bool SvxEditEngineForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, US
     return sal_False;
 }
 
-sal_Bool SvxEditEngineForwarder::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
+sal_Bool SvxEditEngineForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rEditEngine, nPara, nIndex );
 }
 
-USHORT SvxEditEngineForwarder::GetLineCount( USHORT nPara ) const
+sal_uInt16 SvxEditEngineForwarder::GetLineCount( sal_uInt16 nPara ) const
 {
     return rEditEngine.GetLineCount(nPara);
 }
 
-USHORT SvxEditEngineForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
+sal_uInt16 SvxEditEngineForwarder::GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     return rEditEngine.GetLineLen(nPara, nLine);
 }
 
-void SvxEditEngineForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const
+void SvxEditEngineForwarder::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     rEditEngine.GetLineBoundaries(rStart, rEnd, nPara, nLine);
 }
 
-USHORT SvxEditEngineForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 SvxEditEngineForwarder::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return rEditEngine.GetLineNumberAtIndex(nPara, nIndex);
 }
 
 
-sal_Bool SvxEditEngineForwarder::QuickFormatDoc( BOOL )
+sal_Bool SvxEditEngineForwarder::QuickFormatDoc( sal_Bool )
 {
     rEditEngine.QuickFormatDoc();
 
@@ -507,13 +507,13 @@ sal_Bool SvxEditEngineForwarder::InsertText( const String& rStr, const ESelectio
     return sal_True;
 }
 
-sal_Int16 SvxEditEngineForwarder::GetDepth( USHORT ) const
+sal_Int16 SvxEditEngineForwarder::GetDepth( sal_uInt16 ) const
 {
     // EditEngine does not support outline depth
     return -1;
 }
 
-sal_Bool SvxEditEngineForwarder::SetDepth( USHORT, sal_Int16 nNewDepth )
+sal_Bool SvxEditEngineForwarder::SetDepth( sal_uInt16, sal_Int16 nNewDepth )
 {
     // EditEngine does not support outline depth
     return nNewDepth == -1 ? sal_True : sal_False;
@@ -529,11 +529,11 @@ void SvxEditEngineForwarder::AppendParagraph()
     rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), String::EmptyString() );
 }
 
-xub_StrLen SvxEditEngineForwarder::AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet & /*rSet*/ )
+xub_StrLen SvxEditEngineForwarder::AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet & /*rSet*/ )
 {
     xub_StrLen nLen = 0;
 
-    USHORT nParaCount = rEditEngine.GetParagraphCount();
+    sal_uInt16 nParaCount = rEditEngine.GetParagraphCount();
     DBG_ASSERT( nPara < nParaCount, "paragraph index out of bounds" );
     if (/*0 <= nPara && */nPara < nParaCount)
     {
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 2b309a6f8aa6..550e9d9482a1 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, BOOL bOutlText /* = FALSE */ ) :
+SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, sal_Bool bOutlText /* = sal_False */ ) :
     rOutliner( rOutl ),
     bOutlinerText( bOutlText ),
     mpAttribsCache( NULL ),
@@ -63,12 +63,12 @@ SvxOutlinerForwarder::~SvxOutlinerForwarder()
     flushCache();
 }
 
-USHORT SvxOutlinerForwarder::GetParagraphCount() const
+sal_uInt16 SvxOutlinerForwarder::GetParagraphCount() const
 {
-    return (USHORT)rOutliner.GetParagraphCount();
+    return (sal_uInt16)rOutliner.GetParagraphCount();
 }
 
-USHORT SvxOutlinerForwarder::GetTextLen( USHORT nParagraph ) const
+sal_uInt16 SvxOutlinerForwarder::GetTextLen( sal_uInt16 nParagraph ) const
 {
     return rOutliner.GetEditEngine().GetTextLen( nParagraph );
 }
@@ -81,7 +81,7 @@ String SvxOutlinerForwarder::GetText( const ESelection& rSel ) const
     return pEditEngine->GetText( rSel, LINEEND_LF );
 }
 
-static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib, EditEngine& rEditEngine )
+static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib, EditEngine& rEditEngine )
 {
     if( rSel.nStartPara == rSel.nEndPara )
     {
@@ -109,7 +109,7 @@ static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, BOOL
     }
 }
 
-SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
 {
     if( mpAttribsCache && ( 0 == bOnlyHardAttrib ) )
     {
@@ -146,7 +146,7 @@ SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyH
     return aSet;
 }
 
-SfxItemSet SvxOutlinerForwarder::GetParaAttribs( USHORT nPara ) const
+SfxItemSet SvxOutlinerForwarder::GetParaAttribs( sal_uInt16 nPara ) const
 {
     if( mpParaAttribsCache )
     {
@@ -176,7 +176,7 @@ SfxItemSet SvxOutlinerForwarder::GetParaAttribs( USHORT nPara ) const
     return *mpParaAttribsCache;
 }
 
-void SvxOutlinerForwarder::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void SvxOutlinerForwarder::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     flushCache();
 
@@ -200,7 +200,7 @@ SfxItemPool* SvxOutlinerForwarder::GetPool() const
     return rOutliner.GetEmptyItemSet().GetPool();
 }
 
-void SvxOutlinerForwarder::GetPortions( USHORT nPara, SvUShorts& rList ) const
+void SvxOutlinerForwarder::GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const
 {
     ((EditEngine&)rOutliner.GetEditEngine()).GetPortions( nPara, rList );
 }
@@ -236,31 +236,31 @@ void SvxOutlinerForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESelec
     rOutliner.QuickSetAttribs( rSet, rSel );
 }
 
-XubString SvxOutlinerForwarder::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString SvxOutlinerForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     return rOutliner.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
 
-void SvxOutlinerForwarder::FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos )
+void SvxOutlinerForwarder::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos )
 {
     rOutliner.FieldClicked( rField, nPara, nPos );
 }
 
-BOOL SvxOutlinerForwarder::IsValid() const
+sal_Bool SvxOutlinerForwarder::IsValid() const
 {
     // cannot reliably query outliner state
     // while in the middle of an update
     return rOutliner.GetUpdateMode();
 }
 
-extern USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, USHORT nWhich );
+extern sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich );
 
-USHORT SvxOutlinerForwarder::GetItemState( const ESelection& rSel, USHORT nWhich ) const
+sal_uInt16 SvxOutlinerForwarder::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
 {
     return GetSvxEditEngineItemState( (EditEngine&)rOutliner.GetEditEngine(), rSel, nWhich );
 }
 
-USHORT SvxOutlinerForwarder::GetItemState( USHORT nPara, USHORT nWhich ) const
+sal_uInt16 SvxOutlinerForwarder::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     const SfxItemSet& rSet = rOutliner.GetParaAttribs( nPara );
     return rSet.GetItemState( nWhich );
@@ -282,34 +282,34 @@ void SvxOutlinerForwarder::flushCache()
     }
 }
 
-LanguageType SvxOutlinerForwarder::GetLanguage( USHORT nPara, USHORT nIndex ) const
+LanguageType SvxOutlinerForwarder::GetLanguage( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return rOutliner.GetLanguage(nPara, nIndex);
 }
 
-USHORT SvxOutlinerForwarder::GetFieldCount( USHORT nPara ) const
+sal_uInt16 SvxOutlinerForwarder::GetFieldCount( sal_uInt16 nPara ) const
 {
     return rOutliner.GetEditEngine().GetFieldCount(nPara);
 }
 
-EFieldInfo SvxOutlinerForwarder::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo SvxOutlinerForwarder::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
 {
     return rOutliner.GetEditEngine().GetFieldInfo( nPara, nField );
 }
 
-EBulletInfo SvxOutlinerForwarder::GetBulletInfo( USHORT nPara ) const
+EBulletInfo SvxOutlinerForwarder::GetBulletInfo( sal_uInt16 nPara ) const
 {
     return rOutliner.GetBulletInfo( nPara );
 }
 
-Rectangle SvxOutlinerForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const
+Rectangle SvxOutlinerForwarder::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     // #101701#
     // EditEngine's 'internal' methods like GetCharacterBounds()
     // don't rotate for vertical text.
     Size aSize( rOutliner.CalcTextSize() );
     ::std::swap( aSize.Width(), aSize.Height() );
-    bool bIsVertical( rOutliner.IsVertical() == TRUE );
+    bool bIsVertical( rOutliner.IsVertical() == sal_True );
 
     // #108900# Handle virtual position one-past-the end of the string
     if( nIndex >= GetTextLen(nPara) )
@@ -350,7 +350,7 @@ Rectangle SvxOutlinerForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) con
     }
 }
 
-Rectangle SvxOutlinerForwarder::GetParaBounds( USHORT nPara ) const
+Rectangle SvxOutlinerForwarder::GetParaBounds( sal_uInt16 nPara ) const
 {
     Point aPnt = rOutliner.GetDocPosTopLeft( nPara );
     Size aSize = rOutliner.CalcTextSize();
@@ -361,13 +361,13 @@ Rectangle SvxOutlinerForwarder::GetParaBounds( USHORT nPara ) const
         // Hargl. Outliner's 'external' methods return the rotated
         // dimensions, 'internal' methods like GetTextHeight( n )
         // don't rotate.
-        ULONG nWidth = rOutliner.GetTextHeight( nPara );
+        sal_uLong nWidth = rOutliner.GetTextHeight( nPara );
 
         return Rectangle( aSize.Width() - aPnt.Y() - nWidth, 0, aSize.Width() - aPnt.Y(), aSize.Height() );
     }
     else
     {
-        ULONG nHeight = rOutliner.GetTextHeight( nPara );
+        sal_uLong nHeight = rOutliner.GetTextHeight( nPara );
 
         return Rectangle( 0, aPnt.Y(), aSize.Width(), aPnt.Y() + nHeight );
     }
@@ -383,14 +383,14 @@ OutputDevice* SvxOutlinerForwarder::GetRefDevice() const
     return rOutliner.GetRefDevice();
 }
 
-sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara, USHORT& nIndex ) const
+sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_uInt16& nPara, sal_uInt16& nIndex ) const
 {
     // #101701#
     Size aSize( rOutliner.CalcTextSize() );
     ::std::swap( aSize.Width(), aSize.Height() );
     Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos,
                                                       aSize,
-                                                      rOutliner.IsVertical() == TRUE ));
+                                                      rOutliner.IsVertical() == sal_True ));
 
     EPosition aDocPos = rOutliner.GetEditEngine().FindDocPosition( aEEPos );
 
@@ -400,7 +400,7 @@ sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara
     return sal_True;
 }
 
-sal_Bool SvxOutlinerForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const
+sal_Bool SvxOutlinerForwarder::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const
 {
     ESelection aRes = rOutliner.GetEditEngine().GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
 
@@ -416,32 +416,32 @@ sal_Bool SvxOutlinerForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHO
     return sal_False;
 }
 
-sal_Bool SvxOutlinerForwarder::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
+sal_Bool SvxOutlinerForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rOutliner.GetEditEngine(), nPara, nIndex );
 }
 
-USHORT SvxOutlinerForwarder::GetLineCount( USHORT nPara ) const
+sal_uInt16 SvxOutlinerForwarder::GetLineCount( sal_uInt16 nPara ) const
 {
-    return static_cast < USHORT >( rOutliner.GetLineCount(nPara) );
+    return static_cast < sal_uInt16 >( rOutliner.GetLineCount(nPara) );
 }
 
-USHORT SvxOutlinerForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
+sal_uInt16 SvxOutlinerForwarder::GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     return rOutliner.GetLineLen(nPara, nLine);
 }
 
-void SvxOutlinerForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const
+void SvxOutlinerForwarder::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     return rOutliner.GetEditEngine().GetLineBoundaries( rStart, rEnd, nPara, nLine );
 }
 
-USHORT SvxOutlinerForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 SvxOutlinerForwarder::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return rOutliner.GetEditEngine().GetLineNumberAtIndex( nPara, nIndex );
 }
 
-sal_Bool SvxOutlinerForwarder::QuickFormatDoc( BOOL )
+sal_Bool SvxOutlinerForwarder::QuickFormatDoc( sal_Bool )
 {
     rOutliner.QuickFormatDoc();
 
@@ -466,7 +466,7 @@ sal_Bool SvxOutlinerForwarder::InsertText( const String& rStr, const ESelection&
     return sal_True;
 }
 
-sal_Int16 SvxOutlinerForwarder::GetDepth( USHORT nPara ) const
+sal_Int16 SvxOutlinerForwarder::GetDepth( sal_uInt16 nPara ) const
 {
     DBG_ASSERT( nPara < GetParagraphCount(), "SvxOutlinerForwarder::GetDepth: Invalid paragraph index");
 
@@ -480,7 +480,7 @@ sal_Int16 SvxOutlinerForwarder::GetDepth( USHORT nPara ) const
     return nLevel;
 }
 
-sal_Bool SvxOutlinerForwarder::SetDepth( USHORT nPara, sal_Int16 nNewDepth )
+sal_Bool SvxOutlinerForwarder::SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth )
 {
     DBG_ASSERT( nPara < GetParagraphCount(), "SvxOutlinerForwarder::SetDepth: Invalid paragraph index");
 
@@ -564,12 +564,12 @@ void SvxOutlinerForwarder::AppendParagraph()
     rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), String::EmptyString() );
 }
 
-xub_StrLen SvxOutlinerForwarder::AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet & /*rSet*/ )
+xub_StrLen SvxOutlinerForwarder::AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet & /*rSet*/ )
 {
     xub_StrLen nLen = 0;
 
     EditEngine& rEditEngine = const_cast< EditEngine& >( rOutliner.GetEditEngine() );
-    USHORT nParaCount = rEditEngine.GetParagraphCount();
+    sal_uInt16 nParaCount = rEditEngine.GetParagraphCount();
     DBG_ASSERT( nPara < nParaCount, "paragraph index out of bounds" );
     if (/*0 <= nPara && */nPara < nParaCount)
     {
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 6ba232010390..a1b276153d64 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -137,8 +137,8 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
     if( NULL == pItem && pPool )
         pItem = &(pPool->GetDefaultItem( pMap->nWID ));
 
-    const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
-    BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
+    const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
+    sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
     if( eMapUnit == SFX_MAPUNIT_100TH_MM )
         nMemberId &= (~CONVERT_TWIPS);
 
@@ -199,7 +199,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
     {
         uno::Any aValue( rVal );
 
-        const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
+        const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
 
         // check for needed metric translation
         if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != SFX_MAPUNIT_100TH_MM )
@@ -210,7 +210,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
 
         pNewItem = pItem->Clone();
 
-        BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
+        sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
         if( eMapUnit == SFX_MAPUNIT_100TH_MM )
             nMemberId &= (~CONVERT_TWIPS);
 
@@ -234,8 +234,8 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
     // Noch kein UsrAny gemerkt, generiere Default-Eintrag und gib
     // diesen zurueck
 
-    const SfxMapUnit eMapUnit = mrItemPool.GetMetric((USHORT)pMap->nWID);
-    BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
+    const SfxMapUnit eMapUnit = mrItemPool.GetMetric((sal_uInt16)pMap->nWID);
+    sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
     if( eMapUnit == SFX_MAPUNIT_100TH_MM )
         nMemberId &= (~CONVERT_TWIPS);
 
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index e512bfe3d2fd..28a0eb64c570 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -548,7 +548,7 @@ com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCr
     }
     else
     {
-        SvxNumRule aDefaultRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , FALSE);
+        SvxNumRule aDefaultRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , sal_False);
         return new SvxUnoNumberingRules( aDefaultRule );
     }
 }
@@ -584,13 +584,13 @@ sal_Int16 SvxUnoNumberingRules::Compare( const Any& Any1, const Any& Any2 )
                 const SvxNumRule& rRule1 = pRule1->getNumRule();
                 const SvxNumRule& rRule2 = pRule2->getNumRule();
 
-                const USHORT nLevelCount1 = rRule1.GetLevelCount();
-                const USHORT nLevelCount2 = rRule2.GetLevelCount();
+                const sal_uInt16 nLevelCount1 = rRule1.GetLevelCount();
+                const sal_uInt16 nLevelCount2 = rRule2.GetLevelCount();
 
                 if( nLevelCount1 == 0 || nLevelCount2 == 0 )
                     return -1;
 
-                for( USHORT i = 0; (i < nLevelCount1) && (i < nLevelCount2); i++ )
+                for( sal_uInt16 i = 0; (i < nLevelCount1) && (i < nLevelCount2); i++ )
                 {
                     if( rRule1.GetLevel(i) != rRule2.GetLevel(i) )
                         return -1;
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index ec7e76b144c0..f62000e0d0f8 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -519,9 +519,9 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyNa
                 while( nPara <= nEndPara )
                 {
                     // we have a paragraph
-                    SfxItemSet aSet( pForwarder->GetParaAttribs( (USHORT)nPara ) );
+                    SfxItemSet aSet( pForwarder->GetParaAttribs( (sal_uInt16)nPara ) );
                     setPropertyValue( pMap, aValue, maSelection, aSet, aSet );
-                    pForwarder->SetParaAttribs( (USHORT)nPara, aSet );
+                    pForwarder->SetParaAttribs( (sal_uInt16)nPara, aSet );
                     nPara++;
                 }
             }
@@ -654,7 +654,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert
         {
             SfxItemSet* pAttribs = NULL;
             if( nPara != -1 )
-                pAttribs = pForwarder->GetParaAttribs( (USHORT)nPara ).Clone();
+                pAttribs = pForwarder->GetParaAttribs( (sal_uInt16)nPara ).Clone();
             else
                 pAttribs = pForwarder->GetAttribs( GetSelection() ).Clone();
 
@@ -863,7 +863,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rt
                 {
                     if( NULL == pNewParaSet )
                     {
-                        const SfxItemSet aSet( pForwarder->GetParaAttribs( (USHORT)nTempPara ) );
+                        const SfxItemSet aSet( pForwarder->GetParaAttribs( (sal_uInt16)nTempPara ) );
                         pOldParaSet = new SfxItemSet( aSet );
                         pNewParaSet = new SfxItemSet( *pOldParaSet->GetPool(), pOldParaSet->GetRanges() );
                     }
@@ -891,9 +891,9 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rt
             {
                 while( nTempPara <= nEndPara )
                 {
-                    SfxItemSet aSet( pForwarder->GetParaAttribs( (USHORT)nTempPara ) );
+                    SfxItemSet aSet( pForwarder->GetParaAttribs( (sal_uInt16)nTempPara ) );
                     aSet.Put( *pNewParaSet );
-                    pForwarder->SetParaAttribs( (USHORT)nTempPara, aSet );
+                    pForwarder->SetParaAttribs( (sal_uInt16)nTempPara, aSet );
                     nTempPara++;
                 }
                 bNeedsUpdate = sal_True;
@@ -939,7 +939,7 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons
     {
         SfxItemSet* pAttribs = NULL;
         if( nPara != -1 )
-            pAttribs = pForwarder->GetParaAttribs( (USHORT)nPara ).Clone();
+            pAttribs = pForwarder->GetParaAttribs( (sal_uInt16)nPara ).Clone();
         else
             pAttribs = pForwarder->GetAttribs( GetSelection() ).Clone();
 
@@ -1007,7 +1007,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
                     while( *pWhichId )
                     {
                         if(nPara != -1)
-                            eTempItemState = pForwarder->GetItemState( (USHORT)nPara, *pWhichId );
+                            eTempItemState = pForwarder->GetItemState( (sal_uInt16)nPara, *pWhichId );
                         else
                             eTempItemState = pForwarder->GetItemState( GetSelection(), *pWhichId );
 
@@ -1056,7 +1056,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
             if( nWID != 0 )
             {
                 if( nPara != -1 )
-                    eItemState = pForwarder->GetItemState( (USHORT)nPara, nWID );
+                    eItemState = pForwarder->GetItemState( (sal_uInt16)nPara, nWID );
                 else
                     eItemState = pForwarder->GetItemState( GetSelection(), nWID );
             }
@@ -1107,7 +1107,7 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co
         SfxItemSet* pSet = NULL;
         if( nPara != -1 )
         {
-            pSet = new SfxItemSet( pForwarder->GetParaAttribs( (USHORT)nPara ) );
+            pSet = new SfxItemSet( pForwarder->GetParaAttribs( (sal_uInt16)nPara ) );
         }
         else
         {
@@ -1255,7 +1255,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co
 {
     do
     {
-        SfxItemSet aSet( *pForwarder->GetPool(), TRUE );
+        SfxItemSet aSet( *pForwarder->GetPool(), sal_True );
 
         if( pMap->nWID == WID_FONTDESC )
         {
@@ -1281,7 +1281,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co
         }
 
         if(nPara != -1)
-            pForwarder->SetParaAttribs( (USHORT)nPara, aSet );
+            pForwarder->SetParaAttribs( (sal_uInt16)nPara, aSet );
         else
             pForwarder->QuickSetAttribs( aSet, GetSelection() );
 
@@ -2122,7 +2122,7 @@ void SvxPropertyValuesToItemSet(
         const uno::Sequence< beans::PropertyValue > rPropertyVaules,
         const SfxItemPropertySet *pPropSet,
         SvxTextForwarder *pForwarder /*needed for WID_NUMLEVEL*/,
-        USHORT nPara /*needed for WID_NUMLEVEL*/)
+        sal_uInt16 nPara /*needed for WID_NUMLEVEL*/)
     throw(lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     sal_Int32 nProps = rPropertyVaules.getLength();
@@ -2201,7 +2201,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendParagraph(
     SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
     if (pTextForwarder)
     {
-        USHORT nParaCount = pTextForwarder->GetParagraphCount();
+        sal_uInt16 nParaCount = pTextForwarder->GetParagraphCount();
         DBG_ASSERT( nParaCount > 0, "paragraph count is 0 or negative" );
         pTextForwarder->AppendParagraph();
 
@@ -2232,12 +2232,12 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph(
     SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
     if (pTextForwarder)
     {
-        USHORT nParaCount = pTextForwarder->GetParagraphCount();
+        sal_uInt16 nParaCount = pTextForwarder->GetParagraphCount();
         DBG_ASSERT( nParaCount > 0, "paragraph count is 0 or negative" );
         pTextForwarder->AppendParagraph();
 
         // set properties for the previously last paragraph
-        USHORT nPara = nParaCount - 1;
+        sal_uInt16 nPara = nParaCount - 1;
         ESelection aSel( nPara, 0, nPara, 0 );
         SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() );
         SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps,
@@ -2264,9 +2264,9 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
     uno::Reference< text::XTextRange > xRet;
     if (pTextForwarder)
     {
-        USHORT nParaCount = pTextForwarder->GetParagraphCount();
+        sal_uInt16 nParaCount = pTextForwarder->GetParagraphCount();
         DBG_ASSERT( nParaCount > 0, "paragraph count is 0 or negative" );
-        USHORT nPara = nParaCount - 1;
+        sal_uInt16 nPara = nParaCount - 1;
         SfxItemSet aSet( pTextForwarder->GetParaAttribs( nPara ) );
         xub_StrLen nStart = pTextForwarder->AppendTextPortion( nPara, rText, aSet );
         pEditSource->UpdateData();
@@ -2530,7 +2530,7 @@ String SvxDummyTextSource::GetText( const ESelection& ) const
     return String();
 }
 
-SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, BOOL ) const
+SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, sal_Bool ) const
 {
     // AW: Very dangerous: The former implementation used a SfxItemPool created on the
     // fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
@@ -2591,7 +2591,7 @@ XubString SvxDummyTextSource::CalcFieldValue( const SvxFieldItem&, sal_uInt16, s
     return XubString();
 }
 
-void SvxDummyTextSource::FieldClicked( const SvxFieldItem&, USHORT, xub_StrLen )
+void SvxDummyTextSource::FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen )
 {
 }
 
@@ -2604,32 +2604,32 @@ void SvxDummyTextSource::SetNotifyHdl( const Link& )
 {
 }
 
-LanguageType SvxDummyTextSource::GetLanguage( USHORT, USHORT ) const
+LanguageType SvxDummyTextSource::GetLanguage( sal_uInt16, sal_uInt16 ) const
 {
     return LANGUAGE_DONTKNOW;
 }
 
-USHORT SvxDummyTextSource::GetFieldCount( USHORT ) const
+sal_uInt16 SvxDummyTextSource::GetFieldCount( sal_uInt16 ) const
 {
     return 0;
 }
 
-EFieldInfo SvxDummyTextSource::GetFieldInfo( USHORT, USHORT ) const
+EFieldInfo SvxDummyTextSource::GetFieldInfo( sal_uInt16, sal_uInt16 ) const
 {
     return EFieldInfo();
 }
 
-EBulletInfo SvxDummyTextSource::GetBulletInfo( USHORT ) const
+EBulletInfo SvxDummyTextSource::GetBulletInfo( sal_uInt16 ) const
 {
     return EBulletInfo();
 }
 
-Rectangle SvxDummyTextSource::GetCharBounds( USHORT, USHORT ) const
+Rectangle SvxDummyTextSource::GetCharBounds( sal_uInt16, sal_uInt16 ) const
 {
     return Rectangle();
 }
 
-Rectangle SvxDummyTextSource::GetParaBounds( USHORT ) const
+Rectangle SvxDummyTextSource::GetParaBounds( sal_uInt16 ) const
 {
     return Rectangle();
 }
@@ -2644,52 +2644,52 @@ OutputDevice* SvxDummyTextSource::GetRefDevice() const
     return NULL;
 }
 
-sal_Bool SvxDummyTextSource::GetIndexAtPoint( const Point&, USHORT&, USHORT& ) const
+sal_Bool SvxDummyTextSource::GetIndexAtPoint( const Point&, sal_uInt16&, sal_uInt16& ) const
 {
     return sal_False;
 }
 
-sal_Bool SvxDummyTextSource::GetWordIndices( USHORT, USHORT, USHORT&, USHORT& ) const
+sal_Bool SvxDummyTextSource::GetWordIndices( sal_uInt16, sal_uInt16, sal_uInt16&, sal_uInt16& ) const
 {
     return sal_False;
 }
 
-sal_Bool SvxDummyTextSource::GetAttributeRun( USHORT&, USHORT&, USHORT, USHORT ) const
+sal_Bool SvxDummyTextSource::GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const
 {
     return sal_False;
 }
 
-USHORT SvxDummyTextSource::GetLineCount( USHORT ) const
+sal_uInt16 SvxDummyTextSource::GetLineCount( sal_uInt16 ) const
 {
     return 0;
 }
 
-USHORT SvxDummyTextSource::GetLineLen( USHORT, USHORT ) const
+sal_uInt16 SvxDummyTextSource::GetLineLen( sal_uInt16, sal_uInt16 ) const
 {
     return 0;
 }
 
-void SvxDummyTextSource::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT /*nParagraph*/, USHORT /*nLine*/ ) const
+void SvxDummyTextSource::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const
 {
     rStart = rEnd = 0;
 }
 
-USHORT SvxDummyTextSource::GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const
+sal_uInt16 SvxDummyTextSource::GetLineNumberAtIndex( sal_uInt16 /*nPara*/, sal_uInt16 /*nIndex*/ ) const
 {
     return 0;
 }
 
-sal_Bool SvxDummyTextSource::QuickFormatDoc( BOOL )
+sal_Bool SvxDummyTextSource::QuickFormatDoc( sal_Bool )
 {
     return sal_False;
 }
 
-sal_Int16 SvxDummyTextSource::GetDepth( USHORT ) const
+sal_Int16 SvxDummyTextSource::GetDepth( sal_uInt16 ) const
 {
     return -1;
 }
 
-sal_Bool SvxDummyTextSource::SetDepth( USHORT, sal_Int16 nNewDepth )
+sal_Bool SvxDummyTextSource::SetDepth( sal_uInt16, sal_Int16 nNewDepth )
 {
     return nNewDepth == 0 ? sal_True : sal_False;
 }
@@ -2713,7 +2713,7 @@ void SvxDummyTextSource::AppendParagraph()
 {
 }
 
-xub_StrLen SvxDummyTextSource::AppendTextPortion( USHORT, const String &, const SfxItemSet & )
+xub_StrLen SvxDummyTextSource::AppendTextPortion( sal_uInt16, const String &, const SfxItemSet & )
 {
     return 0;
 }
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 49258e327145..97895848b798 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -30,7 +30,7 @@
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uIt16S
 #include <svl/svstdarr.hxx>
 
 #include <rtl/uuid.h>
diff --git a/editeng/source/uno/unoviwed.cxx b/editeng/source/uno/unoviwed.cxx
index 8d203bf328bf..5a31863ff9cd 100644
--- a/editeng/source/uno/unoviwed.cxx
+++ b/editeng/source/uno/unoviwed.cxx
@@ -43,7 +43,7 @@ SvxEditEngineViewForwarder::~SvxEditEngineViewForwarder()
 {
 }
 
-BOOL SvxEditEngineViewForwarder::IsValid() const
+sal_Bool SvxEditEngineViewForwarder::IsValid() const
 {
     return sal_True;
 }
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 93ccacb05808..e70273d32290 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -56,7 +56,7 @@ Point SvxDrawOutlinerViewForwarder::GetTextOffset() const
     return aOutputRect.TopLeft() - maTextShapeTopLeft;
 }
 
-BOOL SvxDrawOutlinerViewForwarder::IsValid() const
+sal_Bool SvxDrawOutlinerViewForwarder::IsValid() const
 {
     return sal_True;
 }
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 6fb8f800b404..e7d0327c059e 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -450,7 +450,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
 
 /* testcode
             const OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
-            SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
+            SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, sal_True );
             aMedium.IsRemote();
             uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
 */
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index bad27e8444a5..6fa3e10a6436 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -67,10 +67,10 @@ using namespace xmloff::token;
 class SvxXMLTextImportContext : public SvXMLImportContext
 {
 public:
-    SvxXMLTextImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText );
+    SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText );
     virtual ~SvxXMLTextImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
 
 //  SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); }
 
@@ -80,7 +80,7 @@ private:
 
 ///////////////////////////////////////////////////////////////////////
 
-SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, const uno::Reference< XText >& xText )
+SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, const uno::Reference< XText >& xText )
 : SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText )
 {
 }
@@ -89,7 +89,7 @@ SvxXMLTextImportContext::~SvxXMLTextImportContext()
 {
 }
 
-SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
+SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
     if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
@@ -127,7 +127,7 @@ public:
 
     static sal_Bool load( const rtl::OUString& rUrl, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xTable ) throw();
 protected:
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
 
 private:
     const uno::Reference< XText > mxText;
@@ -190,7 +190,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
 
 /* testcode
             const OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
-            SfxMedium aMedium( aURL, STREAM_READ | STREAM_NOCREATE, TRUE );
+            SfxMedium aMedium( aURL, STREAM_READ | STREAM_NOCREATE, sal_True );
             aMedium.IsRemote();
             uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
 
@@ -244,7 +244,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
     }
 }
 
-SvXMLImportContext *SvxXMLXTextImportComponent::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
+SvXMLImportContext *SvxXMLXTextImportComponent::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
 {
     SvXMLImportContext* pContext;
     if(XML_NAMESPACE_OFFICE == nPrefix && ( IsXMLToken( rLocalName, XML_DOCUMENT ) || IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) ) )
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index ca11639fef33..e2f93ba4f38c 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -602,10 +602,10 @@ Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& F
 
     if ( pFiles )
     {
-        ULONG nCount = pFiles->Count();
+        sal_uIntPtr nCount = pFiles->Count();
         Sequence < rtl::OUString > aRet( nCount );
         rtl::OUString* pRet = aRet.getArray();
-        for ( USHORT i = 0; i < nCount; ++i )
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
             rtl::OUString* pFile = pFiles->GetObject(i);
             pRet[i] = *( pFile );
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 8d04084d64d8..75e163061ebe 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -64,7 +64,7 @@ struct FormulaArrayStack
 {
     FormulaArrayStack*  pNext;
     FormulaTokenArray*  pArr;
-    BOOL bTemp;
+    sal_Bool bTemp;
 };
 
 
@@ -99,7 +99,7 @@ public:
         ExternalHashMap       * mpExternalHashMap;         /// Hash map of ocExternal, Filter String -> AddIn String
         ExternalHashMap       * mpReverseExternalHashMap;  /// Hash map of ocExternal, AddIn String -> Filter String
         FormulaGrammar::Grammar meGrammar;                  /// Grammar, language and reference convention
-        USHORT                  mnSymbols;                  /// Count of OpCode symbols
+        sal_uInt16                  mnSymbols;                  /// Count of OpCode symbols
         bool                    mbCore      : 1;            /// If mapping was setup by core, not filters
         bool                    mbEnglish   : 1;            /// If English symbols and external names
 
@@ -109,7 +109,7 @@ public:
 
     public:
 
-        OpCodeMap(USHORT nSymbols, bool bCore, FormulaGrammar::Grammar eGrammar ) :
+        OpCodeMap(sal_uInt16 nSymbols, bool bCore, FormulaGrammar::Grammar eGrammar ) :
             mpHashMap( new OpCodeHashMap( nSymbols)),
             mpTable( new String[ nSymbols ]),
             mpExternalHashMap( new ExternalHashMap),
@@ -135,8 +135,8 @@ public:
         /// Get the symbol string matching an OpCode.
         inline const String& getSymbol( const OpCode eOp ) const
         {
-            DBG_ASSERT( USHORT(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
-            if (USHORT(eOp) < mnSymbols)
+            DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
+            if (sal_uInt16(eOp) < mnSymbols)
                 return mpTable[ eOp ];
             static String s_sEmpty;
             return s_sEmpty;
@@ -146,7 +146,7 @@ public:
         inline FormulaGrammar::Grammar getGrammar() const { return meGrammar; }
 
         /// Get the symbol count.
-        inline USHORT getSymbolCount() const { return mnSymbols; }
+        inline sal_uInt16 getSymbolCount() const { return mnSymbols; }
 
         /** Are these English symbols, as opposed to native language (which may
             be English as well)? */
@@ -216,23 +216,23 @@ public:
      */
     OpCode GetEnglishOpCode( const String& rName ) const;
 
-    void            SetCompileForFAP( BOOL bVal )
+    void            SetCompileForFAP( sal_Bool bVal )
                         { bCompileForFAP = bVal; bIgnoreErrors = bVal; }
 
-    static BOOL DeQuote( String& rStr );
+    static sal_Bool DeQuote( String& rStr );
 
     static const String&    GetNativeSymbol( OpCode eOp );
-    static  BOOL            IsMatrixFunction(OpCode _eOpCode);   // if a function _always_ returns a Matrix
+    static  sal_Bool            IsMatrixFunction(OpCode _eOpCode);   // if a function _always_ returns a Matrix
 
     short GetNumFormatType() const { return nNumFmt; }
-    BOOL  CompileTokenArray();
+    sal_Bool  CompileTokenArray();
 
     void CreateStringFromTokenArray( String& rFormula );
     void CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer );
     FormulaToken* CreateStringFromToken( String& rFormula, FormulaToken* pToken,
-                                    BOOL bAllowArrAdvance = FALSE );
+                                    sal_Bool bAllowArrAdvance = sal_False );
     FormulaToken* CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pToken,
-                                    BOOL bAllowArrAdvance = FALSE );
+                                    sal_Bool bAllowArrAdvance = sal_False );
 
     void AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal );
     void AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal );
@@ -243,18 +243,18 @@ public:
     inline  FormulaGrammar::Grammar   GetGrammar() const { return meGrammar; }
 
 protected:
-    virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
+    virtual String FindAddInFunction( const String& rUpperName, sal_Bool bLocalFirst ) const;
     virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
     virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, FormulaGrammar::Grammar _eGrammar ) const;
     virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const;
     virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const;
 
-    virtual void SetError(USHORT nError);
+    virtual void SetError(sal_uInt16 nError);
     virtual FormulaTokenRef ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, bool bReuseDoubleRef );
-    virtual BOOL HandleExternalReference(const FormulaToken& _aToken);
-    virtual BOOL HandleRange();
-    virtual BOOL HandleSingleRef();
-    virtual BOOL HandleDbData();
+    virtual sal_Bool HandleExternalReference(const FormulaToken& _aToken);
+    virtual sal_Bool HandleRange();
+    virtual sal_Bool HandleSingleRef();
+    virtual sal_Bool HandleDbData();
 
     virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP);
     virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
@@ -262,9 +262,9 @@ protected:
     virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
     virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
     virtual void LocalizeString( String& rName );   // modify rName - input: exact name
-    virtual BOOL IsImportingXML() const;
+    virtual sal_Bool IsImportingXML() const;
 
-    BOOL   GetToken();
+    sal_Bool   GetToken();
     OpCode NextToken();
     void PutCode( FormulaTokenRef& );
     void Factor();
@@ -281,7 +281,7 @@ protected:
     void NotLine();
     OpCode Expression();
     void PopTokenArray();
-    void PushTokenArray( FormulaTokenArray*, BOOL = FALSE );
+    void PushTokenArray( FormulaTokenArray*, sal_Bool = sal_False );
 
     bool MergeRangeReference( FormulaToken * * const pCode1, FormulaToken * const * const pCode2 );
 
@@ -301,25 +301,25 @@ protected:
     OpCode              eLastOp;
     short               nRecursion;                 // GetToken() recursions
     short               nNumFmt;                    // set during CompileTokenArray()
-    USHORT              pc;
+    sal_uInt16              pc;
 
     FormulaGrammar::Grammar
                         meGrammar;          // The grammar used, language plus convention.
 
-    BOOL                bAutoCorrect;               // whether to apply AutoCorrection
-    BOOL                bCorrected;                 // AutoCorrection was applied
-    BOOL                bCompileForFAP;             //! not real RPN but names, for FunctionAutoPilot,
+    sal_Bool                bAutoCorrect;               // whether to apply AutoCorrection
+    sal_Bool                bCorrected;                 // AutoCorrection was applied
+    sal_Bool                bCompileForFAP;             //! not real RPN but names, for FunctionAutoPilot,
                                                     // will not be resolved
-    BOOL                bIgnoreErrors;              // on AutoCorrect and CompileForFAP
+    sal_Bool                bIgnoreErrors;              // on AutoCorrect and CompileForFAP
                                                     // ignore errors and create RPN nevertheless
-    BOOL                glSubTotal;                 // if code contains one or more subtotal functions
+    sal_Bool                glSubTotal;                 // if code contains one or more subtotal functions
 private:
     void InitSymbolsNative() const;    /// only SymbolsNative, on first document creation
     void InitSymbolsEnglish() const;   /// only SymbolsEnglish, maybe later
     void InitSymbolsPODF() const;      /// only SymbolsPODF, on demand
     void InitSymbolsODFF() const;      /// only SymbolsODFF, on demand
 
-    void loadSymbols(USHORT _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const;
+    void loadSymbols(sal_uInt16 _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const;
 
     static inline void ForceArrayOperator( FormulaTokenRef& rCurr, const FormulaTokenRef& rPrev )
         {
diff --git a/formula/inc/formula/IControlReferenceHandler.hxx b/formula/inc/formula/IControlReferenceHandler.hxx
index 5b5a78b0467f..9248040e0bbc 100644
--- a/formula/inc/formula/IControlReferenceHandler.hxx
+++ b/formula/inc/formula/IControlReferenceHandler.hxx
@@ -37,7 +37,7 @@ namespace formula
     {
     public:
         virtual void ShowReference(const String& _sRef) = 0;
-        virtual void HideReference( BOOL bDoneRefMode = TRUE ) = 0;
+        virtual void HideReference( sal_Bool bDoneRefMode = sal_True ) = 0;
         virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
         virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
     };
diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index 8dd3a95ae067..f78c7c09c4af 100644
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -89,7 +89,7 @@ namespace formula
         // GetFormulaString
         virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const = 0;
         // GetVisibleArgMapping
-        virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const = 0;
+        virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const = 0;
         virtual void initArgumentInfo() const = 0;
         virtual ::rtl::OUString getSignature() const = 0;
         virtual rtl::OString getHelpId() const = 0;
@@ -117,7 +117,7 @@ namespace formula
     public:
         IStructHelper(){}
         virtual SvLBoxEntry*    InsertEntry(const XubString& rText, SvLBoxEntry* pParent,
-                                USHORT nFlag,ULONG nPos=0,IFormulaToken* pScToken=NULL) = 0;
+                                sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) = 0;
 
         virtual String          GetEntryText(SvLBoxEntry* pEntry) const = 0;
         virtual SvLBoxEntry*    GetParent(SvLBoxEntry* pEntry) const = 0;
@@ -152,9 +152,9 @@ namespace formula
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const = 0;
         virtual ::com::sun::star::table::CellAddress getReferencePosition() const = 0;
 
-        virtual void setDispatcherLock( BOOL bLock ) = 0;
-        virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked) = 0;
-        virtual void doClose(BOOL _bOk) = 0;
+        virtual void setDispatcherLock( sal_Bool bLock ) = 0;
+        virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked) = 0;
+        virtual void doClose(sal_Bool _bOk) = 0;
         virtual void insertEntryToLRUList(const IFunctionDescription*   pDesc) = 0;
         virtual void showReference(const String& _sFormula) = 0;
     };
diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx
index f08af17e095e..fe8382eced9b 100644
--- a/formula/inc/formula/errorcodes.hxx
+++ b/formula/inc/formula/errorcodes.hxx
@@ -34,60 +34,60 @@
 namespace ScErrorCodes
 {
 
-const USHORT errIllegalChar          = 501;
-const USHORT errIllegalArgument      = 502;
-const USHORT errIllegalFPOperation   = 503; // #NUM!
-const USHORT errIllegalParameter     = 504;
-const USHORT errIllegalJump          = 505;
-const USHORT errSeparator            = 506;
-const USHORT errPair                 = 507;
-const USHORT errPairExpected         = 508;
-const USHORT errOperatorExpected     = 509;
-const USHORT errVariableExpected     = 510;
-const USHORT errParameterExpected    = 511;
-const USHORT errCodeOverflow         = 512;
-const USHORT errStringOverflow       = 513;
-const USHORT errStackOverflow        = 514;
-const USHORT errUnknownState         = 515;
-const USHORT errUnknownVariable      = 516;
-const USHORT errUnknownOpCode        = 517;
-const USHORT errUnknownStackVariable = 518;
-const USHORT errNoValue              = 519; // #VALUE!
-const USHORT errUnknownToken         = 520;
-const USHORT errNoCode               = 521; // #NULL!
-const USHORT errCircularReference    = 522;
-const USHORT errNoConvergence        = 523;
-const USHORT errNoRef                = 524; // #REF!
-const USHORT errNoName               = 525; // #NAME?
-const USHORT errDoubleRef            = 526;
-const USHORT errInterpOverflow       = 527;
+const sal_uInt16 errIllegalChar          = 501;
+const sal_uInt16 errIllegalArgument      = 502;
+const sal_uInt16 errIllegalFPOperation   = 503; // #NUM!
+const sal_uInt16 errIllegalParameter     = 504;
+const sal_uInt16 errIllegalJump          = 505;
+const sal_uInt16 errSeparator            = 506;
+const sal_uInt16 errPair                 = 507;
+const sal_uInt16 errPairExpected         = 508;
+const sal_uInt16 errOperatorExpected     = 509;
+const sal_uInt16 errVariableExpected     = 510;
+const sal_uInt16 errParameterExpected    = 511;
+const sal_uInt16 errCodeOverflow         = 512;
+const sal_uInt16 errStringOverflow       = 513;
+const sal_uInt16 errStackOverflow        = 514;
+const sal_uInt16 errUnknownState         = 515;
+const sal_uInt16 errUnknownVariable      = 516;
+const sal_uInt16 errUnknownOpCode        = 517;
+const sal_uInt16 errUnknownStackVariable = 518;
+const sal_uInt16 errNoValue              = 519; // #VALUE!
+const sal_uInt16 errUnknownToken         = 520;
+const sal_uInt16 errNoCode               = 521; // #NULL!
+const sal_uInt16 errCircularReference    = 522;
+const sal_uInt16 errNoConvergence        = 523;
+const sal_uInt16 errNoRef                = 524; // #REF!
+const sal_uInt16 errNoName               = 525; // #NAME?
+const sal_uInt16 errDoubleRef            = 526;
+const sal_uInt16 errInterpOverflow       = 527;
 // Not displayed, temporary for TrackFormulas,
 // Cell depends on another cell that has errCircularReference
-const USHORT errTrackFromCircRef     = 528;
+const sal_uInt16 errTrackFromCircRef     = 528;
 // ScInterpreter internal:  no numeric value but numeric queried. If this is
 // set as mnStringNoValueError no error is generated but 0 returned.
-const USHORT errCellNoValue          = 529;
+const sal_uInt16 errCellNoValue          = 529;
 // Interpreter: needed AddIn not found
-const USHORT errNoAddin              = 530;
+const sal_uInt16 errNoAddin              = 530;
 // Interpreter: needed Macro not found
-const USHORT errNoMacro              = 531;
+const sal_uInt16 errNoMacro              = 531;
 // Interpreter: Division by zero
-const USHORT errDivisionByZero       = 532; // #DIV/0!
+const sal_uInt16 errDivisionByZero       = 532; // #DIV/0!
 // Compiler: a non-simple (str,err,val) value was put in an array
-const USHORT errNestedArray          = 533;
+const sal_uInt16 errNestedArray          = 533;
 // ScInterpreter internal:  no numeric value but numeric queried. If this is
 // temporarily (!) set as mnStringNoValueError, the error is generated and can
 // be used to distinguish that condition from all other (inherited) errors. Do
 // not use for anything else! Never push or inherit the error otherwise!
-const USHORT errNotNumericString     = 534;
+const sal_uInt16 errNotNumericString     = 534;
 
 // Interpreter: NA() not available condition, not a real error
-const USHORT NOTAVAILABLE            = 0x7fff;
+const sal_uInt16 NOTAVAILABLE            = 0x7fff;
 
 
 /** Unconditionally construct a double value of NAN where the lower bits
     represent an interpreter error code. */
-inline double CreateDoubleError( USHORT nErr )
+inline double CreateDoubleError( sal_uInt16 nErr )
 {
     union
     {
@@ -101,17 +101,17 @@ inline double CreateDoubleError( USHORT nErr )
 
 
 /** Recreate the error code of a coded double error, if any. */
-inline USHORT GetDoubleErrorValue( double fVal )
+inline sal_uInt16 GetDoubleErrorValue( double fVal )
 {
     if ( ::rtl::math::isFinite( fVal ) )
         return 0;
     if ( ::rtl::math::isInf( fVal ) )
         return errIllegalFPOperation;       // normal INF
-    UINT32 nErr = reinterpret_cast< sal_math_Double * >(
+    sal_uInt32 nErr = reinterpret_cast< sal_math_Double * >(
             &fVal)->nan_parts.fraction_lo;
     if ( nErr & 0xffff0000 )
         return errNoValue;                  // just a normal NAN
-    return (USHORT)(nErr & 0x0000ffff);     // any other error
+    return (sal_uInt16)(nErr & 0x0000ffff);     // any other error
 }
 
 } // namespace ScErrorCodes
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 0db3492a9519..8be0bea12c87 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -43,27 +43,27 @@ public:
 
     virtual void            SaveValues();
     void                    RestoreValues();
-    BOOL                    HasParent() const   { return pParent != NULL; }
+    sal_Bool                    HasParent() const   { return pParent != NULL; }
 
-    inline USHORT           GetMode() const     { return nMode; }
+    inline sal_uInt16           GetMode() const     { return nMode; }
     inline xub_StrLen       GetFStart() const   { return nFStart; }
-    inline USHORT           GetCatSel() const   { return nCatSel; }
-    inline USHORT           GetFuncSel() const  { return nFuncSel; }
-    inline USHORT           GetOffset() const   { return nOffset; }
-    inline USHORT           GetEdFocus() const  { return nEdFocus; }
+    inline sal_uInt16           GetCatSel() const   { return nCatSel; }
+    inline sal_uInt16           GetFuncSel() const  { return nFuncSel; }
+    inline sal_uInt16           GetOffset() const   { return nOffset; }
+    inline sal_uInt16           GetEdFocus() const  { return nEdFocus; }
     inline const String&    GetUndoStr() const  { return aUndoStr; }
-    inline BOOL             GetMatrixFlag()const{ return bMatrix;}
+    inline sal_Bool             GetMatrixFlag()const{ return bMatrix;}
     inline rtl::OString     GetUniqueId()const  { return aUniqueId;}
     inline const Selection& GetSelection()const { return aSelection;}
 
-    inline void             SetMode( USHORT nNew )                  { nMode = nNew; }
+    inline void             SetMode( sal_uInt16 nNew )                  { nMode = nNew; }
     inline void             SetFStart( xub_StrLen nNew )            { nFStart = nNew; }
-    inline void             SetCatSel( USHORT nNew )                { nCatSel = nNew; }
-    inline void             SetFuncSel( USHORT nNew )               { nFuncSel = nNew; }
-    inline void             SetOffset( USHORT nNew )                { nOffset = nNew; }
-    inline void             SetEdFocus( USHORT nNew )               { nEdFocus = nNew; }
+    inline void             SetCatSel( sal_uInt16 nNew )                { nCatSel = nNew; }
+    inline void             SetFuncSel( sal_uInt16 nNew )               { nFuncSel = nNew; }
+    inline void             SetOffset( sal_uInt16 nNew )                { nOffset = nNew; }
+    inline void             SetEdFocus( sal_uInt16 nNew )               { nEdFocus = nNew; }
     inline void             SetUndoStr( const String& rNew )        { aUndoStr = rNew; }
-    inline void             SetMatrixFlag(BOOL bNew)                { bMatrix=bNew;}
+    inline void             SetMatrixFlag(sal_Bool bNew)                { bMatrix=bNew;}
     inline void             SetUniqueId(const rtl::OString nNew)    { aUniqueId=nNew;}
     inline void             SetSelection(const Selection& aSel)     { aSelection=aSel;}
 protected:
@@ -73,14 +73,14 @@ protected:
 
     FormEditData*   pParent;            // fuer Verschachtelung
 private:
-    USHORT              nMode;              // enum ScFormulaDlgMode
+    sal_uInt16              nMode;              // enum ScFormulaDlgMode
     xub_StrLen          nFStart;
-    USHORT              nCatSel;
-    USHORT              nFuncSel;
-    USHORT              nOffset;
-    USHORT              nEdFocus;
+    sal_uInt16              nCatSel;
+    sal_uInt16              nFuncSel;
+    sal_uInt16              nOffset;
+    sal_uInt16              nEdFocus;
     String              aUndoStr;
-    BOOL                bMatrix;
+    sal_Bool                bMatrix;
     rtl::OString        aUniqueId;
     Selection           aSelection;
 };
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index c12501f61103..700c9043a02d 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -79,22 +79,22 @@ protected:
     virtual long    PreNotify( NotifyEvent& rNEvt );
     ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
     void            RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
-    void            RefInputDoneAfter( BOOL bForced = FALSE );
+    void            RefInputDoneAfter( sal_Bool bForced = sal_False );
     rtl::OString    FindFocusWin(Window *pWin);
     void            SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
     void            HighlightFunctionParas(const String& aFormula);
 
     void            SetMeText(const String& _sText);
-    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
     void            Update();
-    BOOL            CheckMatrix(String& aFormula /*IN/OUT*/);
+    sal_Bool            CheckMatrix(String& aFormula /*IN/OUT*/);
     String          GetMeText() const;
     void            Update(const String& _sExp);
     void            CheckMatrix();
-    void            DoEnter(BOOL _bOk);
-    BOOL            isUserMatrix() const;
+    void            DoEnter(sal_Bool _bOk);
+    sal_Bool            isUserMatrix() const;
     const IFunctionDescription* getCurrentFunctionDescription() const;
-    BOOL            UpdateParaWin(Selection& _rSelection);
+    sal_Bool            UpdateParaWin(Selection& _rSelection);
     void            UpdateParaWin(const Selection& _rSelection,const String& _sRefStr);
     RefEdit*        GetActiveEdit();
     void            SetEdSelection();
@@ -128,22 +128,22 @@ protected:
     virtual long    PreNotify( NotifyEvent& rNEvt );
     ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
     void            RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
-    void            RefInputDoneAfter( BOOL bForced = FALSE );
+    void            RefInputDoneAfter( sal_Bool bForced = sal_False );
     rtl::OString    FindFocusWin(Window *pWin);
     void            SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
     void            HighlightFunctionParas(const String& aFormula);
 
     void            SetMeText(const String& _sText);
-    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
     void            Update();
-    BOOL            CheckMatrix(String& aFormula /*IN/OUT*/);
+    sal_Bool            CheckMatrix(String& aFormula /*IN/OUT*/);
     String          GetMeText() const;
     void            Update(const String& _sExp);
     void            CheckMatrix();
-    void            DoEnter(BOOL _bOk);
-    BOOL            isUserMatrix() const;
+    void            DoEnter(sal_Bool _bOk);
+    sal_Bool            isUserMatrix() const;
     const IFunctionDescription* getCurrentFunctionDescription() const;
-    BOOL            UpdateParaWin(Selection& _rSelection);
+    sal_Bool            UpdateParaWin(Selection& _rSelection);
     void            UpdateParaWin(const Selection& _rSelection,const String& _sRefStr);
     RefEdit*        GetActiveEdit();
     void            SetEdSelection();
diff --git a/formula/inc/formula/formulahelper.hxx b/formula/inc/formula/formulahelper.hxx
index 54cf27277681..e4eae7cf5de4 100644
--- a/formula/inc/formula/formulahelper.hxx
+++ b/formula/inc/formula/formulahelper.hxx
@@ -54,29 +54,29 @@ namespace formula
 
         inline const CharClass* GetCharClass() const { return m_pCharClass; }
 
-        BOOL                GetNextFunc( const String&  rFormula,
-                                                 BOOL           bBack,
+        sal_Bool                GetNextFunc( const String&  rFormula,
+                                                 sal_Bool           bBack,
                                                  xub_StrLen&    rFStart, // Ein- und Ausgabe
                                                  xub_StrLen*    pFEnd = NULL,
                                                  const IFunctionDescription** ppFDesc = NULL,
                                                  ::std::vector< ::rtl::OUString>*      pArgs = NULL ) const;
 
         xub_StrLen          GetFunctionStart( const String& rFormula, xub_StrLen nStart,
-                                                        BOOL bBack, String* pFuncName = NULL ) const;
+                                                        sal_Bool bBack, String* pFuncName = NULL ) const;
 
         xub_StrLen          GetFunctionEnd  ( const String& rFormula, xub_StrLen nStart ) const;
 
         xub_StrLen          GetArgStart     ( const String& rFormula, xub_StrLen nStart,
-                                                      USHORT nArg ) const;
+                                                      sal_uInt16 nArg ) const;
 
         void                GetArgStrings   ( ::std::vector< ::rtl::OUString >& _rArgs,
                                                       const String& rFormula,
                                                       xub_StrLen    nFuncPos,
-                                                      USHORT        nArgs ) const;
+                                                      sal_uInt16        nArgs ) const;
 
         void                FillArgStrings  ( const String& rFormula,
                                                       xub_StrLen    nFuncPos,
-                                                      USHORT        nArgs,
+                                                      sal_uInt16        nArgs,
                                                       ::std::vector< ::rtl::OUString >&      _rArgs ) const;
     };
 // =============================================================================
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index 05c765af50bb..b29982cc2be5 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -44,7 +44,7 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit
 private:
     Timer               aTimer;
     IControlReferenceHandler*      pAnyRefDlg;         // parent dialog
-    BOOL                bSilentFocus;       // for SilentGrabFocus()
+    sal_Bool                bSilentFocus;       // for SilentGrabFocus()
 
     DECL_LINK( UpdateHdl, Timer* );
 
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index 390ab21048d3..cfd3af767465 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -396,7 +396,7 @@ enum OpCodeEnum
 
 #ifndef DBG_UTIL
 // save memory since compilers tend to int an enum
-typedef USHORT OpCode;
+typedef sal_uInt16 OpCode;
 #else
 // have enum names in debugger
 typedef OpCodeEnum OpCode;
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index eafb2480af8e..30618c67381a 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -78,7 +78,7 @@ enum StackVarEnum
 
 #ifndef DBG_UTIL
 // save memory since compilers tend to int an enum
-typedef BYTE StackVar;
+typedef sal_uInt8 StackVar;
 #else
 // have enum names in debugger
 typedef StackVarEnum StackVar;
@@ -99,7 +99,7 @@ class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
 protected:
 
             const StackVar      eType;          // type of data
-            mutable USHORT      nRefCnt;        // reference count
+            mutable sal_uInt16      nRefCnt;        // reference count
 
 public:
                                 FormulaToken( StackVar eTypeP,OpCode e = ocPush ) :
@@ -111,16 +111,16 @@ public:
 
     inline  void                Delete()                { delete this; }
     inline  StackVar            GetType() const         { return eType; }
-            BOOL                IsFunction() const; // pure functions, no operators
-            BOOL                IsMatrixFunction() const;   // if a function _always_ returns a Matrix
-            BYTE                GetParamCount() const;
+            sal_Bool                IsFunction() const; // pure functions, no operators
+            sal_Bool                IsMatrixFunction() const;   // if a function _always_ returns a Matrix
+            sal_uInt8                GetParamCount() const;
     inline  void                IncRef() const          { nRefCnt++; }
     inline  void                DecRef() const
                                     {
                                         if (!--nRefCnt)
                                             const_cast<FormulaToken*>(this)->Delete();
                                     }
-    inline  USHORT              GetRef() const          { return nRefCnt; }
+    inline  sal_uInt16              GetRef() const          { return nRefCnt; }
     inline OpCode               GetOpCode() const       { return eOp; }
 
     /**
@@ -138,26 +138,26 @@ public:
         Any other non-overloaded method pops up an assertion.
      */
 
-    virtual BYTE                GetByte() const;
-    virtual void                SetByte( BYTE n );
+    virtual sal_uInt8                GetByte() const;
+    virtual void                SetByte( sal_uInt8 n );
     virtual bool                HasForceArray() const;
     virtual void                SetForceArray( bool b );
     virtual double              GetDouble() const;
     virtual double&             GetDoubleAsReference();
     virtual const String&       GetString() const;
-    virtual USHORT              GetIndex() const;
-    virtual void                SetIndex( USHORT n );
+    virtual sal_uInt16              GetIndex() const;
+    virtual void                SetIndex( sal_uInt16 n );
     virtual short*              GetJump() const;
     virtual const String&       GetExternal() const;
     virtual FormulaToken*       GetFAPOrigToken() const;
-    virtual USHORT              GetError() const;
-    virtual void                SetError( USHORT );
+    virtual sal_uInt16              GetError() const;
+    virtual void                SetError( sal_uInt16 );
 
     virtual FormulaToken*       Clone() const { return new FormulaToken(*this); }
 
-    virtual BOOL                Is3DRef() const;    // reference with 3D flag set
-    virtual BOOL                TextEqual( const formula::FormulaToken& rToken ) const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                Is3DRef() const;    // reference with 3D flag set
+    virtual sal_Bool                TextEqual( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 
     virtual bool isFunction() const
     {
@@ -182,17 +182,17 @@ public:
 class FORMULA_DLLPUBLIC FormulaByteToken : public FormulaToken
 {
 private:
-            BYTE                nByte;
+            sal_uInt8                nByte;
             bool                bHasForceArray;
 protected:
-                                FormulaByteToken( OpCode e, BYTE n, StackVar v, bool b ) :
+                                FormulaByteToken( OpCode e, sal_uInt8 n, StackVar v, bool b ) :
                                     FormulaToken( v,e ), nByte( n ),
                                     bHasForceArray( b ) {}
 public:
-                                FormulaByteToken( OpCode e, BYTE n, bool b ) :
+                                FormulaByteToken( OpCode e, sal_uInt8 n, bool b ) :
                                     FormulaToken( svByte,e ), nByte( n ),
                                     bHasForceArray( b ) {}
-                                FormulaByteToken( OpCode e, BYTE n ) :
+                                FormulaByteToken( OpCode e, sal_uInt8 n ) :
                                     FormulaToken( svByte,e ), nByte( n ),
                                     bHasForceArray( false ) {}
                                 FormulaByteToken( OpCode e ) :
@@ -203,11 +203,11 @@ public:
                                     bHasForceArray( r.bHasForceArray ) {}
 
     virtual FormulaToken*       Clone() const { return new FormulaByteToken(*this); }
-    virtual BYTE                GetByte() const;
-    virtual void                SetByte( BYTE n );
+    virtual sal_uInt8                GetByte() const;
+    virtual void                SetByte( sal_uInt8 n );
     virtual bool                HasForceArray() const;
     virtual void                SetForceArray( bool b );
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 
     DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken )
 };
@@ -220,7 +220,7 @@ class FORMULA_DLLPUBLIC FormulaFAPToken : public FormulaByteToken
 private:
             FormulaTokenRef          pOrigToken;
 public:
-                                FormulaFAPToken( OpCode e, BYTE n, FormulaToken* p ) :
+                                FormulaFAPToken( OpCode e, sal_uInt8 n, FormulaToken* p ) :
                                     FormulaByteToken( e, n, svFAP, false ),
                                     pOrigToken( p ) {}
                                 FormulaFAPToken( const FormulaFAPToken& r ) :
@@ -228,7 +228,7 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaFAPToken(*this); }
     virtual FormulaToken*       GetFAPOrigToken() const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 class FORMULA_DLLPUBLIC FormulaDoubleToken : public FormulaToken
@@ -244,7 +244,7 @@ public:
     virtual FormulaToken*       Clone() const { return new FormulaDoubleToken(*this); }
     virtual double              GetDouble() const;
     virtual double&             GetDoubleAsReference();
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 
     DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken )
 };
@@ -262,14 +262,14 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaStringToken(*this); }
     virtual const String&       GetString() const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 
     DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken )
 };
 
 
 /** Identical to FormulaStringToken, but with explicit OpCode instead of implicit
-    ocPush, and an optional BYTE for ocBad tokens. */
+    ocPush, and an optional sal_uInt8 for ocBad tokens. */
 class FORMULA_DLLPUBLIC FormulaStringOpToken : public FormulaByteToken
 {
 private:
@@ -282,23 +282,23 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaStringOpToken(*this); }
     virtual const String&       GetString() const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken
 {
 private:
-            USHORT              nIndex;
+            sal_uInt16              nIndex;
 public:
-                                FormulaIndexToken( OpCode e, USHORT n ) :
+                                FormulaIndexToken( OpCode e, sal_uInt16 n ) :
                                     FormulaToken(  svIndex, e ), nIndex( n ) {}
                                 FormulaIndexToken( const FormulaIndexToken& r ) :
                                     FormulaToken( r ), nIndex( r.nIndex ) {}
 
     virtual FormulaToken*       Clone() const { return new FormulaIndexToken(*this); }
-    virtual USHORT              GetIndex() const;
-    virtual void                SetIndex( USHORT n );
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_uInt16              GetIndex() const;
+    virtual void                SetIndex( sal_uInt16 n );
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 
@@ -306,9 +306,9 @@ class FORMULA_DLLPUBLIC FormulaExternalToken : public FormulaToken
 {
 private:
             String              aExternal;
-            BYTE                nByte;
+            sal_uInt8                nByte;
 public:
-                                FormulaExternalToken( OpCode e, BYTE n, const String& r ) :
+                                FormulaExternalToken( OpCode e, sal_uInt8 n, const String& r ) :
                                     FormulaToken( svExternal, e ), aExternal( r ),
                                     nByte( n ) {}
                                 FormulaExternalToken( OpCode e, const String& r ) :
@@ -320,9 +320,9 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaExternalToken(*this); }
     virtual const String&       GetExternal() const;
-    virtual BYTE                GetByte() const;
-    virtual void                SetByte( BYTE n );
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_uInt8                GetByte() const;
+    virtual void                SetByte( sal_uInt8 n );
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 
@@ -337,7 +337,7 @@ public:
     virtual FormulaToken*       Clone() const { return new FormulaMissingToken(*this); }
     virtual double              GetDouble() const;
     virtual const String&       GetString() const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken
@@ -359,7 +359,7 @@ public:
                                 }
     virtual                     ~FormulaJumpToken();
     virtual short*              GetJump() const;
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new FormulaJumpToken(*this); }
 };
 
@@ -373,23 +373,23 @@ public:
                                     FormulaToken( r ) {}
 
     virtual FormulaToken*       Clone() const { return new FormulaUnknownToken(*this); }
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 
 class FORMULA_DLLPUBLIC FormulaErrorToken : public FormulaToken
 {
-            USHORT              nError;
+            sal_uInt16              nError;
 public:
-                                FormulaErrorToken( USHORT nErr ) :
+                                FormulaErrorToken( sal_uInt16 nErr ) :
                                     FormulaToken( svError ), nError( nErr) {}
                                 FormulaErrorToken( const FormulaErrorToken& r ) :
                                     FormulaToken( r ), nError( r.nError) {}
 
     virtual FormulaToken*       Clone() const { return new FormulaErrorToken(*this); }
-    virtual USHORT              GetError() const;
-    virtual void                SetError( USHORT nErr );
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_uInt16              GetError() const;
+    virtual void                SetError( sal_uInt16 nErr );
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 // =============================================================================
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index fc379fc4bb05..31d780c81a79 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -40,7 +40,7 @@ namespace formula
 
 // RecalcMode access only via TokenArray SetRecalcMode / IsRecalcMode...
 
-typedef BYTE ScRecalcMode;
+typedef sal_uInt8 ScRecalcMode;
 // Only one of the exclusive bits can be set,
 // handled by TokenArray SetRecalcMode... methods
 #define RECALCMODE_NORMAL       0x01    // exclusive
@@ -73,13 +73,13 @@ class FORMULA_DLLPUBLIC FormulaTokenArray
 protected:
     FormulaToken**  pCode;                  // Token code array
     FormulaToken**  pRPN;                   // RPN array
-    USHORT          nLen;                   // Length of token array
-    USHORT          nRPN;                   // Length of RPN array
-    USHORT          nIndex;                 // Current step index
-    USHORT          nError;                 // Error code
+    sal_uInt16          nLen;                   // Length of token array
+    sal_uInt16          nRPN;                   // Length of RPN array
+    sal_uInt16          nIndex;                 // Current step index
+    sal_uInt16          nError;                 // Error code
     short           nRefs;                  // Count of cell references
     ScRecalcMode    nMode;                  // Flags to indicate when to recalc this code
-    BOOL            bHyperLink;             // If HYPERLINK() occurs in the formula.
+    sal_Bool            bHyperLink;             // If HYPERLINK() occurs in the formula.
 
 protected:
     void                    Assign( const FormulaTokenArray& );
@@ -116,7 +116,7 @@ public:
     FormulaToken* GetNextColRowName();
     FormulaToken* GetNextOpCodeRPN( OpCode );
     /// Peek at nIdx-1 if not out of bounds, decrements nIdx if successful. Returns NULL if not.
-    FormulaToken* PeekPrev( USHORT & nIdx );
+    FormulaToken* PeekPrev( sal_uInt16 & nIdx );
     FormulaToken* PeekNext();
     FormulaToken* PeekPrevNoSpaces();    /// Only after Reset/First/Next/Last/Prev!
     FormulaToken* PeekNextNoSpaces();    /// Only after Reset/First/Next/Last/Prev!
@@ -125,22 +125,22 @@ public:
     FormulaToken* LastRPN() { nIndex = nRPN; return PrevRPN(); }
     FormulaToken* PrevRPN();
 
-    BOOL    HasOpCode( OpCode ) const;
-    BOOL    HasOpCodeRPN( OpCode ) const;
+    sal_Bool    HasOpCode( OpCode ) const;
+    sal_Bool    HasOpCodeRPN( OpCode ) const;
     /// Token of type svIndex or opcode ocColRowName
-    BOOL    HasNameOrColRowName() const;
+    sal_Bool    HasNameOrColRowName() const;
 
     FormulaToken** GetArray() const  { return pCode; }
     FormulaToken** GetCode()  const  { return pRPN; }
-    USHORT    GetLen() const     { return nLen; }
-    USHORT    GetCodeLen() const { return nRPN; }
+    sal_uInt16    GetLen() const     { return nLen; }
+    sal_uInt16    GetCodeLen() const { return nRPN; }
     void      Reset()            { nIndex = 0; }
-    USHORT    GetCodeError() const      { return nError; }
-    void      SetCodeError( USHORT n )  { nError = n; }
+    sal_uInt16    GetCodeError() const      { return nError; }
+    void      SetCodeError( sal_uInt16 n )  { nError = n; }
     short     GetRefs()  const { return nRefs;  }
     void      IncrementRefs() { ++nRefs; }
-    void      SetHyperLink( BOOL bVal ) { bHyperLink = bVal; }
-    BOOL      IsHyperLink() const       { return bHyperLink; }
+    void      SetHyperLink( sal_Bool bVal ) { bHyperLink = bVal; }
+    sal_Bool      IsHyperLink() const       { return bHyperLink; }
 
     inline  ScRecalcMode    GetRecalcMode() const { return nMode; }
                             /** Bits aren't set directly but validated and
@@ -165,17 +165,17 @@ public:
                                 { nMode |= RECALCMODE_ONREFMOVE; }
     inline  void            ClearRecalcModeOnRefMove()
                                 { nMode &= ~RECALCMODE_ONREFMOVE; }
-    inline  BOOL            IsRecalcModeNormal() const
+    inline  sal_Bool            IsRecalcModeNormal() const
                                 { return (nMode & RECALCMODE_NORMAL) != 0; }
-    inline  BOOL            IsRecalcModeAlways() const
+    inline  sal_Bool            IsRecalcModeAlways() const
                                 { return (nMode & RECALCMODE_ALWAYS) != 0; }
-    inline  BOOL            IsRecalcModeOnLoad() const
+    inline  sal_Bool            IsRecalcModeOnLoad() const
                                 { return (nMode & RECALCMODE_ONLOAD) != 0; }
-    inline  BOOL            IsRecalcModeOnLoadOnce() const
+    inline  sal_Bool            IsRecalcModeOnLoadOnce() const
                                 { return (nMode & RECALCMODE_ONLOAD_ONCE) != 0; }
-    inline  BOOL            IsRecalcModeForced() const
+    inline  sal_Bool            IsRecalcModeForced() const
                                 { return (nMode & RECALCMODE_FORCED) != 0; }
-    inline  BOOL            IsRecalcModeOnRefMove() const
+    inline  sal_Bool            IsRecalcModeOnRefMove() const
                                 { return (nMode & RECALCMODE_ONREFMOVE) != 0; }
 
                             /** Get OpCode of the most outer function */
@@ -183,7 +183,7 @@ public:
 
                             /** Operators +,-,*,/,^,&,=,<>,<,>,<=,>=
                                 with DoubleRef in Formula? */
-    BOOL                    HasMatrixDoubleRefOps();
+    sal_Bool                    HasMatrixDoubleRefOps();
 
     virtual FormulaToken* AddOpCode(OpCode e);
 
@@ -204,7 +204,7 @@ public:
     FormulaToken* AddString( const sal_Unicode* pStr );
     FormulaToken* AddString( const String& rStr );
     FormulaToken* AddDouble( double fVal );
-    FormulaToken* AddName( USHORT n );
+    FormulaToken* AddName( sal_uInt16 n );
     FormulaToken* AddExternal( const sal_Unicode* pStr );
     /** Xcl import may play dirty tricks with OpCode!=ocExternal.
         Others don't use! */
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 2010679907d2..81378bf8ae0c 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -132,7 +132,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
     return NUMBERFORMAT_NUMBER;
 }
 
-inline void lclPushOpCodeMapEntry( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, USHORT nOpCode )
+inline void lclPushOpCodeMapEntry( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, sal_uInt16 nOpCode )
 {
     sheet::FormulaOpCodeMapEntry aEntry;
     aEntry.Token.OpCode = nOpCode;
@@ -140,15 +140,15 @@ inline void lclPushOpCodeMapEntry( ::std::vector< sheet::FormulaOpCodeMapEntry >
     rVec.push_back( aEntry);
 }
 
-void lclPushOpCodeMapEntries( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, USHORT nOpCodeBeg, USHORT nOpCodeEnd )
+void lclPushOpCodeMapEntries( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, sal_uInt16 nOpCodeBeg, sal_uInt16 nOpCodeEnd )
 {
-    for (USHORT nOpCode = nOpCodeBeg; nOpCode < nOpCodeEnd; ++nOpCode)
+    for (sal_uInt16 nOpCode = nOpCodeBeg; nOpCode < nOpCodeEnd; ++nOpCode)
         lclPushOpCodeMapEntry( rVec, pTable, nOpCode );
 }
 
-void lclPushOpCodeMapEntries( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, const USHORT* pnOpCodes, size_t nCount )
+void lclPushOpCodeMapEntries( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, const sal_uInt16* pnOpCodes, size_t nCount )
 {
-    for (const USHORT* pnEnd = pnOpCodes + nCount; pnOpCodes < pnEnd; ++pnOpCodes)
+    for (const sal_uInt16* pnEnd = pnOpCodes + nCount; pnOpCodes < pnEnd; ++pnOpCodes)
         lclPushOpCodeMapEntry( rVec, pTable, *pnOpCodes );
 }
 
@@ -156,11 +156,11 @@ class OpCodeList : public Resource        // temp object for resource
 {
 public:
 
-    OpCodeList( USHORT, FormulaCompiler::NonConstOpCodeMapPtr );
+    OpCodeList( sal_uInt16, FormulaCompiler::NonConstOpCodeMapPtr );
 
 private:
-    bool getOpCodeString( String& rStr, USHORT nOp );
-    void putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, USHORT nOp );
+    bool getOpCodeString( String& rStr, sal_uInt16 nOp );
+    void putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, sal_uInt16 nOp );
 
 private:
     enum SeparatorType
@@ -171,11 +171,11 @@ private:
     SeparatorType meSepType;
 };
 
-OpCodeList::OpCodeList( USHORT nRID, FormulaCompiler::NonConstOpCodeMapPtr xMap ) :
+OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr xMap ) :
     Resource( ResId(nRID,*ResourceManager::getResManager()) )
     ,meSepType(SEMICOLON_BASE)
 {
-     for (USHORT i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i)
+     for (sal_uInt16 i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i)
     {
         String aOpStr;
         if ( getOpCodeString(aOpStr, i) )
@@ -187,7 +187,7 @@ OpCodeList::OpCodeList( USHORT nRID, FormulaCompiler::NonConstOpCodeMapPtr xMap
     FreeResource();
 }
 
-bool OpCodeList::getOpCodeString( String& rStr, USHORT nOp )
+bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
 {
     switch (nOp)
     {
@@ -238,7 +238,7 @@ bool OpCodeList::getOpCodeString( String& rStr, USHORT nOp )
     return false;
 }
 
-void OpCodeList::putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, USHORT nOp )
+void OpCodeList::putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, sal_uInt16 nOp )
 {
     ResId aRes(nOp,*ResourceManager::getResManager());
     aRes.SetRT(RSC_STRING);
@@ -301,7 +301,7 @@ uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceO
                 // interest.
             }
             if (!aIntName.getLength())
-                aIntName = _rCompiler.FindAddInFunction(*pName, !isEnglish());    // bLocalFirst=FALSE for english
+                aIntName = _rCompiler.FindAddInFunction(*pName, !isEnglish());    // bLocalFirst=sal_False for english
             if (!aIntName.getLength())
                 pToken->OpCode = getOpCodeUnknown();
             else
@@ -380,7 +380,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
         // Anything else but SPECIAL.
         if ((nGroups & FormulaMapGroup::SEPARATORS) != 0)
         {
-            static const USHORT aOpCodes[] = {
+            static const sal_uInt16 aOpCodes[] = {
                 SC_OPCODE_OPEN,
                 SC_OPCODE_CLOSE,
                 SC_OPCODE_SEP,
@@ -389,7 +389,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
         }
         if ((nGroups & FormulaMapGroup::ARRAY_SEPARATORS) != 0)
         {
-            static const USHORT aOpCodes[] = {
+            static const sal_uInt16 aOpCodes[] = {
                 SC_OPCODE_ARRAY_OPEN,
                 SC_OPCODE_ARRAY_CLOSE,
                 SC_OPCODE_ARRAY_ROW_SEP,
@@ -406,7 +406,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
             if ((nGroups & FormulaMapGroup::BINARY_OPERATORS) == 0)
                 lclPushOpCodeMapEntry( aVec, mpTable, ocAdd );
             // regular unary operators
-            for (USHORT nOp = SC_OPCODE_START_UN_OP; nOp < SC_OPCODE_STOP_UN_OP && nOp < mnSymbols; ++nOp)
+            for (sal_uInt16 nOp = SC_OPCODE_START_UN_OP; nOp < SC_OPCODE_STOP_UN_OP && nOp < mnSymbols; ++nOp)
             {
                 switch (nOp)
                 {
@@ -422,7 +422,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
         }
         if ((nGroups & FormulaMapGroup::BINARY_OPERATORS) != 0)
         {
-            for (USHORT nOp = SC_OPCODE_START_BIN_OP; nOp < SC_OPCODE_STOP_BIN_OP && nOp < mnSymbols; ++nOp)
+            for (sal_uInt16 nOp = SC_OPCODE_START_BIN_OP; nOp < SC_OPCODE_STOP_BIN_OP && nOp < mnSymbols; ++nOp)
             {
                 switch (nOp)
                 {
@@ -440,10 +440,10 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
         {
             // Function names are not consecutive, skip the gaps between
             // functions with no parameter, functions with 1 parameter
-            lclPushOpCodeMapEntries( aVec, mpTable, SC_OPCODE_START_NO_PAR, ::std::min< USHORT >( SC_OPCODE_STOP_NO_PAR, mnSymbols ) );
-            lclPushOpCodeMapEntries( aVec, mpTable, SC_OPCODE_START_1_PAR, ::std::min< USHORT >( SC_OPCODE_STOP_1_PAR, mnSymbols ) );
+            lclPushOpCodeMapEntries( aVec, mpTable, SC_OPCODE_START_NO_PAR, ::std::min< sal_uInt16 >( SC_OPCODE_STOP_NO_PAR, mnSymbols ) );
+            lclPushOpCodeMapEntries( aVec, mpTable, SC_OPCODE_START_1_PAR, ::std::min< sal_uInt16 >( SC_OPCODE_STOP_1_PAR, mnSymbols ) );
             // Additional functions not within range of functions.
-            static const USHORT aOpCodes[] = {
+            static const sal_uInt16 aOpCodes[] = {
                 SC_OPCODE_IF,
                 SC_OPCODE_CHOSE,
                 SC_OPCODE_AND,
@@ -453,7 +453,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
             };
             lclPushOpCodeMapEntries( aVec, mpTable, aOpCodes, sizeof(aOpCodes)/sizeof(aOpCodes[0]) );
             // functions with 2 or more parameters.
-            for (USHORT nOp = SC_OPCODE_START_2_PAR; nOp < SC_OPCODE_STOP_2_PAR && nOp < mnSymbols; ++nOp)
+            for (sal_uInt16 nOp = SC_OPCODE_START_2_PAR; nOp < SC_OPCODE_STOP_2_PAR && nOp < mnSymbols; ++nOp)
             {
                 switch (nOp)
                 {
@@ -490,8 +490,8 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
 
 void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eOp )
 {
-    DBG_ASSERT( 0 < eOp && USHORT(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range");
-    if (0 < eOp && USHORT(eOp) < mnSymbols)
+    DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range");
+    if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
     {
         DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) || (eOp == ocCurrency),
             ByteString( "OpCodeMap::putOpCode: reusing OpCode ").
@@ -513,10 +513,10 @@ FormulaCompiler::FormulaCompiler(FormulaTokenArray& _rArr)
         nRecursion(0),
         nNumFmt( NUMBERFORMAT_UNDEFINED ),
         meGrammar( formula::FormulaGrammar::GRAM_UNSPECIFIED ),
-        bAutoCorrect( FALSE ),
-        bCorrected( FALSE ),
-        bCompileForFAP( FALSE ),
-        bIgnoreErrors( FALSE )
+        bAutoCorrect( sal_False ),
+        bCorrected( sal_False ),
+        bCompileForFAP( sal_False ),
+        bIgnoreErrors( sal_False )
 
 {
     DBG_CTOR(FormulaCompiler,NULL);
@@ -529,10 +529,10 @@ FormulaCompiler::FormulaCompiler()
         nRecursion(0),
         nNumFmt( NUMBERFORMAT_UNDEFINED ),
         meGrammar( formula::FormulaGrammar::GRAM_UNSPECIFIED ),
-        bAutoCorrect( FALSE ),
-        bCorrected( FALSE ),
-        bCompileForFAP( FALSE ),
-        bIgnoreErrors( FALSE )
+        bAutoCorrect( sal_False ),
+        bCorrected( sal_False ),
+        bCompileForFAP( sal_False ),
+        bIgnoreErrors( sal_False )
 
 {
     DBG_CTOR(FormulaCompiler,NULL);
@@ -575,7 +575,7 @@ FormulaCompiler::OpCodeMapPtr FormulaCompiler::GetOpCodeMap( const sal_Int32 nLa
 }
 // -----------------------------------------------------------------------------
 
-String FormulaCompiler::FindAddInFunction( const String& /*rUpperName*/, BOOL /*bLocalFirst*/ ) const
+String FormulaCompiler::FindAddInFunction( const String& /*rUpperName*/, sal_Bool /*bLocalFirst*/ ) const
 {
     return String();
 }
@@ -681,7 +681,7 @@ void FormulaCompiler::InitSymbolsODFF() const
     mxSymbolsODFF = s_sSymbol;
 }
 // -----------------------------------------------------------------------------
-void FormulaCompiler::loadSymbols(USHORT _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const
+void FormulaCompiler::loadSymbols(sal_uInt16 _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const
 {
     if ( !_xMap.get() )
     {
@@ -721,7 +721,7 @@ OpCode FormulaCompiler::GetEnglishOpCode( const String& rName ) const
 }
 
 // Remove quotes, escaped quotes are unescaped.
-BOOL FormulaCompiler::DeQuote( String& rStr )
+sal_Bool FormulaCompiler::DeQuote( String& rStr )
 {
     xub_StrLen nLen = rStr.Len();
     if ( nLen > 1 && rStr.GetChar(0) == '\'' && rStr.GetChar( nLen-1 ) == '\'' )
@@ -734,16 +734,16 @@ BOOL FormulaCompiler::DeQuote( String& rStr )
             rStr.Erase( nPos, 1 );
             ++nPos;
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 // -----------------------------------------------------------------------------
 void FormulaCompiler::fillAddInToken(::std::vector< sheet::FormulaOpCodeMapEntry >& /*_rVec*/,bool /*_bIsEnglish*/) const
 {
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::IsMatrixFunction(OpCode _eOpCode)
+sal_Bool FormulaCompiler::IsMatrixFunction(OpCode _eOpCode)
 {
     switch ( _eOpCode )
     {
@@ -757,13 +757,13 @@ BOOL FormulaCompiler::IsMatrixFunction(OpCode _eOpCode)
         case ocMatMult :
         case ocMatInv :
         case ocMatrixUnit :
-            return TRUE;
+            return sal_True;
         default:
         {
             // added to avoid warnings
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------------
@@ -781,7 +781,7 @@ sal_Int32 FormulaCompiler::OpCodeMap::getOpCodeUnknown()
     return kOpCodeUnknown;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::GetToken()
+sal_Bool FormulaCompiler::GetToken()
 {
     static const short nRecursionMax = 42;
     FormulaCompilerRecursionGuard aRecursionGuard( nRecursion );
@@ -789,16 +789,16 @@ BOOL FormulaCompiler::GetToken()
     {
         SetError( errStackOverflow );
         pToken = new FormulaByteToken( ocStop );
-        return FALSE;
+        return sal_False;
     }
     if ( bAutoCorrect && !pStack )
     {   // #61426# don't merge stacked subroutine code into entered formula
         aCorrectedFormula += aCorrectedSymbol;
         aCorrectedSymbol.Erase();
     }
-    BOOL bStop = FALSE;
+    sal_Bool bStop = sal_False;
     if( pArr->GetCodeError() && !bIgnoreErrors )
-        bStop = TRUE;
+        bStop = sal_True;
     else
     {
         short nWasColRowName;
@@ -813,11 +813,11 @@ BOOL FormulaCompiler::GetToken()
             if ( nWasColRowName )
                 nWasColRowName++;
             if ( bAutoCorrect && !pStack )
-                CreateStringFromToken( aCorrectedFormula, pToken, FALSE );
+                CreateStringFromToken( aCorrectedFormula, pToken, sal_False );
             pToken = pArr->Next();
         }
         if ( bAutoCorrect && !pStack && pToken )
-            CreateStringFromToken( aCorrectedSymbol, pToken, FALSE );
+            CreateStringFromToken( aCorrectedSymbol, pToken, sal_False );
         if( !pToken )
         {
             if( pStack )
@@ -826,7 +826,7 @@ BOOL FormulaCompiler::GetToken()
                 return GetToken();
             }
             else
-                bStop = TRUE;
+                bStop = sal_True;
         }
         else
         {
@@ -840,10 +840,10 @@ BOOL FormulaCompiler::GetToken()
     if( bStop )
     {
         pToken = new FormulaByteToken( ocStop );
-        return FALSE;
+        return sal_False;
     }
     if( pToken->GetOpCode() == ocSubTotal )
-        glSubTotal = TRUE;
+        glSubTotal = sal_True;
     else if ( pToken->GetOpCode() == ocExternalRef )
     {
         return HandleExternalReference(*pToken);
@@ -868,7 +868,7 @@ BOOL FormulaCompiler::GetToken()
     {
         pArr->nRefs++;
     }
-    return TRUE;
+    return sal_True;
 }
 //---------------------------------------------------------------------------
 // RPN creation by recursion
@@ -900,7 +900,7 @@ void FormulaCompiler::Factor()
             if ( bAutoCorrect && !pStack )
             {   // assume multiplication
                 aCorrectedFormula += mxSymbols->getSymbol(ocMul);
-                bCorrected = TRUE;
+                bCorrected = sal_True;
                 NextToken();
                 eOp = Expression();
                 if( eOp != ocClose )
@@ -970,7 +970,7 @@ void FormulaCompiler::Factor()
                 pArr->SetRecalcModeOnRefMove();
             break;
             case ocHyperLink :
-                pArr->SetHyperLink(TRUE);
+                pArr->SetHyperLink(sal_True);
             break;
             default:
                 ;   // nothing
@@ -1047,7 +1047,7 @@ void FormulaCompiler::Factor()
             }
             else
                 SetError(errPairExpected);
-            BYTE nSepCount = 0;
+            sal_uInt8 nSepCount = 0;
             if( !bNoParam )
             {
                 nSepCount++;
@@ -1135,7 +1135,7 @@ void FormulaCompiler::Factor()
             if ( bAutoCorrect && !pStack )
             {
                 aCorrectedSymbol.Erase();
-                bCorrected = TRUE;
+                bCorrected = sal_True;
             }
         }
         else if ( eOp == ocExternalRef )
@@ -1154,7 +1154,7 @@ void FormulaCompiler::Factor()
                     if ( nLen )
                         aCorrectedFormula.Erase( nLen - 1 );
                     aCorrectedSymbol.Erase();
-                    bCorrected = TRUE;
+                    bCorrected = sal_True;
                 }
             }
         }
@@ -1343,7 +1343,7 @@ OpCode FormulaCompiler::Expression()
     return pToken->GetOpCode();
 }
 // -----------------------------------------------------------------------------
-void FormulaCompiler::SetError(USHORT /*nError*/)
+void FormulaCompiler::SetError(sal_uInt16 /*nError*/)
 {
 }
 // -----------------------------------------------------------------------------
@@ -1374,10 +1374,10 @@ bool FormulaCompiler::MergeRangeReference(FormulaToken * * const pCode1, Formula
     return true;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::CompileTokenArray()
+sal_Bool FormulaCompiler::CompileTokenArray()
 {
-    glSubTotal = FALSE;
-    bCorrected = FALSE;
+    glSubTotal = sal_False;
+    bCorrected = sal_False;
     if( !pArr->GetCodeError() || bIgnoreErrors )
     {
         if ( bAutoCorrect )
@@ -1390,7 +1390,7 @@ BOOL FormulaCompiler::CompileTokenArray()
         pStack = NULL;
         FormulaToken* pData[ MAXCODE ];
         pCode = pData;
-        BOOL bWasForced = pArr->IsRecalcModeForced();
+        sal_Bool bWasForced = pArr->IsRecalcModeForced();
         if ( bWasForced )
         {
             if ( bAutoCorrect )
@@ -1406,7 +1406,7 @@ BOOL FormulaCompiler::CompileTokenArray()
         if (eOp != ocStop)
             SetError( errOperatorExpected);
 
-        USHORT nErrorBeforePop = pArr->GetCodeError();
+        sal_uInt16 nErrorBeforePop = pArr->GetCodeError();
 
         while( pStack )
             PopTokenArray();
@@ -1424,7 +1424,7 @@ BOOL FormulaCompiler::CompileTokenArray()
         if( pArr->GetCodeError() && !bIgnoreErrors )
         {
             pArr->DelRPN();
-            pArr->SetHyperLink(FALSE);
+            pArr->SetHyperLink(sal_False);
         }
 
         if ( bWasForced )
@@ -1486,7 +1486,7 @@ void FormulaCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer )
         rBuffer.append(sal_Unicode('='));
     FormulaToken* t = pArr->First();
     while( t )
-        t = CreateStringFromToken( rBuffer, t, TRUE );
+        t = CreateStringFromToken( rBuffer, t, sal_True );
 
     if (pSaveArr != pArr)
     {
@@ -1495,7 +1495,7 @@ void FormulaCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer )
     }
 }
 // -----------------------------------------------------------------------------
-FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaToken* pTokenP,BOOL bAllowArrAdvance )
+FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaToken* pTokenP,sal_Bool bAllowArrAdvance )
 {
     rtl::OUStringBuffer aBuffer;
     FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, bAllowArrAdvance );
@@ -1503,10 +1503,10 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaT
     return p;
 }
 
-FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP,BOOL bAllowArrAdvance )
+FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP,sal_Bool bAllowArrAdvance )
 {
-    BOOL bNext = TRUE;
-    BOOL bSpaces = FALSE;
+    sal_Bool bNext = sal_True;
+    sal_Bool bSpaces = sal_False;
     FormulaToken* t = pTokenP;
     OpCode eOp = t->GetOpCode();
     if( eOp >= ocAnd && eOp <= ocOr )
@@ -1516,7 +1516,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff
             t = pArr->Next();
         else
             t = pArr->PeekNext();
-        bNext = FALSE;
+        bNext = sal_False;
         bSpaces = ( !t || t->GetOpCode() != ocOpen );
     }
     if( bSpaces )
@@ -1540,8 +1540,8 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff
         else
         {
             // most times it's just one blank
-            BYTE n = t->GetByte();
-            for ( BYTE j=0; j<n; ++j )
+            sal_uInt8 n = t->GetByte();
+            for ( sal_uInt8 j=0; j<n; ++j )
             {
                 rBuffer.append(sal_Unicode(' '));
             }
@@ -1549,7 +1549,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff
     }
     else if( eOp >= ocInternalBegin && eOp <= ocInternalEnd )
         rBuffer.appendAscii( pInternal[ eOp - ocInternalBegin ] );
-    else if( (USHORT) eOp < mxSymbols->getSymbolCount())        // Keyword:
+    else if( (sal_uInt16) eOp < mxSymbols->getSymbolCount())        // Keyword:
         rBuffer.append(mxSymbols->getSymbol(eOp));
     else
     {
@@ -1637,7 +1637,7 @@ void FormulaCompiler::AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal )
     {
         ::rtl::math::doubleToUStringBuffer( rBuffer, fVal,
                 rtl_math_StringFormat_Automatic,
-                rtl_math_DecimalPlaces_Max, '.', TRUE );
+                rtl_math_DecimalPlaces_Max, '.', sal_True );
     }
     else
     {
@@ -1646,7 +1646,7 @@ void FormulaCompiler::AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal )
                 rtl_math_StringFormat_Automatic,
                 rtl_math_DecimalPlaces_Max,
                 aSysLocale.GetLocaleDataPtr()->getNumDecimalSep().GetChar(0),
-                TRUE );
+                sal_True );
     }
 }
 // -----------------------------------------------------------------------------
@@ -1655,9 +1655,9 @@ void FormulaCompiler::AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal )
     rBuffer.append( mxSymbols->getSymbol(static_cast<OpCode>(bVal ? ocTrue : ocFalse)) );
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::IsImportingXML() const
+sal_Bool FormulaCompiler::IsImportingXML() const
 {
-    return FALSE;
+    return sal_False;
 }
 // -----------------------------------------------------------------------------
 void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & rStr )
@@ -1708,7 +1708,7 @@ OpCode FormulaCompiler::NextToken()
                 if ( eOp == eLastOp || eLastOp == ocOpen )
                 {   // throw away duplicated operator
                     aCorrectedSymbol.Erase();
-                    bCorrected = TRUE;
+                    bCorrected = sal_True;
                 }
                 else
                 {
@@ -1725,7 +1725,7 @@ OpCode FormulaCompiler::NextToken()
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocGreater).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                             break;
                             case ocLess:
@@ -1734,14 +1734,14 @@ OpCode FormulaCompiler::NextToken()
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocLess).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                                 else if ( c == mxSymbols->getSymbol(ocGreater).GetChar(0) )
                                 {   // <> instead of ><
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocLess).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                             break;
                             case ocMul:
@@ -1750,7 +1750,7 @@ OpCode FormulaCompiler::NextToken()
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocMul).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                             break;
                             case ocDiv:
@@ -1759,7 +1759,7 @@ OpCode FormulaCompiler::NextToken()
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocDiv).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                             break;
                             default:
@@ -1796,24 +1796,24 @@ void FormulaCompiler::PutCode( FormulaTokenRef& p )
 }
 
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::HandleExternalReference(const FormulaToken& /*_aToken*/)
+sal_Bool FormulaCompiler::HandleExternalReference(const FormulaToken& /*_aToken*/)
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::HandleRange()
+sal_Bool FormulaCompiler::HandleRange()
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::HandleSingleRef()
+sal_Bool FormulaCompiler::HandleSingleRef()
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::HandleDbData()
+sal_Bool FormulaCompiler::HandleDbData()
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 void FormulaCompiler::CreateStringFromSingleRef(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
@@ -1839,7 +1839,7 @@ void FormulaCompiler::CreateStringFromExternal(rtl::OUStringBuffer& /*rBuffer*/,
 void FormulaCompiler::LocalizeString( String& /*rName*/ )
 {
 }
-void FormulaCompiler::PushTokenArray( FormulaTokenArray* pa, BOOL bTemp )
+void FormulaCompiler::PushTokenArray( FormulaTokenArray* pa, sal_Bool bTemp )
 {
     if ( bAutoCorrect && !pStack )
     {   // #61426# don't merge stacked subroutine code into entered formula
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index f10ecf4eb022..3942712da6a4 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -62,19 +62,19 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 )
 // Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2)
 
 // Need a lot of FormulaDoubleToken
-const USHORT nMemPoolDoubleToken = (0x3000 - 64) / sizeof(FormulaDoubleToken);
+const sal_uInt16 nMemPoolDoubleToken = (0x3000 - 64) / sizeof(FormulaDoubleToken);
 IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken, nMemPoolDoubleToken, nMemPoolDoubleToken )
 // Need a lot of FormulaByteToken
-const USHORT nMemPoolByteToken = (0x3000 - 64) / sizeof(FormulaByteToken);
+const sal_uInt16 nMemPoolByteToken = (0x3000 - 64) / sizeof(FormulaByteToken);
 IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken, nMemPoolByteToken, nMemPoolByteToken )
 // Need several FormulaStringToken
-const USHORT nMemPoolStringToken = (0x1000 - 64) / sizeof(FormulaStringToken);
+const sal_uInt16 nMemPoolStringToken = (0x1000 - 64) / sizeof(FormulaStringToken);
 IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken, nMemPoolStringToken, nMemPoolStringToken )
 
 
 // --- helpers --------------------------------------------------------------
 
-inline BOOL lcl_IsReference( OpCode eOp, StackVar eType )
+inline sal_Bool lcl_IsReference( OpCode eOp, StackVar eType )
 {
     return
         (eOp == ocPush && (eType == svSingleRef || eType == svDoubleRef))
@@ -89,12 +89,12 @@ FormulaToken::~FormulaToken()
 {
 }
 
-BOOL FormulaToken::Is3DRef() const
+sal_Bool FormulaToken::Is3DRef() const
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL FormulaToken::IsFunction() const
+sal_Bool FormulaToken::IsFunction() const
 {
 //    OpCode eOp = GetOpCode();
     return (eOp != ocPush && eOp != ocBad && eOp != ocColRowName &&
@@ -113,14 +113,14 @@ BOOL FormulaToken::IsFunction() const
 }
 
 
-BYTE FormulaToken::GetParamCount() const
+sal_uInt8 FormulaToken::GetParamCount() const
 {
     // OpCode eOp = GetOpCode();
     if ( eOp < SC_OPCODE_STOP_DIV && eOp != ocExternal && eOp != ocMacro &&
             eOp != ocIf && eOp != ocChose && eOp != ocPercentSign )
         return 0;       // parameters and specials
                         // ocIf and ocChose not for FAP, have cByte then
-//2do: BOOL parameter whether FAP or not?
+//2do: sal_Bool parameter whether FAP or not?
     else if ( GetByte() )
         return GetByte();   // all functions, also ocExternal and ocMacro
     else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP)
@@ -140,12 +140,12 @@ BYTE FormulaToken::GetParamCount() const
 }
 
 
-BOOL FormulaToken::IsMatrixFunction() const
+sal_Bool FormulaToken::IsMatrixFunction() const
 {
     return formula::FormulaCompiler::IsMatrixFunction(GetOpCode());
 }
 
-BOOL FormulaToken::operator==( const FormulaToken& rToken ) const
+sal_Bool FormulaToken::operator==( const FormulaToken& rToken ) const
 {
     // don't compare reference count!
     return  eType == rToken.eType && GetOpCode() == rToken.GetOpCode();
@@ -154,13 +154,13 @@ BOOL FormulaToken::operator==( const FormulaToken& rToken ) const
 
 // --- virtual dummy methods -------------------------------------------------
 
-BYTE FormulaToken::GetByte() const
+sal_uInt8 FormulaToken::GetByte() const
 {
     // ok to be called for any derived class
     return 0;
 }
 
-void FormulaToken::SetByte( BYTE )
+void FormulaToken::SetByte( sal_uInt8 )
 {
     DBG_ERRORFILE( "FormulaToken::SetByte: virtual dummy called" );
 }
@@ -196,13 +196,13 @@ const String& FormulaToken::GetString() const
     return aDummyString;
 }
 
-USHORT FormulaToken::GetIndex() const
+sal_uInt16 FormulaToken::GetIndex() const
 {
     DBG_ERRORFILE( "FormulaToken::GetIndex: virtual dummy called" );
     return 0;
 }
 
-void FormulaToken::SetIndex( USHORT )
+void FormulaToken::SetIndex( sal_uInt16 )
 {
     DBG_ERRORFILE( "FormulaToken::SetIndex: virtual dummy called" );
 }
@@ -227,17 +227,17 @@ FormulaToken* FormulaToken::GetFAPOrigToken() const
     return NULL;
 }
 
-USHORT FormulaToken::GetError() const
+sal_uInt16 FormulaToken::GetError() const
 {
     DBG_ERRORFILE( "FormulaToken::GetError: virtual dummy called" );
     return 0;
 }
 
-void FormulaToken::SetError( USHORT )
+void FormulaToken::SetError( sal_uInt16 )
 {
     DBG_ERRORFILE( "FormulaToken::SetError: virtual dummy called" );
 }
-BOOL FormulaToken::TextEqual( const FormulaToken& rToken ) const
+sal_Bool FormulaToken::TextEqual( const FormulaToken& rToken ) const
 {
     return *this == rToken;
 }
@@ -246,11 +246,11 @@ BOOL FormulaToken::TextEqual( const FormulaToken& rToken ) const
 // --------------------------------------------------------------------------
 
 
-BYTE FormulaByteToken::GetByte() const                       { return nByte; }
-void FormulaByteToken::SetByte( BYTE n )                     { nByte = n; }
+sal_uInt8 FormulaByteToken::GetByte() const                       { return nByte; }
+void FormulaByteToken::SetByte( sal_uInt8 n )                     { nByte = n; }
 bool FormulaByteToken::HasForceArray() const                 { return bHasForceArray; }
 void FormulaByteToken::SetForceArray( bool b )               { bHasForceArray = b; }
-BOOL FormulaByteToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaByteToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && nByte == r.GetByte() &&
         bHasForceArray == r.HasForceArray();
@@ -258,12 +258,12 @@ BOOL FormulaByteToken::operator==( const FormulaToken& r ) const
 
 
 FormulaToken* FormulaFAPToken::GetFAPOrigToken() const            { return pOrigToken; }
-BOOL FormulaFAPToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaFAPToken::operator==( const FormulaToken& r ) const
 {
     return FormulaByteToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken();
 }
 short* FormulaJumpToken::GetJump() const                     { return pJump; }
-BOOL FormulaJumpToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaJumpToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && pJump[0] == r.GetJump()[0] &&
         memcmp( pJump+1, r.GetJump()+1, pJump[0] * sizeof(short) ) == 0;
@@ -298,9 +298,9 @@ bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken,Exter
                 // long is svIndex, used for name / database area, or "byte" for spaces
                 sal_Int32 nValue = _aToken.Data.get<sal_Int32>();
                 if ( eOpCode == ocName || eOpCode == ocDBArea )
-                    AddToken( formula::FormulaIndexToken( eOpCode, static_cast<USHORT>(nValue) ) );
+                    AddToken( formula::FormulaIndexToken( eOpCode, static_cast<sal_uInt16>(nValue) ) );
                 else if ( eOpCode == ocSpaces )
-                    AddToken( formula::FormulaByteToken( ocSpaces, static_cast<BYTE>(nValue) ) );
+                    AddToken( formula::FormulaByteToken( ocSpaces, static_cast<sal_uInt8>(nValue) ) );
                 else
                     bError = true;
             }
@@ -493,7 +493,7 @@ void FormulaTokenArray::DelRPN()
     if( nRPN )
     {
         FormulaToken** p = pRPN;
-        for( USHORT i = 0; i < nRPN; i++ )
+        for( sal_uInt16 i = 0; i < nRPN; i++ )
         {
             (*p++)->DecRef();
         }
@@ -503,7 +503,7 @@ void FormulaTokenArray::DelRPN()
     nRPN = nIndex = 0;
 }
 
-FormulaToken* FormulaTokenArray::PeekPrev( USHORT & nIdx )
+FormulaToken* FormulaTokenArray::PeekPrev( sal_uInt16 & nIdx )
 {
     if (0 < nIdx && nIdx <= nLen)
         return pCode[--nIdx];
@@ -522,7 +522,7 @@ FormulaToken* FormulaTokenArray::PeekNextNoSpaces()
 {
     if( pCode && nIndex < nLen )
     {
-        USHORT j = nIndex;
+        sal_uInt16 j = nIndex;
         while ( pCode[j]->GetOpCode() == ocSpaces && j < nLen )
             j++;
         if ( j < nLen )
@@ -538,7 +538,7 @@ FormulaToken* FormulaTokenArray::PeekPrevNoSpaces()
 {
     if( pCode && nIndex > 1 )
     {
-        USHORT j = nIndex - 2;
+        sal_uInt16 j = nIndex - 2;
         while ( pCode[j]->GetOpCode() == ocSpaces && j > 0 )
             j--;
         if ( j > 0 || pCode[j]->GetOpCode() != ocSpaces )
@@ -550,34 +550,34 @@ FormulaToken* FormulaTokenArray::PeekPrevNoSpaces()
         return NULL;
 }
 
-BOOL FormulaTokenArray::HasOpCode( OpCode eOp ) const
+sal_Bool FormulaTokenArray::HasOpCode( OpCode eOp ) const
 {
-    for ( USHORT j=0; j < nLen; j++ )
+    for ( sal_uInt16 j=0; j < nLen; j++ )
     {
         if ( pCode[j]->GetOpCode() == eOp )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL FormulaTokenArray::HasOpCodeRPN( OpCode eOp ) const
+sal_Bool FormulaTokenArray::HasOpCodeRPN( OpCode eOp ) const
 {
-    for ( USHORT j=0; j < nRPN; j++ )
+    for ( sal_uInt16 j=0; j < nRPN; j++ )
     {
         if ( pRPN[j]->GetOpCode() == eOp )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL FormulaTokenArray::HasNameOrColRowName() const
+sal_Bool FormulaTokenArray::HasNameOrColRowName() const
 {
-    for ( USHORT j=0; j < nLen; j++ )
+    for ( sal_uInt16 j=0; j < nLen; j++ )
     {
         if( pCode[j]->GetType() == svIndex || pCode[j]->GetOpCode() == ocColRowName )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -586,7 +586,7 @@ FormulaTokenArray::FormulaTokenArray()
 {
     pCode = NULL; pRPN = NULL;
     nError = nLen = nIndex = nRPN = nRefs = 0;
-    bHyperLink = FALSE;
+    bHyperLink = sal_False;
     ClearRecalcMode();
 }
 
@@ -616,14 +616,14 @@ void FormulaTokenArray::Assign( const FormulaTokenArray& r )
     {
         pp = pCode = new FormulaToken*[ nLen ];
         memcpy( pp, r.pCode, nLen * sizeof( FormulaToken* ) );
-        for( USHORT i = 0; i < nLen; i++ )
+        for( sal_uInt16 i = 0; i < nLen; i++ )
             (*pp++)->IncRef();
     }
     if( nRPN )
     {
         pp = pRPN = new FormulaToken*[ nRPN ];
         memcpy( pp, r.pRPN, nRPN * sizeof( FormulaToken* ) );
-        for( USHORT i = 0; i < nRPN; i++ )
+        for( sal_uInt16 i = 0; i < nRPN; i++ )
             (*pp++)->IncRef();
     }
 }
@@ -649,7 +649,7 @@ FormulaTokenArray* FormulaTokenArray::Clone() const
     {
         pp = p->pCode = new FormulaToken*[ nLen ];
         memcpy( pp, pCode, nLen * sizeof( FormulaToken* ) );
-        for( USHORT i = 0; i < nLen; i++, pp++ )
+        for( sal_uInt16 i = 0; i < nLen; i++, pp++ )
         {
             *pp = (*pp)->Clone();
             (*pp)->IncRef();
@@ -659,14 +659,14 @@ FormulaTokenArray* FormulaTokenArray::Clone() const
     {
         pp = p->pRPN = new FormulaToken*[ nRPN ];
         memcpy( pp, pRPN, nRPN * sizeof( FormulaToken* ) );
-        for( USHORT i = 0; i < nRPN; i++, pp++ )
+        for( sal_uInt16 i = 0; i < nRPN; i++, pp++ )
         {
             FormulaToken* t = *pp;
             if( t->GetRef() > 1 )
             {
                 FormulaToken** p2 = pCode;
-                USHORT nIdx = 0xFFFF;
-                for( USHORT j = 0; j < nLen; j++, p2++ )
+                sal_uInt16 nIdx = 0xFFFF;
+                for( sal_uInt16 j = 0; j < nLen; j++, p2++ )
                 {
                     if( *p2 == t )
                     {
@@ -692,7 +692,7 @@ void FormulaTokenArray::Clear()
     if( pCode )
     {
         FormulaToken** p = pCode;
-        for( USHORT i = 0; i < nLen; i++ )
+        for( sal_uInt16 i = 0; i < nLen; i++ )
         {
             (*p++)->DecRef();
         }
@@ -700,7 +700,7 @@ void FormulaTokenArray::Clear()
     }
     pCode = NULL; pRPN = NULL;
     nError = nLen = nIndex = nRPN = nRefs = 0;
-    bHyperLink = FALSE;
+    bHyperLink = sal_False;
     ClearRecalcMode();
 }
 
@@ -758,7 +758,7 @@ FormulaToken* FormulaTokenArray::AddDouble( double fVal )
     return Add( new FormulaDoubleToken( fVal ) );
 }
 
-FormulaToken* FormulaTokenArray::AddName( USHORT n )
+FormulaToken* FormulaTokenArray::AddName( sal_uInt16 n )
 {
     return Add( new FormulaIndexToken( ocName, n ) );
 }
@@ -802,7 +802,7 @@ void FormulaTokenArray::AddRecalcMode( ScRecalcMode nBits )
 }
 
 
-BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
+sal_Bool FormulaTokenArray::HasMatrixDoubleRefOps()
 {
     if ( pRPN && nRPN )
     {
@@ -811,11 +811,11 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
         FormulaToken** pStack = new FormulaToken* [nRPN];
         FormulaToken* pResult = new FormulaDoubleToken( 0.0 );
         short sp = 0;
-        for ( USHORT j = 0; j < nRPN; j++ )
+        for ( sal_uInt16 j = 0; j < nRPN; j++ )
         {
             FormulaToken* t = pRPN[j];
             OpCode eOp = t->GetOpCode();
-            BYTE nParams = t->GetParamCount();
+            sal_uInt8 nParams = t->GetParamCount();
             switch ( eOp )
             {
                 case ocAdd :
@@ -832,13 +832,13 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
                 case ocLessEqual :
                 case ocGreaterEqual :
                 {
-                    for ( BYTE k = nParams; k; k-- )
+                    for ( sal_uInt8 k = nParams; k; k-- )
                     {
                         if ( sp >= k && pStack[sp-k]->GetType() == svDoubleRef )
                         {
                             pResult->Delete();
                             delete [] pStack;
-                            return TRUE;
+                            return sal_True;
                         }
                     }
                 }
@@ -870,7 +870,7 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
         delete [] pStack;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -932,21 +932,21 @@ void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const Missi
             if (mnCurArg == 2)
             {
                 pNewArr->AddOpCode( ocSep );
-                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=TRUE()
+                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=sal_True()
             }
             break;
         case ocPoissonDist:
             if (mnCurArg == 1)
             {
                 pNewArr->AddOpCode( ocSep );
-                pNewArr->AddDouble( 1.0 );      // 3rd, Cumulative=TRUE()
+                pNewArr->AddDouble( 1.0 );      // 3rd, Cumulative=sal_True()
             }
             break;
         case ocNormDist:
             if ( mnCurArg == 2 )
             {
                 pNewArr->AddOpCode( ocSep );
-                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=TRUE()
+                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=sal_True()
             }
             break;
         case ocLogNormDist:
@@ -1086,7 +1086,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissingToPof( const MissingConvent
     FormulaMissingContext aCtx[ nAlloc ];
     int aOpCodeAddressStack[ nAlloc ];  // use of ADDRESS() function
     const int nOmitAddressArg = 3;      // ADDRESS() 4th parameter A1/R1C1
-    USHORT nTokens = GetLen() + 1;
+    sal_uInt16 nTokens = GetLen() + 1;
     FormulaMissingContext* pCtx = (nAlloc < nTokens ? new FormulaMissingContext[nTokens] : &aCtx[0]);
     int* pOcas = (nAlloc < nTokens ? new int[nTokens] : &aOpCodeAddressStack[0]);
     // Never go below 0, never use 0, mpFunc always NULL.
@@ -1168,7 +1168,7 @@ bool FormulaTokenArray::MayReferenceFollow()
     if ( pCode && nLen > 0 )
     {
         // ignore trailing spaces
-        USHORT i = nLen - 1;
+        sal_uInt16 i = nLen - 1;
         while ( i > 0 && pCode[i]->GetOpCode() == SC_OPCODE_SPACES )
         {
             --i;
@@ -1209,7 +1209,7 @@ FormulaToken* FormulaTokenArray::AddOpCode( OpCode eOp )
             }
             break;
         default:
-            pRet = new FormulaByteToken( eOp, 0, FALSE );
+            pRet = new FormulaByteToken( eOp, 0, sal_False );
             break;
     }
     return AddToken( *pRet );
@@ -1297,7 +1297,7 @@ void FormulaTokenIterator::Jump( short nStart, short nNext, short nStop )
 
 bool FormulaTokenIterator::IsEndOfPath() const
 {
-    USHORT nTest = pCur->nPC + 1;
+    sal_uInt16 nTest = pCur->nPC + 1;
     if( nTest < pCur->pArr->nRPN  && nTest < pCur->nStop )
     {
         const FormulaToken* t = pCur->pArr->pRPN[ nTest ];
@@ -1313,44 +1313,44 @@ bool FormulaTokenIterator::IsEndOfPath() const
 
 double      FormulaDoubleToken::GetDouble() const            { return fDouble; }
 double &    FormulaDoubleToken::GetDoubleAsReference()       { return fDouble; }
-BOOL FormulaDoubleToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaDoubleToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && fDouble == r.GetDouble();
 }
 
 
 const String& FormulaStringToken::GetString() const          { return aString; }
-BOOL FormulaStringToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaStringToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && aString == r.GetString();
 }
 
 
 const String& FormulaStringOpToken::GetString() const             { return aString; }
-BOOL FormulaStringOpToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaStringOpToken::operator==( const FormulaToken& r ) const
 {
     return FormulaByteToken::operator==( r ) && aString == r.GetString();
 }
 
-USHORT  FormulaIndexToken::GetIndex() const                  { return nIndex; }
-void    FormulaIndexToken::SetIndex( USHORT n )              { nIndex = n; }
-BOOL FormulaIndexToken::operator==( const FormulaToken& r ) const
+sal_uInt16  FormulaIndexToken::GetIndex() const                  { return nIndex; }
+void    FormulaIndexToken::SetIndex( sal_uInt16 n )              { nIndex = n; }
+sal_Bool FormulaIndexToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && nIndex == r.GetIndex();
 }
 const String&   FormulaExternalToken::GetExternal() const    { return aExternal; }
-BYTE            FormulaExternalToken::GetByte() const        { return nByte; }
-void            FormulaExternalToken::SetByte( BYTE n )      { nByte = n; }
-BOOL FormulaExternalToken::operator==( const FormulaToken& r ) const
+sal_uInt8            FormulaExternalToken::GetByte() const        { return nByte; }
+void            FormulaExternalToken::SetByte( sal_uInt8 n )      { nByte = n; }
+sal_Bool FormulaExternalToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && nByte == r.GetByte() &&
         aExternal == r.GetExternal();
 }
 
 
-USHORT          FormulaErrorToken::GetError() const          { return nError; }
-void            FormulaErrorToken::SetError( USHORT nErr )   { nError = nErr; }
-BOOL FormulaErrorToken::operator==( const FormulaToken& r ) const
+sal_uInt16          FormulaErrorToken::GetError() const          { return nError; }
+void            FormulaErrorToken::SetError( sal_uInt16 nErr )   { nError = nErr; }
+sal_Bool FormulaErrorToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) &&
         nError == static_cast< const FormulaErrorToken & >(r).GetError();
@@ -1361,13 +1361,13 @@ const String&   FormulaMissingToken::GetString() const
     static  String              aDummyString;
     return aDummyString;
 }
-BOOL FormulaMissingToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaMissingToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r );
 }
 
 
-BOOL FormulaUnknownToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaUnknownToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r );
 }
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 28523a24eb92..51edbd91a097 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -58,7 +58,7 @@ private:
     MultiLineEdit*  pMEdit;
     Link            aSelChangedLink;
     Selection       aOldSel;
-    BOOL            bMouseFlag;
+    sal_Bool            bMouseFlag;
                     DECL_LINK( ChangedHdl, EditBox* );
 
 protected:
@@ -93,7 +93,7 @@ public:
             ArgEdit( Window* pParent, const ResId& rResId );
 
     void    Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
-                  ScrollBar& rArgSlider, USHORT nArgCount );
+                  ScrollBar& rArgSlider, sal_uInt16 nArgCount );
 
 protected:
     virtual void    KeyInput( const KeyEvent& rKEvt );
@@ -102,7 +102,7 @@ private:
     ArgEdit*    pEdPrev;
     ArgEdit*    pEdNext;
     ScrollBar*  pSlider;
-    USHORT      nArgs;
+    sal_uInt16      nArgs;
 };
 
 
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 1d71b40919eb..88c43f0daee0 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -47,7 +47,7 @@ namespace formula
             virtual ::rtl::OUString getDescription() const { return ::rtl::OUString(); }
             virtual xub_StrLen getSuppressedArgumentCount() const { return 0; }
             virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& ) const { return ::rtl::OUString(); }
-            virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& ) const {}
+            virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const {}
             virtual void initArgumentInfo()  const {}
             virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); }
             virtual rtl::OString getHelpId() const { return ""; }
@@ -74,14 +74,14 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager)
 {
     m_pCharClass = m_pSysLocale->GetCharClassPtr();
 }
-BOOL FormulaHelper::GetNextFunc( const String&  rFormula,
-                                 BOOL           bBack,
+sal_Bool FormulaHelper::GetNextFunc( const String&  rFormula,
+                                 sal_Bool           bBack,
                                  xub_StrLen&    rFStart,   // Ein- und Ausgabe
                                  xub_StrLen*    pFEnd,     // = NULL
                                  const IFunctionDescription**   ppFDesc,   // = NULL
                                  ::std::vector< ::rtl::OUString>*   pArgs )  const // = NULL
 {
-    BOOL        bFound = FALSE;
+    sal_Bool        bFound = sal_False;
     xub_StrLen  nOldStart = rFStart;
     String      aFname;
 
@@ -114,7 +114,7 @@ BOOL FormulaHelper::GetNextFunc( const String&  rFormula,
             }
             if ( *ppFDesc && pArgs )
             {
-                GetArgStrings( *pArgs,rFormula, rFStart, static_cast<USHORT>((*ppFDesc)->getParameterCount() ));
+                GetArgStrings( *pArgs,rFormula, rFStart, static_cast<sal_uInt16>((*ppFDesc)->getParameterCount() ));
             }
             else
             {
@@ -133,13 +133,13 @@ BOOL FormulaHelper::GetNextFunc( const String&  rFormula,
 
 void FormulaHelper::FillArgStrings( const String&   rFormula,
                                     xub_StrLen      nFuncPos,
-                                    USHORT          nArgs,
+                                    sal_uInt16          nArgs,
                                     ::std::vector< ::rtl::OUString >& _rArgs ) const
 {
     xub_StrLen  nStart  = 0;
     xub_StrLen  nEnd    = 0;
-    USHORT      i;
-    BOOL        bLast   = FALSE;
+    sal_uInt16      i;
+    sal_Bool        bLast   = sal_False;
 
     for ( i=0; i<nArgs && !bLast; i++ )
     {
@@ -152,7 +152,7 @@ void FormulaHelper::FillArgStrings( const String&   rFormula,
             if ( nEnd != nStart )
                 _rArgs.push_back(rFormula.Copy( nStart, nEnd-1-nStart ));
             else
-                _rArgs.push_back(String()), bLast = TRUE;
+                _rArgs.push_back(String()), bLast = sal_True;
         }
         else
         {
@@ -174,7 +174,7 @@ void FormulaHelper::FillArgStrings( const String&   rFormula,
 void FormulaHelper::GetArgStrings( ::std::vector< ::rtl::OUString >& _rArgs
                                       ,const String& rFormula,
                                        xub_StrLen nFuncPos,
-                                       USHORT nArgs ) const
+                                       sal_uInt16 nArgs ) const
 {
     if (nArgs)
     {
@@ -184,10 +184,10 @@ void FormulaHelper::GetArgStrings( ::std::vector< ::rtl::OUString >& _rArgs
 
 //------------------------------------------------------------------------
 
-inline BOOL IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_StrLen nPos )
+inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_StrLen nPos )
 {
     if( _pCharClass->isLetterNumeric( rStr, nPos ) )
-        return TRUE;
+        return sal_True;
     else
     {   // In internationalized versions function names may contain a dot
         //  and in every version also an underscore... ;-)
@@ -199,7 +199,7 @@ inline BOOL IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_
 
 xub_StrLen FormulaHelper::GetFunctionStart( const String&   rFormula,
                                         xub_StrLen      nStart,
-                                        BOOL            bBack,
+                                        sal_Bool            bBack,
                                         String*         pFuncName ) const
 {
     xub_StrLen nStrLen = rFormula.Len();
@@ -210,11 +210,11 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String&   rFormula,
     xub_StrLen  nFStart = FUNC_NOTFOUND;
     xub_StrLen  nParPos = nStart;
 
-    BOOL bRepeat, bFound;
+    sal_Bool bRepeat, bFound;
     do
     {
-        bFound  = FALSE;
-        bRepeat = FALSE;
+        bFound  = sal_False;
+        bRepeat = sal_False;
 
         if ( bBack )
         {
@@ -228,7 +228,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String&   rFormula,
                     if (nParPos > 0)
                         nParPos--;
                 }
-                else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == FALSE )
+                else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == sal_False )
                     nParPos--;
             }
         }
@@ -243,7 +243,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String&   rFormula,
                         nParPos++;
                     nParPos++;
                 }
-                else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == FALSE )
+                else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == sal_False )
                     nParPos++;
             }
         }
@@ -268,13 +268,13 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String&   rFormula,
             }
             else                    // Klammern ohne Funktion -> weitersuchen
             {
-                bRepeat = TRUE;
+                bRepeat = sal_True;
                 if ( !bBack )
                     nParPos++;
                 else if (nParPos > 0)
                     nParPos--;
                 else
-                    bRepeat = FALSE;
+                    bRepeat = sal_False;
             }
         }
         else                        // keine Klammern gefunden
@@ -300,7 +300,7 @@ xub_StrLen  FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
 
     short   nParCount = 0;
     bool    bInArray = false;
-    BOOL    bFound = FALSE;
+    sal_Bool    bFound = sal_False;
 
     while ( !bFound && (nStart < nStrLen) )
     {
@@ -318,10 +318,10 @@ xub_StrLen  FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
         {
             nParCount--;
             if ( nParCount == 0 )
-                bFound = TRUE;
+                bFound = sal_True;
             else if ( nParCount < 0 )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 nStart--;   // einen zu weit gelesen
             }
         }
@@ -337,7 +337,7 @@ xub_StrLen  FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
         {
             if ( !bInArray && nParCount == 0 )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 nStart--;   // einen zu weit gelesen
             }
         }
@@ -349,7 +349,7 @@ xub_StrLen  FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
 
 //------------------------------------------------------------------
 
-xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, USHORT nArg ) const
+xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, sal_uInt16 nArg ) const
 {
     xub_StrLen nStrLen = rStr.Len();
 
@@ -358,7 +358,7 @@ xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, US
 
     short   nParCount   = 0;
     bool    bInArray    = false;
-    BOOL    bFound      = FALSE;
+    sal_Bool    bFound      = sal_False;
 
     while ( !bFound && (nStart < nStrLen) )
     {
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 0a971e94e5b6..54d1c102d5be 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -99,9 +99,9 @@ namespace formula
         ::std::pair<RefButton*,RefEdit*>
                         RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
         void            RefInputStartAfter( RefEdit* pEdit, RefButton* pButton );
-        void            RefInputDoneAfter( BOOL bForced );
-        BOOL            CalcValue( const String& rStrExp, String& rStrResult );
-        BOOL            CalcStruct( const String& rStrExp);
+        void            RefInputDoneAfter( sal_Bool bForced );
+        sal_Bool            CalcValue( const String& rStrExp, String& rStrResult );
+        sal_Bool            CalcStruct( const String& rStrExp);
         void            UpdateValues();
         void            DeleteArgs();
         xub_StrLen      GetFunctionPos(xub_StrLen nPos);
@@ -111,32 +111,32 @@ namespace formula
         void            fillTree(IStructHelper* _pTree);
         void            UpdateTokenArray( const String& rStrExp);
         String          RepairFormula(const String& aFormula);
-        void            FillDialog(BOOL nFlag=TRUE);
-        void            EditNextFunc( BOOL bForward, xub_StrLen nFStart=NOT_FOUND );
+        void            FillDialog(sal_Bool nFlag=sal_True);
+        void            EditNextFunc( sal_Bool bForward, xub_StrLen nFStart=NOT_FOUND );
         void            EditThisFunc(xub_StrLen nFStart);
         void            EditFuncParas(xub_StrLen nEditPos);
 
 
-        void            UpdateArgInput( USHORT nOffset, USHORT nInput );
+        void            UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 nInput );
         void            Update();
         void            Update(const String& _sExp);
 
 
-        void            SaveArg( USHORT nEd );
+        void            SaveArg( sal_uInt16 nEd );
         void            UpdateSelection();
-        void            DoEnter( BOOL bOk );
+        void            DoEnter( sal_Bool bOk );
         void            UpdateFunctionDesc();
         void            ResizeArgArr( const IFunctionDescription* pNewFunc );
         void            FillListboxes();
-        void            FillControls(BOOL &rbNext, BOOL &rbPrev);
+        void            FillControls(sal_Bool &rbNext, sal_Bool &rbPrev);
 
-        FormulaDlgMode  SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+        FormulaDlgMode  SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
         void            SetMeText(const String& _sText);
-        BOOL            CheckMatrix(String& aFormula /*IN/OUT*/);
+        sal_Bool            CheckMatrix(String& aFormula /*IN/OUT*/);
 
         void            SetEdSelection();
 
-        BOOL            UpdateParaWin(Selection& _rSelection);
+        sal_Bool            UpdateParaWin(Selection& _rSelection);
         void            UpdateParaWin(const Selection& _rSelection,const String& _sRefStr);
 
         void            SetData(xub_StrLen nFStart,xub_StrLen nNextFStart,xub_StrLen nNextFEnd,xub_StrLen& PrivStart,xub_StrLen& PrivEnd);
@@ -214,9 +214,9 @@ namespace formula
         FuncPage*   pFuncPage;
         StructPage* pStructPage;
         String          aOldFormula;
-        BOOL            bStructUpdate;
+        sal_Bool            bStructUpdate;
         MultiLineEdit*  pMEdit;
-        BOOL            bUserMatrixFlag;
+        sal_Bool            bUserMatrixFlag;
         Timer           aTimer;
 
         const String    aTitle1;
@@ -231,15 +231,15 @@ namespace formula
         rtl::OString    aOldHelp;
         rtl::OString    aOldUnique;
         rtl::OString    aActivWinId;
-        BOOL            bIsShutDown;
+        sal_Bool            bIsShutDown;
 
 
 
         Font            aFntBold;
         Font            aFntLight;
-        USHORT          nEdFocus;
+        sal_uInt16          nEdFocus;
     //    Selection       theCurSel;
-        BOOL            bEditFlag;
+        sal_Bool            bEditFlag;
         const IFunctionDescription* pFuncDesc;
         xub_StrLen      nArgs;
         ::std::vector< ::rtl::OUString > m_aArguments;
@@ -292,7 +292,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     //
     pTheRefEdit     (NULL),
     pMEdit          (NULL),
-    bUserMatrixFlag (FALSE),
+    bUserMatrixFlag (sal_False),
     //
     aTitle1         ( ModuleRes( STR_TITLE1 ) ),        // lokale Resource
     aTitle2         ( ModuleRes( STR_TITLE2 ) ),        // lokale Resource
@@ -300,7 +300,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aTxtOk          ( aBtnEnd.GetText() ),
     m_aFormulaHelper(_pFunctionMgr),
     //
-    bIsShutDown     (FALSE),
+    bIsShutDown     (sal_False),
     nEdFocus        (0),
     pFuncDesc       (NULL),
     nArgs           (0)
@@ -316,8 +316,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     m_aEditHelpId = pMEdit->GetHelpId();
     pMEdit->SetUniqueId( m_aEditHelpId );
 
-    bEditFlag=FALSE;
-    bStructUpdate=TRUE;
+    bEditFlag=sal_False;
+    bStructUpdate=sal_True;
     Point aPos=aGEdit.GetPosPixel();
     pParaWin->SetPosPixel(aPos);
     pParaWin->SetArgModifiedHdl(LINK( this, FormulaDlg_Impl, ModifyHdl ) );
@@ -356,7 +356,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aMEFormula.SetSelChangedHdl( LINK( this, FormulaDlg_Impl, FormulaCursorHdl ) );
 
     aFntLight = aFtFormula.GetFont();
-    aFntLight.SetTransparent( TRUE );
+    aFntLight.SetTransparent( sal_True );
     aFntBold = aFntLight;
     aFntBold.SetWeight( WEIGHT_BOLD );
 
@@ -375,7 +375,7 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
         aTimer.SetTimeoutHdl(Link());
         aTimer.Stop();
     } // if(aTimer.IsActive())
-    bIsShutDown=TRUE;// Setzen, damit PreNotify keinen GetFocus speichert.
+    bIsShutDown=sal_True;// Setzen, damit PreNotify keinen GetFocus speichert.
     FormEditData* pData = m_pHelper->getFormEditData();
     if (pData) // wird nicht ueber Close zerstoert;
     {
@@ -383,9 +383,9 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
         pData->SetSelection(pMEdit->GetSelection());
 
         if(aTabCtrl.GetCurPageId()==TP_FUNCTION)
-            pData->SetMode( (USHORT) FORMULA_FORMDLG_FORMULA );
+            pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA );
         else
-            pData->SetMode( (USHORT) FORMULA_FORMDLG_EDIT );
+            pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_EDIT );
         pData->SetUndoStr(pMEdit->GetText());
         pData->SetMatrixFlag(aBtnMatrix.IsChecked());
     }
@@ -401,7 +401,7 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
 // -----------------------------------------------------------------------------
 void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nSwitch=rNEvt.GetType();
+    sal_uInt16 nSwitch=rNEvt.GetType();
     if(nSwitch==EVENT_GETFOCUS && !bIsShutDown)
     {
         Window* pWin=rNEvt.GetWindow();
@@ -485,7 +485,7 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
     xub_StrLen nFuncPos=STRING_NOTFOUND;    //@ Testweise
     xub_StrLen nPrevFuncPos=1;
     short  nBracketCount=0;
-    BOOL   bFlag=FALSE;
+    sal_Bool   bFlag=sal_False;
     String aFormString = pMEdit->GetText();
     m_aFormulaHelper.GetCharClass()->toUpper( aFormString );
 
@@ -543,12 +543,12 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
                 if ( eOp == m_aSeparatorsOpCodes[TOKEN_OPEN].OpCode )
                 {
                     nBracketCount++;
-                    bFlag=TRUE;
+                    bFlag=sal_True;
                 }
                 else if ( eOp == m_aSeparatorsOpCodes[TOKEN_CLOSE].OpCode )
                 {
                     nBracketCount--;
-                    bFlag=FALSE;
+                    bFlag=sal_False;
                     nFuncPos=nPrevFuncPos;
                 }
                 bool bIsFunction = ::std::find_if(m_aFunctionOpCodes.getConstArray(),m_pFunctionOpCodesEnd,::std::bind2nd(OpCodeCompare(),boost::cref(eOp))) != m_pFunctionOpCodesEnd;
@@ -588,9 +588,9 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
     return nFuncPos;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult )
+sal_Bool FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult )
 {
-    BOOL bResult = TRUE;
+    sal_Bool bResult = sal_True;
 
     if ( rStrExp.Len() > 0 )
     {
@@ -601,7 +601,7 @@ BOOL FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult )
             bResult = m_pHelper->calculateValue(rStrExp,rStrResult);
         }
         else
-            bResult = FALSE;
+            bResult = sal_False;
     }
 
     return bResult;
@@ -625,9 +625,9 @@ void FormulaDlg_Impl::UpdateValues()
     CalcStruct(pMEdit->GetText());
 }
 
-BOOL FormulaDlg_Impl::CalcStruct( const String& rStrExp)
+sal_Bool FormulaDlg_Impl::CalcStruct( const String& rStrExp)
 {
-    BOOL bResult = TRUE;
+    sal_Bool bResult = sal_True;
     xub_StrLen nLength=rStrExp.Len();
 
     if ( rStrExp.Len() > 0 && aOldFormula!=rStrExp && bStructUpdate)
@@ -658,7 +658,7 @@ BOOL FormulaDlg_Impl::CalcStruct( const String& rStrExp)
                 UpdateTokenArray(rStrExp);
         }
         else
-            bResult = FALSE;
+            bResult = sal_False;
     }
     return bResult;
 }
@@ -766,13 +766,13 @@ void FormulaDlg_Impl::UpdateTokenArray( const String& rStrExp)
     } // if ( pTokens && nLen == m_aTokenList.getLength() )
 
     FormulaCompiler aCompiler(*m_pTokenArray.get());
-    aCompiler.SetCompileForFAP(TRUE);   // #i101512# special handling is needed
+    aCompiler.SetCompileForFAP(sal_True);   // #i101512# special handling is needed
     aCompiler.CompileTokenArray();
 }
 
-void FormulaDlg_Impl::FillDialog(BOOL nFlag)
+void FormulaDlg_Impl::FillDialog(sal_Bool nFlag)
 {
-    BOOL bNext=TRUE, bPrev=TRUE;
+    sal_Bool bNext=sal_True, bPrev=sal_True;
     if(nFlag)
         FillControls(bNext, bPrev);
     FillListboxes();
@@ -803,9 +803,9 @@ void FormulaDlg_Impl::FillListboxes()
     if ( pFuncDesc && pFuncDesc->getCategory() )
     {
         if( pFuncPage->GetCategory() != pFuncDesc->getCategory()->getNumber() + 1 )
-            pFuncPage->SetCategory(static_cast<USHORT>(pFuncDesc->getCategory()->getNumber() + 1));
+            pFuncPage->SetCategory(static_cast<sal_uInt16>(pFuncDesc->getCategory()->getNumber() + 1));
 
-        USHORT nPos=pFuncPage->GetFuncPos(pFuncDesc);
+        sal_uInt16 nPos=pFuncPage->GetFuncPos(pFuncDesc);
 
         pFuncPage->SetFunction(nPos);
     }
@@ -819,7 +819,7 @@ void FormulaDlg_Impl::FillListboxes()
     //  ResizeArgArr jetzt schon in UpdateFunctionDesc
 
 
-    m_pHelper->setDispatcherLock( TRUE);// Modal-Modus einschalten
+    m_pHelper->setDispatcherLock( sal_True);// Modal-Modus einschalten
 
     aNewTitle = aTitle1;
 
@@ -828,7 +828,7 @@ void FormulaDlg_Impl::FillListboxes()
     m_pParent->SetUniqueId( aOldUnique );
 }
 // -----------------------------------------------------------------------------
-void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
+void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
 {
     //  Umschalten zwischen den "Seiten"
     FormEditData* pData = m_pHelper->getFormEditData();
@@ -846,9 +846,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
     aFormula.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " )" ));
     DeleteArgs();
     const IFunctionDescription* pOldFuncDesc = pFuncDesc;
-    BOOL bTestFlag = FALSE;
+    sal_Bool bTestFlag = sal_False;
 
-    if ( m_aFormulaHelper.GetNextFunc( aFormula, FALSE,
+    if ( m_aFormulaHelper.GetNextFunc( aFormula, sal_False,
                                      nNextFStart, &nNextFEnd, &pFuncDesc, &m_aArguments ) )
     {
         bTestFlag = (pOldFuncDesc != pFuncDesc);
@@ -883,26 +883,26 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
             pMEdit->SetSelection( Selection(PrivStart, PrivEnd));
 
         nArgs = pFuncDesc->getSuppressedArgumentCount();
-        USHORT nOffset = pData->GetOffset();
+        sal_uInt16 nOffset = pData->GetOffset();
         nEdFocus = pData->GetEdFocus();
 
         //  Verkettung der Edit's fuer Focus-Kontrolle
 
         if(bTestFlag)
             pParaWin->SetArgumentOffset(nOffset);
-        USHORT nActiv=0;
+        sal_uInt16 nActiv=0;
         xub_StrLen nArgPos= m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
         xub_StrLen nEditPos=(xub_StrLen) pMEdit->GetSelection().Min();
-        BOOL    bFlag=FALSE;
+        sal_Bool    bFlag=sal_False;
 
-        for(USHORT i=0;i<nArgs;i++)
+        for(sal_uInt16 i=0;i<nArgs;i++)
         {
             sal_Int32 nLength = m_aArguments[i].getLength()+1;
             pParaWin->SetArgument(i,m_aArguments[i]);
             if(nArgPos<=nEditPos && nEditPos<nArgPos+nLength)
             {
                 nActiv=i;
-                bFlag=TRUE;
+                bFlag=sal_True;
             }
             nArgPos = sal::static_int_cast<xub_StrLen>( nArgPos + nLength );
         }
@@ -924,10 +924,10 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
         //  Test, ob vorne/hinten noch mehr Funktionen sind
 
     xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
-    rbNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart );
+    rbNext = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nTempStart );
     nTempStart=(xub_StrLen)pMEdit->GetSelection().Min();
     pData->SetFStart(nTempStart);
-    rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart );
+    rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, sal_True, nTempStart );
 }
 // -----------------------------------------------------------------------------
 
@@ -945,7 +945,7 @@ void FormulaDlg_Impl::ClearAllParas()
         aFtEditName.Hide();
         pParaWin->Hide();
 
-        aBtnForward.Enable(TRUE); //@new
+        aBtnForward.Enable(sal_True); //@new
         aFtHeadLine.Show();
         aFtFuncName.Show();
         aFtFuncDesc.Show();
@@ -976,7 +976,7 @@ String FormulaDlg_Impl::RepairFormula(const String& aFormula)
     return aResult;
 }
 
-void FormulaDlg_Impl::DoEnter(BOOL bOk)
+void FormulaDlg_Impl::DoEnter(sal_Bool bOk)
 {
     //  Eingabe ins Dokument uebernehmen oder abbrechen
     if ( bOk)
@@ -1003,11 +1003,11 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
 {
     if ( pBtn == &aBtnCancel )
     {
-        DoEnter(FALSE);                 // schliesst den Dialog
+        DoEnter(sal_False);                 // schliesst den Dialog
     }
     else if ( pBtn == &aBtnEnd )
     {
-        DoEnter(TRUE);                  // schliesst den Dialog
+        DoEnter(sal_True);                  // schliesst den Dialog
     }
     else if ( pBtn == &aBtnForward )
     {
@@ -1015,19 +1015,19 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
         const IFunctionDescription* pDesc =pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
 
         if(pDesc==pFuncDesc || !pFuncPage->IsVisible())
-            EditNextFunc( TRUE );
+            EditNextFunc( sal_True );
         else
         {
             DblClkHdl(pFuncPage);      //new
-            aBtnForward.Enable(FALSE); //new
+            aBtnForward.Enable(sal_False); //new
         }
-        //@EditNextFunc( TRUE );
+        //@EditNextFunc( sal_True );
     }
     else if ( pBtn == &aBtnBackward )
     {
-        bEditFlag=FALSE;
-        aBtnForward.Enable(TRUE);
-        EditNextFunc( FALSE );
+        bEditFlag=sal_False;
+        aBtnForward.Enable(sal_True);
+        EditNextFunc( sal_False );
         aMEFormula.Invalidate();
         aMEFormula.Update();
     }
@@ -1061,11 +1061,11 @@ void FormulaDlg_Impl::UpdateFunctionDesc()
     FormEditData* pData = m_pHelper->getFormEditData();
     if (!pData)
         return;
-    USHORT nCat = pFuncPage->GetCategory();
+    sal_uInt16 nCat = pFuncPage->GetCategory();
     if ( nCat == LISTBOX_ENTRY_NOTFOUND )
         nCat = 0;
     pData->SetCatSel( nCat );
-    USHORT nFunc = pFuncPage->GetFunction();
+    sal_uInt16 nFunc = pFuncPage->GetFunction();
     if ( nFunc == LISTBOX_ENTRY_NOTFOUND )
         nFunc = 0;
     pData->SetFuncSel( nFunc );
@@ -1104,7 +1104,7 @@ void FormulaDlg_Impl::UpdateFunctionDesc()
 
 IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG )
 {
-    USHORT nFunc = pFuncPage->GetFunction();
+    sal_uInt16 nFunc = pFuncPage->GetFunction();
 
     //  ex-UpdateLRUList
     const IFunctionDescription* pDesc = pFuncPage->GetFuncDesc(nFunc);
@@ -1130,7 +1130,7 @@ IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG )
     }
 
     pParaWin->SetEdFocus(0);
-    aBtnForward.Enable(FALSE); //@New
+    aBtnForward.Enable(sal_False); //@New
 
     return 0;
 }
@@ -1184,11 +1184,11 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart)
     xub_StrLen nNextFStart  = nFStart;
     xub_StrLen nNextFEnd    = 0;
 
-    BOOL bFound;
+    sal_Bool bFound;
 
-    //@bFound = m_pHelper->getNextFunction( aFormula, FALSE, nNextFStart, &nNextFEnd, &pFuncDesc );
+    //@bFound = m_pHelper->getNextFunction( aFormula, sal_False, nNextFStart, &nNextFEnd, &pFuncDesc );
 
-    bFound = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nNextFStart, &nNextFEnd);
+    bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd);
     if ( bFound )
     {
         xub_StrLen PrivStart, PrivEnd;
@@ -1201,7 +1201,7 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart)
     }
 }
 
-void FormulaDlg_Impl::EditNextFunc( BOOL bForward, xub_StrLen nFStart )
+void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, xub_StrLen nFStart )
 {
     FormEditData* pData = m_pHelper->getFormEditData();
     if (!pData)
@@ -1221,18 +1221,18 @@ void FormulaDlg_Impl::EditNextFunc( BOOL bForward, xub_StrLen nFStart )
     xub_StrLen nNextFStart  = 0;
     xub_StrLen nNextFEnd    = 0;
 
-    BOOL bFound;
+    sal_Bool bFound;
     if ( bForward )
     {
         nNextFStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
-        //@bFound = m_pHelper->getNextFunction( aFormula, FALSE, nNextFStart, &nNextFEnd, &pFuncDesc );
-        bFound = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nNextFStart, &nNextFEnd);
+        //@bFound = m_pHelper->getNextFunction( aFormula, sal_False, nNextFStart, &nNextFEnd, &pFuncDesc );
+        bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd);
     }
     else
     {
         nNextFStart = nFStart;
-        //@bFound = m_pHelper->getNextFunction( aFormula, TRUE, nNextFStart, &nNextFEnd, &pFuncDesc );
-        bFound = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nNextFStart, &nNextFEnd);
+        //@bFound = m_pHelper->getNextFunction( aFormula, sal_True, nNextFStart, &nNextFEnd, &pFuncDesc );
+        bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_True, nNextFStart, &nNextFEnd);
     }
 
     if ( bFound )
@@ -1261,18 +1261,18 @@ void FormulaDlg_Impl::EditFuncParas(xub_StrLen nEditPos)
         m_aFormulaHelper.GetArgStrings(m_aArguments,aFormula, nFStart, nArgs );
 //      m_aArguments = ScFormulaUtil::GetArgStrings( aFormula, nFStart, nArgs );
 
-        USHORT nActiv=pParaWin->GetSliderPos();
-        BOOL    bFlag=FALSE;
+        sal_uInt16 nActiv=pParaWin->GetSliderPos();
+        sal_Bool    bFlag=sal_False;
         ::std::vector< ::rtl::OUString >::iterator aIter = m_aArguments.begin();
         ::std::vector< ::rtl::OUString >::iterator aEnd = m_aArguments.end();
-        for(USHORT i=0;aIter != aEnd;i++,++aIter)
+        for(sal_uInt16 i=0;aIter != aEnd;i++,++aIter)
         {
             sal_Int32 nLength=(*aIter).getLength();
             pParaWin->SetArgument(i,(*aIter));
             if(nArgPos<=nEditPos && nEditPos<nArgPos+nLength)
             {
                 nActiv=i;
-                bFlag=TRUE;
+                bFlag=sal_True;
             }
             nArgPos+=nLength+1;
         }
@@ -1288,11 +1288,11 @@ void FormulaDlg_Impl::EditFuncParas(xub_StrLen nEditPos)
 
 }
 
-void FormulaDlg_Impl::SaveArg( USHORT nEd )
+void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
 {
     if (nEd<nArgs)
     {
-        USHORT i;
+        sal_uInt16 i;
         for(i=0;i<=nEd;i++)
         {
             if ( m_aArguments[i].getLength() == 0 )
@@ -1301,7 +1301,7 @@ void FormulaDlg_Impl::SaveArg( USHORT nEd )
         if(pParaWin->GetArgument(nEd).Len()!=0)
             m_aArguments[nEd] = pParaWin->GetArgument(nEd);
 
-        USHORT nClearPos=nEd+1;
+        sal_uInt16 nClearPos=nEd+1;
         for(i=nEd+1;i<nArgs;i++)
         {
             if(pParaWin->GetArgument(i).Len()!=0)
@@ -1321,14 +1321,14 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr )
 {
     if(pPtr==pParaWin)
     {
-        aBtnForward.Enable(TRUE); //@ Damit eine neue Fkt eingegeben werden kann.
+        aBtnForward.Enable(sal_True); //@ Damit eine neue Fkt eingegeben werden kann.
         aTabCtrl.SetCurPageId(TP_FUNCTION);
 
         String aUndoStr = m_pHelper->getCurrentFormula();       // bevor unten ein ";" eingefuegt wird
         FormEditData* pData = m_pHelper->getFormEditData();
         if (!pData) return 0;
 
-        USHORT nArgNo = pParaWin->GetActiveLine();
+        sal_uInt16 nArgNo = pParaWin->GetActiveLine();
         nEdFocus=nArgNo;
 
         SaveArg(nArgNo);
@@ -1341,12 +1341,12 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr )
 
         pData->SetEdFocus( nEdFocus );
         pData->SaveValues();
-        pData->SetMode( (USHORT) FORMULA_FORMDLG_FORMULA );
+        pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA );
         pData->SetFStart( n1 );
         pData->SetUndoStr( aUndoStr );
         ClearAllParas();
 
-        FillDialog(FALSE);
+        FillDialog(sal_False);
         pFuncPage->SetFocus(); //Da Parawin nicht mehr sichtbar
     }
     return 0;
@@ -1371,7 +1371,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
     FormEditData* pData = m_pHelper->getFormEditData();
     if (!pData) return 0;
 
-    bEditFlag=TRUE;
+    bEditFlag=sal_True;
     String      aInputFormula=m_pHelper->getCurrentFormula();
     String      aString=pMEdit->GetText();
 
@@ -1418,7 +1418,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
     if(nPos<aSel.Min()-1)
     {
         xub_StrLen nPos1=aString.Search('(',nPos);
-        EditNextFunc( FALSE, nPos1);
+        EditNextFunc( sal_False, nPos1);
     }
     else
     {
@@ -1426,7 +1426,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
     }
 
     m_pHelper->setSelection((xub_StrLen)aSel.Min(),(xub_StrLen)aSel.Max());
-    bEditFlag=FALSE;
+    bEditFlag=sal_False;
     return 0;
 }
 
@@ -1436,7 +1436,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG )
     if (!pData) return 0;
     xub_StrLen nFStart = pData->GetFStart();
 
-    bEditFlag=TRUE;
+    bEditFlag=sal_True;
 
     String      aInputFormula=m_pHelper->getCurrentFormula();
     String      aString=pMEdit->GetText();
@@ -1479,7 +1479,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG )
                 }
                 if(nCount==0)
                 {
-                    nFStart=m_aFormulaHelper.GetFunctionStart(aString,n,TRUE);
+                    nFStart=m_aFormulaHelper.GetFunctionStart(aString,n,sal_True);
                     EditThisFunc(nFStart);
                 }
                 else
@@ -1495,7 +1495,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG )
     }
     m_pHelper->setSelection((xub_StrLen)aSel.Min(),(xub_StrLen)aSel.Max());
 
-    bEditFlag=FALSE;
+    bEditFlag=sal_False;
     return 0;
 }
 
@@ -1514,16 +1514,16 @@ void FormulaDlg_Impl::UpdateSelection()
     String aFormula=pMEdit->GetText();
     sal_Int32 nArgPos=m_aFormulaHelper.GetArgStart( aFormula,PrivStart,0);
 
-    USHORT nPos=pParaWin->GetActiveLine();
+    sal_uInt16 nPos=pParaWin->GetActiveLine();
 
-    for(USHORT i=0;i<nPos;i++)
+    for(sal_uInt16 i=0;i<nPos;i++)
     {
         nArgPos += (m_aArguments[i].getLength() + 1);
     }
     sal_Int32 nLength= m_aArguments[nPos].getLength();
 
     Selection aSel(nArgPos,nArgPos+nLength);
-    m_pHelper->setSelection((USHORT)nArgPos,(USHORT)(nArgPos+nLength));
+    m_pHelper->setSelection((sal_uInt16)nArgPos,(sal_uInt16)(nArgPos+nLength));
     pMEdit->SetSelection(aSel);
     aMEFormula.UpdateOldSel();
 }
@@ -1569,7 +1569,7 @@ void FormulaDlg_Impl::RefInputStartAfter( RefEdit* /*pEdit*/, RefButton* /*pButt
         m_pParent->SetText( MnemonicGenerator::EraseAllMnemonicChars( aStr ) );
     }
 }
-void FormulaDlg_Impl::RefInputDoneAfter( BOOL bForced )
+void FormulaDlg_Impl::RefInputDoneAfter( sal_Bool bForced )
 {
     aRefBtn.SetStartImage();
     if( bForced || !aRefBtn.IsVisible() )
@@ -1584,7 +1584,7 @@ void FormulaDlg_Impl::RefInputDoneAfter( BOOL bForced )
             if( pTheRefButton )
                 pTheRefButton->SetStartImage();
 
-            USHORT nPrivActiv = pParaWin->GetActiveLine();
+            sal_uInt16 nPrivActiv = pParaWin->GetActiveLine();
             pParaWin->SetArgument( nPrivActiv, aEdRef.GetText() );
             ModifyHdl( pParaWin );
             pTheRefEdit = NULL;
@@ -1617,7 +1617,7 @@ void FormulaDlg_Impl::Update(const String& _sExp)
 {
     CalcStruct(_sExp);
     FillDialog();
-    //aBtnForward.Enable(TRUE); //@New
+    //aBtnForward.Enable(sal_True); //@New
     FuncSelHdl(NULL);
 }
 void FormulaDlg_Impl::SetMeText(const String& _sText)
@@ -1627,7 +1627,7 @@ void FormulaDlg_Impl::SetMeText(const String& _sText)
     pMEdit->SetSelection( pData->GetSelection());
     aMEFormula.UpdateOldSel();
 }
-FormulaDlgMode FormulaDlg_Impl::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate)
+FormulaDlgMode FormulaDlg_Impl::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate)
 {
     FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA;
     if(!bEditFlag)
@@ -1646,11 +1646,11 @@ FormulaDlgMode FormulaDlg_Impl::SetMeText(const String& _sText,xub_StrLen PrivSt
     } // if ( _bUpdate )
     return eMode;
 }
-BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula)
+sal_Bool FormulaDlg_Impl::CheckMatrix(String& aFormula)
 {
     pMEdit->GrabFocus();
     xub_StrLen nLen = aFormula.Len();
-    BOOL bMatrix =  nLen > 3                    // Matrix-Formel ?
+    sal_Bool bMatrix =  nLen > 3                    // Matrix-Formel ?
             && aFormula.GetChar(0) == '{'
             && aFormula.GetChar(1) == '='
             && aFormula.GetChar(nLen-1) == '}';
@@ -1667,8 +1667,8 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula)
 }
 IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, pStruP )
 {
-    bStructUpdate=FALSE;
-    if(pStructPage->IsVisible())    aBtnForward.Enable(FALSE); //@New
+    bStructUpdate=sal_False;
+    if(pStructPage->IsVisible())    aBtnForward.Enable(sal_False); //@New
 
     if(pStructPage==pStruP)
     {
@@ -1705,20 +1705,20 @@ IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, pStruP )
         //}
 
     }
-    bStructUpdate=TRUE;
+    bStructUpdate=sal_True;
     return 0;
 }
 IMPL_LINK( FormulaDlg_Impl, MatrixHdl, CheckBox *, EMPTYARG )
 {
-    bUserMatrixFlag=TRUE;
+    bUserMatrixFlag=sal_True;
     return 0;
 }
 
 IMPL_LINK( FormulaDlg_Impl, FuncSelHdl, FuncPage*, EMPTYARG )
 {
-    USHORT nCat = pFuncPage->GetCategory();
+    sal_uInt16 nCat = pFuncPage->GetCategory();
     if ( nCat == LISTBOX_ENTRY_NOTFOUND ) nCat = 0;
-    USHORT nFunc = pFuncPage->GetFunction();
+    sal_uInt16 nFunc = pFuncPage->GetFunction();
     if ( nFunc == LISTBOX_ENTRY_NOTFOUND ) nFunc = 0;
 
     if (   (pFuncPage->GetFunctionEntryCount() > 0)
@@ -1726,7 +1726,7 @@ IMPL_LINK( FormulaDlg_Impl, FuncSelHdl, FuncPage*, EMPTYARG )
     {
         const IFunctionDescription* pDesc =pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
 
-        if(pDesc!=pFuncDesc) aBtnForward.Enable(TRUE); //new
+        if(pDesc!=pFuncDesc) aBtnForward.Enable(sal_True); //new
 
         if (pDesc)
         {
@@ -1757,7 +1757,7 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection,const String& _
     //-------------------------------------
     // Manuelles Update der Ergebnisfelder:
     //-------------------------------------
-    USHORT nPrivActiv = pParaWin->GetActiveLine();
+    sal_uInt16 nPrivActiv = pParaWin->GetActiveLine();
     pParaWin->SetArgument(nPrivActiv,aEdRef.GetText());
     pParaWin->UpdateParas();
 
@@ -1765,11 +1765,11 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection,const String& _
     if( pEd != NULL )
         pEd->SetSelection( theSel );
 
-    pParaWin->SetRefMode(FALSE);
+    pParaWin->SetRefMode(sal_False);
 }
-BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
+sal_Bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
 {
-    pParaWin->SetRefMode(TRUE);
+    pParaWin->SetRefMode(sal_True);
 
     String      aStrEd;
     Edit* pEd = GetCurrRefEdit();
@@ -1810,9 +1810,9 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin)
     }
     else
     {
-        USHORT nCount=pWin->GetChildCount();
+        sal_uInt16 nCount=pWin->GetChildCount();
 
-        for(USHORT i=0;i<nCount;i++)
+        for(sal_uInt16 i=0;i<nCount;i++)
         {
             Window* pChild=pWin->GetChild(i);
             aUniqueId=FindFocusWin(pChild);
@@ -1873,7 +1873,7 @@ void FormulaModalDialog::SetMeText(const String& _sText)
 }
 
 // -----------------------------------------------------------------------------
-FormulaDlgMode FormulaModalDialog::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate)
+FormulaDlgMode FormulaModalDialog::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate)
 {
     return m_pImpl->SetMeText(_sText,PrivStart, PrivEnd,bMatrix,_bSelect,_bUpdate);
 }
@@ -1883,7 +1883,7 @@ void FormulaModalDialog::CheckMatrix()
     m_pImpl->aBtnMatrix.Check();
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaModalDialog::CheckMatrix(String& aFormula)
+sal_Bool FormulaModalDialog::CheckMatrix(String& aFormula)
 {
     return m_pImpl->CheckMatrix(aFormula);
 }
@@ -1903,11 +1903,11 @@ const FormulaHelper& FormulaModalDialog::GetFormulaHelper() const
     return m_pImpl->GetFormulaHelper();
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaModalDialog::isUserMatrix() const
+sal_Bool FormulaModalDialog::isUserMatrix() const
 {
     return m_pImpl->bUserMatrixFlag;
 }
-void FormulaModalDialog::DoEnter(BOOL _bOk)
+void FormulaModalDialog::DoEnter(sal_Bool _bOk)
 {
     m_pImpl->DoEnter(_bOk);
 }
@@ -1919,7 +1919,7 @@ void FormulaModalDialog::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton
 {
     m_pImpl->RefInputStartAfter( pEdit, pButton );
 }
-void FormulaModalDialog::RefInputDoneAfter( BOOL bForced )
+void FormulaModalDialog::RefInputDoneAfter( sal_Bool bForced )
 {
     m_pImpl->RefInputDoneAfter( bForced );
 }
@@ -1937,9 +1937,9 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
     }
     else
     {
-        USHORT nCount=pWin->GetChildCount();
+        sal_uInt16 nCount=pWin->GetChildCount();
 
-        for(USHORT i=0;i<nCount;i++)
+        for(sal_uInt16 i=0;i<nCount;i++)
         {
             Window* pChild=pWin->GetChild(i);
             SetFocusWin(pChild,nUniqueId);
@@ -1975,7 +1975,7 @@ void FormulaModalDialog::UpdateParaWin(const Selection& _rSelection,const String
 {
     m_pImpl->UpdateParaWin(_rSelection,_sRefStr);
 }
-BOOL FormulaModalDialog::UpdateParaWin(Selection& _rSelection)
+sal_Bool FormulaModalDialog::UpdateParaWin(Selection& _rSelection)
 {
     return m_pImpl->UpdateParaWin(_rSelection);
 }
@@ -2029,7 +2029,7 @@ void FormulaDlg::SetMeText(const String& _sText)
 }
 
 // -----------------------------------------------------------------------------
-FormulaDlgMode FormulaDlg::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate)
+FormulaDlgMode FormulaDlg::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate)
 {
     return m_pImpl->SetMeText(_sText,PrivStart, PrivEnd,bMatrix,_bSelect,_bUpdate);
 }
@@ -2039,7 +2039,7 @@ void FormulaDlg::CheckMatrix()
     m_pImpl->aBtnMatrix.Check();
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaDlg::CheckMatrix(String& aFormula)
+sal_Bool FormulaDlg::CheckMatrix(String& aFormula)
 {
     return m_pImpl->CheckMatrix(aFormula);
 }
@@ -2058,11 +2058,11 @@ void FormulaDlg::Update()
 }
 
 // -----------------------------------------------------------------------------
-BOOL FormulaDlg::isUserMatrix() const
+sal_Bool FormulaDlg::isUserMatrix() const
 {
     return m_pImpl->bUserMatrixFlag;
 }
-void FormulaDlg::DoEnter(BOOL _bOk)
+void FormulaDlg::DoEnter(sal_Bool _bOk)
 {
     m_pImpl->DoEnter(_bOk);
 }
@@ -2074,7 +2074,7 @@ void FormulaDlg::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton )
 {
     m_pImpl->RefInputStartAfter( pEdit, pButton );
 }
-void FormulaDlg::RefInputDoneAfter( BOOL bForced )
+void FormulaDlg::RefInputDoneAfter( sal_Bool bForced )
 {
     m_pImpl->RefInputDoneAfter( bForced );
 }
@@ -2092,9 +2092,9 @@ void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
     }
     else
     {
-        USHORT nCount=pWin->GetChildCount();
+        sal_uInt16 nCount=pWin->GetChildCount();
 
-        for(USHORT i=0;i<nCount;i++)
+        for(sal_uInt16 i=0;i<nCount;i++)
         {
             Window* pChild=pWin->GetChild(i);
             SetFocusWin(pChild,nUniqueId);
@@ -2129,7 +2129,7 @@ void FormulaDlg::UpdateParaWin(const Selection& _rSelection,const String& _sRefS
 {
     m_pImpl->UpdateParaWin(_rSelection,_sRefStr);
 }
-BOOL FormulaDlg::UpdateParaWin(Selection& _rSelection)
+sal_Bool FormulaDlg::UpdateParaWin(Selection& _rSelection)
 {
     return m_pImpl->UpdateParaWin(_rSelection);
 }
@@ -2180,7 +2180,7 @@ void FormEditData::Reset()
     nFuncSel = 0;
     nOffset = 0;
     nEdFocus = 0;
-    bMatrix =FALSE;
+    bMatrix =sal_False;
     aUniqueId=rtl::OString();
     aSelection.Min()=0;
     aSelection.Max()=0;
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 1f8b64c7b4ba..6c2d0c757e9a 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -69,7 +69,7 @@ long FormulaListBox::PreNotify( NotifyEvent& rNEvt )
 
     long nResult=ListBox::PreNotify(rNEvt);
 
-    USHORT nSwitch=aNotifyEvt.GetType();
+    sal_uInt16 nSwitch=aNotifyEvt.GetType();
     if(nSwitch==EVENT_KEYINPUT)
     {
         KeyInput(*aNotifyEvt.GetKeyEvent());
@@ -81,7 +81,7 @@ long FormulaListBox::PreNotify( NotifyEvent& rNEvt )
 
 //============================================================================
 
-inline USHORT Lb2Cat( USHORT nLbPos )
+inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos )
 {
     // Kategorie 0 == LRU, sonst Categories == LbPos-1
     if ( nLbPos > 0 )
@@ -134,15 +134,15 @@ void FuncPage::impl_addFunctions(const IFunctionCategory* _pCategory)
 
 void FuncPage::UpdateFunctionList()
 {
-    USHORT  nSelPos   = aLbCategory.GetSelectEntryPos();
+    sal_uInt16  nSelPos   = aLbCategory.GetSelectEntryPos();
     const IFunctionCategory* pCategory = static_cast<const IFunctionCategory*>(aLbCategory.GetEntryData(nSelPos));
-    USHORT  nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
+    sal_uInt16  nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
                             ? Lb2Cat( nSelPos ) : 0;
 
     (void)nCategory;
 
     aLbFunction.Clear();
-    aLbFunction.SetUpdateMode( FALSE );
+    aLbFunction.SetUpdateMode( sal_False );
     //------------------------------------------------------
 
     if ( nSelPos > 0 )
@@ -177,7 +177,7 @@ void FuncPage::UpdateFunctionList()
     }
 
     //------------------------------------------------------
-    aLbFunction.SetUpdateMode( TRUE );
+    aLbFunction.SetUpdateMode( sal_True );
     aLbFunction.SelectEntryPos(0);
 
     if(IsVisible()) SelHdl(&aLbFunction);
@@ -210,16 +210,16 @@ IMPL_LINK( FuncPage, DblClkHdl, ListBox*, EMPTYARG )
     return 0;
 }
 
-void FuncPage::SetCategory(USHORT nCat)
+void FuncPage::SetCategory(sal_uInt16 nCat)
 {
     aLbCategory.SelectEntryPos(nCat);
     UpdateFunctionList();
 }
-USHORT FuncPage::GetFuncPos(const IFunctionDescription* _pDesc)
+sal_uInt16 FuncPage::GetFuncPos(const IFunctionDescription* _pDesc)
 {
     return aLbFunction.GetEntryPos(_pDesc);
 }
-void FuncPage::SetFunction(USHORT nFunc)
+void FuncPage::SetFunction(sal_uInt16 nFunc)
 {
     aLbFunction.SelectEntryPos(nFunc);
 }
@@ -229,17 +229,17 @@ void FuncPage::SetFocus()
     aLbFunction.GrabFocus();
 }
 
-USHORT FuncPage::GetCategory()
+sal_uInt16 FuncPage::GetCategory()
 {
     return aLbCategory.GetSelectEntryPos();
 }
 
-USHORT FuncPage::GetFunction()
+sal_uInt16 FuncPage::GetFunction()
 {
     return aLbFunction.GetSelectEntryPos();
 }
 
-USHORT FuncPage::GetFunctionEntryCount()
+sal_uInt16 FuncPage::GetFunctionEntryCount()
 {
     return aLbFunction.GetSelectEntryCount();
 }
@@ -248,7 +248,7 @@ String FuncPage::GetSelFunctionName() const
 {
     return aLbFunction.GetSelectEntry();
 }
-const IFunctionDescription* FuncPage::GetFuncDesc( USHORT nPos ) const
+const IFunctionDescription* FuncPage::GetFuncDesc( sal_uInt16 nPos ) const
 {
     // nicht schoen, aber hoffentlich selten
     return (const IFunctionDescription*) aLbFunction.GetEntryData(nPos);
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 225114ff00aa..cce9a76f324c 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -99,15 +99,15 @@ public:
 
                     FuncPage( Window* pParent,const IFunctionManager* _pFunctionManager);
 
-    void            SetCategory(USHORT nCat);
-    void            SetFunction(USHORT nFunc);
+    void            SetCategory(sal_uInt16 nCat);
+    void            SetFunction(sal_uInt16 nFunc);
     void            SetFocus();
-    USHORT          GetCategory();
-    USHORT          GetFunction();
-    USHORT          GetFunctionEntryCount();
+    sal_uInt16          GetCategory();
+    sal_uInt16          GetFunction();
+    sal_uInt16          GetFunctionEntryCount();
 
-    USHORT          GetFuncPos(const IFunctionDescription* _pDesc);
-    const IFunctionDescription* GetFuncDesc( USHORT nPos ) const;
+    sal_uInt16          GetFuncPos(const IFunctionDescription* _pDesc);
+    const IFunctionDescription* GetFuncDesc( sal_uInt16 nPos ) const;
     String          GetSelFunctionName() const;
 
     void            SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; }
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index c4e28b3da8f1..b1427f067c9d 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -49,7 +49,7 @@ namespace formula
 ValWnd::ValWnd( Window* pParent, const ResId& rId ) : Window( pParent, rId )
 {
     Font aFnt( GetFont() );
-    aFnt.SetTransparent( TRUE );
+    aFnt.SetTransparent( sal_True );
     aFnt.SetWeight( WEIGHT_LIGHT );
     if ( pParent->IsBackground() )
     {
@@ -110,7 +110,7 @@ ArgEdit::ArgEdit( Window* pParent, const ResId& rResId )
 //----------------------------------------------------------------------------
 
 void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
-                    ScrollBar& rArgSlider, USHORT nArgCount )
+                    ScrollBar& rArgSlider, sal_uInt16 nArgCount )
 {
     pEdPrev = pPrevEdit;
     pEdNext = pNextEdit;
@@ -125,8 +125,8 @@ void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
 void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt )
 {
     KeyCode     aCode   = rKEvt.GetKeyCode();
-    BOOL        bUp     = (aCode.GetCode() == KEY_UP);
-    BOOL        bDown   = (aCode.GetCode() == KEY_DOWN);
+    sal_Bool        bUp     = (aCode.GetCode() == KEY_UP);
+    sal_Bool        bDown   = (aCode.GetCode() == KEY_DOWN);
     ArgEdit*    pEd     = NULL;
 
     if (   pSlider
@@ -136,8 +136,8 @@ void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt )
         if ( nArgs > 1 )
         {
             long    nThumb       = pSlider->GetThumbPos();
-            BOOL    bDoScroll    = FALSE;
-            BOOL    bChangeFocus = FALSE;
+            sal_Bool    bDoScroll    = sal_False;
+            sal_Bool    bChangeFocus = sal_False;
 
             if ( bDown )
             {
@@ -151,13 +151,13 @@ void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt )
                     else
                     {
                         pEd = pEdNext;
-                        bChangeFocus = TRUE;
+                        bChangeFocus = sal_True;
                     }
                 }
                 else if ( pEdNext )
                 {
                     pEd = pEdNext;
-                    bChangeFocus = TRUE;
+                    bChangeFocus = sal_True;
                 }
             }
             else // if ( bUp )
@@ -172,13 +172,13 @@ void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt )
                     else
                     {
                         pEd = pEdPrev;
-                        bChangeFocus = TRUE;
+                        bChangeFocus = sal_True;
                     }
                 }
                 else if ( pEdPrev )
                 {
                     pEd = pEdPrev;
-                    bChangeFocus = TRUE;
+                    bChangeFocus = sal_True;
                 }
             }
 
@@ -743,7 +743,7 @@ EditBox::EditBox(   Window* pParent,WinBits nWinStyle)
 #************************************************************************/
 EditBox::EditBox( Window* pParent, const ResId& rResId )
         :Control(pParent,rResId),
-        bMouseFlag(FALSE)
+        bMouseFlag(sal_False)
 {
     WinBits nStyle=GetStyle();
     SetStyle( nStyle| WB_DIALOGCONTROL);
@@ -849,15 +849,15 @@ void EditBox::GetFocus()
 #************************************************************************/
 long EditBox::PreNotify( NotifyEvent& rNEvt )
 {
-    long nResult=TRUE;
+    long nResult=sal_True;
 
     if(pMEdit==NULL) return nResult;
 
-    USHORT nSwitch=rNEvt.GetType();
+    sal_uInt16 nSwitch=rNEvt.GetType();
     if(nSwitch==EVENT_KEYINPUT)// || nSwitch==EVENT_KEYUP)
     {
         const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nKey=aKeyCode.GetCode();
+        sal_uInt16 nKey=aKeyCode.GetCode();
         if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB )
         {
             nResult=GetParent()->Notify(rNEvt);
@@ -875,7 +875,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
 
         if(nSwitch==EVENT_MOUSEBUTTONDOWN || nSwitch==EVENT_MOUSEBUTTONUP)
         {
-            bMouseFlag=TRUE;
+            bMouseFlag=sal_True;
             Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ) );
         }
     }
@@ -930,7 +930,7 @@ void EditBox::UpdateOldSel()
 RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ) :
     Edit( _pParent, rResId ),
     pAnyRefDlg( pParent ),
-    bSilentFocus( FALSE )
+    bSilentFocus( sal_False )
 {
     aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) );
     aTimer.SetTimeout( SC_ENABLE_TIME );
@@ -939,7 +939,7 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI
 RefEdit::RefEdit( Window* pParent, const ResId& rResId ) :
     Edit( pParent, rResId ),
     pAnyRefDlg( NULL ),
-    bSilentFocus( FALSE )
+    bSilentFocus( sal_False )
 {
 }
 
@@ -967,9 +967,9 @@ void RefEdit::StartUpdateData()
 
 void RefEdit::SilentGrabFocus()
 {
-    bSilentFocus = TRUE;
+    bSilentFocus = sal_True;
     GrabFocus();
-    bSilentFocus = FALSE;
+    bSilentFocus = sal_False;
 }
 
 void RefEdit::SetRefDialog( IControlReferenceHandler* pDlg )
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 5e656aea0967..e51f9dc8a9c8 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -79,7 +79,7 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     aSlider         ( this, ModuleRes( WND_SLIDER ) ),
     m_sOptional     ( ModuleRes( STR_OPTIONAL ) ),
     m_sRequired     ( ModuleRes( STR_REQUIRED ) ),
-    bRefMode        (FALSE)
+    bRefMode        (sal_False)
 {
     Image aFxHC( ModuleRes( IMG_FX_H ) );
     FreeResource();
@@ -106,13 +106,13 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     ClearAll();
 }
 
-void ParaWin::UpdateArgDesc( USHORT nArg )
+void ParaWin::UpdateArgDesc( sal_uInt16 nArg )
 {
     if (nArg==NOT_FOUND) return;
 
     if ( nArgs > 4 )
-        nArg = sal::static_int_cast<USHORT>( nArg + GetSliderPos() );
-        //@ nArg += (USHORT)aSlider.GetThumbPos();
+        nArg = sal::static_int_cast<sal_uInt16>( nArg + GetSliderPos() );
+        //@ nArg += (sal_uInt16)aSlider.GetThumbPos();
 
     if ( (nArgs > 0) && (nArg<nArgs) )
     {
@@ -124,7 +124,7 @@ void ParaWin::UpdateArgDesc( USHORT nArg )
 
         if ( nArgs < VAR_ARGS )
         {
-            USHORT nRealArg = (aVisibleArgMapping.size() < nArg) ? aVisibleArgMapping[nArg] : nArg;
+            sal_uInt16 nRealArg = (aVisibleArgMapping.size() < nArg) ? aVisibleArgMapping[nArg] : nArg;
             aArgDesc  = pFuncDesc->getParameterDescription(nRealArg);
             aArgName  = pFuncDesc->getParameterName(nRealArg);
             aArgName += ' ';
@@ -132,9 +132,9 @@ void ParaWin::UpdateArgDesc( USHORT nArg )
         }
         else
         {
-            USHORT nFix = nArgs - VAR_ARGS;
-            USHORT nPos = ( nArg < nFix ? nArg : nFix );
-            USHORT nRealArg = (nPos < aVisibleArgMapping.size() ?
+            sal_uInt16 nFix = nArgs - VAR_ARGS;
+            sal_uInt16 nPos = ( nArg < nFix ? nArg : nFix );
+            sal_uInt16 nRealArg = (nPos < aVisibleArgMapping.size() ?
                     aVisibleArgMapping[nPos] : aVisibleArgMapping.back());
             aArgDesc  = pFuncDesc->getParameterDescription(nRealArg);
             aArgName  = pFuncDesc->getParameterName(nRealArg);
@@ -150,14 +150,14 @@ void ParaWin::UpdateArgDesc( USHORT nArg )
     }
 }
 
-void ParaWin::UpdateArgInput( USHORT nOffset, USHORT i )
+void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i )
 {
-    USHORT nArg = nOffset + i;
+    sal_uInt16 nArg = nOffset + i;
     if ( nArgs < VAR_ARGS)
     {
         if(nArg<nArgs)
         {
-            USHORT nRealArg = aVisibleArgMapping[nArg];
+            sal_uInt16 nRealArg = aVisibleArgMapping[nArg];
             SetArgNameFont  (i,(pFuncDesc->isParameterOptional(nRealArg))
                                             ? aFntLight : aFntBold );
             SetArgName      (i,pFuncDesc->getParameterName(nRealArg));
@@ -165,9 +165,9 @@ void ParaWin::UpdateArgInput( USHORT nOffset, USHORT i )
     }
     else
     {
-        USHORT nFix = nArgs - VAR_ARGS;
-        USHORT nPos = ( nArg < nFix ? nArg : nFix );
-        USHORT nRealArg = (nPos < aVisibleArgMapping.size() ?
+        sal_uInt16 nFix = nArgs - VAR_ARGS;
+        sal_uInt16 nPos = ( nArg < nFix ? nArg : nFix );
+        sal_uInt16 nRealArg = (nPos < aVisibleArgMapping.size() ?
                 aVisibleArgMapping[nPos] : aVisibleArgMapping.back());
         SetArgNameFont( i,
                 (nArg > nFix || pFuncDesc->isParameterOptional(nRealArg)) ?
@@ -197,12 +197,12 @@ ParaWin::~ParaWin()
     aBtnFx4.SetGetFocusHdl( aEmptyLink );
 }
 
-USHORT ParaWin::GetActiveLine()
+sal_uInt16 ParaWin::GetActiveLine()
 {
     return nActiveLine;
 }
 
-void ParaWin::SetActiveLine(USHORT no)
+void ParaWin::SetActiveLine(sal_uInt16 no)
 {
     if(no<nArgs)
     {
@@ -212,10 +212,10 @@ void ParaWin::SetActiveLine(USHORT no)
         if(nNewEdPos<0 || nNewEdPos>3)
         {
             nOffset+=nNewEdPos;
-            SetSliderPos((USHORT) nOffset);
+            SetSliderPos((sal_uInt16) nOffset);
             nOffset=GetSliderPos();
         }
-        nEdFocus=no-(USHORT)nOffset;
+        nEdFocus=no-(sal_uInt16)nOffset;
         UpdateArgDesc( nEdFocus );
     }
 }
@@ -233,7 +233,7 @@ RefEdit* ParaWin::GetActiveEdit()
 }
 
 
-String ParaWin::GetArgument(USHORT no)
+String ParaWin::GetArgument(sal_uInt16 no)
 {
     String aStr;
     if(no<aParaArray.size())
@@ -256,7 +256,7 @@ String  ParaWin::GetActiveArgName()
 }
 
 
-void ParaWin::SetArgument(USHORT no, const String& aString)
+void ParaWin::SetArgument(sal_uInt16 no, const String& aString)
 {
     if(no<aParaArray.size())
     {
@@ -334,32 +334,32 @@ void ParaWin::SetEditDesc(const String& aText)
     aFtEditDesc.SetText(aText);
 }
 
-void ParaWin::SetArgName(USHORT no,const String& aText)
+void ParaWin::SetArgName(sal_uInt16 no,const String& aText)
 {
     aArgInput[no].SetArgName(aText);
 }
 
-void ParaWin::SetArgNameFont(USHORT no,const Font& aFont)
+void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont)
 {
     aArgInput[no].SetArgNameFont(aFont);
 }
 
-void ParaWin::SetArgVal(USHORT no,const String& aText)
+void ParaWin::SetArgVal(sal_uInt16 no,const String& aText)
 {
     aArgInput[no].SetArgVal(aText);
 }
 
-void ParaWin::HideParaLine(USHORT no)
+void ParaWin::HideParaLine(sal_uInt16 no)
 {
     aArgInput[no].Hide();
 }
 
-void ParaWin::ShowParaLine(USHORT no)
+void ParaWin::ShowParaLine(sal_uInt16 no)
 {
     aArgInput[no].Show();
 }
 
-void ParaWin::SetEdFocus(USHORT no)
+void ParaWin::SetEdFocus(sal_uInt16 no)
 {
     UpdateArgDesc(no);
     if(no<4 && no<aParaArray.size())
@@ -367,7 +367,7 @@ void ParaWin::SetEdFocus(USHORT no)
 }
 
 
-void ParaWin::InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx,
+void ParaWin::InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, ImageButton& rBtnFx,
                         ArgEdit& rEdArg, RefButton& rRefBtn)
 {
 
@@ -390,7 +390,7 @@ void ParaWin::ClearAll()
     SetArgumentOffset(0);
 }
 
-void ParaWin::SetArgumentOffset(USHORT nOffset)
+void ParaWin::SetArgumentOffset(sal_uInt16 nOffset)
 {
     DelParaArray();
     aSlider.SetThumbPos(0);
@@ -430,8 +430,8 @@ void ParaWin::SetArgumentOffset(USHORT nOffset)
 
 void ParaWin::UpdateParas()
 {
-    USHORT i;
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 i;
+    sal_uInt16 nOffset = GetSliderPos();
 
     if ( nArgs > 0 )
     {
@@ -446,19 +446,19 @@ void ParaWin::UpdateParas()
 }
 
 
-USHORT ParaWin::GetSliderPos()
+sal_uInt16 ParaWin::GetSliderPos()
 {
-    return (USHORT) aSlider.GetThumbPos();
+    return (sal_uInt16) aSlider.GetThumbPos();
 }
 
-void ParaWin::SetSliderPos(USHORT nSliderPos)
+void ParaWin::SetSliderPos(sal_uInt16 nSliderPos)
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
 
     if(aSlider.IsVisible() && nOffset!=nSliderPos)
     {
         aSlider.SetThumbPos(nSliderPos);
-        for ( USHORT i=0; i<4; i++ )
+        for ( sal_uInt16 i=0; i<4; i++ )
         {
             UpdateArgInput( nSliderPos, i );
         }
@@ -467,9 +467,9 @@ void ParaWin::SetSliderPos(USHORT nSliderPos)
 
 void ParaWin::SliderMoved()
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
 
-    for ( USHORT i=0; i<4; i++ )
+    for ( sal_uInt16 i=0; i<4; i++ )
     {
         UpdateArgInput( nOffset, i );
     }
@@ -496,9 +496,9 @@ void ParaWin::FxClick()
 
 IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr )
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for ( USHORT nPos=0; nPos<5;nPos++)
+    for ( sal_uInt16 nPos=0; nPos<5;nPos++)
     {
         if(pPtr == &aArgInput[nPos])
         {
@@ -518,9 +518,9 @@ IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr )
 
 IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for ( USHORT nPos=0; nPos<5;nPos++)
+    for ( sal_uInt16 nPos=0; nPos<5;nPos++)
     {
         if(pPtr == &aArgInput[nPos])
         {
@@ -542,9 +542,9 @@ IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
 
 IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr )
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for ( USHORT nPos=0; nPos<5;nPos++)
+    for ( sal_uInt16 nPos=0; nPos<5;nPos++)
     {
         if(pPtr == &aArgInput[nPos])
         {
@@ -574,9 +574,9 @@ IMPL_LINK( ParaWin, ScrollHdl, ScrollBar*, EMPTYARG )
 
 IMPL_LINK( ParaWin, ModifyHdl, ArgInput*, pPtr )
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for ( USHORT nPos=0; nPos<5;nPos++)
+    for ( sal_uInt16 nPos=0; nPos<5;nPos++)
     {
         if(pPtr == &aArgInput[nPos])
         {
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index bfaebccdca09..990eafd28ba2 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -57,10 +57,10 @@ private:
         Link            aFxLink;
         Link            aArgModifiedLink;
 
-        ::std::vector<USHORT>   aVisibleArgMapping;
+        ::std::vector<sal_uInt16>   aVisibleArgMapping;
         const IFunctionDescription* pFuncDesc;
         IControlReferenceHandler*   pMyParent;
-        USHORT          nArgs;      // unsuppressed arguments
+        sal_uInt16          nArgs;      // unsuppressed arguments
         Font            aFntBold;
         Font            aFntLight;
 
@@ -91,10 +91,10 @@ private:
         ScrollBar       aSlider;
         String          m_sOptional;
         String          m_sRequired;
-        BOOL            bRefMode;
+        sal_Bool            bRefMode;
 
-        USHORT          nEdFocus;
-        USHORT          nActiveLine;
+        sal_uInt16          nEdFocus;
+        sal_uInt16          nActiveLine;
 
         ArgInput        aArgInput[4];
         String          aDefaultString;
@@ -113,7 +113,7 @@ protected:
         virtual void    ArgumentModified();
         virtual void    FxClick();
 
-        void            InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx,
+        void            InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, ImageButton& rBtnFx,
                                         ArgEdit& rEdArg, RefButton& rRefBtn);
 
         void            DelParaArray();
@@ -121,40 +121,40 @@ protected:
         void            SetArgumentText(const String& aText);
 
 
-        void            SetArgName      (USHORT no,const String &aArg);
-        void            SetArgNameFont  (USHORT no,const Font&);
-        void            SetArgVal       (USHORT no,const String &aArg);
+        void            SetArgName      (sal_uInt16 no,const String &aArg);
+        void            SetArgNameFont  (sal_uInt16 no,const Font&);
+        void            SetArgVal       (sal_uInt16 no,const String &aArg);
 
-        void            HideParaLine(USHORT no);
-        void            ShowParaLine(USHORT no);
-        void            UpdateArgDesc( USHORT nArg );
-        void            UpdateArgInput( USHORT nOffset, USHORT i );
+        void            HideParaLine(sal_uInt16 no);
+        void            ShowParaLine(sal_uInt16 no);
+        void            UpdateArgDesc( sal_uInt16 nArg );
+        void            UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i );
 
 public:
                         ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos);
                         ~ParaWin();
 
         void            SetFunctionDesc(const IFunctionDescription* pFDesc);
-        void            SetArgumentOffset(USHORT nOffset);
+        void            SetArgumentOffset(sal_uInt16 nOffset);
         void            SetEditDesc(const String& aText);
         void            UpdateParas();
         void            ClearAll();
 
-        BOOL            IsRefMode() {return bRefMode;}
-        void            SetRefMode(BOOL bFlag) {bRefMode=bFlag;}
+        sal_Bool            IsRefMode() {return bRefMode;}
+        void            SetRefMode(sal_Bool bFlag) {bRefMode=bFlag;}
 
-        USHORT          GetActiveLine();
-        void            SetActiveLine(USHORT no);
+        sal_uInt16          GetActiveLine();
+        void            SetActiveLine(sal_uInt16 no);
         RefEdit*        GetActiveEdit();
         String          GetActiveArgName();
 
-        String          GetArgument(USHORT no);
-        void            SetArgument(USHORT no, const String& aString);
+        String          GetArgument(sal_uInt16 no);
+        void            SetArgument(sal_uInt16 no, const String& aString);
         void            SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont);
 
-        void            SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen
-        USHORT          GetSliderPos();
-        void            SetSliderPos(USHORT nSliderPos);
+        void            SetEdFocus(sal_uInt16 nEditLine); //Sichtbare Editzeilen
+        sal_uInt16          GetSliderPos();
+        void            SetSliderPos(sal_uInt16 nSliderPos);
 
         void            SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; }
         const Link&     GetScrollHdl() const { return aScrollLink; }
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 3f86b4ba21eb..89d012d7ba88 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -49,7 +49,7 @@ namespace formula
 StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
     SvTreeListBox(pParent,rResId )
 {
-    bActiveFlag=FALSE;
+    bActiveFlag=sal_False;
 
     Font aFont( GetFont() );
     Size aSize = aFont.GetSize();
@@ -61,9 +61,9 @@ StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
 SvLBoxEntry* StructListBox::InsertStaticEntry(
         const XubString& rText,
         const Image& rEntryImg, const Image& rEntryImgHC,
-        SvLBoxEntry* pParent, ULONG nPos, IFormulaToken* pToken )
+        SvLBoxEntry* pParent, sal_uLong nPos, IFormulaToken* pToken )
 {
-    SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, FALSE, nPos, pToken );
+    SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, sal_False, nPos, pToken );
     SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) );
     DBG_ASSERT( pBmpItem, "StructListBox::InsertStaticEntry - missing item" );
     pBmpItem->SetBitmap1( rEntryImgHC, BMP_COLOR_HIGHCONTRAST );
@@ -71,31 +71,31 @@ SvLBoxEntry* StructListBox::InsertStaticEntry(
     return pEntry;
 }
 
-void StructListBox::SetActiveFlag(BOOL bFlag)
+void StructListBox::SetActiveFlag(sal_Bool bFlag)
 {
     bActiveFlag=bFlag;
 }
 
-BOOL StructListBox::GetActiveFlag()
+sal_Bool StructListBox::GetActiveFlag()
 {
     return bActiveFlag;
 }
 
 void StructListBox::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    bActiveFlag=TRUE;
+    bActiveFlag=sal_True;
     SvTreeListBox::MouseButtonDown(rMEvt);
 }
 
 void StructListBox::GetFocus()
 {
-    bActiveFlag=TRUE;
+    bActiveFlag=sal_True;
     SvTreeListBox::GetFocus();
 }
 
 void StructListBox::LoseFocus()
 {
-    bActiveFlag=FALSE;
+    bActiveFlag=sal_False;
     SvTreeListBox::LoseFocus();
 }
 
@@ -128,20 +128,20 @@ StructPage::StructPage(Window* pParent):
 
 void StructPage::ClearStruct()
 {
-    aTlbStruct.SetActiveFlag(FALSE);
+    aTlbStruct.SetActiveFlag(sal_False);
     aTlbStruct.Clear();
 }
 
 SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
-                                       USHORT nFlag,ULONG nPos,IFormulaToken* pIFormulaToken)
+                                       sal_uInt16 nFlag,sal_uLong nPos,IFormulaToken* pIFormulaToken)
 {
-    aTlbStruct.SetActiveFlag( FALSE );
+    aTlbStruct.SetActiveFlag( sal_False );
 
     SvLBoxEntry* pEntry = NULL;
     switch( nFlag )
     {
         case STRUCT_FOLDER:
-            pEntry = aTlbStruct.InsertEntry( rText, pParent, FALSE, nPos, pIFormulaToken );
+            pEntry = aTlbStruct.InsertEntry( rText, pParent, sal_False, nPos, pIFormulaToken );
         break;
         case STRUCT_END:
             pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, maImgEndHC, pParent, nPos, pIFormulaToken );
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 8e5dff4e6ed9..a060790d08ad 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -49,7 +49,7 @@ class   StructListBox : public SvTreeListBox
 {
 private:
 
-    BOOL            bActiveFlag;
+    sal_Bool            bActiveFlag;
 
 protected:
                     virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -64,11 +64,11 @@ public:
                         const Image& rEntryImg,
                         const Image& rEntryImgHC,
                         SvLBoxEntry* pParent = NULL,
-                        ULONG nPos = LIST_APPEND,
+                        sal_uLong nPos = LIST_APPEND,
                         IFormulaToken* pToken = NULL );
 
-    void            SetActiveFlag(BOOL bFlag=TRUE);
-    BOOL            GetActiveFlag();
+    void            SetActiveFlag(sal_Bool bFlag=sal_True);
+    sal_Bool            GetActiveFlag();
     void            GetFocus();
     void            LoseFocus();
 };
@@ -105,7 +105,7 @@ public:
 
     void            ClearStruct();
     virtual SvLBoxEntry*    InsertEntry(const XubString& rText, SvLBoxEntry* pParent,
-                                USHORT nFlag,ULONG nPos=0,IFormulaToken* pScToken=NULL);
+                                sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL);
 
     virtual String          GetEntryText(SvLBoxEntry* pEntry) const;
     virtual SvLBoxEntry*    GetParent(SvLBoxEntry* pEntry) const;
diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 23079b1e6705..c508bd8b6658 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -88,7 +88,7 @@ namespace formula
     class FORMULA_DLLPUBLIC ModuleRes : public ::ResId
     {
     public:
-        ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+        ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
     };
 //.........................................................................
 }   // namespace formula
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index 9515cdb59aa9..e17defb2b712 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -45,7 +45,7 @@ class FilterHelper;
 
 - (void)setFilterHelper:(FilterHelper*)filterHelper;
 
-- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
+- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
 - (void)panelSelectionDidChange:(id)sender;
 - (void)panel:(id)sender directoryDidChange:(NSString *)path;
 
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index 4266453a7102..d5c906281475 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm
@@ -56,7 +56,7 @@
 
 #pragma mark NSSavePanel delegate methods
 
-- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
+- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
 {
     if( filterHelper == NULL )
         return true;
diff --git a/fpicker/source/aqua/ControlHelper.cxx b/fpicker/source/aqua/ControlHelper.cxx
index 470c22e09b10..0df9c485f65b 100644
--- a/fpicker/source/aqua/ControlHelper.cxx
+++ b/fpicker/source/aqua/ControlHelper.cxx
@@ -340,8 +340,8 @@ void ControlHelper::createUserPane()
     int currentHeight = kAquaSpaceBoxFrameViewDiffTop + kAquaSpaceBoxFrameViewDiffBottom;
     int currentWidth = 300;
 
-    BOOL bPopupControlPresent = NO;
-    BOOL bButtonControlPresent = NO;
+    sal_Bool bPopupControlPresent = NO;
+    sal_Bool bButtonControlPresent = NO;
 
     int nCheckboxMaxWidth = 0;
     int nPopupMaxWidth = 0;
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index ecc38b7e232b..6be80a765228 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -92,8 +92,8 @@ NSString* resolveAlias( NSString* i_pSystemPath )
         FSRef rFS;
         if( CFURLGetFSRef( rUrl, &rFS ) )
         {
-            MacOSBoolean bIsFolder = false;
-            MacOSBoolean bAlias = false;
+            Boolean bIsFolder = false;
+            Boolean bAlias = false;
             OSErr err = FSResolveAliasFile( &rFS, true, &bIsFolder, &bAlias);
             if( (err == noErr) && bAlias )
             {
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 50e99f2b590b..6afe6e509acf 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -537,7 +537,7 @@ namespace svt
             {
                 sal_Int32 nPos = 0;
                 if ( _rValue >>= nPos )
-                    _pListbox->RemoveEntry( (USHORT) nPos );
+                    _pListbox->RemoveEntry( (sal_uInt16) nPos );
             }
             break;
 
@@ -675,7 +675,7 @@ namespace svt
                 sal_Int32 nPos = 0;
                 if ( _rValue >>= nPos )
                 {
-                    static_cast< ListBox* >( _pControl )->SelectEntryPos( (USHORT) nPos );
+                    static_cast< ListBox* >( _pControl )->SelectEntryPos( (sal_uInt16) nPos );
                 }
                 else if ( !_bIgnoreIllegalArgument )
                 {
@@ -737,7 +737,7 @@ namespace svt
 
                 Sequence< ::rtl::OUString > aItems( static_cast< ListBox* >( _pControl )->GetEntryCount() );
                 ::rtl::OUString* pItems = aItems.getArray();
-                for ( USHORT i=0; i<static_cast< ListBox* >( _pControl )->GetEntryCount(); ++i )
+                for ( sal_uInt16 i=0; i<static_cast< ListBox* >( _pControl )->GetEntryCount(); ++i )
                     *pItems++ = static_cast< ListBox* >( _pControl )->GetEntry( i );
 
                 aReturn <<= aItems;
@@ -749,7 +749,7 @@ namespace svt
                 DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
                     "OControlAccess::implGetControlProperty: invalid control/property combination!" );
 
-                USHORT nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+                sal_uInt16 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 ::rtl::OUString sSelected;
                 if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
                     sSelected = static_cast< ListBox* >( _pControl )->GetSelectEntry();
@@ -762,7 +762,7 @@ namespace svt
                 DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
                     "OControlAccess::implGetControlProperty: invalid control/property combination!" );
 
-                USHORT nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+                sal_uInt16 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
                     aReturn <<= (sal_Int32)static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 else
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 516c62fe7580..c7ef19a4dbb8 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -477,7 +477,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( )
 
     prepareExecute();
 
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     // now we are ready to execute the dialog
     sal_Int16 nRet = getDialog()->Execute();
 
@@ -549,7 +549,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::sta
     m_xDlgClosedListener = xListener;
     prepareDialog();
     prepareExecute();
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     getDialog()->StartExecuteModal( LINK( this, SvtFilePicker, DialogClosedHdl ) );
 }
 
@@ -625,8 +625,8 @@ Sequence< rtl::OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeExcep
     // files first and then the list of the selected entries
 
     SvStringsDtor* pPathList = getDialog()->GetPathList();
-    USHORT i, nCount = pPathList->Count();
-    USHORT nTotal = nCount > 1 ? nCount+1: nCount;
+    sal_uInt16 i, nCount = pPathList->Count();
+    sal_uInt16 nTotal = nCount > 1 ? nCount+1: nCount;
 
     Sequence< rtl::OUString > aPath( nTotal );
 
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 48d3a2b43bad..076635ffa923 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -108,7 +108,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::s
     m_xListener = xListener;
     prepareDialog();
     prepareExecute();
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     getDialog()->StartExecuteModal( LINK( this, SvtFolderPicker, DialogClosedHdl ) );
 }
 
@@ -124,7 +124,7 @@ sal_Int16 SvtFolderPicker::implExecutePicker( )
     prepareExecute();
 
     // now we are ready to execute the dialog
-    getDialog()->EnableAutocompletion( FALSE );
+    getDialog()->EnableAutocompletion( sal_False );
     sal_Int16 nRet = getDialog()->Execute();
 
     return nRet;
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index b9d7fac3aa3b..355203dbe767 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -411,7 +411,7 @@ struct ControlChain_Impl
 {
     Window*            _pControl;
     ControlChain_Impl* _pNext;
-    BOOL               _bHasOwnerShip;
+    sal_Bool               _bHasOwnerShip;
 
     ControlChain_Impl( Window* pControl, ControlChain_Impl* pNext );
     ~ControlChain_Impl();
@@ -426,7 +426,7 @@ ControlChain_Impl::ControlChain_Impl
 )
     : _pControl( pControl ),
       _pNext( pNext ),
-      _bHasOwnerShip( TRUE )
+      _bHasOwnerShip( sal_True )
 {
 }
 
@@ -464,7 +464,7 @@ namespace
 
     struct SvtResId : public ResId
     {
-        SvtResId (USHORT nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
+        SvtResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
     };
 }
 
@@ -491,7 +491,7 @@ SvtFileDialog::SvtFileDialog
     ,_pFileNotifier( NULL )
     ,_pImp( new SvtExpFileDlg_Impl( nBits ) )
     ,_nExtraBits( nExtraBits )
-    ,_bIsInExecute( FALSE )
+    ,_bIsInExecute( sal_False )
     ,m_bInExecuteAsync( false )
     ,m_bHasFilename( false )
 {
@@ -514,7 +514,7 @@ SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits )
     ,_pFileNotifier( NULL )
     ,_pImp( new SvtExpFileDlg_Impl( nBits ) )
     ,_nExtraBits( 0L )
-    ,_bIsInExecute( FALSE )
+    ,_bIsInExecute( sal_False )
     ,m_bHasFilename( false )
 {
     Init_Impl( nBits );
@@ -641,7 +641,7 @@ void SvtFileDialog::Init_Impl
     _pImp->_pBtnStandard->SetAccessibleName( _pImp->_pBtnStandard->GetQuickHelpText() );
 
     if ( ( nStyle & SFXWB_MULTISELECTION ) == SFXWB_MULTISELECTION )
-        _pImp->_bMultiSelection = TRUE;
+        _pImp->_bMultiSelection = sal_True;
 
     _pFileView = new SvtFileView( this, SvtResId( CTL_EXPLORERFILE_FILELIST ),
                                        FILEDLG_TYPE_PATHDLG == _pImp->_eDlgType,
@@ -670,7 +670,7 @@ void SvtFileDialog::Init_Impl
             LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width();
 
     // calculate the length of all buttons
-    const USHORT nBtnCount = 3; // "previous level", "new folder" and "standard dir"
+    const sal_uInt16 nBtnCount = 3; // "previous level", "new folder" and "standard dir"
     long nDelta = n6AppFontInPixel; // right border
     nDelta += ( nBtnCount * aSize.Width() ); // button count * button width
     nDelta += ( n3AppFontInPixel + n3AppFontInPixel / 2 ); // spacing 1*big 1*small
@@ -761,8 +761,8 @@ void SvtFileDialog::Init_Impl
     SetSizePixel( aSize );
 
     // Beschriftungen dem Modus anpassen.
-    USHORT nResId = STR_EXPLORERFILE_OPEN;
-    USHORT nButtonResId = 0;
+    sal_uInt16 nResId = STR_EXPLORERFILE_OPEN;
+    sal_uInt16 nButtonResId = 0;
 
     if ( nStyle & WB_SAVEAS )
     {
@@ -945,7 +945,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const String& _rFilter )
         sal_Bool bFilterChanged = sal_True;
 
         // search for a corresponding filter
-        SvtFileDialogFilter_Impl* pFilter = FindFilter_Impl( _rFilter, FALSE, bFilterChanged );
+        SvtFileDialogFilter_Impl* pFilter = FindFilter_Impl( _rFilter, sal_False, bFilterChanged );
 
 #ifdef AUTOSELECT_USERFILTER
         // if we found a filter which without allowing multi-extensions -> select it
@@ -958,7 +958,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const String& _rFilter )
 
         // look for multi-ext filters if necessary
         if ( !pFilter )
-            pFilter = FindFilter_Impl( _rFilter, TRUE, bFilterChanged );
+            pFilter = FindFilter_Impl( _rFilter, sal_True, bFilterChanged );
 
         if ( bFilterChanged )
             nReturn |= FLT_CHANGED;
@@ -1007,7 +1007,7 @@ IMPL_LINK( SvtFileDialog, CancelHdl_Impl, void*, EMPTYARG )
     }
     else
     {
-        EndDialog( FALSE );
+        EndDialog( sal_False );
     }
     return 1L;
 }
@@ -1085,7 +1085,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
         return 0;
     }
 
-    USHORT nLen = aFileName.Len();
+    sal_uInt16 nLen = aFileName.Len();
     if ( !nLen )
     {
         // if the dialog was opened to select a folder, the last selected folder should be selected
@@ -1127,7 +1127,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
     }
 
     // Pr"ufen, ob es sich um einen Ordner handelt.
-    BOOL bIsFolder = FALSE;
+    sal_Bool bIsFolder = sal_False;
 
     // first thing before doing anyhing with the content: Reset it. When the user presses "open" (or "save" or "export",
     // for that matter), s/he wants the complete handling, including all possible error messages, even if s/he
@@ -1195,7 +1195,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
                                pThis->_pImp->GetCurFilter()->GetType());
     }
 
-    BOOL bOpenFolder = ( FILEDLG_TYPE_PATHDLG == pThis->_pImp->_eDlgType ) &&
+    sal_Bool bOpenFolder = ( FILEDLG_TYPE_PATHDLG == pThis->_pImp->_eDlgType ) &&
                        !pThis->_pImp->_bDoubleClick && pVoid != pThis->_pImp->_pEdFileName;
     if ( bIsFolder )
     {
@@ -1270,7 +1270,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
                     INetURLObject aPathObj = aFileObj;
                     aPathObj.removeSegment();
                     // #97148# & #102204# ------------
-                    BOOL bFolder = pThis->m_aContent.isFolder( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
+                    sal_Bool bFolder = pThis->m_aContent.isFolder( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
                     if ( !bFolder )
                     {
                         ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
@@ -1329,7 +1329,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 
     if ( nRet )
     {
-        pThis->EndDialog( TRUE );
+        pThis->EndDialog( sal_True );
     }
 
     return nRet;
@@ -1337,7 +1337,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 
 //*****************************************************************************
 
-void SvtFileDialog::EnableAutocompletion( BOOL _bEnable )
+void SvtFileDialog::EnableAutocompletion( sal_Bool _bEnable )
 {
     _pImp->_pEdFileName->EnableAutocompletion( _bEnable );
 }
@@ -1398,7 +1398,7 @@ IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, ListBox*, pBox )
 
             // Ggf. Endung anzeigen.
             pThis->SetDefaultExt( pSelectedFilter->GetExtension() );
-            USHORT nSepPos = pThis->GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
+            sal_uInt16 nSepPos = pThis->GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
 
             if ( nSepPos != STRING_NOTFOUND )
                 pThis->EraseDefaultExt( nSepPos );
@@ -1450,9 +1450,9 @@ IMPL_STATIC_LINK( SvtFileDialog, FileNameModifiedHdl_Impl, void*, EMPTYARG )
 SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
 (
     const String& _rFilter,
-    sal_Bool _bMultiExt,/*  TRUE - auch Filter mit mehreren Endungen
+    sal_Bool _bMultiExt,/*  sal_True - auch Filter mit mehreren Endungen
                             beruecksichtigen
-                            FALSE - keine ...
+                            sal_False - keine ...
                         */
     sal_Bool& _rFilterChanged
 )
@@ -1466,7 +1466,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
 {
     SvtFileDialogFilter_Impl* pFoundFilter = NULL;
     SvtFileDialogFilterList_Impl* pList = _pImp->_pFilter;
-    USHORT nFilter = pList->Count();
+    sal_uInt16 nFilter = pList->Count();
 
     while ( nFilter-- )
     {
@@ -1476,7 +1476,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
 
         if ( _bMultiExt )
         {
-            USHORT nIdx = 0;
+            sal_uInt16 nIdx = 0;
             while ( !pFoundFilter && nIdx != STRING_NOTFOUND )
             {
                 aSingleType = rType.GetToken( 0, FILEDIALOG_DEF_EXTSEP, nIdx );
@@ -1527,7 +1527,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
 
 {
     String aPath;
-    ULONG nCount = _pFileView->GetSelectionCount();
+    sal_uLong nCount = _pFileView->GetSelectionCount();
     SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
 
     if ( nCount && pEntry )
@@ -1542,7 +1542,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
         nRet = OK();
 
     if ( nRet )
-        EndDialog( TRUE );
+        EndDialog( sal_True );
 }
 
 //*****************************************************************************
@@ -1565,7 +1565,7 @@ void SvtFileDialog::UpdateControls( const String& rURL )
             {
                 // no Fsys path for server file system ( only UCB has mountpoints! )
                 if ( INET_PROT_FILE != aObj.GetProtocol() )
-                    sText = rURL.Copy( static_cast< USHORT >(
+                    sText = rURL.Copy( static_cast< sal_uInt16 >(
                         INetURLObject::GetScheme( aObj.GetProtocol() ).getLength() ) );
             }
 
@@ -1657,9 +1657,9 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox )
 
 IMPL_LINK( SvtFileDialog, DblClickHdl_Impl, SvTabListBox*, EMPTYARG )
 {
-    _pImp->_bDoubleClick = TRUE;
+    _pImp->_bDoubleClick = sal_True;
     OpenHdl_Impl( this, NULL );
-    _pImp->_bDoubleClick = FALSE;
+    _pImp->_bDoubleClick = sal_False;
 
     return 0;
 }
@@ -1761,13 +1761,13 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
 */
 
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     long nRet = 0;
 
     if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() )
     {
         const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nCode = rKeyCode.GetCode();
+        sal_uInt16 nCode = rKeyCode.GetCode();
 
         if ( !rKeyCode.GetModifier() &&
              KEY_BACKSPACE == nCode && !_pImp->_pEdFileName->HasChildPathFocus() )
@@ -1797,7 +1797,7 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
 
 long SvtFileDialog::OK()
 {
-    return TRUE;
+    return sal_True;
 }
 
 //*****************************************************************************
@@ -1874,7 +1874,7 @@ String SvtFileDialog::implGetInitialURL( const String& _rPath, const String& _rF
     INetURLObject aURLParser;
 
     // set the path
-    bool bWasAbsolute = FALSE;
+    bool bWasAbsolute = sal_False;
     aURLParser = aURLParser.smartRel2Abs( _rPath, bWasAbsolute );
 
     // is it a valid folder?
@@ -1927,9 +1927,9 @@ short SvtFileDialog::Execute()
         return 0;
 
     // Start des Dialogs.
-    _bIsInExecute = TRUE;
+    _bIsInExecute = sal_True;
     short nResult = ModalDialog::Execute();
-    _bIsInExecute = FALSE;
+    _bIsInExecute = sal_False;
 
     DBG_ASSERT( !m_pCurrentAsyncAction.is(), "SvtFilePicker::Execute: still running an async action!" );
         // the dialog should not be cancellable while an async action is running - firs, the action
@@ -1946,7 +1946,7 @@ short SvtFileDialog::Execute()
             sal_Int32 nLevel = aURL.getSegmentCount();
             // #97148# & #102204# ------
             sal_Bool bDir = m_aContent.isFolder( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
-            // BOOL bClassPath = ( ( _pImp->_nStyle & SFXWB_CLASSPATH ) == SFXWB_CLASSPATH );
+            // sal_Bool bClassPath = ( ( _pImp->_nStyle & SFXWB_CLASSPATH ) == SFXWB_CLASSPATH );
             if ( nLevel > 1 && ( FILEDLG_TYPE_FILEDLG == _pImp->_eDlgType || !bDir ) )
                 aURL.removeSegment();
         }
@@ -1961,23 +1961,23 @@ void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )
     PrepareExecute();
 
     // Start des Dialogs.
-//    _bIsInExecute = TRUE;
+//    _bIsInExecute = sal_True;
     ModalDialog::StartExecuteModal( rEndDialogHdl );
 }
 
 //-----------------------------------------------------------------------------
 void SvtFileDialog::onAsyncOperationStarted()
 {
-    EnableUI( FALSE );
+    EnableUI( sal_False );
     // the cancel button must be always enabled
-    _pImp->_pBtnCancel->Enable( TRUE );
+    _pImp->_pBtnCancel->Enable( sal_True );
     _pImp->_pBtnCancel->GrabFocus();
 }
 
 //-----------------------------------------------------------------------------
 void SvtFileDialog::onAsyncOperationFinished()
 {
-    EnableUI( TRUE );
+    EnableUI( sal_True );
     m_pCurrentAsyncAction = NULL;
     if ( !m_bInExecuteAsync )
         _pImp->_pEdFileName->GrabFocus();
@@ -2029,7 +2029,7 @@ void SvtFileDialog::displayIOException( const String& _rURL, IOErrorCode _eCode
 }
 
 //-----------------------------------------------------------------------------
-void SvtFileDialog::EnableUI( BOOL _bEnable )
+void SvtFileDialog::EnableUI( sal_Bool _bEnable )
 {
     Enable( _bEnable );
 
@@ -2040,13 +2040,13 @@ void SvtFileDialog::EnableUI( BOOL _bEnable )
               ++aLoop
             )
         {
-            (*aLoop)->Enable( FALSE );
+            (*aLoop)->Enable( sal_False );
         }
     }
 }
 
 //-----------------------------------------------------------------------------
-void SvtFileDialog::EnableControl( Control* _pControl, BOOL _bEnable )
+void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable )
 {
     if ( !_pControl )
     {
@@ -2179,16 +2179,16 @@ short SvtFileDialog::PrepareExecute()
     _pImp->InitFilterList();
 
     // Initialen Filter einstellen.
-    USHORT nFilterCount = GetFilterCount();
+    sal_uInt16 nFilterCount = GetFilterCount();
     String aAll( SvtResId( STR_FILTERNAME_ALL ) );
-    BOOL bHasAll = _pImp->HasFilterListEntry( aAll );
+    sal_Bool bHasAll = _pImp->HasFilterListEntry( aAll );
     if ( _pImp->GetCurFilter() || nFilterCount == 1 || ( nFilterCount == 2 && bHasAll ) )
     {
         // Ggf. einzigen Filter als aktuellen Filter setzen oder den einzigen
         // Filter, der nicht auf alle Dateien verweist.
         if ( !_pImp->GetCurFilter() )
         {
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             if ( 2 == nFilterCount && bHasAll )
             {
                 nPos = nFilterCount;
@@ -2206,7 +2206,7 @@ short SvtFileDialog::PrepareExecute()
         // Anzeige anpassen.
         _pImp->SelectFilterListEntry( _pImp->GetCurFilter()->GetName() );
         SetDefaultExt( _pImp->GetCurFilter()->GetExtension() );
-        USHORT nSepPos = GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
+        sal_uInt16 nSepPos = GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
         if ( nSepPos != STRING_NOTFOUND )
             EraseDefaultExt( nSepPos );
     }
@@ -2404,7 +2404,7 @@ void SvtFileDialog::OpenURL_Impl( const String& _rURL )
 SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const String& _rFilter, const String& _rType )
 {
     SvtFileDialogFilter_Impl* pNewFilter = new SvtFileDialogFilter_Impl( _rFilter, _rType );
-    _pImp->_pFilter->C40_INSERT( SvtFileDialogFilter_Impl, pNewFilter, (USHORT)0 );
+    _pImp->_pFilter->C40_INSERT( SvtFileDialogFilter_Impl, pNewFilter, (sal_uInt16)0 );
 
     if ( !_pImp->GetCurFilter() )
         _pImp->SetCurFilter( pNewFilter, _rFilter );
@@ -2440,7 +2440,7 @@ void SvtFileDialog::SetCurFilter( const String& rFilter )
     DBG_ASSERT( !IsInExecute(), "SvtFileDialog::SetCurFilter: currently executing!" );
 
     // Entsprechenden Filter suchen.
-    USHORT nPos = _pImp->_pFilter->Count();
+    sal_uInt16 nPos = _pImp->_pFilter->Count();
 
     while ( nPos-- )
     {
@@ -2473,14 +2473,14 @@ String SvtFileDialog::getCurFilter( ) const
 
 //*****************************************************************************
 
-USHORT SvtFileDialog::GetFilterCount() const
+sal_uInt16 SvtFileDialog::GetFilterCount() const
 {
     return _pImp->_pFilter->Count();
 }
 
 //*****************************************************************************
 
-const String& SvtFileDialog::GetFilterName( USHORT nPos ) const
+const String& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < GetFilterCount(), "invalid index" );
     return _pImp->_pFilter->GetObject( nPos )->GetName();
@@ -2524,7 +2524,7 @@ void SvtFileDialog::InitSize()
 SvStringsDtor* SvtFileDialog::GetPathList() const
 {
     SvStringsDtor*  pList = new SvStringsDtor;
-    ULONG           nCount = _pFileView->GetSelectionCount();
+    sal_uLong           nCount = _pFileView->GetSelectionCount();
     SvLBoxEntry*    pEntry = nCount ? _pFileView->FirstSelected() : NULL;
 
     if ( ! pEntry )
@@ -2600,12 +2600,12 @@ void SvtFileDialog::implArrangeControls()
 
 //*****************************************************************************
 
-BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
+sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
 {
     String aEmpty;
     String aReversePath( rPath );
     aReversePath.Reverse();
-    USHORT nQuestionMarkPos = rPath.Search( '?' );
+    sal_uInt16 nQuestionMarkPos = rPath.Search( '?' );
 
     if ( nQuestionMarkPos != STRING_NOTFOUND )
     {
@@ -2615,12 +2615,12 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
         if ( INET_PROT_NOT_VALID != eProt && INET_PROT_FILE != eProt )
             nQuestionMarkPos = STRING_NOTFOUND;
     }
-    USHORT nWildCardPos = Min( rPath.Search( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos );
+    sal_uInt16 nWildCardPos = Min( rPath.Search( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos );
     rFilter = aEmpty;
 
     if ( nWildCardPos != STRING_NOTFOUND )
     {
-        USHORT nPathTokenPos = aReversePath.Search( INET_PATH_TOKEN );
+        sal_uInt16 nPathTokenPos = aReversePath.Search( INET_PATH_TOKEN );
 
         if ( nPathTokenPos == STRING_NOTFOUND )
         {
@@ -2653,7 +2653,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
             if ( nPathTokenPos < (rPath.Len() - nWildCardPos - 1) )
             {
                 ErrorHandler::HandleError( ERRCODE_SFX_INVALIDSYNTAX );
-                return FALSE;
+                return sal_False;
             }
 
             // Filter abschneiden.
@@ -2673,7 +2673,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //*****************************************************************************
@@ -3021,7 +3021,7 @@ void SvtFileDialog::AddControls_Impl( )
     {
         _pImp->_pCbAutoExtension = new CheckBox( this, SvtResId( CB_AUTO_EXTENSION ) );
         _pImp->_pCbAutoExtension->SetText( SvtResId( STR_SVT_FILEPICKER_AUTO_EXTENSION ) );
-        _pImp->_pCbAutoExtension->Check( TRUE );
+        _pImp->_pCbAutoExtension->Check( sal_True );
         AddControl( _pImp->_pCbAutoExtension );
         ReleaseOwnerShip( _pImp->_pCbAutoExtension );
         _pImp->_pCbAutoExtension->SetClickHdl( LINK( this, SvtFileDialog, AutoExtensionHdl_Impl ) );
@@ -3214,7 +3214,7 @@ void SvtFileDialog::ReleaseOwnerShip( Window* pUserControl )
     {
         if ( pElement->_pControl == pUserControl )
         {
-            pElement->_bHasOwnerShip = FALSE;
+            pElement->_bHasOwnerShip = sal_False;
             break;
         }
         pElement = pElement->_pNext;
@@ -3223,14 +3223,14 @@ void SvtFileDialog::ReleaseOwnerShip( Window* pUserControl )
 
 //***************************************************************************
 
-BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
+sal_Bool SvtFileDialog::AddControl( Window* pControl, sal_Bool bNewLine )
 {
     // control already exists
     ControlChain_Impl* pElement = _pUserControls;
     while ( pElement )
     {
         if ( pElement->_pControl == pControl )
-            return FALSE;
+            return sal_False;
         pElement = pElement->_pNext;
     }
 
@@ -3272,8 +3272,8 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
     }
     Point aNewControlPos;
     Size* pNewDlgSize = NULL;
-    BOOL bNewRow = bNewLine;
-    FASTBOOL bFirstNewRow = FALSE;
+    sal_Bool bNewRow = bNewLine;
+    sal_Bool bFirstNewRow = sal_False;
 
     if ( nType == WINDOW_WINDOW )
     {
@@ -3300,13 +3300,13 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
 
         // Check if a new row has to be created.
         if ( aNewControlRange.X() > aDlgSize.Width() )
-            bNewRow = TRUE;
+            bNewRow = sal_True;
     }
     else
     {
         // Create a new row if there was no usercontrol before.
-        bNewRow = TRUE;
-        bFirstNewRow = TRUE;
+        bNewRow = sal_True;
+        bFirstNewRow = sal_True;
     }
 
     // Check if a new row has to be created.
@@ -3346,7 +3346,7 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
     pControl->Show();
     _pUserControls = new ControlChain_Impl( pControl, _pUserControls );
 
-    return TRUE;
+    return sal_True;
 }
 
 sal_Bool SvtFileDialog::ContentHasParentFolder( const rtl::OUString& rURL )
@@ -3394,14 +3394,14 @@ void SvtFileDialog::appendDefaultExtension(String& _rFileName,
 
     if ( ! aType.EqualsAscii(FILEDIALOG_FILTER_ALL) )
     {
-        USHORT nWildCard = aType.GetTokenCount( FILEDIALOG_DEF_EXTSEP );
-        USHORT nIndex, nPos = 0;
+        sal_uInt16 nWildCard = aType.GetTokenCount( FILEDIALOG_DEF_EXTSEP );
+        sal_uInt16 nIndex, nPos = 0;
 
         for ( nIndex = 0; nIndex < nWildCard; nIndex++ )
         {
             String aExt(aType.GetToken( 0, FILEDIALOG_DEF_EXTSEP, nPos ));
             // take care of a leading *
-            USHORT nExtOffset = (aExt.GetBuffer()[0] == '*' ? 1 : 0);
+            sal_uInt16 nExtOffset = (aExt.GetBuffer()[0] == '*' ? 1 : 0);
             sal_Unicode* pExt = aExt.GetBufferAccess() + nExtOffset;
             xub_StrLen nExtLen = aExt.Len() - nExtOffset;
             xub_StrLen nOffset = aTemp.Len() - nExtLen;
@@ -3468,12 +3468,12 @@ IMPL_LINK( QueryFolderNameDialog, NameHdl, Edit *, EMPTYARG )
     if ( aName.Len() )
     {
         if ( !aOKBtn.IsEnabled() )
-            aOKBtn.Enable( TRUE );
+            aOKBtn.Enable( sal_True );
     }
     else
     {
         if ( aOKBtn.IsEnabled() )
-            aOKBtn.Enable( FALSE );
+            aOKBtn.Enable( sal_False );
     }
 
     return 0;
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index fbfa9a9355a5..746a6e1d207a 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -110,7 +110,7 @@ private:
     ::svt::IFilePickerListener* _pFileNotifier;
     SvtExpFileDlg_Impl*         _pImp;
     WinBits                     _nExtraBits;
-    BOOL                        _bIsInExecute   :   1;
+    sal_Bool                        _bIsInExecute   :   1;
 
     ImageList                   m_aImages;
     ::svt::SmartContent         m_aContent;
@@ -163,14 +163,14 @@ private:
     DECL_LINK( PlayButtonHdl_Impl, PushButton* );
 
     // entfernt einen Filter mit Wildcards aus dem Path und gibt in zurueck
-    BOOL IsolateFilterFromPath_Impl( String& rPath, String& rFilter );
+    sal_Bool IsolateFilterFromPath_Impl( String& rPath, String& rFilter );
 
     void    implArrangeControls();
     void    implUpdateImages( );
 
 protected:
     virtual long                Notify( NotifyEvent& rNEvt );
-    void                        EnableInternet( BOOL bInternet );
+    void                        EnableInternet( sal_Bool bInternet );
 
     // originally from VclFileDialog
     Link                        _aOKHdl;
@@ -191,14 +191,14 @@ protected:
         This is under the assumption that you'll use EnableControl. Direct access to the control
         (such as pControl->Enable()) will break this.
     */
-    void                        EnableUI( BOOL _bEnable );
+    void                        EnableUI( sal_Bool _bEnable );
 
     /** enables or disables a control
 
         You are strongly encouraged to prefer this method over pControl->Enable( _bEnable ). See
         <member>EnableUI</member> for details.
     */
-    void                        EnableControl( Control* _pControl, BOOL _bEnable );
+    void                        EnableControl( Control* _pControl, sal_Bool _bEnable );
     short                       PrepareExecute();
 
 public:
@@ -228,8 +228,8 @@ public:
 
             void                SetCurFilter( const String& rFilter );
             String              GetCurFilter() const;
-            USHORT              GetFilterCount() const;
-            const String&       GetFilterName( USHORT nPos ) const;
+            sal_uInt16              GetFilterCount() const;
+            const String&       GetFilterName( sal_uInt16 nPos ) const;
 
     virtual void                Resize();
     virtual void                DataChanged( const DataChangedEvent& _rDCEvt );
@@ -242,7 +242,7 @@ public:
     void                        DisableSaveLastDirectory();
     void                        InitSize();
     void                        UpdateControls( const String& rURL );
-    void                        EnableAutocompletion( BOOL _bEnable = TRUE );
+    void                        EnableAutocompletion( sal_Bool _bEnable = sal_True );
 
     void                        SetFileCallback( ::svt::IFilePickerListener *pNotifier ) { _pFileNotifier = pNotifier; }
 
@@ -267,7 +267,7 @@ public:
     }
 
     // originally from VclFileDialog
-    virtual BOOL                AddControl( Window* pControl, BOOL bNewLine = FALSE );
+    virtual sal_Bool                AddControl( Window* pControl, sal_Bool bNewLine = sal_False );
 
     // inline
     inline void                 SetPath( const String& rNewURL );
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 5e57075a6bb7..41acd84be3e0 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -120,7 +120,7 @@ namespace
 
     struct SvtSimpleResId : public ResId
     {
-        SvtSimpleResId (USHORT nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
+        SvtSimpleResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
     };
 }
 
@@ -315,7 +315,7 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu )
 
     sal_Bool bIsHighContrast = GetDialogParent()->GetView()->GetSettings().GetStyleSettings().GetHighContrastMode();
 
-    USHORT nItemId = 1;
+    sal_uInt16 nItemId = 1;
     String sDisplayName;
 
     ::std::vector< String >::const_iterator aLoop;
@@ -471,7 +471,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl*
         sName = _pFilterDesc->GetName();
 
     // insert an set user data
-    USHORT nPos = _pLbFilter->InsertEntry( sName );
+    sal_uInt16 nPos = _pLbFilter->InsertEntry( sName );
     _pLbFilter->SetEntryData( nPos, const_cast< void* >( static_cast< const void* >( _pFilterDesc ) ) );
 }
 
@@ -483,7 +483,7 @@ void SvtExpFileDlg_Impl::InitFilterList( )
     ClearFilterList( );
 
     // reinit it
-    USHORT nPos = _pFilter->Count();
+    sal_uInt16 nPos = _pFilter->Count();
 
     // search for the first entry which is no group separator
     while ( nPos-- && _pFilter->GetObject( nPos ) && _pFilter->GetObject( nPos )->isGroupSeparator() )
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index f7a4f9026388..9826290858c2 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -260,7 +260,7 @@ public:
     inline const ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetBlackList() const { return _aBlackList; }
     void                    SetStandardDir( const String& _rDir );
     inline const String&    GetStandardDir() const          { return _aStdDir; }
-    inline void             DisableFilterBoxAutoWidth()     { _pLbFilter->EnableDDAutoWidth( FALSE ); }
+    inline void             DisableFilterBoxAutoWidth()     { _pLbFilter->EnableDDAutoWidth( sal_False ); }
 
     // ------------------------------------------
     // access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index cfb3574f702e..3848ab081186 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -104,7 +104,7 @@ static void expandexpanders(GtkContainer *pWidget)
         if GTK_IS_CONTAINER(GTK_WIDGET(p->data))
             expandexpanders(GTK_CONTAINER(GTK_WIDGET(p->data)));
         if GTK_IS_EXPANDER(GTK_WIDGET(p->data))
-            gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), TRUE);
+            gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), sal_True);
     }
     g_list_free(pChildren);
 }
@@ -189,17 +189,17 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
 
     gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
 
-    gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
-    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+    gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
+    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
 
-    m_pVBox = gtk_vbox_new( FALSE, 0 );
+    m_pVBox = gtk_vbox_new( sal_False, 0 );
 
     // We don't want clickable items to have a huge hit-area
-    GtkWidget *pHBox = gtk_hbox_new( FALSE, 0 );
-    GtkWidget *pThinVBox = gtk_vbox_new( FALSE, 0 );
+    GtkWidget *pHBox = gtk_hbox_new( sal_False, 0 );
+    GtkWidget *pThinVBox = gtk_vbox_new( sal_False, 0 );
 
-    gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, sal_False, sal_False, 0);
+    gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, sal_False, sal_False, 0);
     gtk_widget_show( pHBox );
     gtk_widget_show( pThinVBox );
 
@@ -229,12 +229,12 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
                 break;
         }
 
-        gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], FALSE, FALSE, 0 );
+        gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], sal_False, sal_False, 0 );
     }
 
     for( i = 0; i < LIST_LAST; i++ )
     {
-        m_pHBoxs[i] = gtk_hbox_new( FALSE, 0 );
+        m_pHBoxs[i] = gtk_hbox_new( sal_False, 0 );
 
         m_pAligns[i] = gtk_alignment_new(0, 0, 0, 1);
 
@@ -259,18 +259,18 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
         }
 
         gtk_container_add( GTK_CONTAINER( m_pAligns[i]), m_pLists[i] );
-        gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], FALSE, FALSE, 0 );
+        gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], sal_False, sal_False, 0 );
 
-        gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], FALSE, FALSE, 0 );
+        gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], sal_False, sal_False, 0 );
 
-        gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], FALSE, FALSE, 0 );
+        gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], sal_False, sal_False, 0 );
     }
 
     aLabel = aResProvider.getResString( FILE_PICKER_FILE_TYPE );
     m_pFilterExpander = gtk_expander_new_with_mnemonic(
         OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr());
 
-    gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, FALSE, TRUE, 0 );
+    gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, sal_False, sal_True, 0 );
 
     GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
@@ -288,11 +288,11 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
         case 0:
             break;
         case 1:
-            gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), TRUE);
+            gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True);
             break;
         case 2:
             expandexpanders(GTK_CONTAINER(m_pDialog));
-            gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), TRUE);
+            gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True);
             break;
     }
 
@@ -309,8 +309,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
     {
         column = gtk_tree_view_column_new ();
         cell = gtk_cell_renderer_text_new ();
-        gtk_tree_view_column_set_expand (column, TRUE);
-        gtk_tree_view_column_pack_start (column, cell, FALSE);
+        gtk_tree_view_column_set_expand (column, sal_True);
+        gtk_tree_view_column_pack_start (column, cell, sal_False);
         gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL);
         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
     }
@@ -1366,12 +1366,12 @@ throw( uno::RuntimeException )
         if( bEnable )
         {
             OSL_TRACE( "enable\n" );
-            gtk_widget_set_sensitive( pWidget, TRUE );
+            gtk_widget_set_sensitive( pWidget, sal_True );
         }
         else
         {
             OSL_TRACE( "disable\n" );
-            gtk_widget_set_sensitive( pWidget, FALSE );
+            gtk_widget_set_sensitive( pWidget, sal_False );
         }
     }
     else
@@ -1410,7 +1410,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUS
     }
     else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
         g_object_set( pWidget, "label", aTxt.getStr(),
-                      "use_underline", TRUE, (char *)NULL );
+                      "use_underline", sal_True, (char *)NULL );
     else
         OSL_TRACE("Can't set label on list\n");
 }
@@ -1548,7 +1548,7 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFi
     GtkWidget *preview;
     char *filename;
     GdkPixbuf *pixbuf;
-    gboolean have_preview = FALSE;
+    gboolean have_preview = sal_False;
 
     preview = pobjFP->m_pPreview;
     filename = gtk_file_chooser_get_preview_filename( file_chooser );
@@ -1865,22 +1865,22 @@ extern "C"
 static gboolean
 case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data)
 {
-    gboolean bRetval = FALSE;
+    gboolean bRetval = sal_False;
     const char *pFilter = (const char *) data;
 
-    g_return_val_if_fail( data != NULL, FALSE );
-    g_return_val_if_fail( filter_info != NULL, FALSE );
+    g_return_val_if_fail( data != NULL, sal_False );
+    g_return_val_if_fail( filter_info != NULL, sal_False );
 
     if( !filter_info->uri )
-        return FALSE;
+        return sal_False;
 
     const char *pExtn = strrchr( filter_info->uri, '.' );
     if( !pExtn )
-        return FALSE;
+        return sal_False;
     pExtn++;
 
     if( !g_ascii_strcasecmp( pFilter, pExtn ) )
-        bRetval = TRUE;
+        bRetval = sal_True;
 
 #ifdef DEBUG
     fprintf( stderr, "'%s' match extn '%s' vs '%s' yeilds %d\n",
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
index dd5d30d203a6..e1c98004035b 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
@@ -97,8 +97,8 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference<lang::XMultiService
         GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL );
 
     gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
-    gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
-    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+    gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
+    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
 }
 
 // -------------------------------------------------
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index eadc255f0ec0..32b26ca02f15 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -260,7 +260,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
         files.append(dir);
     }
 
-    for (USHORT i = 0; i < rawFiles.size(); ++i)
+    for (sal_uInt16 i = 0; i < rawFiles.size(); ++i)
     {
         // if the raw file is not the base directory (see above kde bug)
         // we add the file to list of avail files
@@ -339,8 +339,8 @@ void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString& , const un
     if (!_filter.isNull())
         _filter.append(QString("\n"));
 
-    const USHORT length = filters.getLength();
-    for (USHORT i = 0; i < length; ++i)
+    const sal_uInt16 length = filters.getLength();
+    for (sal_uInt16 i = 0; i < length; ++i)
     {
         beans::StringPair aPair = filters[i];
 
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 84627a9f3d82..e387d672fd41 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -393,7 +393,7 @@ void SAL_CALL CFilePreview::enable( sal_Bool bEnable )
     m_bEnabled = bEnable;
 
     // force a redraw
-    InvalidateRect( m_hwnd, NULL, TRUE );
+    InvalidateRect( m_hwnd, NULL, sal_True );
     UpdateWindow( m_hwnd );
 }
 
@@ -435,7 +435,7 @@ sal_Bool SAL_CALL CFilePreview::update( const rtl::OUString& aFileName )
             loadFile( aFileName );
 
             // force a complete window redraw
-            InvalidateRect( m_hwnd, NULL, TRUE );
+            InvalidateRect( m_hwnd, NULL, sal_True );
             UpdateWindow( m_hwnd );
         }
     }
@@ -548,12 +548,12 @@ sal_Bool CFilePreview::loadFile( const rtl::OUString& aFileName )
         goto CLEANUP_AND_EXIT;
 
     hr = CreateStreamOnHGlobal(
-        hGlobal, FALSE, &pIStream );
+        hGlobal, sal_False, &pIStream );
 
     if ( SUCCEEDED( hr ) )
     {
         hr = OleLoadPicture(
-            pIStream, fsize, FALSE,
+            pIStream, fsize, sal_False,
             __uuidof( IPicture ), (LPVOID*)&m_IPicture );
     }
 
@@ -601,7 +601,7 @@ LRESULT CALLBACK CFilePreview::WndProc(
         // a result of handling WM_NCCREATE what
         // leads to a failure of CreateWindow[Ex]!!!
     case WM_NCCREATE:
-        lResult = TRUE;
+        lResult = sal_True;
         break;
 
     default:
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index ac59a4f65b99..677c2bdbfa7d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -1105,7 +1105,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
         //case css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PREVIEW : // can be ignored ... preview is supported native now !
         case css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION :
             {
-                BOOL    bValue  = sal_False;
+                BOOL    bValue  = FALSE;
                 HRESULT hResult = iCustom->GetCheckButtonState(nId, &bValue);
                 if ( SUCCEEDED(hResult) )
                     aValue = css::uno::makeAny((sal_Bool)bValue);
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index d5bcce4707f4..9fb13c1a2d5e 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -529,7 +529,7 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
             reinterpret_cast<WNDPROC>(pImpl->m_pfnOldDlgProc),
             hWnd,wMessage,wParam,lParam);
 
-        pImpl->onWMShow((BOOL)wParam);
+        pImpl->onWMShow((sal_Bool)wParam);
         break;
 
     case WM_NCDESTROY:
@@ -610,7 +610,7 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam)
 
     OSL_ASSERT(pImpl);
 
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     switch(enumParam->m_action)
     {
@@ -843,7 +843,7 @@ void CWinFileOpenImpl::onWMSize()
 //
 //-----------------------------------------------------------------------------------------
 
-void CWinFileOpenImpl::onWMShow(BOOL bShow)
+void CWinFileOpenImpl::onWMShow(sal_Bool bShow)
 {
     m_Preview->notifyParentShow(bShow);
 }
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 61d63952f8c7..9429f83cf30c 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -189,7 +189,7 @@ protected:
 
 
     void onWMSize();
-    void onWMShow(BOOL bShow);
+    void onWMShow(sal_Bool bShow);
     void onWMWindowPosChanged();
     void onCustomControlHelpRequest(LPHELPINFO lphi);
 
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index 902160f40005..eb0c9c6b4105 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -43,7 +43,7 @@ namespace css = ::com::sun::star;
 void lcl_sleep(::osl::Condition& aCondition   ,
                ::sal_Int32       nMilliSeconds)
 {
-    ULONG nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
 
     if (nMilliSeconds < 1)
         aCondition.wait(0);
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
index 11c7a414d63b..13b1354902af 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
@@ -53,7 +53,7 @@ void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont)
         m_CustomControlHandle,
         WM_SETFONT,
         (WPARAM)hFont,
-        (LPARAM)TRUE);
+        (LPARAM)sal_True);
 }
 
 //-----------------------------------
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index fcc369972ff8..aa3a5903002e 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -207,7 +207,7 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
 
     aGuard.clear();
 
-    InvalidateRect(m_Hwnd,NULL,FALSE);
+    InvalidateRect(m_Hwnd,NULL,sal_False);
     UpdateWindow(m_Hwnd);
 }
 
@@ -248,7 +248,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
 {
     BITMAPFILEHEADER*  pbmfh;
     BITMAPINFO      *  pbmi;
-    BYTE            *  pBits;
+    sal_uInt8            *  pBits;
     int                cxDib;
     int                cyDib;
 
@@ -262,7 +262,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
              (pbmfh->bfType == ('B' | ('M' << 8))) )
         {
             pbmi  = reinterpret_cast<BITMAPINFO*>((pbmfh + 1));
-            pBits = reinterpret_cast<BYTE*>(((DWORD)pbmfh) + pbmfh->bfOffBits);
+            pBits = reinterpret_cast<sal_uInt8*>(((DWORD)pbmfh) + pbmfh->bfOffBits);
 
             cxDib =      pbmi->bmiHeader.biWidth;
             cyDib = abs (pbmi->bmiHeader.biHeight);
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index 43994393e139..8da6f4014f15 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -54,13 +54,13 @@ namespace /* private */
     //-----------------------------------------------
     class CurDirGuard
     {
-        BOOL m_bValid;
+        sal_Bool m_bValid;
         wchar_t* m_pBuffer;
         DWORD m_nBufLen;
 
     public:
         CurDirGuard()
-        : m_bValid( FALSE )
+        : m_bValid( sal_False )
         , m_pBuffer( NULL )
         , m_nBufLen( 0 )
         {
@@ -74,7 +74,7 @@ namespace /* private */
 
         ~CurDirGuard()
         {
-            BOOL bDirSet = FALSE;
+            bool bDirSet = false;
 
             if ( m_pBuffer )
             {
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index d8fee2044115..a145c2af563d 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -308,7 +308,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
     // style bit of the FileOpen dialog must be set after that
     // message
     LONG lStyle = GetWindowLong(prvwnd,GWL_STYLE);
-    BOOL bIsVisible = (BOOL)(lStyle & WS_VISIBLE);
+    sal_Bool bIsVisible = (sal_Bool)(lStyle & WS_VISIBLE);
 
     int cx = 0;
 
@@ -318,7 +318,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
 
         // resize the filelistbox to the half of the
         // available space
-        BOOL bRet = SetWindowPos(flb_new,
+        bool bRet = SetWindowPos(flb_new,
             NULL, 0, 0, cx, height,
             SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 8db37cefd34c..699edc9533a2 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -179,7 +179,7 @@ void SAL_CALL FilePickerListener::fileSelectionChanged( const ::com::sun::star::
                  Sequence< sal_Int8 > aDIB( dwFileSize );
 
                  DWORD dwBytesRead;
-                 BOOL bSuccess = ReadFile (hFile, aDIB.getArray( ), dwFileSize, &dwBytesRead, NULL) ;
+                 sal_Bool bSuccess = ReadFile (hFile, aDIB.getArray( ), dwFileSize, &dwBytesRead, NULL) ;
                  CloseHandle (hFile);
 
                  BITMAPFILEHEADER* pbmfh = (BITMAPFILEHEADER*)aDIB.getConstArray( );
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 254887a2a0f1..88523848d872 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -279,7 +279,7 @@ sal_Bool CMtaFolderPicker::browseForFolder( )
         while ( bContinue )
         {
             DWORD dwResult = MsgWaitForMultipleObjects(
-                1, &aReqCtx.hEvent, FALSE, INFINITE, QS_ALLEVENTS );
+                1, &aReqCtx.hEvent, sal_False, INFINITE, QS_ALLEVENTS );
 
             switch ( dwResult )
             {
@@ -546,7 +546,7 @@ void SAL_CALL CMtaFolderPicker::onInitialized( )
         SendMessageA(
             m_hwnd,
             BFFM_SETSELECTION,
-            (WPARAM)FALSE,
+            (WPARAM)sal_False,
             (LPARAM) lpiidDisplayDir );
 
         releaseItemIdList( lpiidDisplayDir );
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;
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index c9de9f311d9b..40233269b3a0 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -225,7 +225,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     We need it to implement the CLOSE_DOC semantic.
 
             @return [boolean]
-                    TRUE if closing was successfully.
+                    sal_True if closing was successfully.
          */
         sal_Bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame                ,
                                                      sal_Bool                                   bAllowSuspend         ,
@@ -245,7 +245,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     frame is closed ....
 
             @return [bool]
-                    TRUE if closing was successfully.
+                    sal_True if closing was successfully.
          */
         sal_Bool implts_closeFrame();
 
@@ -254,7 +254,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     as new component of our m_xCloseFrame.
 
             @return [bool]
-                    TRUE if operation was successfully.
+                    sal_True if operation was successfully.
          */
         sal_Bool implts_establishBackingMode();
 
@@ -268,7 +268,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     Because he should know, that such things will happen :-)
 
             @return [bool]
-                    TRUE if termination of the application was started ...
+                    sal_True if termination of the application was started ...
          */
         sal_Bool implts_terminateApplication();
 
diff --git a/framework/inc/dispatch/helpagentdispatcher.hxx b/framework/inc/dispatch/helpagentdispatcher.hxx
index 1a8a0b2425d7..84eaf284255b 100644
--- a/framework/inc/dispatch/helpagentdispatcher.hxx
+++ b/framework/inc/dispatch/helpagentdispatcher.hxx
@@ -147,8 +147,8 @@ class HelpAgentDispatcher : public  css::lang::XTypeProvider
                     in case a new dispatch occures or in case the timer expired.
 
             @return [sal_Bool]
-                    TRUE in case the member m_xAgentWindow is a valid reference;
-                    FALSE otherwise.
+                    sal_True in case the member m_xAgentWindow is a valid reference;
+                    sal_False otherwise.
         */
         css::uno::Reference< css::awt::XWindow > implts_ensureAgentWindow();
 
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 80ba78972f88..e2ff8955a423 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -166,7 +166,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
         /** @short  open the special BackingComponent (now StartModule)
 
             @return [bool]
-                    TRUE if operation was successfully.
+                    sal_True if operation was successfully.
          */
         ::sal_Bool implts_establishBackingMode();
 
diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx
index 183c6937b39e..da3c9bb8740b 100644
--- a/framework/inc/framework/addonmenu.hxx
+++ b/framework/inc/framework/addonmenu.hxx
@@ -93,7 +93,7 @@ class FWE_DLLPUBLIC 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 );
@@ -111,17 +111,17 @@ class FWE_DLLPUBLIC 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/framework/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx
index db6e2977f8b5..0ee25dea1ab2 100644
--- a/framework/inc/framework/bmkmenu.hxx
+++ b/framework/inc/framework/bmkmenu.hxx
@@ -67,7 +67,7 @@ class FWE_DLLPUBLIC 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/framework/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx
index d6f2cd734237..61fe08cc7018 100644
--- a/framework/inc/framework/framelistanalyzer.hxx
+++ b/framework/inc/framework/framelistanalyzer.hxx
@@ -118,13 +118,13 @@ class FWE_DLLPUBLIC 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>
 
@@ -144,13 +144,13 @@ class FWE_DLLPUBLIC 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/framework/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx
index 595b4c913744..02042e44a2e2 100644
--- a/framework/inc/framework/imageproducer.hxx
+++ b/framework/inc/framework/imageproducer.hxx
@@ -40,11 +40,11 @@
 namespace framework
 {
 
-typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast );
 
 pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
-Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast );
 
 }
 
diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx
index dee6c23a8f8e..be3437c5e45c 100644
--- a/framework/inc/framework/menuconfiguration.hxx
+++ b/framework/inc/framework/menuconfiguration.hxx
@@ -60,13 +60,13 @@
 #define FWK_SID_ADDONS (FWK_SID_SFX_START+1678)
 #define FWK_SID_ADDONHELP (FWK_SID_SFX_START+1684)
 
-const USHORT START_ITEMID_PICKLIST      = 4500;
-const USHORT END_ITEMID_PICKLIST        = 4599;
-const USHORT MAX_ITEMCOUNT_PICKLIST     =   99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed!
-const USHORT START_ITEMID_WINDOWLIST    = 4600;
-const USHORT END_ITEMID_WINDOWLIST      = 4699;
-const USHORT ITEMID_ADDONLIST           = FWK_SID_ADDONS;
-const USHORT ITEMID_ADDONHELP           = FWK_SID_ADDONHELP;
+const sal_uInt16 START_ITEMID_PICKLIST      = 4500;
+const sal_uInt16 END_ITEMID_PICKLIST        = 4599;
+const sal_uInt16 MAX_ITEMCOUNT_PICKLIST     =   99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed!
+const sal_uInt16 START_ITEMID_WINDOWLIST    = 4600;
+const sal_uInt16 END_ITEMID_WINDOWLIST      = 4699;
+const sal_uInt16 ITEMID_ADDONLIST           = FWK_SID_ADDONS;
+const sal_uInt16 ITEMID_ADDONHELP           = FWK_SID_ADDONHELP;
 
 namespace framework
 {
@@ -113,8 +113,8 @@ class FWE_DLLPUBLIC MenuConfiguration
                       ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream )
             throw ( ::com::sun::star::lang::WrappedTargetException );
 
-        static BOOL IsPickListItemId( USHORT nId );
-        static BOOL IsWindowListItemId( USHORT nId );
+        static sal_Bool IsPickListItemId( sal_uInt16 nId );
+        static sal_Bool IsWindowListItemId( sal_uInt16 nId );
 
     private:
         // #110897#-1 do not hold the uno reference by reference
diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx
index e7f26b354f28..0e24357fe71e 100644
--- a/framework/inc/framework/preventduplicateinteraction.hxx
+++ b/framework/inc/framework/preventduplicateinteraction.hxx
@@ -256,8 +256,8 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
                         - the interaction itself, so it can be analyzed further
 
             @return     [boolean]
-                        TRUE if the queried interaction could be found.
-                        FALSE otherwise.
+                        sal_True if the queried interaction could be found.
+                        sal_False otherwise.
 
             @threadsafe yes
         */
diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index 592a419e0b75..1b448cef13ac 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -205,7 +205,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
         /** provides parts of our own title and we listen there for changes too. */
         css::uno::WeakReference< css::frame::XTitle > m_xSubTitle;
 
-        /** if it's set to TRUE the member m_sTitle has not to be changed internaly.
+        /** if it's set to sal_True the member m_sTitle has not to be changed internaly.
             It was set from outside and so outside code has to make sure it will be
             updated.
          */
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index b2f2258517af..e36d79e0d1db 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -214,7 +214,7 @@ class StatusIndicatorFactory : public  css::lang::XTypeProvider
         WakeUpThread* m_pWakeUp;
 
         /** Our WakeUpThread calls us in our interface method "XUpdatable::update().
-            There we set this member m_bAllowReschedule to TRUE. Next time if our impl_reschedule()
+            There we set this member m_bAllowReschedule to sal_True. Next time if our impl_reschedule()
             method is called, we know, that an Application::Reschedule() should be made.
             Because the last made Reschedule can be was taken long time ago ... may be.*/
         sal_Bool m_bAllowReschedule;
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 8081f823cc52..f74926f07131 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -208,8 +208,8 @@ class TitleBarUpdate : // interfaces
                     Is set only if return value is true.
 
             @return [sal_Bool]
-                    TRUE in casee module could be identified and all needed values could be read.
-                    FALSE otherwise.
+                    sal_True in casee module could be identified and all needed values could be read.
+                    sal_False otherwise.
          */
         ::sal_Bool implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame,
                                               TModuleInfo&                               rInfo );
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 4649f1d094ad..b893403c79ce 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -178,8 +178,8 @@ class HelpOnStartup : private ThreadHelpBase
                     the help url for checking.
 
             @return [bool]
-                    TRUE if the given URL is any default one ...
-                    FALSE otherwise.
+                    sal_True if the given URL is any default one ...
+                    sal_False otherwise.
          */
         ::sal_Bool its_isHelpUrlADefaultOne(const ::rtl::OUString& sHelpURL);
 
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 64f6226ca58f..48096a9449e3 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -157,7 +157,7 @@ class ShellJob : private ThreadHelpBase
                     If it's set to false we return false only in case executable couldnt be found
                     or couldnt be started.
 
-            @return TRUE if command was executed successfully; FALSE otherwise.
+            @return sal_True if command was executed successfully; sal_False otherwise.
          */
         ::sal_Bool impl_execute(const ::rtl::OUString&                       sCommand      ,
                                 const css::uno::Sequence< ::rtl::OUString >& lArguments    ,
diff --git a/framework/inc/loadstate.h b/framework/inc/loadstate.h
index 6c735282d56f..5ed1e86e8e44 100644
--- a/framework/inc/loadstate.h
+++ b/framework/inc/loadstate.h
@@ -76,14 +76,14 @@ class LoadStateHelper
                             the failed load request
 
             @param      rReason
-                            in case this Method returns <TRUE/> the referred string object
+                            in case this Method returns <sal_True/> the referred string object
                             will be used to set the original message of the
                             aborted io exception on it.
-                            If method returns <FALSE/> rReason was not used.
+                            If method returns <sal_False/> rReason was not used.
 
             @return     [boolean]
-                            <TRUE/> in case it was an IO error
-                            <FALSE/> in case it wasn't an IO error or interaction was not used
+                            <sal_True/> in case it was an IO error
+                            <sal_False/> in case it wasn't an IO error or interaction was not used
         */
         static sal_Bool wasIOError( const css::uno::Any& aRequest ,
                                           rtl::OUString& rReason  )
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index a2e6197a8b91..080dd5805b30 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -79,7 +79,7 @@
         LOG_ASSERT ( BCONDITION, STEXT )
         LOG_ASSERT2( BCONDITION, SMETHOD, STEXT )
 
-        Forward assertion to logfile (if condition is FALSE - like a DBG_ASSERT!) and continue with program.
+        Forward assertion to logfile (if condition is sal_False - like a DBG_ASSERT!) and continue with program.
         Set LOGTYPE to LOGTYPE_FILECONTINUE to do this.
         BCONDITION is inserted in "(...)" because user can call this macro with an complex expression!
     _____________________________________________________________________________________________________________*/
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index 5a32a42a28cc..df4489c4cd0a 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -301,7 +301,7 @@ class PropHelper
     //___________________________________________
 
     /** checks if given property will be changed by this settings.
-     *  We compare the content of the given any values. If they are different we return TRUE - FALSE otherwhise.
+     *  We compare the content of the given any values. If they are different we return sal_True - sal_False otherwhise.
      *
      *  @param  aCurrentValue   contains the current value for this property
      *  @param  aNewValue       contains the new value for this property
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 1c64e99ed91d..ef35522333a9 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -654,9 +654,9 @@ class AutoRecovery  : public  css::lang::XTypeProvider
                     the new document, which should be deregistered.
 
             @param  bStopListening
-                    FALSE: must be used in case this method is called withion disposing() of the document,
+                    sal_False: must be used in case this method is called withion disposing() of the document,
                            where it make no sense to deregister our listener. The container dies ...
-                    TRUE : must be used in case this method is used on "dergistration" of this document, where
+                    sal_True : must be used in case this method is used on "dergistration" of this document, where
                            we must deregister our listener .-)
 
             @threadsafe
@@ -723,11 +723,11 @@ class AutoRecovery  : public  css::lang::XTypeProvider
                                  will be postponed if there exists other unsaved
                                  documents. This feature was implemented, because
                                  we dont wish to disturb the user on it's work.
-                                 ... bAllowUserIdleLoop should be set to TRUE
+                                 ... bAllowUserIdleLoop should be set to sal_True
                     EMERGENCY_SAVE / SESSION_SAVE =>
                                  Here we must finish our work ASAP! It's not allowed
                                  to postpone any document.
-                                 ... bAllowUserIdleLoop must(!) be set to FALSE
+                                 ... bAllowUserIdleLoop must(!) be set to sal_False
 
             @param  pParams
                     sometimes this method is required inside an external dispatch request.
diff --git a/framework/inc/services/detectorfactory.hxx b/framework/inc/services/detectorfactory.hxx
index 6fbd0f30afb5..d24261ce290d 100644
--- a/framework/inc/services/detectorfactory.hxx
+++ b/framework/inc/services/detectorfactory.hxx
@@ -371,7 +371,7 @@ class DetectorFactory : // interfaces
             @param  sName
                     the name of the queried container entry.
 
-            @return TRUE if the requested item exist; FALSE otherwise.
+            @return sal_True if the requested item exist; sal_False otherwise.
          */
 
         virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& sName )
@@ -393,7 +393,7 @@ class DetectorFactory : // interfaces
 
         /** @short  return fill state of this cache.
 
-            @return TRUE if any item exist inside this conatiner; FALSE otherwhise.
+            @return sal_True if any item exist inside this conatiner; sal_False otherwhise.
          */
 
         virtual sal_Bool SAL_CALL hasElements()
diff --git a/framework/inc/services/frameloaderfactory.hxx b/framework/inc/services/frameloaderfactory.hxx
index 5908e04cd959..01749f841072 100644
--- a/framework/inc/services/frameloaderfactory.hxx
+++ b/framework/inc/services/frameloaderfactory.hxx
@@ -296,7 +296,7 @@ class FrameLoaderFactory    :   public ThreadHelpBase
         /*-****************************************************************************************************//**
             @short      return state if informations about frame loader available
             @descr      If these method return false - no information could'nt read from configuration ...
-                        I think nothing will work then. Normaly we return TRUE!
+                        I think nothing will work then. Normaly we return sal_True!
 
             @seealso    class FilterCache!
 
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 2cc63cd5ef76..683a147adfd6 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -45,7 +45,7 @@ namespace framework {
 
 class LicenseView : public MultiLineEdit, public SfxListener
 {
-    BOOL            mbEndReached;
+    sal_Bool            mbEndReached;
     Link            maEndReachedHdl;
     Link            maScrolledHdl;
 
@@ -55,9 +55,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; }
@@ -85,7 +85,7 @@ class LicenseDialog : public ModalDialog
     String          aStrAccept;
     String          aStrNotAccept;
     String          aOldCancelText;
-    BOOL            bEndReached;
+    sal_Bool            bEndReached;
 
     void                EnableControls();
 
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index 1469181f13e0..14e4f39462ed 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -566,7 +566,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @return     1; if closed with OK
             @return     0; if cancelled
 
-            @onerror    We return 0(FALSE).
+            @onerror    We return 0(sal_False).
         *//*-*****************************************************************************************************/
 
         virtual sal_Int16 SAL_CALL execute() throw( RUNTIMEEXCEPTION );
diff --git a/framework/inc/services/task.hxx b/framework/inc/services/task.hxx
index d9f8a8d2c579..651d8caac826 100644
--- a/framework/inc/services/task.hxx
+++ b/framework/inc/services/task.hxx
@@ -591,8 +591,8 @@ class Task  :   public css::frame::XTask    ,   // => XFrame => XComponent
     protected:
 
         // But some values are neede by derived classes!
-//        sal_Bool            m_bIsPlugIn         ;   /// In objects of these class this member is set to FALSE.
-                                                    /// But in derived class PlugInFrame it's overwrited with TRUE!
+//        sal_Bool            m_bIsPlugIn         ;   /// In objects of these class this member is set to sal_False.
+                                                    /// But in derived class PlugInFrame it's overwrited with sal_True!
 
     private:
 
diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx
index fbd329f6456b..17ffd540ba55 100644
--- a/framework/inc/services/taskcreatorsrv.hxx
+++ b/framework/inc/services/taskcreatorsrv.hxx
@@ -83,7 +83,7 @@ class TaskCreatorService : public  css::lang::XTypeProvider
          */
         static const ::rtl::OUString ARGUMENT_FRAMENAME;
 
-        /// [sal_Bool] If its set to TRUE we will make the new created frame visible.
+        /// [sal_Bool] If its set to sal_True we will make the new created frame visible.
         static const ::rtl::OUString ARGUMENT_MAKEVISIBLE;
 
         /** [sal_Bool] If not "ContainerWindow" property is set it force creation of a
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index bc55ff78cd64..7cdcb5d268a9 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -66,7 +66,7 @@ class ComboboxToolbarController : public IComboBoxListener,
         ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                    const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                    ToolBox*     pToolBar,
-                                   USHORT       nID,
+                                   sal_uInt16       nID,
                                    sal_Int32    nWidth,
                                    const rtl::OUString& aCommand );
         virtual ~ComboboxToolbarController();
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index 58aa382bc6eb..016cee039796 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -52,9 +52,9 @@ struct CommandInfo
                     bMirrored( false ),
                     bRotated( false ) {}
 
-    USHORT                  nId;
-    sal_uInt16              nWidth;
-    ::std::vector< USHORT > aIds;
+    sal_uInt16                  nId;
+    sal_uInt16                  nWidth;
+    ::std::vector< sal_uInt16 > aIds;
     sal_Int16               nImageInfo;
     sal_Bool                bMirrored : 1,
                             bRotated  : 1;
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index dfb7741a223b..557523aa5359 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -68,7 +68,7 @@ class ComplexToolbarController : public svt::ToolboxController
         ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                   const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                   ToolBox*     pToolBar,
-                                  USHORT       nID,
+                                  sal_uInt16       nID,
                                   const rtl::OUString& aCommand );
         virtual ~ComplexToolbarController();
 
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 4f828c35ff3e..eb146bcacdd1 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -64,7 +64,7 @@ class DropdownToolbarController : public IListBoxListener,
         DropdownToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                    const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                    ToolBox*     pToolBar,
-                                   USHORT       nID,
+                                   sal_uInt16       nID,
                                    sal_Int32    nWidth,
                                    const rtl::OUString& aCommand );
         virtual ~DropdownToolbarController();
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index cdb22db98997..d8b48630da50 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -64,7 +64,7 @@ class EditToolbarController : public IEditListener,
         EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                ToolBox*     pToolBar,
-                               USHORT       nID,
+                               sal_uInt16       nID,
                                sal_Int32    nWidth,
                                const rtl::OUString& aCommand );
         virtual ~EditToolbarController();
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index d8efaf1ad5ad..1db3bfcc593f 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -49,7 +49,7 @@ class GenericToolbarController : public svt::ToolboxController
         GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                   const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                   ToolBox* pToolBar,
-                                  USHORT   nID,
+                                  sal_uInt16   nID,
                                   const rtl::OUString& aCommand );
         virtual ~GenericToolbarController();
 
@@ -82,7 +82,7 @@ class MenuToolbarController : public GenericToolbarController
         MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                   const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                   ToolBox* pToolBar,
-                                  USHORT   nID,
+                                  sal_uInt16   nID,
                                   const rtl::OUString& aCommand,
                                   const rtl::OUString& aModuleIdentifier,
                                   const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc );
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index d67ee86ef569..f99138cd6939 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -51,7 +51,7 @@ class ImageButtonToolbarController : public ComplexToolbarController
         ImageButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                       const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                       ToolBox*             pToolBar,
-                                      USHORT               nID,
+                                      sal_uInt16               nID,
                                       const rtl::OUString& aCommand );
         virtual ~ImageButtonToolbarController();
 
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 1e8b9024eaca..a9d323365dce 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -81,7 +81,7 @@ namespace framework
             virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
             String RetrieveLabelFromCommand( const String& aCmdURL );
-            void addScriptItems( PopupMenu* pPopupMenu, USHORT startItemId );
+            void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId );
     };
 }
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index f201c70d7bb0..64f8667924d7 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -163,11 +163,11 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         Menu*   GetMenuBar() const { return m_pVCLMenu; }
 
         // Configuration methods
-        static void FillMenuWithConfiguration( USHORT& nId, Menu* pMenu,
+        static void FillMenuWithConfiguration( sal_uInt16& nId, Menu* pMenu,
                                                const ::rtl::OUString& rModuleIdentifier,
                                                const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer,
                                                const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer );
-        static void FillMenu( USHORT& nId,
+        static void FillMenu( sal_uInt16& nId,
                               Menu* pMenu,
                               const ::rtl::OUString& rModuleIdentifier,
                               const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer,
@@ -202,7 +202,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
 
         struct MenuItemHandler
         {
-            MenuItemHandler( USHORT             aItemId,
+            MenuItemHandler( sal_uInt16             aItemId,
                              ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xManager,
                              ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) :
                              nItemId( aItemId ),
@@ -210,7 +210,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
                              xSubMenuManager( xManager ),
                              xMenuItemDispatch( rDispatch ) {}
 
-            USHORT                                                                                      nItemId;
+            sal_uInt16                                                                                      nItemId;
             sal_Bool                                                                                    bCheckHide;
             ::rtl::OUString                                                                             aTargetFrame;
             ::rtl::OUString                                                                             aMenuItemURL;
@@ -234,10 +234,10 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
                                                                   std::vector< MenuItemHandler* >& aMenuShortCuts );
         static void      MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const ::rtl::OUString& aModuleIdentifier );
 
-        MenuItemHandler* GetMenuItemHandler( USHORT nItemId );
+        MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId );
         sal_Bool         CreatePopupMenuController( MenuItemHandler* pMenuItemHandler );
-        void             AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId);
-        USHORT           FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const;
+        void             AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId);
+        sal_uInt16           FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const;
         void             Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp = false);
         void             SetHdl();
 
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index 17a9e1611ffa..cd86f5951b74 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -70,7 +70,7 @@ class SpinfieldToolbarController : public ISpinfieldListener,
         SpinfieldToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                     const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                     ToolBox*             pToolBar,
-                                    USHORT               nID,
+                                    sal_uInt16               nID,
                                     sal_Int32            nWidth,
                                     const rtl::OUString& aCommand );
         virtual ~SpinfieldToolbarController();
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 1261b96c769e..d8748648af58 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -58,7 +58,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController
         ToggleButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                        const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                        ToolBox*             pToolBar,
-                                       USHORT               nID,
+                                       sal_uInt16               nID,
                                        Style                eStyle,
                                        const rtl::OUString& aCommand );
         virtual ~ToggleButtonToolbarController();
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 43772f5c4273..fc9f5308825a 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -219,7 +219,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
 
-    AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache!
+    AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache!
     rCache.setKeyCommandPair(aKeyEvent, sCommand);
 
     aWriteLock.unlock();
@@ -325,7 +325,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
 
-    AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache!
+    AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache!
     if (!rCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
                 ::rtl::OUString::createFromAscii("Command does not exists inside this container."),
@@ -345,7 +345,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
-    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // TRUE => open or create!
+    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create!
     try
     {
         xStreamNoLang = m_aPresetHandler.openPreset(PresetHandler::PRESET_DEFAULT(), sal_True);
@@ -388,7 +388,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
 {
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
-    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // TRUE => open or create!
+    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create!
     aReadLock.unlock();
     // <- SAFE ----------------------------------
 
@@ -449,7 +449,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
 {
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
-    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // TRUE => open or create!
+    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create!
     aReadLock.unlock();
     // <- SAFE ----------------------------------
 
@@ -790,8 +790,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
 
-    AcceleratorCache& rPrimaryCache   = impl_getCFG(sal_True, sal_True ); // TRUE => force getting of a writeable cache!
-    AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False, sal_True); // TRUE => force getting of a writeable cache!
+    AcceleratorCache& rPrimaryCache   = impl_getCFG(sal_True, sal_True ); // sal_True => force getting of a writeable cache!
+    AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False, sal_True); // sal_True => force getting of a writeable cache!
 
     if ( rPrimaryCache.hasKey(aKeyEvent) )
     {
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index 98fe7bb7630b..23ba136eaf64 100644
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/acceleratorexecute.cxx
@@ -223,7 +223,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
     sal_Bool bMod1  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
     sal_Bool bMod2  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
     sal_Bool bMod3  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
-    USHORT   nKey   = (USHORT)aAWTKey.KeyCode;
+    sal_uInt16   nKey   = (sal_uInt16)aAWTKey.KeyCode;
 
     return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
 }
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 69226cba3162..d3aad90c5c0d 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -107,7 +107,7 @@ void SAL_CALL DropTargetListener::drop( const css::datatransfer::dnd::DropTarget
             // at first check filelist format
             if ( aHelper.GetFileList( SOT_FORMAT_FILE_LIST, aFileList ) )
             {
-                ULONG i, nCount = aFileList.Count();
+                sal_uLong i, nCount = aFileList.Count();
                 for ( i = 0; i < nCount; ++i )
                     implts_OpenFile( aFileList.GetFile(i) );
                 bFormatFound = sal_True;
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index a441f251a592..d7868a3a0857 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -70,10 +70,10 @@ FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) :
 
 // -----------------------------------------------------------------------
 
-void FwkTabControl::BroadcastEvent( ULONG nEvent )
+void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
 {
     if ( VCLEVENT_TABPAGE_ACTIVATE == nEvent || VCLEVENT_TABPAGE_DEACTIVATE == nEvent )
-        ImplCallEventListeners( nEvent, (void*)(ULONG)GetCurPageId() );
+        ImplCallEventListeners( nEvent, (void*)(sal_uIntPtr)GetCurPageId() );
     else
     {
         DBG_ERRORFILE( "FwkTabControl::BroadcastEvent(): illegal event" );
@@ -289,7 +289,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
 
 IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG )
 {
-    const USHORT nId = m_aTabCtrl.GetCurPageId();
+    const sal_uInt16 nId = m_aTabCtrl.GetCurPageId();
     FwkTabPage* pTabPage = static_cast< FwkTabPage* >( m_aTabCtrl.GetTabPage( nId ) );
     if ( !pTabPage )
     {
@@ -368,7 +368,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
 
     TabEntry* pEntry = new TabEntry( nIndex, sPageURL, xEventHdl );
     m_TabList.push_back( pEntry );
-    USHORT nIdx = static_cast< USHORT >( nIndex );
+    sal_uInt16 nIdx = static_cast< sal_uInt16 >( nIndex );
     m_aTabCtrl.InsertPage( nIdx, sTitle );
     if ( sToolTip.getLength() > 0 )
         m_aTabCtrl.SetHelpText( nIdx, sToolTip );
@@ -384,7 +384,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
 
 void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
 {
-    m_aTabCtrl.SetCurPageId( static_cast< USHORT >( nIndex ) );
+    m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nIndex ) );
     ActivatePageHdl( &m_aTabCtrl );
 }
 
@@ -395,7 +395,7 @@ void FwkTabWindow::RemovePage( sal_Int32 nIndex )
     TabEntry* pEntry = FindEntry(nIndex);
     if ( pEntry )
     {
-        m_aTabCtrl.RemovePage( static_cast< USHORT >( nIndex ) );
+        m_aTabCtrl.RemovePage( static_cast< sal_uInt16 >( nIndex ) );
         if (RemoveEntry(nIndex))
             delete pEntry;
     }
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index e3f3e26ce995..8a555d52f820 100755
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -56,7 +56,7 @@ ResMgr* FwlResId::GetResManager()
 
 // -----------------------------------------------------------------------
 
-FwlResId::FwlResId( USHORT nId ) :
+FwlResId::FwlResId( sal_uInt16 nId ) :
     ResId( nId, *FwlResId::GetResManager() )
 {
 }
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 493ac9dfb4a1..cf4d772f6044 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -159,15 +159,15 @@ MenuManager::MenuManager(
 
     sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
 #if 0
-    ::std::vector< USHORT > aQueryLabelItemIdVector;
+    ::std::vector< sal_uInt16 > aQueryLabelItemIdVector;
 #endif
 
-    USHORT nItemCount = pMenu->GetItemCount();
+    sal_uInt16 nItemCount = pMenu->GetItemCount();
     m_aMenuItemHandlerVector.reserve(nItemCount);
     ::rtl::OUString aItemCommand;
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = FillItemCommand(aItemCommand,pMenu, i );
+        sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i );
         bool bShowMenuImages( m_bShowMenuImages );
         MenuItemBits nBits =  pMenu->GetItemBits( nItemId );
         // overwrite the default?
@@ -194,7 +194,7 @@ MenuManager::MenuManager(
                     aItemCommand == aSlotSpecialToolsMenu ) &&
                     AddonMenuManager::HasAddonMenuElements() )
                 {
-                    USHORT      nCount   = 0;
+                    sal_uInt16      nCount   = 0;
                     AddonMenu*  pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame );
                     if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 ))
                     {
@@ -222,7 +222,7 @@ MenuManager::MenuManager(
                         // Set image for the addon popup menu item
                         if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
                         {
-                            Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                            Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
                             if ( !!aImage )
                                    pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage );
                         }
@@ -254,7 +254,7 @@ MenuManager::MenuManager(
 
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
-                    Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                    Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
                     if ( !!aImage )
                            pMenu->SetItemImage( nItemId, aImage );
                 }
@@ -279,7 +279,7 @@ MenuManager::MenuManager(
 
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
-                    Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                    Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
                     if ( !!aImage )
                            pMenu->SetItemImage( nItemId, aImage );
                 }
@@ -300,14 +300,14 @@ MenuManager::MenuManager(
                         if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
                         {
                             // Retrieve image id from menu attributes
-                            aImage = GetImageFromURL( rFrame, aImageId, FALSE, m_bWasHiContrast );
+                            aImage = GetImageFromURL( rFrame, aImageId, sal_False, m_bWasHiContrast );
                         }
 
                         if ( !aImage )
                         {
-                            aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                            aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
                             if ( !aImage )
-                                aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast );
+                                aImage = AddonsOptions().GetImageFromURL( aItemCommand, sal_False, m_bWasHiContrast );
                         }
 
                         if ( !!aImage )
@@ -315,7 +315,7 @@ MenuManager::MenuManager(
                     }
                     else if ( !pMenu->GetItemImage( nItemId ))
                     {
-                        Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                        Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
                         if ( !!aImage )
                                pMenu->SetItemImage( nItemId, aImage );
                     }
@@ -340,7 +340,7 @@ MenuManager::MenuManager(
         Sequence< ::rtl::OUString > aLabelSequence( aQueryLabelItemIdVector.size() );
 
         sal_uInt32 nPos = 0;
-        ::std::vector< USHORT >::iterator p;
+        ::std::vector< sal_uInt16 >::iterator p;
         for ( p = aQueryLabelItemIdVector.begin(); p != aQueryLabelItemIdVector.end(); p++ )
             aURLSequence[nPos++] = pMenu->GetItemCommand( *p );
 
@@ -379,12 +379,12 @@ MenuManager::MenuManager(
 
     SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
 
-    USHORT nItemCount = pAddonMenu->GetItemCount();
+    sal_uInt16 nItemCount = pAddonMenu->GetItemCount();
     m_aMenuItemHandlerVector.reserve(nItemCount);
     ::rtl::OUString aItemCommand;
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
+        sal_uInt16 nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
 
         PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
         if ( pPopupMenu )
@@ -444,7 +444,7 @@ MenuManager::~MenuManager()
 }
 
 
-MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( USHORT nItemId )
+MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemId )
 {
     ResetableGuard aGuard( m_aLock );
 
@@ -611,7 +611,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
     ::std::vector< MenuItemHandler* > aNewPickVector;
     Reference< XStringWidth > xStringLength( new StringLength );
 
-    USHORT  nPickItemId = START_ITEMID_PICKLIST;
+    sal_uInt16  nPickItemId = START_ITEMID_PICKLIST;
     int     nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
 
     aNewPickVector.reserve(nPickListMenuItems);
@@ -779,8 +779,8 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe
     // #110897#
     Reference< XDesktop > xDesktop( xServiceFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
 
-    USHORT  nActiveItemId = 0;
-    USHORT  nItemId = START_ITEMID_WINDOWLIST;
+    sal_uInt16  nActiveItemId = 0;
+    sal_uInt16  nItemId = START_ITEMID_WINDOWLIST;
 
     if ( xDesktop.is() )
     {
@@ -905,7 +905,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
         if ( m_bActive )
             return 0;
 
-        m_bActive = TRUE;
+        m_bActive = sal_True;
 
         ::rtl::OUString aCommand( m_aMenuItemCommand );
         if ( m_aMenuItemCommand.matchIgnoreAsciiCase( UNO_COMMAND, 0 ))
@@ -1015,7 +1015,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
     {
         ResetableGuard aGuard( m_aLock );
 
-        USHORT nCurItemId = pMenu->GetCurItemId();
+        sal_uInt16 nCurItemId = pMenu->GetCurItemId();
         if ( pMenu == m_pVCLMenu &&
              pMenu->GetItemType( nCurItemId ) != MENUITEM_SEPARATOR )
         {
@@ -1031,7 +1031,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
 
                 if ( xDesktop.is() )
                 {
-                    USHORT nTaskId = START_ITEMID_WINDOWLIST;
+                    sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
                     Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
                     sal_Int32 nCount = xList->getCount();
                     for ( sal_Int32 i=0; i<nCount; ++i )
@@ -1098,7 +1098,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFac
     return mxServiceFactory;
 }
 
-void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,USHORT _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren)
+void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren)
 {
     MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), m_xFrame, _pPopupMenu, _bDelete, _bDeleteChildren );
 
@@ -1113,9 +1113,9 @@ void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCo
     m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
 }
 
-USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const
+sal_uInt16 MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const
 {
-    USHORT nItemId = _pMenu->GetItemId( _nIndex );
+    sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex );
 
     _rItemCommand = _pMenu->GetItemCommand( nItemId );
     if ( !_rItemCommand.getLength() )
@@ -1131,9 +1131,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
 {
     AddonsOptions       aAddonOptions;
 
-    for ( USHORT nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ )
     {
-        USHORT nId = _pMenu->GetItemId( nPos );
+        sal_uInt16 nId = _pMenu->GetItemId( nPos );
         if ( _pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
         {
             bool bTmpShowMenuImages( bShowMenuImages );
@@ -1155,7 +1155,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
 
                 if ( aImageId.getLength() > 0 )
                 {
-                    Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE, bIsHiContrast );
+                    Image aImage = GetImageFromURL( _xFrame, aImageId, sal_False, bIsHiContrast );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -1166,9 +1166,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
                 if ( !bImageSet )
                 {
                     rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId );
-                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE, bIsHiContrast );
+                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, sal_False, bIsHiContrast );
                     if ( !aImage )
-                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast );
+                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, sal_False, bIsHiContrast );
 
                     _pMenu->SetItemImage( nId, aImage );
                 }
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index d28839f1d440..23f03b9ff8f0 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -454,7 +454,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
         else
         {
             css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
-            // Normaly if isTop() returned FALSE ... the parent frame MUST(!) exist ...
+            // Normaly if isTop() returned sal_False ... the parent frame MUST(!) exist ...
             // But it seams to be better to check that here to prevent us against an access violation.
             if (xParent.is())
                 xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_TOP, 0);
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index d55556b23f65..5c71eade3814 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -91,7 +91,7 @@ using namespace ::vos                           ;
 //  non exported const
 //_________________________________________________________________________________________________________________
 
-const USHORT SLOTID_MDIWINDOWLIST = 5610;
+const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610;
 
 //_________________________________________________________________________________________________________________
 //  non exported definitions
@@ -277,9 +277,9 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce
 //*****************************************************************************************************************
 void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel )
 {
-    for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
     {
-        USHORT     nId    = pMenu->GetItemId(nPos);
+        sal_uInt16     nId    = pMenu->GetItemId(nPos);
         PopupMenu* pPopup = pMenu->GetPopupMenu(nId);
         if ( pPopup )
             impl_setAccelerators( (Menu *)pPopup, aAccel );
@@ -336,7 +336,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
 
             if ( pMenuBar != NULL )
             {
-                USHORT nPos = pMenuBar->GetItemPos( SLOTID_MDIWINDOWLIST );
+                sal_uInt16 nPos = pMenuBar->GetItemPos( SLOTID_MDIWINDOWLIST );
                 if ( nPos != MENU_ITEM_NOTFOUND )
                 {
                     OUString aNoContext;
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index c3400f10eef4..9b881448202f 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -203,9 +203,9 @@ sal_Bool SAL_CALL ActionTriggerPropertySet::convertFastPropertyValue(
 throw( IllegalArgumentException )
 {
     //  Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
-    //  Return TRUE, if changed - else return FALSE.
+    //  Return sal_True, if changed - else return sal_False.
     //  Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!!
-    //  Initialize return value with FALSE !!!
+    //  Initialize return value with sal_False !!!
     //  (Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index f68c293fcef4..ce6aaef12dac 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -195,9 +195,9 @@ sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
 throw( IllegalArgumentException )
 {
     //  Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
-    //  Return TRUE, if changed - else return FALSE.
+    //  Return sal_True, if changed - else return sal_False.
     //  Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!!
-    //  Initialize return value with FALSE !!!
+    //  Initialize return value with sal_False !!!
     //  (Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index c3c328c3626e..811a4bdfc383 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -64,8 +64,8 @@ using namespace ::com::sun::star::beans;
 
 // Please look at sfx2/inc/sfxsids.hrc the values are defined there. Due to build dependencies
 // we cannot include the header file.
-const USHORT SID_HELPMENU            = (SID_SFX_START + 410);
-const USHORT SID_ONLINE_REGISTRATION = (SID_SFX_START + 1537);
+const sal_uInt16 SID_HELPMENU            = (SID_SFX_START + 410);
+const sal_uInt16 SID_ONLINE_REGISTRATION = (SID_SFX_START + 1537);
 
 namespace framework
 {
@@ -77,12 +77,12 @@ AddonMenu::AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::
 
 AddonMenu::~AddonMenu()
 {
-    for ( USHORT i = 0; i < GetItemCount(); i++ )
+    for ( sal_uInt16 i = 0; i < GetItemCount(); i++ )
     {
         if ( GetItemType( i ) != MENUITEM_SEPARATOR )
         {
             // delete user attributes created with new!
-            USHORT nId = GetItemId( i );
+            sal_uInt16 nId = GetItemId( i );
             MenuConfiguration::Attributes* pUserAttributes = (MenuConfiguration::Attributes*)GetUserValue( nId );
             delete pUserAttributes;
             delete GetPopupMenu( nId );
@@ -154,7 +154,7 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame
 {
     AddonsOptions aOptions;
     AddonMenu*  pAddonMenu      = NULL;
-    USHORT      nUniqueMenuId   = ADDONMENU_ITEMID_START;
+    sal_uInt16      nUniqueMenuId   = ADDONMENU_ITEMID_START;
 
     const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aOptions.GetAddonsMenu();
     if ( rAddonMenuEntries.getLength() > 0 )
@@ -175,19 +175,19 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame
 }
 
 // Returns the next insert position from nPos.
-USHORT AddonMenuManager::GetNextPos( USHORT nPos )
+sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos )
 {
     return ( nPos == MENU_APPEND ) ? MENU_APPEND : ( nPos+1 );
 }
 
 
-static USHORT FindMenuId( Menu* pMenu, const String aCommand )
+static sal_uInt16 FindMenuId( Menu* pMenu, const String aCommand )
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     String aCmd;
     for ( nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
     {
-        USHORT nId = pMenu->GetItemId( nPos );
+        sal_uInt16 nId = pMenu->GetItemId( nPos );
         aCmd = pMenu->GetItemCommand( nId );
         if ( aCmd == aCommand )
             return nId;
@@ -205,7 +205,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
         PopupMenu* pHelpMenu = pMergeMenuBar->GetPopupMenu( SID_HELPMENU );
         if ( !pHelpMenu )
         {
-            USHORT nId = FindMenuId( pMergeMenuBar, String::CreateFromAscii( ".uno:HelpMenu" ));
+            sal_uInt16 nId = FindMenuId( pMergeMenuBar, String::CreateFromAscii( ".uno:HelpMenu" ));
             if ( nId != USHRT_MAX )
                 pHelpMenu = pMergeMenuBar->GetPopupMenu( nId );
         }
@@ -217,17 +217,17 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
 
             // Add-Ons help menu items should be inserted after the "registration" menu item
             bool   bAddAfter        = true;
-            USHORT nItemCount       = pHelpMenu->GetItemCount();
-            USHORT nRegPos          = pHelpMenu->GetItemPos( SID_ONLINE_REGISTRATION );
-            USHORT nInsPos          = nRegPos;
-            USHORT nInsSepAfterPos  = MENU_APPEND;
-            USHORT nUniqueMenuId    = ADDONMENU_ITEMID_START;
+            sal_uInt16 nItemCount       = pHelpMenu->GetItemCount();
+            sal_uInt16 nRegPos          = pHelpMenu->GetItemPos( SID_ONLINE_REGISTRATION );
+            sal_uInt16 nInsPos          = nRegPos;
+            sal_uInt16 nInsSepAfterPos  = MENU_APPEND;
+            sal_uInt16 nUniqueMenuId    = ADDONMENU_ITEMID_START;
             AddonsOptions aOptions;
 
             if ( nRegPos == USHRT_MAX )
             {
                 // try to detect the online registration dialog menu item with the command URL
-                USHORT nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_AFTER ));
+                sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_AFTER ));
                 nRegPos    = pHelpMenu->GetItemPos( nId );
                 nInsPos    = nRegPos;
             }
@@ -236,7 +236,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
             {
                 // second try:
                 // try to detect the about menu item with the command URL
-                USHORT nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE ));
+                sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE ));
                 nRegPos    = pHelpMenu->GetItemPos( nId );
                 nInsPos    = nRegPos;
                 bAddAfter  = false;
@@ -272,13 +272,13 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
 // Merge the addon popup menus into the given menu bar at the provided pos.
 void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
                                              const Reference< XModel >& rModel,
-                                             USHORT               nMergeAtPos,
+                                             sal_uInt16               nMergeAtPos,
                                              MenuBar*             pMergeMenuBar )
 {
     if ( pMergeMenuBar )
     {
         AddonsOptions   aAddonsOptions;
-        USHORT          nInsertPos = nMergeAtPos;
+        sal_uInt16          nInsertPos = nMergeAtPos;
 
         ::rtl::OUString                              aTitle;
         ::rtl::OUString                              aURL;
@@ -286,7 +286,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
         ::rtl::OUString                              aImageId;
         ::rtl::OUString                              aContext;
         Sequence< Sequence< PropertyValue > > aAddonSubMenu;
-        USHORT                                nUniqueMenuId = ADDONMENU_ITEMID_START;
+        sal_uInt16                                nUniqueMenuId = ADDONMENU_ITEMID_START;
 
         const Sequence< Sequence< PropertyValue > >&    rAddonMenuEntries = aAddonsOptions.GetAddonsMenuBarPart();
         for ( sal_Int32 i = 0; i < rAddonMenuEntries.getLength(); i++ )
@@ -303,7 +303,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
                  aAddonSubMenu.getLength() > 0 &&
                  AddonMenuManager::IsCorrectContext( rModel, aContext ))
             {
-                USHORT          nId             = nUniqueMenuId++;
+                sal_uInt16          nId             = nUniqueMenuId++;
                 AddonPopupMenu* pAddonPopupMenu = (AddonPopupMenu *)AddonMenuManager::CreatePopupMenuType( ADDON_POPUPMENU, rFrame );
 
                 AddonMenuManager::BuildMenu( pAddonPopupMenu, ADDON_MENU, MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, rModel );
@@ -327,17 +327,17 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
 // Insert the menu and sub menu entries into pCurrentMenu with the aAddonMenuDefinition provided
 void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrentMenu,
                                   MenuType                              nSubMenuType,
-                                  USHORT                                nInsPos,
-                                  USHORT&                               nUniqueMenuId,
+                                  sal_uInt16                                nInsPos,
+                                  sal_uInt16&                               nUniqueMenuId,
                                   Sequence< Sequence< PropertyValue > > aAddonMenuDefinition,
                                   const Reference< XFrame >&            rFrame,
                                   const Reference< XModel >&            rModel )
 {
     Sequence< Sequence< PropertyValue > >   aAddonSubMenu;
-    BOOL                                    bInsertSeparator    = FALSE;
-    UINT32                                  i                   = 0;
-    UINT32                                  nElements           = 0;
-    UINT32                                  nCount              = aAddonMenuDefinition.getLength();
+    sal_Bool                                    bInsertSeparator    = sal_False;
+    sal_uInt32                                  i                   = 0;
+    sal_uInt32                                  nElements           = 0;
+    sal_uInt32                                  nCount              = aAddonMenuDefinition.getLength();
     AddonsOptions                           aAddonsOptions;
 
     ::rtl::OUString aTitle;
@@ -354,7 +354,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
             continue;
 
         if ( aURL == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:separator" )))
-            bInsertSeparator = TRUE;
+            bInsertSeparator = sal_True;
         else
         {
             PopupMenu* pSubMenu = NULL;
@@ -377,12 +377,12 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
                 // Insert a separator only when we insert a new element afterwards and we
                 // have already one before us
                 nElements = 0;
-                bInsertSeparator = FALSE;
+                bInsertSeparator = sal_False;
                 pCurrentMenu->InsertSeparator( nInsPos );
                 nInsPos = AddonMenuManager::GetNextPos( nInsPos );
             }
 
-            USHORT nId = nUniqueMenuId++;
+            sal_uInt16 nId = nUniqueMenuId++;
             pCurrentMenu->InsertItem( nId, aTitle, 0, nInsPos );
             nInsPos = AddonMenuManager::GetNextPos( nInsPos );
 
@@ -390,7 +390,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
 
             // Store values from configuration to the New and Wizard menu entries to enable
             // sfx2 based code to support high contrast mode correctly!
-            pCurrentMenu->SetUserValue( nId, ULONG( new MenuConfiguration::Attributes( aTarget, aImageId )) );
+            pCurrentMenu->SetUserValue( nId, sal_uIntPtr( new MenuConfiguration::Attributes( aTarget, aImageId )) );
             pCurrentMenu->SetItemCommand( nId, aURL );
 
             if ( pSubMenu )
diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index 78ddb606585b..ac588be9a881 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -86,30 +86,30 @@ void GetMenuEntry(
 class BmkMenu_Impl
 {
     private:
-        static USHORT        m_nMID;
+        static sal_uInt16        m_nMID;
 
     public:
         BmkMenu*             m_pRoot;
-        BOOL                 m_bInitialized;
+        sal_Bool                 m_bInitialized;
 
         BmkMenu_Impl( BmkMenu* pRoot );
         BmkMenu_Impl();
         ~BmkMenu_Impl();
 
-        static USHORT       GetMID();
+        static sal_uInt16       GetMID();
 };
 
-USHORT BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START;
+sal_uInt16 BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START;
 
 BmkMenu_Impl::BmkMenu_Impl( BmkMenu* pRoot ) :
     m_pRoot(pRoot),
-    m_bInitialized(FALSE)
+    m_bInitialized(sal_False)
 {
 }
 
 BmkMenu_Impl::BmkMenu_Impl() :
     m_pRoot(0),
-    m_bInitialized(FALSE)
+    m_bInitialized(sal_False)
 {
 }
 
@@ -117,7 +117,7 @@ BmkMenu_Impl::~BmkMenu_Impl()
 {
 }
 
-USHORT BmkMenu_Impl::GetMID()
+sal_uInt16 BmkMenu_Impl::GetMID()
 {
     m_nMID++;
     if( !m_nMID )
@@ -155,7 +155,7 @@ void BmkMenu::Initialize()
     if( _pImp->m_bInitialized )
         return;
 
-    _pImp->m_bInitialized = TRUE;
+    _pImp->m_bInitialized = sal_True;
 
     Sequence< Sequence< PropertyValue > > aDynamicMenuEntries;
 
@@ -165,16 +165,16 @@ void BmkMenu::Initialize()
         aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_WIZARDMENU );
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
+    sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
 
     ::rtl::OUString aTitle;
     ::rtl::OUString aURL;
     ::rtl::OUString aTargetFrame;
     ::rtl::OUString aImageId;
 
-    BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
+    sal_Bool bIsHiContrastMode = rSettings.GetHighContrastMode();
 
-    UINT32 i, nCount = aDynamicMenuEntries.getLength();
+    sal_uInt32 i, nCount = aDynamicMenuEntries.getLength();
     for ( i = 0; i < nCount; ++i )
     {
         GetMenuEntry( aDynamicMenuEntries[i], aTitle, aURL, aTargetFrame, aImageId );
@@ -187,13 +187,13 @@ void BmkMenu::Initialize()
         else
         {
             sal_Bool    bImageSet = sal_False;
-            USHORT      nId = CreateMenuId();
+            sal_uInt16      nId = CreateMenuId();
 
             if ( bShowMenuImages )
             {
                 if ( aImageId.getLength() > 0 )
                 {
-                    Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, bIsHiContrastMode );
+                    Image aImage = GetImageFromURL( m_xFrame, aImageId, sal_False, bIsHiContrastMode );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -203,7 +203,7 @@ void BmkMenu::Initialize()
 
                 if ( !bImageSet )
                 {
-                    Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE, bIsHiContrastMode );
+                    Image aImage = GetImageFromURL( m_xFrame, aURL, sal_False, bIsHiContrastMode );
                     if ( !aImage )
                         InsertItem( nId, aTitle );
                     else
@@ -216,14 +216,14 @@ void BmkMenu::Initialize()
             // Store values from configuration to the New and Wizard menu entries to enable
             // sfx2 based code to support high contrast mode correctly!
             MenuConfiguration::Attributes* pUserAttributes = new MenuConfiguration::Attributes( aTargetFrame, aImageId );
-            SetUserValue( nId, (ULONG)pUserAttributes );
+            SetUserValue( nId, (sal_uIntPtr)pUserAttributes );
 
             SetItemCommand( nId, aURL );
         }
     }
 }
 
-USHORT BmkMenu::CreateMenuId()
+sal_uInt16 BmkMenu::CreateMenuId()
 {
     return BmkMenu_Impl::GetMID();
 }
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index 54b37da6dbf7..47e6ddb49fea 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -56,7 +56,7 @@ ResMgr* FwkResId::GetResManager()
 
 // -----------------------------------------------------------------------
 
-FwkResId::FwkResId( USHORT nId ) :
+FwkResId::FwkResId( sal_uInt16 nId ) :
     ResId( nId, *FwkResId::GetResManager() )
 {
 }
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 7de57599dd4b..7c008687ec7d 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -42,7 +42,7 @@
 #include <comphelper/processfactory.hxx>
 
 
-const USHORT START_ITEMID = 1000;
+const sal_uInt16 START_ITEMID = 1000;
 
 using namespace rtl;
 using namespace vos;
@@ -109,7 +109,7 @@ void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet,
     }
 }
 
-void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexContainer > xActionTriggerContainer )
+void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexContainer > xActionTriggerContainer )
 {
     Reference< XIndexAccess > xIndexAccess( xActionTriggerContainer, UNO_QUERY );
     if ( xIndexAccess.is() )
@@ -143,7 +143,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
                         Reference< XIndexContainer > xSubContainer;
                         sal_Bool bSpecialItemId = sal_False;
 
-                        USHORT nNewItemId = nItemId++;
+                        sal_uInt16 nNewItemId = nItemId++;
                         GetMenuItemAttributes( xPropSet, aLabel, aCommandURL, aHelpURL, xBitmap, xSubContainer );
 
                         OGuard aGuard( Application::GetSolarMutex() );
@@ -157,7 +157,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
                                 // got a special url during conversion from menu=>actiontriggercontainer.
                                 // Now we have to extract this special url and set the correct item id!!!
                                 bSpecialItemId = sal_True;
-                                nNewItemId = (USHORT)aCommandURL.copy( nIndex+aSlotURL.getLength() ).toInt32();
+                                nNewItemId = (sal_uInt16)aCommandURL.copy( nIndex+aSlotURL.getLength() ).toInt32();
                                 pSubMenu->InsertItem( nNewItemId, aLabel );
                             }
                             else
@@ -259,7 +259,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
 // implementation helper ( ActionTrigger => menu )
 // ----------------------------------------------------------------------------
 
-Reference< XPropertySet > CreateActionTrigger( USHORT nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
 {
     Reference< XPropertySet > xPropSet;
 
@@ -337,9 +337,9 @@ void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexCon
 {
     OGuard aGuard( Application::GetSolarMutex() );
 
-    for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
     {
-        USHORT          nItemId = pMenu->GetItemId( nPos );
+        sal_uInt16          nItemId = pMenu->GetItemId( nPos );
         MenuItemType    nType   = pMenu->GetItemType( nPos );
 
         try
@@ -383,7 +383,7 @@ void ActionTriggerHelper::CreateMenuFromActionTriggerContainer(
     Menu* pNewMenu,
     const Reference< XIndexContainer >& rActionTriggerContainer )
 {
-    USHORT nItemId = START_ITEMID;
+    sal_uInt16 nItemId = START_ITEMID;
 
     if ( rActionTriggerContainer.is() )
         InsertSubMenuItems( pNewMenu, nItemId, rActionTriggerContainer );
diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index eae77637187c..ab13b2caef6c 100644
--- a/framework/source/fwe/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
@@ -44,7 +44,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
 }
 
 
-Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast )
 {
     if ( _pGetImageFunc )
         return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast );
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index a37451339234..891504adbe71 100755
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -91,7 +91,7 @@ namespace framework
         virtual String      GetComment() const;
         virtual void        Undo();
         virtual void        Redo();
-        virtual BOOL        CanRepeat(SfxRepeatTarget&) const;
+        virtual sal_Bool    CanRepeat(SfxRepeatTarget&) const;
 
     private:
         const Reference< XUndoAction >  m_xUndoAction;
@@ -148,9 +148,9 @@ namespace framework
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    BOOL UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const
+    sal_Bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const
     {
-        return FALSE;
+        return sal_False;
     }
 
     //==================================================================================================================
diff --git a/framework/source/fwe/xml/imagesdocumenthandler.cxx b/framework/source/fwe/xml/imagesdocumenthandler.cxx
index 83d42b82c539..cdf20958332a 100644
--- a/framework/source/fwe/xml/imagesdocumenthandler.cxx
+++ b/framework/source/fwe/xml/imagesdocumenthandler.cxx
@@ -682,7 +682,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw
     {
         ImageListDescriptor* pImageList = m_aImageListsItems.pImageList;
 
-        for ( USHORT i = 0; i < m_aImageListsItems.pImageList->Count(); i++ )
+        for ( sal_uInt16 i = 0; i < m_aImageListsItems.pImageList->Count(); i++ )
         {
             const ImageListItemDescriptor* pImageItems = (*pImageList)[i];
             WriteImageList( pImageItems );
@@ -766,7 +766,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
     ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList;
     if ( pImageItemList )
     {
-        for ( USHORT i = 0; i < pImageItemList->Count(); i++ )
+        for ( sal_uInt16 i = 0; i < pImageItemList->Count(); i++ )
             WriteImage( (*pImageItemList)[i] );
     }
 
@@ -801,7 +801,7 @@ void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageIte
     m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )), m_xEmptyList );
     m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
 
-    for ( USHORT i = 0; i < pExternalImageList->Count(); i++ )
+    for ( sal_uInt16 i = 0; i < pExternalImageList->Count(); i++ )
     {
         ExternalImageItemDescriptor* pItem = (*pExternalImageList)[i];
         WriteExternalImage( pItem );
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 4493d5f80ec9..8a6d2cd1bafd 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -66,12 +66,12 @@ using namespace ::com::sun::star::io;
 namespace framework
 {
 
-BOOL MenuConfiguration::IsPickListItemId( USHORT nId )
+sal_Bool MenuConfiguration::IsPickListItemId( sal_uInt16 nId )
 {
     return (( START_ITEMID_PICKLIST <= nId ) && ( nId <= END_ITEMID_PICKLIST ));
 }
 
-BOOL MenuConfiguration::IsWindowListItemId( USHORT nId )
+sal_Bool MenuConfiguration::IsWindowListItemId( sal_uInt16 nId )
 {
     return (( START_ITEMID_WINDOWLIST <= nId ) && ( nId <= END_ITEMID_WINDOWLIST ));
 }
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index c5d5e84cf609..26ec3bf09372 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -937,7 +937,7 @@ throw ( SAXException, RuntimeException )
                     m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
                     m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) );
                     m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-                    bSeparator = FALSE;
+                    bSeparator = sal_False;
                 }
             }
             else
@@ -946,7 +946,7 @@ throw ( SAXException, RuntimeException )
                 {
                     if ( aCommandURL.getLength() > 0 )
                     {
-                        bSeparator = FALSE;
+                        bSeparator = sal_False;
                         WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
                     }
                 }
@@ -954,7 +954,7 @@ throw ( SAXException, RuntimeException )
                 {
                     // Don't write two separators together
                     WriteMenuSeparator();
-                    bSeparator = TRUE;
+                    bSeparator = sal_True;
                 }
             }
         }
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 370ca6e3f18a..3d8d4bfc7c9a 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -656,7 +656,7 @@ throw ( SAXException, RuntimeException )
                              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_STYLE_OUT )) );
     }
 
-    // autosize (default FALSE)
+    // autosize (default sal_False)
     if ( nStyle & ItemStyle::AUTO_SIZE )
     {
         pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_AUTOSIZE )),
@@ -664,7 +664,7 @@ throw ( SAXException, RuntimeException )
                              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BOOLEAN_TRUE )) );
     }
 
-    // ownerdraw (default FALSE)
+    // ownerdraw (default sal_False)
     if ( nStyle & ItemStyle::OWNER_DRAW )
     {
         pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_OWNERDRAW )),
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index acb88ef16e75..b41f50339343 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -360,7 +360,7 @@ throw(  SAXException, RuntimeException )
 
                             case TB_ATTRIBUTE_ITEMBITS:
                             {
-                                nItemBits = (USHORT)(xAttribs->getValueByIndex( n ).toInt32());
+                                nItemBits = (sal_uInt16)(xAttribs->getValueByIndex( n ).toInt32());
                             }
                             break;
 
@@ -381,13 +381,13 @@ throw(  SAXException, RuntimeException )
 
                             case TB_ATTRIBUTE_WIDTH:
                             {
-                                nWidth = (USHORT)(xAttribs->getValueByIndex( n ).toInt32());
+                                nWidth = (sal_uInt16)(xAttribs->getValueByIndex( n ).toInt32());
                             }
                             break;
 
                             case TB_ATTRIBUTE_USER:
                             {
-                                nUserDef = (USHORT)(xAttribs->getValueByIndex( n ).toInt32());
+                                nUserDef = (sal_uInt16)(xAttribs->getValueByIndex( n ).toInt32());
                             }
                             break;
 
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 0f835abdfeac..641200069dfc 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -225,7 +225,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
         Sequence< Locale > rLocales( xDocumentLanguages->getDocumentLanguages( nScriptType, nMaxCount ));
         if ( rLocales.getLength() > 0 )
         {
-            for ( USHORT i = 0; i < rLocales.getLength(); ++i )
+            for ( sal_uInt16 i = 0; i < rLocales.getLength(); ++i )
             {
                 if ( rLangItems.size() == static_cast< size_t >(nMaxCount) )
                     break;
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 8c81f31f2394..02a040a05bc1 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -348,7 +348,7 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any&       aConve
                                                                const Any& aValue             )
 throw( com::sun::star::lang::IllegalArgumentException )
 {
-    //  Initialize state with FALSE !!!
+    //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index ee0fceeebc7a..877c2dd3d711 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -297,7 +297,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
             (pWindow->IsSystemWindow())
            )
         {
-            ULONG nMask  =   WINDOWSTATE_MASK_ALL;
+            sal_uLong nMask  =   WINDOWSTATE_MASK_ALL;
                   nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
             sWindowState = B2U_ENC(
                             ((SystemWindow*)pWindow)->GetWindowState(nMask),
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index f820d5719b85..362764054326 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -218,7 +218,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
                                                                         sal_Int32  nHandle         ,
                                                                         const Any& aValue             ) throw( com::sun::star::lang::IllegalArgumentException )
 {
-    //  Initialize state with FALSE !!!
+    //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 38724e077326..589c6fdd8aad 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -180,7 +180,7 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any&       /*a
                                                                   sal_Int32  /*nHandle*/         ,
                                                                   const Any& /*aValue*/             ) throw( com::sun::star::lang::IllegalArgumentException )
 {
-    //  Initialize state with FALSE !!!
+    //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
     return sal_False ;
 }
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 3845c09ffb6f..5b9a3996db1d 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -199,7 +199,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
     // <- SAFE ----------------------------------
 
     // normalize value to fit the range of 0-100 %
-    USHORT nPercent = sal::static_int_cast< USHORT >(
+    sal_uInt16 nPercent = sal::static_int_cast< sal_uInt16 >(
         ::std::min(
             ((nValue*100) / ::std::max(nRange,(sal_Int32)1)), (sal_Int32)100));
 
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 23ec86df8a00..b2fc8c078fac 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -138,7 +138,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
                     the key, which should be checked.
 
             @return [bool]
-                    TRUE if the speicfied key exists inside this container.
+                    sal_True if the speicfied key exists inside this container.
          */
         virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const;
         virtual sal_Bool hasCommand(const ::rtl::OUString& sCommand) const;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 36eed6a6d534..fb4a269cdb8f 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -299,7 +299,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
 
         @param  bWriteAccessRequested
         if the outside code whish to change the container
-        it must call this method with "TRUE". So the internal
+        it must call this method with "sal_True". So the internal
         cache can be prepared for that (means copy-on-write ...).
 
         @return [AcceleratorCache]
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index e254378867b6..0a8ebb6f5a35 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -148,10 +148,10 @@ class KeyMapping
 
             @param  rCode
                     contains the converted code, but is defined only
-                    if this method returns TRUE!
+                    if this method returns sal_True!
 
             @return [boolean]
-                    TRUE if convertion was successfully.
+                    sal_True if convertion was successfully.
           */
         sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier,
                                                                 sal_uInt16&      rCode      );
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 291fc29675eb..ae3439b79653 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -212,7 +212,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
                     using the given open mode. If it failed there is second step,
                     which tries to do the same again ... but removing a might existing
                     WRITE flag from the open mode. The user can supress this fallback
-                    handling by setting the parameter bAllowFallback to FALSE.
+                    handling by setting the parameter bAllowFallback to sal_False.
 
             @param  xBaseStorage
                     the storage, where the sub element should be searched.
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 5e1eaf64036d..2059c976ecae 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -122,8 +122,8 @@ class ActionLockGuard : private ThreadHelpBase
             @param  xLock
                     points to the outside resource, which should be locked.
 
-            @return TRUE, if new resource could be set and locked.
-                    FALSE otherwhise.
+            @return sal_True, if new resource could be set and locked.
+                    sal_False otherwhise.
          */
         virtual sal_Bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock)
         {
@@ -150,8 +150,8 @@ class ActionLockGuard : private ThreadHelpBase
             @param  xLock
                     points to the outside resource, which should be locked.
 
-            @return TRUE, if new resource could be set and locked.
-                    FALSE otherwhise.
+            @return sal_True, if new resource could be set and locked.
+                    sal_False otherwhise.
          */
         virtual void freeResource()
         {
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 982f390f8469..6330f2598605 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -195,7 +195,7 @@ class LoadEnv : private ThreadHelpBase
 
         /** @short  it indicates, that the member m_xTargetFrame was new created for this
                     load request and must be closed in case loading (not handling!)
-                    operation failed. The default value is FALSE!
+                    operation failed. The default value is sal_False!
          */
         sal_Bool m_bCloseFrameOnError;
 
@@ -203,7 +203,7 @@ class LoadEnv : private ThreadHelpBase
                     in combination with the m_sTarget value "_self") was suspended.
                     Normaly it will be replaced by the new loaded document. But in case
                     loading (not handling!) failed, it must be reactivated.
-                    The default value is FALSE!
+                    The default value is sal_False!
          */
         sal_Bool m_bReactivateControllerOnError;
 
@@ -369,8 +369,8 @@ class LoadEnv : private ThreadHelpBase
                     specify a timeout in [ms].
                     A value 0 let it wait forever!
 
-            @return TRUE if the started load process could be finished in time;
-                    FALSE if the specified time was over.
+            @return sal_True if the started load process could be finished in time;
+                    sal_False if the specified time was over.
 
             @throw  ... currently not used :-)
 
@@ -653,10 +653,10 @@ class LoadEnv : private ThreadHelpBase
                     points to the container window of a frame.
 
             @param  bForceToFront
-                    if it's set to FALSE ... showing of the window is done more intelligent.
+                    if it's set to sal_False ... showing of the window is done more intelligent.
                     setVisible() is called only if the window was not shown before.
                     This mode is needed by b) and c)
-                    If it's set to TRUE ... both actions has to be done: setVisible(), toFront()!
+                    If it's set to sal_True ... both actions has to be done: setVisible(), toFront()!
                     This mode is needed by a)
          */
         void impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow      ,
@@ -672,8 +672,8 @@ class LoadEnv : private ThreadHelpBase
                     the frame, which should be checked.
 
             @return [sal_Bool]
-                    TRUE if this frame is already used for loading,
-                    FALSE otherwise.
+                    sal_True if this frame is already used for loading,
+                    sal_False otherwise.
          */
         sal_Bool impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const;
 
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 3ffbfaeaebdc..ce625938bd64 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -92,7 +92,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un
             the right owner in case closing failed.
 
     @return [bool]
-            TRUE if closing failed.
+            sal_True if closing failed.
  */
 inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource         ,
                        sal_Bool                                     bDelegateOwnerShip)
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 619ce140d491..11fa0be9a767 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -81,7 +81,7 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind
     // check for system window is neccessary to guarantee correct pointer cast!
     if (pWindow!=NULL && pWindow->IsSystemWindow())
     {
-        ULONG nMask  = WINDOWSTATE_MASK_ALL;
+        sal_uLong nMask  = WINDOWSTATE_MASK_ALL;
               nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
         sWindowState = ((SystemWindow*)pWindow)->GetWindowState(nMask);
     }
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 7ae2452874be..e0f2fd063f5e 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -815,7 +815,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr
                 describes the broadcaster and must be the frame instance
 
     @param  bGetsOwnerShip
-                If it's set to <TRUE> and we throw the right veto excepion, we have to close this frame later
+                If it's set to <sal_True> and we throw the right veto excepion, we have to close this frame later
                 if our internal processes will be finished. If it's set to <FALSE/> we can ignore it.
 
     @throw  CloseVetoException
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index feb1e4bb52f9..0a6f27393330 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -514,7 +514,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
             some informations (e.g. for updating her configuration ...). We must know
             if such request is valid or not then.
 
-    @return TRUE if the represented job is part of the underlying configuration package.
+    @return sal_True if the represented job is part of the underlying configuration package.
  */
 sal_Bool JobData::hasConfig() const
 {
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 59e6384a0e93..a3cc98474104 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -278,8 +278,8 @@ sal_Bool JobURL::implst_split( /*IN*/  const ::rtl::OUString& sPart           ,
     // first search for the given identifier
     sal_Bool bPartFound = (sPart.matchIgnoreAsciiCaseAsciiL(pPartIdentifier,nPartLength,0));
 
-    // If it exist - we can split the part and return TRUE.
-    // Otherwhise we do nothing and return FALSE.
+    // If it exist - we can split the part and return sal_True.
+    // Otherwhise we do nothing and return sal_False.
     if (bPartFound)
     {
         // But may the part has optional arguments - seperated by a "?".
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 407d9ff1ec1e..43176fe82b72 100755..100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1695,7 +1695,7 @@ throw (uno::RuntimeException)
                 Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                 if ( pWindow )
                 {
-                    pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+                    pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                     bResult   = true;
                     bNotify   = true;
                     bDoLayout = true;
@@ -2612,7 +2612,7 @@ void LayoutManager::implts_updateMenuBarClose()
             MenuBar* pMenuBar = pSysWindow->GetMenuBar();
             if ( pMenuBar )
             {
-                // TODO remove link on FALSE ?!
+                // TODO remove link on sal_False ?!
                 pMenuBar->ShowCloser( bShowCloser );
                 pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
             }
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 559e7707ac36..5992e7b42dc5 100755..100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -563,7 +563,7 @@ bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL )
         if ( !aUIElement.m_bFloating )
             implts_setLayoutDirty();
         else
-            pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
 
         aUIElement.m_bVisible = true;
         implts_writeWindowStateData( aUIElement );
@@ -582,7 +582,7 @@ bool ToolbarLayoutManager::hideToolbar( const ::rtl::OUString& rResourceURL )
     Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
     if ( pWindow )
     {
-        pWindow->Show( FALSE );
+        pWindow->Show( sal_False );
         if ( !aUIElement.m_bFloating )
             implts_setLayoutDirty();
 
@@ -642,10 +642,10 @@ void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible )
             if ( bVisible )
             {
                 if ( pIter->m_bVisible && !pIter->m_bMasterHide )
-                    pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+                    pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             }
             else
-                pWindow->Show( FALSE );
+                pWindow->Show( sal_False );
         }
     }
 }
@@ -807,7 +807,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
             if ( pToolBox )
             {
                 aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox );
-                USHORT nId = pToolBox->GetCurItemId();
+                sal_uInt16 nId = pToolBox->GetCurItemId();
                 if ( nId > 0 )
                     aCommand = pToolBox->GetItemCommand( nId );
             }
@@ -938,7 +938,7 @@ rtl::OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal
     aAddonGenericTitle = String( FwkResId( STR_TOOLBAR_TITLE_ADDON ));
     const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
 
-    String aNumStr = rI18nHelper.GetNum( nNumber, 0, FALSE, FALSE );
+    String aNumStr = rI18nHelper.GetNum( nNumber, 0, sal_False, sal_False );
     aAddonGenericTitle.SearchAndReplaceAscii( "%num%", aNumStr );
 
     return rtl::OUString( aAddonGenericTitle );
@@ -1331,7 +1331,7 @@ void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, b
             if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
             {
                 ToolBox* pToolbar = (ToolBox *)pWindow;
-                USHORT nMenuType = pToolbar->GetMenuType();
+                sal_uInt16 nMenuType = pToolbar->GetMenuType();
                 if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, m_aCustomizeCmd ))
                     pToolbar->SetMenuType( nMenuType & ~TOOLBOX_MENUTYPE_CUSTOMIZE );
                 else
@@ -2706,7 +2706,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
             if ( aWinRect.X < nCurrPos )
                 aWinRect.X = nCurrPos;
             pWindow->SetPosSizePixel( ::Point( aWinRect.X, nOffset ), ::Size( aWinRect.Width, rRowColumnWindowData.nStaticSize ));
-            pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             nCurrPos += ( aWinRect.X - nCurrPos ) + aWinRect.Width;
         }
         else
@@ -2714,7 +2714,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
             if ( aWinRect.Y < nCurrPos )
                 aWinRect.Y = nCurrPos;
             pWindow->SetPosSizePixel( ::Point( nOffset, aWinRect.Y ), ::Size( rRowColumnWindowData.nStaticSize, aWinRect.Height ));
-            pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             nCurrPos += ( aWinRect.Y - nCurrPos ) + aWinRect.Height;
         }
     }
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index cf37e1d8129f..768edf4dd2f4 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1017,7 +1017,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
                                 ::comphelper::ConfigurationHelper::E_READONLY);
 
         // NIL means: count of allowed documents = infinite !
-        //     => return TRUE
+        //     => return sal_True
         if ( ! aVal.hasValue())
             bAllowed = sal_True;
         else
@@ -1707,7 +1707,7 @@ void LoadEnv::impl_reactForLoadingState()
     }
 
     // This max force an implicit closing of our target frame ...
-    // e.g. in case close(TRUE) was called before and the frame
+    // e.g. in case close(sal_True) was called before and the frame
     // kill itself if our external use-lock is released here!
     // Thats why we releas this lock AFTER ALL OPERATIONS on this frame
     // are finished. The frame itslef must handle then
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 4e3213081980..564e26f2651b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -233,7 +233,7 @@ static const sal_Int32       GIVE_UP_RETRY                          =   1; // in
 // should be flushed an exception ... so the special error handler for this scenario is triggered
 // #define TRIGGER_FULL_DISC_CHECK
 
-// force "return FALSE" for the method impl_enoughDiscSpace().
+// force "return sal_False" for the method impl_enoughDiscSpace().
 // #define SIMULATE_FULL_DISC
 
 //-----------------------------------------------
@@ -927,7 +927,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
     else
     if (aEvent.EventName.equals(EVENT_ON_UNLOAD))
     {
-        implts_deregisterDocument(xDocument, sal_True); // TRUE => stop listening for disposing() !
+        implts_deregisterDocument(xDocument, sal_True); // sal_True => stop listening for disposing() !
     }
 }
 
@@ -1022,7 +1022,7 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent)
     css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
     if (xDocument.is())
     {
-        implts_deregisterDocument(xDocument, sal_False); // FALSE => dont call removeEventListener() .. because it's not needed here
+        implts_deregisterDocument(xDocument, sal_False); // sal_False => dont call removeEventListener() .. because it's not needed here
         return;
     }
 
@@ -1576,7 +1576,7 @@ void AutoRecovery::implts_updateTimer()
        )
         return;
 
-    ULONG nMilliSeconds = 0;
+    sal_uLong nMilliSeconds = 0;
     if (m_eTimerType == AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL)
     {
         nMilliSeconds = (m_nAutoSaveTimeIntervall*60000); // [min] => 60.000 ms
@@ -1910,7 +1910,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra
 
     AutoRecovery::st_impl_removeFile(aInfo.OldTempURL);
     AutoRecovery::st_impl_removeFile(aInfo.NewTempURL);
-    implts_flushConfigItem(aInfo, sal_True); // TRUE => remove it from config
+    implts_flushConfigItem(aInfo, sal_True); // sal_True => remove it from config
 }
 
 //-----------------------------------------------
@@ -1951,7 +1951,7 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr
     {
         AutoRecovery::TDocumentInfo& rInfo = *pIt;
 
-        // use TRUE as fallback ... so we recognize every document on EmergencySave/AutoRecovery!
+        // use sal_True as fallback ... so we recognize every document on EmergencySave/AutoRecovery!
         sal_Bool bModified = sal_True;
         css::uno::Reference< css::util::XModifiable > xModify(xDocument, css::uno::UNO_QUERY);
         if (xModify.is())
@@ -3301,7 +3301,7 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams)
 
         AutoRecovery::st_impl_removeFile(rInfo.OldTempURL);
         AutoRecovery::st_impl_removeFile(rInfo.NewTempURL);
-        implts_flushConfigItem(rInfo, sal_True); // TRUE => remove it from xml config!
+        implts_flushConfigItem(rInfo, sal_True); // sal_True => remove it from xml config!
 
         m_lDocCache.erase(pIt);
         break; /// !!! pIt is not defined any longer ... further this function has finished it's work
@@ -3382,7 +3382,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
                     sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0));
 
                     // exists session data ... => then we cant say, that these
-                    // data are valid for recovery. So we have to return FALSE then!
+                    // data are valid for recovery. So we have to return sal_False then!
                     if (bSessionData)
                         bRecoveryData = sal_False;
 
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 627f26e0549c..b8db175886d2 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -506,7 +506,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     // disable full screen mode of the frame!
     if (pParent->IsFullScreenMode())
     {
-        pParent->ShowFullScreenMode(FALSE);
+        pParent->ShowFullScreenMode(sal_False);
         pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL);
     }
 
@@ -625,10 +625,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame()
     UI user.
 
     @param  bSuspend
-                If its set to TRUE this controller should be suspended.
-                FALSE will resuspend it.
+                If its set to sal_True this controller should be suspended.
+                sal_False will resuspend it.
 
-    @return TRUE if the request could be finished successfully; FALSE otherwise.
+    @return sal_True if the request could be finished successfully; sal_False otherwise.
  */
 
 sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool )
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 8c477a78892f..1d1e877a5a86 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -83,7 +83,7 @@ DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle ) :
     ToolBox( pParent, nStyle )
 {
         SetBackground();
-        SetPaintTransparent( TRUE );
+        SetPaintTransparent( sal_True );
 }
 
 void DecoToolBox::DataChanged( const DataChangedEvent& rDCEvt )
@@ -94,17 +94,17 @@ void DecoToolBox::DataChanged( const DataChangedEvent& rDCEvt )
     {
         calcMinSize();
         SetBackground();
-        SetPaintTransparent( TRUE );
+        SetPaintTransparent( sal_True );
     }
 }
 
 void DecoToolBox::calcMinSize()
 {
     ToolBox aTbx( GetParent() );
-    USHORT nItems = GetItemCount();
-    for( USHORT i = 0; i < nItems; i++ )
+    sal_uInt16 nItems = GetItemCount();
+    for( sal_uInt16 i = 0; i < nItems; i++ )
     {
-        USHORT nId = GetItemId( i );
+        sal_uInt16 nId = GetItemId( i );
         aTbx.InsertItem( nId, GetItemImage( nId ) );
     }
     aTbx.SetOutStyle( TOOLBOX_STYLE_FLAT );
@@ -193,8 +193,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     // clean up resource stack
     FreeResource();
 
-    maWelcome.SetPaintTransparent( TRUE );
-    maProduct.SetPaintTransparent( TRUE );
+    maWelcome.SetPaintTransparent( sal_True );
+    maProduct.SetPaintTransparent( sal_True );
     EnableChildTransparentMode();
 
     SetStyle( GetStyle() | WB_DIALOGCONTROL );
@@ -387,7 +387,7 @@ void BackingWindow::prepareRecentFileMenu()
                 aBuf.append( i+1 );
             aBuf.appendAscii( ": " );
             aBuf.append( aMenuTitle );
-            mpRecentMenu->InsertItem( static_cast<USHORT>(i+1), aBuf.makeStringAndClear() );
+            mpRecentMenu->InsertItem( static_cast<sal_uInt16>(i+1), aBuf.makeStringAndClear() );
         }
     }
     else
@@ -564,9 +564,9 @@ void BackingWindow::initControls()
         MenuBar* pMBar = pSysWin->GetMenuBar();
         if( pMBar )
         {
-            for( USHORT i = 0; i < pMBar->GetItemCount(); i++ )
+            for( sal_uInt16 i = 0; i < pMBar->GetItemCount(); i++ )
             {
-                USHORT nItemId = pMBar->GetItemId( i );
+                sal_uInt16 nItemId = pMBar->GetItemId( i );
                 String aItemText( pMBar->GetItemText( nItemId ) );
                 if( aItemText.Len() )
                     aMnemns.RegisterMnemonic( aItemText );
@@ -677,11 +677,11 @@ void BackingWindow::layoutButton(
 {
     rtl::OUString aURL( rtl::OUString::createFromAscii( i_pURL ? i_pURL : "" ) );
     // setup button
-    i_rBtn.SetPaintTransparent( TRUE );
+    i_rBtn.SetPaintTransparent( sal_True );
     i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
     if( i_pURL && (! i_rOpt.IsModuleInstalled( i_eMod ) || i_rURLS.find( aURL ) == i_rURLS.end()) )
     {
-        i_rBtn.Enable( FALSE );
+        i_rBtn.Enable( sal_False );
     }
 
     // setup text
@@ -1136,7 +1136,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
             if ( xDispatch.is() )
             {
                 ImplDelayedDispatch* pDisp = new ImplDelayedDispatch( xDispatch, aDispatchURL, i_rArgs );
-                ULONG nEventId = 0;
+                sal_uLong nEventId = 0;
                 if( ! Application::PostUserEvent( nEventId, Link( NULL, implDispatchDelayed ), pDisp ) )
                     delete pDisp; // event could not be posted for unknown reason, at least don't leak
             }
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 289757ec7874..3c89661af599 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1521,7 +1521,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aCon
     // Register transaction and reject wrong calls.
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
 
-    //  Initialize state with FALSE !!!
+    //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index a6567b218369..b9dd626cf06d 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -280,7 +280,7 @@ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFac
         ,   PropertySetHelper           ( xFactory,
                                           &m_aLock,
                                           &m_aTransactionManager,
-                                          sal_False) // FALSE => dont release shared mutex on calling us!
+                                          sal_False) // sal_False => dont release shared mutex on calling us!
         ,   ::cppu::OWeakObject         (                                                   )
         //  init member
         ,   m_xFactory                  ( xFactory                                          )
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 18f3e21bf67d..f140b8e22886 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -243,7 +243,7 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
     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)
@@ -439,7 +439,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
     aArrow(this, ResId(IMG_ARROW, *pResMgr)),
     aStrAccept( ResId(LICENSE_ACCEPT, *pResMgr) ),
     aStrNotAccept( ResId(LICENSE_NOTACCEPT, *pResMgr) ),
-    bEndReached(FALSE)
+    bEndReached(sal_False)
 {
     FreeResource();
 
@@ -502,7 +502,7 @@ IMPL_LINK( LicenseDialog, PageDownHdl, PushButton *, EMPTYARG )
 
 IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG )
 {
-    bEndReached = TRUE;
+    bEndReached = sal_True;
 
     EnableControls();
 
@@ -532,7 +532,7 @@ void LicenseDialog::EnableControls()
 {
     if( !bEndReached &&
         ( aLicenseML.IsEndReached() || !aLicenseML.GetText().Len() ) )
-        bEndReached = TRUE;
+        bEndReached = sal_True;
 
     if ( bEndReached )
     {
@@ -583,20 +583,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;
 }
@@ -605,8 +605,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/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 9af8581652d3..ef29214bc229 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -119,7 +119,7 @@ TabWindowService::TabWindowService( const css::uno::Reference< css::lang::XMulti
         ,   PropertySetHelper       ( xFactory                      ,
                                       &m_aLock                      ,
                                       &m_aTransactionManager        ,
-                                      sal_False                     ) // FALSE => dont release shared mutex on calling us!
+                                      sal_False                     ) // sal_False => dont release shared mutex on calling us!
         ,   OWeakObject             (                               )
 
         // Init member
@@ -368,7 +368,7 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
     if ( !pEvent && !pEvent->ISA(VclWindowEvent))
         return 0;
 
-    ULONG           nEventId = pEvent->GetId();
+    sal_uLong           nEventId = pEvent->GetId();
     VclWindowEvent* pWinEvt  = static_cast< VclWindowEvent* >(pEvent);
 
     css::uno::Reference< css::uno::XInterface > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
@@ -399,19 +399,19 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
             switch (nEventId)
             {
                 case VCLEVENT_TABPAGE_ACTIVATE :
-                    pListener->activated( (sal_Int32)(ULONG)pWinEvt->GetData() );
+                    pListener->activated( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
                     break;
 
                 case VCLEVENT_TABPAGE_DEACTIVATE :
-                    pListener->deactivated( (sal_Int32)(ULONG)pWinEvt->GetData() );
+                    pListener->deactivated( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
                     break;
 
                 case VCLEVENT_TABPAGE_INSERTED :
-                    pListener->inserted( (sal_Int32)(ULONG)pWinEvt->GetData() );
+                    pListener->inserted( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
                     break;
 
                 case VCLEVENT_TABPAGE_REMOVED :
-                    pListener->removed( (sal_Int32)(ULONG)pWinEvt->GetData() );
+                    pListener->removed( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
                     break;
 
                 case VCLEVENT_TABPAGE_PAGETEXTCHANGED :
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 107dccc80dc7..d304de99122f 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -424,16 +424,16 @@ throw (css::uno::Exception, css::uno::RuntimeException)
                     vos::OGuard aGuard( Application::GetSolarMutex() );
                     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     if( pWindow )
-                        pWindow->Show( TRUE );
+                        pWindow->Show( sal_True );
 
                     pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
                     if ( pWindow )
-                        pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE  );
+                        pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE  );
 
                     pWindow = VCLUnoHelper::GetWindow( xTabControl );
                     if ( pWindow )
                     {
-                        pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE  );
+                        pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE  );
                         TabControl* pTabControl = (TabControl *)pWindow;
                         pTabControl->SetActivatePageHdl( LINK( this, TabWindow, Activate ));
                         pTabControl->SetDeactivatePageHdl( LINK( this, TabWindow, Deactivate ));
@@ -849,7 +849,7 @@ sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any&       aCon
                                                        const css::uno::Any& aValue             )
 throw( css::lang::IllegalArgumentException )
 {
-    //  Initialize state with FALSE !!!
+    //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index a5304a9d64df..537fe623d633 100755
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -524,7 +524,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages(
                 sal_Int32 nCount = pList->pImageItemList->Count();
                 std::vector< OUString > aUserImagesVector;
                 aUserImagesVector.reserve(nCount);
-                for ( USHORT i=0; i < nCount; i++ )
+                for ( sal_uInt16 i=0; i < nCount; i++ )
                 {
                     const ImageItemDescriptor* pItem = pList->pImageItemList->GetObject(i);
                     aUserImagesVector.push_back( pItem->aCommandURL );
@@ -597,7 +597,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
             aUserImageListInfo.pImageList->Insert( pList, 0 );
 
             pList->pImageItemList = new ImageItemListDescriptor;
-            for ( USHORT i=0; i < pImageList->GetImageCount(); i++ )
+            for ( sal_uInt16 i=0; i < pImageList->GetImageCount(); i++ )
             {
                 ImageItemDescriptor* pItem = new ::framework::ImageItemDescriptor;
 
@@ -1007,7 +1007,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
             if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicsSequence[i], nIndex ))
                 continue;
 
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
+            sal_uInt16 nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
             if ( nPos == IMAGELIST_IMAGE_NOTFOUND )
             {
                 pImageList->AddImage( aCommandURLSequence[i], xGraphic );
@@ -1091,11 +1091,11 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
 
         for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
         {
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
+            sal_uInt16 nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
             if ( nPos != IMAGELIST_IMAGE_NOTFOUND )
             {
                 Image aImage = pImageList->GetImage( nPos );
-                USHORT nId   = pImageList->GetImageId( nPos );
+                sal_uInt16 nId   = pImageList->GetImageId( nPos );
                 pImageList->RemoveImage( nId );
 
                 if ( m_bUseGlobal )
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index c4ba41372cd5..0512faf3bbf7 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -115,7 +115,7 @@ namespace framework
 {
 
 static const char   TOOLBOXITEM_SEPARATOR_STR[] = "private:separator";
-static const USHORT TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPARATOR_STR )-1;
+static const sal_uInt16 TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPARATOR_STR )-1;
 
 AddonsToolBarManager::AddonsToolBarManager( const Reference< XMultiServiceFactory >& rServiceManager,
                                 const Reference< XFrame >& rFrame,
@@ -159,8 +159,8 @@ static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, cons
 static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame,
                             const rtl::OUString& aImageId,
                             const rtl::OUString& aURL,
-                            BOOL bBigImage,
-                            BOOL bHiContrast )
+                            sal_Bool bBigImage,
+                            sal_Bool bHiContrast )
 {
     Image aImage;
 
@@ -192,7 +192,7 @@ void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException )
         ResetableGuard aGuard( m_aLock );
         for ( sal_uInt16 n = 0; n < m_pToolBar->GetItemCount(); n++ )
         {
-            USHORT nId( m_pToolBar->GetItemId( n ) );
+            sal_uInt16 nId( m_pToolBar->GetItemId( n ) );
 
             if ( nId > 0 )
             {
@@ -220,9 +220,9 @@ bool AddonsToolBarManager::MenuItemAllowed( sal_uInt16 nId ) const
 void AddonsToolBarManager::RefreshImages()
 {
     sal_Bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
     {
-        USHORT nId( m_pToolBar->GetItemId( nPos ) );
+        sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
 
         if ( nId > 0 )
         {
@@ -248,7 +248,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
     if ( m_bDisposed )
         return;
 
-    USHORT    nId( 1 );
+    sal_uInt16    nId( 1 );
 
     RemoveControllers();
 
@@ -296,7 +296,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
         {
             if ( aURL.equalsAsciiL( TOOLBOXITEM_SEPARATOR_STR, TOOLBOXITEM_SEPARATOR_STR_LEN ))
             {
-                USHORT nCount = m_pToolBar->GetItemCount();
+                sal_uInt16 nCount = m_pToolBar->GetItemCount();
                 if ( nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != TOOLBOXITEM_SEPARATOR ) && nElements > 0 )
                 {
                     nElements = 0;
@@ -305,13 +305,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
             }
             else
             {
-                USHORT nCount = m_pToolBar->GetItemCount();
+                sal_uInt16 nCount = m_pToolBar->GetItemCount();
                 if ( bAppendSeparator && nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != TOOLBOXITEM_SEPARATOR ))
                 {
                     // We have to append a separator first if the last item is not a separator
                     m_pToolBar->InsertSeparator();
                 }
-                bAppendSeparator = FALSE;
+                bAppendSeparator = sal_False;
 
                 m_pToolBar->InsertItem( nId, aTitle );
 
@@ -446,7 +446,7 @@ IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -464,7 +464,7 @@ IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -493,7 +493,7 @@ IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG )
         return 1;
 
     sal_Int16   nKeyModifier( (sal_Int16)m_pToolBar->GetModifier() );
-    USHORT      nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16      nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -541,9 +541,9 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
         CheckAndUpdateImages();
     }
 
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
-        const USHORT nId = m_pToolBar->GetItemId(nPos);
+        const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
         Window* pWindow = m_pToolBar->GetItemWindow( nId );
         if ( pWindow )
         {
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 52478f278544..b0384b18d3d1 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -143,7 +143,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
-                    ULONG nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
+                    sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
 
                     pToolBar = new ToolBar( pWindow, nStyles );
                     m_xToolBarWindow = VCLUnoHelper::GetInterface( pToolBar );
@@ -160,7 +160,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
                     // Fill toolbar with container contents
                     pToolBarManager->FillToolbar( m_aConfigData );
                     pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
-                    pToolBar->EnableCustomize( TRUE );
+                    pToolBar->EnableCustomize( sal_True );
                     ::Size aActSize( pToolBar->GetSizePixel() );
                     ::Size aSize( pToolBar->CalcWindowSizePixel() );
                     aSize.Width() = aActSize.Width();
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index d17ffcb78f9d..0185c68726dd 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -170,7 +170,7 @@ ComboboxToolbarController::ComboboxToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     sal_Int32                                nWidth,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
@@ -420,7 +420,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f
                 com::sun::star::util::Color aColor(0);
                 if ( rControlCommand.Arguments[i].Value >>= aColor )
                 {
-                    ::Color aBackColor( static_cast< UINT32 >( aColor ));
+                    ::Color aBackColor( static_cast< sal_uInt32 >( aColor ));
                     m_pComboBox->SetControlBackground( aBackColor );
                 }
                 break;
@@ -436,7 +436,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f
                 com::sun::star::util::Color aColor(0);
                 if ( rControlCommand.Arguments[i].Value >>= aColor )
                 {
-                    ::Color aForeColor( static_cast< UINT32 >( aColor ));
+                    ::Color aForeColor( static_cast< sal_uInt32 >( aColor ));
                     m_pComboBox->SetControlForeground( aForeColor );
                 }
                 break;
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 2e1c88740750..8fbd34801206 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -82,7 +82,7 @@ ComplexToolbarController::ComplexToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     const ::rtl::OUString&                          aCommand ) :
     svt::ToolboxController( rServiceManager, rFrame, aCommand )
     ,   m_pToolbar( pToolbar )
@@ -185,7 +185,7 @@ throw ( RuntimeException )
     {
         m_pToolbar->EnableItem( m_nID, Event.IsEnabled );
 
-        USHORT nItemBits = m_pToolbar->GetItemBits( m_nID );
+        sal_uInt16 nItemBits = m_pToolbar->GetItemBits( m_nID );
         nItemBits &= ~TIB_CHECKABLE;
         TriState eTri = STATE_NOCHECK;
 
@@ -199,7 +199,7 @@ throw ( RuntimeException )
         {
             // Boolean, treat it as checked/unchecked
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
             m_pToolbar->CheckItem( m_nID, bValue );
             if ( bValue )
                 eTri = STATE_CHECK;
@@ -212,14 +212,14 @@ throw ( RuntimeException )
             m_pToolbar->SetQuickHelpText( m_nID, aText );
 
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
         else if ( Event.State >>= aItemState )
         {
             eTri = STATE_DONTKNOW;
             nItemBits |= TIB_CHECKABLE;
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
         else if ( Event.State >>= aItemVisibility )
         {
@@ -230,11 +230,11 @@ throw ( RuntimeException )
         {
             executeControlCommand( aControlCommand );
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
 
         else if ( m_bMadeInvisible )
-            m_pToolbar->ShowItem( m_nID, TRUE );
+            m_pToolbar->ShowItem( m_nID, sal_True );
 
         m_pToolbar->SetItemState( m_nID, eTri );
         m_pToolbar->SetItemBits( m_nID, nItemBits );
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 49501194a014..1443d4374d55 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -289,7 +289,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
 
-    USHORT nMenuId = 0;
+    sal_uInt16 nMenuId = 0;
     for (sal_uInt32 i=0; i < sizeof(aCommands)/sizeof(aCommands[0]); ++i)
     {
         if ( Event.FeatureURL.Complete.equalsAscii( aCommands[i] ))
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 0800103c743e..dadcf46a00bf 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -152,7 +152,7 @@ DropdownToolbarController::DropdownToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     sal_Int32                                nWidth,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 387213d7c3eb..60ea9e7c0ce1 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -151,7 +151,7 @@ EditToolbarController::EditToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     sal_Int32                                nWidth,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index c2625a951efb..deaf39660792 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -117,7 +117,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont
     {
         vector<rtl::OUString> aVector;
         aVector.reserve(rFontNameSeq.getLength());
-        for ( USHORT i = 0; i < rFontNameSeq.getLength(); i++ )
+        for ( sal_uInt16 i = 0; i < rFontNameSeq.getLength(); i++ )
         {
             aVector.push_back(MnemonicGenerator::EraseAllMnemonicChars(pFontNameArray[i]));
         }
@@ -198,12 +198,12 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (
     if ( m_xPopupMenu.is() )
     {
         // find new font name and set check mark!
-        USHORT        nChecked = 0;
-        USHORT        nItemCount = m_xPopupMenu->getItemCount();
+        sal_uInt16        nChecked = 0;
+        sal_uInt16        nItemCount = m_xPopupMenu->getItemCount();
         rtl::OUString aEmpty;
-        for( USHORT i = 0; i < nItemCount; i++ )
+        for( sal_uInt16 i = 0; i < nItemCount; i++ )
         {
-            USHORT nItemId = m_xPopupMenu->getItemId( i );
+            sal_uInt16 nItemId = m_xPopupMenu->getItemId( i );
 
             if ( m_xPopupMenu->isItemChecked( nItemId ) )
                 nChecked = nItemId;
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 0b1a0d003133..c14957be7b7d 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -135,16 +135,16 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::
 void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XPopupMenu >& rPopupMenu )
 {
     // check menu item
-    rtl::OUString   aHeight     = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE  );
-    USHORT          nChecked    = 0;
-    USHORT          nItemCount  = rPopupMenu->getItemCount();
-    for( USHORT i = 0; i < nItemCount; i++ )
+    rtl::OUString   aHeight     = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, sal_True, sal_False  );
+    sal_uInt16          nChecked    = 0;
+    sal_uInt16          nItemCount  = rPopupMenu->getItemCount();
+    for( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = rPopupMenu->getItemId( i );
+        sal_uInt16 nItemId = rPopupMenu->getItemId( i );
 
         if ( m_pHeightArray[i] == nHeight )
         {
-            rPopupMenu->checkItem( nItemId, TRUE );
+            rPopupMenu->checkItem( nItemId, sal_True );
             return;
         }
 
@@ -153,7 +153,7 @@ void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XP
     }
 
     if ( nChecked )
-        rPopupMenu->checkItem( nChecked, FALSE );
+        rPopupMenu->checkItem( nChecked, sal_False );
 }
 
 // private function
@@ -195,11 +195,11 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
 
         const long* pTempAry;
         const long* pAry = pFontList->GetSizeAry( aFntInfo );
-        USHORT nSizeCount = 0;
+        sal_uInt16 nSizeCount = 0;
         while ( pAry[nSizeCount] )
             nSizeCount++;
 
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         const rtl::OUString aFontHeightCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight?FontHeight.Height:float=" ));
 
         // first insert font size names (for simplified/traditional chinese)
@@ -214,8 +214,8 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             if ( pAry == pFontList->GetStdSizeAry() )
             {
                 // for scalable fonts all font size names
-                ULONG nCount = aFontSizeNames.Count();
-                for( ULONG i = 0; i < nCount; i++ )
+                sal_uLong nCount = aFontSizeNames.Count();
+                for( sal_uLong i = 0; i < nCount; i++ )
                 {
                     String  aSizeName = aFontSizeNames.GetIndexName( i );
                     long    nSize = aFontSizeNames.GetIndexSize( i );
@@ -259,7 +259,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         {
             m_pHeightArray[nPos] = *pTempAry;
             nPos++; // Id is nPos+1
-            pVCLPopupMenu->InsertItem( nPos, rI18nHelper.GetNum( *pTempAry, 1, TRUE, FALSE ), MIB_RADIOCHECK | MIB_AUTOCHECK );
+            pVCLPopupMenu->InsertItem( nPos, rI18nHelper.GetNum( *pTempAry, 1, sal_True, sal_False ), MIB_RADIOCHECK | MIB_AUTOCHECK );
             fPoint = float( m_pHeightArray[nPos-1] ) / 10;
 
             // Create dispatchable .uno command and set it
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 6b3b06071e90..6f89eb39f89f 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -130,7 +130,7 @@ struct ExecuteInfo
 GenericToolbarController::GenericToolbarController( const Reference< XMultiServiceFactory >& rServiceManager,
                                                     const Reference< XFrame >&               rFrame,
                                                     ToolBox*                                 pToolbar,
-                                                    USHORT                                   nID,
+                                                    sal_uInt16                                   nID,
                                                     const ::rtl::OUString&                          aCommand ) :
     svt::ToolboxController( rServiceManager, rFrame, aCommand )
     ,   m_pToolbar( pToolbar )
@@ -222,7 +222,7 @@ throw ( RuntimeException )
     {
         m_pToolbar->EnableItem( m_nID, Event.IsEnabled );
 
-        USHORT nItemBits = m_pToolbar->GetItemBits( m_nID );
+        sal_uInt16 nItemBits = m_pToolbar->GetItemBits( m_nID );
         nItemBits &= ~TIB_CHECKABLE;
         TriState eTri = STATE_NOCHECK;
 
@@ -235,7 +235,7 @@ throw ( RuntimeException )
         {
             // Boolean, treat it as checked/unchecked
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
             m_pToolbar->CheckItem( m_nID, bValue );
             if ( bValue )
                 eTri = STATE_CHECK;
@@ -286,14 +286,14 @@ throw ( RuntimeException )
             }
 
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
         else if (( Event.State >>= aItemState ) && !m_bEnumCommand )
         {
             eTri = STATE_DONTKNOW;
             nItemBits |= TIB_CHECKABLE;
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
         else if ( Event.State >>= aItemVisibility )
         {
@@ -301,7 +301,7 @@ throw ( RuntimeException )
             m_bMadeInvisible = !aItemVisibility.bVisible;
         }
         else if ( m_bMadeInvisible )
-            m_pToolbar->ShowItem( m_nID, TRUE );
+            m_pToolbar->ShowItem( m_nID, sal_True );
 
         m_pToolbar->SetItemState( m_nID, eTri );
         m_pToolbar->SetItemBits( m_nID, nItemBits );
@@ -327,7 +327,7 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI
    return 0;
 }
 
-MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, USHORT   nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
+MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16   nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
 {
 }
 
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index c0d7b48a401b..7b3299a344fb 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -83,7 +83,7 @@ using namespace com::sun::star::container;
 //#define RID_SW_SHELLRES (RID_SW_START + 1250 + 1)
 //#define STR_ALLPAGE_HEADFOOT 14
 
-const USHORT ALL_MENUITEM_ID = 1;
+const sal_uInt16 ALL_MENUITEM_ID = 1;
 
 namespace framework
 {
@@ -140,8 +140,8 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
             {
                 Sequence< rtl::OUString > aSeqNames = xNameContainer->getElementNames();
 
-                USHORT   nId = 2;
-                USHORT  nCount = 0;
+                sal_uInt16   nId = 2;
+                sal_uInt16  nCount = 0;
                 sal_Bool bAllOneState( sal_True );
                 sal_Bool bLastCheck( sal_True );
                 sal_Bool bFirstChecked( sal_False );
@@ -184,7 +184,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
 
                             // Check if all entries have the same state
                             if( bAllOneState && n && bHeaderIsOn != bLastCheck )
-                                bAllOneState = FALSE;
+                                bAllOneState = sal_False;
                             bLastCheck = bHeaderIsOn;
                             ++nCount;
                         }
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index e883b236584a..1119ae2a3e39 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -134,7 +134,7 @@ ImageButtonToolbarController::ImageButtonToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
 {
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 651c9bbfdc86..fc7d92323fad 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -292,7 +292,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
             if (rStr == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu )
             {
                 //make a sign for the current language
-                pPopupMenu->CheckItem( nItemId, TRUE );
+                pPopupMenu->CheckItem( nItemId, sal_True );
             }
             aLangMap[ nItemId ] = rStr;
             ++nItemId;
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 021ee4e8f8df..0b9d061dacc9 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -226,7 +226,7 @@ throw (::com::sun::star::uno::RuntimeException)
             if ( rStr == m_aCurLang )
             {
                 //make a sign for the current language
-                xPopupMenu->checkItem( nItemId, TRUE );
+                xPopupMenu->checkItem( nItemId, sal_True );
             }
             aLangMap[ nItemId ] = rStr;
             ++nItemId;
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index e94d8f770fa8..5065881385fb 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -182,7 +182,7 @@ String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL )
     return framework::RetrieveLabelFromCommand(aCmdURL,m_xServiceManager,m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label");
 }
 
-void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startItemId )
+void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId )
 {
     const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" );
     const String ellipsis = String::CreateFromAscii( "..." );
@@ -190,7 +190,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt
     ::rtl::OUString::createFromAscii("com.sun.star.script.provider.ScriptProviderFor" );
     const ::rtl::OUString languageProviderName =
         ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" );
-    USHORT itemId = startItemId;
+    sal_uInt16 itemId = startItemId;
     Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW );
     Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
 
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index cec7be63c87d..fd8e0d3fbcd7 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -549,7 +549,7 @@ throw ( RuntimeException )
                 if ( Event.State >>= bCheckmark )
                 {
                     // Checkmark or RadioButton
-                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, TRUE );
+                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True );
                     m_pVCLMenu->CheckItem( pMenuItemHandler->nItemId, bCheckmark );
 
                     MenuItemBits nBits = m_pVCLMenu->GetItemBits( pMenuItemHandler->nItemId );
@@ -583,7 +583,7 @@ throw ( RuntimeException )
                         aItemText = aTmp;
                     }
 
-                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, TRUE );
+                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True );
                     m_pVCLMenu->SetItemText( pMenuItemHandler->nItemId, aItemText );
                 }
                 else if ( Event.State >>= aVisibilityStatus )
@@ -592,7 +592,7 @@ throw ( RuntimeException )
                     m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, aVisibilityStatus.bVisible );
                 }
                 else
-                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, TRUE );
+                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True );
             }
 
             if ( Event.Requery )
@@ -605,7 +605,7 @@ throw ( RuntimeException )
 }
 
 // Helper to retrieve own structure from item ID
-MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( USHORT nItemId )
+MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16 nItemId )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetMenuItemHandler" );
     ResetableGuard aGuard( m_aLock );
@@ -831,7 +831,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
     }
 }
 
-static void lcl_CheckForChildren(Menu* pMenu, USHORT nItemId)
+static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId)
 {
     if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
         pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
@@ -864,7 +864,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         if ( m_bActive )
             return 0;
 
-        m_bActive = TRUE;
+        m_bActive = sal_True;
 
         ::rtl::OUString aMenuCommand( m_aMenuItemCommand );
         if ( m_aMenuItemCommand == aSpecialWindowMenu ||
@@ -890,9 +890,9 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         }
 
         // Try to map commands to labels
-        for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
+        for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
         {
-            USHORT nItemId = pMenu->GetItemId( nPos );
+            sal_uInt16 nItemId = pMenu->GetItemId( nPos );
             if (( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) &&
                 ( pMenu->GetItemText( nItemId ).Len() == 0 ))
             {
@@ -1088,8 +1088,8 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
     {
         ResetableGuard aGuard( m_aLock );
 
-        USHORT nCurItemId = pMenu->GetCurItemId();
-        USHORT nCurPos    = pMenu->GetItemPos( nCurItemId );
+        sal_uInt16 nCurItemId = pMenu->GetCurItemId();
+        sal_uInt16 nCurPos    = pMenu->GetItemPos( nCurItemId );
         if ( pMenu == m_pVCLMenu &&
              pMenu->GetItemType( nCurPos ) != MENUITEM_SEPARATOR )
         {
@@ -1104,7 +1104,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
 
                 if ( xDesktop.is() )
                 {
-                    USHORT nTaskId = START_ITEMID_WINDOWLIST;
+                    sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
                     Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
                     sal_Int32 nCount = xList->getCount();
                     for ( sal_Int32 i=0; i<nCount; ++i )
@@ -1282,10 +1282,10 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
     if ( pMenu->IsMenuBar() && rFrame.is() )
     {
         // First merge all addon popup menus into our structure
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         for ( nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
         {
-            USHORT          nItemId  = pMenu->GetItemId( nPos );
+            sal_uInt16          nItemId  = pMenu->GetItemId( nPos );
             ::rtl::OUString aCommand = pMenu->GetItemCommand( nItemId );
             if ( nItemId == SID_MDIWINDOWLIST ||
                  aCommand == aSpecialWindowCommand )
@@ -1306,12 +1306,12 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
 
     String      aEmpty;
     sal_Bool    bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() );
-    USHORT nItemCount = pMenu->GetItemCount();
+    sal_uInt16 nItemCount = pMenu->GetItemCount();
     ::rtl::OUString aItemCommand;
     m_aMenuItemHandlerVector.reserve(nItemCount);
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = FillItemCommand(aItemCommand,pMenu, i );
+        sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i );
 
         // Set module identifier when provided from outside
         if ( rModuleIdentifier.getLength() > 0 )
@@ -1396,7 +1396,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                          AddonMenuManager::HasAddonMenuElements() )
                 {
                     // Create addon popup menu if there exist elements and this is the tools popup menu
-                    USHORT      nCount   = 0;
+                    sal_uInt16      nCount   = 0;
                     AddonMenu*  pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame );
                     if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 ))
                     {
@@ -1433,7 +1433,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                         if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
                         {
                             Reference< XFrame > xTemp( rFrame );
-                            Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast );
+                            Image aImage = GetImageFromURL( xTemp, aItemCommand, sal_False, m_bWasHiContrast );
                             if ( !!aImage )
                                    pPopup->SetItemImage( ITEMID_ADDONLIST, aImage );
                         }
@@ -1463,14 +1463,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                     if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
                     {
                         // Retrieve image id from menu attributes
-                        aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, m_bWasHiContrast );
+                        aImage = GetImageFromURL( m_xFrame, aImageId, sal_False, m_bWasHiContrast );
                     }
 
                     if ( !aImage )
                     {
-                        aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                        aImage = GetImageFromURL( m_xFrame, aItemCommand, sal_False, m_bWasHiContrast );
                         if ( !aImage )
-                            aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast );
+                            aImage = AddonsOptions().GetImageFromURL( aItemCommand, sal_False, m_bWasHiContrast );
                     }
 
                     if ( !!aImage )
@@ -1706,7 +1706,7 @@ void MenuBarManager::RetrieveImageManagers()
 }
 
 void MenuBarManager::FillMenuWithConfiguration(
-    USHORT&                             nId,
+    sal_uInt16&                             nId,
     Menu*                               pMenu,
     const ::rtl::OUString&              rModuleIdentifier,
     const Reference< XIndexAccess >&    rItemContainer,
@@ -1742,7 +1742,7 @@ void MenuBarManager::FillMenuWithConfiguration(
 }
 
 void MenuBarManager::FillMenu(
-    USHORT&                               nId,
+    sal_uInt16&                               nId,
     Menu*                                 pMenu,
     const rtl::OUString&                  rModuleIdentifier,
     const Reference< XIndexAccess >&      rItemContainer,
@@ -1819,7 +1819,7 @@ void MenuBarManager::FillMenu(
                             // Use attributes struct to transport special dispatch provider
                             MenuConfiguration::Attributes* pAttributes = new MenuConfiguration::Attributes;
                             pAttributes->xDispatchProvider = xDispatchProvider;
-                            pMenu->SetUserValue( nId, (ULONG)( pAttributes ));
+                            pMenu->SetUserValue( nId, (sal_uIntPtr)( pAttributes ));
                         }
 
                         // Use help command to transport module identifier
@@ -1949,7 +1949,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
         // Remove top-level parts
         m_pVCLMenu->Clear();
 
-        USHORT          nId = 1;
+        sal_uInt16          nId = 1;
 
         // Fill menu bar with container contents
         FillMenuWithConfiguration( nId, (Menu *)m_pVCLMenu, m_aModuleIdentifier, rItemContainer, m_xURLTransformer );
@@ -2017,7 +2017,7 @@ const Reference< XMultiServiceFactory >& MenuBarManager::getServiceFactory()
     return mxServiceFactory;
 }
 
-void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId)
+void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::AddMenu" );
     Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
@@ -2034,10 +2034,10 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUStri
     m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
 }
 
-USHORT MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const
+sal_uInt16 MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillItemCommand" );
-    USHORT nItemId = _pMenu->GetItemId( _nIndex );
+    sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex );
 
     _rItemCommand = _pMenu->GetItemCommand( nItemId );
     if ( !_rItemCommand.getLength() )
@@ -2070,12 +2070,12 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
 
     Reference< XStatusListener > xStatusListener;
     Reference< XDispatch > xDispatch;
-    USHORT nItemCount = pAddonMenu->GetItemCount();
+    sal_uInt16 nItemCount = pAddonMenu->GetItemCount();
     ::rtl::OUString aItemCommand;
     m_aMenuItemHandlerVector.reserve(nItemCount);
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
+        sal_uInt16 nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
 
         PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
         if ( pPopupMenu )
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 887a1c388752..8a1ca4a36cac 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -181,7 +181,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 if ( m_xConfigData.is() )
                 {
                     // Fill menubar with container contents
-                    USHORT nId = 1;
+                    sal_uInt16 nId = 1;
                     MenuBarManager::FillMenuWithConfiguration( nId, pVCLMenuBar, aModuleIdentifier, m_xConfigData, xTrans );
                 }
             }
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 8ae7842d07fd..d3c9a1913843 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -97,13 +97,13 @@ DEFINE_INIT_SERVICE                     (   NewMenuController, {} )
 
 void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast )
 {
-    USHORT nItemCount = pPopupMenu->GetItemCount();
+    sal_uInt16 nItemCount = pPopupMenu->GetItemCount();
     Image               aImage;
     Reference< XFrame > xFrame( m_xFrame );
 
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = pPopupMenu->GetItemId( sal::static_int_cast<USHORT>( i ));
+        sal_uInt16 nItemId = pPopupMenu->GetItemId( sal::static_int_cast<sal_uInt16>( i ));
         if ( nItemId != 0 )
         {
             if ( bSetImages )
@@ -117,7 +117,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
 
                 if ( aImageId.getLength() > 0 )
                 {
-                    aImage = GetImageFromURL( xFrame, aImageId, FALSE, bHiContrast );
+                    aImage = GetImageFromURL( xFrame, aImageId, sal_False, bHiContrast );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -129,7 +129,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
                 {
                     String aCmd( pPopupMenu->GetItemCommand( nItemId ) );
                     if ( aCmd.Len() )
-                        aImage = GetImageFromURL( xFrame, aCmd, FALSE, bHiContrast );
+                        aImage = GetImageFromURL( xFrame, aCmd, sal_False, bHiContrast );
 
                     if ( !!aImage )
                         pPopupMenu->SetItemImage( nItemId, aImage );
@@ -143,8 +143,8 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
 
 void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode )
 {
-    USHORT        nCount( pPopupMenu->GetItemCount() );
-    USHORT        nId( 0 );
+    sal_uInt16        nCount( pPopupMenu->GetItemCount() );
+    sal_uInt16        nId( 0 );
     sal_Bool      bFound( sal_False );
     rtl::OUString aCommand;
 
@@ -154,7 +154,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const
 
         for ( sal_uInt32 i = 0; i < sal_uInt32( nCount ); i++ )
         {
-            nId = pPopupMenu->GetItemId( USHORT( i ));
+            nId = pPopupMenu->GetItemId( sal_uInt16( i ));
             if ( nId != 0 && pPopupMenu->GetItemType( nId ) != MENUITEM_SEPARATOR )
             {
                 aCommand = pPopupMenu->GetItemCommand( nId );
@@ -176,7 +176,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const
         {
             for ( sal_uInt32 i = 0; i < sal_uInt32( nCount ); i++ )
             {
-                nId = pPopupMenu->GetItemId( USHORT( i ));
+                nId = pPopupMenu->GetItemId( sal_uInt16( i ));
                 if ( nId != 0 && pPopupMenu->GetItemType( nId ) != MENUITEM_SEPARATOR )
                 {
                     aCommand = pPopupMenu->GetItemCommand( nId );
@@ -255,7 +255,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
         std::vector< sal_uInt32 >       aIds;
         for ( sal_uInt32 i = 0; i < nItemCount; i++ )
         {
-            USHORT nId( pPopupMenu->GetItemId( USHORT( i )));
+            sal_uInt16 nId( pPopupMenu->GetItemId( sal_uInt16( i )));
             if ( nId & ( pPopupMenu->GetItemType( nId ) != MENUITEM_SEPARATOR ))
             {
                 aIds.push_back( nId );
@@ -291,7 +291,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
 
         const sal_uInt32 nCount2 = aIds.size();
         for ( sal_uInt32 i = 0; i < nCount2; i++ )
-            pPopupMenu->SetAccelKey( USHORT( aIds[i] ), aMenuShortCuts[i] );
+            pPopupMenu->SetAccelKey( sal_uInt16( aIds[i] ), aMenuShortCuts[i] );
 
         // Special handling for "New" menu short-cut should be set at the
         // document which will be opened using it.
@@ -371,9 +371,9 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
 
         // retrieve additional parameters from bookmark menu and
         // store it in a hash_map.
-        for ( USHORT i = 0; i < pSubMenu->GetItemCount(); i++ )
+        for ( sal_uInt16 i = 0; i < pSubMenu->GetItemCount(); i++ )
         {
-            USHORT nItemId = pSubMenu->GetItemId( sal::static_int_cast<USHORT>( i ) );
+            sal_uInt16 nItemId = pSubMenu->GetItemId( sal::static_int_cast<sal_uInt16>( i ) );
             if (( nItemId != 0 ) &&
                 ( pSubMenu->GetItemType( nItemId ) != MENUITEM_SEPARATOR ))
             {
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 80dccb76db05..7a0675ec84b2 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -108,7 +108,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed:
     if ( pVCLPopupMenu )
     {
         const rtl::OUString aVerbCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ObjectMenue?VerbID:short=" ));
-        for ( USHORT i = 0; i < rVerbCommandSeq.getLength(); i++ )
+        for ( sal_uInt16 i = 0; i < rVerbCommandSeq.getLength(); i++ )
         {
             const com::sun::star::embed::VerbDescriptor& rVerb = pVerbCommandArray[i];
             if ( rVerb.VerbAttributes & com::sun::star::embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU )
diff --git a/framework/source/uielement/panelwrapper.cxx b/framework/source/uielement/panelwrapper.cxx
index 405ee412df83..02d05d2653a2 100755..100644
--- a/framework/source/uielement/panelwrapper.cxx
+++ b/framework/source/uielement/panelwrapper.cxx
@@ -152,7 +152,7 @@ void SAL_CALL PanelWrapper::initialize( const Sequence< Any >& aArguments ) thro
                 pContentWindow  = VCLUnoHelper::GetWindow( xContentWindow );
                 if ( pWindow )
                 {
-                    ULONG nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
+                    sal_uInt32 nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
 
                     pPanelWindow = new PanelWindow( pWindow, nStyles );
                     m_xPanelWindow = VCLUnoHelper::GetInterface( pPanelWindow );
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
index 328777db2b79..8ed1586f0170 100644
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -204,7 +204,7 @@ Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() thro
             return xRet;
 
         // get selected button
-        USHORT nItemId = pToolBox->GetDownItemId();
+        sal_uInt16 nItemId = pToolBox->GetDownItemId();
         if( !nItemId )
             return xRet;
 
@@ -223,10 +223,10 @@ Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() thro
             mxPopupMenuController->updatePopupMenu();
 
         }
-        pToolBox->SetItemDown( nItemId, TRUE );
+        pToolBox->SetItemDown( nItemId, sal_True );
         Reference< awt::XWindowPeer > xPeer( getParent(), UNO_QUERY_THROW );
         mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
-        pToolBox->SetItemDown( nItemId, FALSE );
+        pToolBox->SetItemDown( nItemId, sal_False );
     }
     catch( Exception& )
     {
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index a20f107ea22e..a411188f5f94 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -149,13 +149,13 @@ throw (uno::RuntimeException)
                 pStatusBar->StartProgressMode( Text );
             else
             {
-                pStatusBar->SetUpdateMode( FALSE );
+                pStatusBar->SetUpdateMode( sal_False );
                 pStatusBar->EndProgressMode();
                 pStatusBar->StartProgressMode( Text );
-                pStatusBar->SetProgressValue( USHORT( nValue ));
-                pStatusBar->SetUpdateMode( TRUE );
+                pStatusBar->SetProgressValue( sal_uInt16( nValue ));
+                pStatusBar->SetUpdateMode( sal_True );
             }
-            pStatusBar->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            pStatusBar->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
         }
     }
 }
@@ -215,11 +215,11 @@ throw (uno::RuntimeException)
             StatusBar* pStatusBar = (StatusBar *)pWindow;
             if( pStatusBar->IsProgressMode() )
             {
-                pStatusBar->SetUpdateMode( FALSE );
+                pStatusBar->SetUpdateMode( sal_False );
                 pStatusBar->EndProgressMode();
                 pStatusBar->StartProgressMode( Text );
-                pStatusBar->SetProgressValue( USHORT( nValue ));
-                pStatusBar->SetUpdateMode( TRUE );
+                pStatusBar->SetProgressValue( sal_uInt16( nValue ));
+                pStatusBar->SetUpdateMode( sal_True );
             }
             else
                 pStatusBar->SetText( Text );
@@ -268,7 +268,7 @@ throw (uno::RuntimeException)
             StatusBar* pStatusBar = (StatusBar *)pWindow;
             if ( !pStatusBar->IsProgressMode() )
                 pStatusBar->StartProgressMode( aText );
-            pStatusBar->SetProgressValue( USHORT( nValue ));
+            pStatusBar->SetProgressValue( sal_uInt16( nValue ));
         }
     }
 }
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 64f05ed642cb..227cab9e4f2b 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -221,9 +221,9 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
 
                 ::rtl::OUString aTitle( aMenuShortCut + aMenuTitle );
 
-                pVCLPopupMenu->InsertItem( USHORT( i+1 ), aTitle );
-                pVCLPopupMenu->SetTipHelpText( USHORT( i+1 ), aTipHelpText );
-                pVCLPopupMenu->SetItemCommand( USHORT( i+1 ), aURLString );
+                pVCLPopupMenu->InsertItem( sal_uInt16( i+1 ), aTitle );
+                pVCLPopupMenu->SetTipHelpText( sal_uInt16( i+1 ), aTipHelpText );
+                pVCLPopupMenu->SetItemCommand( sal_uInt16( i+1 ), aURLString );
             }
         }
         else
@@ -231,7 +231,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
             // No recent documents => insert "no document" string
             String aNoDocumentStr = String( FwkResId( STR_NODOCUMENT ));
             pVCLPopupMenu->InsertItem( 1, aNoDocumentStr );
-            pVCLPopupMenu->EnableItem( 1, FALSE );
+            pVCLPopupMenu->EnableItem( 1, sal_False );
         }
     }
 }
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index dad2775dc453..51a3cf3ae6ad 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -205,7 +205,7 @@ SpinfieldToolbarController::SpinfieldToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     sal_Int32                                nWidth,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index ab0ff9777ea4..0328f0b6e4e4 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -93,9 +93,9 @@ static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
 namespace framework
 {
 
-static USHORT impl_convertItemStyleToItemBits( sal_Int16 nStyle )
+static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle )
 {
-    USHORT nItemBits( 0 );
+    sal_uInt16 nItemBits( 0 );
 
     if (( nStyle & css_ui::ItemStyle::ALIGN_RIGHT ) == css_ui::ItemStyle::ALIGN_RIGHT )
         nItemBits |= SIB_RIGHT;
@@ -363,9 +363,9 @@ void StatusBarManager::CreateControllers()
     if ( xProps.is() )
         xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext;
 
-    for ( USHORT i = 0; i < m_pStatusBar->GetItemCount(); i++ )
+    for ( sal_uInt16 i = 0; i < m_pStatusBar->GetItemCount(); i++ )
     {
-        USHORT nId = m_pStatusBar->GetItemId( i );
+        sal_uInt16 nId = m_pStatusBar->GetItemId( i );
         if ( nId == 0 )
             continue;
 
@@ -471,7 +471,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
     if ( m_bDisposed || !m_pStatusBar )
         return;
 
-    USHORT         nId( 1 );
+    sal_uInt16         nId( 1 );
     rtl::OUString  aHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ));
 
     RemoveControllers();
@@ -526,7 +526,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
                 if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && ( aCommandURL.getLength() > 0 ))
                 {
                     rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL ));
-                    USHORT        nItemBits( impl_convertItemStyleToItemBits( nStyle ));
+                    sal_uInt16        nItemBits( impl_convertItemStyleToItemBits( nStyle ));
 
                     m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset );
                     m_pStatusBar->SetItemCommand( nId, aCommandURL );
@@ -584,7 +584,7 @@ void StatusBarManager::UserDraw( const UserDrawEvent& rUDEvt )
     if ( m_bDisposed )
         return;
 
-    USHORT nId( rUDEvt.GetItemId() );
+    sal_uInt16 nId( rUDEvt.GetItemId() );
     if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
     {
         uno::Reference< frame::XStatusbarController > xController(
@@ -614,7 +614,7 @@ void StatusBarManager::Command( const CommandEvent& rEvt )
 
     if ( rEvt.GetCommand() == COMMAND_CONTEXTMENU )
     {
-        USHORT nId = m_pStatusBar->GetItemId( rEvt.GetMousePosPixel() );
+        sal_uInt16 nId = m_pStatusBar->GetItemId( rEvt.GetMousePosPixel() );
         if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
         {
             uno::Reference< frame::XStatusbarController > xController(
@@ -642,7 +642,7 @@ void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL
 
     if ( !m_bDisposed )
     {
-        USHORT nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() );
+        sal_uInt16 nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() );
         if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
         {
             uno::Reference< frame::XStatusbarController > xController(
@@ -678,7 +678,7 @@ IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId = m_pStatusBar->GetCurItemId();
+    sal_uInt16 nId = m_pStatusBar->GetCurItemId();
     if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
     {
         uno::Reference< frame::XStatusbarController > xController(
@@ -697,7 +697,7 @@ IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId = m_pStatusBar->GetCurItemId();
+    sal_uInt16 nId = m_pStatusBar->GetCurItemId();
     if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
     {
         uno::Reference< frame::XStatusbarController > xController(
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 3002a340dfef..b355a6542f59 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -131,7 +131,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
-                    ULONG nStyles = WinBits( WB_LEFT | WB_3DLOOK );
+                    sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK );
 
                     pStatusBar = new FrameworkStatusBar( pWindow, nStyles );
                     pStatusBarManager = new StatusBarManager( m_xServiceFactory, xFrame, m_aResourceURL, pStatusBar );
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 43262fcc64a2..4f23713370e2 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -85,7 +85,7 @@ ToggleButtonToolbarController::ToggleButtonToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     Style                                    eStyle,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ),
@@ -149,10 +149,10 @@ throw (::com::sun::star::uno::RuntimeException)
                 aPopup.CheckItem( sal_uInt16( i+1 ), sal_False );
         }
 
-        m_pToolbar->SetItemDown( m_nID, TRUE );
+        m_pToolbar->SetItemDown( m_nID, sal_True );
         aPopup.SetSelectHdl( LINK( this, ToggleButtonToolbarController, MenuSelectHdl ));
         aPopup.Execute( m_pToolbar, m_pToolbar->GetItemRect( m_nID ));
-        m_pToolbar->SetItemDown( m_nID, FALSE );
+        m_pToolbar->SetItemDown( m_nID, sal_False );
     }
 
     return xWindow;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 8d5169101c8d..8162307f87ad 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -145,7 +145,7 @@ static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN       = 5;
 static const char   HELPID_PREFIX[]                 = "helpid:";
 static const char   HELPID_PREFIX_TESTTOOL[]        = ".HelpId:";
 //static sal_Int32    HELPID_PREFIX_LENGTH            = 7;
-static const USHORT STARTID_CUSTOMIZE_POPUPMENU     = 1000;
+static const sal_uInt16 STARTID_CUSTOMIZE_POPUPMENU     = 1000;
 
 #define MENUPREFIX "private:resource/menubar/"
 
@@ -296,7 +296,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
 
     // enables a menu for clipped items and customization
     SvtCommandOptions aCmdOptions;
-    USHORT nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
+    sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
     if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString::createFromAscii( "CreateDialog" )))
          nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
     //added for issue33668 by shizhoubo
@@ -383,7 +383,7 @@ void ToolBarManager::CheckAndUpdateImages()
     {
         if ( !m_bIsHiContrast )
         {
-            bRefreshImages = TRUE;
+            bRefreshImages = sal_True;
             m_bIsHiContrast = sal_True;
         }
     }
@@ -418,9 +418,9 @@ void ToolBarManager::RefreshImages()
     ResetableGuard aGuard( m_aLock );
 
     sal_Bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
     {
-        USHORT nId( m_pToolBar->GetItemId( nPos ) );
+        sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
 
         if ( nId > 0 )
         {
@@ -470,9 +470,9 @@ void ToolBarManager::UpdateImageOrientation()
         }
     }
 
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
     {
-        USHORT nId = m_pToolBar->GetItemId( nPos );
+        sal_uInt16 nId = m_pToolBar->GetItemId( nPos );
         if ( nId > 0 )
         {
             rtl::OUString aCmd = m_pToolBar->GetItemCommand( nId );
@@ -482,7 +482,7 @@ void ToolBarManager::UpdateImageOrientation()
             {
                 if ( pIter->second.bRotated )
                 {
-                    m_pToolBar->SetItemImageMirrorMode( nId, FALSE );
+                    m_pToolBar->SetItemImageMirrorMode( nId, sal_False );
                     m_pToolBar->SetItemImageAngle( nId, m_lImageRotation );
                 }
                 if ( pIter->second.bMirrored )
@@ -806,7 +806,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
 }
 void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter)
 {
-    const ::std::vector< USHORT >& _rIDs = _pIter->second.aIds;
+    const ::std::vector< sal_uInt16 >& _rIDs = _pIter->second.aIds;
     m_pToolBar->SetItemImage( _pIter->second.nId, _aImage );
     ::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBar::SetItemImage,m_pToolBar,_1,_aImage));
 }
@@ -941,9 +941,9 @@ void ToolBarManager::CreateControllers()
     if ( xProps.is() )
         xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext;
 
-    for ( USHORT i = 0; i < m_pToolBar->GetItemCount(); i++ )
+    for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ )
     {
-        USHORT nId = m_pToolBar->GetItemId( i );
+        sal_uInt16 nId = m_pToolBar->GetItemId( i );
         if ( nId == 0 )
             continue;
 
@@ -1238,7 +1238,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
     if ( m_bDisposed )
         return;
 
-    USHORT    nId( 1 );
+    sal_uInt16    nId( 1 );
     ::rtl::OUString  aHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ));
 
     Reference< XModuleManager > xModuleManager( Reference< XModuleManager >(
@@ -1628,7 +1628,7 @@ long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )(
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -1652,7 +1652,7 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -1692,7 +1692,7 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar )
     }
 
     // remove all items that were not added by the toolbar itself
-    USHORT i;
+    sal_uInt16 i;
     for( i=0; i<pMenu->GetItemCount(); )
     {
         if( pMenu->GetItemId( i ) < TOOLBOX_MENUITEM_START )
@@ -1778,7 +1778,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
 
     if ( m_pToolBar->IsCustomize() )
     {
-        USHORT      nPos( 0 );
+        sal_uInt16      nPos( 0 );
         PopupMenu*  pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
 
         sal_Bool    bIsFloating( sal_False );
@@ -1818,7 +1818,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
         {
             if ( m_pToolBar->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
             {
-                USHORT nId = m_pToolBar->GetItemId(nPos);
+                sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
                 ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
                 pItemMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MIB_CHECKABLE );
                 pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
@@ -1837,7 +1837,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
     }
     else
     {
-        USHORT nPos = aPopupMenu.GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
+        sal_uInt16 nPos = aPopupMenu.GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
         if ( nPos != MENU_ITEM_NOTFOUND )
             aPopupMenu.RemoveItem( nPos );
     }
@@ -1846,7 +1846,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
     if( pMenu->GetItemCount() )
         pMenu->InsertSeparator();
 
-    USHORT i;
+    sal_uInt16 i;
     for( i=0; i< aPopupMenu.GetItemCount(); i++)
     {
         sal_uInt16 nId = aPopupMenu.GetItemId( i );
@@ -2005,7 +2005,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
 
             default:
             {
-                USHORT nId = pMenu->GetCurItemId();
+                sal_uInt16 nId = pMenu->GetCurItemId();
                 if(( nId > 0 ) && ( nId < TOOLBOX_MENUITEM_START ))
                 {
                     // toggle toolbar button visibility
@@ -2087,7 +2087,7 @@ IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
         return 1;
 
     sal_Int16   nKeyModifier( (sal_Int16)m_pToolBar->GetModifier() );
-    USHORT      nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16      nId( m_pToolBar->GetCurItemId() );
 
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
@@ -2148,9 +2148,9 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
         CheckAndUpdateImages();
     }
 
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
-        const USHORT nId = m_pToolBar->GetItemId(nPos);
+        const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
         Window* pWindow = m_pToolBar->GetItemWindow( nId );
         if ( pWindow )
         {
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 42207b5611b2..1b5a1dccb667 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -86,7 +86,7 @@ static const char TOOLBARCONTROLLER_TOGGLEDDBTN[]         = "ToggleDropdownButto
 static const sal_uInt32 TOOLBARCONTROLLER_TOGGLEDDBTN_LEN = 20;
 
 static const char   TOOLBOXITEM_SEPARATOR_STR[]   = "private:separator";
-static const USHORT TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPARATOR_STR )-1;
+static const sal_uInt16 TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPARATOR_STR )-1;
 
 using namespace ::com::sun::star;
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index e46468cd821c..02440f048dd5 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -182,7 +182,7 @@ ToolbarsMenuController::~ToolbarsMenuController()
 void ToolbarsMenuController::addCommand(
     Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& rLabel )
 {
-    USHORT        nItemId    = m_xPopupMenu->getItemCount()+1;
+    sal_uInt16        nItemId    = m_xPopupMenu->getItemCount()+1;
 
     rtl::OUString aLabel;
     if ( rLabel.getLength() == 0 )
@@ -207,7 +207,7 @@ void ToolbarsMenuController::addCommand(
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
     if ( rSettings.GetUseImagesInMenus() )
-        aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE, rSettings.GetHighContrastMode() );
+        aImage = GetImageFromURL( m_xFrame, rCommandURL, sal_False, rSettings.GetHighContrastMode() );
 
     VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu );
     if ( pPopupMenu )
@@ -470,7 +470,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         const sal_uInt32 nCount = aSortedTbs.size();
         for ( sal_uInt32 i = 0; i < nCount; i++ )
         {
-            USHORT nItemCount = m_xPopupMenu->getItemCount();
+            sal_uInt16 nItemCount = m_xPopupMenu->getItemCount();
             m_xPopupMenu->insertItem( nIndex, aSortedTbs[i].aUIName, css::awt::MenuItemStyle::CHECKABLE, nItemCount );
             if ( aSortedTbs[i].bVisible )
                 m_xPopupMenu->checkItem( nIndex, sal_True );
@@ -480,7 +480,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
                 VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );
                 PopupMenu*     pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu();
 
-                pVCLPopupMenu->SetUserValue( nIndex, ULONG( aSortedTbs[i].bContextSensitive ? 1L : 0L ));
+                pVCLPopupMenu->SetUserValue( nIndex, sal_uIntPtr( aSortedTbs[i].bContextSensitive ? 1L : 0L ));
             }
 
             // use VCL popup menu pointer to set vital information that are not part of the awt implementation
@@ -532,7 +532,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             // Create command for configure
             if ( m_xPopupMenu->getItemCount() > 0 )
             {
-                USHORT        nItemCount = m_xPopupMenu->getItemCount();
+                sal_uInt16        nItemCount = m_xPopupMenu->getItemCount();
                 m_xPopupMenu->insertSeparator( nItemCount+1 );
             }
 
@@ -545,7 +545,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             // Create command for configure
             if ( m_xPopupMenu->getItemCount() > 0 )
             {
-                USHORT        nItemCount = m_xPopupMenu->getItemCount();
+                sal_uInt16        nItemCount = m_xPopupMenu->getItemCount();
                 m_xPopupMenu->insertSeparator( nItemCount+1 );
             }
         }
@@ -592,9 +592,9 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
         VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( xPopupMenu );
         PopupMenu*     pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu();
 
-        for ( USHORT i = 0; i < pVCLPopupMenu->GetItemCount(); i++ )
+        for ( sal_uInt16 i = 0; i < pVCLPopupMenu->GetItemCount(); i++ )
         {
-            USHORT nId = pVCLPopupMenu->GetItemId( i );
+            sal_uInt16 nId = pVCLPopupMenu->GetItemId( i );
             if ( nId == 0 )
                 continue;
 
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 7b6e81ff91d9..8e86f6b84639 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -178,7 +178,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
-                    ULONG nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
+                    sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
 
                     pToolBar = new ToolBar( pWindow, nStyles );
                     m_xToolBarWindow = VCLUnoHelper::GetInterface( pToolBar );
@@ -197,7 +197,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                     // Fill toolbar with container contents
                     pToolBarManager->FillToolbar( m_xConfigData );
                     pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
-                    pToolBar->EnableCustomize( TRUE );
+                    pToolBar->EnableCustomize( sal_True );
                     ::Size aActSize( pToolBar->GetSizePixel() );
                     ::Size aSize( pToolBar->CalcWindowSizePixel() );
                     aSize.Width() = aActSize.Width();
@@ -212,7 +212,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 if ( pToolBar && pToolBarManager )
                 {
                     pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
-                    pToolBar->EnableCustomize( TRUE );
+                    pToolBar->EnableCustomize( sal_True );
                     ::Size aActSize( pToolBar->GetSizePixel() );
                     ::Size aSize( pToolBar->CalcWindowSizePixel() );
                     aSize.Width() = aActSize.Width();
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index f6705dae8be6..32a05d2a4c6b 100644..100755
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -104,19 +104,19 @@ public:
             SvMetaObject();
 
 #ifdef IDL_COMPILER
-    static void         WriteTab( SvStream & rOutStm, USHORT nTab );
-    static BOOL         TestAndSeekSpaceOnly( SvStream &, ULONG nBegPos );
+    static void         WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
+    static sal_Bool         TestAndSeekSpaceOnly( SvStream &, sal_uLong nBegPos );
     static void         Back2Delemitter( SvStream & );
     static void         WriteStars( SvStream & );
 
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                 WriteType, WriteAttribute = 0 );
 
-    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 };
 SV_DECL_IMPL_REF(SvMetaObject)
@@ -136,7 +136,7 @@ public:
     SvMetaObject *  Pop() { return aList.Remove( aList.Count() -1 ); }
     SvMetaObject *  Top() const { return aList.GetObject( aList.Count() -1 ); }
     void            Clear() { aList.Clear(); }
-    ULONG           Count() const { return aList.Count(); }
+    sal_uLong     Count() const { return aList.Count(); }
 
     SvMetaObject *  Get( TypeId nType )
                     {
@@ -162,26 +162,26 @@ class SvMetaName : public SvMetaObject
 
 protected:
 #ifdef IDL_COMPILER
-    virtual BOOL ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
             void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
                                      char c = '\0' );
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void WriteContextSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
     virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                       SvStream & rOutStm, USHORT nTab );
-    virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+                                       SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0);
-    virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0);
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
             SvMetaName();
 
-    virtual BOOL                SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
+    virtual sal_Bool                SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
     void                        SetDescription( const ByteString& rText )
                                 { aDescription = rText; }
     const SvHelpContext&        GetHelpContext() const { return aHelpContext; }
@@ -191,10 +191,10 @@ public:
     virtual const SvString&     GetDescription() const{ return aDescription; }
 
 #ifdef IDL_COMPILER
-    virtual BOOL        Test( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual sal_Bool        Test( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                        WriteType, WriteAttribute = 0);
     void                WriteDescription( SvStream& rOutStm );
 #endif
@@ -260,8 +260,8 @@ class SvMetaExtern : public SvMetaReference
 
     SvUUId                  aUUId;
     SvVersion               aVersion;
-    BOOL                    bReadUUId;
-    BOOL                    bReadVersion;
+    sal_Bool                    bReadUUId;
+    sal_Bool                    bReadVersion;
 public:
                         SV_DECL_META_FACTORY1( SvMetaExtern, SvMetaName, 16 )
                         SvMetaExtern();
@@ -272,16 +272,16 @@ public:
     const SvVersion &   GetVersion() const { return aVersion; }
 #ifdef IDL_COMPILER
     void                SetModule( SvIdlDataBase & rBase );
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0);
 protected:
     virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                              SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+                                              SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                           WriteType, WriteAttribute = 0);
 #endif
 };
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 99d14ac93432..0fe59e2c86eb 100644..100755
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -42,16 +42,16 @@ class SvTokenStream;
 /******************** class SvUINT32 **********************************/
 class SvUINT32
 {
-    UINT32  nVal;
+    sal_uInt32  nVal;
 public:
                 SvUINT32() { nVal = 0; }
-                SvUINT32( UINT32 n ) : nVal( n ) {}
-    SvUINT32 &  operator = ( UINT32 n ) { nVal = n; return *this; }
+                SvUINT32( sal_uInt32 n ) : nVal( n ) {}
+    SvUINT32 &  operator = ( sal_uInt32 n ) { nVal = n; return *this; }
 
-    operator    UINT32 &() { return nVal; }
+    operator    sal_uInt32 &() { return nVal; }
 
-    static UINT32  Read( SvStream & rStm );
-    static void    Write( SvStream & rStm, UINT32 nVal );
+    static sal_uInt32  Read( SvStream & rStm );
+    static void    Write( SvStream & rStm, sal_uInt32 nVal );
 
     friend SvStream& operator << (SvStream & rStm, const SvUINT32 & r )
                 { SvUINT32::Write( rStm, r.nVal ); return rStm; }
@@ -72,7 +72,7 @@ public:
     operator    short &() { return nVal; }
 
     friend SvStream& operator << (SvStream & rStm, const SvINT16 & r )
-                { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
     friend SvStream& operator >> (SvStream & rStm, SvINT16 & r )
                 { r.nVal = (short)SvUINT32::Read( rStm ); return rStm; }
 };
@@ -81,36 +81,36 @@ public:
 /******************** class SvUINT16 **********************************/
 class SvUINT16
 {
-    USHORT  nVal;
+    sal_uInt16  nVal;
 public:
                 SvUINT16() { nVal = 0; }
-                SvUINT16( USHORT n ) : nVal( n ) {}
-    SvUINT16 &  operator = ( USHORT n ) { nVal = n; return *this; }
+                SvUINT16( sal_uInt16 n ) : nVal( n ) {}
+    SvUINT16 &  operator = ( sal_uInt16 n ) { nVal = n; return *this; }
 
-    operator    UINT16 &() { return nVal; }
+    operator    sal_uInt16 &() { return nVal; }
 
     friend SvStream& operator << (SvStream & rStm, const SvUINT16 & r )
-                { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
     friend SvStream& operator >> (SvStream & rStm, SvUINT16 & r )
-                { r.nVal = (USHORT)SvUINT32::Read( rStm ); return rStm; }
+                { r.nVal = (sal_uInt16)SvUINT32::Read( rStm ); return rStm; }
 };
 
 
 /******************** class SvINT32 **********************************/
 class SvINT32
 {
-    INT32   nVal;
+    sal_Int32   nVal;
 public:
                 SvINT32() { nVal = 0; }
-                SvINT32( INT32 n ) : nVal( n ) {}
-    SvINT32 &   operator = ( INT32 n ) { nVal = n; return *this; }
+                SvINT32( sal_Int32 n ) : nVal( n ) {}
+    SvINT32 &   operator = ( sal_Int32 n ) { nVal = n; return *this; }
 
-    operator    INT32 &() { return nVal; }
+    operator    sal_Int32 &() { return nVal; }
 
     friend SvStream& operator << (SvStream & rStm, const SvINT32 & r )
-                { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
     friend SvStream& operator >> (SvStream & rStm, SvINT32 & r )
-                { r.nVal = (INT32)SvUINT32::Read( rStm ); return rStm; }
+                { r.nVal = (sal_Int32)SvUINT32::Read( rStm ); return rStm; }
 };
 
 
@@ -118,18 +118,18 @@ public:
 class Svint
 {
     int     nVal;
-    BOOL    bSet;
+    sal_Bool    bSet;
 public:
                 Svint() { nVal = bSet = 0; }
-                Svint( int n ) : nVal( n ), bSet( TRUE ) {}
-                Svint( int n, BOOL bSetP ) : nVal( n ), bSet( bSetP ) {}
-    Svint    &  operator = ( int n ) { nVal = n; bSet = TRUE; return *this; }
+                Svint( int n ) : nVal( n ), bSet( sal_True ) {}
+                Svint( int n, sal_Bool bSetP ) : nVal( n ), bSet( bSetP ) {}
+    Svint    &  operator = ( int n ) { nVal = n; bSet = sal_True; return *this; }
 
     operator    int ()const { return nVal; }
-    BOOL        IsSet() const { return bSet; }
+    sal_Bool        IsSet() const { return bSet; }
 
     friend SvStream& operator << (SvStream & rStm, const Svint & r )
-                { SvUINT32::Write( rStm, (UINT32)r.nVal ); rStm << r.bSet; return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm << r.bSet; return rStm; }
     friend SvStream& operator >> (SvStream & rStm, Svint & r )
                 { r.nVal = (int)SvUINT32::Read( rStm ); rStm >> r.bSet ; return rStm; }
 };
@@ -138,27 +138,27 @@ public:
 /******************** class SvBOOL **********************************/
 class SvBOOL
 {
-    BOOL  nVal:1,
+    sal_Bool  nVal:1,
           bSet:1;
 public:
-                SvBOOL() { bSet = nVal = FALSE; }
-                SvBOOL( BOOL n ) : nVal( n ), bSet( TRUE ) {}
-                SvBOOL( BOOL n, BOOL bSetP ) : nVal( n ), bSet( bSetP ) {}
-    SvBOOL &    operator = ( BOOL n ) { nVal = n; bSet = TRUE; return *this; }
+                SvBOOL() { bSet = nVal = sal_False; }
+                SvBOOL( sal_Bool n ) : nVal( n ), bSet( sal_True ) {}
+                SvBOOL( sal_Bool n, sal_Bool bSetP ) : nVal( n ), bSet( bSetP ) {}
+    SvBOOL &    operator = ( sal_Bool n ) { nVal = n; bSet = sal_True; return *this; }
 
-    operator    BOOL() const { return nVal; }
+    operator    sal_Bool() const { return nVal; }
 #ifdef STC
     operator    int() const { return nVal; }
 #endif
-    BOOL        Is() const { return nVal; }
-    BOOL        IsSet() const { return bSet; }
+    sal_Bool        Is() const { return nVal; }
+    sal_Bool        IsSet() const { return bSet; }
 
     friend SvStream& operator << (SvStream &, const SvBOOL &);
     friend SvStream& operator >> (SvStream &, SvBOOL &);
 
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
+    sal_Bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
     ByteString      GetSvIdlString( SvStringHashEntry * pName );
 #endif
 };
@@ -174,11 +174,11 @@ public:
     friend SvStream& operator << (SvStream &, const SvIdentifier &);
     friend SvStream& operator >> (SvStream &, SvIdentifier &);
 
-    BOOL        IsSet() const { return Len() != 0; }
+    sal_Bool        IsSet() const { return Len() != 0; }
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
-                            USHORT nTab );
+    sal_Bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+                            sal_uInt16 nTab );
 #endif
 };
 
@@ -186,23 +186,23 @@ public:
 /******************** class SvIdentifier **********************************/
 class SvNumberIdentifier : public SvIdentifier
 {
-    UINT32  nValue;
+    sal_uInt32  nValue;
     // darf nicht benutzt werden
-    BOOL    ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+    sal_Bool    ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
 public:
                 SvNumberIdentifier() : nValue( 0 ) {};
-    BOOL        IsSet() const
+    sal_Bool        IsSet() const
                 {
                     return SvIdentifier::IsSet() || nValue != 0;
                 }
-    UINT32      GetValue() const { return nValue; }
-    void        SetValue( UINT32 nVal ) { nValue = nVal; }
+    sal_uInt32      GetValue() const { return nValue; }
+    void        SetValue( sal_uInt32 nVal ) { nValue = nVal; }
 
     friend SvStream& operator << (SvStream &, const SvNumberIdentifier &);
     friend SvStream& operator >> (SvStream &, SvNumberIdentifier &);
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    BOOL        ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
+    sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool        ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
                            SvTokenStream & rInStm );
 #endif
 };
@@ -215,14 +215,14 @@ public:
                 SvString(){};
     SvString &  operator = ( const ByteString & rStr )
                 { ByteString::operator =( rStr ); return *this; }
-    BOOL        IsSet() const { return Len() != 0; }
+    sal_Bool        IsSet() const { return Len() != 0; }
     friend SvStream& operator << (SvStream &, const SvString &);
     friend SvStream& operator >> (SvStream &, SvString &);
 
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
-                            USHORT nTab );
+    sal_Bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+                            sal_uInt16 nTab );
 #endif
 };
 
@@ -233,9 +233,9 @@ class SvHelpText : public SvString
 public:
                 SvHelpText() {}
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            USHORT nTab );
+    sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
+                            sal_uInt16 nTab );
 #endif
 };
 
@@ -251,8 +251,8 @@ class SvUUId : public SvGlobalName
 public:
                 SvUUId() {}
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStream & rOutStm );
+    sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStream & rOutStm );
 #endif
 };
 
@@ -260,28 +260,28 @@ public:
 /******************** class SvVersion **********************************/
 class SvVersion
 {
-    USHORT  nMajorVersion;
-    USHORT  nMinorVersion;
+    sal_uInt16  nMajorVersion;
+    sal_uInt16  nMinorVersion;
 public:
                 SvVersion() : nMajorVersion( 1 ), nMinorVersion( 0 ) {}
-    BOOL        operator == ( const SvVersion & r )
+    sal_Bool        operator == ( const SvVersion & r )
                 {
                     return (r.nMajorVersion == nMajorVersion)
                              && (r.nMinorVersion == nMinorVersion);
                 }
-    BOOL        operator != ( const SvVersion & r )
+    sal_Bool        operator != ( const SvVersion & r )
                 {
                     return !(*this == r);
                 }
 
-    USHORT      GetMajorVersion() const { return nMajorVersion; }
-    USHORT      GetMinorVersion() const { return nMinorVersion; }
+    sal_uInt16      GetMajorVersion() const { return nMajorVersion; }
+    sal_uInt16      GetMinorVersion() const { return nMinorVersion; }
 
     friend SvStream& operator << (SvStream &, const SvVersion &);
     friend SvStream& operator >> (SvStream &, SvVersion &);
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStream & rOutStm );
+    sal_Bool        ReadSvIdl( SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStream & rOutStm );
 #endif
 };
 
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 53512f4854d8..5a9577178193 100644..100755
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -62,8 +62,8 @@ public:
     String      aCSVFile;
     String      aExportFile;
     String      aDocuFile;
-    UINT32      nVerbosity;
-    UINT32      nFlags;
+    sal_uInt32      nVerbosity;
+    sal_uInt32      nFlags;
 
                 SvCommand( int argc, char ** argv );
                 ~SvCommand();
@@ -71,7 +71,7 @@ public:
 
 void Init();
 class SvIdlWorkingBase;
-BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
+sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
 void DeInit();
 
 #endif // _COMMAND_HXX
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 0f207b64aef8..b3f9ca5b154f 100644..100755
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -44,15 +44,15 @@ class SvIdlError
 {
     ByteString  aText;
 public:
-    UINT32  nLine, nColumn;
+    sal_uInt32  nLine, nColumn;
 
             SvIdlError() : nLine(0), nColumn(0) {}
-            SvIdlError( UINT32 nL, UINT32 nC )
+            SvIdlError( sal_uInt32 nL, sal_uInt32 nC )
                 : nLine(nL), nColumn(nC) {}
 
     const ByteString &  GetText() const { return aText; }
     void            SetText( const ByteString & rT ) { aText = rT; }
-    BOOL            IsError() const { return nLine != 0; }
+    sal_Bool            IsError() const { return nLine != 0; }
     void            Clear() { nLine = nColumn = 0; }
     SvIdlError &    operator = ( const SvIdlError & rRef )
     { aText   = rRef.aText;
@@ -66,13 +66,13 @@ public:
 /******************** class SvIdlDataBase ********************************/
 class SvIdlDataBase
 {
-    BOOL                        bExport;
+    sal_Bool                        bExport;
     String                      aExportFile;
     sal_uInt32                  nUniqueId;
     sal_uInt32                  nVerbosity;
     String                      aDataBaseFile;
     SvFileStream *              pStm;
-    BOOL                        bIsModified;
+    sal_Bool                        bIsModified;
     SvPersistStream             aPersStream;
     StringList                  aIdFileList;
     SvStringHashTable *         pIdTable;
@@ -98,10 +98,10 @@ protected:
 public:
                 explicit SvIdlDataBase( const SvCommand& rCmd );
                 ~SvIdlDataBase();
-    static BOOL IsBinaryFormat( SvStream & rInStm );
+    static sal_Bool IsBinaryFormat( SvStream & rInStm );
 
     void        Load( SvStream & rInStm );
-    void        Save( SvStream & rInStm, UINT32 nContextFlags );
+    void        Save( SvStream & rInStm, sal_uInt32 nContextFlags );
 
     SvMetaAttributeMemberList&  GetAttrList() { return aAttrList; }
     SvStringHashTable *       GetIdTable() { return pIdTable; }
@@ -132,11 +132,11 @@ public:
     void                    WriteError( const ByteString & rErrWrn,
                                     const ByteString & rFileName,
                                     const ByteString & rErrorText,
-                                    ULONG nRow = 0, ULONG nColumn = 0 ) const;
+                                    sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
     void                    WriteError( SvTokenStream & rInStm );
     void                    SetError( const ByteString & rError, SvToken * pTok );
     void                    Push( SvMetaObject * pObj );
-    BOOL                    Pop( BOOL bOk, SvTokenStream & rInStm, UINT32 nTokPos )
+    sal_Bool                    Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
                             {
                                 GetStack().Pop();
                                 if( bOk )
@@ -146,9 +146,9 @@ public:
                                 return bOk;
                             }
     sal_uInt32              GetUniqueId() { return ++nUniqueId; }
-    BOOL                    FindId( const ByteString & rIdName, ULONG * pVal );
-    BOOL                    InsertId( const ByteString & rIdName, ULONG nVal );
-    BOOL                    ReadIdFile( const String & rFileName );
+    sal_Bool                    FindId( const ByteString & rIdName, sal_uLong * pVal );
+    sal_Bool                    InsertId( const ByteString & rIdName, sal_uLong nVal );
+    sal_Bool                    ReadIdFile( const String & rFileName );
 
     SvMetaType *            FindType( const ByteString & rName );
     static SvMetaType *     FindType( const SvMetaType *, SvMetaTypeMemberList & );
@@ -167,14 +167,14 @@ class SvIdlWorkingBase : public SvIdlDataBase
 public:
                 explicit SvIdlWorkingBase( const SvCommand& rCmd );
 
-    BOOL        ReadSvIdl( SvTokenStream &, BOOL bImported, const String & rPath );
-    BOOL        WriteSvIdl( SvStream & );
+    sal_Bool        ReadSvIdl( SvTokenStream &, sal_Bool bImported, const String & rPath );
+    sal_Bool        WriteSvIdl( SvStream & );
 
-    BOOL        WriteSfx( SvStream & );
-    BOOL        WriteHelpIds( SvStream & );
-    BOOL        WriteSfxItem( SvStream & );
-    BOOL        WriteCSV( SvStream& );
-    BOOL        WriteDocumentation( SvStream& );
+    sal_Bool        WriteSfx( SvStream & );
+    sal_Bool        WriteHelpIds( SvStream & );
+    sal_Bool        WriteSfxItem( SvStream & );
+    sal_Bool        WriteCSV( SvStream& );
+    sal_Bool        WriteDocumentation( SvStream& );
 };
 #endif
 
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 2749181d5966..ec97a12a8fce 100644..100755
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -36,24 +36,24 @@
 /****************** H a s h - T a b l e **********************************/
 class SvHashTable
 {
-    UINT32       nMax;                 // size of hash-tabel
-    UINT32       nFill;                // elements in hash-tabel
-    UINT32       lAsk;                 // Anzahl der Anfragen
-    UINT32       lTry;                 // Anzahl der Versuche
+    sal_uInt32       nMax;                 // size of hash-tabel
+    sal_uInt32       nFill;                // elements in hash-tabel
+    sal_uInt32       lAsk;                 // Anzahl der Anfragen
+    sal_uInt32       lTry;                 // Anzahl der Versuche
 protected:
-    BOOL        Test_Insert( const void *, BOOL bInsert, UINT32 * pInsertPos );
+    sal_Bool        Test_Insert( const void *, sal_Bool bInsert, sal_uInt32 * pInsertPos );
 
                             // compare element with entry
-    virtual StringCompare   Compare( const void * , UINT32 ) const = 0;
+    virtual StringCompare   Compare( const void * , sal_uInt32 ) const = 0;
                             // get hash value from subclass
-    virtual UINT32          HashFunc( const void * ) const = 0;
+    virtual sal_uInt32          HashFunc( const void * ) const = 0;
 public:
-                SvHashTable( UINT32 nMaxEntries );
+                SvHashTable( sal_uInt32 nMaxEntries );
                 virtual ~SvHashTable();
 
-    UINT32      GetMax() const { return nMax; }
+    sal_uInt32      GetMax() const { return nMax; }
 
-    virtual BOOL            IsEntry( UINT32 ) const = 0;
+    virtual sal_Bool            IsEntry( sal_uInt32 ) const = 0;
 };
 
 /************** S t r i n g H a s h T a b l e E n t r y ******************/
@@ -62,28 +62,28 @@ class SvStringHashEntry : public SvRefBase
 {
 friend class SvStringHashTable;
     ByteString  aName;
-    UINT32  nHashId;
-    ULONG   nValue;
-    BOOL    bHasId;
+    sal_uInt32  nHashId;
+    sal_uLong   nValue;
+    sal_Bool    bHasId;
 public:
-                    SvStringHashEntry() : bHasId( FALSE ) {;}
-                    SvStringHashEntry( const ByteString & rName, UINT32 nIdx )
+                    SvStringHashEntry() : bHasId( sal_False ) {;}
+                    SvStringHashEntry( const ByteString & rName, sal_uInt32 nIdx )
                         : aName( rName )
                         , nHashId( nIdx )
                         , nValue( 0 )
-                        , bHasId( TRUE ) {}
+                        , bHasId( sal_True ) {}
                     ~SvStringHashEntry();
 
     const ByteString &  GetName() const { return aName; }
-    BOOL            HasId() const { return bHasId; }
-    UINT32          GetId() const { return nHashId; }
+    sal_Bool            HasId() const { return bHasId; }
+    sal_uInt32          GetId() const { return nHashId; }
 
-    void            SetValue( ULONG n ) { nValue = n; }
-    ULONG           GetValue() const { return nValue; }
+    void            SetValue( sal_uLong n ) { nValue = n; }
+    sal_uLong           GetValue() const { return nValue; }
 
-    BOOL            operator == ( const SvStringHashEntry & rRef )
+    sal_Bool            operator == ( const SvStringHashEntry & rRef )
                     { return nHashId == rRef.nHashId; }
-    BOOL            operator != ( const SvStringHashEntry & rRef )
+    sal_Bool            operator != ( const SvStringHashEntry & rRef )
                     { return ! operator == ( rRef ); }
     SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
         { SvRefBase::operator=( rRef );
@@ -104,19 +104,19 @@ class SvStringHashTable : public SvHashTable
 {
     SvStringHashEntry * pEntries;
 protected:
-    virtual UINT32          HashFunc( const void * pElement ) const;
-    virtual StringCompare   Compare( const void * pElement, UINT32 nIndex ) const;
+    virtual sal_uInt32          HashFunc( const void * pElement ) const;
+    virtual StringCompare   Compare( const void * pElement, sal_uInt32 nIndex ) const;
 public:
-            SvStringHashTable( UINT32 nMaxEntries );   // max size of hash-tabel
+            SvStringHashTable( sal_uInt32 nMaxEntries );   // max size of hash-tabel
             virtual ~SvStringHashTable();
 
     ByteString          GetNearString( const ByteString & rName ) const;
-    virtual BOOL    IsEntry( UINT32 nIndex ) const;
+    virtual sal_Bool    IsEntry( sal_uInt32 nIndex ) const;
 
-    BOOL    Insert( const ByteString & rStr, UINT32 * pHash ); // insert string
-    BOOL    Test( const ByteString & rStr, UINT32 * pHash ) const; // test of insert string
-    SvStringHashEntry * Get ( UINT32 nIndex ) const; // return pointer to string
-    SvStringHashEntry & operator []( UINT32 nPos ) const
+    sal_Bool    Insert( const ByteString & rStr, sal_uInt32 * pHash ); // insert string
+    sal_Bool    Test( const ByteString & rStr, sal_uInt32 * pHash ) const; // test of insert string
+    SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
+    SvStringHashEntry & operator []( sal_uInt32 nPos ) const
             { return pEntries[ nPos ]; }
 
     void    FillHashList( SvStringHashList * rList ) const;
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index b42a7ce4b0f2..9c7ecdd95f3a 100644..100755
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -44,13 +44,13 @@ class BigInt;
 class SvToken
 {
 friend class SvTokenStream;
-    ULONG                   nLine, nColumn;
+    sal_uLong                   nLine, nColumn;
     SVTOKEN_ENUM            nType;
     ByteString                  aString;
     union
     {
-        ULONG               nLong;
-        BOOL                bBool;
+        sal_uLong               nLong;
+        sal_Bool                bBool;
         char                cChar;
 //      SvRttiBase *        pComplexObj;
         SvStringHashEntry * pHash;
@@ -58,8 +58,8 @@ friend class SvTokenStream;
 public:
             SvToken();
             SvToken( const SvToken & rObj );
-            SvToken( ULONG n );
-            SvToken( SVTOKEN_ENUM nTypeP, BOOL b );
+            SvToken( sal_uLong n );
+            SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
             SvToken( char c );
             SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
 //            SvToken( SvRttiBase * pComplexObj );
@@ -70,27 +70,27 @@ public:
     ByteString          GetTokenAsString() const;
     SVTOKEN_ENUM    GetType() const { return nType; }
 
-    void        SetLine( ULONG nLineP )     { nLine = nLineP;       }
-    ULONG       GetLine() const             { return nLine;         }
+    void        SetLine( sal_uLong nLineP )     { nLine = nLineP;       }
+    sal_uLong       GetLine() const             { return nLine;         }
 
-    void        SetColumn( ULONG nColumnP ) { nColumn = nColumnP;   }
-    ULONG       GetColumn() const           { return nColumn;       }
+    void        SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP;   }
+    sal_uLong       GetColumn() const           { return nColumn;       }
 
-    BOOL        IsEmpty() const     { return nType == SVTOKEN_EMPTY; }
-    BOOL        IsComment() const   { return nType == SVTOKEN_COMMENT; }
-    BOOL        IsInteger() const   { return nType == SVTOKEN_INTEGER; }
-    BOOL        IsString() const    { return nType == SVTOKEN_STRING; }
-    BOOL        IsBool() const      { return nType == SVTOKEN_BOOL; }
-    BOOL        IsIdentifierHash() const
+    sal_Bool        IsEmpty() const     { return nType == SVTOKEN_EMPTY; }
+    sal_Bool        IsComment() const   { return nType == SVTOKEN_COMMENT; }
+    sal_Bool        IsInteger() const   { return nType == SVTOKEN_INTEGER; }
+    sal_Bool        IsString() const    { return nType == SVTOKEN_STRING; }
+    sal_Bool        IsBool() const      { return nType == SVTOKEN_BOOL; }
+    sal_Bool        IsIdentifierHash() const
                 { return nType == SVTOKEN_HASHID; }
-    BOOL        IsIdentifier() const
+    sal_Bool        IsIdentifier() const
                 {
                     return nType == SVTOKEN_IDENTIFIER
                             || nType == SVTOKEN_HASHID;
                 }
-    BOOL        IsChar() const      { return nType == SVTOKEN_CHAR; }
-    BOOL        IsRttiBase() const  { return nType == SVTOKEN_RTTIBASE; }
-    BOOL        IsEof() const       { return nType == SVTOKEN_EOF; }
+    sal_Bool        IsChar() const      { return nType == SVTOKEN_CHAR; }
+    sal_Bool        IsRttiBase() const  { return nType == SVTOKEN_RTTIBASE; }
+    sal_Bool        IsEof() const       { return nType == SVTOKEN_EOF; }
 
     const ByteString & GetString() const
                 {
@@ -98,27 +98,27 @@ public:
                         ? pHash->GetName()
                         : aString;
                 }
-    ULONG       GetNumber() const       { return nLong;         }
-    BOOL        GetBool() const         { return bBool;         }
+    sal_uLong       GetNumber() const       { return nLong;         }
+    sal_Bool        GetBool() const         { return bBool;         }
     char        GetChar() const         { return cChar;         }
 //    SvRttiBase *GetObject() const       { return pComplexObj;   }
 
     void        SetHash( SvStringHashEntry * pHashP )
                 { pHash = pHashP; nType = SVTOKEN_HASHID; }
-    BOOL        HasHash() const
+    sal_Bool        HasHash() const
                 { return nType == SVTOKEN_HASHID; }
     SvStringHashEntry * GetHash() const { return pHash; }
-    BOOL        Is( SvStringHashEntry * pEntry ) const
+    sal_Bool        Is( SvStringHashEntry * pEntry ) const
                 { return IsIdentifierHash() && pHash == pEntry; }
 };
 
 inline SvToken::SvToken()
     : nType( SVTOKEN_EMPTY ) {}
 
-inline SvToken::SvToken( ULONG n )
+inline SvToken::SvToken( sal_uLong n )
     : nType( SVTOKEN_INTEGER ), nLong( n ) {}
 
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, BOOL b )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
     : nType( nTypeP ), bBool( b ) {}
 
 inline SvToken::SvToken( char c )
@@ -141,15 +141,15 @@ DECLARE_LIST( SvTokenList, SvToken * )
 /******************** class SvTokenStream ********************************/
 class SvTokenStream
 {
-    ULONG       nLine, nColumn;
+    sal_uLong       nLine, nColumn;
     int         nBufPos;
     int         c;          // naechstes Zeichen
     CharSet     nCharSet;
     char *      pCharTab;   // Zeiger auf die Konverierungstabelle
-    USHORT      nTabSize;   // Tabulator Laenge
+    sal_uInt16      nTabSize;   // Tabulator Laenge
     ByteString      aStrTrue;
     ByteString      aStrFalse;
-    ULONG       nMaxPos;
+    sal_uLong       nMaxPos;
 
     SvFileStream *  pInStream;
     SvStream &      rInStream;
@@ -163,16 +163,16 @@ class SvTokenStream
     int             GetNextChar();
     int             GetFastNextChar()
                     {
-                        return aBufStr.GetChar((USHORT)nBufPos++);
+                        return aBufStr.GetChar((sal_uInt16)nBufPos++);
                     }
 
     void            FillTokenList();
-    ULONG           GetNumber();
-    BOOL            MakeToken( SvToken & );
-    BOOL            IsEof() const { return rInStream.IsEof(); }
+    sal_uLong           GetNumber();
+    sal_Bool            MakeToken( SvToken & );
+    sal_Bool            IsEof() const { return rInStream.IsEof(); }
     void            SetMax()
                     {
-                        ULONG n = Tell();
+                        sal_uLong n = Tell();
                         if( n > nMaxPos )
                             nMaxPos = n;
                     }
@@ -181,7 +181,7 @@ class SvTokenStream
                         // wenn Zeilenende berechnung sparen
                         if( 0 != c )
                         {
-                            USHORT n = 0;
+                            sal_uInt16 n = 0;
                             nColumn = 0;
                             while( n < nBufPos )
                                 nColumn += aBufStr.GetChar(n++) == '\t' ? nTabSize : 1;
@@ -198,9 +198,9 @@ public:
     void            SetCharSet( CharSet nSet );
     CharSet         GetCharSet() const { return nCharSet; }
 
-    void            SetTabSize( USHORT nTabSizeP )
+    void            SetTabSize( sal_uInt16 nTabSizeP )
                     { nTabSize = nTabSizeP; }
-    USHORT          GetTabSize() const { return nTabSize; }
+    sal_uInt16          GetTabSize() const { return nTabSize; }
 
     SvToken *       GetToken_PrevAll()
                     {
@@ -226,16 +226,16 @@ public:
                         return GetToken_NextAll();
                     }
     SvToken *       GetToken() const { return pCurToken; }
-    BOOL            Read( char cChar )
+    sal_Bool            Read( char cChar )
                     {
                         if( pCurToken->IsChar()
                           && cChar == pCurToken->GetChar() )
                         {
                             GetToken_Next();
-                            return TRUE;
+                            return sal_True;
                         }
                         else
-                            return FALSE;
+                            return sal_False;
                     }
     void            ReadDelemiter()
                     {
@@ -247,14 +247,14 @@ public:
                         }
                     }
 
-    UINT32          Tell() const
+    sal_uInt32          Tell() const
                     { return aTokList.GetCurPos(); }
-    void            Seek( UINT32 nPos )
+    void            Seek( sal_uInt32 nPos )
                     {
                         pCurToken = aTokList.Seek( nPos );
                         SetMax();
                     }
-    void            SeekRel( INT32 nRelPos )
+    void            SeekRel( sal_Int32 nRelPos )
                     {
                         pCurToken = aTokList.Seek( Tell() + nRelPos );
                         SetMax();
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index d35ed24affc2..5ffd670d6202 100644..100755
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -34,8 +34,8 @@
 struct SvNamePos
 {
     SvGlobalName    aUUId;
-    UINT32          nStmPos;
-    SvNamePos( const SvGlobalName & rName, UINT32 nPos )
+    sal_uInt32          nStmPos;
+    SvNamePos( const SvGlobalName & rName, sal_uInt32 nPos )
         : aUUId( rName )
         , nStmPos( nPos ) {}
 };
@@ -55,16 +55,16 @@ class SvMetaModule : public SvMetaExtern
     SvString                aModulePrefix;
 
 #ifdef IDL_COMPILER
-    BOOL                    bImported   : 1,
+    sal_Bool                    bImported   : 1,
                             bIsModified : 1;
     SvGlobalName            aBeginName;
     SvGlobalName            aEndName;
     SvGlobalName            aNextName;
 protected:
     virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     virtual void        ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 public:
                         SV_DECL_META_FACTORY1( SvMetaModule, SvMetaExtern, 13 )
@@ -73,7 +73,7 @@ public:
     const String &      GetIdlFileName() const { return aIdlFileName; }
     const ByteString &      GetModulePrefix() const { return aModulePrefix; }
 
-    virtual BOOL        SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
+    virtual sal_Bool        SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
 
     const ByteString &      GetHelpFileName() const { return aHelpFileName; }
     const ByteString &      GetTypeLibFileName() const { return aTypeLibFile; }
@@ -84,20 +84,20 @@ public:
 
 #ifdef IDL_COMPILER
                         SvMetaModule( const String & rIdlFileName,
-                                      BOOL bImported );
+                                      sal_Bool bImported );
 
-    BOOL                FillNextName( SvGlobalName * );
-    BOOL                IsImported() const { return bImported; }
-    BOOL                IsModified() const { return bIsModified; }
+    sal_Bool                FillNextName( SvGlobalName * );
+    sal_Bool                IsImported() const { return bImported; }
+    sal_Bool                IsModified() const { return bIsModified; }
 
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
     virtual void        WriteAttributes( SvIdlDataBase & rBase,
-                                        SvStream & rOutStm, USHORT nTab,
+                                        SvStream & rOutStm, sal_uInt16 nTab,
                                             WriteType, WriteAttribute = 0 );
 //    virtual void        WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm, SvNamePosList & rList );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                     WriteType, WriteAttribute = 0 );
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
     virtual void        WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -105,8 +105,8 @@ public:
     virtual void        WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
                                       Table *pIdTable );
 
-    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 };
 SV_DECL_IMPL_REF(SvMetaModule)
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 377c5bf0a959..5f4b44c8d7fb 100644..100755
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -49,9 +49,9 @@ DECLARE_LIST( SvMetaClassList, SvMetaClass* )
 class SvULongs : public List
 {
 public:
-    void    Insert( ULONG& rId, ULONG nPos ) { ULONG nId(rId ); List::Insert( (void*) nId, nPos ); }
-    void    Remove( ULONG& rId ){ ULONG nId(rId ); List::Remove( (void*) nId ); }
-    ULONG   GetObject( ULONG nPos ){ return (ULONG) List::GetObject( nPos ); }
+    void    Insert( sal_uLong& rId, sal_uLong nPos ) { sal_uLong nId(rId ); List::Insert( (void*) nId, nPos ); }
+    void    Remove( sal_uLong& rId ){ sal_uLong nId(rId ); List::Remove( (void*) nId ); }
+    sal_uLong   GetObject( sal_uLong nPos ){ return (sal_uLong) List::GetObject( nPos ); }
 };
 
 /******************** class SvClassElement *******************************/
@@ -70,9 +70,9 @@ public:
     const ByteString &  GetPrefix() const
                     { return aPrefix; }
 
-    void            SetAutomation( BOOL rAutomation )
+    void            SetAutomation( sal_Bool rAutomation )
                     { aAutomation = rAutomation; }
-    BOOL            GetAutomation() const
+    sal_Bool            GetAutomation() const
                     { return aAutomation; }
 
     void            SetClass( SvMetaClass * pClass )
@@ -97,18 +97,18 @@ class SvMetaClass : public SvMetaType
 
 //    void                FillSbxMemberObject( SvIdlDataBase & rBase,
 //                                            SbxObject *, StringList &,
-//                                            BOOL bVariable );
-    BOOL                TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+//                                            sal_Bool bVariable );
+    sal_Bool                TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                                      SvMetaAttribute & rAttr ) const;
 #ifdef IDL_COMPILER
     void                WriteSlotStubs( const ByteString & rShellName,
                                         SvSlotElementList & rSlotList,
                                         ByteStringList & rList,
                                         SvStream & rOutStm );
-    USHORT              WriteSlotParamArray( SvIdlDataBase & rBase,
+    sal_uInt16              WriteSlotParamArray( SvIdlDataBase & rBase,
                                             SvSlotElementList & rSlotList,
                                             SvStream & rOutStm );
-    USHORT              WriteSlots( const ByteString & rShellName, USHORT nCount,
+    sal_uInt16              WriteSlots( const ByteString & rShellName, sal_uInt16 nCount,
                                     SvSlotElementList & rSlotList,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
@@ -121,21 +121,21 @@ protected:
     virtual void    ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
     virtual void    WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
     virtual void    ReadContextSvIdl( SvIdlDataBase &,
                                      SvTokenStream & rInStm );
     virtual void    WriteContextSvIdl( SvIdlDataBase & rBase,
-                                     SvStream & rOutStm, USHORT nTab );
+                                     SvStream & rOutStm, sal_uInt16 nTab );
     void            WriteOdlMembers( ByteStringList & rSuperList,
-                                    BOOL bVariable, BOOL bWriteTab,
+                                    sal_Bool bVariable, sal_Bool bWriteTab,
                                     SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaClass, SvMetaType, 6 )
             SvMetaClass();
 
-    BOOL                GetAutomation() const
+    sal_Bool                GetAutomation() const
                         { return aAutomation; }
     SvMetaClass *       GetSuperClass() const
                         { return aSuperClass; }
@@ -148,18 +148,18 @@ public:
                         { return aClassList; }
 
 #ifdef IDL_COMPILER
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                 USHORT nTab,
+                                 sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
     virtual void        WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
                                 Table* pTable );
     virtual void        WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
                                  Table * pTable );
-    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 };
 SV_IMPL_REF(SvMetaClass)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index e44df5bd5af6..95d4051026be 100644..100755
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -75,108 +75,108 @@ class SvMetaSlot : public SvMetaAttribute
     SvString        aDisableFlags;
     SvMetaSlot*     pLinkedSlot;
     SvMetaSlot*     pNextSlot;
-    ULONG           nListPos;
+    sal_uLong           nListPos;
     SvMetaEnumValue* pEnumValue;
     SvString    aUnoName;
 
 #ifdef IDL_COMPILER
     void            WriteSlot( const ByteString & rShellName,
-                            USHORT nCount, const ByteString & rSlotId,
+                            sal_uInt16 nCount, const ByteString & rSlotId,
                             SvSlotElementList &rList,
                             const ByteString & rPrefix,
                                SvIdlDataBase & rBase, SvStream & rOutStm );
     virtual void    Write( SvIdlDataBase & rBase,
-                            SvStream & rOutStm, USHORT nTab,
+                            SvStream & rOutStm, sal_uInt16 nTab,
                              WriteType, WriteAttribute = 0 );
 
     void            SetEnumValue(SvMetaEnumValue *p)
                     { pEnumValue = p; }
 #endif
 protected:
-    void    SetCachable( BOOL bSet )
+    void    SetCachable( sal_Bool bSet )
             {
                 aCachable = bSet;
                 if( bSet )
-                    aVolatile = FALSE;
+                    aVolatile = sal_False;
             }
-    void    SetVolatile( BOOL bSet )
+    void    SetVolatile( sal_Bool bSet )
             {
                 aVolatile = bSet;
                 if( bSet )
-                    aCachable = FALSE;
+                    aCachable = sal_False;
             }
-    void    SetToggle( BOOL bSet )
+    void    SetToggle( sal_Bool bSet )
             {
                 aToggle = bSet;
             }
-    void    SetAutoUpdate( BOOL bSet )
+    void    SetAutoUpdate( sal_Bool bSet )
             {
                 aAutoUpdate = bSet;
             }
 
-    void    SetSynchron( BOOL bSet )
+    void    SetSynchron( sal_Bool bSet )
             {
                 aSynchron = bSet;
                 if( bSet )
-                    aAsynchron = FALSE;
+                    aAsynchron = sal_False;
             }
-    void    SetAsynchron( BOOL bSet )
+    void    SetAsynchron( sal_Bool bSet )
             {
                 aAsynchron = bSet;
                 if( bSet )
-                    aSynchron = FALSE;
+                    aSynchron = sal_False;
             }
 
-    void    SetRecordPerItem( BOOL bSet )
+    void    SetRecordPerItem( sal_Bool bSet )
             {
                 aRecordPerItem = bSet;
                 if( bSet )
-                    aRecordPerSet = aRecordManual = aNoRecord = FALSE;
+                    aRecordPerSet = aRecordManual = aNoRecord = sal_False;
             }
-    void    SetRecordPerSet( BOOL bSet )
+    void    SetRecordPerSet( sal_Bool bSet )
             {
                 aRecordPerSet = bSet;
                 if( bSet )
-                    aRecordPerItem = aRecordManual = aNoRecord = FALSE;
+                    aRecordPerItem = aRecordManual = aNoRecord = sal_False;
             }
-    void    SetRecordManual( BOOL bSet )
+    void    SetRecordManual( sal_Bool bSet )
             {
                 aRecordManual = bSet;
                 if( bSet )
-                    aRecordPerItem = aRecordPerSet = aNoRecord = FALSE;
+                    aRecordPerItem = aRecordPerSet = aNoRecord = sal_False;
             }
-    void    SetNoRecord( BOOL bSet )
+    void    SetNoRecord( sal_Bool bSet )
             {
                 aNoRecord = bSet;
                 if( bSet )
-                    aRecordPerItem = aRecordPerSet = aRecordManual = FALSE;
+                    aRecordPerItem = aRecordPerSet = aRecordManual = sal_False;
             }
-    void    SetRecordAbsolute( BOOL bSet )
+    void    SetRecordAbsolute( sal_Bool bSet )
             { aRecordAbsolute = bSet; }
-    void    SetHasDialog( BOOL bSet )
+    void    SetHasDialog( sal_Bool bSet )
             { aHasDialog = bSet; }
-    void    SetMenuConfig( BOOL bSet )
+    void    SetMenuConfig( sal_Bool bSet )
             { aMenuConfig = bSet; }
-    void    SetToolBoxConfig( BOOL bSet )
+    void    SetToolBoxConfig( sal_Bool bSet )
             { aToolBoxConfig = bSet; }
-    void    SetStatusBarConfig( BOOL bSet )
+    void    SetStatusBarConfig( sal_Bool bSet )
             { aStatusBarConfig = bSet; }
-    void    SetAccelConfig( BOOL bSet )
+    void    SetAccelConfig( sal_Bool bSet )
             { aAccelConfig = bSet; }
-    void    SetAllConfig( BOOL bSet )
+    void    SetAllConfig( sal_Bool bSet )
             {
                 aMenuConfig     = bSet;
                 aToolBoxConfig  = bSet;
                 aStatusBarConfig = bSet;
                 aAccelConfig    = bSet;
             }
-    void    SetFastCall( BOOL bSet )
+    void    SetFastCall( sal_Bool bSet )
             { aFastCall = bSet; }
-    void    SetContainer( BOOL bSet )
+    void    SetContainer( sal_Bool bSet )
             { aContainer = bSet; }
-    void    SetImageRotation( BOOL bSet )
+    void    SetImageRotation( sal_Bool bSet )
             { aImageRotation = bSet; }
-    void    SetImageReflection( BOOL bSet )
+    void    SetImageReflection( sal_Bool bSet )
             { aImageReflection = bSet; }
 
 public:
@@ -187,84 +187,84 @@ public:
             SvMetaSlot();
             SvMetaSlot( SvMetaType * pType );
 
-    virtual BOOL    IsVariable() const;
-    virtual BOOL    IsMethod() const;
-    virtual ByteString  GetMangleName( BOOL bVariable ) const;
+    virtual sal_Bool    IsVariable() const;
+    virtual sal_Bool    IsMethod() const;
+    virtual ByteString  GetMangleName( sal_Bool bVariable ) const;
 
     SvMetaAttribute *   GetMethod() const;
     SvMetaType *        GetSlotType() const;
-    BOOL                GetHasCoreId() const;
+    sal_Bool                GetHasCoreId() const;
     const ByteString &      GetGroupId() const;
     const ByteString &      GetConfigId() const;
     const ByteString &      GetExecMethod() const;
     const ByteString &      GetStateMethod() const;
     const ByteString &      GetDefault() const;
     const ByteString &      GetDisableFlags() const;
-    BOOL                GetPseudoSlots() const;
+    sal_Bool                GetPseudoSlots() const;
     /*
-    BOOL                GetGet() const;
-    BOOL                GetSet() const;
+    sal_Bool                GetGet() const;
+    sal_Bool                GetSet() const;
     */
-    BOOL                GetCachable() const;
-    BOOL                GetVolatile() const;
-    BOOL                GetToggle() const;
-    BOOL                GetAutoUpdate() const;
+    sal_Bool                GetCachable() const;
+    sal_Bool                GetVolatile() const;
+    sal_Bool                GetToggle() const;
+    sal_Bool                GetAutoUpdate() const;
 
-    BOOL                GetSynchron() const;
-    BOOL                GetAsynchron() const;
+    sal_Bool                GetSynchron() const;
+    sal_Bool                GetAsynchron() const;
 
-    BOOL                GetRecordPerItem() const;
-    BOOL                GetRecordPerSet() const;
-    BOOL                GetRecordManual() const;
-    BOOL                GetNoRecord() const;
-    BOOL                GetRecordAbsolute() const;
+    sal_Bool                GetRecordPerItem() const;
+    sal_Bool                GetRecordPerSet() const;
+    sal_Bool                GetRecordManual() const;
+    sal_Bool                GetNoRecord() const;
+    sal_Bool                GetRecordAbsolute() const;
 
-    BOOL                GetHasDialog() const;
+    sal_Bool                GetHasDialog() const;
     const ByteString &      GetPseudoPrefix() const;
     const ByteString &      GetUnoName() const;
-    BOOL                GetMenuConfig() const;
-    BOOL                GetToolBoxConfig() const;
-    BOOL                GetStatusBarConfig() const;
-    BOOL                GetAccelConfig() const;
-    BOOL                GetFastCall() const;
-    BOOL                GetContainer() const;
-    BOOL                GetImageRotation() const;
-    BOOL                GetImageReflection() const;
+    sal_Bool                GetMenuConfig() const;
+    sal_Bool                GetToolBoxConfig() const;
+    sal_Bool                GetStatusBarConfig() const;
+    sal_Bool                GetAccelConfig() const;
+    sal_Bool                GetFastCall() const;
+    sal_Bool                GetContainer() const;
+    sal_Bool                GetImageRotation() const;
+    sal_Bool                GetImageReflection() const;
     SvMetaSlot*         GetLinkedSlot() const
                         { return pLinkedSlot; }
     SvMetaSlot*         GetNextSlot() const
                         { return pNextSlot; }
-    ULONG               GetListPos() const
+    sal_uLong               GetListPos() const
                         { return nListPos; }
-    void                SetListPos(ULONG n)
+    void                SetListPos(sal_uLong n)
                         { nListPos = n; }
     void                ResetSlotPointer()
                         { pNextSlot = pLinkedSlot = 0; }
 
-//    void                FillSbxObject( SvIdlDataBase & rBase, SbxObject *, BOOL bProp );
+//    void                FillSbxObject( SvIdlDataBase & rBase, SbxObject *, sal_Bool bProp );
 #ifdef IDL_COMPILER
     SvMetaEnumValue*    GetEnumValue() const
                         { return pEnumValue; }
-    virtual BOOL        Test( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool        Test( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                              SvTokenStream & rInStm );
     virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                              SvStream & rOutStm, USHORT nTab );
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+                                              SvStream & rOutStm, sal_uInt16 nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
     virtual void        Insert( SvSlotElementList&, const ByteString & rPrefix,
                                 SvIdlDataBase& );
     void                WriteSlotStubs( const ByteString & rShellName,
                                     ByteStringList & rList,
                                     SvStream & rOutStm );
-    USHORT              WriteSlotMap( const ByteString & rShellName,
-                                    USHORT nCount,
+    sal_uInt16              WriteSlotMap( const ByteString & rShellName,
+                                    sal_uInt16 nCount,
                                     SvSlotElementList&,
                                     const ByteString &,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
-    USHORT              WriteSlotParamArray( SvIdlDataBase & rBase,
+    sal_uInt16              WriteSlotParamArray( SvIdlDataBase & rBase,
                                             SvStream & rOutStm );
     virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                                   Table * pIdTable );
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 5393981a7a4f..bb12b9291b27 100644..100755
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -48,77 +48,77 @@ class SvMetaAttribute : public SvMetaReference
     SvBOOL              aIsCollection;
     SvBOOL              aReadOnlyDoc;
     SvBOOL              aHidden;
-    BOOL                bNewAttr;
+    sal_Bool                bNewAttr;
 
 protected:
 #ifdef IDL_COMPILER
     virtual void WriteCSource( SvIdlDataBase & rBase,
-                                 SvStream & rOutStm, BOOL bSet );
-    ULONG        MakeSlotValue( SvIdlDataBase & rBase, BOOL bVariable ) const;
+                                 SvStream & rOutStm, sal_Bool bSet );
+    sal_uLong        MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const;
     virtual void WriteAttributes( SvIdlDataBase & rBase,
-                                      SvStream & rOutStm, USHORT nTab,
+                                      SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0 );
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
     virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaAttribute, SvMetaReference, 2 )
                         SvMetaAttribute();
                         SvMetaAttribute( SvMetaType * );
 
-    void                SetNewAttribute( BOOL bNew )
+    void                SetNewAttribute( sal_Bool bNew )
                         { bNewAttr = bNew; }
-    BOOL                IsNewAttribute() const
+    sal_Bool                IsNewAttribute() const
                         { return bNewAttr; }
-    BOOL                GetReadonly() const;
+    sal_Bool                GetReadonly() const;
 
     void                SetSlotId( const SvNumberIdentifier & rId )
                         { aSlotId = rId; }
     const SvNumberIdentifier & GetSlotId() const;
 
-    void                SetExport( BOOL bSet )
+    void                SetExport( sal_Bool bSet )
                         { aExport = bSet; }
-    BOOL                GetExport() const;
+    sal_Bool                GetExport() const;
 
-    void                SetHidden( BOOL bSet )
+    void                SetHidden( sal_Bool bSet )
                         { aHidden = bSet; }
-    BOOL                GetHidden() const;
+    sal_Bool                GetHidden() const;
 
-    void                SetAutomation( BOOL bSet )
+    void                SetAutomation( sal_Bool bSet )
                         { aAutomation = bSet; }
-    BOOL                GetAutomation() const;
+    sal_Bool                GetAutomation() const;
 
-    void                SetIsCollection( BOOL bSet )
+    void                SetIsCollection( sal_Bool bSet )
                         { aIsCollection = bSet; }
-    BOOL                GetIsCollection() const;
-    void                SetReadOnlyDoc( BOOL bSet )
+    sal_Bool                GetIsCollection() const;
+    void                SetReadOnlyDoc( sal_Bool bSet )
                         { aReadOnlyDoc = bSet; }
-    BOOL                GetReadOnlyDoc() const;
+    sal_Bool                GetReadOnlyDoc() const;
 
     void                SetType( SvMetaType * pT ) { aType = pT; }
     SvMetaType *        GetType() const;
 
-    virtual BOOL        IsMethod() const;
-    virtual BOOL        IsVariable() const;
-    virtual ByteString      GetMangleName( BOOL bVariable ) const;
+    virtual sal_Bool        IsMethod() const;
+    virtual sal_Bool        IsVariable() const;
+    virtual ByteString      GetMangleName( sal_Bool bVariable ) const;
 
-//    void                FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags = 0 );
-//    virtual void        FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj, BOOL bVariable );
+//    void                FillSbxObject( SbxInfo * pInfo, sal_uInt16 nSbxFlags = 0 );
+//    virtual void        FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj, sal_Bool bVariable );
 
 #ifdef IDL_COMPILER
-    virtual BOOL        Test( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual sal_Bool        Test( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                     WriteType );
     void                WriteRecursiv_Impl( SvIdlDataBase & rBase,
-                                        SvStream & rOutStm, USHORT nTab,
+                                        SvStream & rOutStm, sal_uInt16 nTab,
                                           WriteType, WriteAttribute );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    ULONG               MakeSfx( ByteString * pAtrrArray );
+    sal_uLong               MakeSfx( ByteString * pAtrrArray );
     virtual void        Insert( SvSlotElementList&, const ByteString & rPrefix,
                                 SvIdlDataBase& );
     virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -152,30 +152,30 @@ class SvMetaType : public SvMetaExtern
     SvIdentifier                aBasicName;
     SvMetaAttributeMemberList * pAttrList;
     int                         nType;
-    BOOL                        bIsItem;
-    BOOL                        bIsShell;
+    sal_Bool                        bIsItem;
+    sal_Bool                        bIsShell;
     char                        cParserChar;
 
 #ifdef IDL_COMPILER
     void    WriteSfxItem( const ByteString & rItemName, SvIdlDataBase & rBase,
                         SvStream & rOutStm );
 protected:
-    BOOL        ReadNamesSvIdl( SvIdlDataBase & rBase,
+    sal_Bool        ReadNamesSvIdl( SvIdlDataBase & rBase,
                                          SvTokenStream & rInStm );
     virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                                   USHORT nTab );
+                                   sal_uInt16 nTab );
 
     virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                      USHORT nTab,
+                                      sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    BOOL    ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool    ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     void    WriteHeaderSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                              USHORT nTab );
+                              sal_uInt16 nTab );
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
@@ -188,7 +188,7 @@ public:
                         const ByteString & rBasicPostfix/*, SbxDataType nT = SbxEMPTY */);
 
     SvMetaAttributeMemberList & GetAttrList() const;
-    ULONG               GetAttrCount() const
+    sal_uLong               GetAttrCount() const
                         {
                             return pAttrList ? pAttrList->Count() : 0L;
                         }
@@ -201,18 +201,18 @@ public:
     int                 GetType() const { return nType; }
     SvMetaType *        GetBaseType() const;
     SvMetaType *        GetReturnType() const;
-    BOOL                IsItem() const { return bIsItem; }
-    BOOL                IsShell() const { return bIsShell; }
+    sal_Bool                IsItem() const { return bIsItem; }
+    sal_Bool                IsShell() const { return bIsShell; }
 
 //    void                SetSbxDataType( SbxDataType nT )
 //                        { aSbxDataType = (int)nT; }
 //    SbxDataType         GetSbxDataType() const;
 
-    void                SetIn( BOOL b ) { aIn = b; }
-    BOOL                GetIn() const;
+    void                SetIn( sal_Bool b ) { aIn = b; }
+    sal_Bool                GetIn() const;
 
-    void                SetOut( BOOL b ) { aOut = b; }
-    BOOL                GetOut() const;
+    void                SetOut( sal_Bool b ) { aOut = b; }
+    sal_Bool                GetOut() const;
 
     void                SetCall0( int e );
     int                 GetCall0() const;
@@ -231,29 +231,29 @@ public:
     const ByteString &      GetCName() const;
     char                GetParserChar() const { return cParserChar; }
 
-    virtual BOOL        SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+    virtual sal_Bool        SetName( const ByteString & rName, SvIdlDataBase * = NULL );
 
-//    void                FillSbxObject( SbxVariable * pObj, BOOL bVariable );
+//    void                FillSbxObject( SbxVariable * pObj, sal_Bool bVariable );
 
 #ifdef IDL_COMPILER
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+                                    SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
     ByteString              GetCString() const;
-    void                WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    void                WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    void                WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    void                WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     void                AppendParserString (ByteString &rString);
 
-    ULONG               MakeSfx( ByteString * pAtrrArray );
+    sal_uLong               MakeSfx( ByteString * pAtrrArray );
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
-    //BOOL              ReadTypePrefix( SvIdlDataBase &, SvTokenStream & rInStm );
-    BOOL                ReadMethodArgs( SvIdlDataBase & rBase,
+    //sal_Bool              ReadTypePrefix( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool                ReadMethodArgs( SvIdlDataBase & rBase,
                                              SvTokenStream & rInStm );
-    void                WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
-    void                WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
-    void                WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
+    void                WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
+    void                WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
+    void                WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
     ByteString              GetParserString() const;
     void                WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
                                         const ByteString & rChief );
@@ -284,9 +284,9 @@ public:
             SvMetaEnumValue();
 
 #ifdef IDL_COMPILER
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
 #endif
 };
@@ -303,26 +303,26 @@ protected:
 #ifdef IDL_COMPILER
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                                   USHORT nTab );
-    virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+                                   sal_uInt16 nTab );
+    virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaTypeEnum, SvMetaType, 21 )
             SvMetaTypeEnum();
 
-    USHORT              GetMaxValue() const;
-    ULONG               Count() const { return aEnumValueList.Count(); }
+    sal_uInt16              GetMaxValue() const;
+    sal_uLong               Count() const { return aEnumValueList.Count(); }
     const ByteString &      GetPrefix() const { return aPrefix; }
-    SvMetaEnumValue *   GetObject( ULONG n ) const
+    SvMetaEnumValue *   GetObject( sal_uLong n ) const
                         { return aEnumValueList.GetObject( n ); }
 
 #ifdef IDL_COMPILER
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                USHORT nTab,
+                                sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
 #endif
 };
diff --git a/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx
index 9f7272ee4524..6e0049240bbb 100644..100755
--- a/idl/source/cmptools/char.cxx
+++ b/idl/source/cmptools/char.cxx
@@ -87,20 +87,20 @@ char * SvChar::GetTable( CharSet nSource , CharSet nDest )
     if( !pCharTable )
         pCharTable = new Table();
 
-    BYTE * pSet;
-    pSet = (BYTE *)pCharTable->Get( ((ULONG)nSource << 16) + (ULONG)nDest );
+    sal_uInt8 * pSet;
+    pSet = (sal_uInt8 *)pCharTable->Get( ((sal_uLong)nSource << 16) + (sal_uLong)nDest );
 
     if( !pSet )
     {
-        pSet = new BYTE[ 256 ];
+        pSet = new sal_uInt8[ 256 ];
         memcpy( pSet, EqualTab, sizeof( EqualTab ) );
-        for( USHORT i = 128; i < 256; i++ )
+        for( sal_uInt16 i = 128; i < 256; i++ )
         {
             char c = ByteString::Convert( pSet[i], nSource, nDest );
             if( c )
-                pSet[ i ] = (BYTE)c;
+                pSet[ i ] = (sal_uInt8)c;
         }
-        pCharTable->Insert( ((ULONG)nSource << 16) + (ULONG)nDest, pSet );
+        pCharTable->Insert( ((sal_uLong)nSource << 16) + (sal_uLong)nDest, pSet );
     }
 
     return (char *)pSet;
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 4d5427f3875c..f919a1074efa 100644..100755
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-// Programmabh„ngige Includes.
+// Programmabh�ngige Includes.
 #include <hash.hxx>
 #include <tools/debug.hxx>
 
@@ -55,7 +55,7 @@ SvStringHashEntry::~SvStringHashEntry() { };
 |*    Beschreibung
 |*
 *************************************************************************/
-SvHashTable::SvHashTable( UINT32 nMaxEntries )
+SvHashTable::SvHashTable( sal_uInt32 nMaxEntries )
 {
     nMax = nMaxEntries;     // set max entries
     nFill = 0;              // no entries
@@ -73,8 +73,8 @@ SvHashTable::SvHashTable( UINT32 nMaxEntries )
 SvHashTable::~SvHashTable()
 {
 #ifdef DOS_NIE
-    printf( "Maximum: %ld, F�llung: %ld\n", (ULONG)nMax, (ULONG)nFill );
-    printf( "Anfragen: %ld, Versuche: %ld", (ULONG)lAsk, (ULONG)lTry );
+    printf( "Maximum: %ld, F�llung: %ld\n", (sal_uLong)nMax, (sal_uLong)nFill );
+    printf( "Anfragen: %ld, Versuche: %ld", (sal_uLong)lAsk, (sal_uLong)lTry );
     if( lTry != 0 )
         printf( ", V/E = %ld\n", lTry / lAsk );
 #endif
@@ -87,12 +87,12 @@ SvHashTable::~SvHashTable()
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
-                               UINT32 * pInsertPos )
+sal_Bool SvHashTable::Test_Insert( const void * pElement, sal_Bool bInsert,
+                               sal_uInt32 * pInsertPos )
 {
-    UINT32    nHash;
-    UINT32    nIndex;
-    UINT32    nLoop;
+    sal_uInt32    nHash;
+    sal_uInt32    nIndex;
+    sal_uInt32    nLoop;
 
     lAsk++;
     lTry++;
@@ -110,11 +110,11 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
         {
             if( pInsertPos )
                 *pInsertPos = nIndex;               // place of Element
-            return TRUE;
+            return sal_True;
         }
         nLoop++;
         lTry++;
-        nIndex = (USHORT)(nIndex + nHash + 7) % nMax;
+        nIndex = (sal_uInt16)(nIndex + nHash + 7) % nMax;
     }
 
     if( bInsert )
@@ -124,10 +124,10 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
         {
             nFill++;
             *pInsertPos = nIndex;                       // return free place
-            return TRUE;
+            return sal_True;
         }
     }
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
@@ -138,7 +138,7 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
 |*    Beschreibung
 |*
 *************************************************************************/
-SvStringHashTable::SvStringHashTable( UINT32 nMaxEntries )
+SvStringHashTable::SvStringHashTable( sal_uInt32 nMaxEntries )
         : SvHashTable( nMaxEntries )
 {
     pEntries = new SvStringHashEntry[ nMaxEntries ];
@@ -177,7 +177,7 @@ SvStringHashTable::~SvStringHashTable()
 
 #ifdef MPW
     // der MPW-Compiler ruft sonst keine Dtoren!
-    for ( USHORT n = 0; n < GetMax(); ++n )
+    for ( sal_uInt16 n = 0; n < GetMax(); ++n )
         (pEntries+n)->SvStringHashEntry::~SvStringHashEntry();
     delete (void*) pEntries;
 #else
@@ -192,18 +192,18 @@ SvStringHashTable::~SvStringHashTable()
 |*    Beschreibung
 |*
 *************************************************************************/
-UINT32 SvStringHashTable::HashFunc( const void * pElement ) const
+sal_uInt32 SvStringHashTable::HashFunc( const void * pElement ) const
 {
-    UINT32          nHash = 0;  // hash value
+    sal_uInt32          nHash = 0;  // hash value
     const char *    pStr = ((const ByteString * )pElement)->GetBuffer();
 
     int nShift = 0;
     while( *pStr )
     {
         if( isupper( *pStr ) )
-            nHash ^= UINT32(*pStr - 'A' + 26) << nShift;
+            nHash ^= sal_uInt32(*pStr - 'A' + 26) << nShift;
         else
-            nHash ^= UINT32(*pStr - 'a') << nShift;
+            nHash ^= sal_uInt32(*pStr - 'a') << nShift;
         if( nShift == 28 )
             nShift = 0;
         else
@@ -222,7 +222,7 @@ UINT32 SvStringHashTable::HashFunc( const void * pElement ) const
 *************************************************************************/
 ByteString SvStringHashTable::GetNearString( const ByteString & rName ) const
 {
-    for( UINT32 i = 0; i < GetMax(); i++ )
+    for( sal_uInt32 i = 0; i < GetMax(); i++ )
     {
         SvStringHashEntry * pE = Get( i );
         if( pE )
@@ -241,10 +241,10 @@ ByteString SvStringHashTable::GetNearString( const ByteString & rName ) const
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvStringHashTable::IsEntry( UINT32 nIndex ) const
+sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
 {
     if( nIndex >= GetMax() )
-        return FALSE;
+        return sal_False;
     return pEntries[ nIndex ].HasId();
 }
 
@@ -255,18 +255,18 @@ BOOL SvStringHashTable::IsEntry( UINT32 nIndex ) const
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvStringHashTable::Insert( const ByteString & rName, UINT32 * pIndex )
+sal_Bool SvStringHashTable::Insert( const ByteString & rName, sal_uInt32 * pIndex )
 {
-    UINT32 nIndex;
+    sal_uInt32 nIndex;
 
     if( !pIndex ) pIndex = &nIndex;
 
-    if( !SvHashTable::Test_Insert( &rName, TRUE, pIndex ) )
-        return FALSE;
+    if( !SvHashTable::Test_Insert( &rName, sal_True, pIndex ) )
+        return sal_False;
 
     if( !IsEntry( *pIndex ) )
         pEntries[ *pIndex ] = SvStringHashEntry( rName, *pIndex );
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -276,10 +276,10 @@ BOOL SvStringHashTable::Insert( const ByteString & rName, UINT32 * pIndex )
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvStringHashTable::Test( const ByteString & rName, UINT32 * pPos ) const
+sal_Bool SvStringHashTable::Test( const ByteString & rName, sal_uInt32 * pPos ) const
 {
     return ((SvStringHashTable *)this)->SvHashTable::
-                Test_Insert( &rName, FALSE, pPos );
+                Test_Insert( &rName, sal_False, pPos );
 }
 
 /*************************************************************************
@@ -289,7 +289,7 @@ BOOL SvStringHashTable::Test( const ByteString & rName, UINT32 * pPos ) const
 |*    Beschreibung
 |*
 *************************************************************************/
-SvStringHashEntry * SvStringHashTable::Get( UINT32 nIndex ) const
+SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const
 {
     if( IsEntry( nIndex ) )
         return pEntries + nIndex;
@@ -304,7 +304,7 @@ SvStringHashEntry * SvStringHashTable::Get( UINT32 nIndex ) const
 |*
 *************************************************************************/
 StringCompare SvStringHashTable::Compare( const void * pElement,
-                                          UINT32 nIndex ) const
+                                          sal_uInt32 nIndex ) const
 {
     return ((const ByteString *)pElement)->CompareTo( pEntries[ nIndex ].GetName() );
 }
@@ -318,7 +318,7 @@ StringCompare SvStringHashTable::Compare( const void * pElement,
 *************************************************************************/
 void SvStringHashTable::FillHashList( SvStringHashList * pList ) const
 {
-    for( UINT32 n = 0; n < GetMax(); n++ )
+    for( sal_uInt32 n = 0; n < GetMax(); n++ )
     {
         if( IsEntry( n ) )
             pList->Insert( Get( n ), LIST_APPEND );
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 579c81a5ec16..24991489841c 100644..100755
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -274,7 +274,7 @@ int SvTokenStream::GetNextChar()
             return '\0';
         }
     }
-    nChar = aBufStr.GetChar( (USHORT)nBufPos++ );
+    nChar = aBufStr.GetChar( (sal_uInt16)nBufPos++ );
     nColumn += nChar == '\t' ? nTabSize : 1;
     return nChar;
 }
@@ -284,9 +284,9 @@ int SvTokenStream::GetNextChar()
 |*
 |*    Beschreibung
 *************************************************************************/
-ULONG SvTokenStream::GetNumber()
+sal_uLong SvTokenStream::GetNumber()
 {
-    ULONG   l = 0;
+    sal_uLong   l = 0;
     short   nLog = 10;
 
     if( '0' == c )
@@ -327,10 +327,10 @@ ULONG SvTokenStream::GetNumber()
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvTokenStream::MakeToken( SvToken & rToken )
+sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
 {
     int             c1;
-    USHORT          i;
+    sal_uInt16          i;
 
     do
     {
@@ -345,8 +345,8 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
     }
     while( 0 == c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
 
-    ULONG nLastLine     = nLine;
-    ULONG nLastColumn   = nColumn;
+    sal_uLong nLastLine     = nLine;
+    sal_uLong nLastColumn   = nColumn;
     // Kommentar
     if( '/' == c )
     {
@@ -378,7 +378,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
                     {
                         c = GetNextChar();
                         if( IsEof() )
-                            return FALSE;
+                            return sal_False;
                     }
                     else
                         c = GetFastNextChar();
@@ -388,7 +388,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
             }
             while( '/' != c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
             if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) )
-                return FALSE;
+                return sal_False;
             //aComment += (char)c;
             c = GetNextChar();
             rToken.nType = SVTOKEN_COMMENT;
@@ -405,7 +405,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
     {
         ByteString          aStr;
         i = 0;
-        BOOL bDone = FALSE;
+        sal_Bool bDone = sal_False;
         while( !bDone && !IsEof() && c )
         {
             c = GetFastNextChar();
@@ -415,7 +415,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
                 aStr += '\n';
                 c = GetNextChar();
                 if( IsEof() )
-                    return FALSE;
+                    return sal_False;
             }
             if( c == '"' )
             {
@@ -426,7 +426,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
                     aStr += '"';
                 }
                 else
-                    bDone = TRUE;
+                    bDone = sal_True;
             }
             else if( c == '\\' )
             {
@@ -439,7 +439,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
                 aStr += (char)c;
         }
         if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) )
-            return FALSE;
+            return sal_False;
         char * pStr = (char *)aStr.GetBuffer();
         while( *pStr )
         {
@@ -467,16 +467,16 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
         if( aStr.EqualsIgnoreCaseAscii( aStrTrue ) )
         {
             rToken.nType = SVTOKEN_BOOL;
-            rToken.bBool = TRUE;
+            rToken.bBool = sal_True;
         }
         else if( aStr.EqualsIgnoreCaseAscii( aStrFalse ) )
         {
             rToken.nType = SVTOKEN_BOOL;
-            rToken.bBool = FALSE;
+            rToken.bBool = sal_False;
         }
         else
         {
-            UINT32 nHashId;
+            sal_uInt32 nHashId;
             if( IDLAPP->pHashTable->Test( aStr, &nHashId ) )
                 rToken.SetHash( IDLAPP->pHashTable->Get( nHashId ) );
             else
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index b5a63285dc1c..09b9a317e07a 100644..100755
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -64,7 +64,7 @@ void SvMetaObject::Save( SvPersistStream & )
 |*    Beschreibung
 *************************************************************************/
 #ifdef IDL_COMPILER
-void SvMetaObject::WriteTab( SvStream & rOutStm, USHORT nTab )
+void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab )
 {
     while( nTab-- )
         rOutStm << "    ";
@@ -89,18 +89,18 @@ void SvMetaObject::WriteStars( SvStream & rOutStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, ULONG nBegPos )
+sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
 {
     // keine leeren Klammern schreiben
-    ULONG nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.Seek( nBegPos );
-    BOOL bOnlySpace = TRUE;
+    sal_Bool bOnlySpace = sal_True;
     while( bOnlySpace && rOutStm.Tell() < nPos )
     {
         char c;
         rOutStm >> c;
         if( !isspace( c ) )
-            bOnlySpace = FALSE;
+            bOnlySpace = sal_False;
     }
     if( bOnlySpace )
         // nichts geschrieben
@@ -118,7 +118,7 @@ BOOL SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, ULONG nBegPos )
 void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
 {
     // keine leeren Klammern schreiben
-    ULONG nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.SeekRel( -1 );
     char c = 0;
     rOutStm >> c;
@@ -140,9 +140,9 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
+sal_Bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
 {
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -150,7 +150,7 @@ BOOL SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
 |*
 |*    Beschreibung
 *************************************************************************/
-void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
 {
 }
 
@@ -159,7 +159,7 @@ void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
 |*
 |*    Beschreibung
 *************************************************************************/
-void SvMetaObject::Write( SvIdlDataBase &, SvStream &, USHORT /*nTab */,
+void SvMetaObject::Write( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */,
                              WriteType, WriteAttribute )
 {
 }
@@ -169,7 +169,7 @@ void SvMetaObject::Write( SvIdlDataBase &, SvStream &, USHORT /*nTab */,
 |*
 |*    Beschreibung
 *************************************************************************/
-void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
 {
 }
 
@@ -178,7 +178,7 @@ void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
 |*
 |*    Beschreibung
 *************************************************************************/
-void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
 {
 }
 
@@ -198,7 +198,7 @@ SvMetaName::SvMetaName()
 void SvMetaName::Load( SvPersistStream & rStm )
 {
     SvMetaObject::Load( rStm );
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
 
     if( nMask >= 0x20 )
@@ -217,7 +217,7 @@ void SvMetaName::Load( SvPersistStream & rStm )
 void SvMetaName::Save( SvPersistStream & rStm )
 {
     SvMetaObject::Save( rStm );
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aName.IsSet() )         nMask |= 0x01;
     if( aHelpContext.IsSet() )  nMask |= 0x02;
     if( aHelpText.IsSet() )     nMask |= 0x04;
@@ -237,10 +237,10 @@ void SvMetaName::Save( SvPersistStream & rStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
+sal_Bool SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
 {
     aName = rName;
-    return TRUE;
+    return sal_True;
 }
 
 #ifdef IDL_COMPILER
@@ -249,19 +249,19 @@ BOOL SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
                                 SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     // Modulnamen lesen
     if( pTok->IsIdentifier() )
         if( SetName( pTok->GetString(), &rBase ) )
-            return TRUE;
+            return sal_True;
 
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -272,7 +272,7 @@ BOOL SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
 void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     if( aName.ReadSvIdl( SvHash_Name(), rInStm ) )
     {
         if( !SetName( aName, &rBase ) )
@@ -296,7 +296,7 @@ void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 void SvMetaName::DoReadContextSvIdl( SvIdlDataBase & rBase,
                                    SvTokenStream & rInStm, char cDel )
 {
-    UINT32 nBeginPos = 0; // kann mit Tell nicht vorkommen
+    sal_uInt32 nBeginPos = 0; // kann mit Tell nicht vorkommen
     while( nBeginPos != rInStm.Tell() )
     {
         nBeginPos = rInStm.Tell();
@@ -322,9 +322,9 @@ void SvMetaName::ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
+sal_Bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
 {
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -332,7 +332,7 @@ BOOL SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
 |*
 |*    Beschreibung
 *************************************************************************/
-void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, USHORT )
+void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 )
 {
 }
 
@@ -346,7 +346,7 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
     rOutStm << "<DESCRIPTION>" << endl;
 
     ByteString aDesc( GetDescription() );
-    USHORT nPos = aDesc.Search( '\n' );
+    sal_uInt16 nPos = aDesc.Search( '\n' );
     while ( nPos != STRING_NOTFOUND )
     {
         rOutStm << aDesc.Copy( 0, nPos ).GetBuffer() << endl;
@@ -364,7 +364,7 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
 *************************************************************************/
 void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                                        SvStream & rOutStm,
-                                       USHORT nTab )
+                                       sal_uInt16 nTab )
 {
     if( aHelpContext.IsSet() || aHelpText.IsSet() || aConfigName.IsSet() )
     {
@@ -396,13 +396,13 @@ void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
-    BOOL bOk = TRUE;
+    sal_uInt32 nTokPos = rInStm.Tell();
+    sal_Bool bOk = sal_True;
     if( rInStm.Read( '[' ) )
     {
-        UINT32 nBeginPos = 0; // kann mit Tell nicht vorkommen
+        sal_uInt32 nBeginPos = 0; // kann mit Tell nicht vorkommen
         while( nBeginPos != rInStm.Tell() )
         {
             nBeginPos = rInStm.Tell();
@@ -432,12 +432,12 @@ BOOL SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 |*    Beschreibung
 *************************************************************************/
 void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                             USHORT nTab )
+                             sal_uInt16 nTab )
 {
-    ULONG nBeginPos = rOutStm.Tell();
+    sal_uLong nBeginPos = rOutStm.Tell();
     WriteTab( rOutStm, nTab );
     rOutStm << '[' << endl;
-    ULONG nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     WriteAttributesSvIdl( rBase, rOutStm, nTab +1 );
 
     // keine leeren Klammern schreiben
@@ -474,25 +474,25 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                           USHORT nTab,
+                           sal_uInt16 nTab,
                          WriteType nT, WriteAttribute nA )
 {
-    ULONG nBeginPos = rOutStm.Tell();
+    sal_uLong nBeginPos = rOutStm.Tell();
     WriteTab( rOutStm, nTab );
     rOutStm << '[' << endl;
-    ULONG nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     WriteAttributes( rBase, rOutStm, nTab +1, nT, nA );
 
     // keine leeren Klammern schreiben
-    ULONG nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.Seek( nOldPos );
-    BOOL bOnlySpace = TRUE;
+    sal_Bool bOnlySpace = sal_True;
     while( bOnlySpace && rOutStm.Tell() < nPos )
     {
         char c;
         rOutStm >> c;
         if( !isspace( c ) )
-            bOnlySpace = FALSE;
+            bOnlySpace = sal_False;
     }
     if( bOnlySpace )
         // nichts geschrieben
@@ -511,7 +511,7 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
-                                USHORT nTab,
+                                sal_uInt16 nTab,
                                  WriteType, WriteAttribute )
 {
     if( GetHelpText().IsSet() || GetHelpContext().IsSet() )
@@ -540,7 +540,7 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaName::WriteContext( SvIdlDataBase &, SvStream &,
-                                USHORT,
+                                sal_uInt16,
                                  WriteType, WriteAttribute )
 {
 }
@@ -562,7 +562,7 @@ void SvMetaReference::Load( SvPersistStream & rStm )
 {
     SvMetaName::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x2 )
     {
@@ -583,7 +583,7 @@ void SvMetaReference::Save( SvPersistStream & rStm )
     SvMetaName::Save( rStm );
 
     // Maske erstellen
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aRef.Is() )
         nMask |= 0x01;
 
@@ -603,8 +603,8 @@ SV_IMPL_META_FACTORY1( SvMetaExtern, SvMetaReference );
 *************************************************************************/
 SvMetaExtern::SvMetaExtern()
     : pModule( NULL )
-    , bReadUUId( FALSE )
-    , bReadVersion( FALSE )
+    , bReadUUId( sal_False )
+    , bReadVersion( sal_False )
 {
 }
 
@@ -612,7 +612,7 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
 {
     SvMetaReference::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x20 )
     {
@@ -623,8 +623,8 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
     if( nMask & 0x01 ) rStm >> pModule;
     if( nMask & 0x02 ) rStm >> aUUId;
     if( nMask & 0x04 ) rStm >> aVersion;
-    if( nMask & 0x08 ) bReadUUId = TRUE;
-    if( nMask & 0x10 ) bReadVersion = TRUE;
+    if( nMask & 0x08 ) bReadUUId = sal_True;
+    if( nMask & 0x10 ) bReadVersion = sal_True;
 }
 
 void SvMetaExtern::Save( SvPersistStream & rStm )
@@ -632,7 +632,7 @@ void SvMetaExtern::Save( SvPersistStream & rStm )
     SvMetaReference::Save( rStm );
 
     // Maske erstellen
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( pModule )                   nMask |= 0x01;
     if( aUUId != SvGlobalName() )   nMask |= 0x02;
     if( aVersion != SvVersion() )   nMask |= 0x04;
@@ -692,9 +692,9 @@ void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 {
     SvMetaReference::ReadAttributesSvIdl( rBase, rInStm );
     if( aUUId.ReadSvIdl( rBase, rInStm ) )
-        bReadUUId = TRUE;
+        bReadUUId = sal_True;
     if( aVersion.ReadSvIdl( rInStm ) )
-        bReadVersion = TRUE;
+        bReadVersion = sal_True;
 }
 
 /*************************************************************************
@@ -703,7 +703,7 @@ void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                         SvStream & rOutStm, USHORT nTab )
+                                         SvStream & rOutStm, sal_uInt16 nTab )
 {
     SvMetaReference::WriteAttributesSvIdl( rBase, rOutStm, nTab );
     if( bReadUUId || bReadVersion )
@@ -731,7 +731,7 @@ void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
     SetModule( rBase );
     GetUUId(); // Id wird angelegt
@@ -744,7 +744,7 @@ BOOL SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 |*    Beschreibung
 *************************************************************************/
 void SvMetaExtern::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                               USHORT nTab )
+                               sal_uInt16 nTab )
 {
     SvMetaReference::WriteSvIdl( rBase, rOutStm, nTab );
 }
@@ -755,7 +755,7 @@ void SvMetaExtern::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaExtern::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                        USHORT nTab,
+                        sal_uInt16 nTab,
                          WriteType nT, WriteAttribute nA )
 {
     SvMetaReference::Write( rBase, rOutStm, nTab, nT, nA );
@@ -767,7 +767,7 @@ void SvMetaExtern::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                     USHORT nTab,
+                                     sal_uInt16 nTab,
                                      WriteType nT, WriteAttribute nA )
 {
     SvMetaReference::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index ac046dfdaa8a..19df1c0967b2 100644..100755
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -40,34 +40,34 @@
 
 #ifdef IDL_COMPILER
 /************************************************************************/
-static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
-                            ULONG nMin, ULONG nMax, ULONG* pValue )
+static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
+                            sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = FALSE;
+        sal_Bool bOk = sal_False;
         if( rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken_Next();
             if( pTok->IsInteger() )
             {
-                ULONG n = pTok->GetNumber();
+                sal_uLong n = pTok->GetNumber();
                 if ( n >= nMin && n <= nMax )
                 {
                     *pValue = n;
-                    bOk = TRUE;
+                    bOk = sal_True;
                 }
             }
         }
 
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
 
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 #endif
 
@@ -81,12 +81,12 @@ static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-UINT32 SvUINT32::Read( SvStream & rStm )
+sal_uInt32 SvUINT32::Read( SvStream & rStm )
 {
     return SvPersistStream::ReadCompressed( rStm );
 }
 
-void SvUINT32::Write( SvStream & rStm, UINT32 nVal )
+void SvUINT32::Write( SvStream & rStm, sal_uInt32 nVal )
 {
     SvPersistStream::WriteCompressed( rStm, nVal );
 }
@@ -103,7 +103,7 @@ void SvUINT32::Write( SvStream & rStm, UINT32 nVal )
 *************************************************************************/
 SvStream& operator << (SvStream & rStm, const SvBOOL & rb )
 {
-    BYTE n = rb.nVal;
+    sal_uInt8 n = rb.nVal;
     if( rb.bSet )
         n |= 0x02;
     rStm << n;
@@ -111,10 +111,10 @@ SvStream& operator << (SvStream & rStm, const SvBOOL & rb )
 }
 SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
 {
-    BYTE n;
+    sal_uInt8 n;
     rStm >> n;
-    rb.nVal = (n & 0x01) ? TRUE : FALSE;
-    rb.bSet = (n & 0x02) ? TRUE : FALSE;
+    rb.nVal = (n & 0x01) ? sal_True : sal_False;
+    rb.bSet = (n & 0x02) ? sal_True : sal_False;
     if( n & ~0x03 )
     {
         rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
@@ -143,11 +143,11 @@ SvStream& operator << (SvStream & rStm, const SvVersion & r )
 
         int n = r.GetMajorVersion() << 4;
         n |= r.GetMinorVersion();
-        rStm << (BYTE)n;
+        rStm << (sal_uInt8)n;
     }
     else
     {
-        rStm << (BYTE)0;
+        rStm << (sal_uInt8)0;
         rStm << r.GetMajorVersion();
         rStm << r.GetMinorVersion();
     }
@@ -156,7 +156,7 @@ SvStream& operator << (SvStream & rStm, const SvVersion & r )
 
 SvStream& operator >> (SvStream & rStm, SvVersion & r )
 {
-    BYTE n;
+    sal_uInt8 n;
     rStm >> n;
     if( n == 0 )
     { // nicht komprimiert
@@ -184,15 +184,15 @@ SvStream& operator >> (SvStream & rStm, SvVersion & r )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
+        sal_Bool bOk = sal_True;
+        sal_Bool bBraket = rInStm.Read( '(' );
         if( bBraket || rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken();
@@ -206,12 +206,12 @@ BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
                 bOk = rInStm.Read( ')' );
         }
         else
-            *this = TRUE; //Defaultaktion ist auf TRUE setzen
+            *this = sal_True; //Defaultaktion ist auf sal_True setzen
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -221,13 +221,13 @@ BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
+sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
 {
     if( nVal )
         rOutStm << pName->GetName().GetBuffer();
     else
         rOutStm << pName->GetName().GetBuffer() << "(FALSE)";
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -258,15 +258,15 @@ ByteString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
+        sal_Bool bOk = sal_True;
+        sal_Bool bBraket = rInStm.Read( '(' );
         if( bBraket || rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken();
@@ -279,10 +279,10 @@ BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
                 bOk = rInStm.Read( ')' );
         }
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -292,13 +292,13 @@ BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
+sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
                                SvStream & rOutStm,
-                               USHORT /*nTab */ )
+                               sal_uInt16 /*nTab */ )
 {
     rOutStm << pName->GetName().GetBuffer() << '(';
     rOutStm << GetBuffer() << ')';
-    return TRUE;
+    return sal_True;
 }
 
 SvStream& operator << (SvStream & rStm, const SvIdentifier & r )
@@ -322,17 +322,17 @@ SvStream& operator >> (SvStream & rStm, SvIdentifier & r )
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
                                     SvStringHashEntry * pName,
                                     SvTokenStream & rInStm )
 {
     if( SvIdentifier::ReadSvIdl( pName, rInStm ) )
     {
-        ULONG n;
+        sal_uLong n;
         if( rBase.FindId( *this, &n ) )
         {
             nValue = n;
-            return TRUE;
+            return sal_True;
         }
         else
         {
@@ -343,7 +343,7 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
             rBase.WriteError( rInStm );
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -353,20 +353,20 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
                                     SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->IsIdentifier() )
     {
-        ULONG n;
+        sal_uLong n;
         if( rBase.FindId( pTok->GetString(), &n ) )
         {
             *(ByteString *)this = pTok->GetString();
             nValue = n;
-            return TRUE;
+            return sal_True;
         }
         else
         {
@@ -378,7 +378,7 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
         }
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -416,15 +416,15 @@ SvStream& operator >> (SvStream & rStm, SvNumberIdentifier & r )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
+        sal_Bool bOk = sal_True;
+        sal_Bool bBraket = rInStm.Read( '(' );
         if( bBraket || rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken();
@@ -437,10 +437,10 @@ BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
                 bOk = rInStm.Read( ')' );
         }
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -452,12 +452,12 @@ BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
-                           USHORT /*nTab */ )
+sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+                           sal_uInt16 /*nTab */ )
 {
     rOutStm << pName->GetName().GetBuffer() << "(\"";
     rOutStm << GetBuffer() << "\")";
-    return TRUE;
+    return sal_True;
 }
 
 SvStream& operator << (SvStream & rStm, const SvString & r )
@@ -482,7 +482,7 @@ SvStream& operator >> (SvStream & rStm, SvString & r )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
+sal_Bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
 {
     return SvString::ReadSvIdl( SvHash_HelpText(), rInStm );
 }
@@ -496,7 +496,7 @@ BOOL SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT nTab )
+sal_Bool SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab )
 {
     return SvString::WriteSvIdl( SvHash_HelpText(), rOutStm, nTab );
 }
@@ -511,15 +511,15 @@ BOOL SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT nTab )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
+sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( SvHash_uuid() ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
+        sal_Bool bOk = sal_True;
+        sal_Bool bBraket = rInStm.Read( '(' );
         if( bBraket || rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken();
@@ -532,10 +532,10 @@ BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
                 bOk = rInStm.Read( ')' );
         }
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -547,12 +547,12 @@ BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvUUId::WriteSvIdl( SvStream & rOutStm )
+sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
 {
     // Global Id schreiben
     rOutStm << SvHash_uuid()->GetName().GetBuffer() << "(\"";
     rOutStm << ByteString( GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << "\")";
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -566,28 +566,28 @@ BOOL SvUUId::WriteSvIdl( SvStream & rOutStm )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm )
+sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
 {
-    ULONG n = 0;
+    sal_uLong n = 0;
 
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) )
     {
-        nMajorVersion = (USHORT)n;
+        nMajorVersion = (sal_uInt16)n;
         if( rInStm.Read( '.' ) )
         {
             SvToken * pTok = rInStm.GetToken_Next();
             if( pTok->IsInteger() && pTok->GetNumber() <= 0xFFFF )
             {
-                nMinorVersion = (USHORT)pTok->GetNumber();
-                return TRUE;
+                nMinorVersion = (sal_uInt16)pTok->GetNumber();
+                return sal_True;
             }
         }
         else
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -599,12 +599,12 @@ BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvVersion::WriteSvIdl( SvStream & rOutStm )
+sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm )
 {
     rOutStm << SvHash_Version()->GetName().GetBuffer() << '('
             << ByteString::CreateFromInt32( nMajorVersion ).GetBuffer() << '.'
             << ByteString::CreateFromInt32( nMinorVersion ).GetBuffer() << ')';
-    return TRUE;
+    return sal_True;
 }
 #endif //IDL_COMPILER
 
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 3fb97326dd97..f8d68dabbbf6 100644..100755
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -52,16 +52,16 @@ SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern );
 *************************************************************************/
 SvMetaModule::SvMetaModule()
 #ifdef IDL_COMPILER
-    : bImported( FALSE )
-    , bIsModified( FALSE )
+    : bImported( sal_False )
+    , bIsModified( sal_False )
 #endif
 {
 }
 
 #ifdef IDL_COMPILER
-SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp )
+SvMetaModule::SvMetaModule( const String & rIdlFileName, sal_Bool bImp )
     : aIdlFileName( rIdlFileName )
-    , bImported( bImp ), bIsModified( FALSE )
+    , bImported( bImp ), bIsModified( sal_False )
 {
 }
 #endif
@@ -78,10 +78,10 @@ SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp )
 #define MODULE_VER      0x0001
 void SvMetaModule::Load( SvPersistStream & rStm )
 {
-    bImported = TRUE; // immer importiert
+    bImported = sal_True; // immer importiert
     SvMetaExtern::Load( rStm );
 
-    USHORT nVer;
+    sal_uInt16 nVer;
 
     rStm >> nVer; // Version
     DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" );
@@ -96,7 +96,7 @@ void SvMetaModule::Load( SvPersistStream & rStm )
     rStm.ReadByteString( aModulePrefix );
 
     // Compiler Daten lesen
-    USHORT nCmpLen;
+    sal_uInt16 nCmpLen;
     rStm >> nCmpLen;
 #ifdef IDL_COMPILER
     DBG_ASSERT( (nVer & IDL_WRITE_MASK) == IDL_WRITE_COMPILER,
@@ -122,7 +122,7 @@ void SvMetaModule::Save( SvPersistStream & rStm )
 {
     SvMetaExtern::Save( rStm );
 
-    rStm << (USHORT)(MODULE_VER | IDL_WRITE_COMPILER); // Version
+    rStm << (sal_uInt16)(MODULE_VER | IDL_WRITE_COMPILER); // Version
 
     rStm << aClassList;
     rStm << aTypeList;
@@ -134,17 +134,17 @@ void SvMetaModule::Save( SvPersistStream & rStm )
     rStm.WriteByteString( aModulePrefix );
 
     // Compiler Daten schreiben
-    USHORT nCmpLen = 0;
-    ULONG nLenPos = rStm.Tell();
+    sal_uInt16 nCmpLen = 0;
+    sal_uLong nLenPos = rStm.Tell();
     rStm << nCmpLen;
 #ifdef IDL_COMPILER
     rStm << aBeginName;
     rStm << aEndName;
     rStm << aNextName;
     // Laenge der Compiler Daten schreiben
-    ULONG nPos = rStm.Tell();
+    sal_uLong nPos = rStm.Tell();
     rStm.Seek( nLenPos );
-    rStm << (USHORT)( nPos - nLenPos - sizeof( USHORT ) );
+    rStm << (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) );
     rStm.Seek( nPos );
 #endif
 }
@@ -158,12 +158,12 @@ void SvMetaModule::Save( SvPersistStream & rStm )
 |*    Letzte Aenderung  MM 12.12.94
 |*
 *************************************************************************/
-BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
 {
     if( pBase )
     {
         if( pBase->GetModule( rName ) )
-            return FALSE;
+            return sal_False;
     }
     return SvMetaExtern::SetName( rName );
 }
@@ -174,17 +174,17 @@ BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaModule::FillNextName( SvGlobalName * pName )
+sal_Bool SvMetaModule::FillNextName( SvGlobalName * pName )
 {
     *pName = aNextName;
 
     if( aNextName < aEndName )
     {
         ++aNextName;
-        bIsModified = TRUE;
-        return TRUE;
+        bIsModified = sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -200,7 +200,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     aHelpFileName.ReadSvIdl( SvHash_HelpFile(), rInStm );
     if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) )
     {
-        UINT32 nTokPos = rInStm.Tell();
+        sal_uInt32 nTokPos = rInStm.Tell();
         if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.GetBuffer() ) ) )
         {
             ByteString aStr = "cannot read file: ";
@@ -222,7 +222,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 *************************************************************************/
 void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                                          SvStream & rOutStm,
-                                         USHORT nTab )
+                                         sal_uInt16 nTab )
 {
     SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
     if( aTypeLibFile.Len() || aSlotIdFile.Len() || aTypeLibFile.Len() )
@@ -256,7 +256,7 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
                                      SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     if( rInStm.GetToken()->Is( SvHash_interface() )
       || rInStm.GetToken()->Is( SvHash_shell() ) )
     {
@@ -296,7 +296,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
     }
     else if( rInStm.GetToken()->Is( SvHash_include() ) )
     {
-        BOOL bOk = FALSE;
+        sal_Bool bOk = sal_False;
         rInStm.GetToken_Next();
         SvToken * pTok = rInStm.GetToken_Next();
         if( pTok->IsString() )
@@ -313,7 +313,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
                     // Fehler zuruecksetzen
                     rBase.SetError( SvIdlError() );
 
-                    UINT32 nBeginPos = 0xFFFFFFFF; // kann mit Tell nicht vorkommen
+                    sal_uInt32 nBeginPos = 0xFFFFFFFF; // kann mit Tell nicht vorkommen
                     while( nBeginPos != aTokStm.Tell() )
                     {
                         nBeginPos = aTokStm.Tell();
@@ -369,10 +369,10 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
 *************************************************************************/
 void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
                                       SvStream & rOutStm,
-                                      USHORT nTab )
+                                      sal_uInt16 nTab )
 {
     SvMetaExtern::WriteContextSvIdl( rBase, rOutStm, nTab );
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < aTypeList.Count(); n++ )
     {
         WriteTab( rOutStm, nTab );
@@ -399,13 +399,13 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    bIsModified = TRUE; // bisher immer wenn Compiler laueft
+    bIsModified = sal_True; // bisher immer wenn Compiler laueft
 
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok  = rInStm.GetToken_Next();
-    BOOL bOk        = FALSE;
+    sal_Bool bOk        = sal_False;
     bOk = pTok->Is( SvHash_module() );
     if( bOk )
     {
@@ -448,7 +448,7 @@ BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 |*
 *************************************************************************/
 void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                               USHORT nTab )
+                               sal_uInt16 nTab )
 {
     rOutStm << SvHash_module()->GetName().GetBuffer() << endl
             << '\"';
@@ -464,7 +464,7 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 *************************************************************************/
 void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteSfx( rBase, rOutStm );
@@ -474,7 +474,7 @@ void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
                             Table* pTable )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteHelpIds( rBase, rOutStm, pTable );
@@ -486,7 +486,7 @@ void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
 *************************************************************************/
 void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
                                     SvStream & rOutStm,
-                                     USHORT nTab,
+                                     sal_uInt16 nTab,
                                      WriteType nT, WriteAttribute nA )
 {
     SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
@@ -506,7 +506,7 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
 void SvMetaModule::WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm,
                                 SvNamePosList & rList )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         if( !pClass->IsShell() && pClass->GetAutomation() )
@@ -525,7 +525,7 @@ void SvMetaModule::WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    SvMetaModule::Write()
 *************************************************************************/
 void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                              USHORT nTab,
+                              sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     switch ( nT )
@@ -547,19 +547,19 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         rOutStm << "importlib(\"STDOLE.TLB\");" << endl;
 
     /*
-        for( ULONG n = 0; n < aTypeList.Count(); n++ )
+        for( sal_uLong n = 0; n < aTypeList.Count(); n++ )
         {
             SvMetaType * pType = aTypeList.GetObject( n );
             if( !pType ->Write( rBase, rOutStm, nTab +1, nT, nA ) )
-                return FALSE;
+                return sal_False;
         }
     */
         /*
-        for( ULONG n = 0; n < rBase.GetModuleList().Count(); n++ )
+        for( sal_uLong n = 0; n < rBase.GetModuleList().Count(); n++ )
         {
             SvMetaModule * pModule = rBase.GetModuleList().GetObject( n );
             const SvMetaTypeMemberList &rTypeList = pModule->GetTypeList();
-            for( ULONG n = 0; n < rTypeList.Count(); n++ )
+            for( sal_uLong n = 0; n < rTypeList.Count(); n++ )
             {
                 SvMetaType * pType = rTypeList.GetObject( n );
                 pType->Write( rBase, rOutStm, nTab +1, nT, nA );
@@ -567,7 +567,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         }
         */
 
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() && pClass->GetAutomation() )
@@ -591,7 +591,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         rOutStm << "</MODULE>" << endl << endl;
 
         rOutStm << "<CLASSES>" << endl;
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() )
@@ -607,7 +607,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                 {
                     rOutStm << " ( ";
 
-                    for( ULONG m=0; m<rClassList.Count(); m++ )
+                    for( sal_uLong m=0; m<rClassList.Count(); m++ )
                     {
                         SvClassElement *pEle = rClassList.GetObject(m);
                         SvMetaClass *pCl = pEle->GetClass();
@@ -629,7 +629,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
     case WRITE_C_SOURCE:
     case WRITE_C_HEADER:
     {
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() /* && pClass->GetAutomation() */ )
@@ -652,7 +652,7 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 //  rOutStm << "#pragma CHARSET IBMPC" << endl;
     if( aSlotIdFile.Len() )
         rOutStm << "//#include <" << aSlotIdFile.GetBuffer() << '>' << endl;
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable );
     }
@@ -662,9 +662,9 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    SvMetaModule::WriteHxx()
 *************************************************************************/
 void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
-                             USHORT nTab )
+                             sal_uInt16 nTab )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteHxx( rBase, rOutStm, nTab );
@@ -675,9 +675,9 @@ void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    SvMetaModule::WriteCxx()
 *************************************************************************/
 void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm,
-                             USHORT nTab )
+                             sal_uInt16 nTab )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteCxx( rBase, rOutStm, nTab );
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index c6af0e0bb785..e9bddda61f9a 100644..100755
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -57,7 +57,7 @@ SvClassElement::SvClassElement()
 *************************************************************************/
 void SvClassElement::Load( SvPersistStream & rStm )
 {
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x08 )
     {
@@ -83,7 +83,7 @@ void SvClassElement::Load( SvPersistStream & rStm )
 void SvClassElement::Save( SvPersistStream & rStm )
 {
     // Maske erstellen
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aAutomation.IsSet() )       nMask |= 0x1;
     if( aPrefix.Len() )             nMask |= 0x2;
     if( xClass.Is() )               nMask |= 0x4;
@@ -103,7 +103,7 @@ SV_IMPL_META_FACTORY1( SvMetaClass, SvMetaType );
 |*    Beschreibung
 *************************************************************************/
 SvMetaClass::SvMetaClass()
-    : aAutomation( TRUE, FALSE )
+    : aAutomation( sal_True, sal_False )
 {
 }
 
@@ -116,7 +116,7 @@ void SvMetaClass::Load( SvPersistStream & rStm )
 {
     SvMetaType::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x20 )
     {
@@ -151,7 +151,7 @@ void SvMetaClass::Save( SvPersistStream & rStm )
     SvMetaType::Save( rStm );
 
     // Maske erstellen
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aAttrList.Count() )         nMask |= 0x1;
     if( aSuperClass.Is() )          nMask |= 0x2;
     if( aClassList.Count() )        nMask |= 0x4;
@@ -176,10 +176,10 @@ void SvMetaClass::Save( SvPersistStream & rStm )
 void SvMetaClass::FillSbxMemberObject( SvIdlDataBase & rBase,
                                         SbxObject * pObj,
                                         StringList & rSuperList,
-                                        BOOL bVariable )
+                                        sal_Bool bVariable )
 {
     // alle Attribute der Klasse schreiben
-    ULONG n ;
+    sal_uLong n ;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -223,8 +223,8 @@ void SvMetaClass::FillSbxMemberObject( SvIdlDataBase & rBase,
 void SvMetaClass::FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj )
 {
     StringList aSuperList;
-    FillSbxMemberObject( rBase, pObj, aSuperList, TRUE );
-    FillSbxMemberObject( rBase, pObj, aSuperList, FALSE );
+    FillSbxMemberObject( rBase, pObj, aSuperList, sal_True );
+    FillSbxMemberObject( rBase, pObj, aSuperList, sal_False );
 
     ByteString * pStr = aSuperList.First();
     while( pStr )
@@ -253,7 +253,7 @@ void SvMetaClass::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaClass::WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                 SvStream & rOutStm, USHORT nTab )
+                                 SvStream & rOutStm, sal_uInt16 nTab )
 {
     SvMetaType::WriteAttributesSvIdl( rBase, rOutStm, nTab );
 
@@ -278,7 +278,7 @@ void SvMetaClass::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
                                     SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( SvHash_import() ) )
@@ -305,7 +305,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
                             rBase.WriteError( rInStm );
                         }
                         xAutomationInterface = pClass;
-                        xEle->SetAutomation( TRUE );
+                        xEle->SetAutomation( sal_True );
                     }
                     else
                     {
@@ -342,7 +342,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
         rInStm.Seek( nTokPos );
         SvMetaType * pType = rBase.ReadKnownType( rInStm );
 
-        BOOL bOk = FALSE;
+        sal_Bool bOk = sal_False;
         SvMetaAttributeRef xAttr;
         if( !pType || pType->IsItem() )
         {
@@ -383,11 +383,11 @@ void SvMetaClass::WriteContextSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     //SvMetaType::WriteContextSvIdl( rBase, rOutStm, nTab );
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         WriteTab( rOutStm, nTab );
@@ -414,12 +414,12 @@ void SvMetaClass::WriteContextSvIdl
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    ULONG nTokPos = rInStm.Tell();
+    sal_uLong nTokPos = rInStm.Tell();
     if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_CLASS )
     {
-        BOOL bOk = TRUE;
+        sal_Bool bOk = sal_True;
         if( rInStm.Read( ':' ) )
         {
             aSuperClass = rBase.ReadKnownClass( rInStm );
@@ -441,7 +441,7 @@ BOOL SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
             return bOk;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -449,7 +449,7 @@ BOOL SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                                  SvMetaAttribute & rAttr ) const
 {
     if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) )
@@ -458,7 +458,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
         DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
     }
 
-    for( ULONG n = 0; n < aAttrList.Count(); n++ )
+    for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pS = aAttrList.GetObject( n );
         if( pS->GetName() == rAttr.GetName() )
@@ -476,13 +476,13 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                 aStr += " with different id's";
                 rBase.SetError( aStr, rInStm.GetToken() );
                 rBase.WriteError( rInStm );
-                return FALSE;
+                return sal_False;
              }
         }
         else
         {
-            UINT32 nId1 = pS->GetSlotId().GetValue();
-            UINT32 nId2 = rAttr.GetSlotId().GetValue();
+            sal_uInt32 nId1 = pS->GetSlotId().GetValue();
+            sal_uInt32 nId2 = rAttr.GetSlotId().GetValue();
             if( nId1 == nId2 && nId1 != 0 /*&& nId2 != 0 ist ueberfluessig*/ )
             {
                 DBG_ERROR( "Gleiche Id in MetaClass : " );
@@ -497,14 +497,14 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                 aStr += " with equal id's";
                 rBase.SetError( aStr, rInStm.GetToken() );
                 rBase.WriteError( rInStm );
-                return FALSE;
+                return sal_False;
              }
         }
     }
     SvMetaClass * pSC = aSuperClass;
     if( pSC )
         return pSC->TestAttribute( rBase, rInStm, rAttr );
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -513,7 +513,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                              USHORT nTab )
+                              sal_uInt16 nTab )
 {
     WriteHeaderSvIdl( rBase, rOutStm, nTab );
     if( aSuperClass.Is() )
@@ -530,12 +530,12 @@ void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 *************************************************************************/
 /*
 void SvMetaClass::WriteOdlMembers( ByteStringList & rSuperList,
-                                    BOOL bVariable, BOOL bWriteTab,
+                                    sal_Bool bVariable, sal_Bool bWriteTab,
                                        SvIdlDataBase & rBase,
-                                       SvStream & rOutStm, USHORT nTab )
+                                       SvStream & rOutStm, sal_uInt16 nTab )
 {
     // alle Attribute schreiben
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -586,7 +586,7 @@ void SvMetaClass::WriteOdlMembers( ByteStringList & rSuperList,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                        USHORT nTab,
+                        sal_uInt16 nTab,
                          WriteType nT, WriteAttribute )
 {
     rBase.aIFaceName = GetName();
@@ -609,13 +609,13 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             rOutStm << endl;
 
             StringList aSuperList;
-            WriteOdlMembers( aSuperList, TRUE, TRUE, rBase, rOutStm, nTab );
+            WriteOdlMembers( aSuperList, sal_True, sal_True, rBase, rOutStm, nTab );
 
             WriteTab( rOutStm, nTab );
             rOutStm << "methods:";
             rOutStm << endl;
 
-            WriteOdlMembers( aSuperList, FALSE, TRUE, rBase, rOutStm, nTab );
+            WriteOdlMembers( aSuperList, sal_False, sal_True, rBase, rOutStm, nTab );
 
             ByteString * pStr = aSuperList.First();
             while( pStr )
@@ -655,7 +655,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             rOutStm << "</INTERFACE>" << endl << endl;
 
             // alle Attribute schreiben
-            ULONG n;
+            sal_uLong n;
             for( n = 0; n < aAttrList.Count(); n++ )
             {
                 SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -681,12 +681,12 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*
 |*    Beschreibung
 *************************************************************************/
-USHORT SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
+sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
                                         SvSlotElementList & rSlotList,
                                         SvStream & rOutStm )
 {
-    USHORT nCount = 0;
-    for( ULONG n = 0; n < rSlotList.Count(); n++ )
+    sal_uInt16 nCount = 0;
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = rSlotList.GetObject( n );
         SvMetaSlot *pAttr = pEle->xSlot;
@@ -701,13 +701,13 @@ USHORT SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-USHORT SvMetaClass::WriteSlots( const ByteString & rShellName,
-                                USHORT nCount, SvSlotElementList & rSlotList,
+sal_uInt16 SvMetaClass::WriteSlots( const ByteString & rShellName,
+                                sal_uInt16 nCount, SvSlotElementList & rSlotList,
                                 SvIdlDataBase & rBase,
                                 SvStream & rOutStm )
 {
-    USHORT nSCount = 0;
-    for( ULONG n = 0; n < rSlotList.Count(); n++ )
+    sal_uInt16 nSCount = 0;
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         rSlotList.Seek(n);
         SvSlotElement * pEle = rSlotList.GetCurObject();
@@ -736,13 +736,13 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
     rClassList.Insert(this, LIST_APPEND);
 
     // alle direkten Attribute schreiben
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
 
-        ULONG nId = pAttr->GetSlotId().GetValue();
-        USHORT nPos;
+        sal_uLong nId = pAttr->GetSlotId().GetValue();
+        sal_uInt16 nPos;
         for ( nPos=0; nPos < rSuperList.Count(); nPos++ )
         {
             if ( rSuperList.GetObject(nPos) == nId )
@@ -800,7 +800,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
         rList.Insert(this, LIST_APPEND);
 
         // Meine Imports
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvClassElement * pEle = aClassList.GetObject( n );
             SvMetaClass * pCl = pEle->GetClass();
@@ -825,7 +825,7 @@ void SvMetaClass::WriteSlotStubs( const ByteString & rShellName,
                                 SvStream & rOutStm )
 {
     // alle Attribute schreiben
-    for( ULONG n = 0; n < rSlotList.Count(); n++ )
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = rSlotList.GetObject( n );
         SvMetaSlot *pAttr = pEle->xSlot;
@@ -876,7 +876,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
     SvMetaClassList classList;
     SvSlotElementList aSlotList;
     InsertSlots(aSlotList, aSuperList, classList, ByteString(), rBase);
-    ULONG n;
+    sal_uLong n;
     for ( n=0; n<aSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = aSlotList.GetObject( n );
@@ -884,10 +884,10 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
         pSlot->SetListPos(n);
     }
 
-    ULONG nSlotCount = aSlotList.Count();
+    sal_uLong nSlotCount = aSlotList.Count();
 
     // alle Attribute schreiben
-    USHORT nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm );
+    sal_uInt16 nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm );
     if( nArgCount )
         Back2Delemitter( rOutStm );
     else
@@ -944,7 +944,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
                             Table* pTable )
 {
-    for( ULONG n=0; n<aAttrList.Count(); n++ )
+    for( sal_uLong n=0; n<aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
         pAttr->WriteHelpId( rBase, rOutStm, pTable );
@@ -957,7 +957,7 @@ void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
 void SvMetaClass::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
                              Table * pTable )
 {
-    for( ULONG n=0; n<aAttrList.Count(); n++ )
+    for( sal_uLong n=0; n<aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
         pAttr->WriteSrc( rBase, rOutStm, pTable );
@@ -969,7 +969,7 @@ void SvMetaClass::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*
 |*    Beschreibung
 *************************************************************************/
-void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
 {
     ByteString aSuperName( "SvDispatch" );
     if( GetSuperClass() )
@@ -982,11 +982,11 @@ void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
     << '{' << endl
     << "protected:" << endl
     << "\tvirtual SvGlobalName  GetTypeName() const;" << endl
-    << "\tvirtual BOOL          FillTypeLibInfo( SvGlobalName *, USHORT * pMajor," << endl
-    << "\t                                       USHORT * pMinor ) const;" << endl
-    << "\tvirtual BOOL          FillTypeLibInfo( ByteString * pName, USHORT * pMajor," << endl;
+    << "\tvirtual sal_Bool          FillTypeLibInfo( SvGlobalName *, sal_uInt16 * pMajor," << endl
+    << "\t                                       sal_uInt16 * pMinor ) const;" << endl
+    << "\tvirtual sal_Bool          FillTypeLibInfo( ByteString * pName, sal_uInt16 * pMajor," << endl;
     rOutStm
-    << "\t                                       USHORT * pMinor ) const;" << endl
+    << "\t                                       sal_uInt16 * pMinor ) const;" << endl
     << "\tvirtual void          Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) = 0;" << endl
     << "public:" << endl
     << "\t static SvGlobalName  ClassName()" << endl
@@ -999,7 +999,7 @@ void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
 |*
 |*    Beschreibung
 *************************************************************************/
-void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
 {
     ByteString aSuperName( "SvDispatch" );
     if( GetSuperClass() )
@@ -1015,26 +1015,26 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
 
     SvMetaModule * pMod = GetModule();
     // FillTypeLibInfo
-    rOutStm << "BOOL " << name.GetBuffer() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
-    << "\t                               USHORT * pMajor," << endl
-    << "\t                               USHORT * pMinor ) const" << endl
+    rOutStm << "sal_Bool " << name.GetBuffer() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
+    << "\t                               sal_uInt16 * pMajor," << endl
+    << "\t                               sal_uInt16 * pMinor ) const" << endl
     << '{' << endl
     << "\tSvGlobalName aN( " << ByteString( pMod->GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << " );" << endl;
     rOutStm << "\t*pGN = aN;" << endl
     << "\t*pMajor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMajorVersion()).GetBuffer() << ';' << endl
     << "\t*pMinor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMinorVersion()).GetBuffer() << ';' << endl
-    << "\treturn TRUE;" << endl
+    << "\treturn sal_True;" << endl
     << '}' << endl;
 
     // FillTypeLibInfo
-    rOutStm << "BOOL " << name.GetBuffer() << "::FillTypeLibInfo( ByteString * pName,"
-    << "\t                               USHORT * pMajor," << endl
-    << "\t                               USHORT * pMinor ) const" << endl;
+    rOutStm << "sal_Bool " << name.GetBuffer() << "::FillTypeLibInfo( ByteString * pName,"
+    << "\t                               sal_uInt16 * pMajor," << endl
+    << "\t                               sal_uInt16 * pMinor ) const" << endl;
     rOutStm << '{' << endl
     << "\t*pName = \"" << pMod->GetTypeLibFileName().GetBuffer()  << "\";" << endl
     << "\t*pMajor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMajorVersion()).GetBuffer() << ';' << endl
     << "\t*pMinor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMinorVersion()).GetBuffer() << ';' << endl
-    << "\treturn TRUE;" << endl
+    << "\treturn sal_True;" << endl
     << '}' << endl;
 
     rOutStm << "void " << name.GetBuffer() << "::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )" << endl
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 7b7039892fde..6c7018959a9d 100644..100755
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -47,14 +47,14 @@ SvMetaObject *SvMetaSlot::MakeClone() const
 /*************************************************************************
 |*    SvMetaSlot::SvMetaSlot()
 |*
-|*    Beschreibung      Zweites FALSE bei den SvBOOL-Objekten bedeutet,
-|*                      IsSet() liefert FALSE (Defaultinitialisierung).
+|*    Beschreibung      Zweites sal_False bei den SvBOOL-Objekten bedeutet,
+|*                      IsSet() liefert sal_False (Defaultinitialisierung).
 *************************************************************************/
 SvMetaSlot::SvMetaSlot()
-    : aCachable( TRUE, FALSE )
-    , aSynchron( TRUE, FALSE )
-    , aRecordPerSet( TRUE, FALSE )
-    , aRecordAbsolute( FALSE, FALSE )
+    : aCachable( sal_True, sal_False )
+    , aSynchron( sal_True, sal_False )
+    , aRecordPerSet( sal_True, sal_False )
+    , aRecordAbsolute( sal_False, sal_False )
     , pLinkedSlot(0)
     , pNextSlot(0)
     , pEnumValue(0)
@@ -63,10 +63,10 @@ SvMetaSlot::SvMetaSlot()
 
 SvMetaSlot::SvMetaSlot( SvMetaType * pType )
     : SvMetaAttribute( pType )
-    , aCachable( TRUE, FALSE )
-    , aSynchron( TRUE, FALSE )
-    , aRecordPerSet( TRUE, FALSE )
-    , aRecordAbsolute( FALSE, FALSE )
+    , aCachable( sal_True, sal_False )
+    , aSynchron( sal_True, sal_False )
+    , aRecordPerSet( sal_True, sal_False )
+    , aRecordAbsolute( sal_False, sal_False )
     , pLinkedSlot(0)
     , pNextSlot(0)
     , pEnumValue(0)
@@ -76,13 +76,13 @@ SvMetaSlot::SvMetaSlot( SvMetaType * pType )
 /*
 #define TEST_READ                                               \
 {                                                               \
-    UINT32  nPos;                                               \
+    sal_uInt32  nPos;                                               \
     rStm >> nPos;                                               \
     DBG_ASSERT( nPos +4 == rStm.Tell(), "stream pos error" );   \
 }
 
 #define TEST_WRITE                                              \
-    rStm << (UINT32)rStm.Tell();
+    rStm << (sal_uInt32)rStm.Tell();
 */
 #define TEST_READ
 #define TEST_WRITE
@@ -91,7 +91,7 @@ void SvMetaSlot::Load( SvPersistStream & rStm )
 {
     SvMetaAttribute::Load( rStm );
 
-    USHORT nMask;
+    sal_uInt16 nMask;
     rStm >> nMask;
 
     TEST_READ
@@ -189,7 +189,7 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
     SvMetaAttribute::Save( rStm );
 
     // Maske erstellen
-    USHORT nMask = 0;
+    sal_uInt16 nMask = 0;
     if( aMethod.Is() )          nMask |= 0x0001;
     if( aGroupId.Len() )        nMask |= 0x0002;
     if( aHasCoreId.IsSet() )    nMask |= 0x0004;
@@ -312,7 +312,7 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaSlot::IsVariable() const
+sal_Bool SvMetaSlot::IsVariable() const
 {
     return SvMetaAttribute::IsVariable();
 }
@@ -322,9 +322,9 @@ BOOL SvMetaSlot::IsVariable() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaSlot::IsMethod() const
+sal_Bool SvMetaSlot::IsMethod() const
 {
-    BOOL b = SvMetaAttribute::IsMethod();
+    sal_Bool b = SvMetaAttribute::IsMethod();
     b |= NULL != GetMethod();
     return b;
 }
@@ -334,7 +334,7 @@ BOOL SvMetaSlot::IsMethod() const
 |*
 |*    Beschreibung
 *************************************************************************/
-ByteString SvMetaSlot::GetMangleName( BOOL bVariable ) const
+ByteString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
 {
     if( !bVariable )
     {
@@ -348,8 +348,8 @@ ByteString SvMetaSlot::GetMangleName( BOOL bVariable ) const
 /*************************************************************************
 |*    Referenz
 |*
-|*    Beschreibung      Zweites FALSE bei den SvBOOL-Objekten bedeutet,
-|*                      IsSet() liefert FALSE (Defaultinitialisierung).
+|*    Beschreibung      Zweites sal_False bei den SvBOOL-Objekten bedeutet,
+|*                      IsSet() liefert sal_False (Defaultinitialisierung).
 *************************************************************************/
 /** Referenz Aufloesung **/
 SvMetaType * SvMetaSlot::GetSlotType() const
@@ -362,7 +362,7 @@ SvMetaAttribute * SvMetaSlot::GetMethod() const
     if( aMethod.Is() || !GetRef() ) return aMethod;
     return ((SvMetaSlot *)GetRef())->GetMethod();
 }
-BOOL SvMetaSlot::GetHasCoreId() const
+sal_Bool SvMetaSlot::GetHasCoreId() const
 {
     if( aHasCoreId.IsSet() || !GetRef() ) return aHasCoreId;
     return ((SvMetaSlot *)GetRef())->GetHasCoreId();
@@ -397,62 +397,62 @@ const ByteString & SvMetaSlot::GetDefault() const
     if( aDefault.Len() || !GetRef() ) return aDefault;
     return ((SvMetaSlot *)GetRef())->GetDefault();
 }
-BOOL SvMetaSlot::GetPseudoSlots() const
+sal_Bool SvMetaSlot::GetPseudoSlots() const
 {
     if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots;
     return ((SvMetaSlot *)GetRef())->GetPseudoSlots();
 }
 /*
-BOOL SvMetaSlot::GetGet() const
+sal_Bool SvMetaSlot::GetGet() const
 {
     if( aGet.IsSet() || !GetRef() ) return aGet;
     return ((SvMetaSlot *)GetRef())->GetGet();
 }
-BOOL SvMetaSlot::GetSet() const
+sal_Bool SvMetaSlot::GetSet() const
 {
     if( aSet.IsSet() || !GetRef() ) return aSet;
     return ((SvMetaSlot *)GetRef())->GetSet();
 }
 */
-BOOL SvMetaSlot::GetCachable() const
+sal_Bool SvMetaSlot::GetCachable() const
 {
     // Cachable und Volatile sind exclusiv
     if( !GetRef() || aCachable.IsSet() || aVolatile.IsSet() )
          return aCachable;
     return ((SvMetaSlot *)GetRef())->GetCachable();
 }
-BOOL SvMetaSlot::GetVolatile() const
+sal_Bool SvMetaSlot::GetVolatile() const
 {
     // Cachable und Volatile sind exclusiv
     if( !GetRef() || aVolatile.IsSet() || aCachable.IsSet() )
         return aVolatile;
     return ((SvMetaSlot *)GetRef())->GetVolatile();
 }
-BOOL SvMetaSlot::GetToggle() const
+sal_Bool SvMetaSlot::GetToggle() const
 {
     if( aToggle.IsSet() || !GetRef() ) return aToggle;
     return ((SvMetaSlot *)GetRef())->GetToggle();
 }
-BOOL SvMetaSlot::GetAutoUpdate() const
+sal_Bool SvMetaSlot::GetAutoUpdate() const
 {
     if( aAutoUpdate.IsSet() || !GetRef() ) return aAutoUpdate;
     return ((SvMetaSlot *)GetRef())->GetAutoUpdate();
 }
-BOOL SvMetaSlot::GetSynchron() const
+sal_Bool SvMetaSlot::GetSynchron() const
 {
     // Synchron und Asynchron sind exclusiv
     if( !GetRef() || aSynchron.IsSet() || aAsynchron.IsSet() )
         return aSynchron;
     return ((SvMetaSlot *)GetRef())->GetSynchron();
 }
-BOOL SvMetaSlot::GetAsynchron() const
+sal_Bool SvMetaSlot::GetAsynchron() const
 {
     // Synchron und Asynchron sind exclusiv
     if( !GetRef() || aAsynchron.IsSet() || aSynchron.IsSet() )
         return aAsynchron;
     return ((SvMetaSlot *)GetRef())->GetAsynchron();
 }
-BOOL SvMetaSlot::GetRecordPerItem() const
+sal_Bool SvMetaSlot::GetRecordPerItem() const
 {
     // Record- PerItem, No, PerSet und Manual sind exclusiv
     if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -460,7 +460,7 @@ BOOL SvMetaSlot::GetRecordPerItem() const
         return aRecordPerItem;
     return ((SvMetaSlot *)GetRef())->GetRecordPerItem();
 }
-BOOL SvMetaSlot::GetRecordPerSet() const
+sal_Bool SvMetaSlot::GetRecordPerSet() const
 {
     // Record- PerItem, No, PerSet und Manual sind exclusiv
     if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -468,7 +468,7 @@ BOOL SvMetaSlot::GetRecordPerSet() const
         return aRecordPerSet;
     return ((SvMetaSlot *)GetRef())->GetRecordPerSet();
 }
-BOOL SvMetaSlot::GetRecordManual() const
+sal_Bool SvMetaSlot::GetRecordManual() const
 {
     // Record- PerItem, No, PerSet und Manual sind exclusiv
     if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -476,7 +476,7 @@ BOOL SvMetaSlot::GetRecordManual() const
         return aRecordManual;
     return ((SvMetaSlot *)GetRef())->GetRecordManual();
 }
-BOOL SvMetaSlot::GetNoRecord() const
+sal_Bool SvMetaSlot::GetNoRecord() const
 {
     // Record- PerItem, No, PerSet und Manual sind exclusiv
     if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -484,13 +484,13 @@ BOOL SvMetaSlot::GetNoRecord() const
         return aNoRecord;
     return ((SvMetaSlot *)GetRef())->GetNoRecord();
 }
-BOOL SvMetaSlot::GetRecordAbsolute() const
+sal_Bool SvMetaSlot::GetRecordAbsolute() const
 {
     if( !GetRef() || aRecordAbsolute.IsSet() )
         return aRecordAbsolute;
     return ((SvMetaSlot *)GetRef())->GetRecordAbsolute();
 }
-BOOL SvMetaSlot::GetHasDialog() const
+sal_Bool SvMetaSlot::GetHasDialog() const
 {
     if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog;
     return ((SvMetaSlot *)GetRef())->GetHasDialog();
@@ -500,44 +500,44 @@ const ByteString & SvMetaSlot::GetPseudoPrefix() const
     if( aPseudoPrefix.Len() || !GetRef() ) return aPseudoPrefix;
     return ((SvMetaSlot *)GetRef())->GetPseudoPrefix();
 }
-BOOL SvMetaSlot::GetMenuConfig() const
+sal_Bool SvMetaSlot::GetMenuConfig() const
 {
     if( aMenuConfig.IsSet() || !GetRef() ) return aMenuConfig;
     return ((SvMetaSlot *)GetRef())->GetMenuConfig();
 }
-BOOL SvMetaSlot::GetToolBoxConfig() const
+sal_Bool SvMetaSlot::GetToolBoxConfig() const
 {
     if( aToolBoxConfig.IsSet() || !GetRef() ) return aToolBoxConfig;
     return ((SvMetaSlot *)GetRef())->GetToolBoxConfig();
 }
-BOOL SvMetaSlot::GetStatusBarConfig() const
+sal_Bool SvMetaSlot::GetStatusBarConfig() const
 {
     if( aStatusBarConfig.IsSet() || !GetRef() ) return aStatusBarConfig;
     return ((SvMetaSlot *)GetRef())->GetStatusBarConfig();
 }
-BOOL SvMetaSlot::GetAccelConfig() const
+sal_Bool SvMetaSlot::GetAccelConfig() const
 {
     if( aAccelConfig.IsSet() || !GetRef() ) return aAccelConfig;
     return ((SvMetaSlot *)GetRef())->GetAccelConfig();
 }
-BOOL SvMetaSlot::GetFastCall() const
+sal_Bool SvMetaSlot::GetFastCall() const
 {
     if( aFastCall.IsSet() || !GetRef() ) return aFastCall;
     return ((SvMetaSlot *)GetRef())->GetFastCall();
 }
-BOOL SvMetaSlot::GetContainer() const
+sal_Bool SvMetaSlot::GetContainer() const
 {
     if( aContainer.IsSet() || !GetRef() ) return aContainer;
     return ((SvMetaSlot *)GetRef())->GetContainer();
 }
 
-BOOL SvMetaSlot::GetImageRotation() const
+sal_Bool SvMetaSlot::GetImageRotation() const
 {
     if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation;
     return ((SvMetaSlot *)GetRef())->GetImageRotation();
 }
 
-BOOL SvMetaSlot::GetImageReflection() const
+sal_Bool SvMetaSlot::GetImageReflection() const
 {
     if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
     return ((SvMetaSlot *)GetRef())->GetImageReflection();
@@ -556,7 +556,7 @@ const ByteString& SvMetaSlot::GetUnoName() const
 *************************************************************************/
 /*
 void SvMetaSlot::FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj,
-                                BOOL bVariable )
+                                sal_Bool bVariable )
 {
     // keine Attribut fuer Automation
     if( !GetAutomation() || !GetExport() )
@@ -574,7 +574,7 @@ void SvMetaSlot::FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj,
             SbxMethodRef xMeth = new SbxMethod( aName,
                                     pRetBaseType->GetSbxDataType() );
             pType->FillSbxObject( xMeth, bVariable );
-            xMeth->SetUserData( MakeSlotValue(rBase, FALSE) );
+            xMeth->SetUserData( MakeSlotValue(rBase, sal_False) );
 
             pObj->Insert( &xMeth );
             return;
@@ -596,7 +596,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 {
     SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm );
 
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     bOk |= aDefault.ReadSvIdl( SvHash_Default(), rInStm );
     bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm );
     bOk |= aHasCoreId.ReadSvIdl( SvHash_HasCoreId(), rInStm );
@@ -620,29 +620,29 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     }
 
     if( aCachable.ReadSvIdl( SvHash_Cachable(), rInStm ) )
-        SetCachable( aCachable ), bOk = TRUE;
+        SetCachable( aCachable ), bOk = sal_True;
     if( aVolatile.ReadSvIdl( SvHash_Volatile(), rInStm ) )
-        SetVolatile( aVolatile ), bOk = TRUE;
+        SetVolatile( aVolatile ), bOk = sal_True;
     if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) )
-        SetToggle( aToggle ), bOk = TRUE;
+        SetToggle( aToggle ), bOk = sal_True;
     if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) )
-        SetAutoUpdate( aAutoUpdate ), bOk = TRUE;
+        SetAutoUpdate( aAutoUpdate ), bOk = sal_True;
 
     if( aSynchron.ReadSvIdl( SvHash_Synchron(), rInStm ) )
-        SetSynchron( aSynchron ), bOk = TRUE;
+        SetSynchron( aSynchron ), bOk = sal_True;
     if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) )
-        SetAsynchron( aAsynchron ), bOk = TRUE;
+        SetAsynchron( aAsynchron ), bOk = sal_True;
 
     if( aRecordAbsolute.ReadSvIdl( SvHash_RecordAbsolute(), rInStm ) )
-        SetRecordAbsolute( aRecordAbsolute), bOk = TRUE;
+        SetRecordAbsolute( aRecordAbsolute), bOk = sal_True;
     if( aRecordPerItem.ReadSvIdl( SvHash_RecordPerItem(), rInStm ) )
-        SetRecordPerItem( aRecordPerItem ), bOk = TRUE;
+        SetRecordPerItem( aRecordPerItem ), bOk = sal_True;
     if( aRecordPerSet.ReadSvIdl( SvHash_RecordPerSet(), rInStm ) )
-        SetRecordPerSet( aRecordPerSet ), bOk = TRUE;
+        SetRecordPerSet( aRecordPerSet ), bOk = sal_True;
     if( aRecordManual.ReadSvIdl( SvHash_RecordManual(), rInStm ) )
-        SetRecordManual( aRecordManual ), bOk = TRUE;
+        SetRecordManual( aRecordManual ), bOk = sal_True;
     if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) )
-        SetNoRecord( aNoRecord ), bOk = TRUE;
+        SetNoRecord( aNoRecord ), bOk = sal_True;
 
     bOk |= aHasDialog.ReadSvIdl( SvHash_HasDialog(), rInStm );
     bOk |= aPseudoPrefix.ReadSvIdl( SvHash_PseudoPrefix(), rInStm );
@@ -653,7 +653,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 
     SvBOOL aAllConfig;
     if( aAllConfig.ReadSvIdl( SvHash_AllConfig(), rInStm ) )
-        SetAllConfig( aAllConfig ), bOk = TRUE;
+        SetAllConfig( aAllConfig ), bOk = sal_True;
     bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
     bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
     bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
@@ -664,11 +664,11 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     {
         if( !aSlotType.Is() )
         {
-            UINT32 nTokPos = rInStm.Tell();
+            sal_uInt32 nTokPos = rInStm.Tell();
             SvToken * pTok = rInStm.GetToken_Next();
             if( pTok->Is( SvHash_SlotType() ) )
             {
-                BOOL bBraket = rInStm.Read( '(' );
+                sal_Bool bBraket = rInStm.Read( '(' );
                 if( bBraket || rInStm.Read( '=' ) )
                 {
                     aSlotType = rBase.ReadKnownType( rInStm );
@@ -700,7 +700,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
             if( pTok->IsIdentifier() )
             {
                 aMethod = new SvMetaSlot();
-                UINT32 nTokPos = rInStm.Tell();
+                sal_uInt32 nTokPos = rInStm.Tell();
                 if( aMethod->ReadSvIdl( rBase, rInStm ) )
                 {
                     if( aMethod->IsMethod() )
@@ -724,7 +724,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 *************************************************************************/
 void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                        SvStream & rOutStm,
-                       USHORT nTab )
+                       sal_uInt16 nTab )
 {
     SvMetaAttribute::WriteAttributesSvIdl( rBase, rOutStm, nTab );
 
@@ -800,7 +800,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
     if( aVolatile )
         aOut += aVolatile.GetSvIdlString( SvHash_Volatile() );
     else if( !aCachable )
-        // wegen Default == TRUE, nur wenn kein anderer gesetzt
+        // wegen Default == sal_True, nur wenn kein anderer gesetzt
         aOut += aCachable.GetSvIdlString( SvHash_Cachable() );
     else
         aDel.Erase();
@@ -820,7 +820,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
     if( aAsynchron )
         ( aOut += aDel ) += aAsynchron.GetSvIdlString( SvHash_Asynchron() );
     else if( !aSynchron )
-        // wegen Default == TRUE, nur wenn kein anderer gesetzt
+        // wegen Default == sal_True, nur wenn kein anderer gesetzt
         ( aOut += aDel ) += aSynchron.GetSvIdlString( SvHash_Synchron() );
     else
         aDel1 = aDel;
@@ -831,7 +831,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
     else if( aNoRecord )
         ( aOut += aDel1 ) += aNoRecord.GetSvIdlString( SvHash_NoRecord() );
     else if( !aRecordPerSet )
-        // wegen Default == TRUE, nur wenn kein anderer gesetzt
+        // wegen Default == sal_True, nur wenn kein anderer gesetzt
         ( aOut += aDel1 ) += aRecordPerSet.GetSvIdlString( SvHash_RecordPerSet() );
     else if( aRecordPerItem )
         ( aOut += aDel1 ) += aRecordPerItem.GetSvIdlString( SvHash_RecordPerItem() );
@@ -903,9 +903,9 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    BOOL bOk = SvMetaAttribute::Test( rBase, rInStm );
+    sal_Bool bOk = SvMetaAttribute::Test( rBase, rInStm );
     if( bOk )
     {
         SvMetaType * pType = GetType();
@@ -915,7 +915,7 @@ BOOL SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
         {
             rBase.SetError( "this attribute is not a slot", rInStm.GetToken() );
             rBase.WriteError( rInStm );
-            bOk = FALSE;
+            bOk = sal_False;
         }
     }
 
@@ -927,10 +927,10 @@ BOOL SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    UINT32  nTokPos     = rInStm.Tell();
-    BOOL bOk = TRUE;
+    sal_uInt32  nTokPos     = rInStm.Tell();
+    sal_Bool bOk = sal_True;
 
     SvMetaAttribute * pAttr = rBase.ReadKnownAttr( rInStm, GetType() );
     if( pAttr )
@@ -950,7 +950,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
             aStr += " is method or variable but not a slot";
             rBase.SetError( aStr, rInStm.GetToken() );
             rBase.WriteError( rInStm );
-            bOk = FALSE;
+            bOk = sal_False;
         }
     }
     else
@@ -971,7 +971,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
                 {
                     DBG_ERROR("Illegal definition!");
                     rInStm.Seek( nTokPos );
-                    return FALSE;
+                    return sal_False;
                 }
 
                   SetName( pKnownSlot->GetName(), &rBase );
@@ -983,7 +983,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
                 aStr += " is method or variable but not a slot";
                 rBase.SetError( aStr, rInStm.GetToken() );
                 rBase.WriteError( rInStm );
-                bOk = FALSE;
+                bOk = sal_False;
             }
         }
     }
@@ -1000,7 +1000,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 |*    Beschreibung
 *************************************************************************/
 void SvMetaSlot::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            USHORT nTab )
+                            sal_uInt16 nTab )
 {
     SvMetaAttribute::WriteSvIdl( rBase, rOutStm, nTab );
 }
@@ -1011,7 +1011,7 @@ void SvMetaSlot::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaSlot::Write( SvIdlDataBase & rBase,
-                        SvStream & rOutStm, USHORT nTab,
+                        SvStream & rOutStm, sal_uInt16 nTab,
                         WriteType nT, WriteAttribute nA )
 {
     if ( nT == WRITE_DOCU )
@@ -1046,10 +1046,10 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
                         SvIdlDataBase& rBase)
 {
     // Einf"ugeposition durch bin"are Suche in der SlotListe ermitteln
-    USHORT nId = (USHORT) GetSlotId().GetValue();
-    USHORT nListCount = (USHORT) rList.Count();
-    USHORT nPos;
-    ULONG m;  // for inner "for" loop
+    sal_uInt16 nId = (sal_uInt16) GetSlotId().GetValue();
+    sal_uInt16 nListCount = (sal_uInt16) rList.Count();
+    sal_uInt16 nPos;
+    sal_uLong m;  // for inner "for" loop
 
     if ( !nListCount )
         nPos = 0;
@@ -1057,9 +1057,9 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
         nPos = rList.GetObject(0)->xSlot->GetSlotId().GetValue() >= nId ? 0 : 1;
     else
     {
-        USHORT nMid = 0, nLow = 0;
-        USHORT nHigh = nListCount - 1;
-        BOOL bFound = FALSE;
+        sal_uInt16 nMid = 0, nLow = 0;
+        sal_uInt16 nHigh = nListCount - 1;
+        sal_Bool bFound = sal_False;
         while ( !bFound && nLow <= nHigh )
         {
             nMid = (nLow + nHigh) >> 1;
@@ -1078,7 +1078,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
                 break;
             }
             else
-                bFound = TRUE;
+                bFound = sal_True;
         }
 
         DBG_ASSERT(!bFound, "Duplicate SlotId!");
@@ -1088,13 +1088,13 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
     DBG_ASSERT( nPos <= nListCount,
         "nPos too large" );
     DBG_ASSERT( nPos == nListCount || nId <=
-        (USHORT) rList.GetObject(nPos)->xSlot->GetSlotId().GetValue(),
+        (sal_uInt16) rList.GetObject(nPos)->xSlot->GetSlotId().GetValue(),
         "Successor has lower SlotId" );
     DBG_ASSERT( nPos == 0 || nId >
-        (USHORT) rList.GetObject(nPos-1)->xSlot->GetSlotId().GetValue(),
+        (sal_uInt16) rList.GetObject(nPos-1)->xSlot->GetSlotId().GetValue(),
         "Predecessor has higher SlotId" );
     DBG_ASSERT( nPos+1 >= nListCount || nId <
-        (USHORT) rList.GetObject(nPos+1)->xSlot->GetSlotId().GetValue(),
+        (sal_uInt16) rList.GetObject(nPos+1)->xSlot->GetSlotId().GetValue(),
         "Successor has lower SlotId" );
 
     rList.Insert( new SvSlotElement( this, rPrefix ), nPos );
@@ -1108,7 +1108,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
         // Den MasterSlot clonen
         SvMetaSlotRef xEnumSlot;
         SvMetaSlot *pFirstEnumSlot = NULL;
-        for( ULONG n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             // Die SlotId erzeugen
             SvMetaEnumValue *enumValue = pEnum->GetObject(n);
@@ -1135,7 +1135,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
             {
                 DBG_ERROR("Invalid EnumSlot!");
                 xEnumSlot = Clone();
-                ULONG nValue;
+                sal_uLong nValue;
                 if ( rBase.FindId(aSId , &nValue) )
                 {
                     SvNumberIdentifier aId;
@@ -1146,7 +1146,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
             }
 
             // Die Slaves sind kein Master !
-            xEnumSlot->aPseudoSlots = FALSE;
+            xEnumSlot->aPseudoSlots = sal_False;
             xEnumSlot->SetEnumValue(enumValue);
 
             if ( !pFirstEnumSlot || xEnumSlot->GetSlotId().GetValue() < pFirstEnumSlot->GetSlotId().GetValue() )
@@ -1163,7 +1163,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
         pLinkedSlot = pFirstEnumSlot;
 
         // Slaves untereinander verketten
-        rList.Seek((ULONG)0);
+        rList.Seek((sal_uLong)0);
         xEnumSlot = pFirstEnumSlot;
         SvSlotElement *pEle;
         do
@@ -1215,12 +1215,12 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
     ByteString aMethodName( GetExecMethod() );
     if ( aMethodName.Len() && aMethodName != "NoExec" )
     {
-        BOOL bIn = FALSE;
-        for( USHORT n = 0; n < rList.Count(); n++ )
+        sal_Bool bIn = sal_False;
+        for( sal_uInt16 n = 0; n < rList.Count(); n++ )
         {
             if( *(rList.GetObject(n)) == aMethodName )
             {
-                bIn=TRUE;
+                bIn=sal_True;
                 break;
             }
         }
@@ -1239,12 +1239,12 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
     aMethodName = GetStateMethod();
     if ( aMethodName.Len() && aMethodName != "NoState" )
     {
-        BOOL bIn = FALSE;
-        for ( USHORT n=0; n < rList.Count(); n++ )
+        sal_Bool bIn = sal_False;
+        for ( sal_uInt16 n=0; n < rList.Count(); n++ )
         {
             if ( *(rList.GetObject(n)) == aMethodName )
             {
-                bIn=TRUE;
+                bIn=sal_True;
                 break;
             }
         }
@@ -1261,7 +1261,7 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
     }
 }
 
-void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
+void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
                             const ByteString & rSlotId,
                             SvSlotElementList& rSlotList,
                             const ByteString & rPrefix,
@@ -1270,8 +1270,8 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
     if ( !GetExport() && !GetHidden() )
         return;
 
-//  BOOL bIsEnumSlot = 0 != rValueName.Len();
-    BOOL bIsEnumSlot = 0 != pEnumValue;
+//  sal_Bool bIsEnumSlot = 0 != rValueName.Len();
+    sal_Bool bIsEnumSlot = 0 != pEnumValue;
 
     rOutStm << "// Slot Nr. " << ByteString::CreateFromInt32(nListPos).GetBuffer() << " : ";
     ByteString aSlotIdValue( ByteString::CreateFromInt32( GetSlotId().GetValue() ) );
@@ -1483,7 +1483,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
                 pType = pMethod->GetType();
             else
                 pType = GetType();
-            ULONG nSCount = pType->GetAttrCount();
+            sal_uLong nSCount = pType->GetAttrCount();
             rOutStm << ByteString::CreateFromInt32( nSCount ).GetBuffer() << "/*Count*/";
         }
         else
@@ -1498,7 +1498,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
             rOutStm << '.';
             if ( !IsVariable() || !GetType() ||
                  GetType()->GetBaseType()->GetType() != TYPE_STRUCT )
-                rOutStm << GetMangleName( FALSE ).GetBuffer();
+                rOutStm << GetMangleName( sal_False ).GetBuffer();
             rOutStm << "\",";
         }
         else
@@ -1520,7 +1520,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
 //    if ( GetUnoName().Len() )
     {
         rOutStm << ",\"";
-        rOutStm << GetMangleName( FALSE ).GetBuffer();
+        rOutStm << GetMangleName( sal_False ).GetBuffer();
         //rOutStm << GetUnoName().GetBuffer();
         rOutStm << "\"";
     }
@@ -1530,7 +1530,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
     rOutStm << " )," << endl;
 }
 
-USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm )
+sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm )
 {
     if ( !GetExport() && !GetHidden() )
         return 0;
@@ -1549,7 +1549,7 @@ USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutSt
 
         const SvMetaAttributeMemberList & rList =
                     pType->GetAttrList();
-        for( ULONG n = 0; n < rList.Count(); n++ )
+        for( sal_uLong n = 0; n < rList.Count(); n++ )
         {
             SvMetaAttribute * pPar  = rList.GetObject( n );
             SvMetaType * pPType     = pPar->GetType();
@@ -1563,12 +1563,12 @@ USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutSt
             if( !rBase.FindType( pPType, rBase.aUsedTypes ) )
                 rBase.aUsedTypes.Append( pPType );
         }
-        return (USHORT)rList.Count();
+        return (sal_uInt16)rList.Count();
     }
     return 0;
 }
 
-USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
+sal_uInt16 SvMetaSlot::WriteSlotMap( const ByteString & rShellName, sal_uInt16 nCount,
                                 SvSlotElementList& rSlotList,
                                 const ByteString & rPrefix,
                                 SvIdlDataBase & rBase,
@@ -1577,7 +1577,7 @@ USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
     // SlotId, wenn nicht angegeben, aus Namen generieren
     ByteString slotId = GetSlotId();
 
-    USHORT nSCount = 0;
+    sal_uInt16 nSCount = 0;
     if( IsMethod() )
     {
         SvMetaType * pType;
@@ -1587,7 +1587,7 @@ USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
         else
             pType = GetType();
 
-        nSCount = (USHORT)pType->GetAttrCount();
+        nSCount = (sal_uInt16)pType->GetAttrCount();
     }
 
     WriteSlot( rShellName, nCount, slotId, rSlotList, rPrefix, rBase, rOutStm );
@@ -1603,7 +1603,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
     if (!GetToolBoxConfig() && !GetAccelConfig() && !GetMenuConfig() && !GetStatusBarConfig() )
         return;
 
-    ULONG nSId = GetSlotId().GetValue();
+    sal_uLong nSId = GetSlotId().GetValue();
     if( !pTable->IsKeyValid( nSId ) )
     {
         pTable->Insert( nSId, this );
@@ -1630,7 +1630,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
     SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
     if( GetPseudoSlots() && pEnum )
     {
-        for( ULONG n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             ByteString aValName = pEnum->GetObject( n )->GetName();
             ByteString aSId( GetSlotId() );
@@ -1639,12 +1639,12 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
             aSId += '_';
             aSId += aValName.Copy( pEnum->GetPrefix().Len() );
 
-            ULONG nSId2;
-            BOOL bIdOk = FALSE;
+            sal_uLong nSId2;
+            sal_Bool bIdOk = sal_False;
             if( rBase.FindId( aSId, &nSId2 ) )
             {
                 aSId = ByteString::CreateFromInt32( nSId2 );
-                bIdOk = TRUE;
+                bIdOk = sal_True;
             }
 
             // wenn Id nicht gefunden, immer schreiben
@@ -1672,7 +1672,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                              Table * pTable )
 {
-    ULONG nSId = GetSlotId().GetValue();
+    sal_uLong nSId = GetSlotId().GetValue();
     if( !pTable->IsKeyValid( nSId ) )
     {
         pTable->Insert( nSId, this );
@@ -1682,7 +1682,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
     SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
     if( GetPseudoSlots() && pEnum )
     {
-        for( ULONG n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             ByteString aValName = pEnum->GetObject( n )->GetName();
             ByteString aSId( GetSlotId() );
@@ -1691,12 +1691,12 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
             aSId += '_';
             aSId += aValName.Copy( pEnum->GetPrefix().Len() );
 
-            ULONG nSId2;
-            BOOL bIdOk = FALSE;
+            sal_uLong nSId2;
+            sal_Bool bIdOk = sal_False;
             if( rBase.FindId( aSId, &nSId2 ) )
             {
                 aSId = ByteString::CreateFromInt32( nSId2 );
-                bIdOk = TRUE;
+                bIdOk = sal_True;
             }
 
             // wenn Id nicht gefunden, immer schreiben
@@ -1711,12 +1711,12 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
     }
 }
 
-void WriteBool( BOOL bSet, SvStream& rStream )
+void WriteBool( sal_Bool bSet, SvStream& rStream )
 {
     if ( bSet )
-        rStream << "TRUE" << ',';
+        rStream << "sal_True" << ',';
     else
-        rStream << "FALSE" << ',';
+        rStream << "sal_False" << ',';
 }
 
 void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 3867d59cbea1..48b08da96962 100644..100755
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -47,23 +47,23 @@ SV_IMPL_META_FACTORY1( SvMetaAttribute, SvMetaReference );
 |*    Beschreibung
 *************************************************************************/
 SvMetaAttribute::SvMetaAttribute()
-    : aAutomation( TRUE, FALSE )
-    , aExport( TRUE, FALSE )
-    , aIsCollection ( FALSE, FALSE )
-    , aReadOnlyDoc ( TRUE, FALSE )
-    , aHidden( FALSE, FALSE )
-    , bNewAttr( FALSE )
+    : aAutomation( sal_True, sal_False )
+    , aExport( sal_True, sal_False )
+    , aIsCollection ( sal_False, sal_False )
+    , aReadOnlyDoc ( sal_True, sal_False )
+    , aHidden( sal_False, sal_False )
+    , bNewAttr( sal_False )
 {
 }
 
 SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
     : aType( pType )
-    , aAutomation( TRUE, FALSE )
-    , aExport( TRUE, FALSE )
-    , aIsCollection ( FALSE, FALSE)
-    , aReadOnlyDoc ( TRUE, FALSE)
-    , aHidden( FALSE, FALSE )
-    , bNewAttr( FALSE )
+    , aAutomation( sal_True, sal_False )
+    , aExport( sal_True, sal_False )
+    , aIsCollection ( sal_False, sal_False)
+    , aReadOnlyDoc ( sal_True, sal_False)
+    , aHidden( sal_False, sal_False )
+    , bNewAttr( sal_False )
 {
 }
 
@@ -77,7 +77,7 @@ void SvMetaAttribute::Load( SvPersistStream & rStm )
 {
     SvMetaReference::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask & 0x01 )
     {
@@ -99,7 +99,7 @@ void SvMetaAttribute::Save( SvPersistStream & rStm )
     SvMetaReference::Save( rStm );
 
     // Maske erstellen
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aType.Is() )            nMask |= 0x1;
     if( aSlotId.IsSet() )       nMask |= 0x2;
     if( aExport.IsSet() )       nMask |= 0x4;
@@ -148,7 +148,7 @@ const SvNumberIdentifier & SvMetaAttribute::GetSlotId() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaAttribute::GetReadonly() const
+sal_Bool SvMetaAttribute::GetReadonly() const
 {
     if( aReadonly.IsSet() || !GetRef() ) return aReadonly;
     return ((SvMetaAttribute *)GetRef())->GetReadonly();
@@ -159,7 +159,7 @@ BOOL SvMetaAttribute::GetReadonly() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaAttribute::GetExport() const
+sal_Bool SvMetaAttribute::GetExport() const
 {
     if( aExport.IsSet() || !GetRef() ) return aExport;
     return ((SvMetaAttribute *)GetRef())->GetExport();
@@ -170,7 +170,7 @@ BOOL SvMetaAttribute::GetExport() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaAttribute::GetHidden() const
+sal_Bool SvMetaAttribute::GetHidden() const
 {
     // Wenn Export gesetzt wurde, aber Hidden nicht, gilt der Default
     // aHidden = !aExport
@@ -187,15 +187,15 @@ BOOL SvMetaAttribute::GetHidden() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaAttribute::GetAutomation() const
+sal_Bool SvMetaAttribute::GetAutomation() const
 {
     if( aAutomation.IsSet() || !GetRef() ) return aAutomation;
     return ((SvMetaAttribute *)GetRef())->GetAutomation();
 }
 
-BOOL SvMetaAttribute::GetIsCollection() const
+sal_Bool SvMetaAttribute::GetIsCollection() const
 {
-    BOOL bRet;
+    sal_Bool bRet;
     if( aIsCollection.IsSet() || !GetRef() )
     {
         if ( aIsCollection.IsSet() )
@@ -210,7 +210,7 @@ BOOL SvMetaAttribute::GetIsCollection() const
     return ((SvMetaSlot *)GetRef())->GetIsCollection();
 }
 
-BOOL SvMetaAttribute::GetReadOnlyDoc() const
+sal_Bool SvMetaAttribute::GetReadOnlyDoc() const
 {
     if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc;
     return ((SvMetaSlot *)GetRef())->GetReadOnlyDoc();
@@ -223,20 +223,20 @@ BOOL SvMetaAttribute::GetReadOnlyDoc() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaAttribute::IsMethod() const
+sal_Bool SvMetaAttribute::IsMethod() const
 {
     SvMetaType * pType = GetType();
     DBG_ASSERT( pType, "no type for attribute" );
     return pType->GetType() == TYPE_METHOD;
 }
 
-BOOL SvMetaAttribute::IsVariable() const
+sal_Bool SvMetaAttribute::IsVariable() const
 {
     SvMetaType * pType = GetType();
     return pType->GetType() != TYPE_METHOD;
 }
 
-ByteString SvMetaAttribute::GetMangleName( BOOL ) const
+ByteString SvMetaAttribute::GetMangleName( sal_Bool ) const
 {
     return GetName();
 }
@@ -247,7 +247,7 @@ ByteString SvMetaAttribute::GetMangleName( BOOL ) const
 |*    Beschreibung
 *************************************************************************/
 /*
-void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags )
+void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, sal_uInt16 nSbxFlags )
 {
     SvMetaType * pType = GetType();
     DBG_ASSERT( pType, "no type for attribute" );
@@ -267,8 +267,8 @@ void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags )
     if( pBaseType->GetType() == TYPE_STRUCT )
     {
         const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
-        ULONG nCount = rList.Count();
-        for( ULONG i = 0; i < nCount; i++ )
+        sal_uLong nCount = rList.Count();
+        for( sal_uLong i = 0; i < nCount; i++ )
             rList.GetObject( i )->FillSbxObject( pInfo, nSbxFlags );
     }
     else
@@ -284,7 +284,7 @@ void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags )
 *************************************************************************/
 /*
 void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase,
-                                    SbxObject * pObj, BOOL bVariable )
+                                    SbxObject * pObj, sal_Bool bVariable )
 {
     // keine Attribut fuer Automation
     if( !GetAutomation() || !GetExport() )
@@ -303,8 +303,8 @@ void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase,
             if ( GetSlotId().Len() )
                 rBase.aStructSlotId = GetSlotId();
             const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
-            ULONG nCount = rList.Count();
-            for( ULONG i = 0; i < nCount; i++ )
+            sal_uLong nCount = rList.Count();
+            for( sal_uLong i = 0; i < nCount; i++ )
                 rList.GetObject( i )->FillSbxObject( rBase, pObj, bVariable );
             rBase.aStructSlotId = aSlotId;
         }
@@ -314,7 +314,7 @@ void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase,
                                         //MI: pBaseType->GetSbxDataType() );
             if ( GetReadonly() || IsMethod() )
                 xProp->ResetFlag( SBX_WRITE );
-            xProp->SetUserData( MakeSlotValue( rBase, TRUE ) );
+            xProp->SetUserData( MakeSlotValue( rBase, sal_True ) );
             pType->FillSbxObject( xProp, bVariable );
 
             pObj->Insert( &xProp );
@@ -327,7 +327,7 @@ void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase,
         SbxMethodRef xMeth = new SbxMethod( GetName(),
                             pRetBaseType->GetSbxDataType() );
         xMeth->ResetFlag( SBX_WRITE );
-        xMeth->SetUserData( MakeSlotValue( rBase, FALSE ) );
+        xMeth->SetUserData( MakeSlotValue( rBase, sal_False ) );
         pType->FillSbxObject( xMeth, bVariable );
 
         pObj->Insert( &xMeth );
@@ -340,22 +340,22 @@ void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaAttribute::Test( SvIdlDataBase & rBase,
+sal_Bool SvMetaAttribute::Test( SvIdlDataBase & rBase,
                             SvTokenStream & rInStm )
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     if( GetType()->IsItem() && !GetSlotId().IsSet() )
     {
         rBase.SetError( "slot without id declared", rInStm.GetToken() );
         rBase.WriteError( rInStm );
-        bOk = FALSE;
+        bOk = sal_False;
     }
     /*
     if( !GetType()->IsItem() && GetSlotId().IsSet() )
     {
         rBase.SetError( "slot without item declared", rInStm.GetToken() );
         rBase.WriteError( rInStm );
-        bOk = FALSE;
+        bOk = sal_False;
     }
     */
     return bOk;
@@ -366,20 +366,20 @@ BOOL SvMetaAttribute::Test( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
                                      SvTokenStream & rInStm )
 {
-    UINT32  nTokPos     = rInStm.Tell();
+    sal_uInt32  nTokPos     = rInStm.Tell();
     if( !GetType() )
         // Es wurde kein Typ im ctor mitgegeben
         aType = rBase.ReadKnownType( rInStm );
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     if( GetType() )
     {
         ReadNameSvIdl( rBase, rInStm );
         aSlotId.ReadSvIdl( rBase, rInStm );
 
-        bOk = TRUE;
+        bOk = sal_True;
         SvToken * pTok  = rInStm.GetToken();
         if( bOk && pTok->IsChar() && pTok->GetChar() == '(' )
         {
@@ -408,7 +408,7 @@ void SvMetaAttribute::WriteSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     SvMetaType * pType = GetType();
@@ -418,7 +418,7 @@ void SvMetaAttribute::WriteSvIdl
         rOutStm << ' ' << aSlotId.GetBuffer();
     if( pType->GetType() == TYPE_METHOD )
         pType->WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
-    ULONG nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm << endl;
     SvMetaName::WriteSvIdl( rBase, rOutStm, nTab );
     TestAndSeekSpaceOnly( rOutStm, nPos );
@@ -459,7 +459,7 @@ void SvMetaAttribute::WriteAttributesSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     SvMetaReference::WriteAttributesSvIdl( rBase, rOutStm, nTab );
@@ -515,7 +515,7 @@ void SvMetaAttribute::WriteAttributesSvIdl
 *************************************************************************/
 void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
                                     SvStream & rOutStm,
-                                    USHORT nTab,
+                                    sal_uInt16 nTab,
                                     WriteType nT )
 {
     SvMetaType * pType = GetType();
@@ -529,8 +529,8 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
         if( pBaseType->GetType() == TYPE_STRUCT )
         {
             const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
-            ULONG nCount = rList.Count();
-            for( ULONG i = 0; i < nCount; i++ )
+            sal_uLong nCount = rList.Count();
+            for( sal_uLong i = 0; i < nCount; i++ )
             {
                 rList.GetObject( i )->WriteParam( rBase, rOutStm, nTab, nT );
                 if( i+1<nCount )
@@ -584,10 +584,10 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-ULONG SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, BOOL bVar ) const
+sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const
 {
      const SvNumberIdentifier & rId = GetSlotId();
-    ULONG n = rId.GetValue();
+    sal_uLong n = rId.GetValue();
     if( rBase.aStructSlotId.Len() )
     {
         n = n << 20;
@@ -608,20 +608,20 @@ ULONG SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, BOOL bVar ) const
 |*    Beschreibung
 *************************************************************************/
 void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                      USHORT nTab,
+                                      sal_uInt16 nTab,
                                       WriteType nT, WriteAttribute nA )
 {
     if( nT == WRITE_ODL  )
     {
         const SvNumberIdentifier & rId = GetSlotId();
-        BOOL bReadonly = GetReadonly() || ( nA & WA_READONLY );
+        sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
         if( (rId.IsSet() && !(nA & WA_STRUCT)) || bReadonly )
         {
-            BOOL bVar = IsVariable();
+            sal_Bool bVar = IsVariable();
             if( nA & WA_VARIABLE )
-                bVar = TRUE;
+                bVar = sal_True;
             else if( nA & WA_METHOD )
-                bVar = FALSE;
+                bVar = sal_False;
 
             WriteTab( rOutStm, nTab );
             rOutStm << "//class SvMetaAttribute" << endl;
@@ -647,14 +647,14 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
 |*    Beschreibung
 *************************************************************************/
 void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                    BOOL bSet )
+                                    sal_Bool bSet )
 {
     rOutStm << endl;
     SvMetaType * pType = GetType();
     SvMetaType * pBaseType = pType->GetBaseType();
 
     // Bei Set ist der Return immer void
-    BOOL bVoid = bSet;
+    sal_Bool bVoid = bSet;
     if( pBaseType->GetType() == TYPE_METHOD )
         bVoid = pBaseType->GetReturnType()->GetBaseType()->GetName() == "void";
 
@@ -739,11 +739,11 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
-                            SvStream & rOutStm, USHORT nTab,
+                            SvStream & rOutStm, sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     const SvMetaAttributeMemberList & rList = GetType()->GetBaseType()->GetAttrList();
-    ULONG nCount = rList.Count();
+    sal_uLong nCount = rList.Count();
 
     SvNumberIdentifier slotId = rBase.aStructSlotId;
     if ( GetSlotId().Len() )
@@ -754,7 +754,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
     if ( GetReadonly() )
         nA |= WA_READONLY;
 
-    for( ULONG i = 0; i < nCount; i++ )
+    for( sal_uLong i = 0; i < nCount; i++ )
     {
         SvMetaAttribute *pAttr = rList.GetObject( i );
         if ( nT == WRITE_DOCU )
@@ -773,7 +773,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            USHORT nTab,
+                            sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     // keine Attribut fuer Automation
@@ -785,11 +785,11 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
     else if ( !GetAutomation() || !GetExport() )
         return;
 
-    BOOL bVariable;
+    sal_Bool bVariable;
     if( nA & WA_VARIABLE )
-        bVariable = TRUE;
+        bVariable = sal_True;
     else if( nA & WA_METHOD )
-        bVariable = FALSE;
+        bVariable = sal_False;
     else
         bVariable = IsVariable();
 
@@ -839,7 +839,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             if( nT == WRITE_C_HEADER )
                 rOutStm << ';' << endl << endl;
             else
-                WriteCSource( rBase, rOutStm, FALSE );
+                WriteCSource( rBase, rOutStm, sal_False );
         }
         else if ( bVariable && IsVariable() )
         {
@@ -853,10 +853,10 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             else
             {
                 // Beispiel
-                // void SetValue( C_Object *, USHORT n );
+                // void SetValue( C_Object *, sal_uInt16 n );
                 ByteString name = GetName();
 
-                BOOL bReadonly = GetReadonly() || ( nA & WA_READONLY );
+                sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
                 if ( !bReadonly && !IsMethod() )
                 {
                     // Zuweisung
@@ -874,7 +874,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                     if( nT == WRITE_C_HEADER )
                         rOutStm << ';' << endl << endl;
                     else
-                        WriteCSource( rBase, rOutStm, TRUE );
+                        WriteCSource( rBase, rOutStm, sal_True );
                 }
 
                 // Zugriff
@@ -890,7 +890,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                 if( nT == WRITE_C_HEADER )
                     rOutStm << ';' << endl << endl;
                 else
-                    WriteCSource( rBase, rOutStm, FALSE );
+                    WriteCSource( rBase, rOutStm, sal_False );
             }
         }
     }
@@ -970,7 +970,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*
 |*    Beschreibung
 *************************************************************************/
-ULONG SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
 {
     SvMetaType * pType = GetType();
     DBG_ASSERT( pType, "no type for attribute" );
@@ -1017,13 +1017,13 @@ SV_IMPL_META_FACTORY1( SvMetaType, SvMetaExtern );
 |*    Beschreibung
 *************************************************************************/
 #define CTOR                            \
-    : aCall0( CALL_VALUE, FALSE )       \
-    , aCall1( CALL_VALUE, FALSE )       \
-    , aSbxDataType( 0, FALSE )          \
+    : aCall0( CALL_VALUE, sal_False )       \
+    , aCall1( CALL_VALUE, sal_False )       \
+    , aSbxDataType( 0, sal_False )          \
     , pAttrList( NULL )                 \
     , nType( TYPE_BASE )                \
-    , bIsItem( FALSE )                  \
-    , bIsShell( FALSE )                 \
+    , bIsItem( sal_False )                  \
+    , bIsShell( sal_False )                 \
     , cParserChar( 'h' )
 
 SvMetaType::SvMetaType()
@@ -1063,7 +1063,7 @@ void SvMetaType::Load( SvPersistStream & rStm )
 {
     SvMetaExtern::Load( rStm );
 
-    USHORT nMask;
+    sal_uInt16 nMask;
     rStm >> nMask;
     if( nMask & 0x0001 ) rStm >> aIn;
     if( nMask & 0x0002 ) rStm >> aOut;
@@ -1074,11 +1074,11 @@ void SvMetaType::Load( SvPersistStream & rStm )
     if( nMask & 0x0040 ) rStm >> aSbxName;
     if( nMask & 0x0080 ) rStm >> aOdlName;
     if( nMask & 0x0100 ) rStm >> GetAttrList();
-    if( nMask & 0x0200 ) bIsItem = TRUE;
-    if( nMask & 0x0400 ) bIsShell = TRUE;
+    if( nMask & 0x0200 ) bIsItem = sal_True;
+    if( nMask & 0x0400 ) bIsShell = sal_True;
     if( nMask & 0x0800 )
     {
-        USHORT nT;
+        sal_uInt16 nT;
         rStm >> nT;
         nType = nT;
     }
@@ -1093,7 +1093,7 @@ void SvMetaType::Save( SvPersistStream & rStm )
     SvMetaExtern::Save( rStm );
 
     // Maske erstellen
-    USHORT nMask = 0;
+    sal_uInt16 nMask = 0;
     if( aIn.IsSet() )               nMask |= 0x0001;
     if( aOut.IsSet() )              nMask |= 0x0002;
     if( aCall0.IsSet() )            nMask |= 0x0004;
@@ -1122,7 +1122,7 @@ void SvMetaType::Save( SvPersistStream & rStm )
     if( nMask & 0x0040 ) rStm << aSbxName;
     if( nMask & 0x0080 ) rStm << aOdlName;
     if( nMask & 0x0100 ) rStm << *pAttrList;
-    if( nMask & 0x0800 ) rStm << (USHORT)nType;
+    if( nMask & 0x0800 ) rStm << (sal_uInt16)nType;
     if( nMask & 0x1000 ) rStm << cParserChar;
     if( nMask & 0x2000 ) rStm << aCName;
     if( nMask & 0x4000 ) rStm << aBasicName;
@@ -1245,7 +1245,7 @@ ByteString SvMetaType::GetBasicPostfix() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaType::GetIn() const
+sal_Bool SvMetaType::GetIn() const
 {
     if( aIn.IsSet() || !GetRef() )
         return aIn;
@@ -1258,7 +1258,7 @@ BOOL SvMetaType::GetIn() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaType::GetOut() const
+sal_Bool SvMetaType::GetOut() const
 {
     if( aOut.IsSet() || !GetRef() )
         return aOut;
@@ -1391,7 +1391,7 @@ const ByteString & SvMetaType::GetCName() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
 {
     aSvName     = rName;
     aSbxName    = rName;
@@ -1407,13 +1407,13 @@ BOOL SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
 |*    Beschreibung
 *************************************************************************/
 /*
-void SvMetaType::FillSbxObject( SbxVariable * pObj, BOOL bVariable )
+void SvMetaType::FillSbxObject( SbxVariable * pObj, sal_Bool bVariable )
 {
     if( PTR_CAST( SbxMethod, pObj ) )
     {
         if( GetType() == TYPE_METHOD )
         {
-            ULONG nCount = GetAttrCount();
+            sal_uLong nCount = GetAttrCount();
             if( nCount )
             {
                 SbxInfoRef xInfo = pObj->GetInfo();
@@ -1422,7 +1422,7 @@ void SvMetaType::FillSbxObject( SbxVariable * pObj, BOOL bVariable )
                     xInfo = new SbxInfo();
                     pObj->SetInfo( xInfo );
                 }
-                for( ULONG n = nCount; n > 0; n-- )
+                for( sal_uLong n = nCount; n > 0; n-- )
                     pAttrList->GetObject( n -1 )->FillSbxObject( xInfo );
             }
         }
@@ -1454,18 +1454,18 @@ ByteString SvMetaType::GetCString() const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
                                      SvTokenStream & rInStm )
 {
-    BOOL bOk = FALSE;
-    UINT32  nTokPos = rInStm.Tell();
+    sal_Bool bOk = sal_False;
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( SvHash_interface() )
       || pTok->Is( SvHash_shell() ) )
     {
         if( pTok->Is( SvHash_shell() ) )
-            bIsShell = TRUE;
+            bIsShell = sal_True;
         SetType( TYPE_CLASS );
         bOk = ReadNamesSvIdl( rBase, rInStm );
 
@@ -1479,7 +1479,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
     {
         SetType( TYPE_UNION );
         if( ReadNameSvIdl( rBase, rInStm ) )
-            return TRUE;
+            return sal_True;
     }
     else if( pTok->Is( SvHash_enum() ) )
     {
@@ -1490,7 +1490,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
       || pTok->Is( SvHash_item() ) )
     {
           if( pTok->Is( SvHash_item() ) )
-            bIsItem = TRUE;
+            bIsItem = sal_True;
 
         SvMetaType * pType = rBase.ReadKnownType( rInStm );
         if( pType )
@@ -1508,12 +1508,12 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
                     if( rInStm.Read( ')' ) )
                     {
                         SetType( TYPE_METHOD );
-                        bOk = TRUE;
+                        bOk = sal_True;
                     }
                 }
                 else
                 {
-                    bOk = TRUE;
+                    bOk = sal_True;
                 }
             }
         }
@@ -1536,7 +1536,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
                              SvTokenStream & rInStm )
 {
     if( ReadHeaderSvIdl( rBase, rInStm ) )
@@ -1544,7 +1544,7 @@ BOOL SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
         rBase.Write( '.' );
         return SvMetaExtern::ReadSvIdl( rBase, rInStm );
     }
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -1556,14 +1556,14 @@ void SvMetaType::WriteSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     WriteHeaderSvIdl( rBase, rOutStm, nTab );
     if( GetType() == TYPE_METHOD )
         WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
 
-    ULONG nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     rOutStm << endl;
     SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab );
     if( TestAndSeekSpaceOnly( rOutStm, nOldPos ) )
@@ -1578,7 +1578,7 @@ void SvMetaType::WriteSvIdl
 |*    Beschreibung
 *************************************************************************/
 void SvMetaType::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                 USHORT nTab,
+                                 sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     if( GetAttrCount() )
@@ -1602,7 +1602,7 @@ void SvMetaType::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                          USHORT nTab,
+                          sal_uInt16 nTab,
                          WriteType nT, WriteAttribute nA )
 {
     if( nT == WRITE_C_HEADER && nType != TYPE_ENUM )
@@ -1686,14 +1686,14 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
                                      SvTokenStream & rInStm )
 {
-    BOOL bOk = ReadNameSvIdl( rBase, rInStm );
+    sal_Bool bOk = ReadNameSvIdl( rBase, rInStm );
 /*
     if( bOk )
     {
-        UINT32 nTokPos = rInStm.Tell();
+        sal_uInt32 nTokPos = rInStm.Tell();
         SvToken * pTok = rInStm.GetToken_Next();
 
         if( pTok->IsIdentifier() )
@@ -1721,7 +1721,7 @@ BOOL SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
 *************************************************************************/
 void SvMetaType::WriteHeaderSvIdl( SvIdlDataBase & rBase,
                                    SvStream & rOutStm,
-                                   USHORT nTab )
+                                   sal_uInt16 nTab )
 {
     switch( nType )
     {
@@ -1800,7 +1800,7 @@ void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 *************************************************************************/
 void SvMetaType::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                                        SvStream & rOutStm,
-                                       USHORT nTab )
+                                       sal_uInt16 nTab )
 {
     SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
     ByteString name = GetName();
@@ -1854,7 +1854,7 @@ void SvMetaType::WriteContextSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     if( GetAttrCount() )
@@ -1879,7 +1879,7 @@ void SvMetaType::WriteContextSvIdl
 |*    Beschreibung
 *************************************************************************/
 void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                   USHORT nTab,
+                                   sal_uInt16 nTab,
                                  WriteType nT, WriteAttribute nA )
 {
     SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
@@ -1890,15 +1890,15 @@ void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*
 |*    Beschreibung
 *************************************************************************/
-ULONG SvMetaType::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray )
 {
-    ULONG nC = 0;
+    sal_uLong nC = 0;
 
     if( GetBaseType()->GetType() == TYPE_STRUCT )
     {
-        ULONG nAttrCount = GetAttrCount();
+        sal_uLong nAttrCount = GetAttrCount();
         // Die einzelnen Attribute schreiben
-        for( ULONG n = 0; n < nAttrCount; n++ )
+        for( sal_uLong n = 0; n < nAttrCount; n++ )
         {
             nC += pAttrList->GetObject( n )->MakeSfx( pAttrArray );
             if( n +1 < nAttrCount )
@@ -1918,8 +1918,8 @@ void SvMetaType::WriteSfxItem(
 
     ByteString  aTypeName = "SfxType";
     ByteString  aAttrArray;
-    ULONG   nAttrCount = MakeSfx( &aAttrArray );
-    //ULONG nAttrCount = GetAttrCount();
+    sal_uLong   nAttrCount = MakeSfx( &aAttrArray );
+    //sal_uLong nAttrCount = GetAttrCount();
     ByteString  aAttrCount( ByteString::CreateFromInt32( nAttrCount ) );
     aTypeName += aAttrCount;
 
@@ -1965,10 +1965,10 @@ void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     if( rInStm.Read( '(' ) )
     {
         //DoReadContextSvIdl( rBase, rInStm, ',' );
@@ -1976,11 +1976,11 @@ BOOL SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
         if( rInStm.Read( ')' ) )
         {
             SetType( TYPE_METHOD );
-            return TRUE;
+            return sal_True;
         }
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -1992,7 +1992,7 @@ void SvMetaType::WriteMethodArgs
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab, WriteType nT
+    sal_uInt16 nTab, WriteType nT
 )
 {
     if( nT == WRITE_IDL )
@@ -2068,7 +2068,7 @@ void SvMetaType::WriteMethodArgs
 
                     default:
                     {
-                        DBG_ASSERT( FALSE, "WriteType not implemented" );
+                        DBG_ASSERT( sal_False, "WriteType not implemented" );
                     }
                 }
                 pAttr = pAttrList->Next();
@@ -2092,7 +2092,7 @@ void SvMetaType::WriteMethodArgs
 |*    Beschreibung
 *************************************************************************/
 void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                 USHORT nTab, WriteType nT )
+                                 sal_uInt16 nTab, WriteType nT )
 {
     switch( nT )
     {
@@ -2110,8 +2110,8 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
 
         case WRITE_ODL:
         {
-            BOOL bIn = GetIn();
-            BOOL bOut = GetOut();
+            sal_Bool bIn = GetIn();
+            sal_Bool bOut = GetOut();
             if( bIn || bOut )
             {
                 if( bIn && bOut )
@@ -2198,7 +2198,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
 
         default:
         {
-            DBG_ASSERT( FALSE, "WriteType not implemented" );
+            DBG_ASSERT( sal_False, "WriteType not implemented" );
         }
     }
 }
@@ -2209,7 +2209,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaType::WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm,
-                             USHORT nTab, WriteType nT )
+                             sal_uInt16 nTab, WriteType nT )
 {
     WriteTypePrefix( rBase, rOutStm, nTab, nT );
     if( GetType() == TYPE_METHOD )
@@ -2232,9 +2232,9 @@ ByteString SvMetaType::GetParserString() const
 
     if( TYPE_METHOD == type || TYPE_STRUCT == type )
     {
-        ULONG nAttrCount = GetAttrCount();
+        sal_uLong nAttrCount = GetAttrCount();
         // Die einzelnen Attribute schreiben
-        for( ULONG n = 0; n < nAttrCount; n++ )
+        for( sal_uLong n = 0; n < nAttrCount; n++ )
         {
             SvMetaAttribute * pT = pAttrList->GetObject( n );
             aPStr += pT->GetType()->GetParserString();
@@ -2264,9 +2264,9 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
 
         if( TYPE_METHOD == type || TYPE_STRUCT == type )
         {
-            ULONG nAttrCount = GetAttrCount();
+            sal_uLong nAttrCount = GetAttrCount();
             // Die einzelnen Attribute schreiben
-            for( ULONG n = 0; n < nAttrCount; n++ )
+            for( sal_uLong n = 0; n < nAttrCount; n++ )
             {
                 SvMetaAttribute * pA = pAttrList->GetObject( n );
                 // Fuer Methoden ist rChief immer ""
@@ -2329,7 +2329,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm )
 {
     SvMetaName::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x02 )
     {
@@ -2345,7 +2345,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
     SvMetaName::Save( rStm );
 
     // Maske erstellen
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aEnumValue.Len() ) nMask |= 0x01;
 
     // Daten schreiben
@@ -2361,12 +2361,12 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
                                  SvTokenStream & rInStm )
 {
     if( !ReadNameSvIdl( rBase, rInStm ) )
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -2376,7 +2376,7 @@ BOOL SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
 |*    Beschreibung
 |*
 *************************************************************************/
-void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
 {
     rOutStm << GetName().GetBuffer();
 }
@@ -2388,7 +2388,7 @@ void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT )
 |*    Beschreibung
 |*
 *************************************************************************/
-void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, USHORT,
+void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16,
                              WriteType nT, WriteAttribute )
 {
     if ( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE )
@@ -2417,7 +2417,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm )
 {
     SvMetaType::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x04 )
     {
@@ -2434,7 +2434,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
     SvMetaType::Save( rStm );
 
     // Maske erstellen
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aEnumValueList.Count() )    nMask |= 0x01;
     if( aPrefix.Len() )             nMask |= 0x02;
 
@@ -2452,10 +2452,10 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
 |*
 *************************************************************************/
 /*
-USHORT SvMetaTypeEnum::GetMaxValue() const
+sal_uInt16 SvMetaTypeEnum::GetMaxValue() const
 {
-    USHORT nMax = 0;
-    for( ULONG n = 0; n < aEnumValueList.Count(); n++ )
+    sal_uInt16 nMax = 0;
+    for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
     {
         SvMetaEnumValue * pObj = aEnumValueList.GetObject( n );
         if( nMax < pObj->GetValue() )
@@ -2476,10 +2476,10 @@ USHORT SvMetaTypeEnum::GetMaxValue() const
 void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
                                        SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
 
     SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue();
-    BOOL bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
+    sal_Bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
     if( bOk )
     {
         if( 0 == aEnumValueList.Count() )
@@ -2487,7 +2487,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
            aPrefix = aEnumVal->GetName();
         else
         {
-            USHORT nPos = aPrefix.Match( aEnumVal->GetName() );
+            sal_uInt16 nPos = aPrefix.Match( aEnumVal->GetName() );
             if( nPos != aPrefix.Len() && nPos != STRING_MATCH )
                 aPrefix.Erase( nPos );
         }
@@ -2506,10 +2506,10 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
 *************************************************************************/
 void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
                                         SvStream & rOutStm,
-                                        USHORT nTab )
+                                        sal_uInt16 nTab )
 {
     WriteTab( rOutStm, nTab +1 );
-    for( ULONG n = 0; n < aEnumValueList.Count(); n++ )
+    for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
     {
         aEnumValueList.GetObject( n )->WriteSvIdl( rBase, rOutStm, nTab );
         if( n +1 != aEnumValueList.Count() )
@@ -2526,18 +2526,18 @@ void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
                                 SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm )
       && GetType() == TYPE_ENUM )
     {
         if( SvMetaName::ReadSvIdl( rBase, rInStm ) )
-             return TRUE;
+             return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -2548,7 +2548,7 @@ BOOL SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
 |*
 *************************************************************************/
 void SvMetaTypeEnum::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                   USHORT nTab )
+                                   sal_uInt16 nTab )
 {
     WriteHeaderSvIdl( rBase, rOutStm, nTab );
     rOutStm << endl;
@@ -2564,7 +2564,7 @@ void SvMetaTypeEnum::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*
 *************************************************************************/
 void SvMetaTypeEnum::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            USHORT nTab,
+                            sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     SvMetaType::Write( rBase, rOutStm, nTab, nT, nA );
@@ -2576,11 +2576,11 @@ void SvMetaTypeEnum::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*    Beschreibung
 *************************************************************************/
 void SvMetaTypeEnum::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                   USHORT nTab,
+                                   sal_uInt16 nTab,
                                  WriteType nT, WriteAttribute nA )
 {
     WriteTab( rOutStm, nTab +1 );
-    for( ULONG n = 0; n < aEnumValueList.Count(); n++ )
+    for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
     {
         aEnumValueList.GetObject( n )->Write( rBase, rOutStm, nTab +1, nT, nA );
 
@@ -2645,7 +2645,7 @@ ByteString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
 
             if ( aType->GetAttrCount() )
             {
-                ULONG nCount = aType->GetAttrCount();
+                sal_uLong nCount = aType->GetAttrCount();
                 SvMetaAttributeMemberList& rList = aType->GetAttrList();
                 SvMetaAttributeMemberList& rOtherList = pAttr->GetType()->GetAttrList();
                 if ( pAttr->GetType()->GetAttrCount() != nCount )
@@ -2654,7 +2654,7 @@ ByteString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
                 }
                 else
                 {
-                    for ( USHORT n=0; n<nCount; n++ )
+                    for ( sal_uInt16 n=0; n<nCount; n++ )
                     {
                         SvMetaAttribute *pAttr1 = rList.GetObject(n);
                         SvMetaAttribute *pAttr2 = rOtherList.GetObject(n);
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index ce2025856676..616ed98d182a 100644..100755
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -169,9 +169,9 @@ void DeInit()
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
+sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
 {
-    for( USHORT n = 0; n < rCommand.aInFileList.Count(); n++ )
+    for( sal_uInt16 n = 0; n < rCommand.aInFileList.Count(); n++ )
     {
         String aFileName ( *rCommand.aInFileList.GetObject( n ) );
         SvFileStream aStm( aFileName, STREAM_STD_READ | STREAM_NOCREATE );
@@ -191,24 +191,24 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
                         aStr = "error during load, file ";
                     aStr += ByteString( aFileName, RTL_TEXTENCODING_UTF8 );
                     fprintf( stderr, "%s\n", aStr.GetBuffer() );
-                    return FALSE;
+                    return sal_False;
                 }
             }
             else
             {
                 SvTokenStream aTokStm( aStm, aFileName );
-                if( !pDataBase->ReadSvIdl( aTokStm, FALSE, rCommand.aPath ) )
-                    return FALSE;
+                if( !pDataBase->ReadSvIdl( aTokStm, sal_False, rCommand.aPath ) )
+                    return sal_False;
             }
         }
         else
         {
             const ByteString aStr( aFileName, RTL_TEXTENCODING_UTF8 );
             fprintf( stderr, "unable to read input file: %s\n", aStr.GetBuffer() );
-            return FALSE;
+            return sal_False;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -218,7 +218,7 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
 |*    Beschreibung
 |*
 *************************************************************************/
-static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
+static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
 {
     // Programmname
     pList->Insert( new String( String::CreateFromAscii(*argv) ), LIST_APPEND );
@@ -228,13 +228,13 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
         { // wenn @, dann Response-Datei
             SvFileStream aStm( String::CreateFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
             if( aStm.GetError() != SVSTREAM_OK )
-                return FALSE;
+                return sal_False;
 
             ByteString aStr;
             while( aStm.ReadLine( aStr ) )
             {
-                USHORT n = 0;
-                USHORT nPos = 1;
+                sal_uInt16 n = 0;
+                sal_uInt16 nPos = 1;
                 while( n != nPos )
                 {
                     while( aStr.GetChar(n) && isspace( aStr.GetChar(n) ) )
@@ -250,7 +250,7 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
         else if( argv[ i ] )
             pList->Insert( new String( String::CreateFromAscii( argv[ i ] ) ), LIST_APPEND );
     }
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -264,7 +264,7 @@ SvCommand::SvCommand( int argc, char ** argv )
     StringList aList;
 
     if( ResponseFile( &aList, argc, argv ) )
-    for( ULONG i = 1; i < aList.Count(); i++ )
+    for( sal_uLong i = 1; i < aList.Count(); i++ )
     {
         String aParam( *aList.GetObject( i ) );
         sal_Unicode aFirstChar( aParam.GetChar(0) );
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 06e7e2d7c69c..dd199ea4261d 100644..100755
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -44,7 +44,7 @@
 *************************************************************************/
 /*
 void PrimeNumber(){
-    USHORT i, n;
+    sal_uInt16 i, n;
     for( i = 5001; i < 5500; i += 2 ){
         for( n = 2; n < i && ((i % n) != 0); n++ );
         if( n == i ){
@@ -56,10 +56,10 @@ void PrimeNumber(){
 */
 
 SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
-    : bExport( FALSE )
+    : bExport( sal_False )
     , nUniqueId( 0 )
     , nVerbosity( rCmd.nVerbosity )
-    , bIsModified( FALSE )
+    , bIsModified( sal_False )
     , aPersStream( *IDLAPP->pClassMgr, NULL )
     , pIdTable( NULL )
 {
@@ -111,8 +111,9 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
         ADD_TYPE( double,    "double", 'F', "double", "Double", "#" );
         ADD_TYPE( SbxObject, "VARIANT", 'o', "C_Object", "Object", "" );
 
+
         // A c h t u n g !!!, bei hinzufuegen von Typen werden alle
-        // bin„ren Datenbasen inkompatibel
+        // bin�ren Datenbasen inkompatibel
 
     /*
         // So tun als ob die Init-Daten auf einem Stream gelesen wurden
@@ -138,7 +139,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
 *************************************************************************/
 SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
 {
-    for( ULONG n = 0; n < aModuleList.Count(); n++ )
+    for( sal_uLong n = 0; n < aModuleList.Count(); n++ )
         if( aModuleList.GetObject( n )->GetName() == rName )
             return aModuleList.GetObject( n );
     return NULL;
@@ -151,12 +152,12 @@ SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
 |*    Beschreibung
 |*
 *************************************************************************/
-#define DATABASE_SIGNATURE  (UINT32)0x13B799F2
+#define DATABASE_SIGNATURE  (sal_uInt32)0x13B799F2
 #define DATABASE_VER 0x0006
-BOOL SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
+sal_Bool SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
 {
-    UINT32  nSig = 0;
-    ULONG   nPos = rStm.Tell();
+    sal_uInt32  nSig = 0;
+    sal_uLong   nPos = rStm.Tell();
     rStm >> nSig;
     rStm.Seek( nPos );
 
@@ -175,8 +176,8 @@ void SvIdlDataBase::Load( SvStream & rStm )
     DBG_ASSERT( aTypeList.Count() == 0, "type list already initialized" );
     SvPersistStream aPStm( *IDLAPP->pClassMgr, &rStm );
 
-    USHORT  nVersion = 0;
-    UINT32  nSig = 0;
+    sal_uInt16  nVersion = 0;
+    sal_uInt32  nSig = 0;
 
     aPStm >> nSig;
     aPStm >> nVersion;
@@ -205,22 +206,22 @@ void SvIdlDataBase::Load( SvStream & rStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-void SvIdlDataBase::Save( SvStream & rStm, UINT32 nFlags )
+void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
 {
     SvPersistStream aPStm( *IDLAPP->pClassMgr, &rStm );
     aPStm.SetContextFlags( nFlags );
 
-    aPStm << (UINT32)DATABASE_SIGNATURE;
-    aPStm << (USHORT)DATABASE_VER;
+    aPStm << (sal_uInt32)DATABASE_SIGNATURE;
+    aPStm << (sal_uInt16)DATABASE_VER;
 
-    BOOL bOnlyStreamedObjs = FALSE;
+    sal_Bool bOnlyStreamedObjs = sal_False;
     if( nFlags & IDL_WRITE_CALLING )
-        bOnlyStreamedObjs = TRUE;
+        bOnlyStreamedObjs = sal_True;
 
     if( bOnlyStreamedObjs )
     {
         SvMetaClassMemberList aList;
-        for( ULONG n = 0; n < GetModuleList().Count(); n++ )
+        for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
         {
             SvMetaModule * pModule = GetModuleList().GetObject( n );
             if( !pModule->IsImported() )
@@ -274,18 +275,18 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvIdlDataBase::FindId( const ByteString & rIdName, ULONG * pVal )
+sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uLong * pVal )
 {
     if( pIdTable )
     {
-        UINT32 nHash;
+        sal_uInt32 nHash;
         if( pIdTable->Test( rIdName, &nHash ) )
         {
             *pVal = pIdTable->Get( nHash )->GetValue();
-            return TRUE;
+            return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -295,18 +296,18 @@ BOOL SvIdlDataBase::FindId( const ByteString & rIdName, ULONG * pVal )
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL SvIdlDataBase::InsertId( const ByteString & rIdName, ULONG nVal )
+sal_Bool SvIdlDataBase::InsertId( const ByteString & rIdName, sal_uLong nVal )
 {
     if( !pIdTable )
         pIdTable = new SvStringHashTable( 20003 );
 
-    UINT32 nHash;
+    sal_uInt32 nHash;
     if( pIdTable->Insert( rIdName, &nHash ) )
     {
         pIdTable->Get( nHash )->SetValue( nVal );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -314,7 +315,7 @@ BOOL SvIdlDataBase::InsertId( const ByteString & rIdName, ULONG nVal )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
+sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
 {
     DirEntry aFullName( rFileName );
     aFullName.Find( GetPath() );
@@ -323,7 +324,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
     while( pIdFile )
     {
         if( *pIdFile == rFileName )
-            return TRUE; // schon eingelesen
+            return sal_True; // schon eingelesen
         pIdFile = aIdFileList.Next();
     }
 
@@ -351,21 +352,21 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                         // Fehler setzen
                         SetError( aStr, pTok );
                         WriteError( aTokStm );
-                        return FALSE;
+                        return sal_False;
                     }
 
-                    ULONG nVal = 0;
-                    BOOL bOk = TRUE;
+                    sal_uLong nVal = 0;
+                    sal_Bool bOk = sal_True;
                     while( bOk )
                     {
                         pTok = aTokStm.GetToken_Next();
                         if( pTok->IsIdentifier() )
                         {
-                            ULONG n;
+                            sal_uLong n;
                             if( FindId( pTok->GetString(), &n ) )
                                 nVal += n;
                             else
-                                bOk = FALSE;
+                                bOk = sal_False;
                         }
                         else if( pTok->IsChar() )
                         {
@@ -383,7 +384,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                                 // Fehler setzen
                                 SetError( aStr, pTok );
                                 WriteError( aTokStm );
-                                return FALSE;
+                                return sal_False;
                             }
                             if( pTok->GetChar() != '+'
                               && pTok->GetChar() != '('
@@ -406,7 +407,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                             ByteString aStr = "hash table overflow: ";
                             SetError( aStr, pTok );
                             WriteError( aTokStm );
-                            return FALSE;
+                            return sal_False;
                         }
                     }
                 }
@@ -431,7 +432,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                             // Fehler setzen
                             SetError( aStr, pTok );
                             WriteError( aTokStm );
-                            return FALSE;
+                            return sal_False;
                         }
                     }
                     if( !ReadIdFile( String::CreateFromAscii(aName.GetBuffer()) ) )
@@ -440,7 +441,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                         aStr += aName;
                         SetError( aStr, pTok );
                         WriteError( aTokStm );
-                        return FALSE;
+                        return sal_False;
                     }
                 }
             }
@@ -449,8 +450,8 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
         }
     }
     else
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -482,39 +483,39 @@ SvMetaType * SvIdlDataBase::FindType( const ByteString & rName )
 *************************************************************************/
 SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
 {
-    BOOL bIn    = FALSE;
-    BOOL bOut   = FALSE;
+    sal_Bool bIn    = sal_False;
+    sal_Bool bOut   = sal_False;
     int nCall0  = CALL_VALUE;
     int nCall1  = CALL_VALUE;
-    BOOL bSet   = FALSE; //irgent ein Attribut gesetzt
+    sal_Bool bSet   = sal_False; //irgent ein Attribut gesetzt
 
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->HasHash() )
     {
-        UINT32 nBeginPos = 0; // kann mit Tell nicht vorkommen
+        sal_uInt32 nBeginPos = 0; // kann mit Tell nicht vorkommen
         while( nBeginPos != rInStm.Tell() )
         {
             nBeginPos = rInStm.Tell();
             if( pTok->Is( SvHash_in() ) )
             {
-                bIn  = TRUE;
+                bIn  = sal_True;
                 pTok = rInStm.GetToken_Next();
-                bSet = TRUE;
+                bSet = sal_True;
             }
             if( pTok->Is( SvHash_out() ) )
             {
-                bOut = TRUE;
+                bOut = sal_True;
                 pTok = rInStm.GetToken_Next();
-                bSet = TRUE;
+                bSet = sal_True;
             }
             if( pTok->Is( SvHash_inout() ) )
             {
-                bIn  = TRUE;
-                bOut = TRUE;
+                bIn  = sal_True;
+                bOut = sal_True;
                 pTok = rInStm.GetToken_Next();
-                bSet = TRUE;
+                bSet = sal_True;
             }
         }
     }
@@ -550,7 +551,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
                                                             CALL_POINTER;
                         rInStm.GetToken_Next();
                     }
-                    bSet = TRUE;
+                    bSet = sal_True;
                 }
             }
             /*
@@ -602,7 +603,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
                                noch gelesen werden. */
 )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
 
     if( !pType )
         pType = ReadKnownType( rInStm );
@@ -614,7 +615,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
 /*
         SvToken * pTok = rInStm.GetToken_Next();
         if( pTok->IsIdentifier() )
-            for( ULONG n = 0; n < aAttrList.Count(); n++ )
+            for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
             {
                 SvMetaAttribute * pAttr = aAttrList.GetObject( n );
                 if( pAttr->GetName() == pTok->GetString() )
@@ -628,10 +629,10 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
         SvToken * pTok = rInStm.GetToken_Next();
         if( pTok->IsIdentifier() )
         {
-            ULONG n;
+            sal_uLong n;
             if( FindId( pTok->GetString(), &n ) )
             {
-                for( ULONG i = 0; i < aAttrList.Count(); i++ )
+                for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
                 {
                     SvMetaAttribute * pAttr = aAttrList.GetObject( i );
                     if( pAttr->GetSlotId() == pTok->GetString() )
@@ -654,10 +655,10 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr
     const SvNumberIdentifier& rId
 )
 {
-    ULONG n;
+    sal_uLong n;
     if( FindId( rId, &n ) )
     {
-        for( ULONG i = 0; i < aAttrList.Count(); i++ )
+        for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
         {
             SvMetaAttribute * pAttr = aAttrList.GetObject( i );
             if( pAttr->GetSlotId() == rId )
@@ -675,11 +676,11 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr
 *************************************************************************/
 SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->IsIdentifier() )
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( pClass->GetName() == pTok->GetString() )
@@ -709,7 +710,7 @@ void SvIdlDataBase::Write( const ByteString & rText )
 void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
                                 const ByteString & rFileName,
                                 const ByteString & rErrorText,
-                                ULONG nRow, ULONG nColumn ) const
+                                sal_uLong nRow, sal_uLong nColumn ) const
 {
     //Fehlerbehandlung
     fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n",
@@ -731,7 +732,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
     //Fehlerbehandlung
     String aFileName( rInStm.GetFileName() );
     ByteString aErrorText;
-    ULONG   nRow = 0, nColumn = 0;
+    sal_uLong   nRow = 0, nColumn = 0;
 
     rInStm.SeekEnd();
     SvToken *pTok = rInStm.GetToken();
@@ -805,11 +806,11 @@ SvIdlWorkingBase::SvIdlWorkingBase(const SvCommand& rCmd) : SvIdlDataBase(rCmd)
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, BOOL bImported, const String & rPath )
+sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported, const String & rPath )
 {
     aPath = rPath; // nur fuer den durchlauf gueltig
     SvToken * pTok;
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
         pTok = rInStm.GetToken();
         // nur ein import ganz am Anfang
         if( pTok->Is( SvHash_import() ) )
@@ -833,34 +834,34 @@ BOOL SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, BOOL bImported, const
                             aStr += ByteString( aFullName.GetFull(), RTL_TEXTENCODING_UTF8 );
                             SetError( aStr, pTok );
                             WriteError( rInStm );
-                            bOk = FALSE;
+                            bOk = sal_False;
                         }
                         else
                         {
                             aStm.Seek( 0 );
                             aStm.ResetError();
                             SvTokenStream aTokStm( aStm, aFullName.GetFull() );
-                            bOk = ReadSvIdl( aTokStm, TRUE, rPath );
+                            bOk = ReadSvIdl( aTokStm, sal_True, rPath );
                         }
                     }
                 }
                 else
-                    bOk = FALSE;
+                    bOk = sal_False;
             }
             else
-                bOk = FALSE;
+                bOk = sal_False;
         }
 
-    UINT32 nBeginPos = 0xFFFFFFFF; // kann mit Tell nicht vorkommen
+    sal_uInt32 nBeginPos = 0xFFFFFFFF; // kann mit Tell nicht vorkommen
 
     while( bOk && nBeginPos != rInStm.Tell() )
     {
         nBeginPos = rInStm.Tell();
         pTok = rInStm.GetToken();
         if( pTok->IsEof() )
-            return TRUE;
+            return sal_True;
         if( pTok->IsEmpty() )
-            bOk = FALSE;
+            bOk = sal_False;
 
         // nur ein import ganz am Anfang
         /*else */if( pTok->Is( SvHash_module() ) )
@@ -869,18 +870,18 @@ BOOL SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, BOOL bImported, const
             if( aModule->ReadSvIdl( *this, rInStm ) )
                 GetModuleList().Append( aModule );
             else
-                bOk = FALSE;
+                bOk = sal_False;
         }
         else
-            bOk = FALSE;
+            bOk = sal_False;
     }
     if( !bOk || !pTok->IsEof() )
     {
          //Fehlerbehandlung
          WriteError( rInStm );
-         return FALSE;
+         return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -888,10 +889,10 @@ BOOL SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, BOOL bImported, const
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
+sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
 {
     if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
 
     SvStringHashList aList;
     if( GetIdTable() )
@@ -909,13 +910,13 @@ BOOL SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
         }
     }
 
-    for( ULONG n = 0; n < GetModuleList().Count(); n++ )
+    for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
         //if( !pModule->IsImported() )
             pModule->WriteSvIdl( *this, rOutStm, 0 );
     }
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -923,15 +924,15 @@ BOOL SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
+sal_Bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
 {
     if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
 
     // alle Tmp-Variablen fuer das Schreiben zuruecksetzen
     WriteReset();
     SvMemoryStream aTmpStm( 256000, 256000 );
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
@@ -946,16 +947,16 @@ BOOL SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
     }
     aUsedTypes.Clear();
     rOutStm << aTmpStm;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
+sal_Bool SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
 {
     if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
 
     Table aIdTable;
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
@@ -970,7 +971,7 @@ BOOL SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
         pAttr->WriteHelpId( *this, rOutStm, &aIdTable );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -978,9 +979,9 @@ BOOL SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvIdlWorkingBase::WriteSfxItem( SvStream & )
+sal_Bool SvIdlWorkingBase::WriteSfxItem( SvStream & )
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SvIdlDataBase::StartNewFile( const String& rName )
@@ -992,14 +993,14 @@ void SvIdlDataBase::AppendAttr( SvMetaAttribute *pAttr )
 {
     aAttrList.Append( pAttr );
     if ( bExport )
-        pAttr->SetNewAttribute( TRUE );
+        pAttr->SetNewAttribute( sal_True );
 }
 
-BOOL SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
+sal_Bool SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
 {
     SvMetaAttributeMemberList &rList = GetAttrList();
-    ULONG nCount = rList.Count();
-    for ( ULONG n=0; n<nCount; n++ )
+    sal_uLong nCount = rList.Count();
+    for ( sal_uLong n=0; n<nCount; n++ )
     {
         if ( rList.GetObject(n)->IsNewAttribute() )
         {
@@ -1008,9 +1009,9 @@ BOOL SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
     }
 
     if ( rStrm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
     else
-        return TRUE;
+        return sal_True;
 }
 
 /*************************************************************************
@@ -1018,18 +1019,18 @@ BOOL SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
 |*
 |*    Beschreibung
 *************************************************************************/
-BOOL SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
+sal_Bool SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
 {
     if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
 
-    for( ULONG n = 0; n < GetModuleList().Count(); n++ )
+    for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
         if( !pModule->IsImported() )
             pModule->Write( *this, rOutStm, 0, WRITE_DOCU );
     }
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 4956cc9392a0..d213fc06b16a 100644..100755
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -93,7 +93,7 @@ IdlDll::~IdlDll()
 *************************************************************************/
 inline SvStringHashEntry * INS( const ByteString & rName )
 {
-    UINT32  nIdx;
+    sal_uInt32  nIdx;
     IDLAPP->pHashTable->Insert( rName, &nIdx );
     return (SvStringHashEntry * )IDLAPP->pHashTable->Get( nIdx );
 }
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index d37bde0afc51..d2884464b5a7 100644..100755
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -37,19 +37,19 @@
 #include <tools/string.hxx>
 
 #define BR 0x8000
-BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVerschieben )
+sal_Bool FileMove_Impl( const String & rFile1, const String & rFile2, sal_Bool bImmerVerschieben )
 {
     //printf( "Move from %s to %s\n", rFile2.GetStr(), rFile1.GetStr() );
-    ULONG nC1 = 0;
-    ULONG nC2 = 1;
+    sal_uLong nC1 = 0;
+    sal_uLong nC2 = 1;
     if( !bImmerVerschieben )
     {
         SvFileStream aOutStm1( rFile1, STREAM_STD_READ );
         SvFileStream aOutStm2( rFile2, STREAM_STD_READ );
         if( aOutStm1.GetError() == SVSTREAM_OK )
         {
-            BYTE * pBuf1 = new BYTE[ BR ];
-            BYTE * pBuf2 = new BYTE[ BR ];
+            sal_uInt8 * pBuf1 = new sal_uInt8[ BR ];
+            sal_uInt8 * pBuf2 = new sal_uInt8[ BR ];
             nC1 = aOutStm1.Read( pBuf1, BR );
             nC2 = aOutStm2.Read( pBuf2, BR );
             while( nC1 == nC2 )
@@ -82,7 +82,7 @@ BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVer
             // Beide Dateien loeschen
             aF1.Kill();
             aF2.Kill();
-            return FALSE;
+            return sal_False;
         }
 /*
         else
@@ -91,7 +91,7 @@ BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVer
                      rFile2.GetStr(), rFile1.GetStr() );
         }
 */
-        return TRUE;
+        return sal_True;
     }
     return 0 == aF2.Kill();
 }
@@ -312,8 +312,8 @@ int cdecl main ( int argc, char ** argv)
 
     if( nExit == 0 )
     {
-        BOOL bErr = FALSE;
-        BOOL bDoMove = aCommand.aTargetFile.Len() == 0;
+        sal_Bool bErr = sal_False;
+        sal_Bool bDoMove = aCommand.aTargetFile.Len() == 0;
         String aErrFile, aErrFile2;
         if( !bErr && aCommand.aListFile.Len() )
         {
diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx
index 167c11dcc65d..5d163e827239 100644
--- a/linguistic/inc/linguistic/hyphdta.hxx
+++ b/linguistic/inc/linguistic/hyphdta.hxx
@@ -51,18 +51,18 @@ class HyphenatedWord :
 {
     ::rtl::OUString     aWord;
     ::rtl::OUString     aHyphenatedWord;
-    INT16               nHyphPos;
-    INT16               nHyphenationPos;
-    INT16               nLanguage;
-    BOOL                bIsAltSpelling;
+    sal_Int16               nHyphPos;
+    sal_Int16               nHyphenationPos;
+    sal_Int16               nLanguage;
+    sal_Bool                bIsAltSpelling;
 
     // disallow copy-constructor and assignment-operator for now
     HyphenatedWord(const HyphenatedWord &);
     HyphenatedWord & operator = (const HyphenatedWord &);
 
 public:
-    HyphenatedWord(const ::rtl::OUString &rWord, INT16 nLang, INT16 nHyphenationPos,
-                   const ::rtl::OUString &rHyphenatedWord, INT16 nHyphenPos );
+    HyphenatedWord(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+                   const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
     virtual ~HyphenatedWord();
 
     // XHyphenatedWord
@@ -87,10 +87,10 @@ public:
 
     ::rtl::OUString GetWord()           { return aWord; }
     ::rtl::OUString GetHyphenatedWord() { return aHyphenatedWord; }
-    INT16           GetLanguage()       { return nLanguage; }
+    sal_Int16           GetLanguage()       { return nLanguage; }
     void            SetWord( ::rtl::OUString &rTxt )            { aWord = rTxt; }
     void            SetHyphenatedWord( ::rtl::OUString &rTxt )  { aHyphenatedWord = rTxt; }
-    void            SetLanguage( INT16 nLang )                  { nLanguage = nLang; }
+    void            SetLanguage( sal_Int16 nLang )                  { nLanguage = nLang; }
 };
 
 
@@ -104,17 +104,17 @@ class PossibleHyphens :
 {
     ::rtl::OUString             aWord;
     ::rtl::OUString             aWordWithHyphens;
-    ::com::sun::star::uno::Sequence< INT16 >    aOrigHyphenPos;
-    INT16                       nLanguage;
+    ::com::sun::star::uno::Sequence< sal_Int16 >    aOrigHyphenPos;
+    sal_Int16                       nLanguage;
 
     // disallow copy-constructor and assignment-operator for now
     PossibleHyphens(const PossibleHyphens &);
     PossibleHyphens & operator = (const PossibleHyphens &);
 
 public:
-    PossibleHyphens(const ::rtl::OUString &rWord, INT16 nLang,
+    PossibleHyphens(const ::rtl::OUString &rWord, sal_Int16 nLang,
             const ::rtl::OUString &rHyphWord,
-            const ::com::sun::star::uno::Sequence< INT16 > &rPositions);
+            const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
     virtual ~PossibleHyphens();
 
     // XPossibleHyphens
@@ -132,9 +132,9 @@ public:
             throw(::com::sun::star::uno::RuntimeException);
 
     ::rtl::OUString GetWord()       { return aWord; }
-    INT16           GetLanguage()   { return nLanguage; }
+    sal_Int16           GetLanguage()   { return nLanguage; }
     void            SetWord( ::rtl::OUString &rTxt )    { aWord = rTxt; }
-    void            SetLanguage( INT16 nLang )          { nLanguage = nLang; }
+    void            SetLanguage( sal_Int16 nLang )          { nLanguage = nLang; }
 };
 
 
diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx
index 18d125af560e..2deef9539fbc 100644
--- a/linguistic/inc/linguistic/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
@@ -80,12 +80,12 @@ class PropertyChgHelper :
     int     nEvtFlags;  // flags for event types allowed to be launched
 
     // default values
-    BOOL    bIsIgnoreControlCharacters;
-    BOOL    bIsUseDictionaryList;
+    sal_Bool    bIsIgnoreControlCharacters;
+    sal_Bool    bIsUseDictionaryList;
 
     // return values, will be set to default value or current temporary value
-    BOOL    bResIsIgnoreControlCharacters;
-    BOOL    bResIsUseDictionaryList;
+    sal_Bool    bResIsIgnoreControlCharacters;
+    sal_Bool    bResIsUseDictionaryList;
 
 
     // disallow use of copy-constructor and assignment-operator
@@ -102,9 +102,9 @@ protected:
         ::com::sun::star::beans::XPropertySet > &
             GetPropSet()    { return xPropSet; }
 
-    void    AddPropNames( const char *pNewNames[], INT32 nCount );
+    void    AddPropNames( const char *pNewNames[], sal_Int32 nCount );
 
-    virtual BOOL    propertyChange_Impl(
+    virtual sal_Bool    propertyChange_Impl(
                             const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
 
 public:
@@ -155,8 +155,8 @@ public:
         ::com::sun::star::uno::XInterface > &
             GetEvtObj() const       { return xMyEvtObj; }
 
-    BOOL    IsIgnoreControlCharacters() const   { return bResIsIgnoreControlCharacters; }
-    BOOL    IsUseDictionaryList() const         { return bResIsUseDictionaryList; }
+    sal_Bool    IsIgnoreControlCharacters() const   { return bResIsIgnoreControlCharacters; }
+    sal_Bool    IsUseDictionaryList() const         { return bResIsUseDictionaryList; }
 };
 
 
@@ -189,15 +189,15 @@ class PropertyHelper_Spell :
     public PropertyChgHelper
 {
     // default values
-    BOOL    bIsSpellUpperCase;
-    BOOL    bIsSpellWithDigits;
-    BOOL    bIsSpellCapitalization;
+    sal_Bool    bIsSpellUpperCase;
+    sal_Bool    bIsSpellWithDigits;
+    sal_Bool    bIsSpellCapitalization;
 
     // return values, will be set to default value or current temporary value
-    INT16   nResMaxNumberOfSuggestions; // special value that is not part of the property set and thus needs to be handled differently
-    BOOL    bResIsSpellUpperCase;
-    BOOL    bResIsSpellWithDigits;
-    BOOL    bResIsSpellCapitalization;
+    sal_Int16   nResMaxNumberOfSuggestions; // special value that is not part of the property set and thus needs to be handled differently
+    sal_Bool    bResIsSpellUpperCase;
+    sal_Bool    bResIsSpellWithDigits;
+    sal_Bool    bResIsSpellCapitalization;
 
 
     // disallow use of copy-constructor and assignment-operator
@@ -208,7 +208,7 @@ protected:
     // PropertyChgHelper
     virtual void    SetDefaultValues();
     virtual void    GetCurrentValues();
-    virtual BOOL    propertyChange_Impl(
+    virtual sal_Bool    propertyChange_Impl(
                             const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
 
 public:
@@ -226,12 +226,12 @@ public:
         propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
             throw(::com::sun::star::uno::RuntimeException);
 
-    virtual INT16   GetDefaultNumberOfSuggestions() const;
+    virtual sal_Int16   GetDefaultNumberOfSuggestions() const;
 
-    INT16   GetMaxNumberOfSuggestions() const   { return nResMaxNumberOfSuggestions; }
-    BOOL    IsSpellUpperCase() const            { return bResIsSpellUpperCase; }
-    BOOL    IsSpellWithDigits() const           { return bResIsSpellWithDigits; }
-    BOOL    IsSpellCapitalization() const       { return bResIsSpellCapitalization; }
+    sal_Int16   GetMaxNumberOfSuggestions() const   { return nResMaxNumberOfSuggestions; }
+    sal_Bool    IsSpellUpperCase() const            { return bResIsSpellUpperCase; }
+    sal_Bool    IsSpellWithDigits() const           { return bResIsSpellWithDigits; }
+    sal_Bool    IsSpellCapitalization() const       { return bResIsSpellCapitalization; }
 };
 
 ///////////////////////////////////////////////////////////////////////////
@@ -240,12 +240,12 @@ class PropertyHelper_Hyphen :
     public PropertyChgHelper
 {
     // default values
-    INT16   nHyphMinLeading,
+    sal_Int16   nHyphMinLeading,
             nHyphMinTrailing,
             nHyphMinWordLength;
 
     // return values, will be set to default value or current temporary value
-    INT16   nResHyphMinLeading,
+    sal_Int16   nResHyphMinLeading,
             nResHyphMinTrailing,
             nResHyphMinWordLength;
 
@@ -257,7 +257,7 @@ protected:
     // PropertyChgHelper
     virtual void    SetDefaultValues();
     virtual void    GetCurrentValues();
-    virtual BOOL    propertyChange_Impl(
+    virtual sal_Bool    propertyChange_Impl(
                             const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
 
 public:
@@ -275,9 +275,9 @@ public:
         propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
             throw(::com::sun::star::uno::RuntimeException);
 
-    INT16   GetMinLeading() const               { return nResHyphMinLeading; }
-    INT16   GetMinTrailing() const              { return nResHyphMinTrailing; }
-    INT16   GetMinWordLength() const            { return nResHyphMinWordLength; }
+    sal_Int16   GetMinLeading() const               { return nResHyphMinLeading; }
+    sal_Int16   GetMinTrailing() const              { return nResHyphMinTrailing; }
+    sal_Int16   GetMinWordLength() const            { return nResHyphMinWordLength; }
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index f40a0ae55803..2b49f37858c0 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -97,11 +97,11 @@ namespace linguistic
 
 ::osl::Mutex &  GetLinguMutex();
 
-LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang );
+LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang );
 
 ///////////////////////////////////////////////////////////////////////////
 
-rtl_TextEncoding GetTextEncoding( INT16 nLanguage );
+rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage );
 
 inline ::rtl::OUString BS2OU(const ByteString &rText, rtl_TextEncoding nEnc)
 {
@@ -131,9 +131,9 @@ LanguageType
     LanguageToLocale( ::com::sun::star::lang::Locale& rLocale, LanguageType eLang );
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >
-    LangSeqToLocaleSeq( const ::com::sun::star::uno::Sequence< INT16 > &rLangSeq );
+    LangSeqToLocaleSeq( const ::com::sun::star::uno::Sequence< sal_Int16 > &rLangSeq );
 
-::com::sun::star::uno::Sequence< INT16 >
+::com::sun::star::uno::Sequence< sal_Int16 >
     LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence<
         ::com::sun::star::lang::Locale > &rLocaleSeq );
 
@@ -141,17 +141,17 @@ LanguageType
 
 // checks if file pointed to by rURL is readonly
 // and may also check return if such a file exists or not
-BOOL    IsReadOnly( const String &rURL, BOOL *pbExist = 0 );
+sal_Bool    IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 );
 
 // checks if a file with the given URL exists
-BOOL    FileExists( const String &rURL );
+sal_Bool    FileExists( const String &rURL );
 
 #ifdef TL_OUTDATED
 // returns complete file URL for given filename that is to be searched in
 // the specified path
 String  GetFileURL( SvtPathOptions::Pathes ePath, const String &rFileName );
 
-String  GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim = TRUE );
+String  GetModulePath( SvtPathOptions::Pathes ePath, sal_Bool bAddAccessDelim = sal_True );
 #endif
 
 ///////////////////////////////////////////////////////////////////////////
@@ -171,7 +171,7 @@ String     SearchFileInPaths( const String &rFile, const ::com::sun::star::uno::
 
 ///////////////////////////////////////////////////////////////////////////
 
-INT32       GetPosInWordToCheck( const rtl::OUString &rTxt, INT32 nPos );
+sal_Int32       GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos );
 
 ::com::sun::star::uno::Reference<
     ::com::sun::star::linguistic2::XHyphenatedWord >
@@ -181,19 +181,19 @@ INT32       GetPosInWordToCheck( const rtl::OUString &rTxt, INT32 nPos );
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL        IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage );
-BOOL        IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage );
+sal_Bool        IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
+sal_Bool        IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
 
-inline BOOL        IsUpper( const String &rText, INT16 nLanguage )     { return IsUpper( rText, 0, rText.Len(), nLanguage ); }
-inline BOOL        IsLower( const String &rText, INT16 nLanguage )     { return IsLower( rText, 0, rText.Len(), nLanguage ); }
+inline sal_Bool        IsUpper( const String &rText, sal_Int16 nLanguage )     { return IsUpper( rText, 0, rText.Len(), nLanguage ); }
+inline sal_Bool        IsLower( const String &rText, sal_Int16 nLanguage )     { return IsLower( rText, 0, rText.Len(), nLanguage ); }
 
-String      ToLower( const String &rText, INT16 nLanguage );
-String      ToUpper( const String &rText, INT16 nLanguage );
-String      ToTitle( const String &rText, INT16 nLanguage );
-sal_Unicode ToLower( const sal_Unicode cChar, INT16 nLanguage );
-sal_Unicode ToUpper( const sal_Unicode cChar, INT16 nLanguage );
-BOOL        HasDigits( const ::rtl::OUString &rText );
-BOOL        IsNumeric( const String &rText );
+String      ToLower( const String &rText, sal_Int16 nLanguage );
+String      ToUpper( const String &rText, sal_Int16 nLanguage );
+String      ToTitle( const String &rText, sal_Int16 nLanguage );
+sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage );
+sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage );
+sal_Bool        HasDigits( const ::rtl::OUString &rText );
+sal_Bool        IsNumeric( const String &rText );
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -205,11 +205,11 @@ BOOL        IsNumeric( const String &rText );
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties,
+sal_Bool IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > &rxPropSet );
 
-BOOL IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties,
+sal_Bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > &rxPropSet );
 
@@ -217,8 +217,8 @@ BOOL IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rPrope
     ::com::sun::star::linguistic2::XDictionaryEntry >
         SearchDicList(
             const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList >& rDicList,
-            const ::rtl::OUString& rWord, INT16 nLanguage,
-            BOOL bSearchPosDics, BOOL bSearchSpellEntry );
+            const ::rtl::OUString& rWord, sal_Int16 nLanguage,
+            sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry );
 
 sal_uInt8 AddEntryToDic(
     ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >  &rxDic,
diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index f4d0f5c660ce..7ab7cab06b56 100644
--- a/linguistic/inc/linguistic/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
@@ -61,21 +61,21 @@ namespace linguistic
         MergeProposalSeqs(
                 ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt1,
                 ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt2,
-                BOOL bAllowDuplicates );
+                sal_Bool bAllowDuplicates );
 
 void    SeqRemoveNegEntries(
                 ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq,
                 ::com::sun::star::uno::Reference<
                     ::com::sun::star::linguistic2::XDictionaryList > &rxDicList,
-                INT16 nLanguage );
+                sal_Int16 nLanguage );
 
-BOOL    SeqHasEntry(
+sal_Bool    SeqHasEntry(
                 const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq,
                 const ::rtl::OUString &rTxt);
 
 ///////////////////////////////////////////////////////////////////////////
 
-void SearchSimilarText( const rtl::OUString &rText, INT16 nLanguage,
+void SearchSimilarText( const rtl::OUString &rText, sal_Int16 nLanguage,
         ::com::sun::star::uno::Reference<
             ::com::sun::star::linguistic2::XDictionaryList > &xDicList,
         std::vector< rtl::OUString > & rDicListProps );
@@ -92,8 +92,8 @@ class SpellAlternatives :
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString >  aAlt;   // list of alternatives, may be empty.
     ::rtl::OUString         aWord;
-    INT16                   nType;          // type of failure
-    INT16                   nLanguage;
+    sal_Int16                   nType;          // type of failure
+    sal_Int16                   nLanguage;
 
     // disallow copy-constructor and assignment-operator for now
     SpellAlternatives(const SpellAlternatives &);
@@ -101,9 +101,9 @@ class SpellAlternatives :
 
 public:
     SpellAlternatives();
-    SpellAlternatives(const ::rtl::OUString &rWord, INT16 nLang, INT16 nFailureType,
+    SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
                       const ::rtl::OUString &rRplcWord );
-    SpellAlternatives(const ::rtl::OUString &rWord, INT16 nLang, INT16 nFailureType,
+    SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
                       const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlternatives );
     virtual ~SpellAlternatives();
 
@@ -119,8 +119,8 @@ public:
     virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException);
 
     // non-interface specific functions
-    void    SetWordLanguage(const ::rtl::OUString &rWord, INT16 nLang);
-    void    SetFailureType(INT16 nTypeP);
+    void    SetWordLanguage(const ::rtl::OUString &rWord, sal_Int16 nLang);
+    void    SetFailureType(sal_Int16 nTypeP);
     void    SetAlternatives(
                 const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
 };
diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx
index 1b262ab73da7..2267a7d4c2fd 100644
--- a/linguistic/inc/thesdta.hxx
+++ b/linguistic/inc/thesdta.hxx
@@ -51,7 +51,7 @@ class ThesaurusMeaning :
 protected:
     ::rtl::OUString aText;              // one of the found 'meanings' for the looked up text
     ::rtl::OUString aLookUpText;        // text that was looked up in the thesaurus
-    INT16           nLookUpLanguage;    // language of the text that was looked up
+    sal_Int16           nLookUpLanguage;    // language of the text that was looked up
 
     // disallow copy-constructor and assignment-operator for now
     ThesaurusMeaning(const ThesaurusMeaning &);
@@ -59,7 +59,7 @@ protected:
 
 public:
     ThesaurusMeaning(const ::rtl::OUString &rText,
-            const ::rtl::OUString &rLookUpText, INT16 nLookUpLang );
+            const ::rtl::OUString &rLookUpText, sal_Int16 nLookUpLang );
     virtual ~ThesaurusMeaning();
 
     // XMeaning
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index e7c52b500817..2f2fa78b8f72 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -110,7 +110,7 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
 
     SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xIn ) );
 
-    ULONG nError = sal::static_int_cast< ULONG >(-1);
+    sal_uLong nError = sal::static_int_cast< sal_uLong >(-1);
 
     // prepare ParserInputSource
     xml::sax::InputSource aParserInput;
@@ -162,9 +162,9 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
     }
 }
 
-BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType )
+sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if (rFileURL.Len() == 0)
         return bRes;
@@ -205,9 +205,9 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType )
 
 ConvDic::ConvDic(
         const String &rName,
-        INT16 nLang,
+        sal_Int16 nLang,
         sal_Int16 nConvType,
-             BOOL bBiDirectional,
+             sal_Bool bBiDirectional,
         const String &rMainURL) :
     aFlushListeners( GetLinguMutex() )
 {
@@ -222,30 +222,30 @@ ConvDic::ConvDic(
         pConvPropType = std::auto_ptr< PropTypeMap >( new PropTypeMap );
 
     nMaxLeftCharCount = nMaxRightCharCount = 0;
-    bMaxCharCountIsValid = TRUE;
+    bMaxCharCountIsValid = sal_True;
 
-    bNeedEntries = TRUE;
-    bIsModified  = bIsActive = FALSE;
-    bIsReadonly = FALSE;
+    bNeedEntries = sal_True;
+    bIsModified  = bIsActive = sal_False;
+    bIsReadonly = sal_False;
 
     if( rMainURL.Len() > 0 )
     {
-        BOOL bExists = FALSE;
+        sal_Bool bExists = sal_False;
         bIsReadonly = IsReadOnly( rMainURL, &bExists );
 
         if( !bExists )  // new empty dictionary
         {
-            bNeedEntries = FALSE;
+            bNeedEntries = sal_False;
             //! create physical representation of an **empty** dictionary
             //! that could be found by the dictionary-list implementation
             // (Note: empty dictionaries are not just empty files!)
             Save();
-            bIsReadonly = IsReadOnly( rMainURL );   // will be FALSE if Save was succesfull
+            bIsReadonly = IsReadOnly( rMainURL );   // will be sal_False if Save was succesfull
         }
     }
     else
     {
-        bNeedEntries = FALSE;
+        bNeedEntries = sal_False;
     }
 }
 
@@ -260,12 +260,12 @@ void ConvDic::Load()
     DBG_ASSERT( !bIsModified, "dictionary is modified. Really do 'Load'?" );
 
     //!! prevent function from being called recursively via HasEntry, AddEntry
-    bNeedEntries = FALSE;
+    bNeedEntries = sal_False;
     ConvDicXMLImport *pImport = new ConvDicXMLImport( this, aMainURL );
     //!! keep a first reference to ensure the lifetime of the object !!
     uno::Reference< XInterface > xRef( (document::XFilter *) pImport, UNO_QUERY );
     ReadThroughDic( aMainURL, *pImport );    // will implicitly add the entries
-    bIsModified = FALSE;
+    bIsModified = sal_False;
 }
 
 
@@ -326,7 +326,7 @@ void ConvDic::Save()
         sal_Bool bRet = pExport->Export();     // write entries to file
         DBG_ASSERT( !pStream->GetError(), "I/O error while writing to stream" );
         if (bRet)
-            bIsModified = FALSE;
+            bIsModified = sal_False;
     }
     DBG_ASSERT( !bIsModified, "dictionary still modified after save. Save failed?" );
 }
@@ -348,7 +348,7 @@ ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const rtl::OUString &rFirstT
 }
 
 
-BOOL ConvDic::HasEntry( const OUString &rLeftText, const OUString &rRightText )
+sal_Bool ConvDic::HasEntry( const OUString &rLeftText, const OUString &rRightText )
 {
     if (bNeedEntries)
         Load();
@@ -375,7 +375,7 @@ void ConvDic::AddEntry( const OUString &rLeftText, const OUString &rRightText )
             nMaxRightCharCount  = (sal_Int16) rRightText.getLength();
     }
 
-    bIsModified = TRUE;
+    bIsModified = sal_True;
 }
 
 
@@ -395,8 +395,8 @@ void ConvDic::RemoveEntry( const OUString &rLeftText, const OUString &rRightText
         pFromRight->erase( aRightIt );
     }
 
-    bIsModified = TRUE;
-    bMaxCharCountIsValid = FALSE;
+    bIsModified = sal_True;
+    bMaxCharCountIsValid = sal_False;
 }
 
 
@@ -447,11 +447,11 @@ void SAL_CALL ConvDic::clear(  )
     aFromLeft .clear();
     if (pFromRight.get())
         pFromRight->clear();
-    bNeedEntries    = FALSE;
-    bIsModified     = TRUE;
+    bNeedEntries    = sal_False;
+    bIsModified     = sal_True;
     nMaxLeftCharCount       = 0;
     nMaxRightCharCount      = 0;
-    bMaxCharCountIsValid    = TRUE;
+    bMaxCharCountIsValid    = sal_True;
 }
 
 
@@ -477,14 +477,14 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversions(
     pair< ConvMap::iterator, ConvMap::iterator > aRange =
             rConvMap.equal_range( aLookUpText );
 
-    INT32 nCount = 0;
+    sal_Int32 nCount = 0;
     ConvMap::iterator aIt;
     for (aIt = aRange.first;  aIt != aRange.second;  ++aIt)
         ++nCount;
 
     uno::Sequence< OUString > aRes( nCount );
     OUString *pRes = aRes.getArray();
-    INT32 i = 0;
+    sal_Int32 i = 0;
     for (aIt = aRange.first;  aIt != aRange.second;  ++aIt)
         pRes[i++] = (*aIt).second;
 
@@ -492,19 +492,19 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversions(
 }
 
 
-static BOOL lcl_SeqHasEntry(
+static sal_Bool lcl_SeqHasEntry(
     const OUString *pSeqStart,  // first element to check
-    INT32 nToCheck,             // number of elements to check
+    sal_Int32 nToCheck,             // number of elements to check
     const OUString &rText)
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (pSeqStart && nToCheck > 0)
     {
         const OUString *pDone = pSeqStart + nToCheck;   // one behind last to check
         while (!bRes && pSeqStart != pDone)
         {
             if (*pSeqStart++ == rText)
-                bRes = TRUE;
+                bRes = sal_True;
         }
     }
     return bRes;
@@ -527,7 +527,7 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversionEntries(
     uno::Sequence< OUString > aRes( rConvMap.size() );
     OUString *pRes = aRes.getArray();
     ConvMap::iterator aIt = rConvMap.begin();
-    INT32 nIdx = 0;
+    sal_Int32 nIdx = 0;
     while (aIt != rConvMap.end())
     {
         OUString aCurEntry( (*aIt).first );
@@ -612,7 +612,7 @@ sal_Int16 SAL_CALL ConvDic::getMaxCharCount( ConversionDirection eDirection )
             }
         }
 
-        bMaxCharCountIsValid = TRUE;
+        bMaxCharCountIsValid = sal_True;
     }
     sal_Int16 nRes = eDirection == ConversionDirection_FROM_LEFT ?
             nMaxLeftCharCount : nMaxRightCharCount;
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 983b06704653..77346927df9b 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -52,7 +52,7 @@ class SvStream;
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL    IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType );
+sal_Bool    IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType );
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -104,15 +104,15 @@ protected:
 
     String          aMainURL;   // URL to file
     rtl::OUString   aName;
-    INT16           nLanguage;
+    sal_Int16           nLanguage;
     sal_Int16       nConversionType;
     sal_Int16       nMaxLeftCharCount;
     sal_Int16       nMaxRightCharCount;
-    BOOL            bMaxCharCountIsValid;
-    BOOL            bNeedEntries;
-    BOOL            bIsModified;
-    BOOL            bIsActive;
-    BOOL            bIsReadonly;
+    sal_Bool            bMaxCharCountIsValid;
+    sal_Bool            bNeedEntries;
+    sal_Bool            bIsModified;
+    sal_Bool            bIsActive;
+    sal_Bool            bIsReadonly;
 
     // disallow copy-constructor and assignment-operator for now
     ConvDic(const ConvDic &);
@@ -124,9 +124,9 @@ protected:
 
 public:
     ConvDic( const String &rName,
-             INT16 nLanguage,
+             sal_Int16 nLanguage,
              sal_Int16 nConversionType,
-             BOOL bBiDirectional,
+             sal_Bool bBiDirectional,
              const String &rMainURL);
     virtual ~ConvDic();
 
@@ -163,7 +163,7 @@ public:
     static com::sun::star::uno::Sequence< ::rtl::OUString >
         getSupportedServiceNames_Static() throw();
 
-    BOOL    HasEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
+    sal_Bool    HasEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
     void    AddEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
     void    RemoveEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
 };
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 7f4dc8a913a0..f1af7ea597df 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -113,7 +113,7 @@ class ConvDicNameContainer :
     ConvDicNameContainer(const ConvDicNameContainer &);
     ConvDicNameContainer & operator = (const ConvDicNameContainer &);
 
-    INT32 GetIndexByName_Impl( const OUString& rName );
+    sal_Int32 GetIndexByName_Impl( const OUString& rName );
 
 public:
     ConvDicNameContainer( ConvDicList &rMyConvDicList );
@@ -143,10 +143,10 @@ public:
     // calls Flush for the dictionaries that support XFlushable
     void    FlushDics() const;
 
-    INT32   GetCount() const    { return aConvDics.getLength(); }
+    sal_Int32   GetCount() const    { return aConvDics.getLength(); }
     uno::Reference< XConversionDictionary > GetByName( const OUString& rName );
 
-    const uno::Reference< XConversionDictionary >    GetByIndex( INT32 nIdx )
+    const uno::Reference< XConversionDictionary >    GetByIndex( sal_Int32 nIdx )
     {
         return aConvDics.getConstArray()[nIdx];
     }
@@ -166,9 +166,9 @@ ConvDicNameContainer::~ConvDicNameContainer()
 
 void ConvDicNameContainer::FlushDics() const
 {
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nLen = aConvDics.getLength();
     const uno::Reference< XConversionDictionary > *pDic = aConvDics.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         uno::Reference< util::XFlushable > xFlush( pDic[i] , UNO_QUERY );
         if (xFlush.is())
@@ -186,13 +186,13 @@ void ConvDicNameContainer::FlushDics() const
 }
 
 
-INT32 ConvDicNameContainer::GetIndexByName_Impl(
+sal_Int32 ConvDicNameContainer::GetIndexByName_Impl(
         const OUString& rName )
 {
-    INT32 nRes = -1;
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nRes = -1;
+    sal_Int32 nLen = aConvDics.getLength();
     const uno::Reference< XConversionDictionary > *pDic = aConvDics.getConstArray();
-    for (INT32 i = 0;  i < nLen && nRes == -1;  ++i)
+    for (sal_Int32 i = 0;  i < nLen && nRes == -1;  ++i)
     {
         if (rName == pDic[i]->getName())
             nRes = i;
@@ -205,7 +205,7 @@ uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName(
         const OUString& rName )
 {
     uno::Reference< XConversionDictionary > xRes;
-    INT32 nIdx = GetIndexByName_Impl( rName );
+    sal_Int32 nIdx = GetIndexByName_Impl( rName );
     if ( nIdx != -1)
         xRes = aConvDics.getArray()[nIdx];
     return xRes;
@@ -244,11 +244,11 @@ uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames(  )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nLen = aConvDics.getLength();
     uno::Sequence< OUString > aRes( nLen );
     OUString *pName = aRes.getArray();
     const uno::Reference< XConversionDictionary > *pDic = aConvDics.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
         pName[i] = pDic[i]->getName();
     return aRes;
 }
@@ -269,7 +269,7 @@ void SAL_CALL ConvDicNameContainer::replaceByName(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nRplcIdx = GetIndexByName_Impl( rName );
+    sal_Int32 nRplcIdx = GetIndexByName_Impl( rName );
     if (nRplcIdx == -1)
         throw NoSuchElementException();
     uno::Reference< XConversionDictionary > xNew;
@@ -294,7 +294,7 @@ void SAL_CALL ConvDicNameContainer::insertByName(
     if (!xNew.is() || xNew->getName() != rName)
         throw IllegalArgumentException();
 
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nLen = aConvDics.getLength();
     aConvDics.realloc( nLen + 1 );
     aConvDics.getArray()[ nLen ] = xNew;
 }
@@ -305,7 +305,7 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nRplcIdx = GetIndexByName_Impl( rName );
+    sal_Int32 nRplcIdx = GetIndexByName_Impl( rName );
     if (nRplcIdx == -1)
         throw NoSuchElementException();
 
@@ -333,9 +333,9 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
         }
     }
 
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nLen = aConvDics.getLength();
     uno::Reference< XConversionDictionary > *pDic = aConvDics.getArray();
-    for (INT32 i = nRplcIdx;  i < nLen - 1;  ++i)
+    for (sal_Int32 i = nRplcIdx;  i < nLen - 1;  ++i)
         pDic[i] = pDic[i + 1];
     aConvDics.realloc( nLen - 1 );
 }
@@ -346,11 +346,11 @@ void ConvDicNameContainer::AddConvDics(
         const String &rExtension )
 {
     const Sequence< OUString > aDirCnt(
-                utl::LocalFileHelper::GetFolderContents( rSearchDirPathURL, FALSE ) );
+                utl::LocalFileHelper::GetFolderContents( rSearchDirPathURL, sal_False ) );
     const OUString *pDirCnt = aDirCnt.getConstArray();
-    INT32 nEntries = aDirCnt.getLength();
+    sal_Int32 nEntries = aDirCnt.getLength();
 
-    for (INT32 i = 0;  i < nEntries;  ++i)
+    for (sal_Int32 i = 0;  i < nEntries;  ++i)
     {
         String  aURL( pDirCnt[i] );
 
@@ -362,7 +362,7 @@ void ConvDicNameContainer::AddConvDics(
         if(aExt != aSearchExt)
             continue;          // skip other files
 
-        INT16 nLang;
+        sal_Int16 nLang;
         sal_Int16 nConvType;
         if (IsConvDic( aURL, nLang, nConvType ))
         {
@@ -381,7 +381,7 @@ void ConvDicNameContainer::AddConvDics(
             else if ((nLang == LANGUAGE_CHINESE_SIMPLIFIED || nLang == LANGUAGE_CHINESE_TRADITIONAL) &&
                       nConvType == ConversionDictionaryType::SCHINESE_TCHINESE)
             {
-                xDic = new ConvDic( aDicName, nLang, nConvType, FALSE, aURL );
+                xDic = new ConvDic( aDicName, nLang, nConvType, sal_False, aURL );
             }
 
             if (xDic.is())
@@ -417,7 +417,7 @@ ConvDicList::ConvDicList() :
     aEvtListeners( GetLinguMutex() )
 {
     pNameContainer = 0;
-    bDisposing = FALSE;
+    bDisposing = sal_False;
 
     pExitListener = new MyAppExitListener( *this );
     xExitListener = pExitListener;
@@ -459,9 +459,9 @@ ConvDicNameContainer & ConvDicList::GetNameContainer()
         // access list of text conversion dictionaries to activate
         SvtLinguOptions aOpt;
         SvtLinguConfig().GetOptions( aOpt );
-        INT32 nLen = aOpt.aActiveConvDics.getLength();
+        sal_Int32 nLen = aOpt.aActiveConvDics.getLength();
         const OUString *pActiveConvDics = aOpt.aActiveConvDics.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Reference< XConversionDictionary > xDic =
                     pNameContainer->GetByName( pActiveConvDics[i] );
@@ -502,7 +502,7 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT16 nLang = LocaleToLanguage( rLocale );
+    sal_Int16 nLang = LocaleToLanguage( rLocale );
 
     if (GetNameContainer().hasByName( rName ))
         throw ElementExistException();
@@ -517,7 +517,7 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary(
     else if ((nLang == LANGUAGE_CHINESE_SIMPLIFIED || nLang == LANGUAGE_CHINESE_TRADITIONAL) &&
               nConvDicType == ConversionDictionaryType::SCHINESE_TCHINESE)
     {
-        xRes = new ConvDic( rName, nLang, nConvDicType, FALSE, aDicMainURL );
+        xRes = new ConvDic( rName, nLang, nConvDicType, sal_False, aDicMainURL );
     }
 
     if (!xRes.is())
@@ -545,15 +545,15 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    /*INT16 nLang = LocaleToLanguage( rLocale );*/
+    /*sal_Int16 nLang = LocaleToLanguage( rLocale );*/
 
-    INT32 nCount = 0;
+    sal_Int32 nCount = 0;
     uno::Sequence< OUString > aRes( 20 );
     OUString *pRes = aRes.getArray();
 
     sal_Bool bSupported = sal_False;
-    INT32 nLen = GetNameContainer().GetCount();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    sal_Int32 nLen = GetNameContainer().GetCount();
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const uno::Reference< XConversionDictionary > xDic( GetNameContainer().GetByIndex(i) );
         sal_Bool bMatch =   xDic.is()  &&
@@ -565,7 +565,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions(
             Sequence< OUString > aNewConv( xDic->getConversions(
                                 rText, nStartPos, nLength,
                                 eDirection, nTextConversionOptions ) );
-            INT32 nNewLen = aNewConv.getLength();
+            sal_Int32 nNewLen = aNewConv.getLength();
             if (nNewLen > 0)
             {
                 if (nCount + nNewLen > aRes.getLength())
@@ -574,7 +574,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions(
                     pRes = aRes.getArray();
                 }
                 const OUString *pNewConv = aNewConv.getConstArray();
-                for (INT32 k = 0;  k < nNewLen;  ++k)
+                for (sal_Int32 k = 0;  k < nNewLen;  ++k)
                     pRes[nCount++] = pNewConv[k];
             }
         }
@@ -598,8 +598,8 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount(
 
     sal_Int16 nRes = 0;
     GetNameContainer();
-    INT32 nLen = GetNameContainer().GetCount();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    sal_Int32 nLen = GetNameContainer().GetCount();
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const uno::Reference< XConversionDictionary > xDic( GetNameContainer().GetByIndex(i) );
         if (xDic.is()  &&
@@ -621,7 +621,7 @@ void SAL_CALL ConvDicList::dispose(  )
     MutexGuard  aGuard( GetLinguMutex() );
     if (!bDisposing)
     {
-        bDisposing = TRUE;
+        bDisposing = sal_True;
         EventObject aEvtObj( (XConversionDictionaryList *) this );
         aEvtListeners.disposeAndClear( aEvtObj );
 
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index dec9103d1d51..206f88bf1c22 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -73,7 +73,7 @@ class ConvDicList :
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::
                 XTerminateListener >        xExitListener;
 
-    BOOL                                    bDisposing;
+    sal_Bool                                    bDisposing;
 
     // disallow copy-constructor and assignment-operator for now
     ConvDicList( const ConvDicList & );
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 30ced3ca02cb..64e6f7a071bd 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -129,7 +129,7 @@ public:
 class ConvDicXMLDictionaryContext_Impl :
     public ConvDicXMLImportContext
 {
-    INT16       nLanguage;
+    sal_Int16       nLanguage;
     sal_Int16   nConversionType;
 
 public:
@@ -145,7 +145,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList );
 
-    INT16       GetLanguage() const         { return nLanguage; }
+    sal_Int16       GetLanguage() const         { return nLanguage; }
     sal_Int16   GetConversionType() const   { return nConversionType; }
 };
 
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index d005d51a4b28..edf5ebe104d1 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -89,7 +89,7 @@ class ConvDicXMLImport : public SvXMLImport
                                 //   but the language and conversion type will
                                 //   still be determined!
 
-    INT16           nLanguage;          // language of the dictionary
+    sal_Int16           nLanguage;          // language of the dictionary
     sal_Int16       nConversionType;    // conversion type the dictionary is used for
     sal_Bool        bSuccess;
 
@@ -120,11 +120,11 @@ public:
         const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList > &rxAttrList );
 
     ConvDic *   GetDic()                    { return pDic; }
-    INT16       GetLanguage() const         { return nLanguage; }
+    sal_Int16       GetLanguage() const         { return nLanguage; }
     sal_Int16   GetConversionType() const   { return nConversionType; }
     sal_Bool    GetSuccess() const          { return bSuccess; }
 
-    void        SetLanguage( INT16 nLang )              { nLanguage = nLang; }
+    void        SetLanguage( sal_Int16 nLang )              { nLanguage = nLang; }
     void        SetConversionType( sal_Int16 nType )    { nConversionType = nType; }
 };
 
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 01c6838a4d3d..05924609384f 100755
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -74,32 +74,32 @@ static const sal_Char*      pVerStr5    = "WBSWG5";
 static const sal_Char*      pVerStr6    = "WBSWG6";
 static const sal_Char*      pVerOOo7    = "OOoUserDict1";
 
-static const INT16 DIC_VERSION_DONTKNOW = -1;
-static const INT16 DIC_VERSION_2 = 2;
-static const INT16 DIC_VERSION_5 = 5;
-static const INT16 DIC_VERSION_6 = 6;
-static const INT16 DIC_VERSION_7 = 7;
+static const sal_Int16 DIC_VERSION_DONTKNOW = -1;
+static const sal_Int16 DIC_VERSION_2 = 2;
+static const sal_Int16 DIC_VERSION_5 = 5;
+static const sal_Int16 DIC_VERSION_6 = 6;
+static const sal_Int16 DIC_VERSION_7 = 7;
 
 static sal_Bool getTag(const ByteString &rLine,
         const sal_Char *pTagName, ByteString &rTagValue)
 {
     xub_StrLen nPos = rLine.Search( pTagName );
     if (nPos == STRING_NOTFOUND)
-        return FALSE;
+        return sal_False;
 
     rTagValue = rLine.Copy( nPos + sal::static_int_cast< xub_StrLen >(strlen( pTagName )) ).EraseLeadingAndTrailingChars();
-    return TRUE;
+    return sal_True;
 }
 
 
-INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
+sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNeg )
 {
     // Sniff the header
-    INT16 nDicVersion = DIC_VERSION_DONTKNOW;
+    sal_Int16 nDicVersion = DIC_VERSION_DONTKNOW;
     sal_Char pMagicHeader[MAX_HEADER_LENGTH];
 
     nLng = LANGUAGE_NONE;
-    bNeg = FALSE;
+    bNeg = sal_False;
 
     if (!rpStream.get() || rpStream->GetError())
         return -1;
@@ -140,9 +140,9 @@ INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
             if (getTag(aLine, "type: ", aTagValue))
             {
                 if (aTagValue == "negative")
-                    bNeg = TRUE;
+                    bNeg = sal_True;
                 else
-                    bNeg = FALSE;
+                    bNeg = sal_False;
             }
 
             if (aLine.Search ("---") != STRING_NOTFOUND) // end of header
@@ -153,7 +153,7 @@ INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
     }
     else
     {
-        USHORT nLen;
+        sal_uInt16 nLen;
 
         rpStream->Seek (nSniffPos );
 
@@ -187,7 +187,7 @@ INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
             // Negative Flag
             sal_Char nTmp;
             *rpStream >> nTmp;
-            bNeg = (BOOL)nTmp;
+            bNeg = (sal_Bool)nTmp;
         }
     }
 
@@ -210,15 +210,15 @@ DictionaryNeo::DictionaryNeo() :
 {
     nCount       = 0;
     nDicVersion  = DIC_VERSION_DONTKNOW;
-    bNeedEntries = FALSE;
-    bIsModified  = bIsActive = FALSE;
-    bIsReadonly  = FALSE;
+    bNeedEntries = sal_False;
+    bIsModified  = bIsActive = sal_False;
+    bIsReadonly  = sal_False;
 }
 
 DictionaryNeo::DictionaryNeo(const OUString &rName,
-                             INT16 nLang, DictionaryType eType,
+                             sal_Int16 nLang, DictionaryType eType,
                              const OUString &rMainURL,
-                             BOOL bWriteable) :
+                             sal_Bool bWriteable) :
     aDicEvtListeners( GetLinguMutex() ),
     aDicName        (rName),
     aMainURL        (rMainURL),
@@ -227,13 +227,13 @@ DictionaryNeo::DictionaryNeo(const OUString &rName,
 {
     nCount       = 0;
     nDicVersion  = DIC_VERSION_DONTKNOW;
-    bNeedEntries = TRUE;
-    bIsModified  = bIsActive = FALSE;
+    bNeedEntries = sal_True;
+    bIsModified  = bIsActive = sal_False;
     bIsReadonly = !bWriteable;
 
     if( rMainURL.getLength() > 0 )
     {
-        BOOL bExists = FileExists( rMainURL );
+        sal_Bool bExists = FileExists( rMainURL );
         if( !bExists )
         {
             // save new dictionaries with in Format 7 (UTF8 plain text)
@@ -246,14 +246,14 @@ DictionaryNeo::DictionaryNeo(const OUString &rName,
                     "DictionaryNeo: dictionaries should be writeable if they are to be saved" );
             if (!bIsReadonly)
                 saveEntries( rMainURL );
-            bNeedEntries = FALSE;
+            bNeedEntries = sal_False;
         }
     }
     else
     {
         // non persistent dictionaries (like IgnoreAllList) should always be writable
-        bIsReadonly  = FALSE;
-        bNeedEntries = FALSE;
+        bIsReadonly  = sal_False;
+        bNeedEntries = sal_False;
     }
 }
 
@@ -261,16 +261,16 @@ DictionaryNeo::~DictionaryNeo()
 {
 }
 
-ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
+sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    // counter check that it is safe to set bIsModified to FALSE at
+    // counter check that it is safe to set bIsModified to sal_False at
     // the end of the function
     DBG_ASSERT(!bIsModified, "lng : dictionary already modified!");
 
     // function should only be called once in order to load entries from file
-    bNeedEntries = FALSE;
+    bNeedEntries = sal_False;
 
     if (rMainURL.getLength() == 0)
         return 0;
@@ -291,15 +291,15 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
         (void) e;
     }
     if (!xStream.is())
-        return static_cast< ULONG >(-1);
+        return static_cast< sal_uLong >(-1);
 
     SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
 
-    ULONG nErr = sal::static_int_cast< ULONG >(-1);
+    sal_uLong nErr = sal::static_int_cast< sal_uLong >(-1);
 
     // Header einlesen
-    BOOL bNegativ;
-    USHORT nLang;
+    sal_Bool bNegativ;
+    sal_uInt16 nLang;
     nDicVersion = ReadDicVersion(pStream, nLang, bNegativ);
     if (0 != (nErr = pStream->GetError()))
         return nErr;
@@ -317,7 +317,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
         DIC_VERSION_5 == nDicVersion ||
         DIC_VERSION_2 == nDicVersion)
     {
-        USHORT  nLen = 0;
+        sal_uInt16  nLen = 0;
         sal_Char aWordBuf[ BUFSIZE ];
 
         // Das erste Wort einlesen
@@ -345,7 +345,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
                 String aText( aDummy, eEnc );
                 uno::Reference< XDictionaryEntry > xEntry =
                         new DicEntry( aText, bNegativ );
-                addEntry_Impl( xEntry , TRUE ); //! don't launch events here
+                addEntry_Impl( xEntry , sal_True ); //! don't launch events here
             }
 
             *pStream >> nLen;
@@ -382,7 +382,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
             rtl::OUString aText = rtl::OStringToOUString (aLine, RTL_TEXTENCODING_UTF8);
             uno::Reference< XDictionaryEntry > xEntry =
                     new DicEntry( aText, eDicType == DictionaryType_NEGATIVE );
-            addEntry_Impl( xEntry , TRUE ); //! don't launch events here
+            addEntry_Impl( xEntry , sal_True ); //! don't launch events here
         }
     }
 
@@ -391,7 +391,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
     // since this routine should be called only initialy (prior to any
     // modification to be saved) we reset the bIsModified flag here that
     // was implicitly set by addEntry_Impl
-    bIsModified = FALSE;
+    bIsModified = sal_False;
 
     return pStream->GetError();
 }
@@ -411,7 +411,7 @@ static ByteString formatForSave(
 }
 
 
-ULONG DictionaryNeo::saveEntries(const OUString &rURL)
+sal_uLong DictionaryNeo::saveEntries(const OUString &rURL)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -435,10 +435,10 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL)
         (void) e;
     }
     if (!xStream.is())
-        return static_cast< ULONG >(-1);
+        return static_cast< sal_uLong >(-1);
 
     SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
-    ULONG nErr = sal::static_int_cast< ULONG >(-1);
+    sal_uLong nErr = sal::static_int_cast< sal_uLong >(-1);
 
     //
     // Always write as the latest version, i.e. DIC_VERSION_7
@@ -467,7 +467,7 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL)
     if (0 != (nErr = pStream->GetError()))
         return nErr;
     const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
-    for (INT32 i = 0;  i < nCount;  i++)
+    for (sal_Int32 i = 0;  i < nCount;  i++)
     {
         ByteString aOutStr = formatForSave(pEntry[i], eEnc);
         pStream->WriteLine (aOutStr);
@@ -482,7 +482,7 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL)
     return nErr;
 }
 
-void DictionaryNeo::launchEvent(INT16 nEvent,
+void DictionaryNeo::launchEvent(sal_Int16 nEvent,
                                 uno::Reference< XDictionaryEntry > xEntry)
 {
     MutexGuard  aGuard( GetLinguMutex() );
@@ -503,7 +503,7 @@ void DictionaryNeo::launchEvent(INT16 nEvent,
 
 int DictionaryNeo::cmpDicEntry(const OUString& rWord1,
                                const OUString &rWord2,
-                               BOOL bSimilarOnly)
+                               sal_Bool bSimilarOnly)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -515,7 +515,7 @@ int DictionaryNeo::cmpDicEntry(const OUString& rWord1,
 
     OUString    aWord1( rWord1 ),
                 aWord2( rWord2 );
-    INT32       nLen1 = aWord1.getLength(),
+    sal_Int32       nLen1 = aWord1.getLength(),
                   nLen2 = aWord2.getLength();
     if (bSimilarOnly)
     {
@@ -527,7 +527,7 @@ int DictionaryNeo::cmpDicEntry(const OUString& rWord1,
     }
 
     const sal_Unicode cIgnChar = '=';
-    INT32       nIdx1 = 0,
+    sal_Int32       nIdx1 = 0,
                   nIdx2 = 0,
                   nNumIgnChar1 = 0,
                   nNumIgnChar2 = 0;
@@ -578,17 +578,17 @@ int DictionaryNeo::cmpDicEntry(const OUString& rWord1,
                 nNumIgnChar2++;
         }
 
-        nRes = ((INT32) nLen1 - nNumIgnChar1) - ((INT32) nLen2 - nNumIgnChar2);
+        nRes = ((sal_Int32) nLen1 - nNumIgnChar1) - ((sal_Int32) nLen2 - nNumIgnChar2);
     }
 
     return nRes;
 }
 
-BOOL DictionaryNeo::seekEntry(const OUString &rWord,
-                              INT32 *pPos, BOOL bSimilarOnly)
+sal_Bool DictionaryNeo::seekEntry(const OUString &rWord,
+                              sal_Int32 *pPos, sal_Bool bSimilarOnly)
 {
     // look for entry with binary search.
-    // return TRUE if found FALSE else.
+    // return sal_True if found sal_False else.
     // if pPos != NULL it will become the position of the found entry, or
     // if that was not found the position where it has to be inserted
     // to keep the entries sorted
@@ -596,7 +596,7 @@ BOOL DictionaryNeo::seekEntry(const OUString &rWord,
     MutexGuard  aGuard( GetLinguMutex() );
 
     const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
-    INT32 nUpperIdx = getCount(),
+    sal_Int32 nUpperIdx = getCount(),
           nMidIdx,
           nLowerIdx = 0;
     if( nUpperIdx > 0 )
@@ -612,66 +612,66 @@ BOOL DictionaryNeo::seekEntry(const OUString &rWord,
             if(nCmp == 0)
             {
                 if( pPos ) *pPos = nMidIdx;
-                return TRUE;
+                return sal_True;
             }
             else if(nCmp > 0)
                 nLowerIdx = nMidIdx + 1;
             else if( nMidIdx == 0 )
             {
                 if( pPos ) *pPos = nLowerIdx;
-                return FALSE;
+                return sal_False;
             }
             else
                 nUpperIdx = nMidIdx - 1;
         }
     }
     if( pPos ) *pPos = nLowerIdx;
-    return FALSE;
+    return sal_False;
 }
 
-BOOL DictionaryNeo::isSorted()
+sal_Bool DictionaryNeo::isSorted()
 {
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
 
     const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
-    INT32 nEntries = getCount();
-    INT32 i;
+    sal_Int32 nEntries = getCount();
+    sal_Int32 i;
     for (i = 1;  i < nEntries;  i++)
     {
         if (cmpDicEntry( pEntry[i-1]->getDictionaryWord(),
                          pEntry[i]->getDictionaryWord() ) > 0)
         {
-            bRes = FALSE;
+            bRes = sal_False;
             break;
         }
     }
     return bRes;
 }
 
-BOOL DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicEntry,
-        BOOL bIsLoadEntries)
+sal_Bool DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicEntry,
+        sal_Bool bIsLoadEntries)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if ( bIsLoadEntries || (!bIsReadonly  &&  xDicEntry.is()) )
     {
-        BOOL bIsNegEntry = xDicEntry->isNegative();
-        BOOL bAddEntry   = !isFull() &&
+        sal_Bool bIsNegEntry = xDicEntry->isNegative();
+        sal_Bool bAddEntry   = !isFull() &&
                    (   ( eDicType == DictionaryType_POSITIVE && !bIsNegEntry )
                     || ( eDicType == DictionaryType_NEGATIVE &&  bIsNegEntry )
                     || ( eDicType == DictionaryType_MIXED ) );
 
         // look for position to insert entry at
         // if there is already an entry do not insert the new one
-        INT32 nPos = 0;
-        BOOL bFound = FALSE;
+        sal_Int32 nPos = 0;
+        sal_Bool bFound = sal_False;
         if (bAddEntry)
         {
             bFound = seekEntry( xDicEntry->getDictionaryWord(), &nPos );
             if (bFound)
-                bAddEntry = FALSE;
+                bAddEntry = sal_False;
         }
 
         if (bAddEntry)
@@ -683,7 +683,7 @@ BOOL DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicE
             uno::Reference< XDictionaryEntry > *pEntry = aEntries.getArray();
 
             // shift old entries right
-            INT32 i;
+            sal_Int32 i;
             for (i = nCount - 1; i >= nPos;  i--)
                 pEntry[ i+1 ] = pEntry[ i ];
             // insert new entry at specified position
@@ -692,8 +692,8 @@ BOOL DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicE
 
             nCount++;
 
-            bIsModified = TRUE;
-            bRes = TRUE;
+            bIsModified = sal_True;
+            bRes = sal_True;
 
             if (!bIsLoadEntries)
                 launchEvent( DictionaryEventFlags::ADD_ENTRY, xDicEntry );
@@ -748,13 +748,13 @@ void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate )
     if (bIsActive != bActivate)
     {
         bIsActive = bActivate != 0;
-        INT16 nEvent = bIsActive ?
+        sal_Int16 nEvent = bIsActive ?
                 DictionaryEventFlags::ACTIVATE_DIC : DictionaryEventFlags::DEACTIVATE_DIC;
 
         // remove entries from memory if dictionary is deactivated
-        if (bIsActive == FALSE)
+        if (bIsActive == sal_False)
         {
-            BOOL bIsEmpty = nCount == 0;
+            sal_Bool bIsEmpty = nCount == 0;
 
             // save entries first if necessary
             if (bIsModified && hasLocation() && !isReadonly())
@@ -802,11 +802,11 @@ void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale )
         throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    INT16 nLanguageP = LocaleToLanguage( aLocale );
+    sal_Int16 nLanguageP = LocaleToLanguage( aLocale );
     if (!bIsReadonly  &&  nLanguage != nLanguageP)
     {
         nLanguage = nLanguageP;
-        bIsModified = TRUE; // new language needs to be saved with dictionary
+        bIsModified = sal_True; // new language needs to be saved with dictionary
 
         launchEvent( DictionaryEventFlags::CHG_LANGUAGE, NULL );
     }
@@ -821,8 +821,8 @@ uno::Reference< XDictionaryEntry > SAL_CALL DictionaryNeo::getEntry(
     if (bNeedEntries)
         loadEntries( aMainURL );
 
-    INT32 nPos;
-    BOOL bFound = seekEntry( aWord, &nPos, TRUE );
+    sal_Int32 nPos;
+    sal_Bool bFound = seekEntry( aWord, &nPos, sal_True );
     DBG_ASSERT( nCount <= aEntries.getLength(), "lng : wrong number of entries");
     DBG_ASSERT(!bFound || nPos < nCount, "lng : index out of range");
 
@@ -836,7 +836,7 @@ sal_Bool SAL_CALL DictionaryNeo::addEntry(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if (!bIsReadonly)
     {
@@ -855,7 +855,7 @@ sal_Bool SAL_CALL
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if (!bIsReadonly)
     {
@@ -892,15 +892,15 @@ sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRemoved = FALSE;
+    sal_Bool bRemoved = sal_False;
 
     if (!bIsReadonly)
     {
         if (bNeedEntries)
             loadEntries( aMainURL );
 
-        INT32 nPos;
-        BOOL bFound = seekEntry( aWord, &nPos );
+        sal_Int32 nPos;
+        sal_Bool bFound = seekEntry( aWord, &nPos );
         DBG_ASSERT( nCount < aEntries.getLength(),
                 "lng : wrong number of entries");
         DBG_ASSERT(!bFound || nPos < nCount, "lng : index out of range");
@@ -917,7 +917,7 @@ sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord )
 
             //! the following call reduces the length of the sequence by 1 also
             lcl_SequenceRemoveElementAt( aEntries, nPos );
-            bRemoved = bIsModified = TRUE;
+            bRemoved = bIsModified = sal_True;
 
             launchEvent( DictionaryEventFlags::DEL_ENTRY, xDicEntry );
         }
@@ -962,8 +962,8 @@ void SAL_CALL DictionaryNeo::clear(  )
         aEntries = uno::Sequence< uno::Reference< XDictionaryEntry > > ( 32 );
 
         nCount = 0;
-        bNeedEntries = FALSE;
-        bIsModified = TRUE;
+        bNeedEntries = sal_False;
+        bIsModified = sal_True;
 
         launchEvent( DictionaryEventFlags::ENTRIES_CLEARED , NULL );
     }
@@ -975,10 +975,10 @@ sal_Bool SAL_CALL DictionaryNeo::addDictionaryEventListener(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xListener.is())
     {
-        INT32   nLen = aDicEvtListeners.getLength();
+        sal_Int32   nLen = aDicEvtListeners.getLength();
         bRes = aDicEvtListeners.addInterface( xListener ) != nLen;
     }
     return bRes;
@@ -990,10 +990,10 @@ sal_Bool SAL_CALL DictionaryNeo::removeDictionaryEventListener(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xListener.is())
     {
-        INT32   nLen = aDicEvtListeners.getLength();
+        sal_Int32   nLen = aDicEvtListeners.getLength();
         bRes = aDicEvtListeners.removeInterface( xListener ) != nLen;
     }
     return bRes;
@@ -1036,7 +1036,7 @@ void SAL_CALL DictionaryNeo::store()
 #endif
         }
         else
-            bIsModified = FALSE;
+            bIsModified = sal_False;
     }
 }
 
@@ -1056,7 +1056,7 @@ void SAL_CALL DictionaryNeo::storeAsURL(
     else
     {
         aMainURL = aURL;
-        bIsModified = FALSE;
+        bIsModified = sal_False;
         bIsReadonly = IsReadOnly( getLocation() );
     }
 }
@@ -1080,18 +1080,18 @@ void SAL_CALL DictionaryNeo::storeToURL(
 
 DicEntry::DicEntry()
 {
-    bIsNegativ = FALSE;
+    bIsNegativ = sal_False;
 }
 
 DicEntry::DicEntry(const OUString &rDicFileWord,
-                   BOOL bIsNegativWord)
+                   sal_Bool bIsNegativWord)
 {
     if (rDicFileWord.getLength())
         splitDicFileWord( rDicFileWord, aDicWord, aReplacement );
     bIsNegativ = bIsNegativWord;
 }
 
-DicEntry::DicEntry(const OUString &rDicWord, BOOL bNegativ,
+DicEntry::DicEntry(const OUString &rDicWord, sal_Bool bNegativ,
                    const OUString &rRplcText) :
     aDicWord                (rDicWord),
     aReplacement            (rRplcText),
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 5952c6ca0247..d6b4653db28e 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -47,7 +47,7 @@
 
 #define DIC_MAX_ENTRIES     30000
 
-INT16           ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg );
+sal_Int16           ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNeg );
 const String    GetDicExtension();
 
 ///////////////////////////////////////////////////////////////////////////
@@ -67,41 +67,41 @@ class DictionaryNeo :
     ::rtl::OUString                                             aDicName;
     ::rtl::OUString                                             aMainURL;
     ::com::sun::star::linguistic2::DictionaryType               eDicType;
-    INT16                                                       nCount;
-    INT16                                                       nLanguage;
-    INT16                                                       nDicVersion;
-    BOOL                                                        bNeedEntries;
-    BOOL                                                        bIsModified;
-    BOOL                                                        bIsActive;
-    BOOL                                                        bIsReadonly;
+    sal_Int16                                                       nCount;
+    sal_Int16                                                       nLanguage;
+    sal_Int16                                                       nDicVersion;
+    sal_Bool                                                        bNeedEntries;
+    sal_Bool                                                        bIsModified;
+    sal_Bool                                                        bIsActive;
+    sal_Bool                                                        bIsReadonly;
 
     // disallow copy-constructor and assignment-operator for now
     DictionaryNeo(const DictionaryNeo &);
     DictionaryNeo & operator = (const DictionaryNeo &);
 
-    void                    launchEvent(INT16 nEvent,
+    void                    launchEvent(sal_Int16 nEvent,
         ::com::sun::star::uno::Reference<
             ::com::sun::star::linguistic2::XDictionaryEntry > xEntry);
 
-    ULONG                   loadEntries(const ::rtl::OUString &rMainURL);
-    ULONG                   saveEntries(const ::rtl::OUString &rMainURL);
+    sal_uLong                   loadEntries(const ::rtl::OUString &rMainURL);
+    sal_uLong                   saveEntries(const ::rtl::OUString &rMainURL);
     int                     cmpDicEntry(const ::rtl::OUString &rWord1,
                                         const ::rtl::OUString &rWord2,
-                                        BOOL bSimilarOnly = FALSE);
-    BOOL                    seekEntry(const ::rtl::OUString &rWord, INT32 *pPos,
-                                        BOOL bSimilarOnly = FALSE);
-    BOOL                    isSorted();
+                                        sal_Bool bSimilarOnly = sal_False);
+    sal_Bool                    seekEntry(const ::rtl::OUString &rWord, sal_Int32 *pPos,
+                                        sal_Bool bSimilarOnly = sal_False);
+    sal_Bool                    isSorted();
 
-    BOOL                    addEntry_Impl(const ::com::sun::star::uno::Reference<
+    sal_Bool                    addEntry_Impl(const ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XDictionaryEntry > xDicEntry,
-                                          BOOL bIsLoadEntries = FALSE);
+                                          sal_Bool bIsLoadEntries = sal_False);
 
 public:
     DictionaryNeo();
-    DictionaryNeo(const ::rtl::OUString &rName, INT16 nLang,
+    DictionaryNeo(const ::rtl::OUString &rName, sal_Int16 nLang,
                     ::com::sun::star::linguistic2::DictionaryType eType,
                     const ::rtl::OUString &rMainURL,
-                    BOOL bWriteable );
+                    sal_Bool bWriteable );
     virtual ~DictionaryNeo();
 
     // XNamed
@@ -205,7 +205,7 @@ class DicEntry :
 {
     ::rtl::OUString aDicWord,       // including hyphen positions represented by "="
                     aReplacement;   // including hyphen positions represented by "="
-    BOOL            bIsNegativ;
+    sal_Bool            bIsNegativ;
 
     // disallow copy-constructor and assignment-operator for now
     DicEntry(const DicEntry &);
@@ -217,8 +217,8 @@ class DicEntry :
 
 public:
     DicEntry();
-    DicEntry(const ::rtl::OUString &rDicFileWord, BOOL bIsNegativ);
-    DicEntry(const ::rtl::OUString &rDicWord, BOOL bIsNegativ,
+    DicEntry(const ::rtl::OUString &rDicFileWord, sal_Bool bIsNegativ);
+    DicEntry(const ::rtl::OUString &rDicWord, sal_Bool bIsNegativ,
              const ::rtl::OUString &rRplcText);
     virtual ~DicEntry();
 
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 0e1a045bb98e..e8e6ef4e15fd 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -70,7 +70,7 @@ using namespace linguistic;
 
 ///////////////////////////////////////////////////////////////////////////
 
-static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg );
+static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg );
 
 static void AddInternal( const uno::Reference< XDictionary > &rDic,
                          const rtl::OUString& rNew );
@@ -88,8 +88,8 @@ class DicEvtListenerHelper :
     uno::Sequence< DictionaryEvent >        aCollectDicEvt;
     uno::Reference< XDictionaryList >       xMyDicList;
 
-    INT16                               nCondensedEvt;
-    INT16                               nNumCollectEvtListeners,
+    sal_Int16                               nCondensedEvt;
+    sal_Int16                               nNumCollectEvtListeners,
                                          nNumVerboseListeners;
 
 public:
@@ -109,14 +109,14 @@ public:
     // non-UNO functions
     void    DisposeAndClear( const EventObject &rEvtObj );
 
-    BOOL    AddDicListEvtListener(
+    sal_Bool    AddDicListEvtListener(
                 const uno::Reference< XDictionaryListEventListener >& rxListener,
-                BOOL bReceiveVerbose );
-    BOOL    RemoveDicListEvtListener(
+                sal_Bool bReceiveVerbose );
+    sal_Bool    RemoveDicListEvtListener(
                 const uno::Reference< XDictionaryListEventListener >& rxListener );
-    INT16   BeginCollectEvents();
-    INT16   EndCollectEvents();
-    INT16   FlushEvents();
+    sal_Int16   BeginCollectEvents();
+    sal_Int16   EndCollectEvents();
+    sal_Int16   FlushEvents();
     void    ClearEvents()   { nCondensedEvt = 0; }
 };
 
@@ -183,7 +183,7 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent(
                 || xDicEntry.is(),
                 "lng : missing dictionary entry" );
 
-    /*BOOL bActiveDicsModified = FALSE;*/
+    /*sal_Bool bActiveDicsModified = sal_False;*/
     //
     // evaluate DictionaryEvents and update data for next DictionaryListEvent
     //
@@ -220,7 +220,7 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent(
     // update list of collected events if needs to be
     if (nNumVerboseListeners > 0)
     {
-        INT32 nColEvts = aCollectDicEvt.getLength();
+        sal_Int32 nColEvts = aCollectDicEvt.getLength();
         aCollectDicEvt.realloc( nColEvts + 1 );
         aCollectDicEvt.getArray()[ nColEvts ] = rDicEvent;
     }
@@ -230,32 +230,32 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent(
 }
 
 
-BOOL DicEvtListenerHelper::AddDicListEvtListener(
+sal_Bool DicEvtListenerHelper::AddDicListEvtListener(
             const uno::Reference< XDictionaryListEventListener >& xListener,
-            BOOL /*bReceiveVerbose*/ )
+            sal_Bool /*bReceiveVerbose*/ )
 {
     DBG_ASSERT( xListener.is(), "empty reference" );
-    INT32   nCount = aDicListEvtListeners.getLength();
+    sal_Int32   nCount = aDicListEvtListeners.getLength();
     return aDicListEvtListeners.addInterface( xListener ) != nCount;
 }
 
 
-BOOL DicEvtListenerHelper::RemoveDicListEvtListener(
+sal_Bool DicEvtListenerHelper::RemoveDicListEvtListener(
             const uno::Reference< XDictionaryListEventListener >& xListener )
 {
     DBG_ASSERT( xListener.is(), "empty reference" );
-    INT32   nCount = aDicListEvtListeners.getLength();
+    sal_Int32   nCount = aDicListEvtListeners.getLength();
     return aDicListEvtListeners.removeInterface( xListener ) != nCount;
 }
 
 
-INT16 DicEvtListenerHelper::BeginCollectEvents()
+sal_Int16 DicEvtListenerHelper::BeginCollectEvents()
 {
     return ++nNumCollectEvtListeners;
 }
 
 
-INT16 DicEvtListenerHelper::EndCollectEvents()
+sal_Int16 DicEvtListenerHelper::EndCollectEvents()
 {
     DBG_ASSERT(nNumCollectEvtListeners > 0, "lng: mismatched function call");
     if (nNumCollectEvtListeners > 0)
@@ -268,7 +268,7 @@ INT16 DicEvtListenerHelper::EndCollectEvents()
 }
 
 
-INT16 DicEvtListenerHelper::FlushEvents()
+sal_Int16 DicEvtListenerHelper::FlushEvents()
 {
     if (0 != nCondensedEvt)
     {
@@ -310,8 +310,8 @@ DicList::DicList() :
 {
     pDicEvtLstnrHelper  = new DicEvtListenerHelper( this );
     xDicEvtLstnrHelper  = pDicEvtLstnrHelper;
-    bDisposing = FALSE;
-    bInCreation = FALSE;
+    bDisposing = sal_False;
+    bInCreation = sal_False;
 
     pExitListener = new MyAppExitListener( *this );
     xExitListener = pExitListener;
@@ -327,22 +327,22 @@ DicList::~DicList()
 void DicList::SearchForDictionaries(
     DictionaryVec_t&rDicList,
     const String &rDicDirURL,
-    BOOL bIsWriteablePath )
+    sal_Bool bIsWriteablePath )
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     const uno::Sequence< rtl::OUString > aDirCnt( utl::LocalFileHelper::
-                                        GetFolderContents( rDicDirURL, FALSE ) );
+                                        GetFolderContents( rDicDirURL, sal_False ) );
     const rtl::OUString *pDirCnt = aDirCnt.getConstArray();
-    INT32 nEntries = aDirCnt.getLength();
+    sal_Int32 nEntries = aDirCnt.getLength();
 
     String aDCN( String::CreateFromAscii( "dcn" ) );
     String aDCP( String::CreateFromAscii( "dcp" ) );
-    for (INT32 i = 0;  i < nEntries;  ++i)
+    for (sal_Int32 i = 0;  i < nEntries;  ++i)
     {
         String  aURL( pDirCnt[i] );
-        USHORT  nLang = LANGUAGE_NONE;
-        BOOL    bNeg  = FALSE;
+        sal_uInt16  nLang = LANGUAGE_NONE;
+        sal_Bool    bNeg  = sal_False;
 
         if(!::IsVers2OrNewer( aURL, nLang, bNeg ))
         {
@@ -352,9 +352,9 @@ void DicList::SearchForDictionaries(
             aExt.ToLowerAscii();
 
             if(aExt == aDCN)       // negativ
-                bNeg = TRUE;
+                bNeg = sal_True;
             else if(aExt == aDCP)  // positiv
-                bNeg = FALSE;
+                bNeg = sal_False;
             else
                 continue;          // andere Files
         }
@@ -362,7 +362,7 @@ void DicList::SearchForDictionaries(
         // Aufnehmen in die Liste der Dictionaries
         // Wenn existent nicht aufnehmen
         //
-        INT16 nSystemLanguage = MsLangId::getSystemLanguage();
+        sal_Int16 nSystemLanguage = MsLangId::getSystemLanguage();
         String aTmp1 = ToLower( aURL, nSystemLanguage );
         xub_StrLen nPos = aTmp1.SearchBackward( '/' );
         if (STRING_NOTFOUND != nPos)
@@ -396,11 +396,11 @@ void DicList::SearchForDictionaries(
 }
 
 
-INT32 DicList::GetDicPos(const uno::Reference< XDictionary > &xDic)
+sal_Int32 DicList::GetDicPos(const uno::Reference< XDictionary > &xDic)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    INT32 nPos = -1;
+    sal_Int32 nPos = -1;
     DictionaryVec_t& rDicList = GetOrCreateDicList();
     size_t n = rDicList.size();
     for (size_t i = 0;  i < n;  i++)
@@ -437,8 +437,8 @@ uno::Sequence< uno::Reference< XDictionary > > SAL_CALL
     uno::Sequence< uno::Reference< XDictionary > > aDics( rDicList.size() );
     uno::Reference< XDictionary > *pDic = aDics.getArray();
 
-    INT32 n = (USHORT) aDics.getLength();
-    for (INT32 i = 0;  i < n;  i++)
+    sal_Int32 n = (sal_uInt16) aDics.getLength();
+    for (sal_Int32 i = 0;  i < n;  i++)
         pDic[i] = rDicList[i];
 
     return aDics;
@@ -473,14 +473,14 @@ sal_Bool SAL_CALL DicList::addDictionary(
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     if (bDisposing)
-        return FALSE;
+        return sal_False;
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xDictionary.is())
     {
         DictionaryVec_t& rDicList = GetOrCreateDicList();
         rDicList.push_back( xDictionary );
-        bRes = TRUE;
+        bRes = sal_True;
 
         // add listener helper to the dictionaries listener lists
         xDictionary->addDictionaryEventListener( xDicEvtLstnrHelper );
@@ -495,10 +495,10 @@ sal_Bool SAL_CALL
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     if (bDisposing)
-        return FALSE;
+        return sal_False;
 
-    BOOL  bRes = FALSE;
-    INT32 nPos = GetDicPos( xDictionary );
+    sal_Bool  bRes = sal_False;
+    sal_Int32 nPos = GetDicPos( xDictionary );
     if (nPos >= 0)
     {
         // remove dictionary list from the dictionaries listener lists
@@ -508,14 +508,14 @@ sal_Bool SAL_CALL
         if (xDic.is())
         {
             // deactivate dictionary if not already done
-            xDic->setActive( FALSE );
+            xDic->setActive( sal_False );
 
             xDic->removeDictionaryEventListener( xDicEvtLstnrHelper );
         }
 
         // remove element at nPos
         rDicList.erase( rDicList.begin() + nPos );
-        bRes = TRUE;
+        bRes = sal_True;
     }
     return bRes;
 }
@@ -528,11 +528,11 @@ sal_Bool SAL_CALL DicList::addDictionaryListEventListener(
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     if (bDisposing)
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT(!bReceiveVerbose, "lng : not yet supported");
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xListener.is()) //! don't add empty references
     {
         bRes = pDicEvtLstnrHelper->
@@ -548,9 +548,9 @@ sal_Bool SAL_CALL DicList::removeDictionaryListEventListener(
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     if (bDisposing)
-        return FALSE;
+        return sal_False;
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if(xListener.is())
     {
         bRes = pDicEvtLstnrHelper->RemoveDicListEvtListener( xListener );
@@ -583,7 +583,7 @@ uno::Reference< XDictionary > SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     bool bIsWriteablePath = rURL.match( GetDictionaryWriteablePath(), 0 );
     return new DictionaryNeo( rName, nLanguage, eDicType, rURL, bIsWriteablePath );
 }
@@ -608,7 +608,7 @@ void SAL_CALL
 
     if (!bDisposing)
     {
-        bDisposing = TRUE;
+        bDisposing = sal_True;
         EventObject aEvtObj( (XDictionaryList *) this );
 
         aEvtListeners.disposeAndClear( aEvtObj );
@@ -669,7 +669,7 @@ void SAL_CALL
 
 void DicList::_CreateDicList()
 {
-    bInCreation = TRUE;
+    bInCreation = sal_True;
 
     // look for dictionaries
     const rtl::OUString aWriteablePath( GetDictionaryWriteablePath() );
@@ -677,7 +677,7 @@ void DicList::_CreateDicList()
     const rtl::OUString *pPaths = aPaths.getConstArray();
     for (sal_Int32 i = 0;  i < aPaths.getLength();  ++i)
     {
-        const BOOL bIsWriteablePath = (pPaths[i] == aWriteablePath);
+        const sal_Bool bIsWriteablePath = (pPaths[i] == aWriteablePath);
         SearchForDictionaries( aDicList, pPaths[i], bIsWriteablePath );
     }
 
@@ -690,7 +690,7 @@ void DicList::_CreateDicList()
     if (xIgnAll.is())
     {
         AddUserData( xIgnAll );
-        xIgnAll->setActive( TRUE );
+        xIgnAll->setActive( sal_True );
         addDictionary( xIgnAll );
     }
 
@@ -704,14 +704,14 @@ void DicList::_CreateDicList()
     //
     const uno::Sequence< rtl::OUString > aActiveDics( aOpt.GetActiveDics() );
     const rtl::OUString *pActiveDic = aActiveDics.getConstArray();
-    INT32 nLen = aActiveDics.getLength();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    sal_Int32 nLen = aActiveDics.getLength();
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         if (pActiveDic[i].getLength())
         {
             uno::Reference< XDictionary > xDic( getDictionaryByName( pActiveDic[i] ) );
             if (xDic.is())
-                xDic->setActive( TRUE );
+                xDic->setActive( sal_True );
         }
     }
 
@@ -721,7 +721,7 @@ void DicList::_CreateDicList()
 
     pDicEvtLstnrHelper->EndCollectEvents();
 
-    bInCreation = FALSE;
+    bInCreation = sal_False;
 }
 
 
@@ -772,10 +772,10 @@ sal_Bool SAL_CALL DicList::supportsService( const rtl::OUString& ServiceName )
 
     uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames();
     const rtl::OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 
@@ -842,7 +842,7 @@ xub_StrLen lcl_GetToken( String &rToken,
         if (i >= rText.Len())   // delimeter not found
             rToken  = rText.Copy( nPos );
         else
-            rToken  = rText.Copy( nPos, sal::static_int_cast< xub_StrLen >((INT32) i - nPos) );
+            rToken  = rText.Copy( nPos, sal::static_int_cast< xub_StrLen >((sal_Int32) i - nPos) );
         nRes    = i + 1;    // continue after found delimeter
     }
 
@@ -870,7 +870,7 @@ static void AddInternal(
         {
             if( aToken.Len()  &&  !IsNumeric( aToken ) )
             {
-                rDic->add( aToken, FALSE, rtl::OUString() );
+                rDic->add( aToken, sal_False, rtl::OUString() );
             }
         }
     }
@@ -897,10 +897,10 @@ static void AddUserData( const uno::Reference< XDictionary > &rDic )
 #pragma optimize("g",off)
 #endif
 
-static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg )
+static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg )
 {
     if (rFileURL.Len() == 0)
-        return FALSE;
+        return sal_False;
     String aDIC( GetDicExtension() );
     String aExt;
     xub_StrLen nPos = rFileURL.SearchBackward( '.' );
@@ -909,7 +909,7 @@ static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg )
     aExt.ToLowerAscii();
 
     if(aExt != aDIC)
-        return FALSE;
+        return sal_False;
 
     // get stream to be used
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() );
@@ -929,15 +929,15 @@ static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg )
     }
     DBG_ASSERT( xStream.is(), "failed to get stream for read" );
     if (!xStream.is())
-        return FALSE;
+        return sal_False;
 
     SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
 
     int nDicVersion = ReadDicVersion(pStream, nLng, bNeg);
     if (2 == nDicVersion || nDicVersion >= 5)
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 0674210d8494..ca88be6660ca 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -80,8 +80,8 @@ class DicList :
                 XTerminateListener >        xExitListener;
     MyAppExitListener                       *pExitListener;
 
-    BOOL    bDisposing;
-    BOOL    bInCreation;
+    sal_Bool    bDisposing;
+    sal_Bool    bInCreation;
 
     // disallow copy-constructor and assignment-operator for now
     DicList( const DicList & );
@@ -95,11 +95,11 @@ class DicList :
                             return aDicList;
                         }
 
-    void            LaunchEvent(INT16 nEvent, com::sun::star::uno::Sequence<
+    void            LaunchEvent(sal_Int16 nEvent, com::sun::star::uno::Sequence<
                             ::com::sun::star::linguistic2::XDictionary > xDic);
     void            SearchForDictionaries( DictionaryVec_t &rDicList,
-                                            const String &rDicDir, BOOL bIsWritePath );
-    INT32           GetDicPos(const com::sun::star::uno::Reference<
+                                            const String &rDicDir, sal_Bool bIsWritePath );
+    sal_Int32           GetDicPos(const com::sun::star::uno::Reference<
                             ::com::sun::star::linguistic2::XDictionary > &xDic);
 
 public:
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 56e96df65d7b..19972d641492 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -1220,10 +1220,10 @@ throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); ++i )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); ++i )
         if( pArray[i] == rServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 4de68ab1f9af..6f4b1c5d3da8 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -249,10 +249,10 @@ sal_Bool SAL_CALL GrammarChecker::supportsService( const OUString& ServiceName )
 
     uno::Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); ++i )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); ++i )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 uno::Sequence< OUString > GrammarChecker::getSupportedServiceNames_Static(  ) throw()
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 8f0e1f8736b8..d54bdbe4bbfa 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -88,13 +88,13 @@ sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) throw (RuntimeException)
 
 
 
-BOOL TextIsAllScriptType( const OUString &rTxt, INT16 nScriptType )
+sal_Bool TextIsAllScriptType( const OUString &rTxt, sal_Int16 nScriptType )
 {
-    BOOL bIsAll = TRUE;
-    for (INT32 i = 0;  i < rTxt.getLength() && bIsAll;  ++i)
+    sal_Bool bIsAll = sal_True;
+    for (sal_Int32 i = 0;  i < rTxt.getLength() && bIsAll;  ++i)
     {
         if (checkScriptType( rTxt.getStr()[i]) != nScriptType)
-            bIsAll = FALSE;
+            bIsAll = sal_False;
     }
     return bIsAll;
 }
@@ -103,7 +103,7 @@ BOOL TextIsAllScriptType( const OUString &rTxt, INT16 nScriptType )
 ///////////////////////////////////////////////////////////////////////////
 
 HHConvDic::HHConvDic( const String &rName, const String &rMainURL ) :
-    ConvDic( rName, LANGUAGE_KOREAN, ConversionDictionaryType::HANGUL_HANJA, TRUE, rMainURL )
+    ConvDic( rName, LANGUAGE_KOREAN, ConversionDictionaryType::HANGUL_HANJA, sal_True, rMainURL )
 {
 }
 
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 2d234fdc15fa..d296a8a56bfb 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -82,7 +82,7 @@ void HyphenatorDispatcher::ClearSvcList()
 Reference<XHyphenatedWord>  HyphenatorDispatcher::buildHyphWord(
             const OUString rOrigWord,
             const Reference<XDictionaryEntry> &xEntry,
-            INT16 nLang, INT16 nMaxLeading )
+            sal_Int16 nLang, sal_Int16 nMaxLeading )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -91,25 +91,25 @@ Reference<XHyphenatedWord>  HyphenatorDispatcher::buildHyphWord(
     if (xEntry.is())
     {
         OUString aText( xEntry->getDictionaryWord() );
-        INT32 nTextLen = aText.getLength();
+        sal_Int32 nTextLen = aText.getLength();
 
         // trailing '=' means "hyphenation should not be possible"
         if (nTextLen > 0  &&  aText[ nTextLen - 1 ] != '=')
         {
-            INT16 nHyphenationPos = -1;
+            sal_Int16 nHyphenationPos = -1;
 
             OUStringBuffer aTmp( nTextLen );
-            BOOL  bSkip = FALSE;
-            INT32 nHyphIdx = -1;
-            INT32 nLeading = 0;
-            for (INT32 i = 0;  i < nTextLen;  i++)
+            sal_Bool  bSkip = sal_False;
+            sal_Int32 nHyphIdx = -1;
+            sal_Int32 nLeading = 0;
+            for (sal_Int32 i = 0;  i < nTextLen;  i++)
             {
                 sal_Unicode cTmp = aText[i];
                 if (cTmp != '=')
                 {
                     aTmp.append( cTmp );
                     nLeading++;
-                    bSkip = FALSE;
+                    bSkip = sal_False;
                     nHyphIdx++;
                 }
                 else
@@ -117,9 +117,9 @@ Reference<XHyphenatedWord>  HyphenatorDispatcher::buildHyphWord(
                     if (!bSkip  &&  nHyphIdx >= 0)
                     {
                         if (nLeading <= nMaxLeading)
-                            nHyphenationPos = (INT16) nHyphIdx;
+                            nHyphenationPos = (sal_Int16) nHyphIdx;
                     }
-                    bSkip = TRUE;   //! multiple '=' should count as one only
+                    bSkip = sal_True;   //! multiple '=' should count as one only
                 }
             }
 
@@ -169,7 +169,7 @@ Reference<XHyphenatedWord>  HyphenatorDispatcher::buildHyphWord(
 
 
 Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens(
-            const Reference< XDictionaryEntry > &xEntry, INT16 nLanguage )
+            const Reference< XDictionaryEntry > &xEntry, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -179,33 +179,33 @@ Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens(
     {
         // text with hyphenation info
         OUString aText( xEntry->getDictionaryWord() );
-        INT32 nTextLen = aText.getLength();
+        sal_Int32 nTextLen = aText.getLength();
 
         // trailing '=' means "hyphenation should not be possible"
         if (nTextLen > 0  &&  aText[ nTextLen - 1 ] != '=')
         {
             // sequence to hold hyphenation positions
-            Sequence< INT16 > aHyphPos( nTextLen );
-            INT16 *pPos = aHyphPos.getArray();
-            INT32 nHyphCount = 0;
+            Sequence< sal_Int16 > aHyphPos( nTextLen );
+            sal_Int16 *pPos = aHyphPos.getArray();
+            sal_Int32 nHyphCount = 0;
 
             OUStringBuffer aTmp( nTextLen );
-            BOOL  bSkip = FALSE;
-            INT32 nHyphIdx = -1;
-            for (INT32 i = 0;  i < nTextLen;  i++)
+            sal_Bool  bSkip = sal_False;
+            sal_Int32 nHyphIdx = -1;
+            for (sal_Int32 i = 0;  i < nTextLen;  i++)
             {
                 sal_Unicode cTmp = aText[i];
                 if (cTmp != '=')
                 {
                     aTmp.append( cTmp );
-                    bSkip = FALSE;
+                    bSkip = sal_False;
                     nHyphIdx++;
                 }
                 else
                 {
                     if (!bSkip  &&  nHyphIdx >= 0)
-                        pPos[ nHyphCount++ ] = (INT16) nHyphIdx;
-                    bSkip = TRUE;   //! multiple '=' should count as one only
+                        pPos[ nHyphCount++ ] = (sal_Int16) nHyphIdx;
+                    bSkip = sal_True;   //! multiple '=' should count as one only
                 }
             }
 
@@ -245,7 +245,7 @@ Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales()
 }
 
 
-BOOL SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale)
+sal_Bool SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale)
         throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
@@ -264,8 +264,8 @@ Reference< XHyphenatedWord > SAL_CALL
 
     Reference< XHyphenatedWord >    xRes;
 
-    INT32 nWordLen = rWord.getLength();
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int32 nWordLen = rWord.getLength();
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     if (nLanguage == LANGUAGE_NONE  || !nWordLen ||
         nMaxLeading == 0 || nMaxLeading == nWordLen)
         return xRes;
@@ -274,7 +274,7 @@ Reference< XHyphenatedWord > SAL_CALL
     HyphSvcByLangMap_t::iterator    aIt( aSvcMap.find( nLanguage ) );
     LangSvcEntries_Hyph     *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
 
-    BOOL bWordModified = FALSE;
+    sal_Bool bWordModified = sal_False;
     if (!pEntry || (nMaxLeading < 0 || nMaxLeading > nWordLen))
     {
 #ifdef LINGU_EXCEPTIONS
@@ -296,7 +296,7 @@ Reference< XHyphenatedWord > SAL_CALL
         bWordModified |= RemoveHyphens( aChkWord );
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             bWordModified |= RemoveControlChars( aChkWord );
-        INT16 nChkMaxLeading = (INT16) GetPosInWordToCheck( rWord, nMaxLeading );
+        sal_Int16 nChkMaxLeading = (sal_Int16) GetPosInWordToCheck( rWord, nMaxLeading );
 
         // check for results from (positive) dictionaries which have precedence!
         Reference< XDictionaryEntry > xEntry;
@@ -304,7 +304,7 @@ Reference< XHyphenatedWord > SAL_CALL
         if (GetDicList().is()  &&  IsUseDicList( rProperties, GetPropSet() ))
         {
             xEntry = GetDicList()->queryDictionaryEntry( aChkWord, rLocale,
-                        TRUE, FALSE );
+                        sal_True, sal_False );
         }
 
         if (xEntry.is())
@@ -318,11 +318,11 @@ Reference< XHyphenatedWord > SAL_CALL
         }
         else
         {
-            INT32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
+            sal_Int32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
             DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                     "lng : index out of range");
 
-            INT32 i = 0;
+            sal_Int32 i = 0;
             Reference< XHyphenator > xHyph;
             if (pEntry->aSvcRefs.getLength() > 0)
                 xHyph = pEntry->aSvcRefs[0];
@@ -373,7 +373,7 @@ Reference< XHyphenatedWord > SAL_CALL
                         xRes = xHyph->hyphenate( aChkWord, rLocale, nChkMaxLeading,
                                                 rProperties );
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
 
                     // if language is not supported by the services
@@ -409,8 +409,8 @@ Reference< XHyphenatedWord > SAL_CALL
 
     Reference< XHyphenatedWord >    xRes;
 
-    INT32 nWordLen = rWord.getLength();
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int32 nWordLen = rWord.getLength();
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     if (nLanguage == LANGUAGE_NONE  || !nWordLen)
         return xRes;
 
@@ -418,7 +418,7 @@ Reference< XHyphenatedWord > SAL_CALL
     HyphSvcByLangMap_t::iterator    aIt( aSvcMap.find( nLanguage ) );
     LangSvcEntries_Hyph     *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
 
-    BOOL bWordModified = FALSE;
+    sal_Bool bWordModified = sal_False;
     if (!pEntry || !(0 <= nIndex && nIndex <= nWordLen - 2))
     {
 #ifdef LINGU_EXCEPTIONS
@@ -440,7 +440,7 @@ Reference< XHyphenatedWord > SAL_CALL
         bWordModified |= RemoveHyphens( aChkWord );
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             bWordModified |= RemoveControlChars( aChkWord );
-        INT16 nChkIndex = (INT16) GetPosInWordToCheck( rWord, nIndex );
+        sal_Int16 nChkIndex = (sal_Int16) GetPosInWordToCheck( rWord, nIndex );
 
         // check for results from (positive) dictionaries which have precedence!
         Reference< XDictionaryEntry > xEntry;
@@ -448,7 +448,7 @@ Reference< XHyphenatedWord > SAL_CALL
         if (GetDicList().is()  &&  IsUseDicList( rProperties, GetPropSet() ))
         {
             xEntry = GetDicList()->queryDictionaryEntry( aChkWord, rLocale,
-                        TRUE, FALSE );
+                        sal_True, sal_False );
         }
 
         if (xEntry.is())
@@ -457,11 +457,11 @@ Reference< XHyphenatedWord > SAL_CALL
         }
         else
         {
-            INT32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
+            sal_Int32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
             DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                     "lng : index out of range");
 
-            INT32 i = 0;
+            sal_Int32 i = 0;
             Reference< XHyphenator > xHyph;
             if (pEntry->aSvcRefs.getLength() > 0)
                 xHyph = pEntry->aSvcRefs[0];
@@ -512,7 +512,7 @@ Reference< XHyphenatedWord > SAL_CALL
                         xRes = xHyph->queryAlternativeSpelling( aChkWord, rLocale,
                                     nChkIndex, rProperties );
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
 
                     // if language is not supported by the services
@@ -548,7 +548,7 @@ Reference< XPossibleHyphens > SAL_CALL
 
     Reference< XPossibleHyphens >   xRes;
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     if (nLanguage == LANGUAGE_NONE  || !rWord.getLength())
         return xRes;
 
@@ -582,7 +582,7 @@ Reference< XPossibleHyphens > SAL_CALL
         if (GetDicList().is()  &&  IsUseDicList( rProperties, GetPropSet() ))
         {
             xEntry = GetDicList()->queryDictionaryEntry( aChkWord, rLocale,
-                        TRUE, FALSE );
+                        sal_True, sal_False );
         }
 
         if (xEntry.is())
@@ -591,11 +591,11 @@ Reference< XPossibleHyphens > SAL_CALL
         }
         else
         {
-            INT32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
+            sal_Int32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
             DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                     "lng : index out of range");
 
-            INT32 i = 0;
+            sal_Int32 i = 0;
             Reference< XHyphenator > xHyph;
             if (pEntry->aSvcRefs.getLength() > 0)
                 xHyph = pEntry->aSvcRefs[0];
@@ -646,7 +646,7 @@ Reference< XPossibleHyphens > SAL_CALL
                     xRes = xHyph->createPossibleHyphens( aChkWord, rLocale,
                                 rProperties );
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
 
                     // if language is not supported by the services
@@ -674,9 +674,9 @@ void HyphenatorDispatcher::SetServiceList( const Locale &rLocale,
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
 
-    INT32 nLen = rSvcImplNames.getLength();
+    sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
         // remove entry
         aSvcMap.erase( nLanguage );
@@ -711,7 +711,7 @@ Sequence< OUString >
     Sequence< OUString > aRes;
 
     // search for entry with that language and use data from that
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     HyphenatorDispatcher            *pThis = (HyphenatorDispatcher *) this;
     const HyphSvcByLangMap_t::iterator  aIt( pThis->aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Hyph       *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index 416715943c9e..8271c5f08969 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -88,13 +88,13 @@ class HyphenatorDispatcher :
             buildHyphWord( const rtl::OUString rOrigWord,
                 const ::com::sun::star::uno::Reference<
                     ::com::sun::star::linguistic2::XDictionaryEntry> &xEntry,
-                INT16 nLang, INT16 nMaxLeading );
+                sal_Int16 nLang, sal_Int16 nMaxLeading );
 
     com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XPossibleHyphens >
             buildPossHyphens( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::linguistic2::XDictionaryEntry > &xEntry,
-                    INT16 nLanguage );
+                    sal_Int16 nLanguage );
 
 public:
     HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr );
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 503d646de117..32c755ad7758 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -53,8 +53,8 @@ namespace linguistic
 ///////////////////////////////////////////////////////////////////////////
 
 
-HyphenatedWord::HyphenatedWord(const OUString &rWord, INT16 nLang, INT16 nHPos,
-                               const OUString &rHyphWord, INT16 nPos ) :
+HyphenatedWord::HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHPos,
+                               const OUString &rHyphWord, sal_Int16 nPos ) :
     aWord           (rWord),
     aHyphenatedWord (rHyphWord),
     nHyphPos        (nPos),
@@ -136,9 +136,9 @@ sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling()
 ///////////////////////////////////////////////////////////////////////////
 
 
-PossibleHyphens::PossibleHyphens(const OUString &rWord, INT16 nLang,
+PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
             const OUString &rHyphWord,
-            const Sequence< INT16 > &rPositions) :
+            const Sequence< sal_Int16 > &rPositions) :
     aWord           (rWord),
     aWordWithHyphens(rHyphWord),
     aOrigHyphenPos  (rPositions),
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index 6556fc71d052..bdde4e6851ff 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -79,7 +79,7 @@ namespace linguistic
 static const struct
 {
     const char *pPropName;
-    INT32       nPropHdl;
+    sal_Int32       nPropHdl;
 } aFlushProperties[ NUM_FLUSH_PROPS ] =
 {
     { UPN_IS_USE_DICTIONARY_LIST,         UPH_IS_USE_DICTIONARY_LIST },
@@ -120,7 +120,7 @@ static void lcl_RemoveAsPropertyChangeListener(
 }
 
 
-static BOOL lcl_IsFlushProperty( INT32 nHandle )
+static sal_Bool lcl_IsFlushProperty( sal_Int32 nHandle )
 {
     int i;
     for (i = 0;  i < NUM_FLUSH_PROPS;  ++i)
@@ -154,7 +154,7 @@ void FlushListener::SetDicList( Reference<XDictionaryList> &rDL )
 
         xDicList = rDL;
         if (xDicList.is())
-            xDicList->addDictionaryListEventListener( this, FALSE );
+            xDicList->addDictionaryListEventListener( this, sal_False );
     }
 }
 
@@ -201,13 +201,13 @@ void SAL_CALL FlushListener::processDictionaryListEvent(
 
     if (rDicListEvent.Source == xDicList)
     {
-        INT16 nEvt = rDicListEvent.nCondensedEvent;
-        INT16 nFlushFlags =
+        sal_Int16 nEvt = rDicListEvent.nCondensedEvent;
+        sal_Int16 nFlushFlags =
                 DictionaryListEventFlags::ADD_NEG_ENTRY     |
                 DictionaryListEventFlags::DEL_POS_ENTRY     |
                 DictionaryListEventFlags::ACTIVATE_NEG_DIC  |
                 DictionaryListEventFlags::DEACTIVATE_POS_DIC;
-        BOOL bFlush = 0 != (nEvt & nFlushFlags);
+        sal_Bool bFlush = 0 != (nEvt & nFlushFlags);
 
         DBG_ASSERT( pFlushObj, "missing object (NULL pointer)" );
         if (bFlush && pFlushObj != NULL)
@@ -224,7 +224,7 @@ void SAL_CALL FlushListener::propertyChange(
 
     if (rEvt.Source == xPropSet)
     {
-        BOOL bFlush = lcl_IsFlushProperty( rEvt.PropertyHandle );
+        sal_Bool bFlush = lcl_IsFlushProperty( rEvt.PropertyHandle );
 
         DBG_ASSERT( pFlushObj, "missing object (NULL pointer)" );
         if (bFlush && pFlushObj != NULL)
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index f00f4f439451..95cde6a32812 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -98,33 +98,33 @@ LinguOptions::~LinguOptions()
 }
 
 
-BOOL LinguOptions::SetLocale_Impl( INT16 &rLanguage, Any &rOld, const Any &rVal, sal_Int16 nType)
+sal_Bool LinguOptions::SetLocale_Impl( sal_Int16 &rLanguage, Any &rOld, const Any &rVal, sal_Int16 nType)
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     Locale  aNew;
     rVal >>= aNew;
-        INT16 nNew = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew), nType);
+        sal_Int16 nNew = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew), nType);
     if (nNew != rLanguage)
     {
         Locale  aLocale( CreateLocale( rLanguage ) );
         rOld.setValue( &aLocale, ::getCppuType((Locale*)0 ));
         rLanguage = nNew;
-        bRes = TRUE;
+        bRes = sal_True;
     }
 
     return bRes;
 }
 
 
-BOOL LinguOptions::SetValue( Any &rOld, const Any &rVal, INT32 nWID )
+sal_Bool LinguOptions::SetValue( Any &rOld, const Any &rVal, sal_Int32 nWID )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
-    INT16 *pnVal = 0;
-    BOOL  *pbVal = 0;
+    sal_Int16 *pnVal = 0;
+    sal_Bool  *pbVal = 0;
 
     switch( nWID )
     {
@@ -163,30 +163,30 @@ BOOL LinguOptions::SetValue( Any &rOld, const Any &rVal, INT32 nWID )
         default :
         {
             DBG_ASSERT( 0,"lng : unknown WID");
-            bRes = FALSE;
+            bRes = sal_False;
         }
     }
 
     if (pbVal)
     {
-        BOOL bNew = FALSE;
+        sal_Bool bNew = sal_False;
         rVal >>= bNew;
         if (bNew != *pbVal)
         {
             rOld <<= *pbVal;
             *pbVal = bNew;
-            bRes = TRUE;
+            bRes = sal_True;
         }
     }
     if (pnVal)
     {
-        INT16 nNew = 0;
+        sal_Int16 nNew = 0;
         rVal >>= nNew;
         if (nNew != *pnVal)
         {
             rOld <<= *pnVal;
             *pnVal = nNew;
-            bRes = TRUE;
+            bRes = sal_True;
         }
     }
 
@@ -196,13 +196,13 @@ BOOL LinguOptions::SetValue( Any &rOld, const Any &rVal, INT32 nWID )
     return bRes;
 }
 
-void LinguOptions::GetValue( Any &rVal, INT32 nWID ) const
+void LinguOptions::GetValue( Any &rVal, sal_Int32 nWID ) const
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT16 *pnVal = 0;
-    BOOL  *pbVal = 0;
-    BOOL  bDummy = FALSE;
+    sal_Int16 *pnVal = 0;
+    sal_Bool  *pbVal = 0;
+    sal_Bool  bDummy = sal_False;
 
     switch( nWID )
     {
@@ -256,7 +256,7 @@ void LinguOptions::GetValue( Any &rVal, INT32 nWID ) const
 
 struct WID_Name
 {
-    INT32        nWID;
+    sal_Int32        nWID;
     const char  *pPropertyName;
 };
 
@@ -291,13 +291,13 @@ WID_Name aWID_Name[] =
 };
 
 
-OUString LinguOptions::GetName( INT32 nWID )
+OUString LinguOptions::GetName( sal_Int32 nWID )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
     OUString aRes;
 
-    INT32 nLen = sizeof( aWID_Name ) / sizeof( aWID_Name[0] );
+    sal_Int32 nLen = sizeof( aWID_Name ) / sizeof( aWID_Name[0] );
     if (0 <= nWID  &&  nWID < nLen
         && aWID_Name[ nWID ].nWID == nWID)
     {
@@ -369,7 +369,7 @@ LinguProps::LinguProps() :
     aPropListeners  (GetLinguMutex()),
     aPropertyMap(lcl_GetLinguProps())
 {
-    bDisposing = FALSE;
+    bDisposing = sal_False;
 }
 
 void LinguProps::launchEvent( const PropertyChangeEvent &rEvt ) const
@@ -420,7 +420,7 @@ void SAL_CALL LinguProps::setPropertyValue(
         if (aOld != rValue && aConfig.SetProperty( pCur->nWID, rValue ))
         {
             PropertyChangeEvent aChgEvt( (XPropertySet *) this, rPropertyName,
-                    FALSE, pCur->nWID, aOld, rValue );
+                    sal_False, pCur->nWID, aOld, rValue );
             launchEvent( aChgEvt );
         }
     }
@@ -523,7 +523,7 @@ void SAL_CALL LinguProps::setFastPropertyValue( sal_Int32 nHandle, const Any& rV
     if (aOld != rValue && aConfig.SetProperty( nHandle, rValue ))
     {
         PropertyChangeEvent aChgEvt( (XPropertySet *) this,
-                LinguOptions::GetName( nHandle ), FALSE, nHandle, aOld, rValue );
+                LinguOptions::GetName( nHandle ), sal_False, nHandle, aOld, rValue );
         launchEvent( aChgEvt );
     }
 }
@@ -545,12 +545,12 @@ Sequence< PropertyValue > SAL_CALL
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nLen = aPropertyMap.getSize();
+    sal_Int32 nLen = aPropertyMap.getSize();
     Sequence< PropertyValue > aProps( nLen );
     PropertyValue *pProp = aProps.getArray();
     PropertyEntryVector_t aPropEntries = aPropertyMap.getPropertyEntries();
     PropertyEntryVector_t::const_iterator aIt = aPropEntries.begin();
-    for (INT32 i = 0;  i < nLen;  ++i, ++aIt)
+    for (sal_Int32 i = 0;  i < nLen;  ++i, ++aIt)
     {
         PropertyValue &rVal = pProp[i];
         Any aAny( aConfig.GetProperty( aIt->nWID ) );
@@ -570,9 +570,9 @@ void SAL_CALL
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nLen = rProps.getLength();
+    sal_Int32 nLen = rProps.getLength();
     const PropertyValue *pVal = rProps.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const PropertyValue &rVal = pVal[i];
         setPropertyValue( rVal.Name, rVal.Value );
@@ -587,7 +587,7 @@ void SAL_CALL
 
     if (!bDisposing)
     {
-        bDisposing = TRUE;
+        bDisposing = sal_True;
 
         //! its too late to save the options here!
         // (see AppExitListener for saving)
@@ -640,10 +640,10 @@ sal_Bool SAL_CALL LinguProps::supportsService( const OUString& ServiceName )
 
     uno::Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 // XServiceInfo
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 7f14142a4519..ecfa5461e2c3 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -72,7 +72,7 @@ class LinguOptions
 
     //! uses default assignment-operator
 
-    BOOL SetLocale_Impl( INT16 &rLanguage,
+    sal_Bool SetLocale_Impl( sal_Int16 &rLanguage,
             ::com::sun::star::uno::Any &rOld,
             const ::com::sun::star::uno::Any &rVal, sal_Int16 nType );
 
@@ -81,11 +81,11 @@ public:
     LinguOptions(const LinguOptions &rOpt);
     ~LinguOptions();
 
-    BOOL            SetValue( ::com::sun::star::uno::Any &rOld,
-                            const ::com::sun::star::uno::Any &rVal, INT32 nWID );
-    void            GetValue( ::com::sun::star::uno::Any &rVal, INT32 nWID ) const;
+    sal_Bool            SetValue( ::com::sun::star::uno::Any &rOld,
+                            const ::com::sun::star::uno::Any &rVal, sal_Int32 nWID );
+    void            GetValue( ::com::sun::star::uno::Any &rVal, sal_Int32 nWID ) const;
 
-    static ::rtl::OUString    GetName( INT32 nWID );
+    static ::rtl::OUString    GetName( sal_Int32 nWID );
 
     const ::com::sun::star::uno::Sequence< rtl::OUString >
             GetActiveDics() const   { return pData->aActiveDics; }
@@ -103,14 +103,14 @@ public:
 // helper function call class
 struct PropHashType_Impl
 {
-    size_t operator()(const INT32 &s) const { return s; }
+    size_t operator()(const sal_Int32 &s) const { return s; }
 };
 
 typedef cppu::OMultiTypeInterfaceContainerHelperVar
     <
-        INT32,
+        sal_Int32,
         PropHashType_Impl,
-        std::equal_to< INT32 >
+        std::equal_to< sal_Int32 >
     > OPropertyListenerContainerHelper;
 
 ///////////////////////////////////////////////////////////////////////////
@@ -132,7 +132,7 @@ class LinguProps :
     SfxItemPropertyMap                          aPropertyMap;
     SvtLinguConfig                              aConfig;
 
-    BOOL                                        bDisposing;
+    sal_Bool                                        bDisposing;
 
     // disallow copy-constructor and assignment-operator for now
     LinguProps(const LinguProps &);
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 0efcf94a0b13..88c5c7829cee 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -78,7 +78,7 @@ PropertyChgHelper::PropertyChgHelper(
     nEvtFlags           (nAllowedEvents)
 {
     OUString *pName = aPropNames.getArray();
-    for (INT32 i = 0;  i < nCHCount;  ++i)
+    for (sal_Int32 i = 0;  i < nCHCount;  ++i)
     {
         pName[i] = A2OU( aCH[i] );
     }
@@ -108,14 +108,14 @@ PropertyChgHelper::~PropertyChgHelper()
 }
 
 
-void PropertyChgHelper::AddPropNames( const char *pNewNames[], INT32 nCount )
+void PropertyChgHelper::AddPropNames( const char *pNewNames[], sal_Int32 nCount )
 {
     if (pNewNames && nCount)
     {
-        INT32 nLen = GetPropNames().getLength();
+        sal_Int32 nLen = GetPropNames().getLength();
         GetPropNames().realloc( nLen + nCount );
         OUString *pName = GetPropNames().getArray();
-        for (INT32 i = 0;  i < nCount;  ++i)
+        for (sal_Int32 i = 0;  i < nCount;  ++i)
         {
             pName[ nLen + i ] = A2OU( pNewNames[ i ] );
         }
@@ -125,20 +125,20 @@ void PropertyChgHelper::AddPropNames( const char *pNewNames[], INT32 nCount )
 
 void PropertyChgHelper::SetDefaultValues()
 {
-    bResIsIgnoreControlCharacters   = bIsIgnoreControlCharacters    = TRUE;
-    bResIsUseDictionaryList         = bIsUseDictionaryList          = TRUE;
+    bResIsIgnoreControlCharacters   = bIsIgnoreControlCharacters    = sal_True;
+    bResIsUseDictionaryList         = bIsUseDictionaryList          = sal_True;
 }
 
 
 void PropertyChgHelper::GetCurrentValues()
 {
-    INT32 nLen = GetPropNames().getLength();
+    sal_Int32 nLen = GetPropNames().getLength();
     if (GetPropSet().is() && nLen)
     {
         const OUString *pPropName = GetPropNames().getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            BOOL *pbVal     = NULL,
+            sal_Bool *pbVal     = NULL,
                  *pbResVal  = NULL;
 
             if (pPropName[i].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UPN_IS_IGNORE_CONTROL_CHARACTERS ) ))
@@ -169,13 +169,13 @@ void PropertyChgHelper::SetTmpPropVals( const PropertyValues &rPropVals )
     bResIsIgnoreControlCharacters   = bIsIgnoreControlCharacters;
     bResIsUseDictionaryList         = bIsUseDictionaryList;
     //
-    INT32 nLen = rPropVals.getLength();
+    sal_Int32 nLen = rPropVals.getLength();
     if (nLen)
     {
         const PropertyValue *pVal = rPropVals.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            BOOL  *pbResVal = NULL;
+            sal_Bool  *pbResVal = NULL;
             switch (pVal[i].Handle)
             {
                 case UPH_IS_IGNORE_CONTROL_CHARACTERS :
@@ -193,18 +193,18 @@ void PropertyChgHelper::SetTmpPropVals( const PropertyValues &rPropVals )
 }
 
 
-BOOL PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
+sal_Bool PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if (GetPropSet().is()  &&  rEvt.Source == GetPropSet())
     {
-        INT16 nLngSvcFlags = (nEvtFlags & AE_HYPHENATOR) ?
+        sal_Int16 nLngSvcFlags = (nEvtFlags & AE_HYPHENATOR) ?
                     LinguServiceEventFlags::HYPHENATE_AGAIN : 0;
-        BOOL bSCWA = FALSE, // SPELL_CORRECT_WORDS_AGAIN ?
-             bSWWA = FALSE; // SPELL_WRONG_WORDS_AGAIN ?
+        sal_Bool bSCWA = sal_False, // SPELL_CORRECT_WORDS_AGAIN ?
+             bSWWA = sal_False; // SPELL_WRONG_WORDS_AGAIN ?
 
-        BOOL  *pbVal = NULL;
+        sal_Bool  *pbVal = NULL;
         switch (rEvt.PropertyHandle)
         {
             case UPH_IS_IGNORE_CONTROL_CHARACTERS :
@@ -216,12 +216,12 @@ BOOL PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
             case UPH_IS_USE_DICTIONARY_LIST       :
             {
                 pbVal = &bIsUseDictionaryList;
-                bSCWA = bSWWA = TRUE;
+                bSCWA = bSWWA = sal_True;
                 break;
             }
             default:
             {
-                bRes = FALSE;
+                bRes = sal_False;
                 //DBG_ASSERT( 0, "unknown property" );
             }
         }
@@ -231,7 +231,7 @@ BOOL PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
         bRes = 0 != pbVal;  // sth changed?
         if (bRes)
         {
-            BOOL bSpellEvts = (nEvtFlags & AE_SPELLCHECKER) ? TRUE : FALSE;
+            sal_Bool bSpellEvts = (nEvtFlags & AE_SPELLCHECKER) ? sal_True : sal_False;
             if (bSCWA && bSpellEvts)
                 nLngSvcFlags |= LinguServiceEventFlags::SPELL_CORRECT_WORDS_AGAIN;
             if (bSWWA && bSpellEvts)
@@ -261,9 +261,9 @@ void PropertyChgHelper::AddAsPropListener()
 {
     if (xPropSet.is())
     {
-        INT32 nLen = aPropNames.getLength();
+        sal_Int32 nLen = aPropNames.getLength();
         const OUString *pPropName = aPropNames.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             if (pPropName[i].getLength())
                 xPropSet->addPropertyChangeListener( pPropName[i], this );
@@ -275,9 +275,9 @@ void PropertyChgHelper::RemoveAsPropListener()
 {
     if (xPropSet.is())
     {
-        INT32 nLen = aPropNames.getLength();
+        sal_Int32 nLen = aPropNames.getLength();
         const OUString *pPropName = aPropNames.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             if (pPropName[i].getLength())
                 xPropSet->removePropertyChangeListener( pPropName[i], this );
@@ -318,10 +318,10 @@ sal_Bool SAL_CALL
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxListener.is())
     {
-        INT32   nCount = aLngSvcEvtListeners.getLength();
+        sal_Int32   nCount = aLngSvcEvtListeners.getLength();
         bRes = aLngSvcEvtListeners.addInterface( rxListener ) != nCount;
     }
     return bRes;
@@ -335,10 +335,10 @@ sal_Bool SAL_CALL
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxListener.is())
     {
-        INT32   nCount = aLngSvcEvtListeners.getLength();
+        sal_Int32   nCount = aLngSvcEvtListeners.getLength();
         bRes = aLngSvcEvtListeners.removeInterface( rxListener ) != nCount;
     }
     return bRes;
@@ -405,9 +405,9 @@ void PropertyHelper_Spell::SetDefaultValues()
 {
     PropertyChgHelper::SetDefaultValues();
 
-    bResIsSpellUpperCase        = bIsSpellUpperCase         = FALSE;
-    bResIsSpellWithDigits       = bIsSpellWithDigits        = FALSE;
-    bResIsSpellCapitalization   = bIsSpellCapitalization    = TRUE;
+    bResIsSpellUpperCase        = bIsSpellUpperCase         = sal_False;
+    bResIsSpellWithDigits       = bIsSpellWithDigits        = sal_False;
+    bResIsSpellCapitalization   = bIsSpellCapitalization    = sal_True;
 }
 
 
@@ -415,13 +415,13 @@ void PropertyHelper_Spell::GetCurrentValues()
 {
     PropertyChgHelper::GetCurrentValues();
 
-    INT32 nLen = GetPropNames().getLength();
+    sal_Int32 nLen = GetPropNames().getLength();
     if (GetPropSet().is() && nLen)
     {
         const OUString *pPropName = GetPropNames().getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            BOOL *pbVal     = NULL,
+            sal_Bool *pbVal     = NULL,
                  *pbResVal  = NULL;
 
             if (pPropName[i].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UPN_IS_SPELL_UPPER_CASE ) ))
@@ -450,38 +450,38 @@ void PropertyHelper_Spell::GetCurrentValues()
 }
 
 
-BOOL PropertyHelper_Spell::propertyChange_Impl( const PropertyChangeEvent& rEvt )
+sal_Bool PropertyHelper_Spell::propertyChange_Impl( const PropertyChangeEvent& rEvt )
 {
-    BOOL bRes = PropertyChgHelper::propertyChange_Impl( rEvt );
+    sal_Bool bRes = PropertyChgHelper::propertyChange_Impl( rEvt );
 
     if (!bRes  &&  GetPropSet().is()  &&  rEvt.Source == GetPropSet())
     {
-        INT16 nLngSvcFlags = 0;
-        BOOL bSCWA = FALSE, // SPELL_CORRECT_WORDS_AGAIN ?
-             bSWWA = FALSE; // SPELL_WRONG_WORDS_AGAIN ?
+        sal_Int16 nLngSvcFlags = 0;
+        sal_Bool bSCWA = sal_False, // SPELL_CORRECT_WORDS_AGAIN ?
+             bSWWA = sal_False; // SPELL_WRONG_WORDS_AGAIN ?
 
-        BOOL *pbVal = NULL;
+        sal_Bool *pbVal = NULL;
         switch (rEvt.PropertyHandle)
         {
             case UPH_IS_SPELL_UPPER_CASE          :
             {
                 pbVal = &bIsSpellUpperCase;
-                bSCWA = FALSE == *pbVal;    // FALSE->TRUE change?
-                bSWWA = !bSCWA;             // TRUE->FALSE change?
+                bSCWA = sal_False == *pbVal;    // sal_False->sal_True change?
+                bSWWA = !bSCWA;             // sal_True->sal_False change?
                 break;
             }
             case UPH_IS_SPELL_WITH_DIGITS         :
             {
                 pbVal = &bIsSpellWithDigits;
-                bSCWA = FALSE == *pbVal;    // FALSE->TRUE change?
-                bSWWA = !bSCWA;             // TRUE->FALSE change?
+                bSCWA = sal_False == *pbVal;    // sal_False->sal_True change?
+                bSWWA = !bSCWA;             // sal_True->sal_False change?
                 break;
             }
             case UPH_IS_SPELL_CAPITALIZATION      :
             {
                 pbVal = &bIsSpellCapitalization;
-                bSCWA = FALSE == *pbVal;    // FALSE->TRUE change?
-                bSWWA = !bSCWA;             // TRUE->FALSE change?
+                bSCWA = sal_False == *pbVal;    // sal_False->sal_True change?
+                bSWWA = !bSCWA;             // sal_True->sal_False change?
                 break;
             }
             default:
@@ -528,11 +528,11 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
     bResIsSpellWithDigits       = bIsSpellWithDigits;
     bResIsSpellCapitalization   = bIsSpellCapitalization;
     //
-    INT32 nLen = rPropVals.getLength();
+    sal_Int32 nLen = rPropVals.getLength();
     if (nLen)
     {
         const PropertyValue *pVal = rPropVals.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             if (pVal[i].Name.equalsAscii( UPN_MAX_NUMBER_OF_SUGGESTIONS ))
             {
@@ -540,7 +540,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
             }
             else
             {
-                BOOL *pbResVal = NULL;
+                sal_Bool *pbResVal = NULL;
                 switch (pVal[i].Handle)
                 {
                     case UPH_IS_SPELL_UPPER_CASE     : pbResVal = &bResIsSpellUpperCase; break;
@@ -556,7 +556,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
     }
 }
 
-INT16 PropertyHelper_Spell::GetDefaultNumberOfSuggestions() const
+sal_Int16 PropertyHelper_Spell::GetDefaultNumberOfSuggestions() const
 {
     return 16;
 }
@@ -601,13 +601,13 @@ void PropertyHelper_Hyphen::GetCurrentValues()
 {
     PropertyChgHelper::GetCurrentValues();
 
-    INT32 nLen = GetPropNames().getLength();
+    sal_Int32 nLen = GetPropNames().getLength();
     if (GetPropSet().is() && nLen)
     {
         const OUString *pPropName = GetPropNames().getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            INT16  *pnVal    = NULL,
+            sal_Int16  *pnVal    = NULL,
                    *pnResVal = NULL;
 
             if (pPropName[i].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UPN_HYPH_MIN_LEADING ) ))
@@ -636,15 +636,15 @@ void PropertyHelper_Hyphen::GetCurrentValues()
 }
 
 
-BOOL PropertyHelper_Hyphen::propertyChange_Impl( const PropertyChangeEvent& rEvt )
+sal_Bool PropertyHelper_Hyphen::propertyChange_Impl( const PropertyChangeEvent& rEvt )
 {
-    BOOL bRes = PropertyChgHelper::propertyChange_Impl( rEvt );
+    sal_Bool bRes = PropertyChgHelper::propertyChange_Impl( rEvt );
 
     if (!bRes  &&  GetPropSet().is()  &&  rEvt.Source == GetPropSet())
     {
-        INT16 nLngSvcFlags = LinguServiceEventFlags::HYPHENATE_AGAIN;
+        sal_Int16 nLngSvcFlags = LinguServiceEventFlags::HYPHENATE_AGAIN;
 
-        INT16   *pnVal = NULL;
+        sal_Int16   *pnVal = NULL;
         switch (rEvt.PropertyHandle)
         {
             case UPH_HYPH_MIN_LEADING     : pnVal = &nHyphMinLeading; break;
@@ -690,13 +690,13 @@ void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals )
     nResHyphMinTrailing     = nHyphMinTrailing;
     nResHyphMinWordLength   = nHyphMinWordLength;
     //
-    INT32 nLen = rPropVals.getLength();
+    sal_Int32 nLen = rPropVals.getLength();
     if (nLen)
     {
         const PropertyValue *pVal = rPropVals.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            INT16   *pnResVal = NULL;
+            sal_Int16   *pnResVal = NULL;
             switch (pVal[i].Handle)
             {
                 case UPH_HYPH_MIN_LEADING     : pnResVal = &nResHyphMinLeading; break;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 00e71628bd70..2b88947aa9ee 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -66,19 +66,19 @@ uno::Sequence< OUString > static GetLangSvc( const uno::Any &rVal );
 
 ///////////////////////////////////////////////////////////////////////////
 
-static BOOL lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const OUString &rText )
+static sal_Bool lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const OUString &rText )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
-    INT32 nLen = rSeq.getLength();
+    sal_Int32 nLen = rSeq.getLength();
     if (nLen == 0 || rText.getLength() == 0)
         return bRes;
 
     const OUString *pSeq = rSeq.getConstArray();
-    for (INT32 i = 0;  i < nLen  &&  !bRes;  ++i)
+    for (sal_Int32 i = 0;  i < nLen  &&  !bRes;  ++i)
     {
         if (rText == pSeq[i])
-            bRes = TRUE;
+            bRes = sal_True;
     }
     return bRes;
 }
@@ -91,7 +91,7 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
     uno::Sequence< lang::Locale > aRes;
 
     uno::Reference< lang::XMultiServiceFactory >  xFac( utl::getProcessServiceFactory() );
-    INT32 nNames = rSvcImplNames.getLength();
+    sal_Int32 nNames = rSvcImplNames.getLength();
     if (nNames  &&  xFac.is())
     {
         std::set< LanguageType > aLanguages;
@@ -104,7 +104,7 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
         // check all services for the supported languages and new
         // languages to the result
         const OUString *pImplNames = rSvcImplNames.getConstArray();
-        INT32 i;
+        sal_Int32 i;
 
         for (i = 0;  i < nNames;  ++i)
         {
@@ -122,8 +122,8 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
             if (xSuppLoc.is())
             {
                 uno::Sequence< lang::Locale > aLoc( xSuppLoc->getLocales() );
-                INT32 nLoc = aLoc.getLength();
-                for (INT32 k = 0;  k < nLoc;  ++k)
+                sal_Int32 nLoc = aLoc.getLength();
+                for (sal_Int32 k = 0;  k < nLoc;  ++k)
                 {
                     const lang::Locale *pLoc = aLoc.getConstArray();
                     LanguageType nLang = LocaleToLanguage( pLoc[k] );
@@ -140,7 +140,7 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
         }
 
         // build return sequence
-        INT32 nLanguages = static_cast< INT32 >(aLanguages.size());
+        sal_Int32 nLanguages = static_cast< sal_Int32 >(aLanguages.size());
         aRes.realloc( nLanguages );
         lang::Locale *pRes = aRes.getArray();
         std::set< LanguageType >::const_iterator aIt( aLanguages.begin() );
@@ -159,24 +159,24 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
 struct SvcInfo
 {
     const OUString                  aSvcImplName;
-    const uno::Sequence< INT16 >    aSuppLanguages;
+    const uno::Sequence< sal_Int16 >    aSuppLanguages;
 
     SvcInfo( const OUString &rSvcImplName,
-             const uno::Sequence< INT16 >  &rSuppLanguages ) :
+             const uno::Sequence< sal_Int16 >  &rSuppLanguages ) :
         aSvcImplName    (rSvcImplName),
         aSuppLanguages  (rSuppLanguages)
     {
     }
 
-    BOOL    HasLanguage( INT16 nLanguage ) const;
+    sal_Bool    HasLanguage( sal_Int16 nLanguage ) const;
 };
 
 
-BOOL SvcInfo::HasLanguage( INT16 nLanguage ) const
+sal_Bool SvcInfo::HasLanguage( sal_Int16 nLanguage ) const
 {
-    INT32 nCnt = aSuppLanguages.getLength();
-    const INT16 *pLang = aSuppLanguages.getConstArray();
-    INT32 i;
+    sal_Int32 nCnt = aSuppLanguages.getLength();
+    const sal_Int16 *pLang = aSuppLanguages.getConstArray();
+    sal_Int32 i;
 
     for ( i = 0;  i < nCnt;  ++i)
     {
@@ -195,15 +195,15 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
 {
     // get list of nodenames to look at for their service list
     const char *pEntryName = 0;
-    BOOL bHasLangSvcList = TRUE;
+    sal_Bool bHasLangSvcList = sal_True;
     switch (rDispatcher.GetDspType())
     {
         case LinguDispatcher::DSP_SPELL     : pEntryName = "ServiceManager/SpellCheckerList";    break;
         case LinguDispatcher::DSP_GRAMMAR   : pEntryName = "ServiceManager/GrammarCheckerList";
-                                              bHasLangSvcList = FALSE;
+                                              bHasLangSvcList = sal_False;
                                               break;
         case LinguDispatcher::DSP_HYPH      : pEntryName = "ServiceManager/HyphenatorList";
-                                              bHasLangSvcList = FALSE;
+                                              bHasLangSvcList = sal_False;
                                               break;
         case LinguDispatcher::DSP_THES      : pEntryName = "ServiceManager/ThesaurusList";  break;
         default :
@@ -213,9 +213,9 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
     uno::Sequence < OUString > aNodeNames( /*aCfg.*/GetNodeNames( aNode ) );
 
 
-    INT32 nLen = aNodeNames.getLength();
+    sal_Int32 nLen = aNodeNames.getLength();
     const OUString *pNodeNames = aNodeNames.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         uno::Sequence< OUString >   aSvcImplNames;
 
@@ -238,7 +238,7 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
             else
                 aSvcImplNames = GetLangSvc( rValue );
 
-            INT32 nSvcs = aSvcImplNames.getLength();
+            sal_Int32 nSvcs = aSvcImplNames.getLength();
             if (nSvcs)
             {
                 const OUString *pImplNames = aSvcImplNames.getConstArray();
@@ -246,10 +246,10 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
                 LanguageType nLang = MsLangId::convertIsoStringToLanguage( pNodeNames[i] );
 
                 // build list of available services from those
-                INT32 nCnt = 0;
+                sal_Int32 nCnt = 0;
                 uno::Sequence< OUString > aAvailSvcs( nSvcs );
                 OUString *pAvailSvcs = aAvailSvcs.getArray();
-                for (INT32 k = 0;  k < nSvcs;  ++k)
+                for (sal_Int32 k = 0;  k < nSvcs;  ++k)
                 {
                     // check for availability of the service
                     size_t nAvailSvcs = rAvailSvcs.size();
@@ -295,13 +295,13 @@ class LngSvcMgrListenerHelper :
     uno::Reference< linguistic2::XDictionaryList >               xDicList;
     uno::Reference< uno::XInterface >                        xMyEvtObj;
 
-    INT16   nCombinedLngSvcEvt;
+    sal_Int16   nCombinedLngSvcEvt;
 
     // disallow copy-constructor and assignment-operator for now
     LngSvcMgrListenerHelper(const LngSvcMgrListenerHelper &);
     LngSvcMgrListenerHelper & operator = (const LngSvcMgrListenerHelper &);
 
-    void    LaunchEvent( INT16 nLngSvcEvtFlags );
+    void    LaunchEvent( sal_Int16 nLngSvcEvtFlags );
 
 //  DECL_LINK( TimeOut, Timer* );
     long Timeout();
@@ -327,17 +327,17 @@ public:
                 const linguistic2::DictionaryListEvent& rDicListEvent )
             throw(uno::RuntimeException);
 
-    inline  BOOL    AddLngSvcMgrListener(
+    inline  sal_Bool    AddLngSvcMgrListener(
                         const uno::Reference< lang::XEventListener >& rxListener );
-    inline  BOOL    RemoveLngSvcMgrListener(
+    inline  sal_Bool    RemoveLngSvcMgrListener(
                         const uno::Reference< lang::XEventListener >& rxListener );
     void    DisposeAndClear( const lang::EventObject &rEvtObj );
-    BOOL    AddLngSvcEvtBroadcaster(
+    sal_Bool    AddLngSvcEvtBroadcaster(
                         const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
-    BOOL    RemoveLngSvcEvtBroadcaster(
+    sal_Bool    RemoveLngSvcEvtBroadcaster(
                         const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
 
-    void    AddLngSvcEvt( INT16 nLngSvcEvt );
+    void    AddLngSvcEvt( sal_Int16 nLngSvcEvt );
 };
 
 
@@ -354,7 +354,7 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper(
     if (xDicList.is())
     {
         xDicList->addDictionaryListEventListener(
-            (linguistic2::XDictionaryListEventListener *) this, FALSE );
+            (linguistic2::XDictionaryListEventListener *) this, sal_False );
     }
 
     //! The timer is used to 'sum up' different events in order to reduce the
@@ -414,7 +414,7 @@ long LngSvcMgrListenerHelper::Timeout()
 }
 
 
-void LngSvcMgrListenerHelper::AddLngSvcEvt( INT16 nLngSvcEvt )
+void LngSvcMgrListenerHelper::AddLngSvcEvt( sal_Int16 nLngSvcEvt )
 {
     nCombinedLngSvcEvt |= nLngSvcEvt;
 //  aLaunchTimer.Start();
@@ -439,7 +439,7 @@ void SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    INT16 nDlEvt = rDicListEvent.nCondensedEvent;
+    sal_Int16 nDlEvt = rDicListEvent.nCondensedEvent;
     if (0 == nDlEvt)
         return;
 
@@ -457,9 +457,9 @@ void SAL_CALL
     //
     // "translate" DictionaryList event into linguistic2::LinguServiceEvent
     //
-    INT16 nLngSvcEvt = 0;
+    sal_Int16 nLngSvcEvt = 0;
     //
-    INT16 nSpellCorrectFlags =
+    sal_Int16 nSpellCorrectFlags =
             linguistic2::DictionaryListEventFlags::ADD_NEG_ENTRY        |
             linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY        |
             linguistic2::DictionaryListEventFlags::ACTIVATE_NEG_DIC |
@@ -467,7 +467,7 @@ void SAL_CALL
     if (0 != (nDlEvt & nSpellCorrectFlags))
         nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_CORRECT_WORDS_AGAIN;
     //
-    INT16 nSpellWrongFlags =
+    sal_Int16 nSpellWrongFlags =
             linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY        |
             linguistic2::DictionaryListEventFlags::DEL_NEG_ENTRY        |
             linguistic2::DictionaryListEventFlags::ACTIVATE_POS_DIC |
@@ -475,7 +475,7 @@ void SAL_CALL
     if (0 != (nDlEvt & nSpellWrongFlags))
         nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_WRONG_WORDS_AGAIN;
     //
-    INT16 nHyphenateFlags =
+    sal_Int16 nHyphenateFlags =
             linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY        |
             linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY        |
             linguistic2::DictionaryListEventFlags::ACTIVATE_POS_DIC |
@@ -490,7 +490,7 @@ void SAL_CALL
 }
 
 
-void LngSvcMgrListenerHelper::LaunchEvent( INT16 nLngSvcEvtFlags )
+void LngSvcMgrListenerHelper::LaunchEvent( sal_Int16 nLngSvcEvtFlags )
 {
     linguistic2::LinguServiceEvent aEvt( xMyEvtObj, nLngSvcEvtFlags );
 
@@ -505,19 +505,19 @@ void LngSvcMgrListenerHelper::LaunchEvent( INT16 nLngSvcEvtFlags )
 }
 
 
-inline BOOL LngSvcMgrListenerHelper::AddLngSvcMgrListener(
+inline sal_Bool LngSvcMgrListenerHelper::AddLngSvcMgrListener(
         const uno::Reference< lang::XEventListener >& rxListener )
 {
     aLngSvcMgrListeners.addInterface( rxListener );
-    return TRUE;
+    return sal_True;
 }
 
 
-inline BOOL LngSvcMgrListenerHelper::RemoveLngSvcMgrListener(
+inline sal_Bool LngSvcMgrListenerHelper::RemoveLngSvcMgrListener(
         const uno::Reference< lang::XEventListener >& rxListener )
 {
     aLngSvcMgrListeners.removeInterface( rxListener );
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -545,10 +545,10 @@ void LngSvcMgrListenerHelper::DisposeAndClear( const lang::EventObject &rEvtObj
 }
 
 
-BOOL LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
+sal_Bool LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
         const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxBroadcaster.is())
     {
         aLngSvcEvtBroadcasters.addInterface( rxBroadcaster );
@@ -559,10 +559,10 @@ BOOL LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
 }
 
 
-BOOL LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
+sal_Bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
         const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxBroadcaster.is())
     {
         aLngSvcEvtBroadcasters.removeInterface( rxBroadcaster );
@@ -584,7 +584,7 @@ LngSvcMgr::LngSvcMgr() :
     bHasAvailGrammarLocales =
     bHasAvailHyphLocales    =
     bHasAvailThesLocales    =
-    bDisposing = FALSE;
+    bDisposing = sal_False;
 
     pSpellDsp   = 0;
     pGrammarDsp = 0;
@@ -900,7 +900,7 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl()
                     if (xSvc.is())
                     {
                         OUString            aImplName;
-                        uno::Sequence< INT16 >    aLanguages;
+                        uno::Sequence< sal_Int16 >    aLanguages;
                         uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                         if (xInfo.is())
                             aImplName = xInfo->getImplementationName();
@@ -966,7 +966,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
                     if (xSvc.is())
                     {
                         OUString            aImplName;
-                        uno::Sequence< INT16 >   aLanguages;
+                        uno::Sequence< sal_Int16 >   aLanguages;
                         uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                         if (xInfo.is())
                             aImplName = xInfo->getImplementationName();
@@ -1031,7 +1031,7 @@ void LngSvcMgr::GetAvailableHyphSvcs_Impl()
                     if (xSvc.is())
                     {
                         OUString            aImplName;
-                        uno::Sequence< INT16 >    aLanguages;
+                        uno::Sequence< sal_Int16 >    aLanguages;
                         uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                         if (xInfo.is())
                             aImplName = xInfo->getImplementationName();
@@ -1098,7 +1098,7 @@ void LngSvcMgr::GetAvailableThesSvcs_Impl()
                     if (xSvc.is())
                     {
                         OUString            aImplName;
-                        uno::Sequence< INT16 >    aLanguages;
+                        uno::Sequence< sal_Int16 >    aLanguages;
                         uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                         if (xInfo.is())
                             aImplName = xInfo->getImplementationName();
@@ -1127,7 +1127,7 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp )
     String  aNode( String::CreateFromAscii( "ServiceManager/SpellCheckerList" ) );
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
     OUString *pNames = aNames.getArray();
-    INT32 nLen = aNames.getLength();
+    sal_Int32 nLen = aNames.getLength();
 
     // append path prefix need for 'GetProperties' call below
     String aPrefix( aNode );
@@ -1143,13 +1143,13 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp )
     if (nLen  &&  nLen == aValues.getLength())
     {
         const uno::Any *pValues = aValues.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             if (pValues[i] >>= aSvcImplNames)
             {
 #if OSL_DEBUG_LEVEL > 1
-//                INT32 nSvcs = aSvcImplNames.getLength();
+//                sal_Int32 nSvcs = aSvcImplNames.getLength();
 //                const OUString *pSvcImplNames = aSvcImplNames.getConstArray();
 #endif
                 String aLocaleStr( pNames[i] );
@@ -1170,7 +1170,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
     String  aNode( String::CreateFromAscii( "ServiceManager/GrammarCheckerList" ) );
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
     OUString *pNames = aNames.getArray();
-    INT32 nLen = aNames.getLength();
+    sal_Int32 nLen = aNames.getLength();
 
     // append path prefix need for 'GetProperties' call below
     String aPrefix( aNode );
@@ -1186,7 +1186,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
     if (nLen  &&  nLen == aValues.getLength())
     {
         const uno::Any *pValues = aValues.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             if (pValues[i] >>= aSvcImplNames)
@@ -1196,7 +1196,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
                     aSvcImplNames.realloc(1);
 
 #if OSL_DEBUG_LEVEL > 1
-//                INT32 nSvcs = aSvcImplNames.getLength();
+//                sal_Int32 nSvcs = aSvcImplNames.getLength();
 //                const OUString *pSvcImplNames = aSvcImplNames.getConstArray();
 #endif
                 String aLocaleStr( pNames[i] );
@@ -1217,7 +1217,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
     String  aNode( String::CreateFromAscii( "ServiceManager/HyphenatorList" ) );
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
     OUString *pNames = aNames.getArray();
-    INT32 nLen = aNames.getLength();
+    sal_Int32 nLen = aNames.getLength();
 
     // append path prefix need for 'GetProperties' call below
     String aPrefix( aNode );
@@ -1233,7 +1233,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
     if (nLen  &&  nLen == aValues.getLength())
     {
         const uno::Any *pValues = aValues.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             if (pValues[i] >>= aSvcImplNames)
@@ -1243,7 +1243,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
                     aSvcImplNames.realloc(1);
 
 #if OSL_DEBUG_LEVEL > 1
-//                INT32 nSvcs = aSvcImplNames.getLength();
+//                sal_Int32 nSvcs = aSvcImplNames.getLength();
 //                const OUString *pSvcImplNames = aSvcImplNames.getConstArray();
 #endif
                 String aLocaleStr( pNames[i] );
@@ -1264,7 +1264,7 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
     String  aNode( String::CreateFromAscii( "ServiceManager/ThesaurusList" ) );
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
     OUString *pNames = aNames.getArray();
-    INT32 nLen = aNames.getLength();
+    sal_Int32 nLen = aNames.getLength();
 
     // append path prefix need for 'GetProperties' call below
     String aPrefix( aNode );
@@ -1280,13 +1280,13 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
     if (nLen  &&  nLen == aValues.getLength())
     {
         const uno::Any *pValues = aValues.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             if (pValues[i] >>= aSvcImplNames)
             {
 #if OSL_DEBUG_LEVEL > 1
-//                INT32 nSvcs = aSvcImplNames.getLength();
+//                sal_Int32 nSvcs = aSvcImplNames.getLength();
 //                const OUString *pSvcImplNames = aSvcImplNames.getConstArray();
 #endif
                 String aLocaleStr( pNames[i] );
@@ -1367,7 +1367,7 @@ sal_Bool SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (!bDisposing  &&  xListener.is())
     {
         if (!pListenerHelper)
@@ -1385,7 +1385,7 @@ sal_Bool SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (!bDisposing  &&  xListener.is())
     {
         DBG_ASSERT( pListenerHelper, "listener removed without being added" );
@@ -1448,7 +1448,7 @@ uno::Sequence< OUString > SAL_CALL
         aRes.realloc( nMaxCnt );
         OUString *pImplName = aRes.getArray();
 
-        USHORT nCnt = 0;
+        sal_uInt16 nCnt = 0;
         LanguageType nLanguage = LocaleToLanguage( rLocale );
         for (size_t i = 0;  i < nMaxCnt;  ++i)
         {
@@ -1479,7 +1479,7 @@ uno::Sequence< lang::Locale > SAL_CALL
     uno::Sequence< lang::Locale > aRes;
 
     uno::Sequence< lang::Locale >  *pAvailLocales     = NULL;
-    BOOL                *pHasAvailLocales   = NULL;
+    sal_Bool                *pHasAvailLocales   = NULL;
     if (0 == rServiceName.compareToAscii( SN_SPELLCHECKER ))
     {
         pAvailLocales       = &aAvailSpellLocales;
@@ -1510,7 +1510,7 @@ uno::Sequence< lang::Locale > SAL_CALL
 //      {
             *pAvailLocales = GetAvailLocales(
                     getAvailableServices( rServiceName, lang::Locale() ) );
-//          *pHasAvailLocales = TRUE;
+//          *pHasAvailLocales = sal_True;
 //      }
         aRes = *pAvailLocales;
     }
@@ -1518,22 +1518,22 @@ uno::Sequence< lang::Locale > SAL_CALL
     return aRes;
 }
 
-static BOOL IsEqSvcList( const uno::Sequence< OUString > &rList1,
+static sal_Bool IsEqSvcList( const uno::Sequence< OUString > &rList1,
                         const uno::Sequence< OUString > &rList2 )
 {
-    // returns TRUE iff both sequences are equal
+    // returns sal_True iff both sequences are equal
 
-    BOOL bRes = FALSE;
-    INT32 nLen = rList1.getLength();
+    sal_Bool bRes = sal_False;
+    sal_Int32 nLen = rList1.getLength();
     if (rList2.getLength() == nLen)
     {
         const OUString *pStr1 = rList1.getConstArray();
         const OUString *pStr2 = rList2.getConstArray();
-        bRes = TRUE;
-        for (INT32 i = 0;  i < nLen  &&  bRes;  ++i)
+        bRes = sal_True;
+        for (sal_Int32 i = 0;  i < nLen  &&  bRes;  ++i)
         {
             if (*pStr1++ != *pStr2++)
-                bRes = FALSE;
+                bRes = sal_False;
         }
     }
     return bRes;
@@ -1562,7 +1562,7 @@ void SAL_CALL
         {
             if (!xSpellDsp.is())
                 GetSpellCheckerDsp_Impl();
-            BOOL bChanged = !IsEqSvcList( rServiceImplNames,
+            sal_Bool bChanged = !IsEqSvcList( rServiceImplNames,
                                           pSpellDsp->GetServiceList( rLocale ) );
             if (bChanged)
             {
@@ -1579,7 +1579,7 @@ void SAL_CALL
         {
             if (!xGrammarDsp.is())
                 GetGrammarCheckerDsp_Impl();
-            BOOL bChanged = !IsEqSvcList( rServiceImplNames,
+            sal_Bool bChanged = !IsEqSvcList( rServiceImplNames,
                                           pGrammarDsp->GetServiceList( rLocale ) );
             if (bChanged)
             {
@@ -1595,7 +1595,7 @@ void SAL_CALL
         {
             if (!xHyphDsp.is())
                 GetHyphenatorDsp_Impl();
-            BOOL bChanged = !IsEqSvcList( rServiceImplNames,
+            sal_Bool bChanged = !IsEqSvcList( rServiceImplNames,
                                           pHyphDsp->GetServiceList( rLocale ) );
             if (bChanged)
             {
@@ -1611,7 +1611,7 @@ void SAL_CALL
         {
             if (!xThesDsp.is())
                 GetThesaurusDsp_Impl();
-            BOOL bChanged = !IsEqSvcList( rServiceImplNames,
+            sal_Bool bChanged = !IsEqSvcList( rServiceImplNames,
                                           pThesDsp->GetServiceList( rLocale ) );
             if (bChanged)
             {
@@ -1623,11 +1623,11 @@ void SAL_CALL
 }
 
 
-BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
+sal_Bool LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SaveCfgSvcs" );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     LinguDispatcher *pDsp = 0;
     uno::Sequence< lang::Locale > aLocales;
@@ -1663,7 +1663,7 @@ BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
 
     if (pDsp  &&  aLocales.getLength())
     {
-        INT32 nLen = aLocales.getLength();
+        sal_Int32 nLen = aLocales.getLength();
         const lang::Locale *pLocale = aLocales.getConstArray();
 
         uno::Sequence< beans::PropertyValue > aValues( nLen );
@@ -1686,15 +1686,15 @@ BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
         }
         OUString aNodeName( A2OU(pNodeName) );
 
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             aSvcImplNames = pDsp->GetServiceList( pLocale[i] );
 
 #if OSL_DEBUG_LEVEL > 1
-            INT32 nSvcs = aSvcImplNames.getLength();
+            sal_Int32 nSvcs = aSvcImplNames.getLength();
             const OUString *pSvcImplName = aSvcImplNames.getConstArray();
-            for (INT32 j = 0;  j < nSvcs;  ++j)
+            for (sal_Int32 j = 0;  j < nSvcs;  ++j)
             {
                 OUString aImplName( pSvcImplName[j] );
             }
@@ -1733,11 +1733,11 @@ static uno::Sequence< OUString > GetLangSvcList( const uno::Any &rVal )
     {
         rVal >>= aRes;
 #if OSL_DEBUG_LEVEL > 1
-        INT32 nSvcs = aRes.getLength();
+        sal_Int32 nSvcs = aRes.getLength();
         if (nSvcs)
         {
             const OUString *pSvcName = aRes.getConstArray();
-            for (INT32 j = 0;  j < nSvcs;  ++j)
+            for (sal_Int32 j = 0;  j < nSvcs;  ++j)
             {
                 OUString aImplName( pSvcName[j] );
                 DBG_ASSERT( aImplName.getLength(), "service impl-name missing" );
@@ -1879,7 +1879,7 @@ void SAL_CALL
 
     if (!bDisposing)
     {
-        bDisposing = TRUE;
+        bDisposing = sal_True;
 
         // require listeners to release this object
         lang::EventObject aEvtObj( (XLinguServiceManager *) this );
@@ -1919,10 +1919,10 @@ void SAL_CALL
 }
 
 
-BOOL LngSvcMgr::AddLngSvcEvtBroadcaster(
+sal_Bool LngSvcMgr::AddLngSvcEvtBroadcaster(
             const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxBroadcaster.is())
     {
         if (!pListenerHelper)
@@ -1933,10 +1933,10 @@ BOOL LngSvcMgr::AddLngSvcEvtBroadcaster(
 }
 
 
-BOOL LngSvcMgr::RemoveLngSvcEvtBroadcaster(
+sal_Bool LngSvcMgr::RemoveLngSvcEvtBroadcaster(
             const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxBroadcaster.is())
     {
         DBG_ASSERT( pListenerHelper, "pListenerHelper non existent" );
@@ -1965,10 +1965,10 @@ sal_Bool SAL_CALL
 
     uno::Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 1fd74d08acd1..9116b36f767b 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -112,11 +112,11 @@ class LngSvcMgr :
     SvcInfoArray *                                      pAvailHyphSvcs;
     SvcInfoArray *                                      pAvailThesSvcs;
 
-    BOOL bDisposing;
-    BOOL bHasAvailSpellLocales;
-    BOOL bHasAvailGrammarLocales;
-    BOOL bHasAvailHyphLocales;
-    BOOL bHasAvailThesLocales;
+    sal_Bool bDisposing;
+    sal_Bool bHasAvailSpellLocales;
+    sal_Bool bHasAvailGrammarLocales;
+    sal_Bool bHasAvailHyphLocales;
+    sal_Bool bHasAvailThesLocales;
 
     // disallow copy-constructor and assignment-operator for now
     LngSvcMgr(const LngSvcMgr &);
@@ -138,7 +138,7 @@ class LngSvcMgr :
     void    SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp );
     void    SetCfgServiceLists( ThesaurusDispatcher &rThesDsp );
 
-    BOOL    SaveCfgSvcs( const String &rServiceName );
+    sal_Bool    SaveCfgSvcs( const String &rServiceName );
 
     void    SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
                     const SvcInfoArray &rAvailSvcs );
@@ -180,10 +180,10 @@ public:
     static inline ::rtl::OUString   getImplementationName_Static();
     static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
 
-    BOOL    AddLngSvcEvtBroadcaster(
+    sal_Bool    AddLngSvcEvtBroadcaster(
                 const ::com::sun::star::uno::Reference<
                     ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
-    BOOL    RemoveLngSvcEvtBroadcaster(
+    sal_Bool    RemoveLngSvcEvtBroadcaster(
                 const ::com::sun::star::uno::Reference<
                     ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
 };
diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index 9bbd456ce89d..49dedeec3e82 100644
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -29,7 +29,7 @@ PRJ=..
 
 PRJNAME=linguistic
 TARGET=lng
-ENABLE_EXCEPTIONS=TRUE
+ENABLE_EXCEPTIONS=sal_True
 
 #----- Settings ---------------------------------------------------------
 
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 25c2a7f6b374..f0a26ca50f09 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -86,7 +86,7 @@ osl::Mutex &    GetLinguMutex()
 
 ///////////////////////////////////////////////////////////////////////////
 
-LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang )
+LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang )
 {
     static LocaleDataWrapper aLclDtaWrp(
                 getProcessServiceFactory(),
@@ -106,10 +106,10 @@ LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang )
 /**
     returns text-encoding used for ByteString unicode String conversion
  */
-rtl_TextEncoding GetTextEncoding( INT16 nLanguage )
+rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage )
 {
     DBG_ASSERT( nLanguage != LANGUAGE_NONE, "invalid language argument" );
-    static INT16 nLastLanguage = LANGUAGE_NONE;
+    static sal_Int16 nLastLanguage = LANGUAGE_NONE;
 
     // set default value for unknown languages
     static rtl_TextEncoding nEncoding = RTL_TEXTENCODING_DONTKNOW;
@@ -265,14 +265,14 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 )
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL IsUseDicList( const PropertyValues &rProperties,
+sal_Bool IsUseDicList( const PropertyValues &rProperties,
         const uno::Reference< XPropertySet > &rxProp )
 {
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
 
-    INT32 nLen = rProperties.getLength();
+    sal_Int32 nLen = rProperties.getLength();
     const PropertyValue *pVal = rProperties.getConstArray();
-    INT32 i;
+    sal_Int32 i;
 
     for ( i = 0;  i < nLen;  ++i)
     {
@@ -293,14 +293,14 @@ BOOL IsUseDicList( const PropertyValues &rProperties,
 }
 
 
-BOOL IsIgnoreControlChars( const PropertyValues &rProperties,
+sal_Bool IsIgnoreControlChars( const PropertyValues &rProperties,
         const uno::Reference< XPropertySet > &rxProp )
 {
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
 
-    INT32 nLen = rProperties.getLength();
+    sal_Int32 nLen = rProperties.getLength();
     const PropertyValue *pVal = rProperties.getConstArray();
-    INT32 i;
+    sal_Int32 i;
 
     for ( i = 0;  i < nLen;  ++i)
     {
@@ -321,9 +321,9 @@ BOOL IsIgnoreControlChars( const PropertyValues &rProperties,
 }
 
 
-static BOOL lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry )
+static sal_Bool lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xEntry.is())
     {
         // there has to be (at least one) '=' denoting a hyphenation position
@@ -337,8 +337,8 @@ static BOOL lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry )
 
 uno::Reference< XDictionaryEntry > SearchDicList(
         const uno::Reference< XDictionaryList > &xDicList,
-        const OUString &rWord, INT16 nLanguage,
-        BOOL bSearchPosDics, BOOL bSearchSpellEntry )
+        const OUString &rWord, sal_Int16 nLanguage,
+        sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -351,15 +351,15 @@ uno::Reference< XDictionaryEntry > SearchDicList(
             aDics( xDicList->getDictionaries() );
     const uno::Reference< XDictionary >
             *pDic = aDics.getConstArray();
-    INT32 nDics = xDicList->getCount();
+    sal_Int32 nDics = xDicList->getCount();
 
-    INT32 i;
+    sal_Int32 i;
     for (i = 0;  i < nDics;  i++)
     {
         uno::Reference< XDictionary > axDic( pDic[i], UNO_QUERY );
 
         DictionaryType  eType = axDic->getDictionaryType();
-        INT16           nLang = LocaleToLanguage( axDic->getLocale() );
+        sal_Int16           nLang = LocaleToLanguage( axDic->getLocale() );
 
         if ( axDic.is() && axDic->isActive()
             && (nLang == nLanguage  ||  nLang == LANGUAGE_NONE) )
@@ -393,8 +393,8 @@ sal_Bool SaveDictionaries( const uno::Reference< XDictionaryList > &xDicList )
 
     Sequence< uno::Reference< XDictionary >  > aDics( xDicList->getDictionaries() );
     const uno::Reference< XDictionary >  *pDic = aDics.getConstArray();
-    INT32 nCount = aDics.getLength();
-    for (INT32 i = 0;  i < nCount;  i++)
+    sal_Int32 nCount = aDics.getLength();
+    for (sal_Int32 i = 0;  i < nCount;  i++)
     {
         try
         {
@@ -485,14 +485,14 @@ Locale CreateLocale( LanguageType eLang )
     return aLocale;
 }
 
-uno::Sequence< Locale > LangSeqToLocaleSeq( const uno::Sequence< INT16 > &rLangSeq )
+uno::Sequence< Locale > LangSeqToLocaleSeq( const uno::Sequence< sal_Int16 > &rLangSeq )
 {
-    const INT16 *pLang = rLangSeq.getConstArray();
-    INT32 nCount = rLangSeq.getLength();
+    const sal_Int16 *pLang = rLangSeq.getConstArray();
+    sal_Int32 nCount = rLangSeq.getLength();
 
     uno::Sequence< Locale > aLocales( nCount );
     Locale *pLocale = aLocales.getArray();
-    for (INT32 i = 0;  i < nCount;  ++i)
+    for (sal_Int32 i = 0;  i < nCount;  ++i)
     {
         LanguageToLocale( pLocale[i], pLang[ i ] );
     }
@@ -500,15 +500,15 @@ uno::Sequence< Locale > LangSeqToLocaleSeq( const uno::Sequence< INT16 > &rLangS
     return aLocales;
 }
 
-uno::Sequence< INT16 >
+uno::Sequence< sal_Int16 >
     LocaleSeqToLangSeq( uno::Sequence< Locale > &rLocaleSeq )
 {
     const Locale *pLocale = rLocaleSeq.getConstArray();
-    INT32 nCount = rLocaleSeq.getLength();
+    sal_Int32 nCount = rLocaleSeq.getLength();
 
-    uno::Sequence< INT16 >   aLangs( nCount );
-    INT16 *pLang = aLangs.getArray();
-    for (INT32 i = 0;  i < nCount;  ++i)
+    uno::Sequence< sal_Int16 >   aLangs( nCount );
+    sal_Int16 *pLang = aLangs.getArray();
+    for (sal_Int32 i = 0;  i < nCount;  ++i)
     {
         pLang[i] = LocaleToLanguage( pLocale[i] );
     }
@@ -518,10 +518,10 @@ uno::Sequence< INT16 >
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL    IsReadOnly( const String &rURL, BOOL *pbExist )
+sal_Bool    IsReadOnly( const String &rURL, sal_Bool *pbExist )
 {
-    BOOL bRes = FALSE;
-    BOOL bExists = FALSE;
+    sal_Bool bRes = sal_False;
+    sal_Bool bExists = sal_False;
 
     if (rURL.Len() > 0)
     {
@@ -539,7 +539,7 @@ BOOL    IsReadOnly( const String &rURL, BOOL *pbExist )
         }
         catch (Exception &)
         {
-            bRes = TRUE;
+            bRes = sal_True;
         }
     }
 
@@ -551,16 +551,16 @@ BOOL    IsReadOnly( const String &rURL, BOOL *pbExist )
 ///////////////////////////////////////////////////////////////////////////
 
 
-static BOOL GetAltSpelling( INT16 &rnChgPos, INT16 &rnChgLen, OUString &rRplc,
+static sal_Bool GetAltSpelling( sal_Int16 &rnChgPos, sal_Int16 &rnChgLen, OUString &rRplc,
         uno::Reference< XHyphenatedWord > &rxHyphWord )
 {
-    BOOL bRes = rxHyphWord->isAlternativeSpelling();
+    sal_Bool bRes = rxHyphWord->isAlternativeSpelling();
     if (bRes)
     {
         OUString aWord( rxHyphWord->getWord() ),
                  aHyphenatedWord( rxHyphWord->getHyphenatedWord() );
-        INT16   nHyphenationPos     = rxHyphWord->getHyphenationPos();
-        /*INT16   nHyphenPos          = rxHyphWord->getHyphenPos()*/;
+        sal_Int16   nHyphenationPos     = rxHyphWord->getHyphenationPos();
+        /*sal_Int16   nHyphenPos          = rxHyphWord->getHyphenPos()*/;
         const sal_Unicode *pWord    = aWord.getStr(),
                           *pAltWord = aHyphenatedWord.getStr();
 
@@ -574,7 +574,7 @@ static BOOL GetAltSpelling( INT16 &rnChgPos, INT16 &rnChgLen, OUString &rRplc,
         // find first different char from left
         sal_Int32   nPosL    = 0,
                     nAltPosL = 0;
-        for (INT16 i = 0 ;  pWord[ nPosL ] == pAltWord[ nAltPosL ];  nPosL++, nAltPosL++, i++)
+        for (sal_Int16 i = 0 ;  pWord[ nPosL ] == pAltWord[ nAltPosL ];  nPosL++, nAltPosL++, i++)
         {
             // restrict changes area beginning to the right to
             // the char immediately following the hyphen.
@@ -592,8 +592,8 @@ static BOOL GetAltSpelling( INT16 &rnChgPos, INT16 &rnChgLen, OUString &rRplc,
                 nPosR--, nAltPosR--)
             ;
 
-        rnChgPos = sal::static_int_cast< INT16 >(nPosL);
-        rnChgLen = sal::static_int_cast< INT16 >(nPosR - nPosL + 1);
+        rnChgPos = sal::static_int_cast< sal_Int16 >(nPosL);
+        rnChgLen = sal::static_int_cast< sal_Int16 >(nPosR - nPosL + 1);
         DBG_ASSERT( rnChgLen >= 0, "nChgLen < 0");
 
         sal_Int32 nTxtStart = nPosL;
@@ -604,32 +604,32 @@ static BOOL GetAltSpelling( INT16 &rnChgPos, INT16 &rnChgLen, OUString &rRplc,
 }
 
 
-static INT16 GetOrigWordPos( const OUString &rOrigWord, INT16 nPos )
+static sal_Int16 GetOrigWordPos( const OUString &rOrigWord, sal_Int16 nPos )
 {
-    INT32 nLen = rOrigWord.getLength();
-    INT32 i = -1;
+    sal_Int32 nLen = rOrigWord.getLength();
+    sal_Int32 i = -1;
     while (nPos >= 0  &&  i++ < nLen)
     {
         sal_Unicode cChar = rOrigWord[i];
-        BOOL bSkip = IsHyphen( cChar ) || IsControlChar( cChar );
+        sal_Bool bSkip = IsHyphen( cChar ) || IsControlChar( cChar );
         if (!bSkip)
             --nPos;
     }
-    return sal::static_int_cast< INT16 >((0 <= i  &&  i < nLen) ? i : -1);
+    return sal::static_int_cast< sal_Int16 >((0 <= i  &&  i < nLen) ? i : -1);
 }
 
 
-INT32 GetPosInWordToCheck( const OUString &rTxt, INT32 nPos )
+sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos )
 {
-    INT32 nRes = -1;
-    INT32 nLen = rTxt.getLength();
+    sal_Int32 nRes = -1;
+    sal_Int32 nLen = rTxt.getLength();
     if (0 <= nPos  &&  nPos < nLen)
     {
         nRes = 0;
-        for (INT32 i = 0;  i < nPos;  ++i)
+        for (sal_Int32 i = 0;  i < nPos;  ++i)
         {
             sal_Unicode cChar = rTxt[i];
-            BOOL bSkip = IsHyphen( cChar ) || IsControlChar( cChar );
+            sal_Bool bSkip = IsHyphen( cChar ) || IsControlChar( cChar );
             if (!bSkip)
                 ++nRes;
         }
@@ -645,17 +645,17 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
     uno::Reference< XHyphenatedWord > xRes;
     if (rOrigWord.getLength() && rxHyphWord.is())
     {
-        INT16    nChgPos = 0,
+        sal_Int16    nChgPos = 0,
                  nChgLen = 0;
         OUString aRplc;
-        BOOL bAltSpelling = GetAltSpelling( nChgPos, nChgLen, aRplc, rxHyphWord );
+        sal_Bool bAltSpelling = GetAltSpelling( nChgPos, nChgLen, aRplc, rxHyphWord );
 #if OSL_DEBUG_LEVEL > 1
         OUString aWord( rxHyphWord->getWord() );
 #endif
 
         OUString aOrigHyphenatedWord;
-        INT16 nOrigHyphenPos        = -1;
-        INT16 nOrigHyphenationPos   = -1;
+        sal_Int16 nOrigHyphenPos        = -1;
+        sal_Int16 nOrigHyphenationPos   = -1;
         if (!bAltSpelling)
         {
             aOrigHyphenatedWord = rOrigWord;
@@ -668,10 +668,10 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
             //! B�-c-k-er and Sc-hif-fah-rt
 
             OUString aLeft, aRight;
-            INT16 nPos = GetOrigWordPos( rOrigWord, nChgPos );
+            sal_Int16 nPos = GetOrigWordPos( rOrigWord, nChgPos );
 
             // get words like Sc-hif-fah-rt to work correct
-            INT16 nHyphenationPos = rxHyphWord->getHyphenationPos();
+            sal_Int16 nHyphenationPos = rxHyphWord->getHyphenationPos();
             if (nChgPos > nHyphenationPos)
                 --nPos;
 
@@ -682,7 +682,7 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
             aOrigHyphenatedWord += aRplc;
             aOrigHyphenatedWord += aRight;
 
-            nOrigHyphenPos      = sal::static_int_cast< INT16 >(aLeft.getLength() +
+            nOrigHyphenPos      = sal::static_int_cast< sal_Int16 >(aLeft.getLength() +
                                   rxHyphWord->getHyphenPos() - nChgPos);
             nOrigHyphenationPos = GetOrigWordPos( rOrigWord, nHyphenationPos );
         }
@@ -693,7 +693,7 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
         }
         else
         {
-            INT16 nLang = LocaleToLanguage( rxHyphWord->getLocale() );
+            sal_Int16 nLang = LocaleToLanguage( rxHyphWord->getLocale() );
             xRes = new HyphenatedWord(
                         rOrigWord, nLang, nOrigHyphenationPos,
                         aOrigHyphenatedWord, nOrigHyphenPos );
@@ -721,7 +721,7 @@ osl::Mutex & lcl_GetCharClassMutex()
 }
 
 
-BOOL IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage )
+sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -733,7 +733,7 @@ BOOL IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLang
 }
 
 
-BOOL IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage )
+sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -745,7 +745,7 @@ BOOL IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLang
 }
 
 
-String ToLower( const String &rText, INT16 nLanguage )
+String ToLower( const String &rText, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -755,7 +755,7 @@ String ToLower( const String &rText, INT16 nLanguage )
 }
 
 
-String ToUpper( const String &rText, INT16 nLanguage )
+String ToUpper( const String &rText, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -765,7 +765,7 @@ String ToUpper( const String &rText, INT16 nLanguage )
 }
 
 
-String ToTitle( const String &rText, INT16 nLanguage )
+String ToTitle( const String &rText, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -775,7 +775,7 @@ String ToTitle( const String &rText, INT16 nLanguage )
 }
 
 
-sal_Unicode ToLower( const sal_Unicode cChar, INT16 nLanguage )
+sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -785,7 +785,7 @@ sal_Unicode ToLower( const sal_Unicode cChar, INT16 nLanguage )
 }
 
 
-sal_Unicode ToUpper( const sal_Unicode cChar, INT16 nLanguage )
+sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -833,7 +833,7 @@ static const sal_uInt32 the_aDigitZeroes [] =
     0x0001D7CE  //1D7FF   ; Decimal # Nd  [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE
 };
 
-BOOL HasDigits( const OUString &rText )
+sal_Bool HasDigits( const OUString &rText )
 {
     static const int nNumDigitZeroes = sizeof(the_aDigitZeroes) / sizeof(the_aDigitZeroes[0]);
     const sal_Int32 nLen = rText.getLength();
@@ -848,27 +848,27 @@ BOOL HasDigits( const OUString &rText )
             if (nDigitZero > nCodePoint)
                 break;
             if (/*nDigitZero <= nCodePoint &&*/ nCodePoint <= nDigitZero + 9)
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL IsNumeric( const String &rText )
+sal_Bool IsNumeric( const String &rText )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     xub_StrLen nLen = rText.Len();
     if (nLen)
     {
-        bRes = TRUE;
+        bRes = sal_True;
         xub_StrLen i = 0;
         while (i < nLen)
         {
             sal_Unicode cChar = rText.GetChar( i++ );
             if ( !((sal_Unicode)'0' <= cChar  &&  cChar <= (sal_Unicode)'9') )
             {
-                bRes = FALSE;
+                bRes = sal_False;
                 break;
             }
         }
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index 9c02a976fcbd..dbfbd19f3f55 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -53,9 +53,9 @@ namespace linguistic
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL FileExists( const String &rMainURL )
+sal_Bool FileExists( const String &rMainURL )
 {
-    BOOL bExists = FALSE;
+    sal_Bool bExists = sal_False;
     if (rMainURL.Len())
     {
         try
@@ -93,7 +93,7 @@ String GetFileURL( SvtPathOptions::Pathes ePath, const String &rFileName )
 }
 
 
-String  GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim  )
+String  GetModulePath( SvtPathOptions::Pathes ePath, sal_Bool bAddAccessDelim  )
 {
     String aRes;
 
@@ -268,11 +268,11 @@ String SearchFileInPaths(
     const sal_Int32 nPaths = rPaths.getLength();
     for (sal_Int32 k = 0;  k < nPaths;  ++k)
     {
-        BOOL bIsURL = TRUE;
+        sal_Bool bIsURL = sal_True;
         INetURLObject aObj( rPaths[k] );
         if ( aObj.HasError() )
         {
-            bIsURL = FALSE;
+            bIsURL = sal_False;
             String aURL;
             if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( rPaths[k], aURL ) )
                 aObj.SetURL( aURL );
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 9f1f969f7237..6cc73236a5de 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -71,7 +71,7 @@ class ProposalList
 {
     std::vector< OUString > aVec;
 
-    BOOL    HasEntry( const OUString &rText ) const;
+    sal_Bool    HasEntry( const OUString &rText ) const;
 
     // make copy c-tor and assignment operator private
     ProposalList( const ProposalList & );
@@ -91,14 +91,14 @@ public:
 };
 
 
-BOOL ProposalList::HasEntry( const OUString &rText ) const
+sal_Bool ProposalList::HasEntry( const OUString &rText ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     size_t nCnt = aVec.size();
     for (size_t i = 0;  !bFound && i < nCnt;  ++i)
     {
         if (aVec[i] == rText)
-            bFound = TRUE;
+            bFound = sal_True;
     }
     return bFound;
 }
@@ -128,9 +128,9 @@ void ProposalList::Append( const std::vector< OUString > &rNew )
 
 void ProposalList::Append( const Sequence< OUString > &rNew )
 {
-    INT32 nLen = rNew.getLength();
+    sal_Int32 nLen = rNew.getLength();
     const OUString *pNew = rNew.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const OUString &rText = pNew[i];
         if (!HasEntry( rText ))
@@ -154,12 +154,12 @@ size_t ProposalList::Count() const
 
 Sequence< OUString > ProposalList::GetSequence() const
 {
-    INT32 nCount = Count();
-    INT32 nIdx = 0;
+    sal_Int32 nCount = Count();
+    sal_Int32 nIdx = 0;
     Sequence< OUString > aRes( nCount );
     OUString *pRes = aRes.getArray();
-    INT32 nLen = aVec.size();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    sal_Int32 nLen = aVec.size();
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const OUString &rText = aVec[i];
         DBG_ASSERT( nIdx < nCount, "index our of range" );
@@ -186,16 +186,16 @@ void ProposalList::Remove( const OUString &rText )
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL SvcListHasLanguage(
+sal_Bool SvcListHasLanguage(
         const LangSvcEntries_Spell &rEntry,
         LanguageType nLanguage )
 {
-    BOOL bHasLanguage = FALSE;
+    sal_Bool bHasLanguage = sal_False;
     Locale aTmpLocale;
 
     const Reference< XSpellChecker >  *pRef  = rEntry.aSvcRefs .getConstArray();
     sal_Int32 nLen = rEntry.aSvcRefs.getLength();
-    for (INT32 k = 0;  k < nLen  &&  !bHasLanguage;  ++k)
+    for (sal_Int32 k = 0;  k < nLen  &&  !bHasLanguage;  ++k)
     {
         if (pRef[k].is())
         {
@@ -264,7 +264,7 @@ sal_Bool SAL_CALL
         throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    return isValid_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, TRUE );
+    return isValid_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, sal_True );
 }
 
 
@@ -274,7 +274,7 @@ Reference< XSpellAlternatives > SAL_CALL
         throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    return spell_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, TRUE );
+    return spell_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, sal_True );
 }
 
 
@@ -296,13 +296,13 @@ static Reference< XDictionaryEntry > lcl_GetRulingDictionaryEntry(
     {
         Reference< XDictionaryList > xDList( GetDictionaryList() );
         Reference< XDictionaryEntry > xNegEntry( SearchDicList( xDList,
-                rWord, nLanguage, FALSE, TRUE ) );
+                rWord, nLanguage, sal_False, sal_True ) );
         if (xNegEntry.is())
             xRes = xNegEntry;
         else
         {
             Reference< XDictionaryEntry > xPosEntry( SearchDicList( xDList,
-                    rWord, nLanguage, TRUE, TRUE ) );
+                    rWord, nLanguage, sal_True, sal_True ) );
             if (xPosEntry.is())
                 xRes = xPosEntry;
         }
@@ -312,16 +312,16 @@ static Reference< XDictionaryEntry > lcl_GetRulingDictionaryEntry(
 }
 
 
-BOOL SpellCheckerDispatcher::isValid_Impl(
+sal_Bool SpellCheckerDispatcher::isValid_Impl(
             const OUString& rWord,
             LanguageType nLanguage,
             const PropertyValues& rProperties,
-            BOOL bCheckDics)
+            sal_Bool bCheckDics)
         throw( RuntimeException, IllegalArgumentException )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
 
     if (nLanguage == LANGUAGE_NONE  || !rWord.getLength())
         return bRes;
@@ -351,24 +351,24 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             RemoveControlChars( aChkWord );
 
-        INT32 nLen = pEntry->aSvcRefs.getLength();
+        sal_Int32 nLen = pEntry->aSvcRefs.getLength();
         DBG_ASSERT( nLen == pEntry->aSvcImplNames.getLength(),
                 "lng : sequence length mismatch");
         DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                 "lng : index out of range");
 
-        INT32 i = 0;
-        BOOL bTmpRes = TRUE;
-        BOOL bTmpResValid = FALSE;
+        sal_Int32 i = 0;
+        sal_Bool bTmpRes = sal_True;
+        sal_Bool bTmpResValid = sal_False;
 
         // try already instantiated services first
         {
             const Reference< XSpellChecker >  *pRef  =
                     pEntry->aSvcRefs.getConstArray();
             while (i <= pEntry->nLastTriedSvcIndex
-                   &&  (!bTmpResValid  ||  FALSE == bTmpRes))
+                   &&  (!bTmpResValid  ||  sal_False == bTmpRes))
             {
-                bTmpResValid = TRUE;
+                bTmpResValid = sal_True;
                 if (pRef[i].is()  &&  pRef[i]->hasLocale( aLocale ))
                 {
                     bTmpRes = GetCache().CheckWord( aChkWord, nLanguage );
@@ -384,7 +384,7 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
                     }
                 }
                 else
-                    bTmpResValid = FALSE;
+                    bTmpResValid = sal_False;
 
                 if (bTmpResValid)
                     bRes = bTmpRes;
@@ -394,7 +394,7 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
         }
 
         // if still no result instantiate new services and try those
-        if ((!bTmpResValid  ||  FALSE == bTmpRes)
+        if ((!bTmpResValid  ||  sal_False == bTmpRes)
             &&  pEntry->nLastTriedSvcIndex < nLen - 1)
         {
             const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray();
@@ -410,7 +410,7 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
                 //! thus the service needs not to now about it
                 //aArgs.getArray()[1] <<= GetDicList();
 
-                while (i < nLen  &&  (!bTmpResValid  ||  FALSE == bTmpRes))
+                while (i < nLen  &&  (!bTmpResValid  ||  sal_False == bTmpRes))
                 {
                     // create specific service via it's implementation name
                     Reference< XSpellChecker > xSpell;
@@ -431,7 +431,7 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
                     if (xBroadcaster.is())
                         rMgr.AddLngSvcEvtBroadcaster( xBroadcaster );
 
-                    bTmpResValid = TRUE;
+                    bTmpResValid = sal_True;
                     if (xSpell.is()  &&  xSpell->hasLocale( aLocale ))
                     {
                         bTmpRes = GetCache().CheckWord( aChkWord, nLanguage );
@@ -447,12 +447,12 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
                         }
                     }
                     else
-                        bTmpResValid = FALSE;
+                        bTmpResValid = sal_False;
 
                     if (bTmpResValid)
                         bRes = bTmpRes;
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
                 }
 
@@ -484,7 +484,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
             const OUString& rWord,
             LanguageType nLanguage,
             const PropertyValues& rProperties,
-            BOOL bCheckDics )
+            sal_Bool bCheckDics )
         throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
@@ -519,15 +519,15 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             RemoveControlChars( aChkWord );
 
-        INT32 nLen = pEntry->aSvcRefs.getLength();
+        sal_Int32 nLen = pEntry->aSvcRefs.getLength();
         DBG_ASSERT( nLen == pEntry->aSvcImplNames.getLength(),
                 "lng : sequence length mismatch");
         DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                 "lng : index out of range");
 
-        INT32 i = 0;
+        sal_Int32 i = 0;
         Reference< XSpellAlternatives > xTmpRes;
-        BOOL bTmpResValid = FALSE;
+        sal_Bool bTmpResValid = sal_False;
 
         // try already instantiated services first
         {
@@ -536,10 +536,10 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
             while (i <= pEntry->nLastTriedSvcIndex
                    &&  (!bTmpResValid || xTmpRes.is()) )
             {
-                bTmpResValid = TRUE;
+                bTmpResValid = sal_True;
                 if (pRef[i].is()  &&  pRef[i]->hasLocale( aLocale ))
                 {
-                    BOOL bOK = GetCache().CheckWord( aChkWord, nLanguage );
+                    sal_Bool bOK = GetCache().CheckWord( aChkWord, nLanguage );
                     if (bOK)
                         xTmpRes = NULL;
                     else
@@ -554,7 +554,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
                     }
                 }
                 else
-                    bTmpResValid = FALSE;
+                    bTmpResValid = sal_False;
 
                 // return first found result if the word is not known by any checker.
                 // But if that result has no suggestions use the first one that does
@@ -618,10 +618,10 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
                     if (xBroadcaster.is())
                         rMgr.AddLngSvcEvtBroadcaster( xBroadcaster );
 
-                    bTmpResValid = TRUE;
+                    bTmpResValid = sal_True;
                     if (xSpell.is()  &&  xSpell->hasLocale( aLocale ))
                     {
-                        BOOL bOK = GetCache().CheckWord( aChkWord, nLanguage );
+                        sal_Bool bOK = GetCache().CheckWord( aChkWord, nLanguage );
                         if (bOK)
                             xTmpRes = NULL;
                         else
@@ -636,7 +636,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
                         }
                     }
                     else
-                        bTmpResValid = FALSE;
+                        bTmpResValid = sal_False;
 
                     // return first found result if the word is not known by any checker.
                     // But if that result has no suggestions use the first one that does
@@ -657,7 +657,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
                         nNumSugestions = nTmpNumSugestions;
                     }
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
                 }
 
@@ -680,7 +680,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
         // neagtive dictionaries)
         ProposalList aProposalList;
 //        Sequence< OUString > aProposals;
-        INT16 eFailureType = -1;    // no failure
+        sal_Int16 eFailureType = -1;    // no failure
         if (xRes.is())
         {
             aProposalList.Append( xRes->getAlternatives() );
@@ -706,7 +706,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
 
                     // replacement text must not be in negative dictionary itself
                     if (aAddRplcTxt.getLength() &&
-                        !SearchDicList( xDList, aAddRplcTxt, nLanguage, FALSE, TRUE ).is())
+                        !SearchDicList( xDList, aAddRplcTxt, nLanguage, sal_False, sal_True ).is())
                     {
                         aProposalList.Prepend( aAddRplcTxt );
                     }
@@ -764,7 +764,7 @@ throw (uno::RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     uno::Sequence< Locale > aTmp( getLocales() );
-    uno::Sequence< INT16 > aRes( LocaleSeqToLangSeq( aTmp ) );
+    uno::Sequence< sal_Int16 > aRes( LocaleSeqToLangSeq( aTmp ) );
     return aRes;
 }
 
@@ -811,9 +811,9 @@ void SpellCheckerDispatcher::SetServiceList( const Locale &rLocale,
     if (pCache)
         pCache->Flush();    // new services may spell differently...
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
 
-    INT32 nLen = rSvcImplNames.getLength();
+    sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
         // remove entry
         aSvcMap.erase( nLanguage );
@@ -845,7 +845,7 @@ Sequence< OUString >
     Sequence< OUString > aRes;
 
     // search for entry with that language and use data from that
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     SpellCheckerDispatcher          *pThis = (SpellCheckerDispatcher *) this;
     const SpellSvcByLangMap_t::iterator aIt( pThis->aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Spell      *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 7ae83d3dbc6f..99c8eeefbc6b 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -90,16 +90,16 @@ class SpellCheckerDispatcher :
 
     void    ClearSvcList();
 
-    BOOL    isValid_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage,
+    sal_Bool    isValid_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage,
                     const ::com::sun::star::beans::PropertyValues& aProperties,
-                    BOOL bCheckDics)
+                    sal_Bool bCheckDics)
                 throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XSpellAlternatives >
             spell_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage,
                     const ::com::sun::star::beans::PropertyValues& aProperties,
-                    BOOL bCheckDics)
+                    sal_Bool bCheckDics)
                 throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 
 public:
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index fb4c11c892c6..158ff9073d56 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -70,23 +70,23 @@ Reference< XSpellAlternatives > MergeProposals(
         xMerged = rxAlt1;
     else
     {
-        INT32 nAltCount1 = rxAlt1->getAlternativesCount();
+        sal_Int32 nAltCount1 = rxAlt1->getAlternativesCount();
         Sequence< OUString > aAlt1( rxAlt1->getAlternatives() );
         const OUString *pAlt1 = aAlt1.getConstArray();
 
-        INT32 nAltCount2 = rxAlt2->getAlternativesCount();
+        sal_Int32 nAltCount2 = rxAlt2->getAlternativesCount();
         Sequence< OUString > aAlt2( rxAlt2->getAlternatives() );
         const OUString *pAlt2 = aAlt2.getConstArray();
 
-        INT32 nCountNew = Min( nAltCount1 + nAltCount2, (INT32) MAX_PROPOSALS );
+        sal_Int32 nCountNew = Min( nAltCount1 + nAltCount2, (sal_Int32) MAX_PROPOSALS );
         Sequence< OUString > aAltNew( nCountNew );
         OUString *pAltNew = aAltNew.getArray();
 
-        INT32 nIndex = 0;
-        INT32 i = 0;
+        sal_Int32 nIndex = 0;
+        sal_Int32 i = 0;
         for (int j = 0;  j < 2;  j++)
         {
-            INT32           nCount  = j == 0 ? nAltCount1 : nAltCount2;
+            sal_Int32           nCount  = j == 0 ? nAltCount1 : nAltCount2;
             const OUString  *pAlt   = j == 0 ? pAlt1 : pAlt2;
             for (i = 0;  i < nCount  &&  nIndex < MAX_PROPOSALS;  i++)
             {
@@ -108,23 +108,23 @@ Reference< XSpellAlternatives > MergeProposals(
 }
 
 
-BOOL SeqHasEntry(
+sal_Bool SeqHasEntry(
         const Sequence< OUString > &rSeq,
         const OUString &rTxt)
 {
-    BOOL bRes = FALSE;
-    INT32 nLen = rSeq.getLength();
+    sal_Bool bRes = sal_False;
+    sal_Int32 nLen = rSeq.getLength();
     const OUString *pEntry = rSeq.getConstArray();
-    for (INT32 i = 0;  i < nLen  &&  !bRes;  ++i)
+    for (sal_Int32 i = 0;  i < nLen  &&  !bRes;  ++i)
     {
         if (rTxt == pEntry[i])
-            bRes = TRUE;
+            bRes = sal_True;
     }
     return bRes;
 }
 
 
-void SearchSimilarText( const OUString &rText, INT16 nLanguage,
+void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
         Reference< XDictionaryList > &xDicList,
         std::vector< OUString > & rDicListProps )
 {
@@ -135,13 +135,13 @@ void SearchSimilarText( const OUString &rText, INT16 nLanguage,
             aDics( xDicList->getDictionaries() );
     const Reference< XDictionary >
             *pDic = aDics.getConstArray();
-    INT32 nDics = xDicList->getCount();
+    sal_Int32 nDics = xDicList->getCount();
 
-    for (INT32 i = 0;  i < nDics;  i++)
+    for (sal_Int32 i = 0;  i < nDics;  i++)
     {
         Reference< XDictionary > xDic( pDic[i], UNO_QUERY );
 
-        INT16           nLang = LocaleToLanguage( xDic->getLocale() );
+        sal_Int16           nLang = LocaleToLanguage( xDic->getLocale() );
 
         if ( xDic.is() && xDic->isActive()
             && (nLang == nLanguage  ||  nLang == LANGUAGE_NONE) )
@@ -153,8 +153,8 @@ void SearchSimilarText( const OUString &rText, INT16 nLanguage,
 #endif
             const Sequence< Reference< XDictionaryEntry > > aEntries = xDic->getEntries();
             const Reference< XDictionaryEntry > *pEntries = aEntries.getConstArray();
-            INT32 nLen = aEntries.getLength();
-            for (INT32 k = 0;  k < nLen;  ++k)
+            sal_Int32 nLen = aEntries.getLength();
+            for (sal_Int32 k = 0;  k < nLen;  ++k)
             {
                 String aEntryTxt;
                 if (pEntries[k].is())
@@ -173,27 +173,27 @@ void SearchSimilarText( const OUString &rText, INT16 nLanguage,
 
 void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
         Reference< XDictionaryList > &rxDicList,
-        INT16 nLanguage )
+        sal_Int16 nLanguage )
 {
     static const OUString aEmpty;
-    BOOL bSthRemoved = FALSE;
-    INT32 nLen = rSeq.getLength();
+    sal_Bool bSthRemoved = sal_False;
+    sal_Int32 nLen = rSeq.getLength();
     OUString *pEntries = rSeq.getArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         Reference< XDictionaryEntry > xNegEntry( SearchDicList( rxDicList,
-                    pEntries[i], nLanguage, FALSE, TRUE ) );
+                    pEntries[i], nLanguage, sal_False, sal_True ) );
         if (xNegEntry.is())
         {
             pEntries[i] = aEmpty;
-            bSthRemoved = TRUE;
+            bSthRemoved = sal_True;
         }
     }
     if (bSthRemoved)
     {
         Sequence< OUString > aNew;
         // merge sequence without duplicates and empty strings in new empty sequence
-        aNew = MergeProposalSeqs( aNew, rSeq, FALSE );
+        aNew = MergeProposalSeqs( aNew, rSeq, sal_False );
         rSeq = aNew;
     }
 }
@@ -202,7 +202,7 @@ void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
 Sequence< OUString > MergeProposalSeqs(
             Sequence< OUString > &rAlt1,
             Sequence< OUString > &rAlt2,
-            BOOL bAllowDuplicates )
+            sal_Bool bAllowDuplicates )
 {
     Sequence< OUString > aMerged;
 
@@ -212,20 +212,20 @@ Sequence< OUString > MergeProposalSeqs(
         aMerged = rAlt1;
     else
     {
-        INT32 nAltCount1 = rAlt1.getLength();
+        sal_Int32 nAltCount1 = rAlt1.getLength();
         const OUString *pAlt1 = rAlt1.getConstArray();
-        INT32 nAltCount2 = rAlt2.getLength();
+        sal_Int32 nAltCount2 = rAlt2.getLength();
         const OUString *pAlt2 = rAlt2.getConstArray();
 
-        INT32 nCountNew = Min( nAltCount1 + nAltCount2, (INT32) MAX_PROPOSALS );
+        sal_Int32 nCountNew = Min( nAltCount1 + nAltCount2, (sal_Int32) MAX_PROPOSALS );
         aMerged.realloc( nCountNew );
         OUString *pMerged = aMerged.getArray();
 
-        INT32 nIndex = 0;
-        INT32 i = 0;
+        sal_Int32 nIndex = 0;
+        sal_Int32 i = 0;
         for (int j = 0;  j < 2;  j++)
         {
-            INT32           nCount  = j == 0 ? nAltCount1 : nAltCount2;
+            sal_Int32           nCount  = j == 0 ? nAltCount1 : nAltCount2;
             const OUString  *pAlt   = j == 0 ? pAlt1 : pAlt2;
             for (i = 0;  i < nCount  &&  nIndex < MAX_PROPOSALS;  i++)
             {
@@ -252,8 +252,8 @@ SpellAlternatives::SpellAlternatives()
 
 
 SpellAlternatives::SpellAlternatives(
-            const OUString &rWord, INT16 nLang,
-            INT16 nFailureType, const OUString &rRplcWord ) :
+            const OUString &rWord, sal_Int16 nLang,
+            sal_Int16 nFailureType, const OUString &rRplcWord ) :
     aAlt        ( Sequence< OUString >(1) ),
     aWord       (rWord),
     nType       (nFailureType),
@@ -267,7 +267,7 @@ SpellAlternatives::SpellAlternatives(
 
 
 SpellAlternatives::SpellAlternatives(
-        const OUString &rWord, INT16 nLang, INT16 nFailureType,
+        const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
         const Sequence< OUString > &rAlternatives ) :
     aAlt        (rAlternatives),
     aWord       (rWord),
@@ -310,7 +310,7 @@ sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount()
         throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    return (INT16) aAlt.getLength();
+    return (sal_Int16) aAlt.getLength();
 }
 
 
@@ -338,7 +338,7 @@ throw (uno::RuntimeException)
 }
 
 
-void SpellAlternatives::SetWordLanguage(const OUString &rWord, INT16 nLang)
+void SpellAlternatives::SetWordLanguage(const OUString &rWord, sal_Int16 nLang)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     aWord = rWord;
@@ -346,7 +346,7 @@ void SpellAlternatives::SetWordLanguage(const OUString &rWord, INT16 nLang)
 }
 
 
-void SpellAlternatives::SetFailureType(INT16 nTypeP)
+void SpellAlternatives::SetFailureType(sal_Int16 nTypeP)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     nType = nTypeP;
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 91aab5c0997e..8cf9110c7570 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -52,15 +52,15 @@ using namespace linguistic;
 
 ///////////////////////////////////////////////////////////////////////////
 
-static BOOL SvcListHasLanguage(
+static sal_Bool SvcListHasLanguage(
         const Sequence< Reference< XThesaurus > > &rRefs,
         const Locale &rLocale )
 {
-    BOOL bHasLanguage = FALSE;
+    sal_Bool bHasLanguage = sal_False;
 
     const Reference< XThesaurus > *pRef = rRefs.getConstArray();
-    INT32 nLen = rRefs.getLength();
-    for (INT32 k = 0;  k < nLen  &&  !bHasLanguage;  ++k)
+    sal_Int32 nLen = rRefs.getLength();
+    for (sal_Int32 k = 0;  k < nLen  &&  !bHasLanguage;  ++k)
     {
         if (pRef[k].is())
             bHasLanguage = pRef[k]->hasLocale( rLocale );
@@ -128,7 +128,7 @@ Sequence< Reference< XMeaning > > SAL_CALL
 
     Sequence< Reference< XMeaning > >   aMeanings;
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     if (nLanguage == LANGUAGE_NONE  || !rTerm.getLength())
         return aMeanings;
 
@@ -150,13 +150,13 @@ Sequence< Reference< XMeaning > > SAL_CALL
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             RemoveControlChars( aChkWord );
 
-        INT32 nLen = pEntry->aSvcRefs.getLength();
+        sal_Int32 nLen = pEntry->aSvcRefs.getLength();
         DBG_ASSERT( nLen == pEntry->aSvcImplNames.getLength(),
                 "lng : sequence length mismatch");
         DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                 "lng : index out of range");
 
-        INT32 i = 0;
+        sal_Int32 i = 0;
 
         // try already instantiated services first
         {
@@ -203,7 +203,7 @@ Sequence< Reference< XMeaning > > SAL_CALL
                     if (xThes.is()  &&  xThes->hasLocale( rLocale ))
                         aMeanings = xThes->queryMeanings( aChkWord, rLocale, rProperties );
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
                 }
 
@@ -227,9 +227,9 @@ void ThesaurusDispatcher::SetServiceList( const Locale &rLocale,
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
 
-    INT32 nLen = rSvcImplNames.getLength();
+    sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
         // remove entry
         aSvcMap.erase( nLanguage );
@@ -261,7 +261,7 @@ Sequence< OUString >
     Sequence< OUString > aRes;
 
     // search for entry with that language and use data from that
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     ThesaurusDispatcher             *pThis = (ThesaurusDispatcher *) this;
     const ThesSvcByLangMap_t::iterator  aIt( pThis->aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Thes       *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx
index e7aa3bf310f8..1978923a59ff 100644
--- a/linguistic/source/thesdta.cxx
+++ b/linguistic/source/thesdta.cxx
@@ -52,7 +52,7 @@ namespace linguistic
 
 
 ThesaurusMeaning::ThesaurusMeaning(const OUString &rText,
-                 const OUString &rLookUpText, INT16 nLookUpLang ) :
+                 const OUString &rLookUpText, sal_Int16 nLookUpLang ) :
     aText               (rText),
     aLookUpText         (rLookUpText),
     nLookUpLanguage     (nLookUpLang)
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index f27b612ce9cb..c4bc6f872834 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -218,7 +218,7 @@ namespace basprov
         if ( aFunctionName == BASPROV_PROPERTY_EDITABLE )
         {
             ::rtl::OUString sDocURL, sLibName, sModName;
-            USHORT nLine1 = 0, nLine2;
+            sal_uInt16 nLine1 = 0, nLine2;
 
             if ( !m_bIsAppScript )
             {
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index fe6ed69fccab..dc9d98acab64 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -100,7 +100,7 @@ namespace basprov
                 sal_Int32 nRealCount = 0;
                 for ( sal_Int32 i = 0; i < nCount; ++i )
                 {
-                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< USHORT >( i ) ) );
+                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< sal_uInt16 >( i ) ) );
                     if ( pMethod && !pMethod->IsHidden() )
                         ++nRealCount;
                 }
@@ -110,7 +110,7 @@ namespace basprov
                 sal_Int32 iTarget = 0;
                 for ( sal_Int32 i = 0; i < nCount; ++i )
                 {
-                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< USHORT >( i ) ) );
+                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< sal_uInt16 >( i ) ) );
                     if ( pMethod && !pMethod->IsHidden() )
                         pChildNodes[iTarget++] = static_cast< browse::XBrowseNode* >( new BasicMethodNodeImpl( m_xContext, m_sScriptingContext, pMethod, m_bIsAppScript ) );
                 }
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index ed6c9d7e6a5b..db697dfb807f 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -396,7 +396,7 @@ namespace basprov
                 StarBASIC* pBasic = pBasicMgr->GetLib( aLibrary );
                 if ( !pBasic )
                 {
-                    USHORT nId = pBasicMgr->GetLibId( aLibrary );
+                    sal_uInt16 nId = pBasicMgr->GetLibId( aLibrary );
                     if ( nId != LIB_NOTFOUND )
                     {
                         pBasicMgr->LoadLib( nId );
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 24bba1e7bff6..3006ba82e554 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -136,7 +136,7 @@ namespace basprov
             if ( pInfo )
             {
                 sal_Int32 nSbxOptional = 0;
-                USHORT n = 1;
+                sal_uInt16 n = 1;
                 for ( const SbxParamInfo* pParamInfo = pInfo->GetParam( n ); pParamInfo; pParamInfo = pInfo->GetParam( ++n ) )
                 {
                     if ( ( pParamInfo->nFlags & SBX_OPTIONAL ) != 0 )
@@ -169,7 +169,7 @@ namespace basprov
                 {
                     SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
                     unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), pParams[i] );
-                    xSbxParams->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+                    xSbxParams->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
 
                     // Enable passing by ref
                     if ( xSbxVar->GetType() != SbxVARIANT )
@@ -205,7 +205,7 @@ namespace basprov
                 if ( pInfo_ )
                 {
                     OutParamMap aOutParamMap;
-                    for ( USHORT n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
+                    for ( sal_uInt16 n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
                     {
                         const SbxParamInfo* pParamInfo = pInfo_->GetParam( n );
                         if ( pParamInfo && ( pParamInfo->eType & SbxBYREF ) != 0 )
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index e9d12be12b5e..b1268ada4998 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -155,7 +155,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
     sal_Bool bSuccess = sal_False;
     Any invokeResult;
-    bool bCaughtException = FALSE;
+    bool bCaughtException = sal_False;
     Any aException;
 
     if ( m_bInitialised )
@@ -251,7 +251,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
             invokeResult <<= reason.concat( aException.getValueTypeName() ).concat( e.Message );
 
-            bCaughtException = TRUE;
+            bCaughtException = sal_True;
         }
     }
     else
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 48a03c96229e..3fbf4eecffbd 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -35,54 +35,54 @@ class BitSet
 {
 private:
     void CopyFrom( const BitSet& rSet );
-    USHORT nBlocks;
-    USHORT nCount;
-    ULONG* pBitmap;
+    sal_uInt16 nBlocks;
+    sal_uInt16 nCount;
+    sal_uIntPtr* pBitmap;
 public:
-    BitSet operator<<( USHORT nOffset ) const;
-    BitSet operator>>( USHORT nOffset ) const;
-    static USHORT CountBits( ULONG nBits );
-    BOOL operator!() const;
+    BitSet operator<<( sal_uInt16 nOffset ) const;
+    BitSet operator>>( sal_uInt16 nOffset ) const;
+    static sal_uInt16 CountBits( sal_uIntPtr nBits );
+    sal_Bool operator!() const;
     BitSet();
     BitSet( const BitSet& rOrig );
-    BitSet( USHORT* pArray, USHORT nSize );
+    BitSet( sal_uInt16* pArray, sal_uInt16 nSize );
     ~BitSet();
     BitSet( const Range& rRange );
-    USHORT Count() const;
+    sal_uInt16 Count() const;
     BitSet& operator=( const BitSet& rOrig );
-    BitSet& operator=( USHORT nBit );
+    BitSet& operator=( sal_uInt16 nBit );
     BitSet operator|( const BitSet& rSet ) const;
-    BitSet operator|( USHORT nBit ) const;
+    BitSet operator|( sal_uInt16 nBit ) const;
     BitSet& operator|=( const BitSet& rSet );
-    BitSet& operator|=( USHORT nBit );
+    BitSet& operator|=( sal_uInt16 nBit );
     BitSet operator-( const BitSet& rSet ) const;
-    BitSet operator-( USHORT nId ) const;
+    BitSet operator-( sal_uInt16 nId ) const;
     BitSet& operator-=( const BitSet& rSet );
-    BitSet& operator-=( USHORT nBit );
+    BitSet& operator-=( sal_uInt16 nBit );
     BitSet operator&( const BitSet& rSet ) const;
     BitSet& operator&=( const BitSet& rSet );
     BitSet operator^( const BitSet& rSet ) const;
-    BitSet operator^( USHORT nBit ) const;
+    BitSet operator^( sal_uInt16 nBit ) const;
     BitSet& operator^=( const BitSet& rSet );
-    BitSet& operator^=( USHORT nBit );
-    BOOL IsRealSubSet( const BitSet& rSet ) const;
-    BOOL IsSubSet( const BitSet& rSet ) const;
-    BOOL IsRealSuperSet( const BitSet& rSet ) const;
-    BOOL Contains( USHORT nBit ) const;
-    BOOL IsSuperSet( const BitSet& rSet ) const;
-    BOOL operator==( const BitSet& rSet ) const;
-    BOOL operator==( USHORT nBit ) const;
-    BOOL operator!=( const BitSet& rSet ) const;
-    BOOL operator!=( USHORT nBit ) const;
+    BitSet& operator^=( sal_uInt16 nBit );
+    sal_Bool IsRealSubSet( const BitSet& rSet ) const;
+    sal_Bool IsSubSet( const BitSet& rSet ) const;
+    sal_Bool IsRealSuperSet( const BitSet& rSet ) const;
+    sal_Bool Contains( sal_uInt16 nBit ) const;
+    sal_Bool IsSuperSet( const BitSet& rSet ) const;
+    sal_Bool operator==( const BitSet& rSet ) const;
+    sal_Bool operator==( sal_uInt16 nBit ) const;
+    sal_Bool operator!=( const BitSet& rSet ) const;
+    sal_Bool operator!=( sal_uInt16 nBit ) const;
 
 };
 //--------------------------------------------------------------------
 
-// returns TRUE if the set is empty
+// returns sal_True if the set is empty
 
 
 
-inline BOOL BitSet::operator!() const
+inline sal_Bool BitSet::operator!() const
 {
     return nCount == 0;
 }
@@ -90,7 +90,7 @@ inline BOOL BitSet::operator!() const
 
 // returns the number of bits in the bitset
 
-inline USHORT BitSet::Count() const
+inline sal_uInt16 BitSet::Count() const
 {
     return nCount;
 }
@@ -106,7 +106,7 @@ inline BitSet BitSet::operator|( const BitSet& rSet ) const
 
 // creates the union of a bitset with a single bit
 
-inline BitSet BitSet::operator|( USHORT nBit ) const
+inline BitSet BitSet::operator|( sal_uInt16 nBit ) const
 {
     return BitSet(*this) |= nBit;
 }
@@ -123,7 +123,7 @@ inline BitSet BitSet::operator-( const BitSet& ) const
 // creates the asymetric difference with a single bit
 
 
-inline BitSet BitSet::operator-( USHORT ) const
+inline BitSet BitSet::operator-( sal_uInt16 ) const
 {
     return BitSet();
 }
@@ -164,7 +164,7 @@ inline BitSet BitSet::operator^( const BitSet& ) const
 
 // creates the symetric difference with a single bit
 
-inline BitSet BitSet::operator^( USHORT ) const
+inline BitSet BitSet::operator^( sal_uInt16 ) const
 {
     return BitSet();
 }
@@ -180,7 +180,7 @@ inline BitSet& BitSet::operator^=( const BitSet& )
 #ifdef BITSET_READY
 // builds the symetric difference with a single bit
 
-inline BitSet& BitSet::operator^=( USHORT )
+inline BitSet& BitSet::operator^=( sal_uInt16 )
 {
     // crash!!!
     return BitSet();
@@ -190,48 +190,48 @@ inline BitSet& BitSet::operator^=( USHORT )
 
 // determines if the other bitset is a real superset
 
-inline BOOL BitSet::IsRealSubSet( const BitSet& ) const
+inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const
 {
-    return FALSE;
+    return sal_False;
 }
 //--------------------------------------------------------------------
 
 // detsermines if the other bitset is a superset or equal
 
-inline BOOL BitSet::IsSubSet( const BitSet& ) const
+inline sal_Bool BitSet::IsSubSet( const BitSet& ) const
 {
-    return FALSE;
+    return sal_False;
 }
 //--------------------------------------------------------------------
 
 // determines if the other bitset is a real subset
 
-inline BOOL BitSet::IsRealSuperSet( const BitSet& ) const
+inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
 
 // determines if the other bitset is a subset or equal
 
-inline BOOL BitSet::IsSuperSet( const BitSet& ) const
+inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const
 {
-    return FALSE;
+    return sal_False;
 }
 //--------------------------------------------------------------------
 
 // determines if the bit is the only one in the bitset
 
-inline BOOL BitSet::operator==( USHORT ) const
+inline sal_Bool BitSet::operator==( sal_uInt16 ) const
 {
-    return FALSE;
+    return sal_False;
 }
 //--------------------------------------------------------------------
 
 // determines if the bitsets aren't equal
 
-inline BOOL BitSet::operator!=( const BitSet& rSet ) const
+inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const
 {
     return !( *this == rSet );
 }
@@ -239,7 +239,7 @@ inline BOOL BitSet::operator!=( const BitSet& rSet ) const
 
 // determines if the bitset doesn't contain only this bit
 
-inline BOOL BitSet::operator!=( USHORT nBit ) const
+inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const
 {
     return !( *this == nBit );
 }
@@ -248,8 +248,8 @@ inline BOOL BitSet::operator!=( USHORT nBit ) const
 class IndexBitSet : BitSet
 {
 public:
-  USHORT GetFreeIndex();
-  void ReleaseIndex(USHORT i){*this-=i;}
+  sal_uInt16 GetFreeIndex();
+  void ReleaseIndex(sal_uInt16 i){*this-=i;}
 };
 
 
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 1bdbdf98161d..9e252123348b 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -66,27 +66,27 @@ friend class SfxOrganizeDlg_Impl;
     SfxOrganizeMgr*         pMgr;
     SfxOrganizeDlg_Impl*    pDlg;
 
-    static BOOL             bDropMoveOk;
+    static sal_Bool             bDropMoveOk;
 
     DECL_LINK( OnAsyncExecuteDrop, ExecuteDropEvent* );
 
 protected:
-    virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection & );
-    virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
-    virtual BOOL NotifyMoving(SvLBoxEntry *pSource,
+    virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection & );
+    virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual sal_Bool NotifyMoving(SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
-                            SvLBoxEntry *&pNewParent, ULONG &);
-    virtual BOOL NotifyCopying(SvLBoxEntry *pSource,
+                            SvLBoxEntry *&pNewParent, sal_uIntPtr &);
+    virtual sal_Bool NotifyCopying(SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
-                            SvLBoxEntry *&pNewParent, ULONG &);
+                            SvLBoxEntry *&pNewParent, sal_uIntPtr &);
     virtual void RequestingChilds( SvLBoxEntry* pParent );
     virtual long ExpandingHdl();
-    virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE );
+    virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
 
         using SvLBox::ExecuteDrop;
     // new d&d
     virtual DragDropMode    NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* );
-    virtual BOOL            NotifyAcceptDrop( SvLBoxEntry* );
+    virtual sal_Bool            NotifyAcceptDrop( SvLBoxEntry* );
     virtual sal_Int8        AcceptDrop( const AcceptDropEvent& rEvt );
     virtual sal_Int8        ExecuteDrop( const ExecuteDropEvent& rEvt );
     virtual void            DragFinished( sal_Int8 nDropAction );
@@ -105,34 +105,34 @@ public:
     inline void SetBitmaps(
                     const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp,
                     const Image &rOFolderBmpHC, const Image &rCFolderBmpHC, const Image &rODocBmpHC, const Image &rCDocBmpHC );
-    const Image &GetClosedBmp(USHORT nLevel) const;
-    const Image &GetOpenedBmp(USHORT nLevel) const;
+    const Image &GetClosedBmp(sal_uInt16 nLevel) const;
+    const Image &GetOpenedBmp(sal_uInt16 nLevel) const;
 
     virtual PopupMenu*  CreateContextMenu();
 
 private:
-    BOOL IsStandard_Impl( SvLBoxEntry *) const;
-    BOOL MoveOrCopyTemplates(SvLBox *pSourceBox,
+    sal_Bool IsStandard_Impl( SvLBoxEntry *) const;
+    sal_Bool MoveOrCopyTemplates(SvLBox *pSourceBox,
                             SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
                             SvLBoxEntry *&pNewParent,
-                            ULONG &rIdx,
-                            BOOL bCopy);
-    BOOL MoveOrCopyContents(SvLBox *pSourceBox,
+                            sal_uIntPtr &rIdx,
+                            sal_Bool bCopy);
+    sal_Bool MoveOrCopyContents(SvLBox *pSourceBox,
                             SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
                             SvLBoxEntry *&pNewParent,
-                            ULONG &rIdx,
-                            BOOL bCopy);
-    inline USHORT       GetDocLevel() const;
+                            sal_uIntPtr &rIdx,
+                            sal_Bool bCopy);
+    inline sal_uInt16       GetDocLevel() const;
     SfxObjectShellRef   GetObjectShell( const Path& );
-    BOOL                IsUniqName_Impl( const String &rText,
+    sal_Bool                IsUniqName_Impl( const String &rText,
                                          SvLBoxEntry* pParent, SvLBoxEntry* pEntry = 0 ) const;
-    USHORT              GetLevelCount_Impl( SvLBoxEntry* pParent ) const;
+    sal_uInt16              GetLevelCount_Impl( SvLBoxEntry* pParent ) const;
 
     SvLBoxEntry*        InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
-                            SvLBoxEntry* pParent = NULL, BOOL bChildsOnDemand = FALSE,
-                            ULONG nPos = LIST_APPEND, void* pUserData = NULL );
+                            SvLBoxEntry* pParent = NULL, sal_Bool bChildsOnDemand = sal_False,
+                            sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL );
 };
 
 #endif // _SFX_HXX
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index 74c5a1ff35d1..437f3bf07439 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -96,7 +96,7 @@ private:
                         ) const;
 
     sal_Bool            impl_createNewDocWithSlotParam(
-                            const USHORT _nSlotID,
+                            const sal_uInt16 _nSlotID,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rxFrame,
                             const bool i_bHidden
                         );
@@ -109,7 +109,7 @@ private:
                             ::comphelper::NamedValueCollection& io_rDescriptor
                         ) const;
 
-    USHORT              impl_findSlotParam(
+    sal_uInt16              impl_findSlotParam(
                             const ::rtl::OUString& i_rFactoryURL
                         ) const;
 
diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index bb16fb203437..b8e605b6ef13 100644
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.hxx
@@ -35,25 +35,25 @@
 class IdPool: private BitSet
 {
 private:
-    USHORT nNextFree;
-    USHORT nRange;
-    USHORT nOffset;
+    sal_uInt16 nNextFree;
+    sal_uInt16 nRange;
+    sal_uInt16 nOffset;
 public:
-    BOOL Lock( const BitSet& rLockSet );
-    BOOL IsLocked( USHORT nId ) const;
-    IdPool( USHORT nMin = 1, USHORT nMax = USHRT_MAX );
-    USHORT Get();
-    BOOL Put( USHORT nId );
-    BOOL Lock( const Range& rRange );
-    BOOL Lock( USHORT nId );
+    sal_Bool Lock( const BitSet& rLockSet );
+    sal_Bool IsLocked( sal_uInt16 nId ) const;
+    IdPool( sal_uInt16 nMin = 1, sal_uInt16 nMax = USHRT_MAX );
+    sal_uInt16 Get();
+    sal_Bool Put( sal_uInt16 nId );
+    sal_Bool Lock( const Range& rRange );
+    sal_Bool Lock( sal_uInt16 nId );
 
 };
 
 //------------------------------------------------------------------------
 
-// returns TRUE if the id is locked
+// returns sal_True if the id is locked
 
-inline BOOL IdPool::IsLocked( USHORT nId ) const
+inline sal_Bool IdPool::IsLocked( sal_uInt16 nId ) const
 {
     return ( this->Contains(nId-nOffset) );
 }
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index fe8358bfe646..97b5275711f1 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -48,7 +48,7 @@ private:
     ::svt::AcceleratorExecute*  pAccExec;
 
     SvtURLBox*              GetURLBox() const;
-    void                    OpenURL( const String& rName, BOOL bNew ) const;
+    void                    OpenURL( const String& rName, sal_Bool bNew ) const;
 
     DECL_LINK(              OpenHdl, void* );
     DECL_LINK(              SelectHdl, void* );
@@ -67,11 +67,11 @@ public:
 
                             SFX_DECL_TOOLBOX_CONTROL();
 
-                            SfxURLToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+                            SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
     virtual                 ~SfxURLToolBoxControl_Impl();
 
     virtual Window*         CreateItemWindow( Window* pParent );
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 };
 
 #endif
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index 79af6b7302dc..b6a0a2a655d5 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -16,17 +16,17 @@ 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)
-    BOOL                bDone;      // auskommentieren wenn kein Done() gerufen
+    sal_Bool                bDone;      // auskommentieren wenn kein Done() gerufen
     void*               pDummy;     // f"ur alle F"alle zum kompatibel bleiben
 
 #ifdef _SFXMACRO_HXX
 private:
     void                GenerateNameAndArgs_Impl( SfxMacro *pMacro,
                                                   const SfxSlot &rSlot,
-                                                  BOOL bRequestDone,
+                                                  sal_Bool bRequestDone,
                                                   ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
 #endif
 
@@ -35,28 +35,28 @@ public:
 
                         SfxMacroStatement( const String &rTarget,
                                            const SfxSlot &rSlot,
-                                           BOOL bRequestDone,
+                                           sal_Bool bRequestDone,
                                            ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
 
                         SfxMacroStatement( const SfxShell &rShell,
                                            const String &rTarget,
-                                           BOOL bAbsolute,
+                                           sal_Bool bAbsolute,
                                            const SfxSlot &rSlot,
-                                           BOOL bRequestDone,
+                                           sal_Bool bRequestDone,
                                            ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
 
                         SfxMacroStatement( const String &rStatment );
                         ~SfxMacroStatement();
 
-    USHORT              GetSlotId() const;
+    sal_uInt16              GetSlotId() const;
     const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& GetArgs() const;
-    BOOL                IsDone() const;
+    sal_Bool                IsDone() const;
     const String&       GetStatement() const;
 };
 
 //--------------------------------------------------------------------
 
-inline USHORT SfxMacroStatement::GetSlotId() const
+inline sal_uInt16 SfxMacroStatement::GetSlotId() const
 
 /*  [Beschreibung]
 
@@ -89,7 +89,7 @@ inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::Property
 
 //--------------------------------------------------------------------
 
-inline BOOL SfxMacroStatement::IsDone() const
+inline sal_Bool SfxMacroStatement::IsDone() const
 
 /*  [Beschreibung]
 
diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx
index c48765acfe42..c6d714657ed6 100644
--- a/sfx2/inc/msgnodei.hxx
+++ b/sfx2/inc/msgnodei.hxx
@@ -40,8 +40,8 @@ struct SfxMsgAttachFile {
     int                 operator==( const SfxMsgAttachFile& rRec ) const
                         {
                             if( aName == rRec.aName && aFile == rRec.aFile )
-                                return TRUE;
-                            return FALSE;
+                                return sal_True;
+                            return sal_False;
                         }
 
                         SfxMsgAttachFile( const String& rFile, const String& rName)
@@ -66,8 +66,8 @@ struct SfxMsgReceiver {
     int                 operator==( const SfxMsgReceiver& rRec ) const
                         {
                             if( aName == rRec.aName && eRole == rRec.eRole )
-                                return TRUE;
-                            return FALSE;
+                                return sal_True;
+                            return sal_False;
                         }
 
                         SfxMsgReceiver( const String& rName, SfxMsgReceiverRole _eRole )
@@ -81,7 +81,7 @@ struct SfxMsgReceiver {
 
 class SfxMsgReceiverList_Impl : public List
 {
-    ULONG           nRef;
+    sal_uIntPtr             nRef;
                     ~SfxMsgReceiverList_Impl();
     SfxMsgReceiverList_Impl& operator=( const SfxMsgReceiverList_Impl&); //n.i.
 public:
@@ -92,7 +92,7 @@ public:
     void            Store( SvStream& ) const;
     void            IncRef() { nRef++; }
     void            DecRef() { nRef--; if( !nRef ) delete this; }
-    ULONG           GetRefCount() const { return nRef; }
+    sal_uIntPtr         GetRefCount() const { return nRef; }
     int             operator==( const SfxMsgReceiverList_Impl& ) const;
 };
 
@@ -105,8 +105,8 @@ public:
                             TYPEINFO();
 
                             SfxMsgReceiverListItem();
-                            SfxMsgReceiverListItem( USHORT nWhich );
-                            SfxMsgReceiverListItem( USHORT nWhich, SvStream& rStream );
+                            SfxMsgReceiverListItem( sal_uInt16 nWhich );
+                            SfxMsgReceiverListItem( sal_uInt16 nWhich, SvStream& rStream );
                             SfxMsgReceiverListItem( const SfxMsgReceiverListItem& rItem );
                             ~SfxMsgReceiverListItem();
 
@@ -117,14 +117,14 @@ public:
                                     SfxMapUnit ePresMetric,
                                     XubString &rText ) const;
 
-    USHORT                  Count() const;
-    SfxMsgReceiver*         GetObject( USHORT nPos );
-    void                    Remove( USHORT nPos );
+    sal_uInt16                  Count() const;
+    SfxMsgReceiver*         GetObject( sal_uInt16 nPos );
+    void                    Remove( sal_uInt16 nPos );
     void                    Add( const SfxMsgReceiver& );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream &, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream &, sal_uInt16 nItemVersion ) const;
 };
 
 
@@ -132,7 +132,7 @@ public:
 
 class SfxMsgAttachFileList_Impl : public List
 {
-    ULONG           nRef;
+    sal_uIntPtr             nRef;
                     ~SfxMsgAttachFileList_Impl();
     SfxMsgAttachFileList_Impl& operator=( const SfxMsgAttachFileList_Impl&); //n.i.
 
@@ -141,12 +141,12 @@ public:
                     SfxMsgAttachFileList_Impl(const SfxMsgAttachFileList_Impl&);
 
     int             operator==( const SfxMsgAttachFileList_Impl& rRec ) const;
-    SfxMsgAttachFile* GetReceiver(ULONG nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); }
+    SfxMsgAttachFile* GetReceiver(sal_uIntPtr nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); }
     void            Load( SvStream& );
     void            Store( SvStream& ) const;
     void            IncRef() { nRef++; }
     void            DecRef() { nRef--; if( !nRef ) delete this; }
-    ULONG           GetRefCount() const { return nRef; }
+    sal_uIntPtr         GetRefCount() const { return nRef; }
 };
 
 class SfxMsgAttachFileListItem : public SfxPoolItem
@@ -158,8 +158,8 @@ public:
                             TYPEINFO();
 
                             SfxMsgAttachFileListItem();
-                            SfxMsgAttachFileListItem( USHORT nWhich );
-                            SfxMsgAttachFileListItem( USHORT nWhich, SvStream& rStream );
+                            SfxMsgAttachFileListItem( sal_uInt16 nWhich );
+                            SfxMsgAttachFileListItem( sal_uInt16 nWhich, SvStream& rStream );
                             SfxMsgAttachFileListItem( const SfxMsgAttachFileListItem& rItem );
                             ~SfxMsgAttachFileListItem();
 
@@ -170,14 +170,14 @@ public:
                                     SfxMapUnit ePresMetric,
                                     XubString &rText ) const;
 
-    USHORT                  Count() const;
-    SfxMsgAttachFile*       GetObject( USHORT nPos );
-    void                    Remove( USHORT nPos );
+    sal_uInt16                  Count() const;
+    SfxMsgAttachFile*       GetObject( sal_uInt16 nPos );
+    void                    Remove( sal_uInt16 nPos );
     void                    Add( const SfxMsgAttachFile& );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream &, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream &, sal_uInt16 nItemVersion ) const;
 };
 
 
@@ -196,17 +196,17 @@ class SfxMsgPriorityItem : public SfxEnumItem
 public:
     TYPEINFO();
 
-    SfxMsgPriorityItem( USHORT nWhich, SfxMsgPriority = MSG_PRIORITY_NORMAL);
+    SfxMsgPriorityItem( sal_uInt16 nWhich, SfxMsgPriority = MSG_PRIORITY_NORMAL);
 
     virtual SfxPoolItem*        Clone( SfxItemPool* pPool=0 ) const;
-    virtual SfxPoolItem*        Create( SvStream&, USHORT ) const;
-    virtual SvStream&           Store( SvStream&, USHORT ) const;
+    virtual SfxPoolItem*        Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&           Store( SvStream&, sal_uInt16 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresentationMetric,
                                     String &rText ) const;
-    virtual USHORT              GetValueCount() const;
-    virtual String              GetValueTextByPos( USHORT nPos ) const;
+    virtual sal_uInt16              GetValueCount() const;
+    virtual String              GetValueTextByPos( sal_uInt16 nPos ) const;
 
     inline SfxMsgPriorityItem& operator=(const SfxMsgPriorityItem& rPrio)
     {
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index 85248e07996c..99a87f75f860 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -44,8 +44,8 @@ public:
     SfxObjectList();
     ~SfxObjectList();
 
-    const String&   GetBaseName( USHORT nId ) const;
-    const String&   GetFileName( USHORT nId ) const;
+    const String&   GetBaseName( sal_uInt16 nId ) const;
+    const String&   GetFileName( sal_uInt16 nId ) const;
 };
 
 class IntlWrapper;
@@ -66,8 +66,8 @@ private:
     SfxDocumentTemplates*       pTemplates;
     SfxOrganizeListBox_Impl*    pLeftBox;
     SfxOrganizeListBox_Impl*    pRightBox;
-    BOOL                        bDeleteTemplates    :1;
-    BOOL                        bModified           :1;
+    sal_Bool                        bDeleteTemplates    :1;
+    sal_Bool                        bModified           :1;
 
     SfxOrganizeListBox_Impl*    GetOther( SfxOrganizeListBox_Impl* );
 
@@ -77,27 +77,27 @@ public:
                     SfxDocumentTemplates* pTempl = NULL );
     ~SfxOrganizeMgr();
 
-    BOOL    Copy( USHORT nTargetRegion, USHORT nTargetIdx, USHORT nSourceRegion, USHORT nSourceIdx );
-    BOOL    Move( USHORT nTargetRegion, USHORT nTargetIdx, USHORT nSourceRegion, USHORT nSourceIdx );
-    BOOL    Delete( SfxOrganizeListBox_Impl* pCaller, USHORT nRegion, USHORT nIdx );
-    BOOL    InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, USHORT nRegion );
-    BOOL    SetName( const String& rName, USHORT nRegion, USHORT nIdx = USHRT_MAX );
-    BOOL    CopyTo( USHORT nRegion, USHORT nIdx, const String& rName ) const;
-    BOOL    CopyFrom( SfxOrganizeListBox_Impl* pCaller, USHORT nRegion, USHORT nIdx, String& rName );
+    sal_Bool    Copy( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx );
+    sal_Bool    Move( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx );
+    sal_Bool    Delete( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx );
+    sal_Bool    InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, sal_uInt16 nRegion );
+    sal_Bool    SetName( const String& rName, sal_uInt16 nRegion, sal_uInt16 nIdx = USHRT_MAX );
+    sal_Bool    CopyTo( sal_uInt16 nRegion, sal_uInt16 nIdx, const String& rName ) const;
+    sal_Bool    CopyFrom( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx, String& rName );
 
-    BOOL    Rescan();
-    BOOL    InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName );
+    sal_Bool    Rescan();
+    sal_Bool    InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName );
 
-    BOOL    IsModified() const { return bModified ? TRUE : FALSE; }
+    sal_Bool    IsModified() const { return bModified ? sal_True : sal_False; }
 
     const SfxDocumentTemplates* GetTemplates() const { return pTemplates; }
     SfxObjectList&              GetObjectList() { return *pImpl->pDocList; }
     const SfxObjectList&        GetObjectList() const { return *pImpl->pDocList; }
 
-    SfxObjectShellRef   CreateObjectShell( USHORT nIdx );
-    SfxObjectShellRef   CreateObjectShell( USHORT nRegion, USHORT nIdx );
-    BOOL                DeleteObjectShell( USHORT );
-    BOOL                DeleteObjectShell( USHORT, USHORT );
+    SfxObjectShellRef   CreateObjectShell( sal_uInt16 nIdx );
+    SfxObjectShellRef   CreateObjectShell( sal_uInt16 nRegion, sal_uInt16 nIdx );
+    sal_Bool                DeleteObjectShell( sal_uInt16 );
+    sal_Bool                DeleteObjectShell( sal_uInt16, sal_uInt16 );
     void                SaveAll( Window* pParent );
 };
 
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
index 13fe19f1c4e8..7fdb1eab2d7c 100644
--- a/sfx2/inc/resmgr.hxx
+++ b/sfx2/inc/resmgr.hxx
@@ -42,30 +42,30 @@ class SfxResourceManager
 {
     SfxResMgrArr                aResMgrArr;
     SfxResMgrArr                aResMgrBmpArr;
-    USHORT                      nEnterCount;
+    sal_uInt16                      nEnterCount;
     SfxMessageTable*            pMessageTable;
 
 private:
     void                        ClearMsgTable_Impl();
-    SfxMessageDescription*      MakeDesc_Impl(USHORT);
+    SfxMessageDescription*      MakeDesc_Impl(sal_uInt16);
 
 public:
                                 SfxResourceManager();
                                 ~SfxResourceManager();
 
-    USHORT                      RegisterResource( const char *pFileName);
-    void                        ReleaseResource( USHORT nRegisterId );
+    sal_uInt16                      RegisterResource( const char *pFileName);
+    void                        ReleaseResource( sal_uInt16 nRegisterId );
 
-    USHORT                      RegisterBitmap(const char *pMono, const char *pColor);
+    sal_uInt16                      RegisterBitmap(const char *pMono, const char *pColor);
 
-    USHORT                      RegisterBitmap( const char *pSingleFile );
-    void                        ReleaseBitmap( USHORT nRegisterId );
+    sal_uInt16                      RegisterBitmap( const char *pSingleFile );
+    void                        ReleaseBitmap( sal_uInt16 nRegisterId );
 
-    Bitmap                      GetAllBitmap( USHORT nBmpsPerRow );
+    Bitmap                      GetAllBitmap( sal_uInt16 nBmpsPerRow );
 
     void                        Enter();
     void                        Leave();
-    SfxMessageDescription*      CreateDescription( USHORT nId );
+    SfxMessageDescription*      CreateDescription( sal_uInt16 nId );
 };
 
 
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 889960af3d84..62bb17ea2248 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -117,7 +117,7 @@ public:
     {   return new SfxLinkItem( *this ); }
     virtual int              operator==( const SfxPoolItem& rL) const
     {   return ((SfxLinkItem&)rL).aLink == aLink; }
-    SfxLinkItem( USHORT nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId )
+    SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId )
     {   aLink = rValue; }
     const Link&              GetValue() const { return aLink; }
 };
@@ -139,7 +139,7 @@ public:
     SfxItemFactory_Impl* GetFactory_Impl( TypeId ) const;
     const SvGlobalName* GetGlobalName( const SfxPoolItem* pItem ) const;
     SfxPoolItem* Create(
-        const SvGlobalName& rName, USHORT nId, SvStream* pStrm = 0) const;
+        const SvGlobalName& rName, sal_uInt16 nId, SvStream* pStrm = 0) const;
     void         RegisterItemFactory(
         const SvGlobalName& rName, SfxItemCreateFunc );
 };
@@ -163,13 +163,20 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
     SfxAppData_Impl*            pAppData_Impl;
 
     DECL_DLLPRIVATE_LINK(       GlobalBasicErrorHdl_Impl, StarBASIC* );
+<<<<<<< local
     SAL_DLLPRIVATE BOOL         SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE);
     SAL_DLLPRIVATE short        QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE);
+=======
+    SAL_DLLPRIVATE sal_Bool         SaveAll_Impl(sal_Bool bPrompt = sal_False, sal_Bool bAutoSave = sal_False);
+    SAL_DLLPRIVATE short        QuerySave_Impl(SfxObjectShell &, sal_Bool bAutoSave = sal_False);
+    SAL_DLLPRIVATE void         InitializeDisplayName_Impl();
+//#endif
+>>>>>>> other
 
     static SfxApplication*      Create();
     void                        Init();
     void                        Exit();
-    void                        SettingsChange( USHORT, const AppSettings & );
+    void                        SettingsChange( sal_uInt16, const AppSettings & );
     void                        Main( );
     void                        PreInit( );
     void                        Quit();
@@ -199,14 +206,14 @@ public:
                                             const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue );
     ::sfx2::SvLinkSource*       DdeCreateLinkSource( const String& rItem );
-    BOOL                        InitializeDde();
+    sal_Bool                        InitializeDde();
     const DdeService*           GetDdeService() const;
     DdeService*                 GetDdeService();
     void                        AddDdeTopic( SfxObjectShell* );
     void                        RemoveDdeTopic( SfxObjectShell* );
 
     // "static" methods
-    ULONG                       LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, BOOL bCopy=TRUE, SfxItemSet* pArgs = 0 );
+    sal_uIntPtr                       LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, sal_Bool bCopy=sal_True, SfxItemSet* pArgs = 0 );
     ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const;
     SfxTemplateDialog*          GetTemplateDialog();
     Window*                     GetTopWindow() const;
@@ -218,13 +225,13 @@ public:
     SfxFilterMatcher&           GetFilterMatcher();
     SfxProgress*                GetProgress() const;
     const String&               GetLastSaveDirectory() const;
-    USHORT                      GetFreeIndex();
-    void                        ReleaseIndex(USHORT i);
+    sal_uInt16                  GetFreeIndex();
+    void                        ReleaseIndex(sal_uInt16 i);
 
     // Basic/Scripting
     static sal_Bool             IsXScriptURL( const String& rScriptURL );
     static ::rtl::OUString      ChooseScript();
-    static void                 MacroOrganizer( INT16 nTabId );
+    static void                 MacroOrganizer( sal_Int16 nTabId );
     static ErrCode              CallBasic( const String&, BasicManager*, SbxArray *pArgs, SbxValue *pRet );
     static ErrCode              CallAppBasic( const String& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL )
                                 { return CallBasic( i_macroName, SfxApplication::GetOrCreate()->GetBasicManager(), i_args, i_ret ); }
@@ -234,23 +241,23 @@ public:
     com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >
                                 GetBasicContainer();
     StarBASIC*                  GetBasic();
-    USHORT                      SaveBasicManager() const;
-    USHORT                      SaveBasicAndDialogContainer() const;
+    sal_uInt16                  SaveBasicManager() const;
+    sal_uInt16                  SaveBasicAndDialogContainer() const;
     void                        RegisterBasicConstants( const char *pPrefix,
                                                         const SfxConstant *pConsts,
-                                                        USHORT nCount );
+                                                        sal_uInt16 nCount );
 
     // misc.
-    BOOL                        GetOptions(SfxItemSet &);
+    sal_Bool                        GetOptions(SfxItemSet &);
     void                        SetOptions(const SfxItemSet &);
-    virtual void                Invalidate(USHORT nId = 0);
-    void                        NotifyEvent(const SfxEventHint& rEvent, FASTBOOL bSynchron = TRUE );
-    BOOL                        IsDowning() const;
-    BOOL                        IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const;
+    virtual void                Invalidate(sal_uInt16 nId = 0);
+    void                        NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true );
+    sal_Bool                        IsDowning() const;
+    sal_Bool                        IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const;
     static SfxObjectShellRef    DocAlreadyLoaded( const String &rName,
-                                                  BOOL bSilent,
-                                                  BOOL bActivate,
-                                                  BOOL bForbidVisible = FALSE,
+                                                  sal_Bool bSilent,
+                                                  sal_Bool bActivate,
+                                                  sal_Bool bForbidVisible = sal_False,
                                                   const String* pPostStr = 0);
     void                        ResetLastDir();
 
@@ -259,15 +266,15 @@ public:
     SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
     SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
 
-    SAL_DLLPRIVATE BOOL         QueryExit_Impl();
+    SAL_DLLPRIVATE sal_Bool         QueryExit_Impl();
     SAL_DLLPRIVATE void         SetOptions_Impl(const SfxItemSet &);
-    SAL_DLLPRIVATE FASTBOOL     Initialize_Impl();
+    SAL_DLLPRIVATE bool         Initialize_Impl();
 
     SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pAppData_Impl; }
 
     // Object-Factories/global arrays
     SAL_DLLPRIVATE void         RegisterChildWindow_Impl(SfxModule*, SfxChildWinFactory*);
-    SAL_DLLPRIVATE void         RegisterChildWindowContext_Impl(SfxModule*, USHORT, SfxChildWinContextFactory*);
+    SAL_DLLPRIVATE void         RegisterChildWindowContext_Impl(SfxModule*, sal_uInt16, SfxChildWinContextFactory*);
     SAL_DLLPRIVATE void         RegisterStatusBarControl_Impl(SfxModule*, SfxStbCtrlFactory*);
     SAL_DLLPRIVATE void         RegisterMenuControl_Impl(SfxModule*, SfxMenuCtrlFactory*);
     SAL_DLLPRIVATE void         RegisterToolBoxControl_Impl( SfxModule*, SfxTbxCtrlFactory*);
@@ -299,7 +306,7 @@ public:
     SAL_DLLPRIVATE void         SetLastDir_Impl( const String & );
 
     SAL_DLLPRIVATE void         EnterAsynchronCall_Impl();
-    SAL_DLLPRIVATE FASTBOOL     IsInAsynchronCall_Impl() const;
+    SAL_DLLPRIVATE bool         IsInAsynchronCall_Impl() const;
     SAL_DLLPRIVATE void         LeaveAsynchronCall_Impl();
     SAL_DLLPRIVATE void         Registrations_Impl();
     SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const;
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index fc7b318965b0..979cfe5693a9 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -115,7 +115,7 @@ protected:
                             SfxModelessDialog( SfxBindings*, SfxChildWindow*,
                                 Window*, WinBits nWinStyle = WB_STDMODELESS );
                             ~SfxModelessDialog();
-    virtual BOOL            Close();
+    virtual sal_Bool            Close();
     virtual void            Resize();
     virtual void            Move();
     virtual void            StateChanged( StateChangedType nStateChange );
@@ -154,7 +154,7 @@ protected:
                             ~SfxFloatingWindow();
 
     virtual void            StateChanged( StateChangedType nStateChange );
-    virtual BOOL            Close();
+    virtual sal_Bool            Close();
     virtual void            Resize();
     virtual void            Move();
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -186,14 +186,14 @@ struct SingleTabDlgImpl
         m_pTabPage( NULL ), m_pSfxPage( NULL ), m_pLine( NULL ), m_pInfoImage( NULL ) {}
 };
 
-typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
 
 class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
 {
 public:
-    SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, USHORT nUniqueId );
-    SfxSingleTabDialog( Window* pParent, USHORT nUniqueId, const SfxItemSet* pInSet = 0 );
-    SfxSingleTabDialog( Window* pParent, USHORT nUniqueId, const String& rInfoURL );
+    SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId );
+    SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 );
+    SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const String& rInfoURL );
 
     virtual             ~SfxSingleTabDialog();
 
@@ -201,7 +201,7 @@ public:
     void                SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 );
     SfxTabPage*         GetTabPage() const { return pImpl->m_pSfxPage; }
 
-    const USHORT*       GetInputRanges( const SfxItemPool& rPool );
+    const sal_uInt16*       GetInputRanges( const SfxItemPool& rPool );
 //  void                SetInputSet( const SfxItemSet* pInSet ) { pOptions = pInSet; }
 //  const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
     OKButton*           GetOKButton() const { return pOKBtn; }
@@ -210,7 +210,7 @@ public:
 
 private:
     GetTabPageRanges    fnGetRanges;
-    USHORT*             pRanges;
+    sal_uInt16*             pRanges;
 
     OKButton*           pOKBtn;
     CancelButton*       pCancelBtn;
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index e568fe7305f0..32a5fb1dd223 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -120,7 +120,7 @@ friend class SfxBindings_Impl;
 //#if 0 // _SOLAR__PRIVATE
 private:
     SAL_DLLPRIVATE const SfxPoolItem*  Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi,
-                                    SfxCallMode nCall, const SfxPoolItem **pInternalArgs, BOOL bGlobalOnly=FALSE);
+                                    SfxCallMode nCall, const SfxPoolItem **pInternalArgs, sal_Bool bGlobalOnly=sal_False);
     SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* );
     SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // SlotServer aktualisieren
     SAL_DLLPRIVATE SfxItemSet* CreateSet_Impl( SfxStateCache* &pCache,
@@ -142,7 +142,7 @@ public:
                      ~SfxBindings();
 
     void             HidePopups( bool bHide = true );
-    SAL_DLLPRIVATE void HidePopupCtrls_Impl( FASTBOOL bHide = sal_True );
+    SAL_DLLPRIVATE void HidePopupCtrls_Impl( int bHide = sal_True );
 
     void             SetDispatcher(SfxDispatcher *pDisp);
 
@@ -202,18 +202,18 @@ public:
     SAL_DLLPRIVATE void ClearCache_Impl( sal_uInt16 nSlotId );
     SAL_DLLPRIVATE sal_Bool IsInUpdate_Impl() const{ return IsInUpdate(); }
     SAL_DLLPRIVATE void RegisterInternal_Impl( SfxControllerItem& rBinding );
-    SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, BOOL );
+    SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, sal_Bool );
     SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const;
     SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
     SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl( sal_Bool bTop = sal_False ) const;
     SAL_DLLPRIVATE void InvalidateUnoControllers_Impl();
     SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
     SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
-    SAL_DLLPRIVATE BOOL ExecuteCommand_Impl( const String& rCommand );
+    SAL_DLLPRIVATE sal_Bool ExecuteCommand_Impl( const String& rCommand );
     SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& );
-    SAL_DLLPRIVATE void ExecuteGlobal_Impl( USHORT nId );
+    SAL_DLLPRIVATE void ExecuteGlobal_Impl( sal_uInt16 nId );
     SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
-    SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( USHORT nId );
+    SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
 //#endif
 };
 
diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx
index 37df69d08ca6..26b13ee34bd7 100644
--- a/sfx2/inc/sfx2/chalign.hxx
+++ b/sfx2/inc/sfx2/chalign.hxx
@@ -55,7 +55,7 @@ enum SfxChildAlignment
 };
 
 // "Uberpr"uft, ob ein g"ultiges Alignment verwendet wird
-inline BOOL SfxChildAlignValid( SfxChildAlignment eAlign )
+inline sal_Bool SfxChildAlignValid( SfxChildAlignment eAlign )
 {
     return ( eAlign >= SFX_ALIGN_HIGHESTTOP && eAlign <= SFX_ALIGN_NOALIGNMENT );
 }
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index fd1eb65d54df..5570506b2c89 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -164,7 +164,7 @@ public:
 
     virtual void        Resizing( Size& rSize );
     virtual sal_Bool        Close();
-    static void         RegisterChildWindowContext(SfxModule*, USHORT, SfxChildWinContextFactory*);
+    static void         RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*);
 };
 
 class SFX2_DLLPUBLIC SfxChildWindow
@@ -204,7 +204,7 @@ public:
                         { return pWindow->GetPosPixel(); }
 //<!--Modified by PengYunQuan for Validity Cell Range Picker
     virtual void                Hide();
-    virtual void                Show( USHORT nFlags );
+    virtual void                Show( sal_uInt16 nFlags );
 //-->Modified by PengYunQuan for Validity Cell Range Picker
     sal_uInt16          GetFlags() const
                         { return GetInfo().nFlags; }
@@ -233,7 +233,7 @@ public:
     void                SetHideAtToggle( sal_Bool bOn );
     sal_Bool                IsHideAtToggle() const;
     sal_Bool                IsVisible() const;
-    void                SetWantsFocus( BOOL );
+    void                SetWantsFocus( sal_Bool );
     sal_Bool            WantsFocus() const;
 
     virtual sal_Bool    QueryClose();
@@ -274,7 +274,7 @@ public:
                 SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
         {   \
             SfxChildWindowContext *pContext = new Class(pParent, \
-                    /* cast is safe here! */static_cast< USHORT >(ShellClass::GetInterfaceId()), \
+                    /* cast is safe here! */static_cast< sal_uInt16 >(ShellClass::GetInterfaceId()), \
                     pBindings,pInfo); \
             return pContext; \
         } \
diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx
index 579d7b1299d3..ed962342b6e3 100644
--- a/sfx2/inc/sfx2/controlwrapper.hxx
+++ b/sfx2/inc/sfx2/controlwrapper.hxx
@@ -50,9 +50,9 @@ namespace sfx {
 // ============================================================================
 
 /** List position type of VCL ListBox. */
-typedef USHORT ListBoxPosType;
+typedef sal_uInt16 ListBoxPosType;
 /** List position type of SVTOOLS ValueSet. */
-typedef USHORT ValueSetPosType;
+typedef sal_uInt16 ValueSetPosType;
 
 // ============================================================================
 // Helpers
@@ -247,7 +247,7 @@ public:
 
 /** A wrapper for the VCL CheckBox. */
 class SFX2_DLLPUBLIC CheckBoxWrapper:
-    public SingleControlWrapper< CheckBox, BOOL >
+    public SingleControlWrapper< CheckBox, sal_Bool >
 {
 public:
     explicit            CheckBoxWrapper( CheckBox& rCheckBox );
@@ -255,8 +255,8 @@ public:
     virtual bool        IsControlDontKnow() const;
     virtual void        SetControlDontKnow( bool bSet );
 
-    virtual BOOL        GetControlValue() const;
-    virtual void        SetControlValue( BOOL bValue );
+    virtual sal_Bool        GetControlValue() const;
+    virtual void        SetControlValue( sal_Bool bValue );
 };
 
 // ----------------------------------------------------------------------------
@@ -317,13 +317,13 @@ public:
 
 // ----------------------------------------------------------------------------
 
-typedef NumericFieldWrapper< INT16 >  Int16NumericFieldWrapper;
-typedef NumericFieldWrapper< UINT16 > UInt16NumericFieldWrapper;
-typedef NumericFieldWrapper< INT32 >  Int32NumericFieldWrapper;
-typedef NumericFieldWrapper< UINT32 > UInt32NumericFieldWrapper;
+typedef NumericFieldWrapper< sal_Int16 >  Int16NumericFieldWrapper;
+typedef NumericFieldWrapper< sal_uInt16 > UInt16NumericFieldWrapper;
+typedef NumericFieldWrapper< sal_Int32 >  Int32NumericFieldWrapper;
+typedef NumericFieldWrapper< sal_uInt32 > UInt32NumericFieldWrapper;
 
-typedef NumericFieldWrapper< USHORT > UShortNumericFieldWrapper;
-typedef NumericFieldWrapper< ULONG >  ULongNumericFieldWrapper;
+typedef NumericFieldWrapper< sal_uInt16 > UShortNumericFieldWrapper;
+typedef NumericFieldWrapper< sal_uIntPtr >  ULongNumericFieldWrapper;
 
 // ============================================================================
 
@@ -352,13 +352,13 @@ private:
 
 // ----------------------------------------------------------------------------
 
-typedef MetricFieldWrapper< INT16 >  Int16MetricFieldWrapper;
-typedef MetricFieldWrapper< UINT16 > UInt16MetricFieldWrapper;
-typedef MetricFieldWrapper< INT32 >  Int32MetricFieldWrapper;
-typedef MetricFieldWrapper< UINT32 > UInt32MetricFieldWrapper;
+typedef MetricFieldWrapper< sal_Int16 >  Int16MetricFieldWrapper;
+typedef MetricFieldWrapper< sal_uInt16 > UInt16MetricFieldWrapper;
+typedef MetricFieldWrapper< sal_Int32 >  Int32MetricFieldWrapper;
+typedef MetricFieldWrapper< sal_uInt32 > UInt32MetricFieldWrapper;
 
-typedef MetricFieldWrapper< USHORT > UShortMetricFieldWrapper;
-typedef MetricFieldWrapper< ULONG >  ULongMetricFieldWrapper;
+typedef MetricFieldWrapper< sal_uInt16 > UShortMetricFieldWrapper;
+typedef MetricFieldWrapper< sal_uIntPtr >  ULongMetricFieldWrapper;
 
 // ============================================================================
 
@@ -394,13 +394,13 @@ public:
 
 // ----------------------------------------------------------------------------
 
-typedef ListBoxWrapper< INT16 >  Int16ListBoxWrapper;
-typedef ListBoxWrapper< UINT16 > UInt16ListBoxWrapper;
-typedef ListBoxWrapper< INT32 >  Int32ListBoxWrapper;
-typedef ListBoxWrapper< UINT32 > UInt32ListBoxWrapper;
+typedef ListBoxWrapper< sal_Int16 >  Int16ListBoxWrapper;
+typedef ListBoxWrapper< sal_uInt16 > UInt16ListBoxWrapper;
+typedef ListBoxWrapper< sal_Int32 >  Int32ListBoxWrapper;
+typedef ListBoxWrapper< sal_uInt32 > UInt32ListBoxWrapper;
 
-typedef ListBoxWrapper< USHORT > UShortListBoxWrapper;
-typedef ListBoxWrapper< ULONG >  ULongListBoxWrapper;
+typedef ListBoxWrapper< sal_uInt16 > UShortListBoxWrapper;
+typedef ListBoxWrapper< sal_uIntPtr >  ULongListBoxWrapper;
 
 // ============================================================================
 
@@ -436,13 +436,13 @@ public:
 
 // ----------------------------------------------------------------------------
 
-typedef ValueSetWrapper< INT16 >  Int16ValueSetWrapper;
-typedef ValueSetWrapper< UINT16 > UInt16ValueSetWrapper;
-typedef ValueSetWrapper< INT32 >  Int32ValueSetWrapper;
-typedef ValueSetWrapper< UINT32 > UInt32ValueSetWrapper;
+typedef ValueSetWrapper< sal_Int16 >  Int16ValueSetWrapper;
+typedef ValueSetWrapper< sal_uInt16 > UInt16ValueSetWrapper;
+typedef ValueSetWrapper< sal_Int32 >  Int32ValueSetWrapper;
+typedef ValueSetWrapper< sal_uInt32 > UInt32ValueSetWrapper;
 
-typedef ValueSetWrapper< USHORT > UShortValueSetWrapper;
-typedef ValueSetWrapper< ULONG >  ULongValueSetWrapper;
+typedef ValueSetWrapper< sal_uInt16 > UShortValueSetWrapper;
+typedef ValueSetWrapper< sal_uIntPtr >  ULongValueSetWrapper;
 
 // ============================================================================
 // Multi control wrappers
@@ -641,7 +641,7 @@ ValueT ListBoxWrapper< ValueT >::GetControlValue() const
 template< typename ValueT >
 void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue )
 {
-    USHORT nPos = GetPosFromValue( nValue );
+    sal_uInt16 nPos = GetPosFromValue( nValue );
     if( nPos != this->GetNotFoundPos() )
         this->GetControl().SelectEntryPos( nPos );
 }
@@ -657,7 +657,7 @@ ValueT ValueSetWrapper< ValueT >::GetControlValue() const
 template< typename ValueT >
 void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue )
 {
-    USHORT nPos = GetPosFromValue( nValue );
+    sal_uInt16 nPos = GetPosFromValue( nValue );
     if( nPos != this->GetNotFoundPos() )
         this->GetControl().SelectItem( nPos );
 }
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index 53667fbf0aa7..4ceb2d940f52 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -39,14 +39,14 @@ class SvStream;
 class SFX2_DLLPUBLIC SfxControllerItem
 {
 private:
-    USHORT              nId;
+    sal_uInt16              nId;
     SfxControllerItem*  pNext; // zu benachrichtigendes weiteres ControllerItem
     SfxBindings*        pBindings;
 
 protected:
 //#if defined( DBG_UTIL ) && defined( _SOLAR__PRIVATE )
 #if defined( DBG_UTIL )
-    SAL_DLLPRIVATE void CheckConfigure_Impl( ULONG nType );
+    SAL_DLLPRIVATE void CheckConfigure_Impl( sal_uIntPtr nType );
 #endif
 
 public:
@@ -60,13 +60,13 @@ public:
                         }
 
                         SfxControllerItem(); // fuer arrays
-                        SfxControllerItem( USHORT nId, SfxBindings & );
+                        SfxControllerItem( sal_uInt16 nId, SfxBindings & );
     virtual             ~SfxControllerItem();
 
-    void                Bind( USHORT nNewId, SfxBindings * = 0);    // in SfxBindings registrieren
+    void                Bind( sal_uInt16 nNewId, SfxBindings * = 0);    // in SfxBindings registrieren
     void                UnBind();
     void                ReBind();
-    BOOL                IsBound() const;
+    sal_Bool                IsBound() const;
     void                UpdateSlot();
     void                ClearCache();
     void                SetBindings(SfxBindings &rBindings) { pBindings = &rBindings; }
@@ -74,10 +74,10 @@ public:
     SfxControllerItem*  GetItemLink();
     SfxControllerItem*  ChangeItemLink( SfxControllerItem* pNewLink );
 
-    void                SetId( USHORT nItemId );
-    USHORT              GetId() const { return nId; }
+    void                SetId( sal_uInt16 nItemId );
+    sal_uInt16              GetId() const { return nId; }
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     virtual void        DeleteFloatingWindow();
 
@@ -86,9 +86,9 @@ public:
     static SfxItemState GetItemState( const SfxPoolItem* pState );
 
 //#if 0 // _SOLAR__PRIVATE
-    SAL_DLLPRIVATE BOOL IsBindable_Impl() const
+    SAL_DLLPRIVATE sal_Bool IsBindable_Impl() const
                         { return pBindings != NULL; }
-    SAL_DLLPRIVATE void BindInternal_Impl( USHORT nNewId, SfxBindings* );
+    SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* );
 //#endif
 };
 
@@ -99,11 +99,11 @@ class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem
     SfxControllerItem*      pMaster;
 
 protected:
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
 
 public:
-                            SfxStatusForwarder( USHORT nSlotId,
+                            SfxStatusForwarder( sal_uInt16 nSlotId,
                                    SfxControllerItem&rMaster );
 };
 
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 4a33afde24d5..8cf17e3f6e4f 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -162,8 +162,8 @@ public:
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 // class SfxDocumentPage -------------------------------------------------
@@ -207,7 +207,7 @@ private:
     String                      aUnknownSize;
     String                      aMultiSignedStr;
 
-    BOOL                        bEnableUseUserData  : 1,
+    sal_Bool                        bEnableUseUserData  : 1,
                                 bHandleDelete       : 1;
 
     DECL_LINK(          DeleteHdl, PushButton * );
@@ -217,7 +217,7 @@ private:
 protected:
     SfxDocumentPage( Window* pParent, const SfxItemSet& );
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
 public:
@@ -244,7 +244,7 @@ private:
 protected:
     SfxDocumentDescPage( Window* pParent, const SfxItemSet& );
 
-    virtual BOOL            FillItemSet( SfxItemSet& );
+    virtual sal_Bool            FillItemSet( SfxItemSet& );
     virtual void            Reset( const SfxItemSet& );
 
 public:
@@ -290,9 +290,9 @@ private:
 
     void                    ChangeState( STATE eNewState );     // S_Init is not a valid value here
                                                                 // also checks corresponding radiobutton
-    void                    EnableNoUpdate( BOOL bEnable );
-    void                    EnableReload( BOOL bEnable );
-    void                    EnableForward( BOOL bEnable );
+    void                    EnableNoUpdate( sal_Bool bEnable );
+    void                    EnableReload( sal_Bool bEnable );
+    void                    EnableForward( sal_Bool bEnable );
 
     DECL_LINK( ClickHdlNoUpdate, Control* );
     DECL_LINK( ClickHdlReload, Control* );
@@ -306,7 +306,7 @@ protected:
     SfxInternetPage( Window* pParent, const SfxItemSet& );
     ~SfxInternetPage();
 
-    virtual BOOL            FillItemSet( SfxItemSet& );
+    virtual sal_Bool            FillItemSet( SfxItemSet& );
     virtual void            Reset( const SfxItemSet& );
     virtual int                     DeactivatePage( SfxItemSet* pSet = 0 );
 
@@ -319,7 +319,7 @@ public:
 class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog
 {
 protected:
-    virtual void    PageCreated( USHORT nId, SfxTabPage& rPage );
+    virtual void    PageCreated( sal_uInt16 nId, SfxTabPage& rPage );
 
 public:
     SfxDocumentInfoDialog(  Window* pParent, const SfxItemSet& );
@@ -430,7 +430,7 @@ public:
 
     inline void     CheckYes() { m_aYesButton.Check(); }
     inline void     CheckNo() { m_aNoButton.Check(); }
-    inline bool     IsYesChecked() const { return m_aYesButton.IsChecked() != FALSE; }
+    inline bool     IsYesChecked() const { return m_aYesButton.IsChecked() != sal_False; }
 };
 
 // struct CustomPropertyLine ---------------------------------------------
@@ -502,7 +502,7 @@ public:
     ~CustomPropertiesWindow();
 
     void                InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar );
-    USHORT              GetVisibleLineCount() const;
+    sal_uInt16              GetVisibleLineCount() const;
     inline sal_Int32    GetLineHeight() const { return m_nLineHeight; }
     void                AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny );
     bool                AreAllLinesValid() const;
@@ -563,7 +563,7 @@ private:
 protected:
     SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& );
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
     virtual int         DeactivatePage( SfxItemSet* pSet = NULL );
 
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 4a1bacf089d1..945d04b71f99 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -82,23 +82,23 @@ typedef SfxItemPtrArray SfxItemArray_Impl;
 
 class SfxExecuteItem : public SfxItemPtrArray, public SfxPoolItem
 {
-    USHORT nSlot;
+    sal_uInt16 nSlot;
     SfxCallMode eCall;
-    USHORT nModifier;
+    sal_uInt16 nModifier;
 public:
-    USHORT                   GetSlot() const { return nSlot; }
-    USHORT                   GetModifier() const { return nModifier; }
-    void                     SetModifier( USHORT nModifierP ) { nModifier = nModifierP; }
+    sal_uInt16                   GetSlot() const { return nSlot; }
+    sal_uInt16                   GetModifier() const { return nModifier; }
+    void                     SetModifier( sal_uInt16 nModifierP ) { nModifier = nModifierP; }
     SfxCallMode              GetCallMode() const { return eCall; }
     void                     SetCallMode( SfxCallMode eMode ) { eCall = eMode; }
     virtual int              operator==( const SfxPoolItem& ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
                              SfxExecuteItem(
-                                 USHORT nWhich, USHORT nSlot, SfxCallMode eMode,
+                                 sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode,
                                  const SfxPoolItem *pArg1, ... );
                              SfxExecuteItem(
-                                 USHORT nWhich, USHORT nSlot, SfxCallMode eMode );
+                                 sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode );
                              SfxExecuteItem( const SfxExecuteItem& );
 };
 
@@ -107,11 +107,11 @@ public:
 class SFX2_DLLPUBLIC SfxDispatcher
 {
     SfxDispatcher_Impl*             pImp;
-    BOOL                            bFlushed;
+    sal_Bool                            bFlushed;
 
 private:
     // auf temporaer ausgewerteten Todos suchen
-    SAL_DLLPRIVATE BOOL CheckVirtualStack( const SfxShell& rShell, BOOL bDeep );
+    SAL_DLLPRIVATE sal_Bool CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep );
 
 #ifndef _SFX_HXX
 
@@ -121,8 +121,8 @@ friend class SfxViewFrame;
     DECL_DLLPRIVATE_LINK( EventHdl_Impl, void * );
     DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * );
 
-    SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord );
-    SAL_DLLPRIVATE void _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*);
+    SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, sal_Bool bRecord );
+    SAL_DLLPRIVATE void _Update_Impl( sal_Bool,sal_Bool,sal_Bool,SfxWorkWindow*);
     SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*);
 
 protected:
@@ -132,15 +132,15 @@ friend class SfxPopupMenuManager;
 friend class SfxHelp;
                         // Fuer die Bindings: Finden einer Message; Level fuer
                         // erneuten Zugriff
-    SAL_DLLPRIVATE BOOL _TryIntercept_Impl( USHORT nId, SfxSlotServer &rServer, BOOL bModal );
-    BOOL                _FindServer( USHORT nId, SfxSlotServer &rServer, BOOL bModal );
-    BOOL                _FillState( const SfxSlotServer &rServer,
+    SAL_DLLPRIVATE sal_Bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal );
+    sal_Bool                _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal );
+    sal_Bool                _FillState( const SfxSlotServer &rServer,
                                     SfxItemSet &rState, const SfxSlot *pRealSlot );
     const SfxPoolItem*  _Execute( const SfxSlotServer &rServer );
     void                _Execute( SfxShell &rShell, const SfxSlot &rSlot,
                                   SfxRequest &rReq,
                                   SfxCallMode eCall = SFX_CALLMODE_STANDARD);
-    const SfxPoolItem*  _Execute( USHORT nSlot, SfxCallMode eCall,
+    const SfxPoolItem*  _Execute( sal_uInt16 nSlot, SfxCallMode eCall,
                                   va_list pArgs, const SfxPoolItem *pArg1 );
 
 #endif
@@ -156,48 +156,48 @@ public:
     virtual             ~SfxDispatcher();
 
     const SfxPoolItem*  Execute( const SfxExecuteItem& rItem );
-    virtual USHORT      ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs=0, USHORT nMode=0 );
-    USHORT              ExecuteFunction( USHORT nSID, const SfxItemSet& rArgs , USHORT nMode=0 );
+    virtual sal_uInt16      ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs=0, sal_uInt16 nMode=0 );
+    sal_uInt16              ExecuteFunction( sal_uInt16 nSID, const SfxItemSet& rArgs , sal_uInt16 nMode=0 );
 
-    virtual void        SetExecuteMode( USHORT );
+    virtual void        SetExecuteMode( sal_uInt16 );
 
-    const SfxPoolItem*  Execute( USHORT nSlot,
+    const SfxPoolItem*  Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall = SFX_CALLMODE_SLOT,
                                  const SfxPoolItem **pArgs = 0,
-                                 USHORT nModi = 0,
+                                 sal_uInt16 nModi = 0,
                                  const SfxPoolItem **pInternalArgs = 0);
 
-    const SfxPoolItem*  Execute( USHORT nSlot,
+    const SfxPoolItem*  Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall,
                                  SfxItemSet* pArgs,
                                  SfxItemSet* pInternalArgs,
-                                 USHORT nModi = 0);
+                                 sal_uInt16 nModi = 0);
 
-    const SfxPoolItem*  Execute( USHORT nSlot,
+    const SfxPoolItem*  Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall,
                                  const SfxPoolItem *pArg1, ... );
 
-    const SfxPoolItem*  Execute( USHORT nSlot,
+    const SfxPoolItem*  Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall,
                                  const SfxItemSet &rArgs );
 
-    const SfxPoolItem*  Execute( USHORT nSlot,
+    const SfxPoolItem*  Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall,
-                                 USHORT nModi,
+                                 sal_uInt16 nModi,
                                  const SfxItemSet &rArgs );
 
-    USHORT              GetSlotId( const String& rCommand );
+    sal_uInt16              GetSlotId( const String& rCommand );
     const SfxSlot*      GetSlot( const String& rCommand );
 
-    BOOL                IsActive( const SfxShell& rShell );
-    BOOL                IsOnTop( const SfxShell& rShell );
-    USHORT              GetShellLevel( const SfxShell &rShell );
+    sal_Bool                IsActive( const SfxShell& rShell );
+    sal_Bool                IsOnTop( const SfxShell& rShell );
+    sal_uInt16              GetShellLevel( const SfxShell &rShell );
     SfxBindings*        GetBindings() const;
 
     void                Push( SfxShell& rShell );
-    void                Pop( SfxShell& rShell, USHORT nMode = 0 );
+    void                Pop( SfxShell& rShell, sal_uInt16 nMode = 0 );
 
-    SfxShell*           GetShell(USHORT nIdx) const;
+    SfxShell*           GetShell(sal_uInt16 nIdx) const;
     SfxViewFrame*       GetFrame() const;
     SfxModule*      GetModule() const;
     // caller has to clean up the Manager on his own
@@ -205,62 +205,62 @@ public:
 
     void                ExecutePopup( const ResId &rId,
                               Window *pWin = 0, const Point *pPosPixel = 0 );
-    static void         ExecutePopup( USHORT nConfigId = 0,
+    static void         ExecutePopup( sal_uInt16 nConfigId = 0,
                               Window *pWin = 0, const Point *pPosPixel = 0 );
-    static void         ExecutePopup( USHORT nConfigId,
+    static void         ExecutePopup( sal_uInt16 nConfigId,
                                       Window *pWin, const Point *pPosPixel,
                                       const SfxPoolItem *pArg1, ...  );
 
-    BOOL                IsAppDispatcher() const;
-    BOOL                IsFlushed() const;
+    sal_Bool            IsAppDispatcher() const;
+    sal_Bool            IsFlushed() const;
     void                Flush();
-    void                Lock( BOOL bLock );
-    BOOL                IsLocked( USHORT nSID = 0 ) const;
-    void                SetSlotFilter( BOOL bEnable = FALSE,
-                                       USHORT nCount = 0, const USHORT *pSIDs = 0 );
+    void                Lock( sal_Bool bLock );
+    sal_Bool                IsLocked( sal_uInt16 nSID = 0 ) const;
+    void                SetSlotFilter( sal_Bool bEnable = sal_False,
+                                       sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 );
 
-    void                HideUI( BOOL bHide = TRUE );
-    void                ShowObjectBar(USHORT nId, SfxShell *pShell=0) const;
-    sal_uInt32          GetObjectBarId( USHORT nPos ) const;
+    void                HideUI( sal_Bool bHide = sal_True );
+    void                ShowObjectBar(sal_uInt16 nId, SfxShell *pShell=0) const;
+    sal_uInt32          GetObjectBarId( sal_uInt16 nPos ) const;
 
-    SfxItemState        QueryState( USHORT nSID, const SfxPoolItem* &rpState );
-    SfxItemState        QueryState( USHORT nSID, ::com::sun::star::uno::Any& rAny );
+    SfxItemState        QueryState( sal_uInt16 nSID, const SfxPoolItem* &rpState );
+    SfxItemState        QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny );
 
-    BOOL                IsAllowed( USHORT nSlot ) const;
+    sal_Bool                IsAllowed( sal_uInt16 nSlot ) const;
     ::com::sun::star::frame::XDispatch*          GetDispatchInterface( const String& );
     void                SetDisableFlags( sal_uInt32 nFlags );
     sal_uInt32              GetDisableFlags() const;
 
 //#if 0 // _SOLAR__PRIVATE
-    SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT );
+    SAL_DLLPRIVATE sal_Bool HasSlot_Impl( sal_uInt16 );
     SAL_DLLPRIVATE void SetMenu_Impl();
-    SAL_DLLPRIVATE void Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
-    SAL_DLLPRIVATE BOOL IsUpdated_Impl() const;
+    SAL_DLLPRIVATE void Update_Impl( sal_Bool bForce = sal_False ); // ObjectBars etc.
+    SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const;
     SAL_DLLPRIVATE void DebugOutput_Impl() const;
     SAL_DLLPRIVATE void ResetObjectBars_Impl();
-    SAL_DLLPRIVATE int GetShellAndSlot_Impl( USHORT nSlot, SfxShell **ppShell, const SfxSlot **ppSlot,
-                                              BOOL bOwnShellsOnly, BOOL bModal, BOOL bRealSlot=TRUE );
-    SAL_DLLPRIVATE void LockUI_Impl( BOOL bLock = TRUE );
-    SAL_DLLPRIVATE void SetReadOnly_Impl( BOOL  bOn );
-    SAL_DLLPRIVATE BOOL GetReadOnly_Impl() const;
-    SAL_DLLPRIVATE BOOL IsSlotEnabledByFilter_Impl( USHORT nSID ) const;
-    SAL_DLLPRIVATE void SetQuietMode_Impl( BOOL bOn );
-    SAL_DLLPRIVATE void SetModalMode_Impl( BOOL bOn );
-    SAL_DLLPRIVATE BOOL IsReadOnlyShell_Impl( USHORT nShell ) const;
+    SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot,
+                                              sal_Bool bOwnShellsOnly, sal_Bool bModal, sal_Bool bRealSlot=sal_True );
+    SAL_DLLPRIVATE void LockUI_Impl( sal_Bool bLock = sal_True );
+    SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool  bOn );
+    SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const;
+    SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool bOn );
+    SAL_DLLPRIVATE void SetModalMode_Impl( sal_Bool bOn );
+    SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const;
     SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell );
-    SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, USHORT nPos );
+    SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, sal_uInt16 nPos );
     SAL_DLLPRIVATE void DoParentActivate_Impl();
     SAL_DLLPRIVATE void DoParentDeactivate_Impl();
-    SAL_DLLPRIVATE void DoActivate_Impl( BOOL bMDI, SfxViewFrame* pOld );
-    SAL_DLLPRIVATE void DoDeactivate_Impl( BOOL bMDI, SfxViewFrame* pNew );
-    SAL_DLLPRIVATE void InvalidateBindings_Impl(BOOL);
-    SAL_DLLPRIVATE USHORT GetNextToolBox_Impl( USHORT nPos, USHORT nType, String *pStr );
+    SAL_DLLPRIVATE void DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* pOld );
+    SAL_DLLPRIVATE void DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew );
+    SAL_DLLPRIVATE void InvalidateBindings_Impl(sal_Bool);
+    SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType, String *pStr );
 //#endif
 };
 
 //--------------------------------------------------------------------
 
-inline BOOL SfxDispatcher::IsFlushed() const
+inline sal_Bool SfxDispatcher::IsFlushed() const
 
 /*  [Beschreibung]
 
@@ -281,9 +281,9 @@ inline void SfxDispatcher::Flush()
 
     Diese Methode f"uhrt ausstehenden Push- und Pop-Befehle aus.
     F"ur <SfxShell>s, die dabei neu auf den Stack kommen, wird
-    <SfxShell::Activate(BOOL)> mit bMDI == TRUE aufgerufen, f"ur
-    SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(BOOL)>
-    mit bMDI == TRUE aufgerufen.
+    <SfxShell::Activate(sal_Bool)> mit bMDI == sal_True aufgerufen, f"ur
+    SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(sal_Bool)>
+    mit bMDI == sal_True aufgerufen.
 */
 
 {
@@ -310,7 +310,7 @@ inline void SfxDispatcher::Push( SfxShell& rShell )
 
 //--------------------------------------------------------------------
 
-inline BOOL SfxDispatcher::IsActive( const SfxShell& rShell )
+inline sal_Bool SfxDispatcher::IsActive( const SfxShell& rShell )
 
 /*  [Beschreibung]
 
@@ -319,22 +319,22 @@ inline BOOL SfxDispatcher::IsActive( const SfxShell& rShell )
 
     [R"uckgabewert]
 
-    BOOL                TRUE
+    sal_Bool                sal_True
                         Die SfxShell-Instanz befindet sich auf dem
                         SfxDispatcher.
 
-                        FALSE
+                        sal_False
                         Die SfxShell-Instanz befindet sich nicht auf dem
                         SfxDispatcher.
 
 */
 
 {
-    return CheckVirtualStack( rShell, TRUE );
+    return CheckVirtualStack( rShell, sal_True );
 }
 //--------------------------------------------------------------------
 
-inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell )
+inline sal_Bool SfxDispatcher::IsOnTop( const SfxShell& rShell )
 
 /*  [Beschreibung]
 
@@ -343,18 +343,18 @@ inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell )
 
     [R"uckgabewert]
 
-    BOOL                TRUE
+    sal_Bool                sal_True
                         Die SfxShell-Instanz befindet sich als oberste
                         SfxShell auf dem SfxDispatcher.
 
-                        FALSE
+                        sal_False
                         Die SfxShell-Instanz befindet sich nicht als
                         oberste SfxShell auf dem SfxDispatcher.
 
 */
 
 {
-    return CheckVirtualStack( rShell, FALSE );
+    return CheckVirtualStack( rShell, sal_False );
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index 89062d7b7263..bc2d9bfc7be2 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -87,12 +87,12 @@ public:
     String          GetModuleName() const;
     void            SetDocumentTypeNameResource( const ResId& rId );
     String          GetDocumentTypeName() const;
-    SfxFilterContainer *GetFilterContainer( BOOL bForceLoad = TRUE) const;
+    SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const;
 
     // Views
     void            RegisterViewFactory(SfxViewFactory &rFactory);
-    USHORT          GetViewFactoryCount() const;
-    SfxViewFactory& GetViewFactory(USHORT i = 0) const;
+    sal_uInt16          GetViewFactoryCount() const;
+    SfxViewFactory& GetViewFactory(sal_uInt16 i = 0) const;
 
     /// returns the view factory whose GetAPIViewName or GetLegacyViewName delivers the requested logical name
     SfxViewFactory* GetViewFactoryByViewName( const String& i_rViewName ) const;
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index f2253a8f2b67..87e62aef5b63 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -121,7 +121,7 @@ public:
                         SfxMedium();
                         SfxMedium( const String &rName,
                                    StreamMode nOpenMode,
-                                   sal_Bool bDirect=FALSE,
+                                   sal_Bool bDirect=sal_False,
                                    const SfxFilter *pFilter = 0,
                                    SfxItemSet *pSet = 0 );
 
@@ -135,7 +135,7 @@ public:
 
                         ~SfxMedium();
 
-    void                UseInteractionHandler( BOOL );
+    void                UseInteractionHandler( sal_Bool );
     ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >
                         GetInteractionHandler();
 
@@ -239,7 +239,7 @@ public:
     ::rtl::OUString     GetBaseURL( bool bForSaving=false );
 
 #if _SOLAR__PRIVATE
-    SAL_DLLPRIVATE BOOL HasStorage_Impl() const;
+    SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const;
 
     SAL_DLLPRIVATE void StorageBackup_Impl();
     SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl();
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index 83bad4d1d01c..7a6af9040066 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -49,16 +49,16 @@ class SFX2_DLLPUBLIC SfxFilter
 friend class SfxFilterContainer;
 
     WildCard        aWildCard;
-    ULONG           lFormat;
+    sal_uIntPtr         lFormat;
     String          aTypeName;
     String          aUserData;
     SfxFilterFlags  nFormatType;
-    USHORT          nDocIcon;
+    sal_uInt16          nDocIcon;
     String          aServiceName;
     String          aMimeType;
     String          aFilterName;
     String          aPattern;
-    ULONG           nVersion;
+    sal_uIntPtr           nVersion;
     String          aUIName;
     String          aDefaultTemplate;
 
@@ -68,7 +68,7 @@ public:
                                SfxFilterFlags nFormatType,
                                sal_uInt32 lFormat,
                                const String &rTypeName,
-                               USHORT nDocIcon,
+                               sal_uInt16 nDocIcon,
                                const String &rMimeType,
                                const String &rUserData,
                                const String& rServiceName );
@@ -87,19 +87,19 @@ public:
     const String&   GetName() const { return  aFilterName; }
     const WildCard& GetWildcard() const { return aWildCard; }
     const String&   GetRealTypeName() const { return aTypeName; }
-    ULONG           GetFormat() const { return lFormat; }
+    sal_uIntPtr         GetFormat() const { return lFormat; }
     const String&   GetTypeName() const { return aTypeName; }
     const String&   GetUIName() const { return aUIName; }
-    USHORT          GetDocIconId() const { return nDocIcon; }
+    sal_uInt16          GetDocIconId() const { return nDocIcon; }
     const String&   GetUserData() const { return aUserData; }
     const String&   GetDefaultTemplate() const { return aDefaultTemplate; }
     void            SetDefaultTemplate( const String& rStr ) { aDefaultTemplate = rStr; }
-    BOOL            UsesStorage() const { return GetFormat() != 0; }
+    sal_Bool            UsesStorage() const { return GetFormat() != 0; }
     void            SetURLPattern( const String& rStr ) { aPattern = rStr; aPattern.ToLowerAscii(); }
     String          GetURLPattern() const { return aPattern; }
     void            SetUIName( const String& rName ) { aUIName = rName; }
-    void            SetVersion( ULONG nVersionP ) { nVersion = nVersionP; }
-    ULONG           GetVersion() const { return nVersion; }
+    void            SetVersion( sal_uIntPtr nVersionP ) { nVersion = nVersionP; }
+    sal_uIntPtr           GetVersion() const { return nVersion; }
     String          GetSuffixes() const;
     String          GetDefaultExtension() const;
     const String&   GetServiceName() const { return aServiceName; }
@@ -110,7 +110,7 @@ public:
 
     static String   GetTypeFromStorage( const SotStorage& rStg );
     static String   GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage,
-                                        BOOL bTemplate = FALSE,
+                                        sal_Bool bTemplate = sal_False,
                                         String* pName=0 )
                         throw ( ::com::sun::star::beans::UnknownPropertyException,
                                 ::com::sun::star::lang::WrappedTargetException,
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index 254bd622d9bc..c9138988fa45 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.hxx
@@ -66,14 +66,14 @@ protected:
                         CheckAlignment(SfxChildAlignment,SfxChildAlignment);
 
     virtual void        Resize();
-    virtual BOOL        PrepareToggleFloatingMode();
+    virtual sal_Bool        PrepareToggleFloatingMode();
     virtual void        ToggleFloatingMode();
     virtual void        StartDocking();
-    virtual BOOL        Docking( const Point& rPos, Rectangle& rRect );
-    virtual void        EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+    virtual sal_Bool        Docking( const Point& rPos, Rectangle& rRect );
+    virtual void        EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
     virtual void        Resizing( Size& rSize );
     virtual void        Paint( const Rectangle& rRect );
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
     virtual void        Move();
 
 //#if 0 // _SOLAR__PRIVATE
@@ -100,7 +100,7 @@ public:
     const Rectangle&    GetInnerRect() const                    { return aInnerRect; }
     const Rectangle&    GetOuterRect() const                    { return aOuterRect; }
     SfxBindings&        GetBindings() const                     { return *pBindings; }
-    USHORT              GetType() const                         { return pMgr->GetType(); }
+    sal_uInt16              GetType() const                         { return pMgr->GetType(); }
     SfxChildAlignment   GetAlignment() const                    { return pMgr->GetAlignment(); }
     void                SetAlignment(SfxChildAlignment eAlign)  { pMgr->SetAlignment(eAlign); }
     Size                GetFloatingSize() const                 { return aFloatSize; }
@@ -109,20 +109,20 @@ public:
     void                SetMinOutputSizePixel( const Size& rSize );
     Size                GetMinOutputSizePixel() const;
     virtual long        Notify( NotifyEvent& rNEvt );
-    virtual void        FadeIn( BOOL );
-    void                AutoShow( BOOL bShow = TRUE );
+    virtual void        FadeIn( sal_Bool );
+    void                AutoShow( sal_Bool bShow = sal_True );
     DECL_LINK( TimerHdl, Timer* );
 
 //#if 0 // _SOLAR__PRIVATE
     SAL_DLLPRIVATE void Initialize_Impl();
-    SAL_DLLPRIVATE USHORT GetWinBits_Impl() const;
+    SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const;
     SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
     SAL_DLLPRIVATE void Disappear_Impl();
     SAL_DLLPRIVATE void Reappear_Impl();
-    SAL_DLLPRIVATE BOOL IsAutoHide_Impl() const;
-    SAL_DLLPRIVATE BOOL IsPinned_Impl() const;
-    SAL_DLLPRIVATE void AutoShow_Impl( BOOL bShow = TRUE );
-    SAL_DLLPRIVATE void Pin_Impl( BOOL bPinned );
+    SAL_DLLPRIVATE sal_Bool IsAutoHide_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsPinned_Impl() const;
+    SAL_DLLPRIVATE void AutoShow_Impl( sal_Bool bShow = sal_True );
+    SAL_DLLPRIVATE void Pin_Impl( sal_Bool bPinned );
     SAL_DLLPRIVATE SfxSplitWindow* GetSplitWindow_Impl() const;
     SAL_DLLPRIVATE void ReleaseChildWindow_Impl();
 //#endif
@@ -132,7 +132,7 @@ class SfxDockingWrapper : public SfxChildWindow
 {
     public:
         SfxDockingWrapper( Window* pParent ,
-                           USHORT nId ,
+                           sal_uInt16 nId ,
                            SfxBindings* pBindings ,
                            SfxChildWinInfo* pInfo );
 
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
index ddc0d6196a64..9c991912448a 100644
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ b/sfx2/inc/sfx2/doctdlg.hxx
@@ -78,7 +78,7 @@ public:
     { return aNameEd.GetText().EraseLeadingChars(); }
     String GetTemplatePath();
     void NewTemplate(const String &rPath);
-    USHORT GetRegion() const { return aRegionLb.GetSelectEntryPos(); }
+    sal_uInt16 GetRegion() const { return aRegionLb.GetSelectEntryPos(); }
     String GetRegionName() const { return aRegionLb.GetSelectEntry(); }
 };
 
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index 43ab94b4b28e..bc0728b0ec1b 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -56,70 +56,70 @@ class SFX2_DLLPUBLIC SfxDocumentTemplates
 private:
     SfxDocTemplate_ImplRef  pImp;
 
-    SAL_DLLPRIVATE BOOL CopyOrMove( USHORT nTargetRegion, USHORT nTargetIdx,
-                                    USHORT nSourceRegion, USHORT nSourceIdx, BOOL bMove );
+    SAL_DLLPRIVATE sal_Bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx,
+                                    sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, sal_Bool bMove );
 public:
                         SfxDocumentTemplates();
                         SfxDocumentTemplates(const SfxDocumentTemplates &);
                         ~SfxDocumentTemplates();
 
-    BOOL                IsConstructed() { return pImp != NULL; }
+    sal_Bool                IsConstructed() { return pImp != NULL; }
     void                Construct();
 
-    static BOOL         SaveDir( /*SfxTemplateDir &rEntry */ ) ;
+    static sal_Bool         SaveDir( /*SfxTemplateDir &rEntry */ ) ;
     const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &);
 
-    BOOL                Rescan( );      // Aktualisieren
+    sal_Bool                Rescan( );      // Aktualisieren
     void                ReInitFromComponent();
 
-    BOOL                IsRegionLoaded( USHORT nIdx ) const;
-    USHORT              GetRegionCount() const;
-    const String&       GetRegionName(USHORT nIdx) const;                   //dv!
-    String              GetFullRegionName(USHORT nIdx) const;
-    USHORT              GetRegionNo( const String &rRegionName ) const;
+    sal_Bool                IsRegionLoaded( sal_uInt16 nIdx ) const;
+    sal_uInt16              GetRegionCount() const;
+    const String&       GetRegionName(sal_uInt16 nIdx) const;                   //dv!
+    String              GetFullRegionName(sal_uInt16 nIdx) const;
+    sal_uInt16              GetRegionNo( const String &rRegionName ) const;
 
-    USHORT              GetCount(USHORT nRegion) const;
-    USHORT              GetCount( const String &rName) const;
-    const String&       GetName(USHORT nRegion, USHORT nIdx) const;         //dv!
-    String              GetFileName(USHORT nRegion, USHORT nIdx) const;
-    String              GetPath(USHORT nRegion, USHORT nIdx) const;
+    sal_uInt16              GetCount(sal_uInt16 nRegion) const;
+    sal_uInt16              GetCount( const String &rName) const;
+    const String&       GetName(sal_uInt16 nRegion, sal_uInt16 nIdx) const;         //dv!
+    String              GetFileName(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
+    String              GetPath(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
 
     String              GetDefaultTemplatePath(const String &rLongName);
 
     // Pfad zur Vorlage geben lassen; logischer Name muss angegeben
     // werden, damit beim Ueberschreiben einer Vorlage der
     // richtige Dateiname gefunden werden kann
-    String              GetTemplatePath(USHORT nRegion, const String &rLongName) const;
+    String              GetTemplatePath(sal_uInt16 nRegion, const String &rLongName) const;
 
     // Allows to retrieve the target template URL from the UCB
     ::rtl::OUString     GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName,
                                                          const ::rtl::OUString& aTitle );
 
     // Speichern als Vorlage hat geklappt -> Aktualisieren
-    void            NewTemplate(USHORT nRegion,
+    void            NewTemplate(sal_uInt16 nRegion,
                                 const String &rLongName,
                                 const String &rFileName);
 
-    BOOL            Copy(USHORT nTargetRegion,
-                         USHORT nTargetIdx,
-                         USHORT nSourceRegion,
-                         USHORT nSourceIdx);
-    BOOL            Move(USHORT nTargetRegion,
-                         USHORT nTargetIdx,
-                         USHORT nSourceRegion,
-                         USHORT nSourceIdx);
-    BOOL            Delete(USHORT nRegion, USHORT nIdx);
-    BOOL            InsertDir(const String &rText, USHORT nRegion);
-    BOOL            SetName(const String &rName, USHORT nRegion, USHORT nIdx);
-
-    BOOL            CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) const;
-    BOOL            CopyFrom(USHORT nRegion, USHORT nIdx, String &rName);
-
-    SfxObjectShellRef CreateObjectShell(USHORT nRegion, USHORT nIdx);
-    BOOL            DeleteObjectShell(USHORT, USHORT);
-
-    BOOL            GetFull( const String& rRegion, const String& rName, String& rPath );
-    BOOL            GetLogicNames( const String& rPath, String& rRegion, String& rName ) const;
+    sal_Bool            Copy(sal_uInt16 nTargetRegion,
+                         sal_uInt16 nTargetIdx,
+                         sal_uInt16 nSourceRegion,
+                         sal_uInt16 nSourceIdx);
+    sal_Bool            Move(sal_uInt16 nTargetRegion,
+                         sal_uInt16 nTargetIdx,
+                         sal_uInt16 nSourceRegion,
+                         sal_uInt16 nSourceIdx);
+    sal_Bool            Delete(sal_uInt16 nRegion, sal_uInt16 nIdx);
+    sal_Bool            InsertDir(const String &rText, sal_uInt16 nRegion);
+    sal_Bool            SetName(const String &rName, sal_uInt16 nRegion, sal_uInt16 nIdx);
+
+    sal_Bool            CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const String &rName) const;
+    sal_Bool            CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, String &rName);
+
+    SfxObjectShellRef CreateObjectShell(sal_uInt16 nRegion, sal_uInt16 nIdx);
+    sal_Bool            DeleteObjectShell(sal_uInt16, sal_uInt16);
+
+    sal_Bool            GetFull( const String& rRegion, const String& rName, String& rPath );
+    sal_Bool            GetLogicNames( const String& rPath, String& rRegion, String& rName ) const;
 
     /** updates the configuration where the document templates structure is stored.
 
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 9b144b3c20b6..d24a38be0deb 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -46,17 +46,17 @@ class SFX2_DLLPUBLIC SfxEventHint : public SfxHint
 {
     SfxObjectShell*     pObjShell;
     ::rtl::OUString     aEventName;
-    USHORT              nEventId;
+    sal_uInt16              nEventId;
 
 public:
     TYPEINFO();
-    SfxEventHint( USHORT nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 )
+    SfxEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 )
                         :   pObjShell(pObj),
                             aEventName(aName),
                             nEventId(nId)
                         {}
 
-    USHORT              GetEventId() const
+    sal_uInt16              GetEventId() const
                         { return nEventId; }
 
     ::rtl::OUString     GetEventName() const
@@ -75,12 +75,12 @@ class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
 public:
     TYPEINFO();
 
-    SfxViewEventHint( USHORT nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController )
+    SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController )
                         : SfxEventHint( nId, aName, pObj )
                         , xViewController( xController, ::com::sun::star::uno::UNO_QUERY )
                         {}
 
-    SfxViewEventHint( USHORT nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController )
+    SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController )
                         : SfxEventHint( nId, aName, pObj )
                         , xViewController( xController )
                         {}
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index 5b41d3a32935..791b63da930a 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -52,11 +52,11 @@ class SvxMacroTableDtor;
 
 struct SFX2_DLLPUBLIC SfxEventName
 {
-    USHORT  mnId;
+    sal_uInt16  mnId;
     String  maEventName;
     String  maUIName;
 
-            SfxEventName( USHORT nId,
+            SfxEventName( sal_uInt16 nId,
                              const String& rEventName,
                              const String& rUIName )
                 : mnId( nId )
@@ -69,7 +69,7 @@ DECLARE_LIST( _SfxEventNamesList, SfxEventName* )
 class SFX2_DLLPUBLIC SfxEventNamesList : public _SfxEventNamesList
 {
 public:
-    SfxEventNamesList( const USHORT nInitSz = 0, const USHORT nReSz = 1 ): _SfxEventNamesList( nInitSz, nReSz ) {}
+    SfxEventNamesList( const sal_uInt16 nInitSz = 0, const sal_uInt16 nReSz = 1 ): _SfxEventNamesList( nInitSz, nReSz ) {}
     SfxEventNamesList( const SfxEventNamesList &rCpy ) : _SfxEventNamesList() { *this = rCpy; }
     ~SfxEventNamesList() { DelDtor(); }
     SfxEventNamesList& operator=( const SfxEventNamesList &rCpy );
@@ -83,7 +83,7 @@ class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SfxEventNamesItem ( const USHORT nId ) : SfxPoolItem( nId ) {}
+    SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {}
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -92,13 +92,13 @@ public:
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
     const SfxEventNamesList& GetEvents() const { return aEventsList;}
     void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; }
-    void                    AddEvent( const String&, const String&, USHORT );
+    void                    AddEvent( const String&, const String&, sal_uInt16 );
 };
 
 // -----------------------------------------------------------------------
@@ -113,7 +113,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration
 {
 public:
     static void                         ConfigureEvent( ::rtl::OUString aName, const SvxMacro&, SfxObjectShell* pObjSh);
-    static SvxMacro*                    ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, BOOL bBlowUp );
+    static SvxMacro*                    ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index c80d61aa81d1..90c43c1ff774 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -49,7 +49,7 @@ class SfxFilterContainer_Impl;
 class SfxFrame;
 
 //#define SFX_FILTER_CONTAINER_FACTORY 1
-typedef USHORT SfxFilterContainerFlags;
+typedef sal_uInt16 SfxFilterContainerFlags;
 
 class SfxRefItem : public SfxPoolItem
 {
@@ -59,7 +59,7 @@ public:
     {   return new SfxRefItem( *this ); }
     virtual int              operator==( const SfxPoolItem& rL) const
     {   return ((SfxRefItem&)rL).aRef == aRef; }
-    SfxRefItem( USHORT nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId )
+    SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId )
     {   aRef = rValue; }
     const SvRefBaseRef&      GetValue() const { return aRef; }
 
@@ -92,7 +92,7 @@ public:
     FactoryFunc GetFactory() { return pFunc; }
 };
 
-typedef ULONG (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont );
+typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont );
 
 class SFX2_DLLPUBLIC SfxFilterContainer
 {
@@ -116,11 +116,11 @@ public:
     const SfxFilter*    GetFilter4UIName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
 
 //#if 0 // _SOLAR__PRIVATE
-    SAL_DLLPRIVATE static void ReadFilters_Impl( BOOL bUpdate=FALSE );
+    SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False );
     SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
-                            BOOL bUpdate );
+                            sal_Bool bUpdate );
     SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const String& );
 //#endif
 };
@@ -137,14 +137,14 @@ public:
                         ~SfxFilterMatcher();
 
 //#if 0 // _SOLAR__PRIVATE
-    SAL_DLLPRIVATE static BOOL IsFilterInstalled_Impl( const SfxFilter* pFilter );
+    SAL_DLLPRIVATE static sal_Bool IsFilterInstalled_Impl( const SfxFilter* pFilter );
     DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String* );
 //#endif
 
     sal_uInt32               GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
     sal_uInt32               GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
     sal_uInt32               GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const;
-    sal_uInt32               DetectFilter( SfxMedium& rMedium, const SfxFilter **, BOOL bPlugIn, BOOL bAPI = FALSE ) const;
+    sal_uInt32               DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const;
 
     const SfxFilter*    GetFilter4Mime( const String& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const;
     const SfxFilter*    GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
@@ -161,7 +161,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter
 {
     SfxFilterFlags nOrMask;
     SfxFilterFlags nAndMask;
-    USHORT nCurrent;
+    sal_uInt16 nCurrent;
     const SfxFilterMatcher_Impl *pMatch;
 
 //#if 0 // _SOLAR__PRIVATE
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index b94e9038e8bb..622be188072a 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -138,7 +138,7 @@ public:
     static SfxFrame*    Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
     static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
                         CreateBlankFrame();
-    static SfxFrame*    Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewId, bool bHidden );
+    static SfxFrame*    Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden );
 
     SvCompatWeakHdl*    GetHdl();
     Window&             GetWindow() const;
@@ -149,7 +149,7 @@ public:
     SfxFrame*           GetParentFrame() const
                         { return pParentFrame; }
 
-    void                SetPresentationMode( BOOL bSet );
+    void                SetPresentationMode( sal_Bool bSet );
     SystemWindow*       GetSystemWindow() const;
 
     static SfxFrame*    GetFirst();
@@ -219,9 +219,9 @@ public:
     SAL_DLLPRIVATE void SetInPlace_Impl( sal_Bool );
 
     SAL_DLLPRIVATE void PrepareForDoc_Impl( SfxObjectShell& i_rDoc );
-    SAL_DLLPRIVATE void LockResize_Impl( BOOL bLock );
-    SAL_DLLPRIVATE void SetMenuBarOn_Impl( BOOL bOn );
-    SAL_DLLPRIVATE BOOL IsMenuBarOn_Impl() const;
+    SAL_DLLPRIVATE void LockResize_Impl( sal_Bool bLock );
+    SAL_DLLPRIVATE void SetMenuBarOn_Impl( sal_Bool bOn );
+    SAL_DLLPRIVATE sal_Bool IsMenuBarOn_Impl() const;
     SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
     SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const;
     SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
@@ -267,8 +267,8 @@ public:
     virtual String          GetValueText() const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     sal_Bool                FrameKilled() const { return &wFrame != pFrame; }
 
@@ -286,8 +286,8 @@ public:
                                 { return aValue; }
     virtual int                 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
@@ -304,8 +304,8 @@ public:
                                 { return m_xFrame; }
     virtual int                 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 typedef SfxUsrAnyItem SfxUnoAnyItem;
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index 4cb52d1b53c6..cc6ae5f4cb7e 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -90,12 +90,12 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
     long                    nWidth;
     ScrollingMode           eScroll;
     SizeSelector            eSizeSelector;
-    USHORT                  nHasBorder;
-    USHORT                  nItemId;
-    BOOL                    bResizeHorizontal;
-    BOOL                    bResizeVertical;
-    BOOL                    bHasUI;
-    BOOL                    bReadOnly;
+    sal_uInt16                  nHasBorder;
+    sal_uInt16                  nItemId;
+    sal_Bool                    bResizeHorizontal;
+    sal_Bool                    bResizeVertical;
+    sal_Bool                    bHasUI;
+    sal_Bool                    bReadOnly;
     SfxFrameDescriptor_Impl* pImp;
     SvStrings*              pScripts;
     SvStrings*              pComments;
@@ -117,13 +117,13 @@ public:
                             { return aActualURL; }
     void                    SetActualURL( const INetURLObject& rURL );
     void                    SetActualURL( const String& rURL );
-    BOOL                    CheckContent() const;
-    BOOL                    CompareOriginal( SfxFrameDescriptor& rSet ) const;
-    void                    UnifyContent( BOOL );
-    void                    SetReadOnly( BOOL bSet ) { bReadOnly = bSet;}
-    BOOL                    IsReadOnly(  ) const { return bReadOnly;}
-    void                    SetEditable( BOOL bSet );
-    BOOL                    IsEditable() const;
+    sal_Bool                    CheckContent() const;
+    sal_Bool                    CompareOriginal( SfxFrameDescriptor& rSet ) const;
+    void                    UnifyContent( sal_Bool );
+    void                    SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;}
+    sal_Bool                    IsReadOnly(  ) const { return bReadOnly;}
+    void                    SetEditable( sal_Bool bSet );
+    sal_Bool                    IsEditable() const;
 
                             // Size
     void                    SetWidth( long n )
@@ -138,9 +138,9 @@ public:
                             { return nWidth; }
     SizeSelector            GetSizeSelector() const
                             { return eSizeSelector; }
-    BOOL                    IsResizable() const
+    sal_Bool                    IsResizable() const
                             { return bResizeHorizontal && bResizeVertical; }
-    void                    SetResizable( BOOL bRes )
+    void                    SetResizable( sal_Bool bRes )
                             { bResizeHorizontal = bResizeVertical = bRes; }
 
                             // FrameName
@@ -162,38 +162,38 @@ public:
                             // FrameBorder
     void                    SetWallpaper( const Wallpaper& rWallpaper );
     const Wallpaper*        GetWallpaper() const;
-    BOOL                    HasFrameBorder() const;
+    sal_Bool                    HasFrameBorder() const;
 
-    BOOL                    IsFrameBorderOn() const
+    sal_Bool                    IsFrameBorderOn() const
                             { return ( nHasBorder & BORDER_YES ) != 0; }
 
-    void                    SetFrameBorder( BOOL bBorder )
+    void                    SetFrameBorder( sal_Bool bBorder )
                             {
                                 nHasBorder = bBorder ?
                                             BORDER_YES | BORDER_SET :
                                             BORDER_NO | BORDER_SET;
                             }
-    BOOL                    IsFrameBorderSet() const
+    sal_Bool                    IsFrameBorderSet() const
                             { return (nHasBorder & BORDER_SET) != 0; }
     void                    ResetBorder()
                             { nHasBorder = 0; }
 
-    BOOL                    HasUI() const
+    sal_Bool                    HasUI() const
                             { return bHasUI; }
-    void                    SetHasUI( BOOL bOn )
+    void                    SetHasUI( sal_Bool bOn )
                             { bHasUI = bOn; }
 
                             // Attribute f"ur das Splitwindow
-    USHORT                  GetItemId() const
+    sal_uInt16                  GetItemId() const
                             { return nItemId; }
-    void                    SetItemId( USHORT nId )
+    void                    SetItemId( sal_uInt16 nId )
                             { nItemId = nId; }
-    USHORT                  GetWinBits() const;
+    sal_uInt16                  GetWinBits() const;
     long                    GetSize() const;
-    USHORT                  GetItemPos() const;
+    sal_uInt16                  GetItemPos() const;
 
                             // Kopie z.B. f"ur die Views
-    SfxFrameDescriptor*     Clone( BOOL bWithIds = TRUE ) const;
+    SfxFrameDescriptor*     Clone( sal_Bool bWithIds = sal_True ) const;
 };
 
 // Kein Bock, einen operator= zu implementieren...
@@ -210,13 +210,13 @@ struct SfxFrameProperties
     ScrollingMode                       eScroll;
     SizeSelector                        eSizeSelector;
     SizeSelector                        eSetSizeSelector;
-    BOOL                                bHasBorder;
-    BOOL                                bBorderSet;
-    BOOL                                bResizable;
-    BOOL                                bSetResizable;
-    BOOL                                bIsRootSet;
-    BOOL                                bIsInColSet;
-    BOOL                                bHasBorderInherited;
+    sal_Bool                                bHasBorder;
+    sal_Bool                                bBorderSet;
+    sal_Bool                                bResizable;
+    sal_Bool                                bSetResizable;
+    sal_Bool                                bIsRootSet;
+    sal_Bool                                bIsInColSet;
+    sal_Bool                                bHasBorderInherited;
     SfxFrameDescriptor*                 pFrame;
 
 private:
@@ -232,13 +232,13 @@ public:
                                               eScroll( ScrollingAuto ),
                                               eSizeSelector( SIZE_REL ),
                                               eSetSizeSelector( SIZE_REL ),
-                                              bHasBorder( TRUE ),
-                                              bBorderSet( TRUE ),
-                                              bResizable( TRUE ),
-                                              bSetResizable( TRUE ),
-                                              bIsRootSet( FALSE ),
-                                              bIsInColSet( FALSE ),
-                                              bHasBorderInherited( TRUE ),
+                                              bHasBorder( sal_True ),
+                                              bBorderSet( sal_True ),
+                                              bResizable( sal_True ),
+                                              bSetResizable( sal_True ),
+                                              bIsRootSet( sal_False ),
+                                              bIsInColSet( sal_False ),
+                                              bHasBorderInherited( sal_True ),
                                               pFrame( 0 ) {}
 
                                         SfxFrameProperties( const SfxFrameDescriptor *pD );
@@ -254,12 +254,12 @@ class SfxFrameDescriptorItem : public SfxPoolItem
 public:
                                         TYPEINFO();
 
-                                        SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const USHORT nId = SID_FRAMEDESCRIPTOR )
+                                        SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const sal_uInt16 nId = SID_FRAMEDESCRIPTOR )
                                             : SfxPoolItem( nId )
                                             , aProperties( pD )
                                         {}
 
-                                        SfxFrameDescriptorItem ( const USHORT nId = SID_FRAMEDESCRIPTOR )
+                                        SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR )
                                             : SfxPoolItem( nId )
                                         {}
 
@@ -280,9 +280,9 @@ public:
                                             UniString &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*                Clone( SfxItemPool *pPool = 0 ) const;
-    //virtual SfxPoolItem*              Create(SvStream &, USHORT) const;
-    //virtual SvStream&                 Store(SvStream &, USHORT nItemVersion ) const;
-    //virtual USHORT                        GetVersion( USHORT nFileFormatVersion ) const;
+    //virtual SfxPoolItem*              Create(SvStream &, sal_uInt16) const;
+    //virtual SvStream&                 Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    //virtual sal_uInt16                        GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
     const SfxFrameProperties&           GetProperties() const
                                         { return aProperties; }
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx
index e3e9c4f9f781..9c3ff64e688a 100644
--- a/sfx2/inc/sfx2/frmhtml.hxx
+++ b/sfx2/inc/sfx2/frmhtml.hxx
@@ -46,7 +46,7 @@ class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser
     friend class _SfxFrameHTMLContext;
 
 protected:
-   SfxFrameHTMLParser( SvStream& rStream, BOOL bIsNewDoc=TRUE, SfxMedium *pMediumPtr=0 ):
+   SfxFrameHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc=sal_True, SfxMedium *pMediumPtr=0 ):
    SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {};
 
 public:
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx
index 93f45f092ba9..e6b681c57f93 100644
--- a/sfx2/inc/sfx2/frmhtmlw.hxx
+++ b/sfx2/inc/sfx2/frmhtmlw.hxx
@@ -53,12 +53,12 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
     SAL_DLLPRIVATE static const sal_Char sNewLine[];
     SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm,
                                 const sal_Char *pIndent, const String& rName,
-                                const String& rContent, BOOL bHTTPEquiv,
+                                const String& rContent, sal_Bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                             String *pNonConvertableChars = 0 );
     SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm,
                                 const sal_Char *pIndent, const sal_Char *pName,
-                                const String& rContent, BOOL bHTTPEquiv,
+                                const String& rContent, sal_Bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                             String *pNonConvertableChars = 0 );
 
@@ -81,7 +81,7 @@ public:
 
 inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                             const sal_Char *pIndent, const sal_Char *pName,
-                            const String& rContent, BOOL bHTTPEquiv,
+                            const String& rContent, sal_Bool bHTTPEquiv,
                             rtl_TextEncoding eDestEnc,
                             String *pNonConvertableChars )
 {
diff --git a/sfx2/inc/sfx2/genlink.hxx b/sfx2/inc/sfx2/genlink.hxx
index 0edf8e3b9dd6..35a7534e6294 100644
--- a/sfx2/inc/sfx2/genlink.hxx
+++ b/sfx2/inc/sfx2/genlink.hxx
@@ -46,8 +46,8 @@ public:
     GenLink& operator = ( const GenLink& rOrig )
         { pFunc = rOrig.pFunc; aLink = rOrig.aLink; return *this; }
 
-    BOOL operator!() const { return !aLink && !pFunc; }
-    BOOL IsSet() const { return aLink.IsSet() || pFunc; }
+    sal_Bool operator!() const { return !aLink && !pFunc; }
+    sal_Bool IsSet() const { return aLink.IsSet() || pFunc; }
 
     long Call( void* pCaller )
          { return pFunc ? (*pFunc)(pCaller) : aLink.Call(pCaller); }
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index 140e93beafa4..375a22f5b2ec 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -52,7 +52,7 @@ class SfxHintPoster: public SvRefBase
 */
 
 {
-    ULONG           nId;
+    sal_uIntPtr         nId;
     GenLink         aLink;
 
 private:
diff --git a/sfx2/inc/sfx2/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx
index 79dc724210c4..fb5337f63b5a 100644
--- a/sfx2/inc/sfx2/imagemgr.hxx
+++ b/sfx2/inc/sfx2/imagemgr.hxx
@@ -33,4 +33,4 @@
 #include <rtl/ustring.hxx>
 #include <vcl/image.hxx>
 
-SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast );
diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx
index ae1f8a23ddc9..555cd37939b3 100644
--- a/sfx2/inc/sfx2/imgmgr.hxx
+++ b/sfx2/inc/sfx2/imgmgr.hxx
@@ -50,18 +50,18 @@ public:
                     SfxImageManager( SfxModule* pModule = 0 );
                     ~SfxImageManager();
 
-    void            RegisterToolBox( ToolBox *pBox, USHORT nFlags=0xFFFF);
+    void            RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags=0xFFFF);
     void            ReleaseToolBox( ToolBox *pBox );
 
                     // get images from resources
     void            SetImages( ToolBox& rToolBox );
-    void            SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
-    void            SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
+    void            SetImages( ToolBox& rToolBox, sal_Bool bHiContrast, sal_Bool bLarge );
+    void            SetImagesForceSize( ToolBox& rToolBox, sal_Bool bHiContrast, sal_Bool bLarge );
 
-    Image           GetImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
-    Image           GetImage( USHORT nId, BOOL bHiContrast ) const;
-    Image           SeekImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
-    Image           SeekImage( USHORT nId, BOOL bHiContrast ) const;
+    Image           GetImage( sal_uInt16 nId, sal_Bool bLarge, sal_Bool bHiContrast ) const;
+    Image           GetImage( sal_uInt16 nId, sal_Bool bHiContrast ) const;
+    Image           SeekImage( sal_uInt16 nId, sal_Bool bLarge, sal_Bool bHiContrast ) const;
+    Image           SeekImage( sal_uInt16 nId, sal_Bool bHiContrast ) const;
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx
index 960c6629b8d2..d302bc53442e 100644
--- a/sfx2/inc/sfx2/ipclient.hxx
+++ b/sfx2/inc/sfx2/ipclient.hxx
@@ -81,7 +81,7 @@ public:
     sal_Bool            IsObjectInPlaceActive() const;
     sal_Bool            IsObjectActive() const;
     void                DeactivateObject();
-    BOOL                SetObjArea( const Rectangle & );
+    sal_Bool                SetObjArea( const Rectangle & );
     Rectangle           GetObjArea() const;
     Rectangle           GetScaledObjArea() const;
     void                SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight );
@@ -96,7 +96,7 @@ public:
     ErrCode             DoVerb( long nVerb );
     void                VisAreaChanged();
     void                ResetObject();
-    BOOL                IsUIActive();
+    sal_Bool                IsUIActive();
 
     // used in Writer
     // Rectangle           PixelObjVisAreaToLogic( const Rectangle & rObjRect ) const;
diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/sfx2/inc/sfx2/itemconnect.hxx
index 1112f5825c1e..3d93bded533f 100644
--- a/sfx2/inc/sfx2/itemconnect.hxx
+++ b/sfx2/inc/sfx2/itemconnect.hxx
@@ -261,13 +261,13 @@ public:
 
     /** Receives pointer to a newly created control wrapper.
         @descr  Takes ownership of the control wrapper. */
-    explicit            ItemControlConnection( USHORT nSlot, ControlWrpT* pNewCtrlWrp,
+    explicit            ItemControlConnection( sal_uInt16 nSlot, ControlWrpT* pNewCtrlWrp,
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 
     /** Convenience constructor. Receives reference to a control directly.
         @descr  May only be used, if ControlWrpT::ControlWrpT( ControlType& )
         constructor exists. */
-    explicit            ItemControlConnection( USHORT nSlot, ControlType& rControl,
+    explicit            ItemControlConnection( sal_uInt16 nSlot, ControlType& rControl,
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 
     virtual             ~ItemControlConnection();
@@ -299,7 +299,7 @@ class SFX2_DLLPUBLIC DummyItemConnection:
     public ItemConnectionBase, public DummyWindowWrapper
 {
 public:
-    explicit            DummyItemConnection( USHORT nSlot, Window& rWindow,
+    explicit            DummyItemConnection( sal_uInt16 nSlot, Window& rWindow,
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 
 protected:
@@ -308,7 +308,7 @@ protected:
     virtual bool        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet );
 
 private:
-    USHORT              mnSlot;
+    sal_uInt16              mnSlot;
 };
 
 // ----------------------------------------------------------------------------
@@ -333,7 +333,7 @@ class NumericConnection : public ItemControlConnection< ItemWrpT,
 public:
     typedef typename ItemControlConnectionType::ControlWrapperType NumericFieldWrapperType;
 
-    explicit            NumericConnection( USHORT nSlot, NumericField& rField,
+    explicit            NumericConnection( sal_uInt16 nSlot, NumericField& rField,
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 };
 
@@ -364,7 +364,7 @@ class MetricConnection : public ItemControlConnection< ItemWrpT,
 public:
     typedef typename ItemControlConnectionType::ControlWrapperType MetricFieldWrapperType;
 
-    explicit            MetricConnection( USHORT nSlot, MetricField& rField,
+    explicit            MetricConnection( sal_uInt16 nSlot, MetricField& rField,
                             FieldUnit eItemUnit = FUNIT_NONE, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 };
 
@@ -396,7 +396,7 @@ public:
     typedef typename ItemControlConnectionType::ControlWrapperType  ListBoxWrapperType;
     typedef typename ListBoxWrapperType::MapEntryType               MapEntryType;
 
-    explicit            ListBoxConnection( USHORT nSlot, ListBox& rListBox,
+    explicit            ListBoxConnection( sal_uInt16 nSlot, ListBox& rListBox,
                             const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 };
 
@@ -428,7 +428,7 @@ public:
     typedef typename ItemControlConnectionType::ControlWrapperType  ValueSetWrapperType;
     typedef typename ValueSetWrapperType::MapEntryType              MapEntryType;
 
-    explicit            ValueSetConnection( USHORT nSlot, ValueSet& rValueSet,
+    explicit            ValueSetConnection( sal_uInt16 nSlot, ValueSet& rValueSet,
                             const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 };
 
@@ -483,7 +483,7 @@ private:
 
 template< typename ItemWrpT, typename ControlWrpT >
 ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection(
-        USHORT nSlot, ControlWrpT* pNewCtrlWrp, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, ControlWrpT* pNewCtrlWrp, ItemConnFlags nFlags ) :
     ItemConnectionBase( nFlags ),
     maItemWrp( nSlot ),
     mxCtrlWrp( pNewCtrlWrp )
@@ -492,7 +492,7 @@ ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection(
 
 template< typename ItemWrpT, typename ControlWrpT >
 ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection(
-        USHORT nSlot, ControlType& rControl, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, ControlType& rControl, ItemConnFlags nFlags ) :
     ItemConnectionBase( nFlags ),
     maItemWrp( nSlot ),
     mxCtrlWrp( new ControlWrpT( rControl ) )
@@ -535,7 +535,7 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet(
         // do not rely on existence of ItemValueType::operator!=
         if( !pOldItem || !(maItemWrp.GetItemValue( *pOldItem ) == aNewValue) )
         {
-            USHORT nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() );
+            sal_uInt16 nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() );
             std::auto_ptr< ItemType > xItem(
                 static_cast< ItemType* >( maItemWrp.GetDefaultItem( rDestSet ).Clone() ) );
             xItem->SetWhich( nWhich );
@@ -555,7 +555,7 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet(
 
 template< typename ItemWrpT >
 NumericConnection< ItemWrpT >::NumericConnection(
-        USHORT nSlot, NumericField& rField, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, NumericField& rField, ItemConnFlags nFlags ) :
     ItemControlConnectionType( nSlot, rField, nFlags )
 {
 }
@@ -564,7 +564,7 @@ NumericConnection< ItemWrpT >::NumericConnection(
 
 template< typename ItemWrpT >
 MetricConnection< ItemWrpT >::MetricConnection(
-        USHORT nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) :
     ItemControlConnectionType( nSlot, new MetricFieldWrapperType( rField, eItemUnit ), nFlags )
 {
 }
@@ -573,7 +573,7 @@ MetricConnection< ItemWrpT >::MetricConnection(
 
 template< typename ItemWrpT >
 ListBoxConnection< ItemWrpT >::ListBoxConnection(
-        USHORT nSlot, ListBox& rListBox, const MapEntryType* pMap, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, ListBox& rListBox, const MapEntryType* pMap, ItemConnFlags nFlags ) :
     ItemControlConnectionType( nSlot, new ListBoxWrapperType( rListBox, pMap ), nFlags )
 {
 }
@@ -582,7 +582,7 @@ ListBoxConnection< ItemWrpT >::ListBoxConnection(
 
 template< typename ItemWrpT >
 ValueSetConnection< ItemWrpT >::ValueSetConnection(
-        USHORT nSlot, ValueSet& rValueSet, const MapEntryType* pMap, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, ValueSet& rValueSet, const MapEntryType* pMap, ItemConnFlags nFlags ) :
     ItemControlConnectionType( nSlot, new ValueSetWrapperType( rValueSet, pMap ), nFlags )
 {
 }
diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx
index 6d5cc4d3986b..939182eae12d 100644
--- a/sfx2/inc/sfx2/itemwrapper.hxx
+++ b/sfx2/inc/sfx2/itemwrapper.hxx
@@ -47,20 +47,20 @@ class SFX2_DLLPUBLIC ItemWrapperHelper
 {
 public:
     /** Returns the WID of the passed SID in the item set. */
-    static USHORT       GetWhichId( const SfxItemSet& rItemSet, USHORT nSlot );
+    static sal_uInt16       GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot );
 
     /** Returns true, if the passed item set supports the SID. */
-    static bool         IsKnownItem( const SfxItemSet& rItemSet, USHORT nSlot );
+    static bool         IsKnownItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot );
 
     /** Returns an item from an item set, if it is not in "don't know" state.
         @return  Pointer to item, or 0 if it has "don't know" state. */
-    static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, USHORT nSlot );
+    static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot );
 
     /** Returns the default item from the pool of the passed item set. */
-    static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, USHORT nSlot );
+    static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot );
 
     /** Removes an item from rDestSet, if it is default in rOldSet. */
-    static void         RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, USHORT nSlot );
+    static void         RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot );
 };
 
 // ============================================================================
@@ -102,10 +102,10 @@ public:
     typedef ValueT                              ItemValueType;
     typedef SingleItemWrapper< ItemT, ValueT >  SingleItemWrapperType;
 
-    inline explicit     SingleItemWrapper( USHORT nSlot ) : mnSlot( nSlot ) {}
+    inline explicit     SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {}
 
     /** Returns the SID this wrapper works on. */
-    inline USHORT       GetSlotId() const { return mnSlot; }
+    inline sal_uInt16       GetSlotId() const { return mnSlot; }
 
     /** Returns the item from an item set, if it is not in "don't know" state.
         @descr  Similar to ItemWrapperHelper::GetUniqueItem(), but works always
@@ -123,7 +123,7 @@ public:
     virtual void        SetItemValue( ItemT& rItem, ValueT aValue ) const = 0;
 
 private:
-    USHORT              mnSlot;     /// The SID of this item wrapper.
+    sal_uInt16              mnSlot;     /// The SID of this item wrapper.
 };
 
 // ============================================================================
@@ -142,7 +142,7 @@ template< typename ItemT, typename ValueT, typename InternalValueT = ValueT >
 class ValueItemWrapper : public SingleItemWrapper< ItemT, ValueT >
 {
 public:
-    inline explicit     ValueItemWrapper( USHORT nSlot ) :
+    inline explicit     ValueItemWrapper( sal_uInt16 nSlot ) :
                             SingleItemWrapper< ItemT, ValueT >( nSlot ) {}
 
     virtual ValueT      GetItemValue( const ItemT& rItem ) const
@@ -153,11 +153,11 @@ public:
 
 // ----------------------------------------------------------------------------
 
-typedef ValueItemWrapper< SfxBoolItem,   BOOL >          BoolItemWrapper;
-typedef ValueItemWrapper< SfxInt16Item,  INT16 >         Int16ItemWrapper;
-typedef ValueItemWrapper< SfxUInt16Item, UINT16 >        UInt16ItemWrapper;
-typedef ValueItemWrapper< SfxInt32Item,  INT32 >         Int32ItemWrapper;
-typedef ValueItemWrapper< SfxUInt32Item, UINT32 >        UInt32ItemWrapper;
+typedef ValueItemWrapper< SfxBoolItem,   sal_Bool >          BoolItemWrapper;
+typedef ValueItemWrapper< SfxInt16Item,  sal_Int16 >         Int16ItemWrapper;
+typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 >        UInt16ItemWrapper;
+typedef ValueItemWrapper< SfxInt32Item,  sal_Int32 >         Int32ItemWrapper;
+typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 >        UInt32ItemWrapper;
 typedef ValueItemWrapper< SfxStringItem, const String& > StringItemWrapper;
 
 // ============================================================================
@@ -167,7 +167,7 @@ template< typename ItemT >
 class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& >
 {
 public:
-    inline explicit     IdentItemWrapper( USHORT nSlot ) :
+    inline explicit     IdentItemWrapper( sal_uInt16 nSlot ) :
                             SingleItemWrapper< ItemT, const ItemT& >( nSlot ) {}
 
     virtual const ItemT& GetItemValue( const ItemT& rItem ) const
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx
index 7dc779e2ba6e..5a1dd1b15bd7 100644
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/sfx2/inc/sfx2/linkmgr.hxx
@@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC LinkManager
 
     SfxObjectShell *pPersist; // LinkMgr muss vor SfxObjectShell freigegeben werden
 protected:
-    BOOL        InsertLink( SvBaseLink* pLink, USHORT nObjType, USHORT nUpdateType,
+    sal_Bool        InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType,
                             const String* pName = 0 );
 public:
 
@@ -78,30 +78,30 @@ public:
     void        SetPersist( SfxObjectShell * p )   { pPersist = p; }
 
     void        Remove( SvBaseLink *pLink );
-    void        Remove( USHORT nPos, USHORT nCnt = 1 );
-    BOOL        Insert( SvBaseLink* pLink );
+    void        Remove( sal_uInt16 nPos, sal_uInt16 nCnt = 1 );
+    sal_Bool        Insert( SvBaseLink* pLink );
 
                 // den Link mit einem SvLinkSource verbinden und in die Liste eintragen
-    BOOL        InsertDDELink( SvBaseLink*,
+    sal_Bool        InsertDDELink( SvBaseLink*,
                         const String& rServer,
                         const String& rTopic,
                         const String& rItem );
 
                 // falls am Link schon alles eingestellt ist !
-    BOOL        InsertDDELink( SvBaseLink* );
+    sal_Bool        InsertDDELink( SvBaseLink* );
 
     // den Link mit einem PseudoObject verbinden und in die Liste eintragen
-    BOOL InsertFileLink( sfx2::SvBaseLink&,
-                        USHORT nFileType,
+    sal_Bool InsertFileLink( sfx2::SvBaseLink&,
+                        sal_uInt16 nFileType,
                         const String& rTxt,
                         const String* pFilterNm = 0,
                         const String* pRange = 0 );
 
             // falls am Link schon alles eingestellt ist !
-    BOOL InsertFileLink( sfx2::SvBaseLink& );
+    sal_Bool InsertFileLink( sfx2::SvBaseLink& );
 
                 // erfrage die Strings fuer den Dialog
-    BOOL GetDisplayNames( const SvBaseLink *,
+    sal_Bool GetDisplayNames( const SvBaseLink *,
                                     String* pType,
                                     String* pFile = 0,
                                     String* pLink = 0,
@@ -109,9 +109,9 @@ public:
 
     SvLinkSourceRef CreateObj( SvBaseLink* );
 
-    void        UpdateAllLinks( BOOL bAskUpdate = TRUE,
-                                BOOL bCallErrHdl = TRUE,
-                                BOOL bUpdateGrfLinks = FALSE,
+    void        UpdateAllLinks( sal_Bool bAskUpdate = sal_True,
+                                sal_Bool bCallErrHdl = sal_True,
+                                sal_Bool bUpdateGrfLinks = sal_False,
                                 Window* pParentWin = 0 );
 
                 // Liste aller Links erfragen (z.B. fuer Verknuepfungs-Dialog)
@@ -122,9 +122,9 @@ public:
                 // Liste der zu serviereden Links erfragen
     const SvLinkSources& GetServers() const { return aServerTbl; }
                 // einen zu servierenden Link eintragen/loeschen
-    BOOL        InsertServer( SvLinkSource* rObj );
+    sal_Bool        InsertServer( SvLinkSource* rObj );
     void        RemoveServer( SvLinkSource* rObj );
-    void        RemoveServer( USHORT nPos, USHORT nCnt = 1 )
+    void        RemoveServer( sal_uInt16 nPos, sal_uInt16 nCnt = 1 )
                 {   aServerTbl.Remove( nPos, nCnt ); }
 
     // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
@@ -136,11 +136,11 @@ public:
     // dann die entsprechenden Informationen als String.
     // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
     // - das braucht Informationen ueber Load/Abort/Error
-    static ULONG  RegisterStatusInfoId();
+    static sal_uIntPtr  RegisterStatusInfoId();
 
     // if the mimetype says graphic/bitmap/gdimetafile then get the
     // graphic from the Any. Return says no errors
-    static BOOL GetGraphicFromAny( const String& rMimeType,
+    static sal_Bool GetGraphicFromAny( const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue,
                                 Graphic& rGrf );
 
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index 1c538112760c..16e9af685c8e 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -75,12 +75,12 @@ public:
     virtual             ~SvLinkSource();
 
 //  SvBaseLink*         GetDataBaseLink() const;
-    BOOL                HasDataLinks( const SvBaseLink* = 0 ) const;
+    sal_Bool                HasDataLinks( const SvBaseLink* = 0 ) const;
 
     void                Closed();
 
-    ULONG               GetUpdateTimeout() const;
-    void                SetUpdateTimeout( ULONG nTime );
+    sal_uIntPtr                 GetUpdateTimeout() const;
+    void                SetUpdateTimeout( sal_uIntPtr nTime );
                         // notify the sink, the mime type is not
                         // a selection criterion
     void                DataChanged( const String & rMimeType,
@@ -88,22 +88,22 @@ public:
     void                SendDataChanged();
     void                NotifyDataChanged();
 
-    virtual BOOL        Connect( SvBaseLink* );
-    virtual BOOL        GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+    virtual sal_Bool        Connect( SvBaseLink* );
+    virtual sal_Bool        GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                                 const String & rMimeType,
-                                BOOL bSynchron = FALSE );
+                                sal_Bool bSynchron = sal_False );
 
-                        // TRUE => waitinmg for data
-    virtual BOOL        IsPending() const;
-                        // TRUE => data complete loaded
-    virtual BOOL        IsDataComplete() const;
+                        // sal_True => waitinmg for data
+    virtual sal_Bool        IsPending() const;
+                        // sal_True => data complete loaded
+    virtual sal_Bool        IsDataComplete() const;
 
     // Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog
     virtual void        Edit( Window *, SvBaseLink *, const Link& rEndEditHdl );
 
 
     void                AddDataAdvise( SvBaseLink *, const String & rMimeType,
-                                        USHORT nAdviceMode );
+                                        sal_uInt16 nAdviceMode );
     void                RemoveAllDataAdvise( SvBaseLink * );
 
     void                AddConnectAdvise( SvBaseLink * );
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index 62e49a1592e8..ffd3020fa9d0 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.hxx
@@ -85,18 +85,18 @@ private:
     SvLinkSourceRef         xObj;
     String                  aLinkName;
     BaseLink_Impl*          pImpl;
-    USHORT                  nObjType;
-    BOOL                    bVisible : 1;
-    BOOL                    bSynchron : 1;
-    BOOL                    bUseCache : 1;      // fuer GrafikLinks!
-    BOOL                    bWasLastEditOK : 1;
+    sal_uInt16                  nObjType;
+    sal_Bool                    bVisible : 1;
+    sal_Bool                    bSynchron : 1;
+    sal_Bool                    bUseCache : 1;      // fuer GrafikLinks!
+    sal_Bool                    bWasLastEditOK : 1;
 
     DECL_LINK( EndEditHdl, String* );
 
     bool                    ExecuteEdit( const String& _rNewName );
 
 protected:
-    void            SetObjType( USHORT );
+    void            SetObjType( sal_uInt16 );
 
                     // setzen des LinkSourceName ohne aktion
     void            SetName( const String & rLn );
@@ -110,10 +110,10 @@ protected:
                         m_xInputStreamToLoadFrom;
 
                     SvBaseLink();
-                    SvBaseLink( USHORT nLinkType, ULONG nContentType = FORMAT_STRING );
+                    SvBaseLink( sal_uInt16 nLinkType, sal_uIntPtr nContentType = FORMAT_STRING );
     virtual         ~SvBaseLink();
 
-    void            _GetRealObject( BOOL bConnect = TRUE );
+    void            _GetRealObject( sal_Bool bConnect = sal_True );
 
     SvLinkSource*   GetRealObject()
                     {
@@ -126,10 +126,10 @@ public:
                     TYPEINFO();
                     // ask JP
     virtual void    Closed();
-                    SvBaseLink( const String& rNm, USHORT nObjectType,
+                    SvBaseLink( const String& rNm, sal_uInt16 nObjectType,
                                  SvLinkSource* );
 
-    USHORT          GetObjType() const { return nObjType; }
+    sal_uInt16          GetObjType() const { return nObjType; }
 
     void            SetObj( SvLinkSource * pObj );
     SvLinkSource*   GetObj() const  { return xObj; }
@@ -140,30 +140,30 @@ public:
     virtual void    DataChanged( const String & rMimeType,
                                 const ::com::sun::star::uno::Any & rValue );
 
-    void            SetUpdateMode( USHORT );
-    USHORT          GetUpdateMode() const;
-    ULONG           GetContentType() const;
-    BOOL            SetContentType( ULONG nType );
+    void            SetUpdateMode( sal_uInt16 );
+    sal_uInt16          GetUpdateMode() const;
+    sal_uIntPtr             GetContentType() const;
+    sal_Bool            SetContentType( sal_uIntPtr nType );
 
     LinkManager*          GetLinkManager();
     const LinkManager*    GetLinkManager() const;
     void                    SetLinkManager( LinkManager* _pMgr );
 
-    BOOL            Update();
+    sal_Bool            Update();
     void            Disconnect();
 
     // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this
     virtual void    Edit( Window*, const Link& rEndEditHdl );
 
         // soll der Link im Dialog angezeigt werden ? (Links im Link im ...)
-    BOOL            IsVisible() const           { return bVisible; }
-    void            SetVisible( BOOL bFlag )    { bVisible = bFlag; }
+    sal_Bool            IsVisible() const           { return bVisible; }
+    void            SetVisible( sal_Bool bFlag )    { bVisible = bFlag; }
         // soll der Link synchron oder asynchron geladen werden?
-    BOOL            IsSynchron() const          { return bSynchron; }
-    void            SetSynchron( BOOL bFlag )   { bSynchron = bFlag; }
+    sal_Bool            IsSynchron() const          { return bSynchron; }
+    void            SetSynchron( sal_Bool bFlag )   { bSynchron = bFlag; }
 
-    BOOL            IsUseCache() const          { return bUseCache; }
-    void            SetUseCache( BOOL bFlag )   { bUseCache = bFlag; }
+    sal_Bool            IsUseCache() const          { return bUseCache; }
+    void            SetUseCache( sal_Bool bFlag )   { bUseCache = bFlag; }
 
     void            setStreamToLoadFrom(
                         const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,
@@ -174,7 +174,7 @@ public:
     void            clearStreamToLoadFrom();
     // <--
 
-    inline BOOL         WasLastEditOK() const       { return bWasLastEditOK; }
+    inline sal_Bool         WasLastEditOK() const       { return bWasLastEditOK; }
     FileDialogHelper*   GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const;
 };
 
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index d9d886cdfd5f..fda2e3feaf96 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -81,7 +81,7 @@ public:
 
     virtual                     ~_SfxMacroTabPage();
 
-    void                        AddEvent( const String & rEventName, USHORT nEventId );
+    void                        AddEvent( const String & rEventName, sal_uInt16 nEventId );
 
     const SvxMacroTableDtor&    GetMacroTbl() const;
     void                        SetMacroTbl( const SvxMacroTableDtor& rTbl );
@@ -96,12 +96,12 @@ public:
     FNGetMacrosOfRangeHdl       GetGetMacrosOfRangeLink() const;
 
     // --------- Erben aus der Basis -------------
-    virtual BOOL                FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool                FillItemSet( SfxItemSet& rSet );
     virtual void                Reset( const SfxItemSet& rSet );
 
-    void                        SetReadOnly( BOOL bSet );
-    BOOL                        IsReadOnly() const;
-    void                        SelectEvent( const String& rEventName, USHORT nEventId );
+    void                        SetReadOnly( sal_Bool bSet );
+    sal_Bool                        IsReadOnly() const;
+    void                        SelectEvent( const String& rEventName, sal_uInt16 nEventId );
 };
 
 inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
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/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index a63f665c1071..60375f5272c0 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -78,13 +78,13 @@ class SfxManageStyleSheetPage : public SfxTabPage
     SfxStyleFamilies *pFamilies;
     const SfxStyleFamilyItem *pItem;
     String aBuf;
-    BOOL bModified;
+    sal_Bool bModified;
 
         // initiale Daten des Styles
     String aName;
     String aFollow;
     String aParent;
-    USHORT nFlags;
+    sal_uInt16 nFlags;
 
 private:
 friend class SfxStyleDialog;
@@ -103,7 +103,7 @@ friend class SfxStyleDialog;
     static SfxTabPage*  Create(Window *pParent, const SfxItemSet &rAttrSet );
 
 protected:
-    virtual BOOL        FillItemSet(SfxItemSet &);
+    virtual sal_Bool        FillItemSet(SfxItemSet &);
     virtual void        Reset(const SfxItemSet &);
 
     using TabPage::ActivatePage;
diff --git a/sfx2/inc/sfx2/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx
index 562bca7940e2..7a00cabd307e 100644
--- a/sfx2/inc/sfx2/mieclip.hxx
+++ b/sfx2/inc/sfx2/mieclip.hxx
@@ -48,8 +48,8 @@ public:
     ~MSE40HTMLClipFormatObj();
 
 //JP 31.01.2001: old interfaces
-    SAL_DLLPRIVATE BOOL GetData( SotDataObject& );
-    SAL_DLLPRIVATE BOOL GetData( SvData& );
+    SAL_DLLPRIVATE sal_Bool GetData( SotDataObject& );
+    SAL_DLLPRIVATE sal_Bool GetData( SvData& );
 //JP 31.01.2001: the new one
     SvStream* IsValid( SvStream& );
 
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index e0a8c398b215..6ccd7e0081c4 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -47,42 +47,42 @@ class ARR\
 {\
 private:\
     T*   pData;\
-    USHORT  nUsed;\
-    BYTE    nGrow;\
-    BYTE    nUnused;\
+    sal_uInt16  nUsed;\
+    sal_uInt8   nGrow;\
+    sal_uInt8    nUnused;\
 public:\
-    ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG );\
+    ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG );\
     ARR( const ARR& rOrig );\
     ~ARR();\
 \
     ARR& operator= ( const ARR& rOrig );\
 \
-    const T& GetObject( USHORT nPos ) const; \
-    T& GetObject( USHORT nPos ); \
+    const T& GetObject( sal_uInt16 nPos ) const; \
+    T& GetObject( sal_uInt16 nPos ); \
 \
-    void Insert( USHORT nPos, ARR& rIns, USHORT nStart = 0, USHORT nEnd = USHRT_MAX );\
-    void Insert( USHORT nPos, const T& rElem );\
-    void Insert( USHORT nPos, const T& rElems, USHORT nLen );\
+    void Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart = 0, sal_uInt16 nEnd = USHRT_MAX );\
+    void Insert( sal_uInt16 nPos, const T& rElem );\
+    void Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen );\
     void Append( const T& rElem );\
 \
-    BOOL Remove( const T& rElem );\
-    USHORT Remove( USHORT nPos, USHORT nLen );\
+    sal_Bool Remove( const T& rElem );\
+    sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );\
 \
-    USHORT Count() const { return nUsed; }\
+    sal_uInt16 Count() const { return nUsed; }\
     T* operator*();\
-    const T& operator[]( USHORT nPos ) const;\
-    T& operator[]( USHORT nPos );\
+    const T& operator[]( sal_uInt16 nPos ) const;\
+    T& operator[]( sal_uInt16 nPos );\
 \
-    BOOL Contains( const T& rItem ) const;\
+    sal_Bool Contains( const T& rItem ) const;\
     void Clear() { Remove( 0, Count() ); }\
 };\
 \
-inline void ARR::Insert( USHORT nPos, ARR& rIns, USHORT nStart, USHORT nEnd )\
+inline void ARR::Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart, sal_uInt16 nEnd )\
 {\
     Insert( nPos, *(rIns.pData+(sizeof(T)*nStart)), nStart-nEnd+1 );\
 }\
 \
-inline void ARR::Insert( USHORT nPos, const T& rElem )\
+inline void ARR::Insert( sal_uInt16 nPos, const T& rElem )\
 {\
     Insert( nPos, rElem, 1 );\
 }\
@@ -91,24 +91,24 @@ inline T* ARR::operator*()\
 {\
     return ( nUsed==0 ? 0 : pData );\
 } \
-inline const T& ARR::operator[]( USHORT nPos ) const\
+inline const T& ARR::operator[]( sal_uInt16 nPos ) const\
 {\
     DBG_ASSERT( nPos < nUsed, "" ); \
     return *(pData+nPos);\
 } \
-inline T& ARR::operator [] (USHORT nPos) \
+inline T& ARR::operator [] (sal_uInt16 nPos) \
 {\
     DBG_ASSERT( nPos < nUsed, "" ); \
     return *(pData+nPos); \
 } \
-inline const T& ARR::GetObject( USHORT nPos ) const { return operator[](nPos); } \
-inline T& ARR::GetObject( USHORT nPos ) { return operator[](nPos); } \
+inline const T& ARR::GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
+inline T& ARR::GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
 
 #ifndef _lint
 // String too long
 
 #define IMPL_OBJARRAY( ARR, T ) \
-ARR::ARR( BYTE nInitSize, BYTE nGrowSize ): \
+ARR::ARR( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ): \
     nUsed(0), \
     nGrow( nGrowSize ? nGrowSize : 1 ), \
     nUnused(nInitSize) \
@@ -134,7 +134,7 @@ ARR::ARR( const ARR& rOrig ) \
         size_t nBytes = (nUsed + nUnused) * sizeof(T); \
         pData = (T*) new char [ nBytes ]; \
         memset( pData, 0, nBytes ); \
-        for ( USHORT n = 0; n < nUsed; ++n ) \
+        for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
             *(pData+n) = *(rOrig.pData+n); \
     } \
     else \
@@ -143,14 +143,14 @@ ARR::ARR( const ARR& rOrig ) \
 \
 ARR::~ARR() \
 { \
-    for ( USHORT n = 0; n < nUsed; ++n ) \
+    for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
         ( pData+n )->T::~T(); \
     delete[] (char*) pData;\
 } \
 \
 ARR& ARR::operator= ( const ARR& rOrig )\
 { \
-    for ( USHORT n = 0; n < nUsed; ++n ) \
+    for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
         ( pData+n )->T::~T(); \
     delete[] (char*) pData;\
 \
@@ -163,7 +163,7 @@ ARR& ARR::operator= ( const ARR& rOrig )\
         size_t nBytes = (nUsed + nUnused) * sizeof(T); \
         pData = (T*) new char[ nBytes ]; \
         memset( pData, 0, nBytes ); \
-        for ( USHORT n = 0; n < nUsed; ++n ) \
+        for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
             *(pData+n) = *(rOrig.pData+n); \
     } \
     else \
@@ -176,7 +176,7 @@ void ARR::Append( const T& aElem ) \
      \
     if ( nUnused == 0 ) \
     { \
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \
         size_t nBytes = nNewSize * sizeof(T); \
         T* pNewData = (T*) new char[ nBytes ]; \
         memset( pNewData, 0, nBytes ); \
@@ -185,7 +185,7 @@ void ARR::Append( const T& aElem ) \
             memcpy( pNewData, pData, nUsed * sizeof(T) ); \
             delete[] (char*) pData;\
         } \
-        nUnused = (BYTE)(nNewSize-nUsed); \
+        nUnused = (sal_uInt8)(nNewSize-nUsed); \
         pData = pNewData; \
     } \
 \
@@ -195,17 +195,17 @@ void ARR::Append( const T& aElem ) \
     --nUnused; \
 } \
 \
-USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
+sal_uInt16 ARR::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) \
 { \
     DBG_ASSERT( (nPos+nLen) < (nUsed+1), "" ); \
     DBG_ASSERT( nLen > 0, "" ); \
 \
-    nLen = Min( (USHORT)(nUsed-nPos), (USHORT)nLen ); \
+    nLen = Min( (sal_uInt16)(nUsed-nPos), (sal_uInt16)nLen ); \
 \
     if ( nLen == 0 ) \
         return 0; \
 \
-    for ( USHORT n = nPos; n < (nPos+nLen); ++n ) \
+    for ( sal_uInt16 n = nPos; n < (nPos+nLen); ++n ) \
         ( pData+n )->T::~T(); \
 \
     if ( (nUsed-nLen) == 0 ) \
@@ -219,8 +219,8 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
 \
     if ( (nUnused+nLen) >= nGrow ) \
     { \
-        USHORT nNewUsed = nUsed-nLen; \
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow; \
+        sal_uInt16 nNewUsed = nUsed-nLen; \
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow; \
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize, \
                     "shrink size computation failed" ); \
         size_t nBytes = nNewSize * sizeof(T); \
@@ -233,7 +233,7 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
         delete[] (char*) pData;\
         pData = pNewData; \
         nUsed = nNewUsed; \
-        nUnused = (BYTE)(nNewSize - nNewUsed); \
+        nUnused = (sal_uInt8)(nNewSize - nNewUsed); \
         return nLen; \
     } \
 \
@@ -243,39 +243,39 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
         memmove(pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen) * sizeof(T));\
     } \
     nUsed = nUsed - nLen; \
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen); \
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen); \
     return nLen; \
 } \
 \
-BOOL ARR::Remove( const T& aElem ) \
+sal_Bool ARR::Remove( const T& aElem ) \
 { \
     if ( nUsed == 0 ) \
-        return FALSE; \
+        return sal_False; \
 \
     const T *pIter = pData + nUsed - 1; \
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter ) \
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter ) \
         if ( *pIter == aElem ) \
         { \
             Remove(nUsed-n-1, 1); \
-            return TRUE; \
+            return sal_True; \
         } \
-    return FALSE; \
+    return sal_False; \
 } \
 \
-BOOL ARR::Contains( const T& rItem ) const \
+sal_Bool ARR::Contains( const T& rItem ) const \
 { \
     if ( !nUsed ) \
-        return FALSE; \
-    for ( USHORT n = 0; n < nUsed; ++n ) \
+        return sal_False; \
+    for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
     { \
         const T& r2ndItem = GetObject(n); \
         if ( r2ndItem == rItem ) \
-            return TRUE; \
+            return sal_True; \
     } \
-    return FALSE; \
+    return sal_False; \
 } \
 \
-void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
+void ARR::Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen ) \
 { \
     DBG_ASSERT( nPos <= nUsed, "" ); \
      \
@@ -283,7 +283,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
     { \
         \
         /* auf die naechste Grow-Grenze aufgerundet vergroeszern */ \
-        USHORT nNewSize; \
+        sal_uInt16 nNewSize; \
         for ( nNewSize = nUsed+nGrow; nNewSize < (nUsed + nLen); ++nNewSize ) \
             /* empty loop */; \
         size_t nBytes = nNewSize * sizeof(T); \
@@ -296,7 +296,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
             memcpy( pNewData, pData, nUsed * sizeof(T) ); \
             delete (char*) pData;\
         } \
-        nUnused = (BYTE)(nNewSize-nUsed); \
+        nUnused = (sal_uInt8)(nNewSize-nUsed); \
         pData = pNewData; \
     } \
 \
@@ -308,7 +308,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
 \
     memmove(pData+nPos, &rElems, sizeof(T) * nLen); \
     nUsed = nUsed + nLen; \
-    nUnused = sal::static_int_cast< BYTE >(nUnused - nLen); \
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused - nLen); \
 }
 
 // _lint
@@ -318,26 +318,26 @@ class SFX2_DLLPUBLIC SfxPtrArr
 {
 private:
     void** pData;
-    USHORT nUsed;
-    BYTE nGrow;
-    BYTE nUnused;
+    sal_uInt16 nUsed;
+    sal_uInt8 nGrow;
+    sal_uInt8 nUnused;
 public:
-    SfxPtrArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 );
+    SfxPtrArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
     SfxPtrArr( const SfxPtrArr& rOrig );
     ~SfxPtrArr();
     SfxPtrArr& operator= ( const SfxPtrArr& rOrig );
-    void* GetObject( USHORT nPos ) const { return operator[](nPos); }
-    void*& GetObject( USHORT nPos ) { return operator[](nPos); }
-    void Insert( USHORT nPos, void* rElem );
+    void* GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
+    void*& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
+    void Insert( sal_uInt16 nPos, void* rElem );
     void Append( void* rElem );
-    BOOL Replace( void* pOldElem, void* pNewElem );
-    BOOL Remove( void* rElem );
-    USHORT Remove( USHORT nPos, USHORT nLen );
-    USHORT Count() const { return nUsed; }
+    sal_Bool Replace( void* pOldElem, void* pNewElem );
+    sal_Bool Remove( void* rElem );
+    sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
+    sal_uInt16 Count() const { return nUsed; }
     inline void** operator*();
-    inline void* operator[]( USHORT nPos ) const;
-    inline void*& operator[]( USHORT nPos );
-    BOOL Contains( const void* rItem ) const;
+    inline void* operator[]( sal_uInt16 nPos ) const;
+    inline void*& operator[]( sal_uInt16 nPos );
+    sal_Bool Contains( const void* rItem ) const;
     void Clear() { Remove( 0, Count() ); }
 };
 
@@ -346,13 +346,13 @@ inline void** SfxPtrArr::operator*()
     return ( nUsed==0 ? 0 : pData );
 }
 
-inline void* SfxPtrArr::operator[]( USHORT nPos ) const
+inline void* SfxPtrArr::operator[]( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < nUsed, "" );
     return *(pData+nPos);
 }
 
-inline void*& SfxPtrArr::operator [] (USHORT nPos)
+inline void*& SfxPtrArr::operator [] (sal_uInt16 nPos)
 {
     DBG_ASSERT( nPos < nUsed, "" );
     return *(pData+nPos);
@@ -363,35 +363,35 @@ inline void*& SfxPtrArr::operator [] (USHORT nPos)
 class ARR: public SfxPtrArr\
 {\
 public:\
-   ARR( BYTE nIni=nI, BYTE nGrowValue=nG ):\
+   ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\
        SfxPtrArr(nIni,nGrowValue) \
    {}\
    ARR( const ARR& rOrig ):\
        SfxPtrArr(rOrig) \
    {}\
-   T GetObject( USHORT nPos ) const { return operator[](nPos); } \
-   T& GetObject( USHORT nPos ) { return operator[](nPos); } \
-   void Insert( USHORT nPos, T aElement ) {\
+   T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
+   T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
+   void Insert( sal_uInt16 nPos, T aElement ) {\
        SfxPtrArr::Insert(nPos,(void *)aElement);\
    }\
    void Append( T aElement ) {\
        SfxPtrArr::Append((void *)aElement);\
    }\
-   BOOL Replace( T aOldElem, T aNewElem ) {\
+   sal_Bool Replace( T aOldElem, T aNewElem ) {\
        return SfxPtrArr::Replace((void *)aOldElem, (void*) aNewElem);\
    }\
    void Remove( T aElement ) {\
        SfxPtrArr::Remove((void*)aElement);\
    }\
-   void Remove( USHORT nPos, USHORT nLen = 1 ) {\
+   void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
        SfxPtrArr::Remove( nPos, nLen ); \
    }\
    T* operator *() {\
        return (T*) SfxPtrArr::operator*();\
    }\
-   T operator[]( USHORT nPos ) const { \
+   T operator[]( sal_uInt16 nPos ) const { \
        return (T) SfxPtrArr::operator[](nPos); } \
-   T& operator[]( USHORT nPos ) { \
+   T& operator[]( sal_uInt16 nPos ) { \
        return (T&) SfxPtrArr::operator[](nPos); } \
    void Clear() { Remove( 0, Count() ); }\
 };
@@ -400,25 +400,25 @@ class ByteArr
 {
 private:
     char* pData;
-    USHORT nUsed;
-    BYTE nGrow;
-    BYTE nUnused;
+    sal_uInt16 nUsed;
+    sal_uInt8 nGrow;
+    sal_uInt8 nUnused;
 public:
-    ByteArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 );
+    ByteArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
     ByteArr( const ByteArr& rOrig );
     ~ByteArr();
     ByteArr& operator= ( const ByteArr& rOrig );
-    char GetObject( USHORT nPos ) const { return operator[](nPos); }
-    char& GetObject( USHORT nPos ) { return operator[](nPos); }
-    void Insert( USHORT nPos, char rElem );
+    char GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
+    char& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
+    void Insert( sal_uInt16 nPos, char rElem );
     void Append( char rElem );
-    BOOL Remove( char rElem );
-    USHORT Remove( USHORT nPos, USHORT nLen );
-    USHORT Count() const { return nUsed; }
+    sal_Bool Remove( char rElem );
+    sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
+    sal_uInt16 Count() const { return nUsed; }
     char* operator*();
-    char operator[]( USHORT nPos ) const;
-    char& operator[]( USHORT nPos );
-    BOOL Contains( const char rItem ) const;
+    char operator[]( sal_uInt16 nPos ) const;
+    char& operator[]( sal_uInt16 nPos );
+    sal_Bool Contains( const char rItem ) const;
     void Clear() { Remove( 0, Count() ); }
 };
 
@@ -431,15 +431,15 @@ inline char* ByteArr::operator*()
 class ARR: public ByteArr\
 {\
 public:\
-        ARR( BYTE nIni=nI, BYTE nGrow=nG ):\
+        ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrow=nG ):\
             ByteArr(nIni,nGrow) \
         {}\
         ARR( const ARR& rOrig ):\
             ByteArr(rOrig) \
         {}\
-        T GetObject( USHORT nPos ) const { return operator[](nPos); } \
-        T& GetObject( USHORT nPos ) { return operator[](nPos); } \
-        void Insert( USHORT nPos, T aElement ) {\
+        T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
+        T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
+        void Insert( sal_uInt16 nPos, T aElement ) {\
             ByteArr::Insert(nPos,(char)aElement);\
         }\
         void Append( T aElement ) {\
@@ -448,15 +448,15 @@ public:\
         void Remove( T aElement ) {\
             ByteArr::Remove((char)aElement);\
         }\
-        void Remove( USHORT nPos, USHORT nLen = 1 ) {\
+        void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
             ByteArr::Remove( nPos, nLen ); \
         }\
         T* operator *() {\
             return (T*) ByteArr::operator*();\
         }\
-        T operator[]( USHORT nPos ) const { \
+        T operator[]( sal_uInt16 nPos ) const { \
             return (T) ByteArr::operator[](nPos); } \
-        T& operator[]( USHORT nPos ) { \
+        T& operator[]( sal_uInt16 nPos ) { \
             return (T&) ByteArr::operator[](nPos); } \
         void Clear() { Remove( 0, Count() ); }\
 };
@@ -465,25 +465,25 @@ class WordArr
 {
 private:
     short* pData;
-    USHORT nUsed;
-    BYTE nGrow;
-    BYTE nUnused;
+    sal_uInt16 nUsed;
+    sal_uInt8 nGrow;
+    sal_uInt8 nUnused;
 public:
-    WordArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 );
+    WordArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
     WordArr( const WordArr& rOrig );
     ~WordArr();
     WordArr& operator= ( const WordArr& rOrig );
-    short GetObject( USHORT nPos ) const { return operator[](nPos); }
-    short& GetObject( USHORT nPos ) { return operator[](nPos); }
-    void Insert( USHORT nPos, short rElem );
+    short GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
+    short& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
+    void Insert( sal_uInt16 nPos, short rElem );
     void Append( short rElem );
-    BOOL Remove( short rElem );
-    USHORT Remove( USHORT nPos, USHORT nLen );
-    USHORT Count() const { return nUsed; }
+    sal_Bool Remove( short rElem );
+    sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
+    sal_uInt16 Count() const { return nUsed; }
     short* operator*();
-    short operator[]( USHORT nPos ) const;
-    short& operator[]( USHORT nPos );
-    BOOL Contains( const short rItem ) const;
+    short operator[]( sal_uInt16 nPos ) const;
+    short& operator[]( sal_uInt16 nPos );
+    sal_Bool Contains( const short rItem ) const;
     void Clear() { Remove( 0, Count() ); }
 };
 
@@ -496,15 +496,15 @@ inline short* WordArr::operator*()
 class ARR: public WordArr\
 {\
 public:\
-        ARR( BYTE nIni=nI, BYTE nGrowValue=nG ):\
+        ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\
             WordArr(nIni,nGrowValue) \
         {}\
         ARR( const ARR& rOrig ):\
             WordArr(rOrig) \
         {}\
-        T GetObject( USHORT nPos ) const { return operator[](nPos); } \
-        T& GetObject( USHORT nPos ) { return operator[](nPos); } \
-        void Insert( USHORT nPos, T aElement ) {\
+        T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
+        T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
+        void Insert( sal_uInt16 nPos, T aElement ) {\
             WordArr::Insert(nPos,(short)aElement);\
         }\
         void Append( T aElement ) {\
@@ -513,15 +513,15 @@ public:\
         void Remove( T aElement ) {\
             WordArr::Remove((short)aElement);\
         }\
-        void Remove( USHORT nPos, USHORT nLen = 1 ) {\
+        void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
             WordArr::Remove( nPos, nLen ); \
         }\
         T* operator *() {\
             return (T*) WordArr::operator*();\
         }\
-        T operator[]( USHORT nPos ) const { \
+        T operator[]( sal_uInt16 nPos ) const { \
             return (T) WordArr::operator[](nPos); } \
-        T& operator[]( USHORT nPos ) { \
+        T& operator[]( sal_uInt16 nPos ) { \
             return (T&) WordArr::operator[](nPos); } \
         void Clear() { Remove( 0, Count() ); }\
 };
diff --git a/sfx2/inc/sfx2/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx
index 29edf6b3e8cb..bdeeaaaba6c8 100644
--- a/sfx2/inc/sfx2/minfitem.hxx
+++ b/sfx2/inc/sfx2/minfitem.hxx
@@ -43,7 +43,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
 
 public:
     TYPEINFO();
-    SfxMacroInfoItem( USHORT nWhich,
+    SfxMacroInfoItem( sal_uInt16 nWhich,
                     const BasicManager* pMgr,
                     const String &rLibName,
                     const String &rModuleName,
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
index c5f2f84da1d5..6b92205a7694 100644
--- a/sfx2/inc/sfx2/minstack.hxx
+++ b/sfx2/inc/sfx2/minstack.hxx
@@ -35,7 +35,7 @@ DECL_OBJARRAY( ARR##arr_, T, nI, nG ); \
 class ARR: private ARR##arr_ \
 { \
 public: \
-    ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG ): \
+    ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \
         ARR##arr_( nInitSize, nGrowSize ) \
     {} \
 \
@@ -43,14 +43,14 @@ public: \
         ARR##arr_( rOrig ) \
     {} \
 \
-    USHORT      Count() const { return ARR##arr_::Count(); } \
+    sal_uInt16      Count() const { return ARR##arr_::Count(); } \
     void        Push( const T& rElem ) { Append( rElem ); } \
-    const T& Top( USHORT nLevel = 0 ) const \
+    const T& Top( sal_uInt16 nLevel = 0 ) const \
                 { return (*this)[Count()-nLevel-1]; } \
     const T& Bottom() const { return (*this)[0]; } \
     T        Pop(); \
     void        Clear() { ARR##arr_::Clear(); } \
-    BOOL        Contains( const T& rItem ) const \
+    sal_Bool        Contains( const T& rItem ) const \
                 { return ARR##arr_::Contains( rItem ); } \
 }
 
@@ -68,7 +68,7 @@ DECL_PTRARRAY( ARR##arr_, T, nI, nG ) \
 class ARR: private ARR##arr_ \
 { \
 public: \
-    ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG ): \
+    ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \
         ARR##arr_( nInitSize, nGrowSize ) \
     {} \
 \
@@ -76,11 +76,11 @@ public: \
         ARR##arr_( rOrig ) \
     {} \
 \
-    USHORT      Count() const { return ARR##arr_::Count(); } \
+    sal_uInt16      Count() const { return ARR##arr_::Count(); } \
     void        Push( T rElem ) { Append( rElem ); } \
-    BOOL        Replace( T rOldElem, T rNewElem ) \
+    sal_Bool        Replace( T rOldElem, T rNewElem ) \
                 { return ARR##arr_::Replace( rOldElem, rNewElem ); } \
-    T           Top( USHORT nLevel = 0 ) const \
+    T           Top( sal_uInt16 nLevel = 0 ) const \
                 { return (*this)[Count()-nLevel-1]; } \
     T           Bottom() const { return (*this)[0]; } \
     T           Pop() \
@@ -91,7 +91,7 @@ public: \
     T*       operator*() \
                 { return &(*this)[Count()-1]; } \
     void        Clear() { ARR##arr_::Clear(); } \
-    BOOL        Contains( const T pItem ) const \
+    sal_Bool        Contains( const T pItem ) const \
                 { return ARR##arr_::Contains( pItem ); } \
 }
 
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index fe7d8bb36b1e..669f579a254c 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -50,24 +50,24 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
     String                  aHelpText;
     SfxVirtualMenu*         pOwnMenu;
     SfxVirtualMenu*         pSubMenu;
-    BOOL                    b_ShowStrings;
-    BOOL                    b_UnusedDummy;
+    sal_Bool                    b_ShowStrings;
+    sal_Bool                    b_UnusedDummy;
 
 public:
                             SfxMenuControl();
-                            SfxMenuControl( BOOL bShowStrings );
-                            SfxMenuControl( USHORT, SfxBindings&);
+                            SfxMenuControl( sal_Bool bShowStrings );
+                            SfxMenuControl( sal_uInt16, SfxBindings&);
 
-    static SfxMenuControl*  CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings );
-    static void             RegisterControl( USHORT nSlotId = 0, SfxModule *pMod=NULL );
+    static SfxMenuControl*  CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
+    static void             RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL );
 
                             ~SfxMenuControl();
 
         using SfxControllerItem::Bind;
-    void                    Bind( SfxVirtualMenu* pOwnMenu, USHORT nId,
+    void                    Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId,
                                   const String& rTitle, const String &rHelpText,
                                   SfxBindings & );
-    void                    Bind( SfxVirtualMenu* pOwnMenu, USHORT nId,
+    void                    Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId,
                                   SfxVirtualMenu& rSubMenu,
                                   const String& rTitle, const String &rHelpText,
                                   SfxBindings & );
@@ -84,13 +84,13 @@ public:
     const String&           GetHelpText() const { return aHelpText; }
     void                    SetHelpText(const String &rStr) { aHelpText  = rStr; }
 
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                           const SfxPoolItem* pState );
 
-    static SfxMenuControl*    CreateControl( USHORT nId, Menu &, SfxBindings & );
-    static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, SfxBindings&, SfxVirtualMenu* );
-    static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, const String& sItemText, const String& sHelpText, SfxBindings&, SfxVirtualMenu* );
-    static BOOL             IsSpecialControl( USHORT nId, SfxModule* );
+    static SfxMenuControl*    CreateControl( sal_uInt16 nId, Menu &, SfxBindings & );
+    static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* );
+    static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, const String& sHelpText, SfxBindings&, SfxVirtualMenu* );
+    static sal_Bool             IsSpecialControl( sal_uInt16 nId, SfxModule* );
     static void             RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*);
 
 };
@@ -99,9 +99,9 @@ class SfxUnoMenuControl : public SfxMenuControl
 {
     SfxUnoControllerItem*   pUnoCtrl;
 public:
-                            SfxUnoMenuControl( const String&, USHORT nId, Menu&,
+                            SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
                                                 SfxBindings&, SfxVirtualMenu* );
-                            SfxUnoMenuControl( const String&, USHORT nId, Menu&,
+                            SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
                                                const String&, const String&,
                                                 SfxBindings&, SfxVirtualMenu* );
                             ~SfxUnoMenuControl();
@@ -110,16 +110,16 @@ public:
 
 //--------------------------------------------------------------------
 
-typedef SfxMenuControl* (*SfxMenuControlCtor)( USHORT nId, Menu &, SfxBindings & );
+typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & );
 
 struct SfxMenuCtrlFactory
 {
     SfxMenuControlCtor  pCtor;
     TypeId              nTypeId;
-    USHORT              nSlotId;
+    sal_uInt16              nSlotId;
 
     SfxMenuCtrlFactory( SfxMenuControlCtor pTheCtor,
-            TypeId nTheTypeId, USHORT nTheSlotId ):
+            TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
         pCtor(pTheCtor),
         nTypeId(nTheTypeId),
         nSlotId(nTheSlotId)
@@ -143,13 +143,13 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
 //--------------------------------------------------------------------
 
 #define SFX_DECL_MENU_CONTROL() \
-        static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); \
-        static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
+        static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); \
+        static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
 
 #define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \
-        SfxMenuControl* __EXPORT Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \
+        SfxMenuControl* __EXPORT Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \
                { return new Class(nId, rMenu, rBindings); } \
-        void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
+        void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
                { SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
                     Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
 
@@ -158,16 +158,16 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
 class SfxAppMenuControl_Impl : public SfxMenuControl
 {
     PopupMenu*  pMenu;
-    ULONG       m_nSymbolsStyle;
-    BOOL        m_bWasHiContrastMode;
-    BOOL        m_bShowMenuImages;
+    sal_uIntPtr       m_nSymbolsStyle;
+    sal_Bool        m_bWasHiContrastMode;
+    sal_Bool        m_bShowMenuImages;
 
 protected:
     DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
 
 public:
     SFX_DECL_MENU_CONTROL();
-    SfxAppMenuControl_Impl( USHORT nPos, Menu& rMenu, SfxBindings& rBindings );
+    SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
     ~SfxAppMenuControl_Impl();
 };
 
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index f5cc509dbf0a..d54dafd6e0b2 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -60,11 +60,11 @@ friend class SfxPopupMenuManager;
 
     SfxVirtualMenu*         pMenu;          // das eigentliche Menu
     SfxVirtualMenu*         pOldMenu;       // only while reconfiguring
-    BOOL                    bMenuBar;       // Popup oder MenuBar
+    sal_Bool                    bMenuBar;       // Popup oder MenuBar
     SfxBindings*            pBindings;
     ResMgr*                 pResMgr;
     sal_uInt32              nType;
-    BOOL                    bAddClipboardFuncs : 1;
+    sal_Bool                    bAddClipboardFuncs : 1;
 
     void                    Construct( SfxVirtualMenu& rMenu );
 
@@ -72,7 +72,7 @@ protected:
                             SfxMenuManager( Menu*, SfxBindings& );
                             SfxMenuManager( const ResId&, SfxBindings& );
                             ~SfxMenuManager();
-    USHORT                  GetItemPos( USHORT nId );
+    sal_uInt16                  GetItemPos( sal_uInt16 nId );
     sal_uInt32              GetType() { return nType; }
 public:
 
@@ -87,10 +87,10 @@ public:
     const SfxBindings&      GetBindings() const { return *pBindings; }
     void                    SetResMgr(ResMgr* pMgr)  {pResMgr = pMgr; }
     ResMgr*                 GetResMgr() const { return pResMgr; }
-    void                    SetPopupMenu( USHORT nId, PopupMenu *pMenu );
+    void                    SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu );
 
 //#if 0 // _SOLAR__PRIVATE
-    void            Construct_Impl( Menu* pMenu, BOOL bWithHelp );
+    void            Construct_Impl( Menu* pMenu, sal_Bool bWithHelp );
 //#endif
 };
 
@@ -122,9 +122,9 @@ public:
     // Please contact cd@openoffice.org if you have questions or need help
     static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow );
 
-    USHORT              Execute( const Point& rPos, Window *pWindow );
-    USHORT              Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 );
-    USHORT              Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... );
+    sal_uInt16              Execute( const Point& rPos, Window *pWindow );
+    sal_uInt16              Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 );
+    sal_uInt16              Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... );
 
     // @deprecated (start)!!
     // Don't use these methods any longer. The whole class will be removed in the future.
@@ -132,11 +132,11 @@ public:
     // Please contact cd@openoffice.org if you have questions or need help
     void                StartInsert();
     void                EndInsert();
-    void                CheckItem( USHORT, BOOL );
-    void                RemoveItem( USHORT );
-    void                InsertItem( USHORT, const String&, MenuItemBits, const rtl::OString& rHelpId,
-                                USHORT nPos = MENU_APPEND );
-    void                InsertSeparator( USHORT nPos = MENU_APPEND );
+    void                CheckItem( sal_uInt16, sal_Bool );
+    void                RemoveItem( sal_uInt16 );
+    void                InsertItem( sal_uInt16, const String&, MenuItemBits, const rtl::OString& rHelpId,
+                                sal_uInt16 nPos = MENU_APPEND );
+    void                InsertSeparator( sal_uInt16 nPos = MENU_APPEND );
     // @deprecated (end)
 
     void                RemoveDisabledEntries();
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 3cf84cf6139e..f944b29c18da 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -90,10 +90,10 @@ public:
     virtual SfxTabPage*         CreateTabPage( sal_uInt16 nId,
                                                Window* pParent,
                                                const SfxItemSet& rSet );
-    virtual void                Invalidate(USHORT nId = 0);
-    BOOL                        IsActive() const;
+    virtual void                Invalidate(sal_uInt16 nId = 0);
+    sal_Bool                        IsActive() const;
 
-    /*virtual*/ bool            IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const;
+    /*virtual*/ bool            IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const;
 
     static SfxModule*           GetActiveModule( SfxViewFrame* pFrame=NULL );
     static FieldUnit            GetCurrentFieldUnit();
@@ -106,8 +106,8 @@ public:
     SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;
     SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
     SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
-    SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig );
-    SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig, BOOL bHiContrast );
+    SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig );
+    SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig, sal_Bool bHiContrast );
 //#endif
 };
 
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index 10fbd222a2ed..a69fd108ccea 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -111,14 +111,14 @@ enum SfxSlotKind
 
 struct SfxTypeAttrib
 {
-    USHORT                  nAID;
+    sal_uInt16                  nAID;
     const char __FAR_DATA*  pName;
 };
 
 struct SfxType
 {
     TypeId          aTypeId;
-    USHORT          nAttribs;
+    sal_uInt16          nAttribs;
     SfxTypeAttrib   aAttrib[16];
 
     const TypeId&   Type() const
@@ -130,7 +130,7 @@ struct SfxType
 struct SfxType0
 {
     TypeId          aTypeId;
-    USHORT          nAttribs;
+    sal_uInt16          nAttribs;
 
     const TypeId&   Type() const
                     { return aTypeId; }
@@ -141,7 +141,7 @@ struct SfxType0
 #define SFX_DECL_TYPE(n)    struct SfxType##n                   \
                             {                                   \
                                 TypeId          aTypeId;        \
-                                USHORT          nAttribs;       \
+                                sal_uInt16          nAttribs;       \
                                 SfxTypeAttrib   aAttrib[n];     \
                             }
 
@@ -240,7 +240,7 @@ struct SfxFormalArgument
 {
     const SfxType*          pType;  // Typ des Parameters (SfxPoolItem Subklasse)
     const char __FAR_DATA*  pName;  // Name des Parameters
-    USHORT                  nSlotId;// Slot-Id zur Identifikation des Parameters
+    sal_uInt16                  nSlotId;// Slot-Id zur Identifikation des Parameters
 
     const TypeId&           Type() const
                             { return pType->aTypeId; }
@@ -253,13 +253,13 @@ struct SfxFormalArgument
 class SfxSlot
 {
 public:
-    USHORT                      nSlotId;        // in Shell eindeutige Slot-Id
-    USHORT                      nGroupId;       // f"ur Konfigurations-Bereich
-    ULONG                       nHelpId;        // i.d.R. == nSlotId
-    ULONG                       nFlags;         // artihm. veroderte Flags
+    sal_uInt16                      nSlotId;        // in Shell eindeutige Slot-Id
+    sal_uInt16                      nGroupId;       // f"ur Konfigurations-Bereich
+    sal_uIntPtr                     nHelpId;        // i.d.R. == nSlotId
+    sal_uIntPtr                     nFlags;         // artihm. veroderte Flags
 
-    USHORT                      nMasterSlotId;  // Enum-Slot bzw. Which-Id
-    USHORT                      nValue;         // Wert, falls Enum-Slot
+    sal_uInt16                      nMasterSlotId;  // Enum-Slot bzw. Which-Id
+    sal_uInt16                      nValue;         // Wert, falls Enum-Slot
 
     SfxExecFunc                 fnExec;         // Funktion zum Ausf"uhren
     SfxStateFunc                fnState;        // Funktion f"ur Status
@@ -272,7 +272,7 @@ public:
     const SfxSlot*              pNextSlot;      // mit derselben Status-Methode
 
     const SfxFormalArgument*    pFirstArgDef;   // erste formale Argument-Definition
-    USHORT                      nArgDefCount;   // Anzahl der formalen Argumente
+    sal_uInt16                      nArgDefCount;   // Anzahl der formalen Argumente
     long                        nDisableFlags;      // DisableFlags, die vorhanden sein
                                                 // m"ussen, damit der Slot enabled ist
     const char __FAR_DATA*      pUnoName;       // UnoName des Slots
@@ -280,21 +280,21 @@ public:
 public:
 
     SfxSlotKind     GetKind() const;
-    USHORT          GetSlotId() const;
-    ULONG           GetHelpId() const;
-    ULONG           GetMode() const;
-    BOOL            IsMode( ULONG nMode ) const;
-    USHORT          GetGroupId() const;
-    USHORT          GetMasterSlotId() const { return nMasterSlotId; }
-    USHORT          GetWhich( const SfxItemPool &rPool ) const;
-    USHORT          GetValue() const { return nValue; }
+    sal_uInt16          GetSlotId() const;
+    sal_uIntPtr         GetHelpId() const;
+    sal_uIntPtr         GetMode() const;
+    sal_Bool            IsMode( sal_uIntPtr nMode ) const;
+    sal_uInt16          GetGroupId() const;
+    sal_uInt16          GetMasterSlotId() const { return nMasterSlotId; }
+    sal_uInt16          GetWhich( const SfxItemPool &rPool ) const;
+    sal_uInt16          GetValue() const { return nValue; }
     const SfxType*  GetType() const { return pType; }
     const char*     GetUnoName() const { return pUnoName; }
     SFX2_DLLPUBLIC rtl::OString    GetCommand() const;
     SFX2_DLLPUBLIC rtl::OUString    GetCommandString() const;
 
-    USHORT          GetFormalArgumentCount() const { return nArgDefCount; }
-    const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const
+    sal_uInt16          GetFormalArgumentCount() const { return nArgDefCount; }
+    const SfxFormalArgument& GetFormalArgument( sal_uInt16 nNo ) const
                     { return pFirstArgDef[nNo]; }
 
     SfxExecFunc     GetExecFnc() const { return fnExec; }
@@ -308,14 +308,14 @@ public:
 
 // returns the id of the function
 
-inline USHORT SfxSlot::GetSlotId() const
+inline sal_uInt16 SfxSlot::GetSlotId() const
 {
     return nSlotId;
 }
 //--------------------------------------------------------------------
 // returns the help-id of the slot
 
-inline ULONG SfxSlot::GetHelpId() const
+inline sal_uIntPtr SfxSlot::GetHelpId() const
 {
     return nHelpId;
 }
@@ -324,7 +324,7 @@ inline ULONG SfxSlot::GetHelpId() const
 
 // returns  a bitfield with flags
 
-inline ULONG SfxSlot::GetMode() const
+inline sal_uIntPtr SfxSlot::GetMode() const
 {
     return nFlags;
 }
@@ -332,7 +332,7 @@ inline ULONG SfxSlot::GetMode() const
 
 // determines if the specified mode is assigned
 
-inline BOOL SfxSlot::IsMode( ULONG nMode ) const
+inline sal_Bool SfxSlot::IsMode( sal_uIntPtr nMode ) const
 {
     return (nFlags & nMode) != 0;
 }
@@ -340,7 +340,7 @@ inline BOOL SfxSlot::IsMode( ULONG nMode ) const
 
 // returns the id of the associated group
 
-inline USHORT SfxSlot::GetGroupId() const
+inline sal_uInt16 SfxSlot::GetGroupId() const
 {
     return nGroupId;
 
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 717aa00c7875..2bda4f36a59d 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -51,13 +51,13 @@ class SFX2_DLLPUBLIC SfxSlotPool
     SfxSlotPool*                _pParentPool;
     ResMgr*                     _pResMgr;
     SfxInterfaceArr_Impl*       _pInterfaces;
-    USHORT                      _nCurGroup;
-    USHORT                      _nCurInterface;
-    USHORT                      _nCurMsg;
+    sal_uInt16                      _nCurGroup;
+    sal_uInt16                      _nCurInterface;
+    sal_uInt16                      _nCurMsg;
     SfxSlotArr_Impl*            _pUnoSlots;
 
 private:
-    const SfxSlot* SeekSlot( USHORT nObject );
+    const SfxSlot* SeekSlot( sal_uInt16 nObject );
 
 public:
                         SfxSlotPool( SfxSlotPool* pParent=0, ResMgr* pMgr=0);
@@ -70,14 +70,14 @@ public:
 
     static SfxSlotPool& GetSlotPool( SfxViewFrame *pFrame=NULL );
 
-    USHORT              GetGroupCount();
-    String              SeekGroup( USHORT nNo );
+    sal_uInt16              GetGroupCount();
+    String              SeekGroup( sal_uInt16 nNo );
     const SfxSlot*      FirstSlot();
     const SfxSlot*      NextSlot();
-    const SfxSlot*      GetSlot( USHORT nId );
-    const SfxSlot*      GetUnoSlot( USHORT nId );
+    const SfxSlot*      GetSlot( sal_uInt16 nId );
+    const SfxSlot*      GetUnoSlot( sal_uInt16 nId );
     const SfxSlot*      GetUnoSlot( const String& rUnoName );
-    TypeId              GetSlotType( USHORT nSlotId ) const;
+    TypeId              GetSlotType( sal_uInt16 nSlotId ) const;
 };
 
 //--------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/navigat.hxx b/sfx2/inc/sfx2/navigat.hxx
index a3f525ccd754..2958f92ca0d3 100644
--- a/sfx2/inc/sfx2/navigat.hxx
+++ b/sfx2/inc/sfx2/navigat.hxx
@@ -38,7 +38,7 @@ class SfxNavigatorWrapper : public SfxChildWindow
 
 public:
                         SfxNavigatorWrapper( Window* pParent ,
-                                                USHORT nId ,
+                                                sal_uInt16 nId ,
                                                 SfxBindings* pBindings ,
                                                 SfxChildWinInfo* pInfo );
 
@@ -57,7 +57,7 @@ public:
 
     virtual void        Resize();
     virtual void        Resizing( Size& rSize );
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index 1647f880500d..e6bfe590431e 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -93,20 +93,20 @@ private:
 
 public:
 
-    SfxNewFileDialog(Window *pParent, USHORT nFlags = 0);
+    SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0);
     ~SfxNewFileDialog();
 
-        // Liefert FALSE, wenn '- Keine -' als Vorlage eingestellt ist
-        // Nur wenn IsTemplate() TRUE liefert, koennen Vorlagennamen
+        // Liefert sal_False, wenn '- Keine -' als Vorlage eingestellt ist
+        // Nur wenn IsTemplate() sal_True liefert, koennen Vorlagennamen
         // erfragt werden
-    BOOL IsTemplate() const;
+    sal_Bool IsTemplate() const;
     String GetTemplateRegion() const;
     String GetTemplateName() const;
     String GetTemplateFileName() const;
 
     // load template methods
-    USHORT  GetTemplateFlags()const;
-    void    SetTemplateFlags(USHORT nSet);
+    sal_uInt16  GetTemplateFlags()const;
+    void    SetTemplateFlags(sal_uInt16 nSet);
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index c7710f533935..4294a93a454c 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -55,27 +55,27 @@ friend class SfxSlotPool;
     const char*             pName;          // Sfx-internal name of interface
     const SfxInterface*     pGenoType;      // base interface
     SfxSlot*                pSlots;         // SlotMap
-    USHORT                  nCount;         // number of slots in SlotMap
+    sal_uInt16                  nCount;         // number of slots in SlotMap
     SfxInterfaceId          nClassId;       // Id of interface
     ResId                   aNameResId;     // ResId of external interface name
     SfxInterface_Impl*      pImpData;
 
-    SfxSlot*                operator[]( USHORT nPos ) const;
+    SfxSlot*                operator[]( sal_uInt16 nPos ) const;
 
 public:
                             SfxInterface( const char *pClass,
                                           const ResId& rResId,
                                           SfxInterfaceId nClassId,
                                           const SfxInterface* pGeno,
-                                          SfxSlot &rMessages, USHORT nMsgCount );
+                                          SfxSlot &rMessages, sal_uInt16 nMsgCount );
     virtual                 ~SfxInterface();
 
-    void                    SetSlotMap( SfxSlot& rMessages, USHORT nMsgCount );
-    inline USHORT           Count() const;
+    void                    SetSlotMap( SfxSlot& rMessages, sal_uInt16 nMsgCount );
+    inline sal_uInt16           Count() const;
 
     const SfxSlot*          GetRealSlot( const SfxSlot * ) const;
-    const SfxSlot*          GetRealSlot( USHORT nSlotId ) const;
-    virtual const SfxSlot*  GetSlot( USHORT nSlotId ) const;
+    const SfxSlot*          GetRealSlot( sal_uInt16 nSlotId ) const;
+    virtual const SfxSlot*  GetSlot( sal_uInt16 nSlotId ) const;
     const SfxSlot*          GetSlot( const String& rCommand ) const;
 
     const char*             GetClassName() const { return pName; }
@@ -88,21 +88,21 @@ public:
     const SfxInterface*     GetGenoType() const { return pGenoType; }
     const SfxInterface*     GetRealInterfaceForSlot( const SfxSlot* ) const;
 
-    void                    RegisterObjectBar( USHORT, const ResId&, const String* pST=0 );
-    void                    RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
-    void                    RegisterChildWindow( USHORT, BOOL bContext, const String* pST=0 );
-    void                    RegisterChildWindow( USHORT, BOOL bContext, sal_uInt32 nFeature, const String* pST=0 );
+    void                    RegisterObjectBar( sal_uInt16, const ResId&, const String* pST=0 );
+    void                    RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
+    void                    RegisterChildWindow( sal_uInt16, sal_Bool bContext, const String* pST=0 );
+    void                    RegisterChildWindow( sal_uInt16, sal_Bool bContext, sal_uInt32 nFeature, const String* pST=0 );
     void                    RegisterStatusBar( const ResId& );
-    const ResId&            GetObjectBarResId( USHORT nNo ) const;
-    USHORT                  GetObjectBarPos( USHORT nNo ) const;
-    sal_uInt32              GetObjectBarFeature( USHORT nNo ) const;
-    USHORT                  GetObjectBarCount() const;
-    void                    SetObjectBarPos( USHORT nPos, USHORT nId );
-    const String*           GetObjectBarName( USHORT nNo ) const;
-    BOOL                    IsObjectBarVisible( USHORT nNo) const;
-    sal_uInt32              GetChildWindowFeature( USHORT nNo ) const;
-    sal_uInt32              GetChildWindowId( USHORT nNo ) const;
-    USHORT                  GetChildWindowCount() const;
+    const ResId&            GetObjectBarResId( sal_uInt16 nNo ) const;
+    sal_uInt16                  GetObjectBarPos( sal_uInt16 nNo ) const;
+    sal_uInt32              GetObjectBarFeature( sal_uInt16 nNo ) const;
+    sal_uInt16                  GetObjectBarCount() const;
+    void                    SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId );
+    const String*           GetObjectBarName( sal_uInt16 nNo ) const;
+    sal_Bool                    IsObjectBarVisible( sal_uInt16 nNo) const;
+    sal_uInt32              GetChildWindowFeature( sal_uInt16 nNo ) const;
+    sal_uInt32              GetChildWindowId( sal_uInt16 nNo ) const;
+    sal_uInt16                  GetChildWindowCount() const;
     void                    RegisterPopupMenu( const ResId& );
     const ResId&            GetPopupMenuResId() const;
     const ResId&            GetStatusBarResId() const;
@@ -121,7 +121,7 @@ public:
 
 // returns the number of functions in this cluster
 
-inline USHORT SfxInterface::Count() const
+inline sal_uInt16 SfxInterface::Count() const
 {
     return nCount;
 }
@@ -130,7 +130,7 @@ inline USHORT SfxInterface::Count() const
 
 // returns a function by position in the array
 
-inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const
+inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const
 {
     return nPos < nCount? pSlots+nPos: 0;
 }
@@ -139,15 +139,15 @@ inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const
 class SfxIFConfig_Impl
 {
 friend class SfxInterface;
-    USHORT                  nCount;
+    sal_uInt16                  nCount;
     SfxObjectUIArr_Impl*    pObjectBars;
 
 public:
                     SfxIFConfig_Impl();
                     ~SfxIFConfig_Impl();
-    BOOL            Store(SvStream&);
-    void            RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
-    USHORT          GetType();
+    sal_Bool            Store(SvStream&);
+    void            RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
+    sal_uInt16          GetType();
 };
 //#endif
 
diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx
index 96bba6c91a07..f7024ccc76f9 100644
--- a/sfx2/inc/sfx2/objitem.hxx
+++ b/sfx2/inc/sfx2/objitem.hxx
@@ -41,7 +41,7 @@ class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem
 
 public:
                              TYPEINFO();
-                             SfxObjectItem( USHORT nWhich=0, SfxShell *pSh=0 );
+                             SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 );
 
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index e8afa44ae91f..05ae3365d6b1 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -258,7 +258,7 @@ public:
                                 GetCurrentComponent();
     static void                 SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
 
-    virtual void                Invalidate(USHORT nId = 0);
+    virtual void                Invalidate(sal_uInt16 nId = 0);
 
     void                        SetFlags( SfxObjectShellFlags eFlags );
     SfxObjectShellFlags         GetFlags( ) const ;
@@ -317,7 +317,7 @@ public:
     sal_Bool                    DoLoad( SfxMedium* pMedium );
     sal_Bool                    DoSave();
     sal_Bool                    DoSaveAs( SfxMedium &rNewStor );
-    sal_Bool                    DoSaveObjectAs( SfxMedium &rNewStor, BOOL bCommit );
+    sal_Bool                    DoSaveObjectAs( SfxMedium &rNewStor, sal_Bool bCommit );
 
     // TODO/LATER: currently only overloaded in Calc, should be made non-virtual
     virtual sal_Bool            DoSaveCompleted( SfxMedium* pNewStor=0 );
@@ -337,9 +337,9 @@ public:
     virtual void                UpdateLinks();
 
     // called for a few slots like SID_SAVE[AS]DOC, SID_PRINTDOC[DIRECT], derived classes may abort the action
-    virtual sal_Bool            QuerySlotExecutable( USHORT nSlotId );
+    virtual sal_Bool            QuerySlotExecutable( sal_uInt16 nSlotId );
 
-    sal_Bool                    SaveChildren(BOOL bObjectsOnly=FALSE);
+    sal_Bool                    SaveChildren(sal_Bool bObjectsOnly=sal_False);
     sal_Bool                    SaveAsChildren( SfxMedium &rMedium );
     sal_Bool                    SwitchChildrenPersistance(
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
@@ -463,7 +463,7 @@ public:
     SfxObjectCreateMode         GetCreateMode() const { return eCreateMode; }
     virtual void                MemoryError();
     SfxProgress*                GetProgress() const;
-    void                        SetWaitCursor( BOOL bSet ) const;
+    void                        SetWaitCursor( sal_Bool bSet ) const;
 
 //(mba)    virtual SotObjectRef        CreateAggObj( const SotFactory* pFact );
 
@@ -584,15 +584,15 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
 
     Window*                     GetDialogParent( SfxMedium* pMedium=0 );
-    String                      UpdateTitle( SfxMedium* pMed=NULL, USHORT nDocViewNo=0 );
+    String                      UpdateTitle( SfxMedium* pMed=NULL, sal_uInt16 nDocViewNo=0 );
     static SfxObjectShell*      CreateObject( const String& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD );
     static SfxObjectShell*      CreateObjectByFactoryName( const String& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD );
     static SfxObjectShell*      CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame=0 );
     static String               GetServiceNameFromFactory( const String& rFact );
-    BOOL                        IsInPlaceActive();
-    BOOL                        IsUIActive();
-    virtual void                InPlaceActivate( BOOL );
-    virtual void                UIActivate( BOOL );
+    sal_Bool                        IsInPlaceActive();
+    sal_Bool                        IsUIActive();
+    virtual void                InPlaceActivate( sal_Bool );
+    virtual void                UIActivate( sal_Bool );
 
     static sal_Bool             CopyStoragesOfUnknownMediaType(
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource,
@@ -635,11 +635,11 @@ public:
     virtual Printer *       GetDocumentPrinter();
     virtual OutputDevice*    GetDocumentRefDev();
     virtual void            OnDocumentPrinterChanged( Printer * pNewPrinter );
-    virtual Rectangle GetVisArea( USHORT nAspect ) const;
+    virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const;
     virtual void    SetVisArea( const Rectangle & rVisArea );
     const Rectangle & GetVisArea() const;
     void            SetVisAreaSize( const Size & rVisSize );
-    virtual ULONG   GetMiscStatus() const;
+    virtual sal_uIntPtr GetMiscStatus() const;
 
     MapUnit         GetMapUnit() const;
     void            SetMapUnit( MapUnit nMUnit );
@@ -648,9 +648,9 @@ public:
     void            DoDraw( OutputDevice *, const Point & rObjPos,
                             const Size & rSize,
                             const JobSetup & rSetup,
-                            USHORT nAspect = ASPECT_CONTENT );
+                            sal_uInt16 nAspect = ASPECT_CONTENT );
     virtual void    Draw( OutputDevice *, const JobSetup & rSetup,
-                          USHORT nAspect = ASPECT_CONTENT ) = 0;
+                          sal_uInt16 nAspect = ASPECT_CONTENT ) = 0;
 
 
     virtual void    FillClass( SvGlobalName * pClassName,
@@ -716,7 +716,7 @@ public:
                                             const Fraction & rScaleX,
                                             const Fraction & rScaleY,
                                             const JobSetup & rSetup,
-                                            USHORT nAspect );
+                                            sal_uInt16 nAspect );
 
     // Shell Interface
     SAL_DLLPRIVATE void ExecFile_Impl(SfxRequest &);
@@ -756,7 +756,7 @@ public:
 
     // configuration items
     SAL_DLLPRIVATE SfxToolBoxConfig* GetToolBoxConfig_Impl();
-    SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE );
+    SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = sal_False );
 
     SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >
         ImplAnalyzeSignature(
@@ -764,7 +764,7 @@ public:
             const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner
                 = ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() );
 
-    SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = FALSE );
+    SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = sal_False );
     SAL_DLLPRIVATE sal_Bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
 //#endif
 };
@@ -842,8 +842,8 @@ public:
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual String          GetValueText() const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SfxObjectShell*         GetObjectShell() const
                             { return pObjSh; }
 
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/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 6ca9d5212a57..26458b16f844 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -37,12 +37,12 @@
 
 // defines ---------------------------------------------------------------
 
-#define SHOWEXTRAS_NONE      ((USHORT)0x0000)
-#define SHOWEXTRAS_USER      ((USHORT)0x0001)
-#define SHOWEXTRAS_CONFIRM   ((USHORT)0x0002)
-#define SHOWEXTRAS_PASSWORD2 ((USHORT)0x0004)
-#define SHOWEXTRAS_CONFIRM2  ((USHORT)0x0008)
-#define SHOWEXTRAS_ALL       ((USHORT)(SHOWEXTRAS_USER | SHOWEXTRAS_CONFIRM))
+#define SHOWEXTRAS_NONE      ((sal_uInt16)0x0000)
+#define SHOWEXTRAS_USER      ((sal_uInt16)0x0001)
+#define SHOWEXTRAS_CONFIRM   ((sal_uInt16)0x0002)
+#define SHOWEXTRAS_PASSWORD2 ((sal_uInt16)0x0004)
+#define SHOWEXTRAS_CONFIRM2  ((sal_uInt16)0x0008)
+#define SHOWEXTRAS_ALL       ((sal_uInt16)(SHOWEXTRAS_USER | SHOWEXTRAS_CONFIRM))
 
 // class SfxPasswordDialog -----------------------------------------------
 
@@ -66,8 +66,8 @@ private:
     CancelButton    maCancelBtn;
     HelpButton      maHelpBtn;
 
-    USHORT          mnMinLen;
-    USHORT          mnExtras;
+    sal_uInt16          mnMinLen;
+    sal_uInt16          mnExtras;
 
     bool            mbAsciiOnly;
     DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* );
@@ -84,10 +84,10 @@ public:
     String          GetConfirm2() const { return maConfirm2ED.GetText(); }
     void            SetGroup2Text( const String& i_rText ) { maPassword2Box.SetText( i_rText ); }
 
-    void            SetMinLen( USHORT Len );
-    void            SetMaxLen( USHORT Len );
+    void            SetMinLen( sal_uInt16 Len );
+    void            SetMaxLen( sal_uInt16 Len );
     void            SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); }
-    void            ShowExtras( USHORT nExtras ) { mnExtras = nExtras; }
+    void            ShowExtras( sal_uInt16 nExtras ) { mnExtras = nExtras; }
     void            AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; }
 
     virtual short   Execute();
diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx
index 11f07ea9e7db..53b2e87d5fa8 100644
--- a/sfx2/inc/sfx2/printer.hxx
+++ b/sfx2/inc/sfx2/printer.hxx
@@ -47,7 +47,7 @@ private:
     JobSetup                aOrigJobSetup;
     SfxItemSet*             pOptions;
     SfxPrinter_Impl*        pImpl;
-    BOOL                    bKnown;
+    sal_Bool                    bKnown;
 
     SAL_DLLPRIVATE void operator =(SfxPrinter &); // not defined
 
@@ -76,8 +76,8 @@ public:
     const SfxItemSet&       GetOptions() const { return *pOptions; }
     void                    SetOptions( const SfxItemSet &rNewOptions );
 
-    BOOL                    IsKnown() const { return bKnown; }
-    BOOL                    IsOriginal() const { return bKnown; }
+    sal_Bool                    IsKnown() const { return bKnown; }
+    sal_Bool                    IsOriginal() const { return bKnown; }
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index 622d69738a59..723fbcc02f9e 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.hxx
@@ -118,7 +118,7 @@ public:
                         SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
                         ~SfxCommonPrintOptionsTabPage();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual Window*     GetParentLabeledBy( const Window* pLabel ) const;
     virtual Window*     GetParentLabelFor( const Window* pLabel ) const;
@@ -148,7 +148,7 @@ public:
                     TransparencyPrintWarningBox( Window* pParent );
                     ~TransparencyPrintWarningBox();
 
-    BOOL            IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); }
+    sal_Bool            IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); }
 };
 
 #endif // #ifndef _SFX_PRINTOPT_HXX
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index f35064418ec3..0b00fbb47ab9 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -57,19 +57,19 @@ private:
 //#endif
 public:
                             SfxPrintProgress( SfxViewShell* pViewSh,
-                                              FASTBOOL bShow = TRUE );
+                                              FASTBOOL bShow = sal_True );
     virtual                 ~SfxPrintProgress();
 
     virtual void            SetText( const String &rText );
-            BOOL            SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 );
-    virtual BOOL            SetState( ULONG nVal, ULONG nNewRange = 0 );
+            sal_Bool            SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 );
+    virtual sal_Bool            SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
 
     void                    RestoreOnEndPrint( SfxPrinter *pOldPrinter );
     void                    RestoreOnEndPrint( SfxPrinter *pOldPrinter,
-                                               BOOL bOldEnablePrintFile );
+                                               sal_Bool bOldEnablePrintFile );
     void                    DeleteOnEndPrint();
     void                    SetCancelHdl( const Link& aCancelHdl );
-    BOOL                    IsAborted() const;
+    sal_Bool                    IsAborted() const;
 };
 */
 // ------------------------------------------------------------------------
@@ -92,7 +92,7 @@ public:
                                                    const SfxItemSet *rOptions );
     virtual                 ~SfxPrintOptionsDialog();
 
-    BOOL                    Construct();
+    sal_Bool                    Construct();
     virtual short           Execute();
     virtual long            Notify( NotifyEvent& rNEvt );
 
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 7019ebf7785e..6f21f6ed92f8 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -47,24 +47,24 @@ struct SvProgressArg;
 class SFX2_DLLPUBLIC SfxProgress
 {
     SfxProgress_Impl*       pImp;
-    ULONG                   nVal;
-    BOOL                    bSuspended;
+    sal_uIntPtr                 nVal;
+    sal_Bool                    bSuspended;
 
 public:
                             SfxProgress( SfxObjectShell* pObjSh,
                                          const String& rText,
-                                         ULONG nRange, BOOL bAllDocs = FALSE,
-                                         BOOL bWait = TRUE );
+                                         sal_uIntPtr nRange, sal_Bool bAllDocs = sal_False,
+                                         sal_Bool bWait = sal_True );
     virtual                 ~SfxProgress();
 
     virtual void            SetText( const String& rText );
-    BOOL                    SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 );
-    virtual BOOL            SetState( ULONG nVal, ULONG nNewRange = 0 );
-    ULONG                   GetState() const { return nVal; }
+    sal_Bool                    SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 );
+    virtual sal_Bool            SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
+    sal_uIntPtr                 GetState() const { return nVal; }
 
     void                    Resume();
     void                    Suspend();
-    BOOL                    IsSuspended() const { return bSuspended; }
+    sal_Bool                    IsSuspended() const { return bSuspended; }
 
     void                    Lock();
     void                    UnLock();
@@ -72,8 +72,8 @@ public:
 
     void                    Stop();
 
-    void                    SetWaitMode( BOOL bWait );
-    BOOL                    GetWaitMode() const;
+    void                    SetWaitMode( sal_Bool bWait );
+    sal_Bool                    GetWaitMode() const;
 
     static SfxProgress*     GetActiveProgress( SfxObjectShell *pDocSh = 0 );
     static void             EnterLock();
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx
index bf9f2c638361..97764317522e 100644
--- a/sfx2/inc/sfx2/querystatus.hxx
+++ b/sfx2/inc/sfx2/querystatus.hxx
@@ -43,7 +43,7 @@ class SfxQueryStatus_Impl;
 class SFX2_DLLPUBLIC SfxQueryStatus
 {
     public:
-        SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const rtl::OUString& aCommand );
+        SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand );
         ~SfxQueryStatus();
 
         // Query method
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 9d7f4a6dc92d..26a87fa31c3d 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -56,7 +56,7 @@ class SFX2_DLLPUBLIC SfxRequest: public SfxHint
 {
 friend struct SfxRequest_Impl;
 
-    USHORT              nSlot;
+    sal_uInt16              nSlot;
     SfxAllItemSet*      pArgs;
     SfxRequest_Impl*    pImp;
 
@@ -73,53 +73,53 @@ private:
     //---------------------------------------------------------------------
 
 public:
-                        SfxRequest( SfxViewFrame*, USHORT nSlotId );
-                        SfxRequest( USHORT nSlot, USHORT nCallMode, SfxItemPool &rPool );
+                        SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId );
+                        SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, SfxItemPool &rPool );
                         SfxRequest( const SfxSlot* pSlot, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rArgs,
-                                            USHORT nCallMode, SfxItemPool &rPool );
-                        SfxRequest( USHORT nSlot, USHORT nCallMode, const SfxAllItemSet& rSfxArgs );
+                                            sal_uInt16 nCallMode, SfxItemPool &rPool );
+                        SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, const SfxAllItemSet& rSfxArgs );
                         SfxRequest( const SfxRequest& rOrig );
                         ~SfxRequest();
 
-    USHORT              GetSlot() const { return nSlot; }
-    void                SetSlot(USHORT nNewSlot) { nSlot = nNewSlot; }
+    sal_uInt16              GetSlot() const { return nSlot; }
+    void                SetSlot(sal_uInt16 nNewSlot) { nSlot = nNewSlot; }
 
-    USHORT              GetModifier() const;
-    void                SetModifier( USHORT nModi );
+    sal_uInt16              GetModifier() const;
+    void                SetModifier( sal_uInt16 nModi );
     SAL_DLLPRIVATE void SetInternalArgs_Impl( const SfxAllItemSet& rArgs );
     SAL_DLLPRIVATE const SfxItemSet* GetInternalArgs_Impl() const;
     const SfxItemSet*   GetArgs() const { return pArgs; }
     void                SetArgs( const SfxAllItemSet& rArgs );
     void                AppendItem(const SfxPoolItem &);
-    void                RemoveItem( USHORT nSlotId );
+    void                RemoveItem( sal_uInt16 nSlotId );
 
-    static const SfxPoolItem* GetItem( const SfxItemSet*, USHORT nSlotId,
+    static const SfxPoolItem* GetItem( const SfxItemSet*, sal_uInt16 nSlotId,
                                        bool bDeep = false,
                                        TypeId aType = 0 );
-    const SfxPoolItem*  GetArg( USHORT nSlotId, FASTBOOL bDeep = FALSE, TypeId aType = 0 ) const;
+    const SfxPoolItem*  GetArg( sal_uInt16 nSlotId, bool bDeep = false, TypeId aType = 0 ) const;
     void                ReleaseArgs();
     void                SetReturnValue(const SfxPoolItem &);
     const SfxPoolItem*  GetReturnValue() const;
 
     static SfxMacro*    GetRecordingMacro();
     static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
-    static BOOL         HasMacroRecorder( SfxViewFrame* pFrame=NULL );
-    USHORT              GetCallMode() const;
-    FASTBOOL            IsRecording() const;
-    void                AllowRecording( BOOL );
-    BOOL                AllowsRecording() const;
-    BOOL                IsAPI() const;
-    BOOL                IsSynchronCall() const;
-    void                SetSynchronCall( BOOL bSynchron );
+    static sal_Bool         HasMacroRecorder( SfxViewFrame* pFrame=NULL );
+    sal_uInt16              GetCallMode() const;
+    bool            IsRecording() const;
+    void                AllowRecording( sal_Bool );
+    sal_Bool                AllowsRecording() const;
+    sal_Bool                IsAPI() const;
+    sal_Bool                IsSynchronCall() const;
+    void                SetSynchronCall( sal_Bool bSynchron );
     void                SetTarget( const String &rTarget );
 
-    BOOL                IsDone() const;
-    void                Done( BOOL bRemove = FALSE );
+    sal_Bool                IsDone() const;
+    void                Done( sal_Bool bRemove = sal_False );
 
     void                Ignore();
     void                Cancel();
-    BOOL                IsCancelled() const;
-    void                Done(const SfxItemSet &, FASTBOOL bKeep = TRUE );
+    sal_Bool                IsCancelled() const;
+    void                Done(const SfxItemSet &, bool bKeep = true );
 
     void                ForgetAllArgs();
 
diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx
index d25f0ee0b967..4c47533f4e4a 100755..100644
--- a/sfx2/inc/sfx2/securitypage.hxx
+++ b/sfx2/inc/sfx2/securitypage.hxx
@@ -45,7 +45,7 @@ protected:
     SfxSecurityPage( Window* pParent, const SfxItemSet& );
     virtual ~SfxSecurityPage();
 
-    virtual BOOL            FillItemSet( SfxItemSet& );
+    virtual sal_Bool            FillItemSet( SfxItemSet& );
     virtual void            Reset( const SfxItemSet& );
 
 public:
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index de01f1965d74..4cc7d0321da3 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -388,9 +388,9 @@ public:
     // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
     // either the _Impl name should vanish or there should be an "official" API
     SfxViewShell* GetViewShell_Impl() const;
-    SAL_DLLPRIVATE BOOL HandleEvent_Impl( NotifyEvent& rEvent );
-    SAL_DLLPRIVATE BOOL HasKeyListeners_Impl();
-    SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl();
+    SAL_DLLPRIVATE sal_Bool HandleEvent_Impl( NotifyEvent& rEvent );
+    SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
+    SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
     SAL_DLLPRIVATE void SetCreationArguments_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rCreationArgs );
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper ();
 //#endif
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/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index f3d773f98afc..eefa614d9630 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -54,7 +54,7 @@ struct TransferableObjectDescriptor;
 
 #include <sfx2/tabdlg.hxx>
 //typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
-//typedef USHORT*       (*GetTabPageRanges)();
+//typedef sal_uInt16*       (*GetTabPageRanges)();
 
 namespace sfx2
 {
@@ -76,8 +76,8 @@ public:
 class SfxAbstractTabDialog : public SfxAbstractDialog
 {
 public:
-    virtual void                SetCurPageId( USHORT nId ) = 0;
-    virtual const USHORT*       GetInputRanges( const SfxItemPool& ) = 0;
+    virtual void                SetCurPageId( sal_uInt16 nId ) = 0;
+    virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& ) = 0;
     virtual void                SetInputSet( const SfxItemSet* pInSet ) = 0;
 };
 
@@ -86,7 +86,7 @@ class SfxAbstractInsertObjectDialog : public VclAbstractDialog
 public:
     virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0;
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType )=0;
-    virtual BOOL IsCreateNew()=0;
+    virtual sal_Bool IsCreateNew()=0;
 };
 
 class SfxAbstractPasteDialog : public VclAbstractDialog
@@ -94,7 +94,7 @@ class SfxAbstractPasteDialog : public VclAbstractDialog
 public:
     virtual void Insert( SotFormatStringId nFormat, const String & rFormatName ) = 0;
     virtual void SetObjName( const SvGlobalName & rClass, const String & rObjName ) = 0;
-    virtual ULONG GetFormat( const TransferableDataHelper& aHelper,
+    virtual sal_uIntPtr GetFormat( const TransferableDataHelper& aHelper,
                         const DataFlavorExVector* pFormats=0,
                         const TransferableObjectDescriptor* pDesc=0 ) = 0;
 };
@@ -131,21 +131,21 @@ public:
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
                                             bool bEditFmt=false,
                                             const String *pUserButtonText=0 ) = 0;
-    virtual CreateTabPage               GetTabPageCreatorFunc( USHORT nId ) = 0;
-    virtual GetTabPageRanges            GetTabPageRangesFunc( USHORT nId ) = 0;
+    virtual CreateTabPage               GetTabPageCreatorFunc( sal_uInt16 nId ) = 0;
+    virtual GetTabPageRanges            GetTabPageRangesFunc( sal_uInt16 nId ) = 0;
     virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
             const SvObjectServerList* pList = 0 )=0;
     virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0;
     virtual  SfxAbstractPasteDialog*         CreatePasteDialog( Window* pParent )=0;
-    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0;
+    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML=sal_False, sfx2::SvBaseLink* p=0 )=0;
     virtual VclAbstractDialog *         CreateSvxScriptOrgDialog( Window* pParent,  const String& rLanguage ) = 0;
 
     virtual AbstractScriptSelectorDialog*
         CreateScriptSelectorDialog(
             Window* pParent,
-            BOOL bShowSlots,
+            sal_Bool bShowSlots,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
         ) = 0;
 
diff --git a/sfx2/inc/sfx2/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx
index 17589c7cd399..98b31872ce68 100644
--- a/sfx2/inc/sfx2/sfxhelp.hxx
+++ b/sfx2/inc/sfx2/sfxhelp.hxx
@@ -45,9 +45,9 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
     SfxHelp_Impl*   pImp;
 
 private:
-    SAL_DLLPRIVATE BOOL Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword );
-    SAL_DLLPRIVATE virtual BOOL SearchKeyword( const XubString& rKeyWord );
-    SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow );
+    SAL_DLLPRIVATE sal_Bool Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword );
+    SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const XubString& rKeyWord );
+    SAL_DLLPRIVATE virtual sal_Bool Start( const String& rURL, const Window* pWindow );
     SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId );
     SAL_DLLPRIVATE String GetHelpModuleName_Impl();
     SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName );
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index 9b1fcf60efbb..a2d0e4162ba6 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -49,32 +49,32 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
     SfxMedium*              pMedium;
     SfxMedium *pDLMedium;   // Medium fuer Download von Files
 
-    USHORT nMetaTags;       // Anzahl der bisher gelesenen Meta-Tags
+    sal_uInt16 nMetaTags;       // Anzahl der bisher gelesenen Meta-Tags
     ScriptType eScriptType;
 
     SAL_DLLPRIVATE void GetScriptType_Impl( SvKeyValueIterator* );
 
 protected:
 
-    SfxHTMLParser( SvStream& rStream, BOOL bNewDoc=TRUE, SfxMedium *pMedium=0 );
+    SfxHTMLParser( SvStream& rStream, sal_Bool bNewDoc=sal_True, SfxMedium *pMedium=0 );
 
     virtual ~SfxHTMLParser();
 
 public:
     // Lesen der Optionen einer Image-Map
-    // <MAP>: TRUE = Image-Map hat einen Namen
-    // <AREA>: TRUE = Image-Map hat jetzt einen Bereich mehr
-    static BOOL ParseMapOptions(ImageMap * pImageMap,
+    // <MAP>: sal_True = Image-Map hat einen Namen
+    // <AREA>: sal_True = Image-Map hat jetzt einen Bereich mehr
+    static sal_Bool ParseMapOptions(ImageMap * pImageMap,
                                 const HTMLOptions * pOptions );
-    BOOL ParseMapOptions(ImageMap * pImageMap)
+    sal_Bool ParseMapOptions(ImageMap * pImageMap)
     { return ParseMapOptions(pImageMap, GetOptions()); }
-    static BOOL ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+    static sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
                                  const HTMLOptions * pOptions,
-                                 USHORT nEventMouseOver = 0,
-                                 USHORT nEventMouseOut = 0 );
-    inline BOOL ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
-                                 USHORT nEventMouseOver = 0,
-                                 USHORT nEventMouseOut = 0);
+                                 sal_uInt16 nEventMouseOver = 0,
+                                 sal_uInt16 nEventMouseOut = 0 );
+    inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+                                 sal_uInt16 nEventMouseOver = 0,
+                                 sal_uInt16 nEventMouseOut = 0);
 
     // <TD SDVAL="..." SDNUM="...">
     static double GetTableDataOptionsValNum( sal_uInt32& nNumForm,
@@ -102,16 +102,16 @@ protected:
     // unmittelbar vor FinishFileDownload aufgerufen werden, nie aber
     // danach.
 
-    BOOL GetFileDownloadMIME( String& rMime );
+    sal_Bool GetFileDownloadMIME( String& rMime );
 
-    // Beenden eines asynchronen File-Downloads. Gibt TRUE zurueck, wenn
+    // Beenden eines asynchronen File-Downloads. Gibt sal_True zurueck, wenn
     // der Download geklappt hat. Das gelesene File befindet sich dann in
     // dem uebergeben String.
-    BOOL FinishFileDownload( String& rStr );
+    sal_Bool FinishFileDownload( String& rStr );
 
-    // Gibt TRUE zurueck, wenn ein File downloaded wurde und
+    // Gibt sal_True zurueck, wenn ein File downloaded wurde und
     // FileDownloadFinished noch nicht gerufen wurde.
-    BOOL ShouldFinishFileDownload() const { return pDLMedium != 0; }
+    sal_Bool ShouldFinishFileDownload() const { return pDLMedium != 0; }
 
     SfxMedium *GetMedium() { return pMedium; }
     const SfxMedium *GetMedium() const { return pMedium; }
@@ -121,9 +121,9 @@ protected:
     const String& GetScriptTypeString( SvKeyValueIterator* ) const;
 };
 
-inline BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
-                                            USHORT nEventMouseOver,
-                                            USHORT nEventMouseOut)
+inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+                                            sal_uInt16 nEventMouseOver,
+                                            sal_uInt16 nEventMouseOut)
 {
     return ParseAreaOptions( pImageMap, rBaseURL, GetOptions(),
                              nEventMouseOver, nEventMouseOut );
diff --git a/sfx2/inc/sfx2/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx
index 2dfdb48afef4..6c67fbbf7dcc 100644
--- a/sfx2/inc/sfx2/sfxresid.hxx
+++ b/sfx2/inc/sfx2/sfxresid.hxx
@@ -34,7 +34,7 @@
 class SFX2_DLLPUBLIC SfxResId: public ResId
 {
 public:
-    SfxResId( USHORT nId );
+    SfxResId( sal_uInt16 nId );
     static ResMgr* GetResMgr();
     static void DeleteResMgr();
 };
@@ -45,7 +45,7 @@ class SfxSimpleResId
     String m_sText;
 
 public:
-    SfxSimpleResId(USHORT nID);
+    SfxSimpleResId(sal_uInt16 nID);
 
     String getText() const { return m_sText; }
 
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index e24db0ac577a..02fa61b17f45 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx
@@ -44,7 +44,7 @@
 class SfxStatusListenerInterface
 {
     public:
-        virtual void StateChanged( USHORT nSlotId, SfxItemState eState, const SfxPoolItem* pState ) = 0;
+        virtual void StateChanged( sal_uInt16 nSlotId, SfxItemState eState, const SfxPoolItem* pState ) = 0;
 };
 
 class SFX2_DLLPUBLIC SfxStatusListener :
@@ -56,17 +56,17 @@ class SFX2_DLLPUBLIC SfxStatusListener :
     public:
         SFX_DECL_XINTERFACE_XTYPEPROVIDER
 
-        SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const rtl::OUString& aCommand );
+        SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand );
         virtual ~SfxStatusListener();
 
         // old methods from SfxControllerItem
-        USHORT  GetId() const { return m_nSlotID; }
+        sal_uInt16  GetId() const { return m_nSlotID; }
         void    Bind();
-        void    Bind( USHORT nSlotID, const rtl::OUString& rNewCommand );
+        void    Bind( sal_uInt16 nSlotID, const rtl::OUString& rNewCommand );
         void    UnBind();
         void    ReBind();
 
-        virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+        virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
         // XComponent
         virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
@@ -84,7 +84,7 @@ class SFX2_DLLPUBLIC SfxStatusListener :
         SfxStatusListener();
         SfxStatusListener& operator=( const SfxStatusListener& );
 
-        USHORT                                                                          m_nSlotID;
+        sal_uInt16                                                                          m_nSlotID;
         ::com::sun::star::util::URL                                                     m_aCommand;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >  m_xDispatchProvider;
         ::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >            m_xDispatch;
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 4d93a7b422aa..40c2a7fc42fc 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -178,7 +178,7 @@ protected:
 
 #ifndef _SFXSH_HXX
     SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell* pView );
-    SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, USHORT nId );
+    SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId );
     SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const;
     SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj );
 #endif
@@ -208,10 +208,10 @@ public:
     static void                 EmptyExecStub(SfxShell *pShell, SfxRequest &);
     static void                 EmptyStateStub(SfxShell *pShell, SfxItemSet &);
 
-    const SfxPoolItem*          GetSlotState( USHORT nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 );
+    const SfxPoolItem*          GetSlotState( sal_uInt16 nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 );
     const SfxPoolItem*          ExecuteSlot( SfxRequest &rReq, const SfxInterface *pIF = 0 );
-    const SfxPoolItem*          ExecuteSlot( SfxRequest &rReq, BOOL bAsync );
-    ULONG                       ExecuteSlot( USHORT nSlot, USHORT nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 );
+    const SfxPoolItem*          ExecuteSlot( SfxRequest &rReq, sal_Bool bAsync );
+    sal_uIntPtr                       ExecuteSlot( sal_uInt16 nSlot, sal_uInt16 nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 );
 
     inline SfxItemPool&         GetPool() const;
     inline void                 SetPool( SfxItemPool *pNewPool ) ;
@@ -223,11 +223,11 @@ public:
     SfxRepeatTarget*            GetRepeatTarget() const;
     void                        SetRepeatTarget( SfxRepeatTarget *pTarget );
 
-    virtual void                Invalidate(USHORT nId = 0);
+    virtual void                Invalidate(sal_uInt16 nId = 0);
 
-    BOOL                        IsActive() const;
-    virtual void                Activate(BOOL bMDI);
-    virtual void                Deactivate(BOOL bMDI);
+    sal_Bool                        IsActive() const;
+    virtual void                Activate(sal_Bool bMDI);
+    virtual void                Deactivate(sal_Bool bMDI);
     virtual void                ParentActivate();
     virtual void                ParentDeactivate();
 
@@ -238,30 +238,30 @@ public:
     void                        UIFeatureChanged();
 
     // Items
-    const SfxPoolItem*          GetItem( USHORT nSlotId ) const;
+    const SfxPoolItem*          GetItem( sal_uInt16 nSlotId ) const;
     void                        PutItem( const SfxPoolItem& rItem );
-    void                        RemoveItem( USHORT nSlotId );
+    void                        RemoveItem( sal_uInt16 nSlotId );
 
     // TODO/CLEANUP: still needed?!
     void SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs);
     const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbs() const;
     void                        VerbExec (SfxRequest&);
     void                        VerbState (SfxItemSet&);
-    SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(USHORT nId) const;
+    SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(sal_uInt16 nId) const;
 
-    void                        SetHelpId(ULONG nId);
-    ULONG                       GetHelpId() const;
+    void                        SetHelpId(sal_uIntPtr nId);
+    sal_uIntPtr                     GetHelpId() const;
     virtual SfxObjectShell*     GetObjectShell();
-    void                        SetDisableFlags( ULONG nFlags );
-    ULONG                       GetDisableFlags() const;
+    void                        SetDisableFlags( sal_uIntPtr nFlags );
+    sal_uIntPtr                     GetDisableFlags() const;
 
-    virtual SfxItemSet*         CreateItemSet( USHORT nId );
-    virtual void                ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
+    virtual SfxItemSet*         CreateItemSet( sal_uInt16 nId );
+    virtual void                ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
 
 #ifndef _SFXSH_HXX
-    SAL_DLLPRIVATE FASTBOOL     CanExecuteSlot_Impl( const SfxSlot &rSlot );
-    SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI);
-    SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI);
+    SAL_DLLPRIVATE bool     CanExecuteSlot_Impl( const SfxSlot &rSlot );
+    SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
+    SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
 #endif
 };
 
@@ -336,7 +336,7 @@ inline void SfxShell::SetPool
             #Class, NameResId, GetInterfaceId(),                            \
             SuperClass::GetStaticInterface(),                               \
             a##Class##Slots_Impl[0],                                        \
-            (USHORT) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) );   \
+            (sal_uInt16) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) );   \
             InitInterface_Impl();                                           \
         }                                                                   \
         return pInterface;                                                  \
@@ -377,13 +377,13 @@ inline void SfxShell::SetPool
         GetStaticInterface()->RegisterObjectBar( nPos, rResId, nFeature )
 
 #define SFX_CHILDWINDOW_REGISTRATION(nId) \
-        GetStaticInterface()->RegisterChildWindow( nId, (BOOL) FALSE )
+        GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False )
 
 #define SFX_FEATURED_CHILDWINDOW_REGISTRATION(nId,nFeature) \
-        GetStaticInterface()->RegisterChildWindow( nId, (BOOL) FALSE, nFeature )
+        GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False, nFeature )
 
 #define SFX_CHILDWINDOW_CONTEXT_REGISTRATION(nId) \
-        GetStaticInterface()->RegisterChildWindow( nId, (BOOL) TRUE )
+        GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_True )
 
 #define SFX_POPUPMENU_REGISTRATION(rResId) \
         GetStaticInterface()->RegisterPopupMenu( rResId )
diff --git a/sfx2/inc/sfx2/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx
index 977ba869750d..f3bb30eaea5f 100644
--- a/sfx2/inc/sfx2/stbitem.hxx
+++ b/sfx2/inc/sfx2/stbitem.hxx
@@ -44,16 +44,16 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     StatusBar* pStatusBar,
     unsigned short nID,
     const ::rtl::OUString& aCommandURL );
-typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( USHORT nSlotId, USHORT nId, StatusBar &rStb );
+typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb );
 
 struct SfxStbCtrlFactory
 {
     SfxStatusBarControlCtor pCtor;
     TypeId                  nTypeId;
-    USHORT                  nSlotId;
+    sal_uInt16                  nSlotId;
 
     SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor,
-            TypeId nTheTypeId, USHORT nTheSlotId ):
+            TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
         pCtor(pTheCtor),
         nTypeId(nTheTypeId),
         nSlotId(nTheSlotId)
@@ -68,8 +68,8 @@ class UserDrawEvent;
 
 class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
 {
-    USHORT          nSlotId;
-    USHORT          nId;
+    sal_uInt16          nSlotId;
+    sal_uInt16          nId;
     StatusBar*      pBar;
 
 protected:
@@ -104,29 +104,29 @@ protected:
     virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
 
     // Old sfx2 interface
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void    Click();
     virtual void    DoubleClick();
     virtual void    Command( const CommandEvent& rCEvt );
-    virtual BOOL    MouseButtonDown( const MouseEvent & );
-    virtual BOOL    MouseMove( const MouseEvent & );
-    virtual BOOL    MouseButtonUp( const MouseEvent & );
+    virtual sal_Bool    MouseButtonDown( const MouseEvent & );
+    virtual sal_Bool    MouseMove( const MouseEvent & );
+    virtual sal_Bool    MouseButtonUp( const MouseEvent & );
     virtual void    Paint( const UserDrawEvent &rUDEvt );
 
-    static USHORT   convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons );
+    static sal_uInt16   convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons );
 
 public:
-                    SfxStatusBarControl( USHORT nSlotID, USHORT nId, StatusBar& rBar );
+                    SfxStatusBarControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar& rBar );
     virtual         ~SfxStatusBarControl();
 
-    USHORT          GetSlotId() const { return nSlotId; }
-    USHORT          GetId() const { return nId; }
+    sal_uInt16          GetSlotId() const { return nSlotId; }
+    sal_uInt16          GetId() const { return nId; }
     StatusBar&      GetStatusBar() const { return *pBar; }
     void            CaptureMouse();
     void            ReleaseMouse();
 
-    static SfxStatusBarControl* CreateControl( USHORT nSlotID, USHORT nId, StatusBar *pBar, SfxModule* );
+    static SfxStatusBarControl* CreateControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar *pBar, SfxModule* );
     static void RegisterStatusBarControl(SfxModule*, SfxStbCtrlFactory*);
 
 };
@@ -134,13 +134,13 @@ public:
 //------------------------------------------------------------------
 
 #define SFX_DECL_STATUSBAR_CONTROL() \
-        static SfxStatusBarControl* CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ); \
-        static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
+        static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \
+        static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
 
 #define SFX_IMPL_STATUSBAR_CONTROL(Class, nItemClass) \
-        SfxStatusBarControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ) \
+        SfxStatusBarControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ) \
                { return new Class( nSlotId, nId, rStb ); } \
-        void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
+        void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
                { SfxStatusBarControl::RegisterStatusBarControl( pMod, new SfxStbCtrlFactory( \
                     Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
 
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index 76be875d6d70..5bb473906dbd 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -45,7 +45,7 @@
 #ifndef _SFX_STYFITEM_HXX_NOLIST
 struct SfxFilterTupel {
     String aName;
-    USHORT nFlags;
+    sal_uInt16 nFlags;
 };
 
 DECLARE_LIST(SfxStyleFilter, SfxFilterTupel*)
@@ -61,7 +61,7 @@ class SfxStyleFamilyItem: public Resource
     Bitmap          aBitmap;
     String          aText;
     String          aHelpText;
-    USHORT          nFamily;
+    sal_uInt16          nFamily;
     SfxStyleFilter  aFilterList;
 
 public:
@@ -98,10 +98,10 @@ public:
                         SfxStyleFamilies( ) {};
                         ~SfxStyleFamilies();
 
-    USHORT              Count() const
-                        { return (USHORT)aEntryList.Count(); }
+    sal_uInt16              Count() const
+                        { return (sal_uInt16)aEntryList.Count(); }
 
-    const SfxStyleFamilyItem* GetObject(ULONG nIdx) const
+    const SfxStyleFamilyItem* GetObject(sal_uIntPtr nIdx) const
                         { return (SfxStyleFamilyItem*)aEntryList.GetObject(nIdx); }
 
     /** updates the images of all single SfxStyleFamilyItems with new images from the given resource
diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx
index 9e2ffdadac4d..10c4b28381a6 100644
--- a/sfx2/inc/sfx2/styledlg.hxx
+++ b/sfx2/inc/sfx2/styledlg.hxx
@@ -47,7 +47,7 @@ protected:
 public:
 #define ID_TABPAGE_MANAGESTYLES 1
     SfxStyleDialog( Window* pParent, const ResId& rResId, SfxStyleSheetBase&,
-                    BOOL bFreeRes = TRUE, const String* pUserBtnTxt = 0 );
+                    sal_Bool bFreeRes = sal_True, const String* pUserBtnTxt = 0 );
 
     ~SfxStyleDialog();
 
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index cedc8f256010..6ea55ed96067 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -57,7 +57,7 @@ class SfxBindings;
 #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG*/
 
 typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef USHORT*     (*GetTabPageRanges)(); // liefert internationale Which-Wert
+typedef sal_uInt16*     (*GetTabPageRanges)(); // liefert internationale Which-Wert
 struct TabPageImpl;
 class SfxUs_Impl;
 
@@ -79,10 +79,10 @@ class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem
 {
 public:
     TYPEINFO();
-                            SfxTabDialogItem( USHORT nId, const SfxItemSet& rItemSet );
+                            SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet );
                             SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL);
     virtual SfxPoolItem*    Clone(SfxItemPool* pToPool) const;
-    virtual SfxPoolItem*    Create(SvStream& rStream, USHORT nVersion) const;
+    virtual SfxPoolItem*    Create(SvStream& rStream, sal_uInt16 nVersion) const;
 };
 
 class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog
@@ -104,11 +104,11 @@ friend class SfxTabDialogController;
     const SfxItemSet*   pSet;
     SfxItemSet*         pOutSet;
     TabDlg_Impl*        pImpl;
-    USHORT*             pRanges;
+    sal_uInt16*             pRanges;
     sal_uInt32          nResId;
-    USHORT              nAppPageId;
-    BOOL                bItemsReset;
-    BOOL                bFmt;
+    sal_uInt16              nAppPageId;
+    sal_Bool                bItemsReset;
+    sal_Bool                bFmt;
 
 //#if 0 // _SOLAR__PRIVATE
     DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
@@ -118,81 +118,81 @@ friend class SfxTabDialogController;
     DECL_DLLPRIVATE_LINK( BaseFmtHdl, Button * );
     DECL_DLLPRIVATE_LINK( UserHdl, Button * );
     DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
-    SAL_DLLPRIVATE void Init_Impl(BOOL, const String *);
+    SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *);
 //#endif
 
 protected:
     virtual short               Ok();
     // wird im Sfx gel"oscht!
-    virtual SfxItemSet*         CreateInputItemSet( USHORT nId );
+    virtual SfxItemSet*         CreateInputItemSet( sal_uInt16 nId );
     // wird *nicht* im Sfx gel"oscht!
     virtual const SfxItemSet*   GetRefreshedSet();
-    virtual void                PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void                PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
     virtual long                Notify( NotifyEvent& rNEvt );
 
     SfxItemSet*     pExampleSet;
     SfxItemSet*     GetInputSetImpl();
-    SfxTabPage*     GetTabPage( USHORT nPageId ) const;
+    SfxTabPage*     GetTabPage( sal_uInt16 nPageId ) const;
 
-    BOOL            IsInOK() const;
+    sal_Bool            IsInOK() const;
     /** prepare to leace the current page. Calls the DeactivatePage method of the current page, (if necessary),
         handles the item sets to copy.
-        @return TRUE if it is allowed to leave the current page, FALSE otherwise
+        @return sal_True if it is allowed to leave the current page, sal_False otherwise
     */
     bool PrepareLeaveCurrentPage();
 
 public:
-    SfxTabDialog( Window* pParent, const ResId &rResId, USHORT nSetId, SfxBindings& rBindings,
-                  BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 );
+    SfxTabDialog( Window* pParent, const ResId &rResId, sal_uInt16 nSetId, SfxBindings& rBindings,
+                  sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 );
     SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0,
-                  BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 );
+                  sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 );
     SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId,
-                  const SfxItemSet * = 0, BOOL bEditFmt = FALSE,
+                  const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False,
                   const String *pUserButtonText = 0 );
     ~SfxTabDialog();
 
-    void                AddTabPage( USHORT nId,
+    void                AddTabPage( sal_uInt16 nId,
                                     CreateTabPage pCreateFunc,      // != 0
                                     GetTabPageRanges pRangesFunc,   // darf 0 sein
-                                    BOOL bItemsOnDemand = FALSE);
-    void                AddTabPage( USHORT nId,
+                                    sal_Bool bItemsOnDemand = sal_False);
+    void                AddTabPage( sal_uInt16 nId,
                                     const String &rRiderText,
                                     CreateTabPage pCreateFunc,      // != 0
                                     GetTabPageRanges pRangesFunc,   // darf 0 sein
-                                    BOOL bItemsOnDemand = FALSE,
-                                    USHORT nPos = TAB_APPEND);
-    void                AddTabPage( USHORT nId,
+                                    sal_Bool bItemsOnDemand = sal_False,
+                                    sal_uInt16 nPos = TAB_APPEND);
+    void                AddTabPage( sal_uInt16 nId,
                                     const Bitmap &rRiderBitmap,
                                     CreateTabPage pCreateFunc,      // != 0
                                     GetTabPageRanges pRangesFunc,   // darf 0 sein
-                                    BOOL bItemsOnDemand = FALSE,
-                                    USHORT nPos = TAB_APPEND);
+                                    sal_Bool bItemsOnDemand = sal_False,
+                                    sal_uInt16 nPos = TAB_APPEND);
 
-    void                AddTabPage( USHORT nId,
-                                    BOOL bItemsOnDemand = FALSE);
-    void                AddTabPage( USHORT nId,
+    void                AddTabPage( sal_uInt16 nId,
+                                    sal_Bool bItemsOnDemand = sal_False);
+    void                AddTabPage( sal_uInt16 nId,
                                     const String &rRiderText,
-                                    BOOL bItemsOnDemand = FALSE,
-                                    USHORT nPos = TAB_APPEND);
-    void                AddTabPage( USHORT nId,
+                                    sal_Bool bItemsOnDemand = sal_False,
+                                    sal_uInt16 nPos = TAB_APPEND);
+    void                AddTabPage( sal_uInt16 nId,
                                     const Bitmap &rRiderBitmap,
-                                    BOOL bItemsOnDemand = FALSE,
-                                    USHORT nPos = TAB_APPEND);
+                                    sal_Bool bItemsOnDemand = sal_False,
+                                    sal_uInt16 nPos = TAB_APPEND);
 
-    void                RemoveTabPage( USHORT nId );
+    void                RemoveTabPage( sal_uInt16 nId );
 
-    void                SetCurPageId( USHORT nId ) { nAppPageId = nId; }
-    USHORT              GetCurPageId() const
+    void                SetCurPageId( sal_uInt16 nId ) { nAppPageId = nId; }
+    sal_uInt16              GetCurPageId() const
                             { return aTabCtrl.GetCurPageId(); }
-    void                ShowPage( USHORT nId );
+    void                ShowPage( sal_uInt16 nId );
 
                         // liefert ggf. per Map konvertierte lokale Slots
-    const USHORT*       GetInputRanges( const SfxItemPool& );
+    const sal_uInt16*       GetInputRanges( const SfxItemPool& );
     void                SetInputSet( const SfxItemSet* pInSet );
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
-    const SfxItemSet*   GetOutputItemSet( USHORT nId ) const;
+    const SfxItemSet*   GetOutputItemSet( sal_uInt16 nId ) const;
     int                 FillOutputItemSet();
-    BOOL IsFormat() const { return bFmt; }
+    sal_Bool IsFormat() const { return bFmt; }
 
     const OKButton&     GetOKButton() const { return aOKBtn; }
     OKButton&           GetOKButton() { return aOKBtn; }
@@ -212,7 +212,7 @@ public:
 
     short               Execute();
     void                StartExecuteModal( const Link& rEndDialogHdl );
-    void                Start( BOOL bShow = TRUE );
+    void                Start( sal_Bool bShow = sal_True );
 
 #if !ENABLE_LAYOUT_SFX_TABDIALOG
     const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
@@ -221,14 +221,14 @@ public:
 #endif /* ENABLE_LAYOUT_SFX_TABDIALOG */
     SfxViewFrame*       GetViewFrame() const { return pFrame; }
 
-    void                EnableApplyButton(BOOL bEnable = TRUE);
-    BOOL                IsApplyButtonEnabled() const;
+    void                EnableApplyButton(sal_Bool bEnable = sal_True);
+    sal_Bool                IsApplyButtonEnabled() const;
     void                SetApplyHandler(const Link& _rHdl);
     Link                GetApplyHandler() const;
 
 //#if 0 // _SOLAR__PRIVATE
     SAL_DLLPRIVATE void Start_Impl();
-    SAL_DLLPRIVATE BOOL OK_Impl() { return PrepareLeaveCurrentPage(); }
+    SAL_DLLPRIVATE sal_Bool OK_Impl() { return PrepareLeaveCurrentPage(); }
 //#endif
 };
 
@@ -252,7 +252,7 @@ friend class SfxTabDialog;
 private:
     const SfxItemSet*   pSet;
     String              aUserString;
-    BOOL                bHasExchangeSupport;
+    sal_Bool                bHasExchangeSupport;
     SfxTabDialog*       pTabDlg;
     TabPageImpl*        pImpl;
 
@@ -263,12 +263,12 @@ protected:
     SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
     SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet );
 
-    USHORT              GetSlot( USHORT nWhich ) const
+    sal_uInt16              GetSlot( sal_uInt16 nWhich ) const
                             { return pSet->GetPool()->GetSlotId( nWhich ); }
-    USHORT              GetWhich( USHORT nSlot, sal_Bool bDeep = sal_True ) const
+    sal_uInt16              GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const
                             { return pSet->GetPool()->GetWhich( nSlot, bDeep ); }
-    const SfxPoolItem*  GetOldItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True );
-    const SfxPoolItem*  GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot );
+    const SfxPoolItem*  GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True );
+    const SfxPoolItem*  GetExchangeItem( const SfxItemSet& rSet, sal_uInt16 nSlot );
     SfxTabDialog*       GetTabDialog() const { return pTabDlg; }
 
     void                AddItemConnection( sfx::ItemConnectionBase* pConnection );
@@ -278,12 +278,12 @@ public:
 
     const SfxItemSet&   GetItemSet() const { return *pSet; }
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
-    BOOL                HasExchangeSupport() const
+    sal_Bool                HasExchangeSupport() const
                             { return bHasExchangeSupport; }
-    void                SetExchangeSupport( BOOL bNew = TRUE )
+    void                SetExchangeSupport( sal_Bool bNew = sal_True )
                             { bHasExchangeSupport = bNew; }
 
     enum sfxpg {
@@ -304,9 +304,9 @@ public:
                             { aUserString = rString; }
     String              GetUserData() { return aUserString; }
     virtual void        FillUserData();
-    virtual BOOL        IsReadOnly() const;
+    virtual sal_Bool        IsReadOnly() const;
     virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
-    static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True );
+    static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True );
 
     void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
diff --git a/sfx2/inc/sfx2/taskpane.hxx b/sfx2/inc/sfx2/taskpane.hxx
index 69ebd866a50b..54783b6df455 100644
--- a/sfx2/inc/sfx2/taskpane.hxx
+++ b/sfx2/inc/sfx2/taskpane.hxx
@@ -65,7 +65,7 @@ namespace sfx2
     public:
         TaskPaneWrapper(
             Window* i_pParent,
-            USHORT i_nId,
+            sal_uInt16 i_nId,
             SfxBindings* i_pBindings,
             SfxChildWinInfo* i_pInfo
         );
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 30d82c854642..f8bfa0f00b37 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -61,17 +61,17 @@ class SfxUnoControllerItem;
 
 svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
 
-//typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nId, ToolBox &rTbx, SfxBindings & );
-typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+//typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nId, ToolBox &rTbx, SfxBindings & );
+typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
 
 struct SfxTbxCtrlFactory
 {
     SfxToolBoxControlCtor   pCtor;
     TypeId                  nTypeId;
-    USHORT                  nSlotId;
+    sal_uInt16                  nSlotId;
 
     SfxTbxCtrlFactory( SfxToolBoxControlCtor pTheCtor,
-            TypeId nTheTypeId, USHORT nTheSlotId ):
+            TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
         pCtor(pTheCtor),
         nTypeId(nTheTypeId),
         nSlotId(nTheSlotId)
@@ -118,11 +118,11 @@ class SfxFrameStatusListener : public svt::FrameStatusListener
 class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface
 {
 friend class SfxToolBox_Impl;
-    BOOL                                                                             m_bFloating;
-    ULONG                                                                            m_nEventId;
-    BOOL                                                                             m_bCascading;
+    sal_Bool                                                                             m_bFloating;
+    sal_uIntPtr                                                                            m_nEventId;
+    sal_Bool                                                                             m_bCascading;
     Link                                                                             m_aDeleteLink;
-    USHORT                                                                           m_nId;
+    sal_uInt16                                                                           m_nId;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              m_xFrame;
     SfxFrameStatusListener*                                                          m_pStatusListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >           m_xStatusListener;
@@ -140,10 +140,10 @@ private:
 
 protected:
     virtual void            PopupModeEnd();
-    virtual BOOL            Close();
+    virtual sal_Bool            Close();
     virtual void            DeleteFloatingWindow();
 
-    USHORT                  GetId() const { return m_nId; }
+    sal_uInt16                  GetId() const { return m_nId; }
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; }
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& GetServiceManager() const { return m_xServiceManager; }
 
@@ -155,21 +155,21 @@ protected:
 
     // SfxStatusListenerInterface
     using FloatingWindow::StateChanged;
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                           const SfxPoolItem* pState );
 
 public:
-                            SfxPopupWindow( USHORT nId,
+                            SfxPopupWindow( sal_uInt16 nId,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                             WinBits nBits );
-                            SfxPopupWindow( USHORT nId,
+                            SfxPopupWindow( sal_uInt16 nId,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                             const ResId &rId );
-                            SfxPopupWindow( USHORT nId,
+                            SfxPopupWindow( sal_uInt16 nId,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                             Window* pParentWindow,
                                             const ResId &rId );
-                            SfxPopupWindow( USHORT nId,
+                            SfxPopupWindow( sal_uInt16 nId,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                             Window* pParentWindow,
                                             WinBits nBits );
@@ -190,8 +190,8 @@ public:
 //------------------------------------------------------------------
 
 #define SFX_DECL_TOOLBOX_CONTROL() \
-        static SfxToolBoxControl* CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ); \
-        static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
+        static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \
+        static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
 
 /*  F"ur spezielle ToolBox-Controls, z.B. eine Font-Auswahl-Box oder
     aus ToolBoxen abrei"sbare FloatingWindows mu"s passend zur Item-Subclass
@@ -223,9 +223,9 @@ protected:
     DECL_LINK( ClosePopupWindow, SfxPopupWindow * );
 
     // old SfxToolBoxControl methods
-    virtual void               StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void               Select( BOOL bMod1 = FALSE );
-    virtual void               Select( USHORT nModifier );
+    virtual void               StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void               Select( sal_Bool bMod1 = sal_False );
+    virtual void               Select( sal_uInt16 nModifier );
 
     virtual void               DoubleClick();
     virtual void               Click();
@@ -288,7 +288,7 @@ protected:
 public:
                                SFX_DECL_TOOLBOX_CONTROL();
 
-                               SfxToolBoxControl( USHORT nSlotID, USHORT nId, ToolBox& rBox, BOOL bShowStrings = FALSE );
+                               SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nId, ToolBox& rBox, sal_Bool bShowStrings = sal_False );
     virtual                    ~SfxToolBoxControl();
 
     ToolBox&                   GetToolBox() const;
@@ -302,21 +302,21 @@ public:
                                          ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
 
     static SfxItemState        GetItemState( const SfxPoolItem* pState );
-    static SfxToolBoxControl*  CreateControl( USHORT nSlotId, USHORT nTbxId, ToolBox *pBox, SfxModule *pMod );
+    static SfxToolBoxControl*  CreateControl( sal_uInt16 nSlotId, sal_uInt16 nTbxId, ToolBox *pBox, SfxModule *pMod );
     static void                RegisterToolBoxControl( SfxModule*, SfxTbxCtrlFactory*);
 };
 
 #define SFX_IMPL_TOOLBOX_CONTROL(Class, nItemClass) \
-        SfxToolBoxControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
+        SfxToolBoxControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
                { return new Class( nSlotId, nId, rTbx ); } \
-        void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
+        void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
                { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
                     Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
 
 #define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \
-        SfxToolBoxControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
+        SfxToolBoxControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
                { return new Class( nSlotId, nId, rTbx, Arg); } \
-        void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
+        void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
                { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
                     Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
 
@@ -342,10 +342,10 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
 {
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
-                            SfxDragToolBoxControl_Impl( USHORT nId, ToolBox& rBox );
+                            SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
     virtual Window*         CreateItemWindow( Window *pParent );
     using SfxToolBoxControl::Select;
-    virtual void            Select( BOOL bMod1 = FALSE );
+    virtual void            Select( sal_Bool bMod1 = sal_False );
 };
 
 //------------------------------------------------------------------------
@@ -361,7 +361,7 @@ class SfxAppToolBoxControl_Impl : public SfxToolBoxControl
 {
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
-                            SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+                            SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
                             ~SfxAppToolBoxControl_Impl();
     void                    SetImage( const String& rFacName );
 
@@ -377,17 +377,17 @@ public:
 protected:
     virtual void            Click();
     using SfxToolBoxControl::Select;
-    virtual void            Select( BOOL );
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void            Select( sal_Bool );
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual SfxPopupWindow* CreatePopupWindow();
                             DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
 private:
     String                  aLastURL;
-    BOOL                    bBigImages;
+    sal_Bool                    bBigImages;
     PopupMenu*              pMenu;
-    ULONG                   m_nSymbolsStyle;
-    BOOL                    m_bWasHiContrastMode;
-    BOOL                    m_bShowMenuImages;
+    sal_uIntPtr                   m_nSymbolsStyle;
+    sal_Bool                    m_bWasHiContrastMode;
+    sal_Bool                    m_bShowMenuImages;
 };
 
 class SfxHistoryToolBoxControl_Impl : public SfxToolBoxControl
@@ -400,22 +400,22 @@ private:
 protected:
     virtual void            Click( );
     using SfxToolBoxControl::Select;
-    virtual void            Select( BOOL );
+    virtual void            Select( sal_Bool );
 
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
-                            SfxHistoryToolBoxControl_Impl( USHORT nId, ToolBox& rBox );
+                            SfxHistoryToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
 };
 
 class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
 {
     protected:
         using SfxToolBoxControl::Select;
-        virtual void Select( USHORT nSelectModifier );
+        virtual void Select( sal_uInt16 nSelectModifier );
 
     public:
     SFX_DECL_TOOLBOX_CONTROL();
-        SfxReloadToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+        SfxReloadToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
 };
 
 class SfxPopupMenuManager;
@@ -428,20 +428,20 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
 */
 
 {
-    BOOL        bBigImages;
+    sal_Bool        bBigImages;
     PopupMenu*  pMenu;
-    BOOL        m_bWasHiContrastMode;
-    BOOL        m_bShowMenuImages;
+    sal_Bool        m_bWasHiContrastMode;
+    sal_Bool        m_bShowMenuImages;
 
 protected:
     virtual void            Click();
     using SfxToolBoxControl::Select;
-    virtual void            Select( BOOL );
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void            Select( sal_Bool );
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
                             DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
-                            SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+                            SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
                             ~SfxAddonsToolBoxControl_Impl();
 
                             void RefreshMenuImages( Menu* pMenu );
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx
index 3602f200e2a9..b663a277065f 100644
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/sfx2/inc/sfx2/templdlg.hxx
@@ -92,7 +92,7 @@ class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow
 {
 public:
                 SfxTemplateDialogWrapper
-                    (Window*,USHORT,SfxBindings*,SfxChildWinInfo*);
+                    (Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*);
                 SFX_DECL_CHILDWINDOW(SfxTemplateDialogWrapper);
 
     void            SetParagraphFamily();
diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx
index b6925ad332ad..cee9709841a5 100644
--- a/sfx2/inc/sfx2/titledockwin.hxx
+++ b/sfx2/inc/sfx2/titledockwin.hxx
@@ -76,7 +76,7 @@ namespace sfx2
             @return
                 the ID of the newly created toolbox item
         */
-        USHORT  AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
+        sal_uInt16  AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
         {
             return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
         }
@@ -114,7 +114,7 @@ namespace sfx2
         virtual void SetText( const String& i_rText );
 
         // DockingWindow overridables
-        void EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+        void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
 
         // own overridables
         virtual void onLayoutDone();
@@ -126,7 +126,7 @@ namespace sfx2
 
         /** internal version of AddDropDownToolBoxItem
         */
-        USHORT  impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback );
+        sal_uInt16  impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback );
 
         /** returns the current title.
 
diff --git a/sfx2/inc/sfx2/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx
index 38198e0ff7ee..5b2cbd1dfaf9 100644
--- a/sfx2/inc/sfx2/tplpitem.hxx
+++ b/sfx2/inc/sfx2/tplpitem.hxx
@@ -39,18 +39,18 @@ class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
 public:
     TYPEINFO();
     SfxTemplateItem();
-    SfxTemplateItem( USHORT nWhich,
+    SfxTemplateItem( sal_uInt16 nWhich,
                      const String &rStyle,
-                     USHORT nMask = 0xffff );
+                     sal_uInt16 nMask = 0xffff );
     SfxTemplateItem( const SfxTemplateItem& );
 
     const String&           GetStyleName() const { return aStyle; }
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
-    virtual BYTE            GetFlagCount() const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_uInt8           GetFlagCount() const;
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx
index 420a44440aae..f3376e733702 100644
--- a/sfx2/inc/sfx2/viewfac.hxx
+++ b/sfx2/inc/sfx2/viewfac.hxx
@@ -44,12 +44,12 @@ class SFX2_DLLPUBLIC SfxViewFactory
 {
 public:
     SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI,
-                    USHORT nOrdinal, const sal_Char* asciiViewName );
+                    sal_uInt16 nOrdinal, const sal_Char* asciiViewName );
     ~SfxViewFactory();
 
     SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
     void          InitFactory();
-    USHORT        GetOrdinal() const { return nOrd; }
+    sal_uInt16        GetOrdinal() const { return nOrd; }
 
     /// returns a legacy view name. This is "view" with an appended ordinal/ID.
     String        GetLegacyViewName() const;
@@ -64,7 +64,7 @@ public:
 private:
     SfxViewCtor fnCreate;
     SfxViewInit fnInit;
-    USHORT      nOrd;
+    sal_uInt16      nOrd;
     const String    m_sViewName;
 };
 
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index affa836486e6..ef5d4a358e22 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -80,7 +80,7 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
     SfxObjectShellRef           xObjSh;
     SfxDispatcher*              pDispatcher;
     SfxBindings*                pBindings;
-    USHORT                      nAdjustPosPixelLock;
+    sal_uInt16                      nAdjustPosPixelLock;
 
 private:
 #ifndef _SFX_HXX
@@ -104,21 +104,21 @@ public:
 
     static void             SetViewFrame( SfxViewFrame* );
 
-    static SfxViewFrame*    LoadHiddenDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId );
-    static SfxViewFrame*    LoadDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId );
-    static SfxViewFrame*    LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const USHORT i_nViewId = 0 );
-    static SfxViewFrame*    LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const USHORT i_nViewId = 0 );
-    static SfxViewFrame*    DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const USHORT i_nViewId = 0 );
+    static SfxViewFrame*    LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId );
+    static SfxViewFrame*    LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId );
+    static SfxViewFrame*    LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId = 0 );
+    static SfxViewFrame*    LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const sal_uInt16 i_nViewId = 0 );
+    static SfxViewFrame*    DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId = 0 );
 
     static SfxViewFrame*    Current();
-    static SfxViewFrame*    GetFirst( const SfxObjectShell* pDoc = 0, BOOL bOnlyVisible = TRUE );
-    static SfxViewFrame*    GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, BOOL bOnlyVisible = TRUE );
-    static USHORT           Count();
+    static SfxViewFrame*    GetFirst( const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True );
+    static SfxViewFrame*    GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True );
+    static sal_uInt16           Count();
 
     static SfxViewFrame*    Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL );
 
-            void            DoActivate(BOOL bMDI, SfxViewFrame *pOld=NULL);
-            void            DoDeactivate(BOOL bMDI, SfxViewFrame *pOld=NULL);
+            void            DoActivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL);
+            void            DoDeactivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL);
 
     SfxViewFrame*           GetParentViewFrame() const;
 
@@ -147,12 +147,12 @@ public:
                                         const Point &rPos, const Size &rSize );
     void                    Hide();
     void                    Show();
-    BOOL                    IsVisible() const;
+    sal_Bool                    IsVisible() const;
     void                    ToTop();
-    void                    Enable( BOOL bEnable );
-    virtual BOOL            Close();
-    virtual void            Activate( BOOL bUI );
-    virtual void            Deactivate( BOOL bUI );
+    void                    Enable( sal_Bool bEnable );
+    virtual sal_Bool            Close();
+    virtual void            Activate( sal_Bool bUI );
+    virtual void            Deactivate( sal_Bool bUI );
 
     // DDE-Interface
     virtual long            DdeExecute( const String& rCmd );
@@ -172,17 +172,17 @@ public:
     static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
 
     // interne Handler
-    SAL_DLLPRIVATE virtual BOOL SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
+    SAL_DLLPRIVATE virtual sal_Bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
     SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const;
     SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh );
 
     virtual SfxObjectShell* GetObjectShell();
-    USHORT                  GetCurViewId() const;
+    sal_uInt16                  GetCurViewId() const;
     SfxFrame&               GetFrame() const;
     SfxViewFrame*           GetTopViewFrame() const;
 
-    BOOL                    DoClose();
-    ULONG                   GetFrameType() const
+    sal_Bool                    DoClose();
+    sal_uIntPtr                 GetFrameType() const
                             { return GetFrame().GetFrameType(); }
     SfxFrame&               GetTopFrame() const
                             { return GetFrame().GetTopFrame(); }
@@ -191,47 +191,47 @@ public:
     void                    CancelTransfers()
                             { GetFrame().CancelTransfers(); }
 
-    void                    SetModalMode( BOOL );
-    BOOL                    IsInModalMode() const;
-    void                    Resize(BOOL bForce=FALSE);
-
-    //void                        SetChildWindow(USHORT nId, BOOL bVisible );
-    void                        SetChildWindow(USHORT nId, BOOL bVisible, BOOL bSetFocus=TRUE);
-    void                        ToggleChildWindow(USHORT);
-    BOOL                        HasChildWindow(USHORT);
-    BOOL                        KnowsChildWindow(USHORT);
-    void                        ShowChildWindow(USHORT,BOOL bVisible=TRUE);
-    SfxChildWindow*             GetChildWindow(USHORT);
+    void                    SetModalMode( sal_Bool );
+    sal_Bool                    IsInModalMode() const;
+    void                    Resize(sal_Bool bForce=sal_False);
+
+    //void                        SetChildWindow(sal_uInt16 nId, sal_Bool bVisible );
+    void                        SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True);
+    void                        ToggleChildWindow(sal_uInt16);
+    sal_Bool                        HasChildWindow(sal_uInt16);
+    sal_Bool                        KnowsChildWindow(sal_uInt16);
+    void                        ShowChildWindow(sal_uInt16,sal_Bool bVisible=sal_True);
+    SfxChildWindow*             GetChildWindow(sal_uInt16);
     void                        ChildWindowExecute(SfxRequest&);
     void                        ChildWindowState(SfxItemSet&);
 
 //#if 0 // _SOLAR__PRIVATE
     SAL_DLLPRIVATE void SetDowning_Impl();
     SAL_DLLPRIVATE void GetDocNumber_Impl();
-    SAL_DLLPRIVATE BOOL IsDowning_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsDowning_Impl() const;
     SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh );
     SAL_DLLPRIVATE void ReleaseObjectShell_Impl();
 
     SAL_DLLPRIVATE void GetState_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq );
-    SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, BOOL bAsync );
+    SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, sal_Bool bAsync );
     SAL_DLLPRIVATE void StateReload_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE void ExecView_Impl( SfxRequest &rReq );
     SAL_DLLPRIVATE void StateView_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq );
     SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const;
-    SAL_DLLPRIVATE void ForceOuterResize_Impl(BOOL bOn=TRUE);
-    SAL_DLLPRIVATE BOOL IsResizeInToOut_Impl() const;
-    SAL_DLLPRIVATE BOOL IsAdjustPosSizePixelLocked_Impl() const
+    SAL_DLLPRIVATE void ForceOuterResize_Impl(sal_Bool bOn=sal_True);
+    SAL_DLLPRIVATE sal_Bool IsResizeInToOut_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsAdjustPosSizePixelLocked_Impl() const
                             { return nAdjustPosPixelLock != 0; }
-    SAL_DLLPRIVATE void ForceInnerResize_Impl( BOOL bOn );
+    SAL_DLLPRIVATE void ForceInnerResize_Impl( sal_Bool bOn );
     SAL_DLLPRIVATE void UpdateDocument_Impl();
 
-    SAL_DLLPRIVATE void LockObjectShell_Impl(BOOL bLock=TRUE);
+    SAL_DLLPRIVATE void LockObjectShell_Impl(sal_Bool bLock=sal_True);
 
-    SAL_DLLPRIVATE void MakeActive_Impl( BOOL bActivate );
-    SAL_DLLPRIVATE void SetQuietMode_Impl( BOOL );
+    SAL_DLLPRIVATE void MakeActive_Impl( sal_Bool bActivate );
+    SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool );
     SAL_DLLPRIVATE const Size& GetMargin_Impl() const;
     SAL_DLLPRIVATE void SetActiveChildFrame_Impl( SfxViewFrame* );
     SAL_DLLPRIVATE SfxViewFrame* GetActiveChildFrame_Impl() const;
@@ -239,21 +239,21 @@ public:
     SAL_DLLPRIVATE static void CloseHiddenFrames_Impl();
     SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &);
     SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &);
-    SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( USHORT nId );
+    SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( sal_uInt16 nId );
     SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const ::rtl::OUString& sMacro);
 
     SAL_DLLPRIVATE void Exec_Impl(SfxRequest &);
     SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &);
     SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &);
 
-    SAL_DLLPRIVATE void SetCurViewId_Impl( const USHORT i_nID );
+    SAL_DLLPRIVATE void SetCurViewId_Impl( const sal_uInt16 i_nID );
     SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL );
 
 //#endif
 private:
-    SAL_DLLPRIVATE BOOL SwitchToViewShell_Impl( USHORT nNo, BOOL bIsIndex = FALSE );
+    SAL_DLLPRIVATE sal_Bool SwitchToViewShell_Impl( sal_uInt16 nNo, sal_Bool bIsIndex = sal_False );
     SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell );
-    SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const USHORT i_nNewViewId );
+    SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId );
 
     /** loads the given existing document into the given frame
 
@@ -276,7 +276,7 @@ private:
                             const SfxObjectShell& i_rDoc,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
                             const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rLoadArgs,
-                            const USHORT i_nViewId,
+                            const sal_uInt16 i_nViewId,
                             const bool i_bHidden
                         );
 
@@ -298,7 +298,7 @@ private:
     SAL_DLLPRIVATE static SfxViewFrame* LoadViewIntoFrame_Impl_NoThrow(
                             const SfxObjectShell& i_rDoc,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
-                            const USHORT i_nViewId,
+                            const sal_uInt16 i_nViewId,
                             const bool i_bHidden
                         );
 };
@@ -315,7 +315,7 @@ public:
                                 SfxPoolItem( 0 ),
                                 pFrame( pViewFrame)
                             {}
-                            SfxViewFrameItem( USHORT nWhichId, SfxViewFrame *pViewFrame ):
+                            SfxViewFrameItem( sal_uInt16 nWhichId, SfxViewFrame *pViewFrame ):
                                 SfxPoolItem( nWhichId ),
                                 pFrame( pViewFrame)
                             {}
@@ -334,16 +334,16 @@ class SfxVerbListItem : public SfxPoolItem
 
 public:
                             TYPEINFO();
-                            SfxVerbListItem( USHORT nWhichId = SID_OBJECT ) :
+                            SfxVerbListItem( sal_uInt16 nWhichId = SID_OBJECT ) :
                                 SfxPoolItem( nWhichId )
                             {}
 
-                            SfxVerbListItem( USHORT nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& );
+                            SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& );
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; }
 };
 
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 5a032af30050..6e613cce0176 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -119,7 +119,7 @@ private: \
     static SfxViewFactory *pFactory; \
 public: \
     static SfxViewShell  *CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView); \
-    static void           RegisterFactory( USHORT nPrio = USHRT_MAX ); \
+    static void           RegisterFactory( sal_uInt16 nPrio = USHRT_MAX ); \
     static SfxViewFactory&Factory() { return *pFactory; } \
     static void           InitFactory()
 
@@ -127,7 +127,7 @@ public: \
     SfxViewFactory* Class::pFactory; \
     SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \
     { return new Class(pFrame, pOldView); } \
-    void Class::RegisterFactory( USHORT nPrio ) \
+    void Class::RegisterFactory( sal_uInt16 nPrio ) \
     { \
         pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\
         InitFactory(); \
@@ -158,11 +158,11 @@ friend class SfxPrinterController;
     SfxViewFrame*               pFrame;
     SfxShell*                   pSubShell;
     Window*                     pWindow;
-    BOOL                        bNoNewWindow;
+    sal_Bool                        bNoNewWindow;
 
 protected:
-    virtual void                Activate(BOOL IsMDIActivate);
-    virtual void                Deactivate(BOOL IsMDIActivate);
+    virtual void                Activate(sal_Bool IsMDIActivate);
+    virtual void                Deactivate(sal_Bool IsMDIActivate);
 
     virtual Size                GetOptimalSizePixel() const;
 
@@ -176,9 +176,9 @@ protected:
 
 public:
     // Iteration
-    static SfxViewShell*        GetFirst( const TypeId* pType = 0, BOOL bOnlyVisible = TRUE );
+    static SfxViewShell*        GetFirst( const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True );
     static SfxViewShell*        GetNext( const SfxViewShell& rPrev,
-                                         const TypeId* pType = 0, BOOL bOnlyVisible = TRUE );
+                                         const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True );
     static SfxViewShell*        Current();
 
     static SfxViewShell*        Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController );
@@ -187,7 +187,7 @@ public:
                                 TYPEINFO();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH)
 
-                                SfxViewShell( SfxViewFrame *pFrame, USHORT nFlags = 0 );
+                                SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 );
     virtual                     ~SfxViewShell();
 
     SfxInPlaceClient*           GetIPClient() const;
@@ -210,23 +210,23 @@ public:
     void                        SetScrollingMode( SfxScrollingMode eMode );
 
     // Misc
-    virtual USHORT              PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
-    virtual String              GetSelectionText( BOOL bCompleteWords = FALSE );
-    virtual BOOL                HasSelection( BOOL bText = TRUE ) const;
+    virtual sal_uInt16              PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
+    virtual String              GetSelectionText( sal_Bool bCompleteWords = sal_False );
+    virtual sal_Bool                HasSelection( sal_Bool bText = sal_True ) const;
     virtual SdrView*            GetDrawView() const;
 
     void                        SetSubShell( SfxShell *pShell );
     SfxShell*                   GetSubShell() const { return pSubShell; }
     void                        AddSubShell( SfxShell& rShell );
     void                        RemoveSubShell( SfxShell *pShell=NULL );
-    SfxShell*                   GetSubShell( USHORT );
+    SfxShell*                   GetSubShell( sal_uInt16 );
 
     // Focus, KeyInput, Cursor
     void                        GotFocus() const;
     inline void                 LostFocus() const;
-    virtual void                ShowCursor( FASTBOOL bOn = TRUE );
+    virtual void                ShowCursor( FASTBOOL bOn = sal_True );
     virtual FASTBOOL            KeyInput( const KeyEvent &rKeyEvent );
-    BOOL                        Escape();
+    sal_Bool                        Escape();
 
     // Viewing Interface
     Window*                     GetWindow() const { return pWindow; }
@@ -239,17 +239,17 @@ public:
     void                        AdjustVisArea(const Rectangle& rRect);
 
     // Printing Interface
-    virtual SfxPrinter*         GetPrinter( BOOL bCreate = FALSE );
-    virtual USHORT              SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=FALSE );
+    virtual SfxPrinter*         GetPrinter( sal_Bool bCreate = sal_False );
+    virtual sal_uInt16              SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=sal_False );
     virtual SfxTabPage*         CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
-    void                        LockPrinter( BOOL bLock = TRUE );
-    BOOL                        IsPrinterLocked() const;
+    void                        LockPrinter( sal_Bool bLock = sal_True );
+    sal_Bool                    IsPrinterLocked() const;
     virtual JobSetup            GetJobSetup() const;
     Printer*                    GetActivePrinter() const;
 
     // Workingset
-    virtual void                WriteUserData( String&, BOOL bBrowse = FALSE );
-    virtual void                ReadUserData( const String&, BOOL bBrowse = FALSE );
+    virtual void                WriteUserData( String&, sal_Bool bBrowse = sal_False );
+    virtual void                ReadUserData( const String&, sal_Bool bBrowse = sal_False );
     virtual void                WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
     virtual void                ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
     virtual void                QueryObjAreaPixel( Rectangle& rRect ) const;
@@ -276,43 +276,43 @@ public:
     void                        SetMargin( const Size& );
     void                        DisconnectAllClients();
     virtual SfxFrame*           GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium );
-    BOOL                        NewWindowAllowed() const            { return !bNoNewWindow; }
-    void                        SetNewWindowAllowed( BOOL bSet )    { bNoNewWindow = !bSet; }
+    sal_Bool                        NewWindowAllowed() const            { return !bNoNewWindow; }
+    void                        SetNewWindowAllowed( sal_Bool bSet )    { bNoNewWindow = !bSet; }
 
     void                        SetController( SfxBaseController* pController );
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
                                 GetController();
 
     ::cppu::OInterfaceContainerHelper& GetContextMenuInterceptors() const;
-    BOOL                        TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
+    sal_Bool                        TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
 
     void                        SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
     void                        ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool );
 
-    void                        AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, BOOL );
+    void                        AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, sal_Bool );
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier();
 
 #if _SOLAR__PRIVATE
     SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
     SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
     SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
-    SAL_DLLPRIVATE FASTBOOL GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
+    SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
 
     SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient )
-                                { GetIPClientList_Impl(TRUE)->Insert(pIPClient); }
+                                { GetIPClientList_Impl(sal_True)->Insert(pIPClient); }
     SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient )
-                                { GetIPClientList_Impl(TRUE)->Remove(pIPClient); }
-    SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( BOOL bCreate = TRUE ) const;
+                                { GetIPClientList_Impl(sal_True)->Remove(pIPClient); }
+    SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const;
     SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP );
     SAL_DLLPRIVATE void DiscardClients_Impl();
-    SAL_DLLPRIVATE BOOL PlugInsActive() const;
+    SAL_DLLPRIVATE sal_Bool PlugInsActive() const;
 
     SAL_DLLPRIVATE SfxPrinter* SetPrinter_Impl( SfxPrinter *pNewPrinter );
-    SAL_DLLPRIVATE BOOL IsShowView_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsShowView_Impl() const;
 
     SAL_DLLPRIVATE long HandleNotifyEvent_Impl( NotifyEvent& rEvent );
-    SAL_DLLPRIVATE BOOL HasKeyListeners_Impl();
-    SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl();
+    SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
+    SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
 
     SAL_DLLPRIVATE SfxBaseController*   GetBaseController_Impl() const;
 
@@ -323,12 +323,12 @@ public:
     SAL_DLLPRIVATE SfxFrameSetDescriptor* GetFrameSet_Impl() const;
     SAL_DLLPRIVATE void SetFrameSet_Impl(SfxFrameSetDescriptor*);
     SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& );
-    SAL_DLLPRIVATE void PushSubShells_Impl( BOOL bPush=TRUE );
-    SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( FALSE ); }
+    SAL_DLLPRIVATE void PushSubShells_Impl( sal_Bool bPush=sal_True );
+    SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( sal_False ); }
     SAL_DLLPRIVATE void TakeOwnerShip_Impl();
     SAL_DLLPRIVATE void CheckOwnerShip_Impl();
     SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl();
-    SAL_DLLPRIVATE BOOL ExecKey_Impl(const KeyEvent& aKey);
+    SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey);
 #endif
 };
 
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 18056e26b730..52dbe7b71294 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -45,8 +45,8 @@ public:
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     String  getLanguage() { return aLanguage; };
 };
 
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index e45d8f591342..4816bfc58f8e 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -83,14 +83,14 @@ public:
 
     inline String       GetSearchText() const { return m_aSearchEdit.GetText(); }
     inline void         SetSearchText( const String& _rText ) { m_aSearchEdit.SetText( _rText ); }
-    inline bool         IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != FALSE ); }
-    inline bool         IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != FALSE ); }
-    inline bool         IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != FALSE ); }
-    inline bool         IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != FALSE ); }
+    inline bool         IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != sal_False ); }
+    inline bool         IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != sal_False ); }
+    inline bool         IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != sal_False ); }
+    inline bool         IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != sal_False ); }
 
     void                SetFocusOnEdit();
 
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
     virtual void        Move();
     virtual void        StateChanged( StateChangedType nStateChange );
 };
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index ee3b2ed2b0c1..d8442bb215f6 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -226,7 +226,7 @@ void SfxPropertyHandler::Property( ApplicationProperty& rProp )
                             String aFactory = String::CreateFromAscii("private:factory/");
                             if ( pArgs && *pArgs )
                             {
-                                SFX_ITEMSET_ARG( &aSet, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, FALSE );
+                                SFX_ITEMSET_ARG( &aSet, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, sal_False );
                                 if ( pFactoryName )
                                     aFactory += pFactoryName->GetValue();
                                 else
@@ -304,7 +304,7 @@ SfxApplication* SfxApplication::GetOrCreate()
         RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SetApp" );
         pApp = pNew;
 
-        // at the moment a bug may occur when Initialize_Impl returns FALSE, but this is only temporary because all code that may cause such a
+        // at the moment a bug may occur when Initialize_Impl returns sal_False, but this is only temporary because all code that may cause such a
         // fault will be moved outside the SFX
         pApp->Initialize_Impl();
 
@@ -473,9 +473,9 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
         // DocWinActivate : both frames belong to the same TopWindow
         // TopWinActivate : both frames belong to different TopWindows
 // not used anymore!
-//      BOOL bDocWinActivate = pOldContainerFrame && pNewContainerFrame &&
+//      sal_Bool bDocWinActivate = pOldContainerFrame && pNewContainerFrame &&
 //                  pOldContainerFrame->GetTopViewFrame() == pNewContainerFrame->GetTopViewFrame();
-        BOOL bTaskActivate = pOldContainerFrame != pNewContainerFrame;
+        sal_Bool bTaskActivate = pOldContainerFrame != pNewContainerFrame;
 
         if ( pOldContainerFrame )
         {
@@ -641,7 +641,7 @@ void SfxApplication::LeaveAsynchronCall_Impl()
 
 //--------------------------------------------------------------------
 
-FASTBOOL SfxApplication::IsInAsynchronCall_Impl() const
+bool SfxApplication::IsInAsynchronCall_Impl() const
 {
     return pAppData_Impl->nAsynchronCalls > 0;
 }
@@ -698,7 +698,7 @@ SfxObjectShellArr_Impl&     SfxApplication::GetObjectShells_Impl() const
     return *pAppData_Impl->pObjShells;
 }
 
-void SfxApplication::Invalidate( USHORT nId )
+void SfxApplication::Invalidate( sal_uInt16 nId )
 {
     for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame ) )
         Invalidate_Impl( pFrame->GetBindings(), nId );
@@ -708,8 +708,8 @@ void SfxApplication::Invalidate( USHORT nId )
 #define STRING( x )                         DOSTRING( x )
 
 typedef long (SAL_CALL *basicide_handle_basic_error)(void*);
-typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, BOOL, rtl_uString*);
-typedef void* (SAL_CALL *basicide_macro_organizer)(INT16);
+typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, sal_Bool, rtl_uString*);
+typedef void* (SAL_CALL *basicide_macro_organizer)(sal_Int16);
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
@@ -734,7 +734,7 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic )
 
 sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL )
 {
-    sal_Bool result = FALSE;
+    sal_Bool result = sal_False;
 
     ::com::sun::star::uno::Reference
         < ::com::sun::star::lang::XMultiServiceFactory > xSMgr =
@@ -758,7 +758,7 @@ sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL )
 
             if ( xUrl.is() )
             {
-                result = TRUE;
+                result = sal_True;
             }
         }
         catch ( ::com::sun::star::uno::RuntimeException& )
@@ -784,11 +784,11 @@ SfxApplication::ChooseScript()
         uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() );
 
           AbstractScriptSelectorDialog* pDlg =
-            pFact->CreateScriptSelectorDialog( NULL, FALSE, xFrame );
+            pFact->CreateScriptSelectorDialog( NULL, sal_False, xFrame );
 
         OSL_TRACE("done, now exec it");
 
-          USHORT nRet = pDlg->Execute();
+          sal_uInt16 nRet = pDlg->Execute();
 
         OSL_TRACE("has returned");
 
@@ -802,7 +802,7 @@ SfxApplication::ChooseScript()
     return aScriptURL;
 }
 
-void SfxApplication::MacroOrganizer( INT16 nTabId )
+void SfxApplication::MacroOrganizer( sal_Int16 nTabId )
 {
     // get basctl dllname
     static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 171a64d044ec..6d6c8ace5a09 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -313,7 +313,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 e94635063727..d98147078bc6 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -170,13 +170,13 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
 
 //--------------------------------------------------------------------
 
-BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
+sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     SfxItemPool &rPool = GetPool();
     String aTRUEStr('1');
 
-    const USHORT *pRanges = rSet.GetRanges();
+    const sal_uInt16 *pRanges = rSet.GetRanges();
     SvtSaveOptions aSaveOptions;
     SvtUndoOptions aUndoOptions;
     SvtHelpOptions aHelpOptions;
@@ -186,132 +186,132 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 
     while ( *pRanges )
     {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
+        for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
         {
             switch(nWhich)
             {
                 case SID_ATTR_BUTTON_OUTSTYLE3D :
                     if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BUTTON_OUTSTYLE3D ),
                               aMiscOptions.GetToolboxStyle() != TOOLBOX_STYLE_FLAT)))
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_ATTR_BUTTON_BIGSIZE :
                 {
                     if( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BUTTON_BIGSIZE ), aMiscOptions.AreCurrentSymbolsLarge() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 }
                 case SID_ATTR_BACKUP :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_BACKUP))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BACKUP ),aSaveOptions.IsBackup())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_PRETTYPRINTING:
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), aSaveOptions.IsPrettyPrinting())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_WARNALIENFORMAT:
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), aSaveOptions.IsWarnAlienFormat())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_AUTOSAVE :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVE))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVE ), aSaveOptions.IsAutoSave())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_AUTOSAVEPROMPT :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVEPROMPT))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVEPROMPT ), aSaveOptions.IsAutoSavePrompt())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_AUTOSAVEMINUTE :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME))
-                            if (!rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (UINT16)aSaveOptions.GetAutoSaveTime())))
-                                bRet = FALSE;
+                            if (!rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (sal_uInt16)aSaveOptions.GetAutoSaveTime())))
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_DOCINFO :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_DOCINFO ), aSaveOptions.IsDocInfoSave())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_WORKINGSET :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEWORKINGSET))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WORKINGSET ), aSaveOptions.IsSaveWorkingSet())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_SAVEDOCVIEW :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEDOCVIEW))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_SAVEDOCVIEW ), aSaveOptions.IsSaveDocView())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_METRIC :
 //                    if(rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_METRIC ),
 //                                pOptions->GetMetric() ) ) )
-//                        bRet = TRUE;
+//                        bRet = sal_True;
                     break;
                 case SID_HELPBALLOONS :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPBALLOONS ),
                                aHelpOptions.IsExtendedHelp() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_HELPTIPS :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPTIPS ),
                                aHelpOptions.IsHelpTips() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_ATTR_AUTOHELPAGENT :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_ATTR_AUTOHELPAGENT ),
                                aHelpOptions.IsHelpAgentAutoStartMode() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_HELPAGENT_TIMEOUT :
                     if ( rSet.Put( SfxInt32Item( rPool.GetWhich( SID_HELPAGENT_TIMEOUT ),
                                                  aHelpOptions.GetHelpAgentTimeoutPeriod() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_ATTR_WELCOMESCREEN :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_ATTR_WELCOMESCREEN ),
                                aHelpOptions.IsWelcomeScreen() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_HELP_STYLESHEET :
                     if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_HELP_STYLESHEET ),
                                aHelpOptions.GetHelpStyleSheet() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                 break;
                 case SID_ATTR_UNDO_COUNT :
                     if(rSet.Put( SfxUInt16Item ( rPool.GetWhich( SID_ATTR_UNDO_COUNT ),
-                                 (UINT16)aUndoOptions.GetUndoCount() ) ) )
-                        bRet = TRUE;
+                                 (sal_uInt16)aUndoOptions.GetUndoCount() ) ) )
+                        bRet = sal_True;
                     break;
                 case SID_ATTR_QUICKLAUNCHER :
                 {
@@ -319,74 +319,74 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     {
                         if ( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_QUICKLAUNCHER ),
                                                     ShutdownIcon::GetAutostart() ) ) )
-                            bRet = TRUE;
+                            bRet = sal_True;
                     }
                     else
                     {
                         rSet.DisableItem( rPool.GetWhich( SID_ATTR_QUICKLAUNCHER ) );
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                     break;
                 }
                 case SID_SAVEREL_INET :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVERELINET))
                             if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_INET ), aSaveOptions.IsSaveRelINet() )))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_SAVEREL_FSYS :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS))
                             if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_FSYS ), aSaveOptions.IsSaveRelFSys() )))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_BASIC_ENABLED :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_BASICMODE))
                         {
-                            if ( !rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_BASIC_ENABLED ), sal::static_int_cast< UINT16 >(aSecurityOptions.GetBasicMode()))))
-                                bRet = FALSE;
+                            if ( !rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_BASIC_ENABLED ), sal::static_int_cast< sal_uInt16 >(aSecurityOptions.GetBasicMode()))))
+                                bRet = sal_False;
                         }
                     }
                     break;
                 case SID_INET_EXE_PLUGIN  :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_EXECUTEPLUGINS))
                         {
                             if ( !rSet.Put( SfxBoolItem( SID_INET_EXE_PLUGIN, aSecurityOptions.IsExecutePlugins() ) ) )
-                                bRet = FALSE;
+                                bRet = sal_False;
                         }
                     }
                     break;
                 case SID_MACRO_WARNING :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_WARNING))
                         {
                             if ( !rSet.Put( SfxBoolItem( SID_MACRO_WARNING, aSecurityOptions.IsWarningEnabled() ) ) )
-                                bRet = FALSE;
+                                bRet = sal_False;
                         }
                     }
                     break;
                 case SID_MACRO_CONFIRMATION :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_CONFIRMATION))
                         {
                             if ( !rSet.Put( SfxBoolItem( SID_MACRO_CONFIRMATION, aSecurityOptions.IsConfirmationEnabled() ) ) )
-                                bRet = FALSE;
+                                bRet = sal_False;
                         }
                     }
                     break;
                 case SID_SECURE_URL :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS))
                         {
                             ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs();
@@ -400,7 +400,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                             if( !rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL),
                                     &aList ) ) )
                             {
-                                bRet = FALSE;
+                                bRet = sal_False;
                             }
                             for( nURL=0; nURL<nCount; ++nURL )
                             {
@@ -418,31 +418,31 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 case SID_INET_PROXY_TYPE :
                 {
                     if( rSet.Put( SfxUInt16Item ( rPool.GetWhich( SID_INET_PROXY_TYPE ),
-                        (UINT16)aInetOptions.GetProxyType() )))
-                            bRet = TRUE;
+                        (sal_uInt16)aInetOptions.GetProxyType() )))
+                            bRet = sal_True;
                     break;
                 }
                 case SID_INET_HTTP_PROXY_NAME :
                 {
                     if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_HTTP_PROXY_NAME ),
                         aInetOptions.GetProxyHttpName() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 }
                 case SID_INET_HTTP_PROXY_PORT :
                     if ( rSet.Put( SfxInt32Item( rPool.GetWhich(SID_INET_HTTP_PROXY_PORT ),
                         aInetOptions.GetProxyHttpPort() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 case SID_INET_FTP_PROXY_NAME :
                     if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_FTP_PROXY_NAME ),
                         aInetOptions.GetProxyFtpName() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 case SID_INET_FTP_PROXY_PORT :
                     if ( rSet.Put( SfxInt32Item ( rPool.GetWhich(SID_INET_FTP_PROXY_PORT ),
                         aInetOptions.GetProxyFtpPort() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 case SID_INET_SECURITY_PROXY_NAME :
                 case SID_INET_SECURITY_PROXY_PORT :
@@ -453,7 +453,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 case SID_INET_NOPROXY :
                     if( rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_NOPROXY),
                         aInetOptions.GetProxyNoProxy() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 case SID_ATTR_PATHNAME :
                 case SID_ATTR_PATHGROUP :
@@ -461,7 +461,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     SfxAllEnumItem aNames(rPool.GetWhich(SID_ATTR_PATHGROUP));
                     SfxAllEnumItem aValues(rPool.GetWhich(SID_ATTR_PATHNAME));
                     SvtPathOptions aPathCfg;
-                    for ( USHORT nProp = SvtPathOptions::PATH_ADDIN;
+                    for ( sal_uInt16 nProp = SvtPathOptions::PATH_ADDIN;
                           nProp <= SvtPathOptions::PATH_WORK; nProp++ )
                     {
                         const String aName( SfxResId( CONFIG_PATH_START + nProp ) );
@@ -496,7 +496,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     }
 
                     if ( rSet.Put(aNames) || rSet.Put(aValues) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                 }
 
                 default:
@@ -515,7 +515,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 }
 
 //--------------------------------------------------------------------
-BOOL SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pReferer ) const
+sal_Bool SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pReferer ) const
 {
     return SvtSecurityOptions().IsSecureURL( rURL.GetMainURL( INetURLObject::NO_DECODE ), *pReferer );
 }
@@ -525,8 +525,8 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 {
     const SfxPoolItem *pItem = 0;
     SfxItemPool &rPool = GetPool();
-    BOOL bResetSession = FALSE;
-    BOOL bProxiesModified = FALSE;
+    sal_Bool bResetSession = sal_False;
+    sal_Bool bProxiesModified = sal_False;
 
     SvtSaveOptions aSaveOptions;
     SvtUndoOptions aUndoOptions;
@@ -535,18 +535,18 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     SvtPathOptions aPathOptions;
     SvtInetOptions aInetOptions;
     SvtMiscOptions aMiscOptions;
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_OUTSTYLE3D), TRUE, &pItem) )
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_OUTSTYLE3D), sal_True, &pItem) )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        USHORT nOutStyle =
+        sal_uInt16 nOutStyle =
             ( (const SfxBoolItem *)pItem)->GetValue() ? 0 : TOOLBOX_STYLE_FLAT;
         aMiscOptions.SetToolboxStyle( nOutStyle );
     }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_BIGSIZE), TRUE, &pItem) )
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_BIGSIZE), sal_True, &pItem) )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        BOOL bBigSize = ( (const SfxBoolItem*)pItem )->GetValue();
+        sal_Bool bBigSize = ( (const SfxBoolItem*)pItem )->GetValue();
         aMiscOptions.SetSymbolsSize(
             sal::static_int_cast< sal_Int16 >(
                 bBigSize ? SFX_SYMBOLS_SIZE_LARGE : SFX_SYMBOLS_SIZE_SMALL ) );
@@ -561,145 +561,145 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     }
 
     // Backup
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BACKUP), TRUE, &pItem) )
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BACKUP), sal_True, &pItem) )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetBackup( ( (const SfxBoolItem*)pItem )->GetValue() );
     }
 
     // PrettyPrinting
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA( SfxBoolItem ), "BoolItem expected" );
         aSaveOptions.SetPrettyPrinting( static_cast< const SfxBoolItem*> ( pItem )->GetValue() );
     }
 
     // WarnAlienFormat
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA( SfxBoolItem ), "BoolItem expected" );
         aSaveOptions.SetWarnAlienFormat( static_cast< const SfxBoolItem*> ( pItem )->GetValue() );
     }
 
     // AutoSave
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVE), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVE), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetAutoSave( ( (const SfxBoolItem*)pItem )->GetValue() );
     }
 
     // AutoSave-Propt
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEPROMPT), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEPROMPT), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetAutoSavePrompt(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // AutoSave-Time
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEMINUTE), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEMINUTE), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
         aSaveOptions.SetAutoSaveTime(((const SfxUInt16Item *)pItem)->GetValue());
     }
 
     // DocInfo
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_DOCINFO), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_DOCINFO), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetDocInfoSave(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // offende Dokumente merken
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WORKINGSET), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WORKINGSET), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetSaveWorkingSet(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // Fenster-Einstellung speichern
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_SAVEDOCVIEW), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_SAVEDOCVIEW), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetSaveDocView(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // Metric
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_METRIC), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_METRIC), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
 //        pOptions->SetMetric((FieldUnit)((const SfxUInt16Item*)pItem)->GetValue());
     }
 
     // HelpBalloons
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPBALLOONS), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPBALLOONS), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aHelpOptions.SetExtendedHelp(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // HelpTips
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPTIPS), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPTIPS), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aHelpOptions.SetHelpTips(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // AutoHelpAgent
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOHELPAGENT ), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOHELPAGENT ), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aHelpOptions.SetHelpAgentAutoStartMode( ((const SfxBoolItem *)pItem)->GetValue() );
     }
 
     // help agent timeout
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_HELPAGENT_TIMEOUT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_HELPAGENT_TIMEOUT ), sal_True, &pItem ) )
     {
         DBG_ASSERT(pItem->ISA(SfxInt32Item), "Int32Item expected");
         aHelpOptions.SetHelpAgentTimeoutPeriod( ( (const SfxInt32Item*)pItem )->GetValue() );
     }
 
     // WelcomeScreen
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WELCOMESCREEN ), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WELCOMESCREEN ), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aHelpOptions.SetWelcomeScreen( ((const SfxBoolItem *)pItem)->GetValue() );
     }
 
     // WelcomeScreen
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_WELCOMESCREEN_RESET ), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_WELCOMESCREEN_RESET ), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        BOOL bReset = ((const SfxBoolItem *)pItem)->GetValue();
+        sal_Bool bReset = ((const SfxBoolItem *)pItem)->GetValue();
         if ( bReset )
         {
             DBG_ERROR( "Not implemented, may be EOL!" );
         }                                                   }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
         aHelpOptions.SetHelpStyleSheet( ((const SfxStringItem *)pItem)->GetValue() );
     }
 
     // SaveRelINet
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_INET), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_INET), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetSaveRelINet(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // SaveRelFSys
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_FSYS), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_FSYS), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetSaveRelFSys(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // Undo-Count
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_UNDO_COUNT), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_UNDO_COUNT), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
-        USHORT nUndoCount = ((const SfxUInt16Item*)pItem)->GetValue();
+        sal_uInt16 nUndoCount = ((const SfxUInt16Item*)pItem)->GetValue();
         aUndoOptions.SetUndoCount( nUndoCount );
 
         // um alle Undo-Manager zu erwischen: "uber alle Frames iterieren
@@ -712,7 +712,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
             pDispat->Flush();
 
             // "uber alle SfxShells auf dem Stack des Dispatchers iterieren
-            USHORT nIdx = 0;
+            sal_uInt16 nIdx = 0;
             for ( SfxShell *pSh = pDispat->GetShell(nIdx);
                   pSh;
                   ++nIdx, pSh = pDispat->GetShell(nIdx) )
@@ -725,73 +725,73 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     }
 
     // Office autostart
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_QUICKLAUNCHER), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_QUICKLAUNCHER), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        ShutdownIcon::SetAutostart( ( (const SfxBoolItem*)pItem )->GetValue() != FALSE );
+        ShutdownIcon::SetAutostart( ( (const SfxBoolItem*)pItem )->GetValue() != sal_False );
     }
 
     // StarBasic Enable
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_BASIC_ENABLED, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_BASIC_ENABLED, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "SfxInt16Item expected");
         aSecurityOptions.SetBasicMode( (EBasicSecurityMode)( (const SfxUInt16Item*)pItem )->GetValue() );
     }
 
     // Execute PlugIns
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_EXE_PLUGIN, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_EXE_PLUGIN, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         aSecurityOptions.SetExecutePlugins( ( (const SfxBoolItem *)pItem )->GetValue() );
-        bResetSession = TRUE;
+        bResetSession = sal_True;
     }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), sal_True, &pItem))
     {
         DBG_ASSERT( pItem->ISA(SfxUInt16Item), "UInt16Item expected" );
         aInetOptions.SetProxyType((SvtInetOptions::ProxyType)( (const SfxUInt16Item*)pItem )->GetValue());
-        bResetSession = TRUE;
-        bProxiesModified = TRUE;
+        bResetSession = sal_True;
+        bProxiesModified = sal_True;
     }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
         aInetOptions.SetProxyHttpName( ((const SfxStringItem *)pItem)->GetValue() );
-        bResetSession = TRUE;
-        bProxiesModified = TRUE;
+        bResetSession = sal_True;
+        bProxiesModified = sal_True;
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
         aInetOptions.SetProxyHttpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
-        bResetSession = TRUE;
-        bProxiesModified = TRUE;
+        bResetSession = sal_True;
+        bProxiesModified = sal_True;
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
         aInetOptions.SetProxyFtpName( ((const SfxStringItem *)pItem)->GetValue() );
-        bResetSession = TRUE;
-        bProxiesModified = TRUE;
+        bResetSession = sal_True;
+        bProxiesModified = sal_True;
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
         aInetOptions.SetProxyFtpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
-        bResetSession = TRUE;
-        bProxiesModified = TRUE;
+        bResetSession = sal_True;
+        bProxiesModified = sal_True;
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
         aInetOptions.SetProxyNoProxy(((const SfxStringItem *)pItem)->GetValue());
-        bResetSession = TRUE;
-        bProxiesModified = TRUE;
+        bResetSession = sal_True;
+        bProxiesModified = sal_True;
     }
 
     // Secure-Referers
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_SECURE_URL, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_SECURE_URL, sal_True, &pItem))
     {
         DELETEZ(pAppData_Impl->pSecureURLs);
 
@@ -806,19 +806,19 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         aSecurityOptions.SetSecureURLs( seqURLs );
     }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_MACRO_WARNING, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_MACRO_WARNING, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         aSecurityOptions.SetWarningEnabled( ( (const SfxBoolItem *)pItem )->GetValue() );
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_MACRO_CONFIRMATION, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_MACRO_CONFIRMATION, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         aSecurityOptions.SetConfirmationEnabled( ( (const SfxBoolItem *)pItem )->GetValue() );
     }
 
     // EnableMetafilePrint
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ENABLE_METAFILEPRINT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ENABLE_METAFILEPRINT ), sal_True, &pItem ) )
     {
 #ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
         DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nsoffice.ini key \"MetafilPrint\" not supported any longer!\n");
@@ -841,7 +841,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
     SfxAllItemSet aSendSet( rSet );
 
     // PathName
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_PATHNAME), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_PATHNAME), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxAllEnumItem), "AllEnumItem expected");
         const SfxAllEnumItem* pEnumItem = (const SfxAllEnumItem *)pItem;
@@ -849,7 +849,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
         String aNoChangeStr( ' ' );
         for( sal_uInt32 nPath=0; nPath<nCount; ++nPath )
         {
-            String sValue = pEnumItem->GetValueTextByPos((USHORT)nPath);
+            String sValue = pEnumItem->GetValueTextByPos((sal_uInt16)nPath);
             if ( sValue != aNoChangeStr )
             {
                 switch( nPath )
@@ -935,11 +935,11 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
 
 // alle Dokumente speichern
 
-BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave)
+sal_Bool SfxApplication::SaveAll_Impl(sal_Bool bPrompt, sal_Bool bAutoSave)
 {
-    bAutoSave = FALSE; // functionality moved to new AutoRecovery Service!
+    bAutoSave = sal_False; // functionality moved to new AutoRecovery Service!
 
-    BOOL bFunc = TRUE;
+    sal_Bool bFunc = sal_True;
     short nRet;
 
     for ( SfxObjectShell *pDoc = SfxObjectShell::GetFirst();
@@ -967,11 +967,11 @@ BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave)
                     const SfxPoolItem *pPoolItem = pDoc->ExecuteSlot( aReq );
                     if ( !pPoolItem || !pPoolItem->ISA(SfxBoolItem) ||
                         !( (const SfxBoolItem*) pPoolItem )->GetValue() )
-                        bFunc = FALSE;
+                        bFunc = sal_False;
                 }
                 else if ( nRet == RET_CANCEL )
                 {
-                    bFunc = FALSE;
+                    bFunc = sal_False;
                     break;
                 }
                 else if ( nRet == RET_NO )
@@ -987,7 +987,7 @@ BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave)
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSynchron )
+void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
 {
     SfxObjectShell *pDoc = rEventHint.GetObjShell();
     if ( pDoc && ( pDoc->IsPreview() || !pDoc->Get_Impl()->bInitialized ) )
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index b18fc905abdc..ea7b331b839b 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -61,7 +61,7 @@ void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFacto
         pAppData_Impl->pFactArr = new SfxChildWinFactArr_Impl;
 
 //#ifdef DBG_UTIL
-    for (USHORT nFactory=0; nFactory<pAppData_Impl->pFactArr->Count(); ++nFactory)
+    for (sal_uInt16 nFactory=0; nFactory<pAppData_Impl->pFactArr->Count(); ++nFactory)
     {
         if (pFact->nId ==  (*pAppData_Impl->pFactArr)[nFactory]->nId)
         {
@@ -76,7 +76,7 @@ void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFacto
         SfxChildWinFactory, pFact, pAppData_Impl->pFactArr->Count() );
 }
 
-void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nId,
+void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt16 nId,
         SfxChildWinContextFactory *pFact)
 {
     SfxChildWinFactArr_Impl *pFactories;
@@ -87,8 +87,8 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
         pFactories = pMod->GetChildWinFactories_Impl();
         if ( pFactories )
         {
-            USHORT nCount = pFactories->Count();
-            for (USHORT nFactory=0; nFactory<nCount; ++nFactory)
+            sal_uInt16 nCount = pFactories->Count();
+            for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory)
             {
                 SfxChildWinFactory *pFac = (*pFactories)[nFactory];
                 if ( nId == pFac->nId )
@@ -108,8 +108,8 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
         DBG_ASSERT( pAppData_Impl->pFactArr, "Keine Factories!" );
 
         pFactories = pAppData_Impl->pFactArr;
-        USHORT nCount = pFactories->Count();
-        for (USHORT nFactory=0; nFactory<nCount; ++nFactory)
+        sal_uInt16 nCount = pFactories->Count();
+        for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory)
         {
             SfxChildWinFactory *pFac = (*pFactories)[nFactory];
             if ( nId == pFac->nId )
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 55a8764ac0c5..26e4fecf3864 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -75,14 +75,14 @@ public:
     ImplDdeService( const String& rNm )
         : DdeService( rNm )
     {}
-    virtual BOOL MakeTopic( const String& );
+    virtual sal_Bool MakeTopic( const String& );
 
     virtual String  Topics();
 //  virtual String  Formats();
 //  virtual String  SysItems();
 //  virtual String  Status();
 
-    virtual BOOL SysTopicExecute( const String* pStr );
+    virtual sal_Bool SysTopicExecute( const String* pStr );
 };
 
 class SfxDdeTriggerTopic_Impl : public DdeTopic
@@ -92,7 +92,7 @@ public:
     : DdeTopic( DEFINE_CONST_UNICODE("TRIGGER") )
     {}
 
-    virtual BOOL Execute( const String* );
+    virtual sal_Bool Execute( const String* );
 };
 
 class SfxDdeDocTopic_Impl : public DdeTopic
@@ -106,11 +106,11 @@ public:
         : DdeTopic( pShell->GetTitle(SFX_TITLE_FULLNAME) ), pSh( pShell )
     {}
 
-    virtual DdeData* Get( ULONG );
-    virtual BOOL Put( const DdeData* );
-    virtual BOOL Execute( const String* );
-    virtual BOOL StartAdviseLoop();
-    virtual BOOL MakeItem( const String& rItem );
+    virtual DdeData* Get( sal_uIntPtr );
+    virtual sal_Bool Put( const DdeData* );
+    virtual sal_Bool Execute( const String* );
+    virtual sal_Bool StartAdviseLoop();
+    virtual sal_Bool MakeItem( const String& rItem );
 
 // wird benoetigt?
 //  virtual void Connect( long n );
@@ -125,7 +125,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *)
 
 //========================================================================
 
-BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
+sal_Bool SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
                        const String &rCmd, const String &rEvent )
 
 /*  [Beschreibung]
@@ -153,7 +153,7 @@ BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
         {
             // in das ApplicationEvent-Format wandeln
             aData.Erase( aData.Len()-1, 1 );
-            for ( USHORT n = 0; n < aData.Len(); ++n )
+            for ( sal_uInt16 n = 0; n < aData.Len(); ++n )
             {
                 if ( aData.GetChar(n) == 0x0022 ) // " = 22h
                     for ( ; aData.GetChar(++n) != 0x0022 ; )
@@ -164,11 +164,11 @@ BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
             aData.EraseAllChars( 0x0022 );
             ApplicationAddress aAddr;
             rAppEvent = ApplicationEvent( String(), aAddr, U2S(rEvent), aData );
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -455,7 +455,7 @@ long SfxViewFrame::DdeSetData
 
 //========================================================================
 
-BOOL SfxApplication::InitializeDde()
+sal_Bool SfxApplication::InitializeDde()
 {
     DBG_ASSERT( !pAppData_Impl->pDdeService,
                 "Dde kann nicht mehrfach initialisiert werden" );
@@ -501,8 +501,8 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
 
     // doppeltes Eintragen verhindern
     String sShellNm;
-    BOOL bFnd = FALSE;
-    for( USHORT n = pAppData_Impl->pDocTopics->Count(); n; )
+    sal_Bool bFnd = sal_False;
+    for( sal_uInt16 n = pAppData_Impl->pDocTopics->Count(); n; )
         if( (*pAppData_Impl->pDocTopics)[ --n ]->pSh == pSh )
         {
             // JP 18.03.96 - Bug 26470
@@ -510,7 +510,7 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
             //  neues Topics anzulegen!
             if( !bFnd )
             {
-                bFnd = TRUE;
+                bFnd = sal_True;
                 (sShellNm = pSh->GetTitle(SFX_TITLE_FULLNAME)).ToLowerAscii();
             }
             String sNm( (*pAppData_Impl->pDocTopics)[ n ]->GetName() );
@@ -532,7 +532,7 @@ void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
         return;
 
     SfxDdeDocTopic_Impl* pTopic;
-    for( USHORT n = pAppData_Impl->pDocTopics->Count(); n; )
+    for( sal_uInt16 n = pAppData_Impl->pDocTopics->Count(); n; )
         if( ( pTopic = (*pAppData_Impl->pDocTopics)[ --n ])->pSh == pSh )
         {
             pAppData_Impl->pDdeService->RemoveTopic( *pTopic );
@@ -552,17 +552,17 @@ DdeService* SfxApplication::GetDdeService()
 
 //--------------------------------------------------------------------
 
-BOOL ImplDdeService::MakeTopic( const String& rNm )
+sal_Bool ImplDdeService::MakeTopic( const String& rNm )
 {
     // Workaround gegen Event nach unserem Main() unter OS/2
     // passierte wenn man beim Beenden aus dem OffMgr die App neu startet
     if ( !Application::IsInExecute() )
-        return FALSE;
+        return sal_False;
 
     // das Topic rNm wird gesucht, haben wir es ?
     // erstmal nur ueber die ObjectShells laufen und die mit dem
     // Namen heraussuchen:
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     String sNm( rNm );
     sNm.ToLowerAscii();
     TypeId aType( TYPE(SfxObjectShell) );
@@ -574,7 +574,7 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
         if( sTmp == sNm )       // die wollen wir haben
         {
             SFX_APP()->AddDdeTopic( pShell );
-            bRet = TRUE;
+            bRet = sal_True;
             break;
         }
         pShell = SfxObjectShell::GetNext( *pShell, &aType );
@@ -591,9 +591,9 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
 
             // dann versuche die Datei zu laden:
             SfxStringItem aName( SID_FILE_NAME, aFile.GetMainURL( INetURLObject::NO_DECODE ) );
-            SfxBoolItem aNewView(SID_OPEN_NEW_VIEW, TRUE);
+            SfxBoolItem aNewView(SID_OPEN_NEW_VIEW, sal_True);
 
-            SfxBoolItem aSilent(SID_SILENT, TRUE);
+            SfxBoolItem aSilent(SID_SILENT, sal_True);
             SfxDispatcher* pDispatcher = SFX_APP()->GetDispatcher_Impl();
             const SfxPoolItem* pRet = pDispatcher->Execute( SID_OPENDOC,
                     SFX_CALLMODE_SYNCHRON,
@@ -606,7 +606,7 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
                     ->GetFrame()->GetObjectShell() ) )
             {
                 SFX_APP()->AddDdeTopic( pShell );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -636,20 +636,20 @@ String ImplDdeService::Topics()
     return sRet;
 }
 
-BOOL ImplDdeService::SysTopicExecute( const String* pStr )
+sal_Bool ImplDdeService::SysTopicExecute( const String* pStr )
 {
-    return (BOOL)SFX_APP()->DdeExecute( *pStr );
+    return (sal_Bool)SFX_APP()->DdeExecute( *pStr );
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxDdeTriggerTopic_Impl::Execute( const String* )
+sal_Bool SfxDdeTriggerTopic_Impl::Execute( const String* )
 {
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
-DdeData* SfxDdeDocTopic_Impl::Get( ULONG nFormat )
+DdeData* SfxDdeDocTopic_Impl::Get( sal_uIntPtr nFormat )
 {
     String sMimeType( SotExchange::GetFormatMimeType( nFormat ));
     ::com::sun::star::uno::Any aValue;
@@ -663,11 +663,11 @@ DdeData* SfxDdeDocTopic_Impl::Get( ULONG nFormat )
     return 0;
 }
 
-BOOL SfxDdeDocTopic_Impl::Put( const DdeData* pData )
+sal_Bool SfxDdeDocTopic_Impl::Put( const DdeData* pData )
 {
     aSeq = ::com::sun::star::uno::Sequence< sal_Int8 >(
                             (sal_Int8*)(const void*)*pData, (long)*pData );
-    BOOL bRet;
+    sal_Bool bRet;
     if( aSeq.getLength() )
     {
         ::com::sun::star::uno::Any aValue;
@@ -676,25 +676,25 @@ BOOL SfxDdeDocTopic_Impl::Put( const DdeData* pData )
         bRet = 0 != pSh->DdeSetData( GetCurItem(), sMimeType, aValue );
     }
     else
-        bRet = FALSE;
+        bRet = sal_False;
     return bRet;
 }
 
-BOOL SfxDdeDocTopic_Impl::Execute( const String* pStr )
+sal_Bool SfxDdeDocTopic_Impl::Execute( const String* pStr )
 {
     long nRet = pStr ? pSh->DdeExecute( *pStr ) : 0;
     return 0 != nRet;
 }
 
-BOOL SfxDdeDocTopic_Impl::MakeItem( const String& rItem )
+sal_Bool SfxDdeDocTopic_Impl::MakeItem( const String& rItem )
 {
     AddItem( DdeItem( rItem ) );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SfxDdeDocTopic_Impl::StartAdviseLoop()
+sal_Bool SfxDdeDocTopic_Impl::StartAdviseLoop()
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ::sfx2::SvLinkSource* pNewObj = pSh->DdeCreateLinkSource( GetCurItem() );
     if( pNewObj )
     {
@@ -702,7 +702,7 @@ BOOL SfxDdeDocTopic_Impl::StartAdviseLoop()
         String sNm, sTmp( Application::GetAppName() );
         ::sfx2::MakeLnkName( sNm, &sTmp, pSh->GetTitle(SFX_TITLE_FULLNAME), GetCurItem() );
         new ::sfx2::SvBaseLink( sNm, OBJECT_DDE_EXTERN, pNewObj );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return bRet;
 }
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index a3d25de8ee61..d9ff26beccba 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -230,7 +230,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/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index f7a8bc98391b..1fdbe5f77107 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -154,6 +154,48 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP))
 }
 
 //--------------------------------------------------------------------
+<<<<<<< local
+=======
+
+void SfxApplication::InitializeDisplayName_Impl()
+{
+    SfxAppData_Impl* pAppData = Get_Impl();
+    if ( !pAppData->pLabelResMgr )
+        return;
+
+    String aTitle = Application::GetDisplayName();
+    if ( !aTitle.Len() )
+    {
+        OClearableGuard aGuard( OMutex::getGlobalMutex() );
+
+        // create version string
+/*!!! (pb) don't show a version number at the moment
+        sal_uInt16 nProductVersion = ProductVersion::GetVersion().ToInt32();
+        String aVersion( String::CreateFromInt32( nProductVersion / 10 ) );
+        aVersion += 0x002E ; // 2Eh ^= '.'
+        aVersion += ( String::CreateFromInt32( nProductVersion % 10 ) );
+*/
+        // load application title
+        aTitle = String( ResId( RID_APPTITLE, *pAppData->pLabelResMgr ) );
+        // merge version into title
+        aTitle.SearchAndReplaceAscii( "$(VER)", String() /*aVersion*/ );
+
+        aGuard.clear();
+
+#ifdef DBG_UTIL
+        ::rtl::OUString aDefault;
+        aTitle += DEFINE_CONST_UNICODE(" [");
+
+        String aVerId( utl::Bootstrap::getBuildIdData( aDefault ));
+        aTitle += aVerId;
+        aTitle += ']';
+#endif
+        Application::SetDisplayName( aTitle );
+    }
+}
+
+//--------------------------------------------------------------------
+>>>>>>> other
 SfxProgress* SfxApplication::GetProgress() const
 
 /*  [Beschreibung]
@@ -192,8 +234,8 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
             pStream = ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ );
         }
 
-        BOOL bSlotsEnabled = SvtInternalOptions().SlotCFGEnabled();
-        BOOL bSlots = ( pStream && !pStream->GetError() );
+        sal_Bool bSlotsEnabled = SvtInternalOptions().SlotCFGEnabled();
+        sal_Bool bSlots = ( pStream && !pStream->GetError() );
         if( bSlots && bSlotsEnabled )
         {
             // SlotDatei einlesen
@@ -260,7 +302,7 @@ SfxModule* SfxApplication::GetModule_Impl()
 {
     SfxModule* pModule = SfxModule::GetActiveModule();
     if ( !pModule )
-        pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( FALSE ) );
+        pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( sal_False ) );
     if( pModule )
         return pModule;
     else
@@ -282,7 +324,7 @@ ISfxTemplateCommon* SfxApplication::GetCurrentTemplateCommon( SfxBindings& rBind
 }
 
 SfxResourceManager& SfxApplication::GetResourceManager() const { return *pAppData_Impl->pResMgr; }
-BOOL  SfxApplication::IsDowning() const { return pAppData_Impl->bDowning; }
+sal_Bool  SfxApplication::IsDowning() const { return pAppData_Impl->bDowning; }
 SfxDispatcher* SfxApplication::GetAppDispatcher_Impl() { return pAppData_Impl->pAppDispat; }
 SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl->pSlotPool; }
 //SfxOptions&  SfxApplication::GetOptions() { return *pAppData_Impl->pOptions; }
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 0f4c1f651082..281a87c962f7 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -130,20 +130,20 @@ namespace css = ::com::sun::star;
 class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener >
 {
 public:
-    BOOL    bFinished;
-    BOOL    bSuccess;
+    sal_Bool    bFinished;
+    sal_Bool    bSuccess;
     virtual void SAL_CALL   dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException);
     virtual void SAL_CALL   disposing( const EventObject& Source ) throw(RuntimeException);
                             SfxOpenDocStatusListener_Impl()
-                                : bFinished( FALSE )
-                                , bSuccess( FALSE )
+                                : bFinished( sal_False )
+                                , bSuccess( sal_False )
                             {}
 };
 
 void SAL_CALL SfxOpenDocStatusListener_Impl::dispatchFinished( const DispatchResultEvent& aEvent ) throw(RuntimeException)
 {
     bSuccess = ( aEvent.State == DispatchResultState::SUCCESS );
-    bFinished = TRUE;
+    bFinished = sal_True;
 }
 
 void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) throw(RuntimeException)
@@ -153,9 +153,9 @@ void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) thr
 SfxObjectShellRef SfxApplication::DocAlreadyLoaded
 (
     const String&   rName,      // Name des Dokuments mit Pfad
-    BOOL            bSilent,    // TRUE: nicht nach neuer Sicht fragen
-    BOOL            bActivate,   // soll bestehende Sicht aktiviert werden
-    BOOL            bForbidVisible,
+    sal_Bool            bSilent,    // sal_True: nicht nach neuer Sicht fragen
+    sal_Bool            bActivate,   // soll bestehende Sicht aktiviert werden
+    sal_Bool            bForbidVisible,
     const String*   pPostStr
 )
 
@@ -183,7 +183,7 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
         // dann bei den normal geoeffneten Docs
         if ( !xDoc.Is() )
         {
-            xDoc = SfxObjectShell::GetFirst( 0, FALSE ); // auch hidden Docs
+            xDoc = SfxObjectShell::GetFirst( 0, sal_False ); // auch hidden Docs
             while( xDoc.Is() )
             {
                 if ( xDoc->GetMedium() &&
@@ -193,13 +193,13 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
                     // Vergleiche anhand der URLs
                     INetURLObject aUrl( xDoc->GetMedium()->GetName() );
                     if ( !aUrl.HasError() && aUrl == aUrlToFind &&
-                         (!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, TRUE )) &&
+                         (!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, sal_True )) &&
                          !xDoc->IsLoading())
                     {
                             break;
                     }
                 }
-                xDoc = SfxObjectShell::GetNext( *xDoc, 0, FALSE );
+                xDoc = SfxObjectShell::GetNext( *xDoc, 0, sal_False );
             }
         }
     }
@@ -221,7 +221,7 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
                 InfoBox( 0, SfxResId(RID_DOCALREADYLOADED_DLG)).Execute();
             if ( bActivate )
             {
-                pFrame->MakeActive_Impl( TRUE );
+                pFrame->MakeActive_Impl( sal_True );
             }
         }
     }
@@ -315,7 +315,7 @@ sal_uInt32 CheckPasswd_Impl
     des Mediums gesetzt; das Set wird, wenn nicht vorhanden, erzeugt.
 */
 {
-    ULONG nRet = ERRCODE_NONE;
+    sal_uIntPtr nRet = ERRCODE_NONE;
 
     if( ( !pFile->GetFilter() || pFile->IsStorage() ) )
     {
@@ -409,10 +409,10 @@ sal_uInt32 CheckPasswd_Impl
 //--------------------------------------------------------------------
 
 
-ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFileName, BOOL bCopy, SfxItemSet* pSet )
+sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFileName, sal_Bool bCopy, SfxItemSet* pSet )
 {
     const SfxFilter* pFilter = NULL;
-    SfxMedium aMedium( rFileName,  ( STREAM_READ | STREAM_SHARE_DENYNONE ), FALSE );
+    SfxMedium aMedium( rFileName,  ( STREAM_READ | STREAM_SHARE_DENYNONE ), sal_False );
 
     if ( !aMedium.GetStorage( sal_True ).is() )
         aMedium.GetInStream();
@@ -423,8 +423,8 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
         return aMedium.GetErrorCode();
     }
 
-    aMedium.UseInteractionHandler( TRUE );
-    ULONG nErr = GetFilterMatcher().GuessFilter( aMedium,&pFilter,SFX_FILTER_TEMPLATE, 0 );
+    aMedium.UseInteractionHandler( sal_True );
+    sal_uIntPtr nErr = GetFilterMatcher().GuessFilter( aMedium,&pFilter,SFX_FILTER_TEMPLATE, 0 );
     if ( 0 != nErr)
     {
         delete pSet;
@@ -444,7 +444,7 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
         SfxStringItem aName( SID_FILE_NAME, rFileName );
         SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") );
         SfxStringItem aFlags( SID_OPTIONS, String::CreateFromAscii("T") );
-        SfxBoolItem aHidden( SID_HIDDEN, TRUE );
+        SfxBoolItem aHidden( SID_HIDDEN, sal_True );
         const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L );
         const SfxObjectItem *pObj = PTR_CAST( SfxObjectItem, pRet );
         if ( pObj )
@@ -468,7 +468,7 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
         if ( !xDoc.Is() )
             xDoc = SfxObjectShell::CreateObject( pFilter->GetServiceName() );
 
-        SfxMedium *pMedium = new SfxMedium( rFileName, STREAM_STD_READ, FALSE, pFilter, pSet );
+        SfxMedium *pMedium = new SfxMedium( rFileName, STREAM_STD_READ, sal_False, pFilter, pSet );
         if(!xDoc->DoLoad(pMedium))
         {
             ErrCode nErrCode = xDoc->GetErrorCode();
@@ -511,7 +511,7 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
 
     xDoc->SetNoName();
     xDoc->InvalidateName();
-    xDoc->SetModified(FALSE);
+    xDoc->SetModified(sal_False);
     xDoc->ResetError();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >  xModel ( xDoc->GetModel(), ::com::sun::star::uno::UNO_QUERY );
@@ -540,7 +540,7 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
 
-    SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, FALSE);
+    SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False);
     String aFactName;
     if ( pFactoryItem )
         aFactName = pFactoryItem->GetValue();
@@ -556,10 +556,10 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
     aReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii( "_default" ) ) );
 
     // TODO/LATER: Should the other arguments be transfered as well?
-    SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, FALSE);
+    SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, sal_False);
     if ( pDefaultPathItem )
         aReq.AppendItem( *pDefaultPathItem );
-    SFX_REQUEST_ARG( rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, FALSE);
+    SFX_REQUEST_ARG( rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, sal_False);
     if ( pDefaultNameItem )
         aReq.AppendItem( *pDefaultNameItem );
 
@@ -576,14 +576,14 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
     DBG_MEMTEST();
 
     // keine Parameter vom BASIC nur Factory angegeben?
-    SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, FALSE);
-    SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE);
-    SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, FALSE);
+    SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
+    SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False);
+    SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False);
 
     SfxObjectShellLock xDoc;
 
     String  aTemplateRegion, aTemplateName, aTemplateFileName;
-    BOOL    bDirect = FALSE; // "uber FileName anstelle Region/Template
+    sal_Bool    bDirect = sal_False; // "uber FileName anstelle Region/Template
     SfxErrorContext aEc(ERRCTX_SFX_NEWDOC);
     if ( !pTemplNameItem && !pTemplFileNameItem )
     {
@@ -624,13 +624,13 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
         if ( pTemplFileNameItem )
         {
             aTemplateFileName = pTemplFileNameItem->GetValue();
-            bDirect = TRUE;
+            bDirect = sal_True;
         }
     }
 
-    ULONG lErr = 0;
+    sal_uIntPtr lErr = 0;
     SfxItemSet* pSet = new SfxAllItemSet( GetPool() );
-    pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) );
+    pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
     if ( !bDirect )
     {
         SfxDocumentTemplates aTmpFac;
@@ -646,7 +646,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
 
     if ( lErr != ERRCODE_NONE )
     {
-        ULONG lFatalErr = ERRCODE_TOERROR(lErr);
+        sal_uIntPtr lFatalErr = ERRCODE_TOERROR(lErr);
         if ( lFatalErr )
             ErrorHandler::HandleError(lErr);
     }
@@ -683,8 +683,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
 
-    USHORT nSID = rReq.GetSlot();
-    SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+    sal_uInt16 nSID = rReq.GetSlot();
+    SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
     if ( pFileNameItem )
     {
         String aCommand( pFileNameItem->GetValue() );
@@ -698,7 +698,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             sal_Int32 nIndex = aCommand.SearchAscii("slot:");
             if ( !nIndex )
             {
-                USHORT nSlotId = (USHORT) String( aCommand, 5, aCommand.Len()-5 ).ToInt32();
+                sal_uInt16 nSlotId = (sal_uInt16) String( aCommand, 5, aCommand.Len()-5 ).ToInt32();
                 if ( nSlotId == SID_OPENDOC )
                     pFileNameItem = NULL;
             }
@@ -712,7 +712,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         String aFilter;
         SfxItemSet* pSet = NULL;
         String aPath;
-        SFX_REQUEST_ARG( rReq, pFolderNameItem, SfxStringItem, SID_PATH, FALSE );
+        SFX_REQUEST_ARG( rReq, pFolderNameItem, SfxStringItem, SID_PATH, sal_False );
         if ( pFolderNameItem )
             aPath = pFolderNameItem->GetValue();
         else if ( nSID == SID_OPENTEMPLATE )
@@ -726,24 +726,24 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         }
 
         sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG;
-        SFX_REQUEST_ARG( rReq, pSystemDialogItem, SfxBoolItem, SID_FILE_DIALOG, FALSE );
+        SFX_REQUEST_ARG( rReq, pSystemDialogItem, SfxBoolItem, SID_FILE_DIALOG, sal_False );
         if ( pSystemDialogItem )
             nDialog = pSystemDialogItem->GetValue() ? SFX2_IMPL_DIALOG_SYSTEM : SFX2_IMPL_DIALOG_OOO;
 
         String sStandardDir;
 
-        SFX_REQUEST_ARG( rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR, FALSE );
+        SFX_REQUEST_ARG( rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR, sal_False );
         if ( pStandardDirItem )
             sStandardDir = pStandardDirItem->GetValue();
 
         ::com::sun::star::uno::Sequence< ::rtl::OUString >  aBlackList;
 
-        SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, FALSE );
+        SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, sal_False );
         if ( pBlackListItem )
             pBlackListItem->GetStringList( aBlackList );
 
 
-        ULONG nErr = sfx2::FileOpenDialog_Impl(
+        sal_uIntPtr nErr = sfx2::FileOpenDialog_Impl(
                 WB_OPEN | SFXWB_MULTISELECTION | SFXWB_SHOWVERSIONS, String(), pURLList, aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList );
 
         if ( nErr == ERRCODE_ABORT )
@@ -762,7 +762,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         if ( pURLList->Count() )
         {
             if ( nSID == SID_OPENTEMPLATE )
-                rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, FALSE ) );
+                rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) );
 
             // This helper wraps an existing (or may new created InteractionHandler)
             // intercept all incoming interactions and provide usefull informations
@@ -773,7 +773,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             css::uno::Reference< css::task::XInteractionHandler >     xWrappedHandler;
 
             // wrap existing handler or create new UUI handler
-            SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE);
+            SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False);
             if (pInteractionItem)
             {
                 pInteractionItem->GetValue() >>= xWrappedHandler;
@@ -790,7 +790,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             ::framework::PreventDuplicateInteraction::InteractionInfo aRule        (aInteraction, 1);
             pHandler->addInteractionRule(aRule);
 
-            for ( USHORT i = 0; i < pURLList->Count(); ++i )
+            for ( sal_uInt16 i = 0; i < pURLList->Count(); ++i )
             {
                 String aURL = *(pURLList->GetObject(i));
                 rReq.RemoveItem( SID_FILE_NAME );
@@ -836,7 +836,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         // return;
     }
 
-    BOOL bHyperlinkUsed = FALSE;
+    sal_Bool bHyperlinkUsed = sal_False;
 
     if ( SID_OPENURL == nSID )
     {
@@ -846,7 +846,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     }
     else if ( nSID == SID_OPENTEMPLATE )
     {
-        rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, FALSE ) );
+        rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) );
     }
     // pass URL to OS by using ShellExecuter or open it internal
     // if it seams to be an own format.
@@ -859,28 +859,28 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     {
         rReq.SetSlot( SID_OPENDOC );
         nSID = SID_OPENDOC;
-        bHyperlinkUsed = TRUE;
+        bHyperlinkUsed = sal_True;
     }
 
     // no else here! It's optional ...
     if (!bHyperlinkUsed)
     {
-        SFX_REQUEST_ARG(rReq, pHyperLinkUsedItem, SfxBoolItem, SID_BROWSE, FALSE);
+        SFX_REQUEST_ARG(rReq, pHyperLinkUsedItem, SfxBoolItem, SID_BROWSE, sal_False);
         if ( pHyperLinkUsedItem )
             bHyperlinkUsed = pHyperLinkUsedItem->GetValue();
         // no "official" item, so remove it from ItemSet before using UNO-API
         rReq.RemoveItem( SID_BROWSE );
     }
 
-    SFX_REQUEST_ARG( rReq, pFileName, SfxStringItem, SID_FILE_NAME, FALSE );
+    SFX_REQUEST_ARG( rReq, pFileName, SfxStringItem, SID_FILE_NAME, sal_False );
     String aFileName = pFileName->GetValue();
 
     String aReferer;
-    SFX_REQUEST_ARG( rReq, pRefererItem, SfxStringItem, SID_REFERER, FALSE );
+    SFX_REQUEST_ARG( rReq, pRefererItem, SfxStringItem, SID_REFERER, sal_False );
     if ( pRefererItem )
         aReferer = pRefererItem->GetValue();
 
-    SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, FALSE);
+    SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, sal_False);
     if ( pFileFlagsItem )
     {
         String aFileFlags = pFileFlagsItem->GetValue();
@@ -888,32 +888,32 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0054 ) )               // T = 54h
         {
             rReq.RemoveItem( SID_TEMPLATE );
-            rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, TRUE ) );
+            rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_True ) );
         }
 
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0048 ) )               // H = 48h
         {
             rReq.RemoveItem( SID_HIDDEN );
-            rReq.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) );
+            rReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) );
         }
 
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0052 ) )               // R = 52h
         {
             rReq.RemoveItem( SID_DOC_READONLY );
-            rReq.AppendItem( SfxBoolItem( SID_DOC_READONLY, TRUE ) );
+            rReq.AppendItem( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
         }
 
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0042 ) )               // B = 42h
         {
             rReq.RemoveItem( SID_PREVIEW );
-            rReq.AppendItem( SfxBoolItem( SID_PREVIEW, TRUE ) );
+            rReq.AppendItem( SfxBoolItem( SID_PREVIEW, sal_True ) );
         }
 
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0053 ) )               // S = 53h
         {
             // not supported anymore
             //rReq.RemoveItem( SID_SILENT );
-            //rReq.AppendItem( SfxBoolItem( SID_SILENT, TRUE ) );
+            //rReq.AppendItem( SfxBoolItem( SID_SILENT, sal_True ) );
         }
 
         rReq.RemoveItem( SID_OPTIONS );
@@ -1082,7 +1082,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
                         if ( !bFound )
                         {
-                            BOOL bLoadInternal = FALSE;
+                            sal_Bool bLoadInternal = sal_False;
 
                             // security reservation: => we have to check the referer before executing
                             if (SFX_APP()->IsSecureURL(rtl::OUString(), &aReferer))
@@ -1112,7 +1112,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
                                     {
                                         rReq.RemoveItem( SID_TARGETNAME );
                                         rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_default") ) );
-                                        bLoadInternal = TRUE;
+                                        bLoadInternal = sal_True;
                                     }
                                 }
                             }
@@ -1147,13 +1147,13 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     SfxFrame* pTargetFrame = NULL;
     Reference< XFrame > xTargetFrame;
 
-    SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE);
+    SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, sal_False);
     if ( pFrameItem )
         pTargetFrame = pFrameItem->GetFrame();
 
     if ( !pTargetFrame )
     {
-        SFX_REQUEST_ARG(rReq, pUnoFrameItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE);
+        SFX_REQUEST_ARG(rReq, pUnoFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False);
         if ( pUnoFrameItem )
             xTargetFrame = pUnoFrameItem->GetFrame();
     }
@@ -1162,7 +1162,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         pTargetFrame = &SfxViewFrame::Current()->GetFrame();
 
     // check if caller has set a callback
-    SFX_REQUEST_ARG(rReq, pLinkItem, SfxLinkItem, SID_DONELINK, FALSE );
+    SFX_REQUEST_ARG(rReq, pLinkItem, SfxLinkItem, SID_DONELINK, sal_False );
 
     // remove from Itemset, because it confuses the parameter transformation
     if ( pLinkItem )
@@ -1171,20 +1171,20 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     rReq.RemoveItem( SID_DONELINK );
 
     // check if the view must be hidden
-    BOOL bHidden = FALSE;
-    SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, FALSE);
+    sal_Bool bHidden = sal_False;
+    SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, sal_False);
     if ( pHidItem )
         bHidden = pHidItem->GetValue();
 
     // This request is a UI call. We have to set the right values inside the MediaDescriptor
     // for: InteractionHandler, StatusIndicator, MacroExecutionMode and DocTemplate.
     // But we have to look for already existing values or for real hidden requests.
-    SFX_REQUEST_ARG(rReq, pPreviewItem, SfxBoolItem, SID_PREVIEW, FALSE);
+    SFX_REQUEST_ARG(rReq, pPreviewItem, SfxBoolItem, SID_PREVIEW, sal_False);
     if (!bHidden && ( !pPreviewItem || !pPreviewItem->GetValue() ) )
     {
-        SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE);
-        SFX_REQUEST_ARG(rReq, pMacroExecItem  , SfxUInt16Item, SID_MACROEXECMODE     , FALSE);
-        SFX_REQUEST_ARG(rReq, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE     , FALSE);
+        SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False);
+        SFX_REQUEST_ARG(rReq, pMacroExecItem  , SfxUInt16Item, SID_MACROEXECMODE     , sal_False);
+        SFX_REQUEST_ARG(rReq, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE     , sal_False);
 
         if (!pInteractionItem)
         {
@@ -1200,12 +1200,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
     // extract target name
     ::rtl::OUString aTarget;
-    SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, FALSE);
+    SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False);
     if ( pTargetItem )
         aTarget = pTargetItem->GetValue();
     else
     {
-        SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, FALSE );
+        SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False );
         if ( pNewViewItem && pNewViewItem->GetValue() )
             aTarget = String::CreateFromAscii("_blank" );
     }
@@ -1234,7 +1234,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         }
 
         // make URL ready
-        SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_FILE_NAME, FALSE );
+        SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_FILE_NAME, sal_False );
         aFileName = pURLItem->GetValue();
         if( aFileName.Len() && aFileName.GetChar(0) == '#' ) // Mark without URL
         {
@@ -1298,7 +1298,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     else
     {
         // synchron loading without a given frame or as blank frame
-        SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+        SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
 
         // Desktop service must exists! dont catch() or check for problems here ...
         // But loading of documents can fail by other reasons. Handle it more gracefully.
@@ -1329,7 +1329,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     {
         // try to find the SfxFrame for the controller
         SfxFrame* pCntrFrame = NULL;
-        for ( SfxViewShell* pShell = SfxViewShell::GetFirst( 0, FALSE ); pShell; pShell = SfxViewShell::GetNext( *pShell, 0, FALSE ) )
+        for ( SfxViewShell* pShell = SfxViewShell::GetFirst( 0, sal_False ); pShell; pShell = SfxViewShell::GetNext( *pShell, 0, sal_False ) )
         {
             if ( pShell->GetController() == xController )
             {
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 0543d7f88f45..351376091929 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -72,9 +72,9 @@
 using ::basic::BasicManagerRepository;
 
 //===================================================================
-BOOL SfxApplication::QueryExit_Impl()
+sal_Bool SfxApplication::QueryExit_Impl()
 {
-    BOOL bQuit = TRUE;
+    sal_Bool bQuit = sal_True;
 
     // will trotzdem noch jemand, den man nicht abschiessen kann, die App haben?
     if ( !bQuit )
@@ -83,10 +83,10 @@ BOOL SfxApplication::QueryExit_Impl()
         InfoBox aInfoBox( NULL, SfxResId(MSG_CANT_QUIT) );
         aInfoBox.Execute();
         DBG_TRACE( "QueryExit => FALSE (in use)" );
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -105,7 +105,7 @@ void SfxApplication::Deinitialize()
 
     SaveBasicAndDialogContainer();
 
-    pAppData_Impl->bDowning = TRUE; // wegen Timer aus DecAliveCount und QueryExit
+    pAppData_Impl->bDowning = sal_True; // wegen Timer aus DecAliveCount und QueryExit
 
     DELETEZ( pAppData_Impl->pTemplates );
 
@@ -115,15 +115,15 @@ void SfxApplication::Deinitialize()
     // For more information see:
     // #123501#
     //SetViewFrame(0);
-    pAppData_Impl->bDowning = FALSE;
+    pAppData_Impl->bDowning = sal_False;
     DBG_ASSERT( !SfxViewFrame::GetFirst(),
                 "existing SfxViewFrame after Execute" );
     DBG_ASSERT( !SfxObjectShell::GetFirst(),
                 "existing SfxObjectShell after Execute" );
     pAppData_Impl->pAppDispat->Pop( *this, SFX_SHELL_POP_UNTIL );
     pAppData_Impl->pAppDispat->Flush();
-    pAppData_Impl->bDowning = TRUE;
-    pAppData_Impl->pAppDispat->DoDeactivate_Impl( TRUE, NULL );
+    pAppData_Impl->bDowning = sal_True;
+    pAppData_Impl->pAppDispat->DoDeactivate_Impl( sal_True, NULL );
 
     // call derived application-exit
     Exit();
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 9fd2dfc696d3..dfecc21f9d4b 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -65,9 +65,9 @@ void SfxApplication::Registrations_Impl()
 
     // ChildWindows
     SfxRecordingFloatWrapper_Impl::RegisterChildWindow();
-    SfxNavigatorWrapper::RegisterChildWindow( FALSE, NULL, SFX_CHILDWIN_NEVERHIDE );
+    SfxNavigatorWrapper::RegisterChildWindow( sal_False, NULL, SFX_CHILDWIN_NEVERHIDE );
     SfxPartChildWnd_Impl::RegisterChildWindow();
-    SfxTemplateDialogWrapper::RegisterChildWindow(TRUE);
+    SfxTemplateDialogWrapper::RegisterChildWindow(sal_True);
     SfxDockingWrapper::RegisterChildWindow();
 
     // Controller
@@ -88,7 +88,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac
     }
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pAppData_Impl->pTbxCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pAppData_Impl->pTbxCtrlFac->Count(); n++ )
     {
         SfxTbxCtrlFactory *pF = (*pAppData_Impl->pTbxCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -113,7 +113,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF
     }
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pAppData_Impl->pStbCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pAppData_Impl->pStbCtrlFac->Count(); n++ )
     {
         SfxStbCtrlFactory *pF = (*pAppData_Impl->pStbCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -138,7 +138,7 @@ void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFacto
     }
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pAppData_Impl->pMenuCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pAppData_Impl->pMenuCtrlFac->Count(); n++ )
     {
         SfxMenuCtrlFactory *pF = (*pAppData_Impl->pMenuCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 36c1c1684fd0..8720fe8f6f5f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -154,7 +154,7 @@ long QuitAgain_Impl( void* pObj, void* pArg )
 void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
-    FASTBOOL bDone = FALSE;
+    bool bDone = sal_False;
     switch ( rReq.GetSlot() )
     {
         case SID_SETOPTIONS:
@@ -185,7 +185,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                         continue;
 
                     if ( pObjSh->PrepareClose(2) )
-                        pObjSh->SetModified( FALSE );
+                        pObjSh->SetModified( sal_False );
                     else
                         return;
                 }
@@ -211,16 +211,16 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             }
 
             // block reentrant calls
-            pAppData_Impl->bInQuit = TRUE;
+            pAppData_Impl->bInQuit = sal_True;
             Reference < XDesktop > xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
 
             rReq.ForgetAllArgs();
 
-            // if terminate() failed, pAppData_Impl->bInQuit will now be FALSE, allowing further calls of SID_QUITAPP
-            BOOL bTerminated = xDesktop->terminate();
+            // if terminate() failed, pAppData_Impl->bInQuit will now be sal_False, allowing further calls of SID_QUITAPP
+            sal_Bool bTerminated = xDesktop->terminate();
             if (!bTerminated)
                 // if terminate() was successful, SfxApplication is now dead!
-                pAppData_Impl->bInQuit = FALSE;
+                pAppData_Impl->bInQuit = sal_False;
 
             // Returnwert setzten, ggf. terminieren
             rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bTerminated ) );
@@ -253,7 +253,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
                 Reference< XFrame > xFrame;
                 const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl();
-                SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE );
+                SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False );
                 if ( pFrameItem )
                     xFrame = pFrameItem->GetFrame();
 
@@ -266,7 +266,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                     const short nRet = pDlg->Execute();
 
                     if ( nRet )
-                        bDone = TRUE;
+                        bDone = sal_True;
 
                     delete pDlg;
                 }
@@ -303,16 +303,16 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             }
             while( sal_True );
 
-            BOOL bOk = ( n == 0);
+            sal_Bool bOk = ( n == 0);
             rReq.SetReturnValue( SfxBoolItem( 0, bOk ) );
-            bDone = TRUE;
+            bDone = sal_True;
             break;
         }
 
         case SID_SAVEDOCS:
         {
-            BOOL bOK = TRUE;
-            BOOL bTmpDone = TRUE;
+            sal_Bool bOK = sal_True;
+            sal_Bool bTmpDone = sal_True;
             for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst();
                   pObjSh;
                   pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
@@ -324,7 +324,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                     SfxBoolItem *pItem = PTR_CAST( SfxBoolItem, aReq.GetReturnValue() );
                     bTmpDone = aReq.IsDone();
                     if ( !pItem || !pItem->GetValue() )
-                        bOK = FALSE;
+                        bOK = sal_False;
                 }
             }
 
@@ -352,7 +352,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 }
                 else
                     pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page
-                bDone = TRUE;
+                bDone = sal_True;
             }
             break;
         }
@@ -361,7 +361,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         case SID_HELPTIPS:
         {
             // Parameter aus werten
-            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, FALSE);
+            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, sal_False);
             bool bOn = pOnItem
                             ? ((SfxBoolItem*)pOnItem)->GetValue()
                             : !Help::IsQuickHelpEnabled();
@@ -373,7 +373,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 Help::DisableQuickHelp();
             SvtHelpOptions().SetHelpTips( bOn );
             Invalidate(SID_HELPTIPS);
-            bDone = TRUE;
+            bDone = sal_True;
 
             // ggf. recorden
             if ( !rReq.IsAPI() )
@@ -389,7 +389,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         case SID_HELPBALLOONS:
         {
             // Parameter auswerten
-            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, FALSE);
+            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, sal_False);
             bool bOn = pOnItem
                             ? ((SfxBoolItem*)pOnItem)->GetValue()
                             : !Help::IsBalloonHelpEnabled();
@@ -401,7 +401,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 Help::DisableBalloonHelp();
             SvtHelpOptions().SetExtendedHelp( bOn );
             Invalidate(SID_HELPBALLOONS);
-            bDone = TRUE;
+            bDone = sal_True;
 
             // ggf. recorden
             if ( !rReq.IsAPI() )
@@ -413,13 +413,13 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         case SID_HELP_PI:
         {
             SvtHelpOptions aHelpOpt;
-            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELP_PI, FALSE);
+            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELP_PI, sal_False);
             sal_Bool bOn = pOnItem
                             ? ((SfxBoolItem*)pOnItem)->GetValue()
                             : !aHelpOpt.IsHelpAgentAutoStartMode();
             aHelpOpt.SetHelpAgentAutoStartMode( bOn );
             Invalidate(SID_HELP_PI);
-            bDone = TRUE;
+            bDone = sal_True;
             break;
         }
 
@@ -434,6 +434,75 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 delete pDlg;
                 bDone = TRUE;
             }
+<<<<<<< local
+=======
+
+            String sProductSource( utl::Bootstrap::getProductSource( sDefault ) );
+            OSL_ENSURE( sProductSource.Len() > 0, "No ProductSource in bootstrap file" );
+
+            // the product source is something like "DEV300", where the
+            // build id is something like "300m12(Build:12345)". For better readability,
+            // strip the duplicate UPD ("300").
+            if ( sProductSource.Len() )
+            {
+                bool bMatchingUPD =
+                        ( sProductSource.Len() >= 3 )
+                    &&  ( sBuildId.Len() >= 3 )
+                    &&  ( sProductSource.Copy( sProductSource.Len() - 3 ) == sBuildId.Copy( 0, 3 ) );
+                OSL_ENSURE( bMatchingUPD, "BUILDID and ProductSource do not match in their UPD" );
+                if ( bMatchingUPD )
+                    sProductSource = sProductSource.Copy( 0, sProductSource.Len() - 3 );
+
+                // prepend the product source
+                sBuildId.Insert( sProductSource, 0 );
+            }
+
+            // --> PB 2008-10-30 #i94693#
+            /* if the build ids of the basis or ure layer are different from the build id
+             * of the brand layer then show them */
+            rtl::OUString aBasisProductBuildId( DEFINE_CONST_OUSTRING(
+                "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" ) );
+            rtl::Bootstrap::expandMacros( aBasisProductBuildId );
+            rtl::OUString aUREProductBuildId( DEFINE_CONST_OUSTRING(
+                "${$URE_BIN_DIR/" SAL_CONFIGFILE("version") ":ProductBuildid}" ) );
+            rtl::Bootstrap::expandMacros( aUREProductBuildId );
+            if ( sBuildId.Search( String( aBasisProductBuildId ) ) == STRING_NOTFOUND
+                || sBuildId.Search( String( aUREProductBuildId ) ) == STRING_NOTFOUND )
+            {
+                String sTemp( '-' );
+                sTemp += String( aBasisProductBuildId );
+                sTemp += '-';
+                sTemp += String( aUREProductBuildId );
+                sBuildId.Insert( sTemp, sBuildId.Search( ')' ) );
+            }
+            // <--
+
+            // the build id format is "milestone(build)[cwsname]". For readability, it would
+            // be nice to have some more spaces in there.
+            xub_StrLen nPos = 0;
+            if ( ( nPos = sBuildId.Search( sal_Unicode( '(' ) ) ) != STRING_NOTFOUND )
+                sBuildId.Insert( sal_Unicode( ' ' ), nPos );
+            if ( ( nPos = sBuildId.Search( sal_Unicode( '[' ) ) ) != STRING_NOTFOUND )
+                sBuildId.Insert( sal_Unicode( ' ' ), nPos );
+
+            // search for the resource of the about box
+            ResId aDialogResId( RID_DEFAULTABOUT, *pAppData_Impl->pLabelResMgr );
+            ResMgr* pResMgr = pAppData_Impl->pLabelResMgr;
+            if( ! pResMgr->IsAvailable( aDialogResId.SetRT( RSC_MODALDIALOG ) ) )
+                pResMgr = GetOffResManager_Impl();
+
+            aDialogResId.SetResMgr( pResMgr );
+            if ( !pResMgr->IsAvailable( aDialogResId ) )
+            {
+                DBG_ERRORFILE( "No RID_DEFAULTABOUT in label-resource-dll" );
+            }
+
+            // then show the about box
+            AboutDialog* pDlg = new AboutDialog( 0, aDialogResId, sBuildId );
+            pDlg->Execute();
+            delete pDlg;
+            bDone = sal_True;
+>>>>>>> other
             break;
         }
 
@@ -444,7 +513,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 new SfxTemplateOrganizeDlg(NULL);
             pDlg->Execute();
             delete pDlg;
-            bDone = TRUE;
+            bDone = sal_True;
             break;
         }
 
@@ -452,7 +521,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         {
             svt::AddressBookSourceDialog aDialog(GetTopWindow(), ::comphelper::getProcessServiceFactory());
             aDialog.Execute();
-            bDone = TRUE;
+            bDone = sal_True;
             break;
         }
 
@@ -480,7 +549,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                                 TYPE(SfxBoolItem)));
                 bool bShow = pItem == 0
                     ? !pAppData_Impl->m_xImeStatusWindow->isShowing()
-                    : ( pItem->GetValue() == TRUE );
+                    : ( pItem->GetValue() == sal_True );
                 pAppData_Impl->m_xImeStatusWindow->show(bShow);
                 if (pItem == 0)
                     rReq.AppendItem(SfxBoolItem(SID_SHOW_IME_STATUS_WINDOW,
@@ -527,7 +596,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
                     // Parameter auswerten
                     rtl::OUString aToolbarName( aBuf.makeStringAndClear() );
-                    BOOL bShow( !xLayoutManager->isElementVisible( aToolbarName ));
+                    sal_Bool bShow( !xLayoutManager->isElementVisible( aToolbarName ));
 
                     if ( bShow )
                     {
@@ -558,11 +627,11 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
     DBG_MEMTEST();
 
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
-    const USHORT *pRanges = rSet.GetRanges();
+    const sal_uInt16 *pRanges = rSet.GetRanges();
     DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
     while ( *pRanges )
     {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
+        for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
         {
             switch(nWhich)
             {
@@ -618,14 +687,14 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 
                 case SID_SAVEDOCS:
                 {
-                    BOOL bModified = FALSE;
+                    sal_Bool bModified = sal_False;
                     for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst();
                           pObjSh;
                           pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
                     {
                         if ( pObjSh->IsModified() )
                         {
-                            bModified = TRUE;
+                            bModified = sal_True;
                             break;
                         }
                     }
@@ -660,15 +729,15 @@ static const ::rtl::OUString& getProductRegistrationServiceName( )
     return s_sServiceName;
 }
 
-typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, BOOL, rtl_uString*);
-typedef void (SAL_CALL *basicide_macro_organizer)( INT16 );
+typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*);
+typedef void (SAL_CALL *basicide_macro_organizer)( sal_Int16 );
 
 #define DOSTRING( x )                       #x
 #define STRING( x )                         DOSTRING( x )
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
-::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() )
+::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() )
 {
     // get basctl dllname
     static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
@@ -688,7 +757,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
     return aScriptURL;
 }
 
-void MacroOrganizer( INT16 nTabId )
+void MacroOrganizer( sal_Int16 nTabId )
 {
     // get basctl dllname
     static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
@@ -846,7 +915,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 SfxViewFrame* pView = SfxViewFrame::GetFirst();
                 while ( pView )
                 {
-                    pView->GetBindings().InvalidateAll(FALSE);
+                    pView->GetBindings().InvalidateAll(sal_False);
                     pView = SfxViewFrame::GetNext( *pView );
                 }
             }
@@ -929,7 +998,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             {
                 SfxObjectShell* pBasicIDE = SfxObjectShell::CreateObject( lcl_getBasicIDEServiceName() );
                 pBasicIDE->DoInitNew( 0 );
-                pBasicIDE->SetModified( FALSE );
+                pBasicIDE->SetModified( sal_False );
                 try
                 {
                     // load the Basic IDE via direct access to the SFX frame loader. A generic loadComponentFromURL
@@ -986,15 +1055,15 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
         {
             const SfxItemSet* pArgs = rReq.GetArgs();
             const SfxPoolItem* pItem;
-            BOOL bChooseOnly = FALSE;
+            sal_Bool bChooseOnly = sal_False;
             Reference< XModel > xLimitToModel;
             if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_RECORDMACRO, sal_False, &pItem) )
             {
-                BOOL bRecord = ((SfxBoolItem*)pItem)->GetValue();
+                sal_Bool bRecord = ((SfxBoolItem*)pItem)->GetValue();
                 if ( bRecord )
                 {
                     // !Hack
-                    bChooseOnly = FALSE;
+                    bChooseOnly = sal_False;
                     SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
                     OSL_ENSURE( pCurrentShell, "macro recording outside an SFX document?" );
                     if ( pCurrentShell )
@@ -1012,7 +1081,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             OSL_TRACE("handling SID_MACROORGANIZER");
             const SfxItemSet* pArgs = rReq.GetArgs();
             const SfxPoolItem* pItem;
-            INT16 nTabId = 0;
+            sal_Int16 nTabId = 0;
             if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_MACROORGANIZER, sal_False, &pItem) )
             {
                 nTabId = ((SfxUInt16Item*)pItem)->GetValue();
@@ -1030,7 +1099,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
             Reference< XFrame > xFrame;
             const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl();
-            SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE );
+            SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False );
             if ( pFrameItem )
                 xFrame = pFrameItem->GetFrame();
 
@@ -1044,7 +1113,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             do  // artificial loop for flow control
             {
                 AbstractScriptSelectorDialog* pDlg = pFact->CreateScriptSelectorDialog(
-                    lcl_getDialogParent( xFrame, GetTopWindow() ), FALSE, xFrame );
+                    lcl_getDialogParent( xFrame, GetTopWindow() ), sal_False, xFrame );
                 OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" );
                 if ( !pDlg )
                     break;
@@ -1112,7 +1181,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             if ( pStringItem )
             {
                 String aPLZ = pStringItem->GetValue();
-                bRet = TRUE /*!!!SfxIniManager::CheckPLZ( aPLZ )*/;
+                bRet = sal_True /*!!!SfxIniManager::CheckPLZ( aPLZ )*/;
             }
             else
                 SbxBase::SetError( SbxERR_WRONG_ARGS );
@@ -1129,7 +1198,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 const SfxPoolItem* pItem=NULL;
                 const SfxItemSet* pSet = rReq.GetArgs();
                 SfxItemPool* pSetPool = pSet ? pSet->GetPool() : NULL;
-                if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), FALSE, &pItem ) == SFX_ITEM_SET )
+                if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), sal_False, &pItem ) == SFX_ITEM_SET )
                     aSet.Put( *pItem );
 
                   SfxAbstractTabDialog* pDlg = pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL );
@@ -1218,7 +1287,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 if (xDialog.is())
                     xDialog->execute();
                 else
-                    ShowServiceNotAvailableError(NULL, sDialogServiceName, TRUE);
+                    ShowServiceNotAvailableError(NULL, sDialogServiceName, sal_True);
             }
             catch(::com::sun::star::uno::Exception&)
             {
@@ -1239,11 +1308,11 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
 void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
 {
-    const USHORT *pRanges = rSet.GetRanges();
+    const sal_uInt16 *pRanges = rSet.GetRanges();
     DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
     while ( *pRanges )
     {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
+        for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
         {
             switch(nWhich)
             {
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 9d2025d1e23e..9ffb48e1b34a 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -224,10 +224,10 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
             return;
         }
 
-        USHORT nWhich = rSet.GetPool()->GetWhich(nSlotId);
-        BOOL bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+        sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
+        sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
         pItem->SetWhich( nWhich );
-        USHORT nSubCount = pType->nAttribs;
+        sal_uInt16 nSubCount = pType->nAttribs;
 
         const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[0];
         String aName = rProp.Name;
@@ -272,11 +272,11 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
             }
 #endif
             // complex property; collect sub items from the parameter set and reconstruct complex item
-            USHORT nFound=0;
+            sal_uInt16 nFound=0;
             for ( sal_uInt16 n=0; n<nCount; n++ )
             {
                 const ::com::sun::star::beans::PropertyValue& rPropValue = pPropsVal[n];
-                USHORT nSub;
+                sal_uInt16 nSub;
                 for ( nSub=0; nSub<nSubCount; nSub++ )
                 {
                     // search sub item by name
@@ -286,7 +286,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     const char* pName = aStr.GetBuffer();
                     if ( rPropValue.Name.compareToAscii( pName ) == COMPARE_EQUAL )
                     {
-                        BYTE nSubId = (BYTE) (sal_Int8) pType->aAttrib[nSub].nAID;
+                        sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) pType->aAttrib[nSub].nAID;
                         if ( bConvertTwips )
                             nSubId |= CONVERT_TWIPS;
                         if ( pItem->PutValue( rPropValue.Value, nSubId ) )
@@ -342,11 +342,11 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 return;
             }
 
-            USHORT nWhich = rSet.GetPool()->GetWhich(rArg.nSlotId);
-            BOOL bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+            sal_uInt16 nWhich = rSet.GetPool()->GetWhich(rArg.nSlotId);
+            sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
             pItem->SetWhich( nWhich );
             const SfxType* pType = rArg.pType;
-            USHORT nSubCount = pType->nAttribs;
+            sal_uInt16 nSubCount = pType->nAttribs;
             if ( nSubCount == 0 )
             {
                 // "simple" (base type) argument
@@ -377,14 +377,14 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
             else
             {
                 // complex argument, could be passed in one struct
-                BOOL bAsWholeItem = FALSE;
+                sal_Bool bAsWholeItem = sal_False;
                 for ( sal_uInt16 n=0; n<nCount; n++ )
                 {
                     const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n];
                     String aName = rProp.Name;
                     if ( aName.CompareToAscii(rArg.pName) == COMPARE_EQUAL )
                     {
-                        bAsWholeItem = TRUE;
+                        bAsWholeItem = sal_True;
 #ifdef DBG_UTIL
                         ++nFoundArgs;
 #endif
@@ -407,11 +407,11 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     // complex argument; collect sub items from argument array and reconstruct complex item
                     // only put item if at least one member was found and had the correct type
                     // (is this a good idea?! Should we ask for *all* members?)
-                    BOOL bRet = FALSE;
+                    sal_Bool bRet = sal_False;
                     for ( sal_uInt16 n=0; n<nCount; n++ )
                     {
                         const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n];
-                        for ( USHORT nSub=0; nSub<nSubCount; nSub++ )
+                        for ( sal_uInt16 nSub=0; nSub<nSubCount; nSub++ )
                         {
                             // search sub item by name
                             ByteString aStr( rArg.pName );
@@ -421,17 +421,17 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                             if ( rProp.Name.compareToAscii( pName ) == COMPARE_EQUAL )
                             {
                                 // at least one member found ...
-                                bRet = TRUE;
+                                bRet = sal_True;
 #ifdef DBG_UTIL
                                 ++nFoundArgs;
 #endif
-                                BYTE nSubId = (BYTE) (sal_Int8) pType->aAttrib[nSub].nAID;
+                                sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) pType->aAttrib[nSub].nAID;
                                 if ( bConvertTwips )
                                     nSubId |= CONVERT_TWIPS;
                                 if (!pItem->PutValue( rProp.Value, nSubId ) )
                                 {
                                     // ... but it was not convertable
-                                    bRet = FALSE;
+                                    bRet = sal_False;
 #ifdef DBG_UTIL
                                     ByteString aDbgStr( "Property not convertable: ");
                                     aDbgStr += rArg.pName;
@@ -935,10 +935,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     if ( !pSlot->IsMode(SFX_SLOT_METHOD) )
     {
         // slot is a property
-        USHORT nWhich = rSet.GetPool()->GetWhich(nSlotId);
+        sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
         if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???
         {
-            USHORT nSubCount = pType->nAttribs;
+            sal_uInt16 nSubCount = pType->nAttribs;
             if ( nSubCount )
                 // it's a complex property, we want it split into simple types
                 // so we expect to get as many items as we have (sub) members
@@ -964,15 +964,15 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     else
     {
         // slot is a method
-        USHORT nFormalArgs = pSlot->GetFormalArgumentCount();
-        for ( USHORT nArg=0; nArg<nFormalArgs; ++nArg )
+        sal_uInt16 nFormalArgs = pSlot->GetFormalArgumentCount();
+        for ( sal_uInt16 nArg=0; nArg<nFormalArgs; ++nArg )
         {
             // check every formal argument of the method
             const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
-            USHORT nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
+            sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
             if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???
             {
-                USHORT nSubCount = rArg.pType->nAttribs;
+                sal_uInt16 nSubCount = rArg.pType->nAttribs;
                 if ( nSubCount )
                     // argument has a complex type, we want it split into simple types
                     // so for this argument we expect to get as many items as we have (sub) members
@@ -1105,10 +1105,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     if ( rSet.Count() != nItems )
     {
         // detect unknown item and present error message
-        const USHORT *pRanges = rSet.GetRanges();
+        const sal_uInt16 *pRanges = rSet.GetRanges();
         while ( *pRanges )
         {
-            for(USHORT nId = *pRanges++; nId <= *pRanges; ++nId)
+            for(sal_uInt16 nId = *pRanges++; nId <= *pRanges; ++nId)
             {
                 if ( rSet.GetItemState(nId) < SFX_ITEM_SET ) //???
                     // not really set
@@ -1117,12 +1117,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 if ( !pSlot->IsMode(SFX_SLOT_METHOD) && nId == rSet.GetPool()->GetWhich( pSlot->GetSlotId() ) )
                     continue;
 
-                USHORT nFormalArgs = pSlot->GetFormalArgumentCount();
-                USHORT nArg;
+                sal_uInt16 nFormalArgs = pSlot->GetFormalArgumentCount();
+                sal_uInt16 nArg;
                 for ( nArg=0; nArg<nFormalArgs; ++nArg )
                 {
                     const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
-                    USHORT nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
+                    sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
                     if ( nId == nWhich )
                         break;
                 }
@@ -1258,12 +1258,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     if ( !pSlot->IsMode(SFX_SLOT_METHOD) )
     {
         // slot is a property
-        USHORT nWhich = rSet.GetPool()->GetWhich(nSlotId);
-        BOOL bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+        sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
+        sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
         SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, sal_False );
         if ( pItem ) //???
         {
-            USHORT nSubCount = pType->nAttribs;
+            sal_uInt16 nSubCount = pType->nAttribs;
             if ( !nSubCount )
             {
                 //rPool.FillVariable( *pItem, *pVar, eUserMetric );
@@ -1278,10 +1278,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
             else
             {
                 // complex type, add a property value for every member of the struct
-                for ( USHORT n=1; n<=nSubCount; ++n )
+                for ( sal_uInt16 n=1; n<=nSubCount; ++n )
                 {
                     //rPool.FillVariable( *pItem, *pVar, eUserMetric );
-                    BYTE nSubId = (BYTE) (sal_Int8) pType->aAttrib[n-1].nAID;
+                    sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) pType->aAttrib[n-1].nAID;
                     if ( bConvertTwips )
                         nSubId |= CONVERT_TWIPS;
 
@@ -1305,16 +1305,16 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     else
     {
         // slot is a method
-        USHORT nFormalArgs = pSlot->GetFormalArgumentCount();
-        for ( USHORT nArg=0; nArg<nFormalArgs; ++nArg )
+        sal_uInt16 nFormalArgs = pSlot->GetFormalArgumentCount();
+        for ( sal_uInt16 nArg=0; nArg<nFormalArgs; ++nArg )
         {
             const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
-            USHORT nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
-            BOOL bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+            sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
+            sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
             SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, sal_False );
             if ( pItem ) //???
             {
-                USHORT nSubCount = rArg.pType->nAttribs;
+                sal_uInt16 nSubCount = rArg.pType->nAttribs;
                 if ( !nSubCount )
                 {
                     //rPool.FillVariable( *pItem, *pVar, eUserMetric );
@@ -1329,10 +1329,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 else
                 {
                     // complex type, add a property value for every member of the struct
-                    for ( USHORT n = 1; n <= nSubCount; ++n )
+                    for ( sal_uInt16 n = 1; n <= nSubCount; ++n )
                     {
                         //rPool.FillVariable( rItem, *pVar, eUserMetric );
-                        BYTE nSubId = (BYTE) (sal_Int8) rArg.pType->aAttrib[n-1].nAID;
+                        sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) rArg.pType->aAttrib[n-1].nAID;
                         if ( bConvertTwips )
                             nSubId |= CONVERT_TWIPS;
 
@@ -1857,7 +1857,7 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::
                 if ( bSetDocMacroMode )
                 {
                     // mark document: it executes an own macro, so it's in a modal mode
-                    pDoc->SetMacroMode_Impl( TRUE );
+                    pDoc->SetMacroMode_Impl( sal_True );
                 }
 
                 if ( bSetGlobalThisComponent )
@@ -1890,7 +1890,7 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::
                 if ( bSetDocMacroMode )
                 {
                     // remove flag for modal mode
-                    pDoc->SetMacroMode_Impl( FALSE );
+                    pDoc->SetMacroMode_Impl( sal_False );
                 }
             }
             else
@@ -1932,7 +1932,7 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
     const ::rtl::OUString& /*sTargetFrameName*/,
     FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException )
 {
-    USHORT                  nId( 0 );
+    sal_uInt16                  nId( 0 );
     sal_Bool                bMasterCommand( sal_False );
     Reference < XDispatch > xDisp;
     const SfxSlot* pSlot = 0;
@@ -1940,9 +1940,9 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
     if ( aURL.Protocol.compareToAscii( "slot:" ) == COMPARE_EQUAL ||
          aURL.Protocol.compareToAscii( "commandId:" ) == COMPARE_EQUAL )
     {
-        nId = (USHORT) aURL.Path.toInt32();
+        nId = (sal_uInt16) aURL.Path.toInt32();
         SfxShell* pShell;
-        pAppDisp->GetShellAndSlot_Impl( nId, &pShell, &pSlot, TRUE, TRUE );
+        pAppDisp->GetShellAndSlot_Impl( nId, &pShell, &pSlot, sal_True, sal_True );
     }
     else if ( aURL.Protocol.compareToAscii( ".uno:" ) == COMPARE_EQUAL )
     {
@@ -1985,10 +1985,10 @@ throw (::com::sun::star::uno::RuntimeException)
     std::list< sal_Int16 > aGroupList;
     SfxSlotPool* pAppSlotPool = &SFX_APP()->GetAppSlotPool_Impl();
 
-    const ULONG nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
+    const sal_uIntPtr nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
 
     // Gruppe anw"ahlen ( Gruppe 0 ist intern )
-    for ( USHORT i=0; i<pAppSlotPool->GetGroupCount(); i++ )
+    for ( sal_uInt16 i=0; i<pAppSlotPool->GetGroupCount(); i++ )
     {
         String aName = pAppSlotPool->SeekGroup( i );
         const SfxSlot* pSfxSlot = pAppSlotPool->FirstSlot();
@@ -2020,11 +2020,11 @@ throw (::com::sun::star::uno::RuntimeException)
 
     if ( pAppSlotPool )
     {
-        const ULONG   nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
+        const sal_uIntPtr   nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
         rtl::OUString aCmdPrefix( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
 
         // Gruppe anw"ahlen ( Gruppe 0 ist intern )
-        for ( USHORT i=0; i<pAppSlotPool->GetGroupCount(); i++ )
+        for ( sal_uInt16 i=0; i<pAppSlotPool->GetGroupCount(); i++ )
         {
             String aName = pAppSlotPool->SeekGroup( i );
             const SfxSlot* pSfxSlot = pAppSlotPool->FirstSlot();
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index b8e8a92da1b8..2af0e9c179e2 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -350,7 +350,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
     aInfo.aSize = pWindow->GetSizePixel();
     if ( pWindow->IsSystemWindow() )
     {
-        ULONG nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+        sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
         if ( pWindow->GetStyle() & WB_SIZEABLE )
             nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
         aInfo.aWinState = ((SystemWindow*)pWindow)->GetWindowState( nMask );
@@ -381,7 +381,7 @@ sal_uInt16 SfxChildWindow::GetPosition()
 #if 0
 static void ImplWindowStateFromStr( Point rPos, Size rSize, const ByteString& rStr )
 {
-    ULONG       nValidMask  = 0;
+    sal_uIntPtr       nValidMask  = 0;
     xub_StrLen  nIndex      = 0;
     ByteString  aTokenStr;
 
@@ -463,7 +463,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
         nPos = aWinData.Search( cToken );
         if (nPos != STRING_NOTFOUND)
         {
-            USHORT nNextPos = aWinData.Search( cToken, 2 );
+            sal_uInt16 nNextPos = aWinData.Search( cToken, 2 );
             if ( nNextPos != STRING_NOTFOUND )
             {
                 // es gibt noch Extra-Information
@@ -642,7 +642,7 @@ sal_Bool SfxChildWindow::IsHideAtToggle() const
     return pImp->bHideAtToggle;
 }
 
-void SfxChildWindow::SetWantsFocus( BOOL bSet )
+void SfxChildWindow::SetWantsFocus( sal_Bool bSet )
 {
     pImp->bWantsFocus = bSet;
 }
@@ -749,18 +749,18 @@ void SfxChildWindow::Hide()
 
 
 
-void SfxChildWindow::Show( USHORT nFlags )
+void SfxChildWindow::Show( sal_uInt16 nFlags )
 {
     switch ( pWindow->GetType() )
     {
         case RSC_DOCKINGWINDOW :
-            ((DockingWindow*)pWindow)->Show( TRUE, nFlags );
+            ((DockingWindow*)pWindow)->Show( sal_True, nFlags );
             break;
         case RSC_TOOLBOX :
-            ((ToolBox*)pWindow)->Show( TRUE, nFlags );
+            ((ToolBox*)pWindow)->Show( sal_True, nFlags );
             break;
         default:
-            pWindow->Show( TRUE, nFlags );
+            pWindow->Show( sal_True, nFlags );
             break;
     }
 }
@@ -843,7 +843,7 @@ sal_Bool SfxChildWindow::CanGetFocus() const
     return !(pImp->pFact->aInfo.nFlags & SFX_CHILDWIN_CANTGETFOCUS);
 }
 
-void SfxChildWindowContext::RegisterChildWindowContext(SfxModule* pMod, USHORT nId, SfxChildWinContextFactory* pFact)
+void SfxChildWindowContext::RegisterChildWindowContext(SfxModule* pMod, sal_uInt16 nId, SfxChildWinContextFactory* pFact)
 {
     SFX_APP()->RegisterChildWindowContext_Impl( pMod, nId, pFact );
 }
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index cb53305e4b01..a2b29344f52c 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -81,9 +81,9 @@ struct Impl_DownLoadData
 SvFileObject::SvFileObject() :
     pDownLoadData( NULL ), pOldParent( NULL ), nType( FILETYPE_TEXT )
 {
-    bLoadAgain = TRUE;
+    bLoadAgain = sal_True;
     bSynchron = bLoadError = bWaitForData = bDataReady = bNativFormat =
-    bClearMedium = bStateChangeCalled = bInCallDownLoad = FALSE;
+    bClearMedium = bStateChangeCalled = bInCallDownLoad = sal_False;
 }
 
 
@@ -99,11 +99,11 @@ SvFileObject::~SvFileObject()
 }
 
 
-BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
+sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
                                 const String & rMimeType,
-                                BOOL bGetSynchron )
+                                sal_Bool bGetSynchron )
 {
-    ULONG nFmt = SotExchange::GetFormatStringId( rMimeType );
+    sal_uIntPtr nFmt = SotExchange::GetFormatStringId( rMimeType );
     switch( nType )
     {
     case FILETYPE_TEXT:
@@ -131,7 +131,7 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
                 //      Ende das Flag zurueckgesetzt werden.
 // wird einzig und allein im sw/ndgrf.cxx benutzt, wenn der Link vom
 // GraphicNode entfernt wird.
-                BOOL bOldNativFormat = bNativFormat;
+                sal_Bool bOldNativFormat = bNativFormat;
 //!!??              bNativFormat = 0 != (ASPECT_ICON & pSvData->GetAspect());
 
                 // falls gedruckt werden soll, warten wir bis die
@@ -150,7 +150,7 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
                             Application::Reschedule();
 
                         xMed = xTmpMed;
-                        bClearMedium = TRUE;
+                        bClearMedium = sal_True;
                     }
                 }
 
@@ -211,7 +211,7 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
                 if( xMed.Is() && !bSynchron && bClearMedium )
                 {
                     xMed.Clear();
-                    bClearMedium = FALSE;
+                    bClearMedium = sal_False;
                 }
             }
         }
@@ -227,10 +227,10 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
 
 
 
-BOOL SvFileObject::Connect( sfx2::SvBaseLink* pLink )
+sal_Bool SvFileObject::Connect( sfx2::SvBaseLink* pLink )
 {
     if( !pLink || !pLink->GetLinkManager() )
-        return FALSE;
+        return sal_False;
 
     // teste doch mal, ob nicht ein anderer Link mit der gleichen
     // Verbindung schon existiert
@@ -242,7 +242,7 @@ BOOL SvFileObject::Connect( sfx2::SvBaseLink* pLink )
         if( pShell.Is() )
         {
             if( pShell->IsAbortingImport() )
-                return FALSE;
+                return sal_False;
 
             if( pShell->GetMedium() )
                 sReferer = pShell->GetMedium()->GetName();
@@ -266,25 +266,25 @@ BOOL SvFileObject::Connect( sfx2::SvBaseLink* pLink )
         break;
 
     default:
-        return FALSE;
+        return sal_False;
     }
 
     SetUpdateTimeout( 0 );
 
     // und jetzt bei diesem oder gefundenem Pseudo-Object anmelden
     AddDataAdvise( pLink, SotExchange::GetFormatMimeType( pLink->GetContentType()), 0 );
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL SvFileObject::LoadFile_Impl()
+sal_Bool SvFileObject::LoadFile_Impl()
 {
     // wir sind noch im Laden!!
     if( bWaitForData || !bLoadAgain || xMed.Is() || pDownLoadData )
-        return FALSE;
+        return sal_False;
 
     // z.Z. nur auf die aktuelle DocShell
-    xMed = new SfxMedium( sFileNm, STREAM_STD_READ, TRUE );
+    xMed = new SfxMedium( sFileNm, STREAM_STD_READ, sal_True );
     SvLinkSource::StreamToLoadFrom aStreamToLoadFrom =
         getStreamToLoadFrom();
     xMed->setStreamToLoadFrom(
@@ -296,14 +296,14 @@ BOOL SvFileObject::LoadFile_Impl()
 
     if( !bSynchron )
     {
-        bLoadAgain = bDataReady = bInNewData = FALSE;
-        bWaitForData = TRUE;
+        bLoadAgain = bDataReady = bInNewData = sal_False;
+        bWaitForData = sal_True;
 
         SfxMediumRef xTmpMed = xMed;
         xMed->SetDataAvailableLink( STATIC_LINK( this, SvFileObject, LoadGrfNewData_Impl ) );
-        bInCallDownLoad = TRUE;
+        bInCallDownLoad = sal_True;
         xMed->DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
-        bInCallDownLoad = FALSE;
+        bInCallDownLoad = sal_False;
 
         bClearMedium = !xMed.Is();
         if( bClearMedium )
@@ -311,24 +311,24 @@ BOOL SvFileObject::LoadFile_Impl()
         return bDataReady;
     }
 
-    bWaitForData = TRUE;
-    bDataReady = bInNewData = FALSE;
+    bWaitForData = sal_True;
+    bDataReady = bInNewData = sal_False;
     xMed->DownLoad();
     bLoadAgain = !xMed->IsRemote();
-    bWaitForData = FALSE;
+    bWaitForData = sal_False;
 
     // Grafik ist fertig, also DataChanged von der Statusaederung schicken:
     SendStateChg_Impl( xMed->GetInStream() && xMed->GetInStream()->GetError()
                         ? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
+sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
 {
     GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
 
-    const USHORT nFilter = sFilter.Len() && pGF->GetImportFormatCount()
+    const sal_uInt16 nFilter = sFilter.Len() && pGF->GetImportFormatCount()
                             ? pGF->GetImportFormatNumber( sFilter )
                             : GRFILTER_FORMAT_DONTKNOW;
 
@@ -366,10 +366,10 @@ BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
                 xMed->SetDataAvailableLink( Link() );
 //              xMed->SetDoneLink( Link() );
                 delete pDownLoadData, pDownLoadData = 0;
-                bDataReady = TRUE;
-                bWaitForData = FALSE;
+                bDataReady = sal_True;
+                bWaitForData = sal_False;
             }
-            else if( FALSE )
+            else if( sal_False )
             {
                 // Timer aufsetzen, um zurueck zukehren
                 pDownLoadData->aTimer.Start();
@@ -519,15 +519,15 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
 IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
 {
     // wenn wir von hier kommen, kann es kein Fehler mehr sein
-    pThis->bLoadError = FALSE;
-    pThis->bWaitForData = FALSE;
-    pThis->bInCallDownLoad = FALSE;
+    pThis->bLoadError = sal_False;
+    pThis->bWaitForData = sal_False;
+    pThis->bInCallDownLoad = sal_False;
 
     if( !pThis->bInNewData && !pThis->bDataReady )
     {
             // Grafik ist fertig, also DataChanged von der Status-
             // aederung schicken:
-        pThis->bDataReady = TRUE;
+        pThis->bDataReady = sal_True;
         pThis->SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_OK );
 
             // und dann nochmal die Daten senden
@@ -536,7 +536,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
 
     if( pThis->bDataReady )
     {
-        pThis->bLoadAgain = TRUE;
+        pThis->bLoadAgain = sal_True;
         if( pThis->xMed.Is() )
         {
             pThis->xMed->SetDataAvailableLink( Link() );
@@ -567,8 +567,8 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
     if( pThis->bInNewData )
         return 0;
 
-    pThis->bInNewData = TRUE;
-    pThis->bLoadError = FALSE;
+    pThis->bInNewData = sal_True;
+    pThis->bLoadError = sal_False;
 
     if( !pThis->pDownLoadData )
     {
@@ -599,7 +599,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
         // im DataChanged ein DataReady?
         else if( pThis->bWaitForData && pThis->pDownLoadData )
         {
-            pThis->bLoadError = TRUE;
+            pThis->bLoadError = sal_True;
         }
     }
 
@@ -610,7 +610,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
         pThis->SendStateChg_Impl( pStrm->GetError() ? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
     }
 
-    pThis->bInNewData = FALSE;
+    pThis->bInNewData = sal_False;
     return 0;
 }
 
@@ -649,28 +649,28 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
         ERRCODE_SO_PENDING      wenn sie noch nicht komplett gelesen wurde
         ERRCODE_SO_FALSE        sonst
 */
-BOOL SvFileObject::IsPending() const
+sal_Bool SvFileObject::IsPending() const
 {
     return FILETYPE_GRF == nType && !bLoadError &&
             ( pDownLoadData || bWaitForData );
 }
-BOOL SvFileObject::IsDataComplete() const
+sal_Bool SvFileObject::IsDataComplete() const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( FILETYPE_GRF != nType )
-        bRet = TRUE;
+        bRet = sal_True;
     else if( !bLoadError && ( !bWaitForData && !pDownLoadData ))
     {
         SvFileObject* pThis = (SvFileObject*)this;
         if( bDataReady ||
             ( bSynchron && pThis->LoadFile_Impl() && xMed.Is() ) )
-            bRet = TRUE;
+            bRet = sal_True;
         else
         {
             INetURLObject aUrl( sFileNm );
             if( aUrl.HasError() ||
                 INET_PROT_NOT_VALID == aUrl.GetProtocol() )
-                bRet = TRUE;
+                bRet = sal_True;
         }
     }
     return bRet;
@@ -684,8 +684,8 @@ void SvFileObject::CancelTransfers()
     if( !bDataReady )
     {
         // nicht noch mal aufsetzen
-        bLoadAgain = FALSE;
-        bDataReady = bLoadError = bWaitForData = TRUE;
+        bLoadAgain = sal_False;
+        bDataReady = bLoadError = bWaitForData = sal_True;
         SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_ABORT );
     }
 }
@@ -699,7 +699,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState )
         aAny <<= rtl::OUString::valueOf( (sal_Int32)nState );
         DataChanged( SotExchange::GetFormatName(
                         sfx2::LinkManager::RegisterStatusInfoId()), aAny );
-        bStateChangeCalled = TRUE;
+        bStateChangeCalled = sal_True;
     }
 }
 
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 50f934a75436..0510f38092bd 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -46,22 +46,22 @@ class SvFileObject : public sfx2::SvLinkSource
     Impl_DownLoadData*  pDownLoadData;
     Window*             pOldParent;
 
-    BYTE nType;
-
-    BOOL bLoadAgain : 1;
-    BOOL bSynchron : 1;
-    BOOL bLoadError : 1;
-    BOOL bWaitForData : 1;
-    BOOL bInNewData : 1;
-    BOOL bDataReady : 1;
-    BOOL bMedUseCache : 1;
-    BOOL bNativFormat : 1;
-    BOOL bClearMedium : 1;
-    BOOL bStateChangeCalled : 1;
-    BOOL bInCallDownLoad : 1;
-
-    BOOL GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
-    BOOL LoadFile_Impl();
+    sal_uInt8 nType;
+
+    sal_Bool bLoadAgain : 1;
+    sal_Bool bSynchron : 1;
+    sal_Bool bLoadError : 1;
+    sal_Bool bWaitForData : 1;
+    sal_Bool bInNewData : 1;
+    sal_Bool bDataReady : 1;
+    sal_Bool bMedUseCache : 1;
+    sal_Bool bNativFormat : 1;
+    sal_Bool bClearMedium : 1;
+    sal_Bool bStateChangeCalled : 1;
+    sal_Bool bInCallDownLoad : 1;
+
+    sal_Bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
+    sal_Bool LoadFile_Impl();
     void SendStateChg_Impl( sfx2::LinkManager::LinkState nState );
 
     DECL_STATIC_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef* );
@@ -75,17 +75,17 @@ protected:
 public:
     SvFileObject();
 
-    virtual BOOL GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+    virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                             const String & rMimeType,
-                            BOOL bSynchron = FALSE );
+                            sal_Bool bSynchron = sal_False );
 
-    virtual BOOL    Connect( sfx2::SvBaseLink* );
+    virtual sal_Bool    Connect( sfx2::SvBaseLink* );
     virtual void    Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl );
 
     // erfrage ob das man direkt auf die Daten zugreifen kann oder ob das
     // erst angestossen werden muss
-    virtual BOOL IsPending() const;
-    virtual BOOL IsDataComplete() const;
+    virtual sal_Bool IsPending() const;
+    virtual sal_Bool IsDataComplete() const;
 
     void CancelTransfers();
 };
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 2d997dcc26ff..4f24ecb21355 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -62,7 +62,7 @@ HelpInterceptor_Impl::HelpInterceptor_Impl() :
 
 HelpInterceptor_Impl::~HelpInterceptor_Impl()
 {
-    for ( USHORT i = 0; m_pHistory && i < m_pHistory->Count(); ++i )
+    for ( sal_uInt16 i = 0; m_pHistory && i < m_pHistory->Count(); ++i )
         delete m_pHistory->GetObject(i);
     delete m_pHistory;
 }
@@ -73,10 +73,10 @@ void HelpInterceptor_Impl::addURL( const String& rURL )
 {
   if ( !m_pHistory )
         m_pHistory = new HelpHistoryList_Impl;
-    ULONG nCount = m_pHistory->Count();
+    sal_uIntPtr nCount = m_pHistory->Count();
     if ( nCount && m_nCurPos < ( nCount - 1 ) )
     {
-        for ( ULONG i = nCount - 1; i > m_nCurPos; i-- )
+        for ( sal_uIntPtr i = nCount - 1; i > m_nCurPos; i-- )
             delete m_pHistory->Remove(i);
     }
     Reference<XFrame> xFrame(m_xIntercepted, UNO_QUERY);
@@ -126,7 +126,7 @@ void HelpInterceptor_Impl::SetStartURL( const String& rURL )
     {
         m_pHistory = new HelpHistoryList_Impl;
         Any aEmptyViewData;
-        m_pHistory->Insert( new HelpHistoryEntry_Impl( rURL, aEmptyViewData ), ((ULONG)0x0) );
+        m_pHistory->Insert( new HelpHistoryEntry_Impl( rURL, aEmptyViewData ), ((sal_uIntPtr)0x0) );
         m_nCurPos = m_pHistory->Count() - 1;
 
         m_pWindow->UpdateToolbox();
@@ -161,7 +161,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
 
     // INetURLObject aObj( aURL.Complete );
     // sal_Bool bHelpURL = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
-    BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
+    sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
 
     if ( bHelpURL )
     {
@@ -269,7 +269,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
                 }
             }
 
-            ULONG nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos
+            sal_uIntPtr nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos
                                                     : ( !bBack && m_nCurPos < m_pHistory->Count() - 1 )
                                                     ? ++m_nCurPos
                                                     : ULONG_MAX;
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 3476f0d305b5..5a6f0d024c20 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -75,7 +75,7 @@ friend class SfxHelpWindow_Impl;
 
     HelpHistoryList_Impl*       m_pHistory;
     SfxHelpWindow_Impl*         m_pWindow;
-    ULONG                       m_nCurPos;
+    sal_uIntPtr                     m_nCurPos;
     String                      m_aCurrentURL;
     com::sun::star::uno::Any    m_aViewData;
 
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index b9f4404d5555..af8086f4e046 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -71,7 +71,7 @@ static WeakReference< XModuleUIConfigurationManagerSupplier > m_xModuleCfgMgrSup
 static WeakReference< XURLTransformer >                       m_xURLTransformer;
 static ModuleIdToImagegMgr                                    m_aModuleIdToImageMgrMap;
 
-Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast )
 {
     // TODO/LATeR: shouldn't this become a method at SfxViewFrame?! That would save the UnoTunnel
     if ( !rFrame.is() )
@@ -105,8 +105,8 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
         URL aTargetURL;
         aTargetURL.Complete = aURL;
         xURLTransformer->parseStrict( aTargetURL );
-        USHORT nId = ( USHORT ) aTargetURL.Path.toInt32();*/
-        USHORT nId = ( USHORT ) String(aURL).Copy(5).ToInt32();
+        sal_uInt16 nId = ( sal_uInt16 ) aTargetURL.Path.toInt32();*/
+        sal_uInt16 nId = ( sal_uInt16 ) String(aURL).Copy(5).ToInt32();
         const SfxSlot* pSlot = 0;
         if ( xModel.is() )
         {
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 479e8ddea745..df8ae4b8b425 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -134,7 +134,7 @@ SvDDEObject::SvDDEObject()
     : pConnection( 0 ), pLink( 0 ), pRequest( 0 ), pGetData( 0 ), nError( 0 )
 {
     SetUpdateTimeout( 100 );
-    bWaitForData = FALSE;
+    bWaitForData = sal_False;
 }
 
 SvDDEObject::~SvDDEObject()
@@ -144,12 +144,12 @@ SvDDEObject::~SvDDEObject()
     delete pConnection;
 }
 
-BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                             const String & rMimeType,
-                            BOOL bSynchron )
+                            sal_Bool bSynchron )
 {
     if( !pConnection )
-        return FALSE;
+        return sal_False;
 
     if( pConnection->GetError() )       // dann versuchen wir es nochmal
     {
@@ -163,10 +163,10 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
     }
 
     if( bWaitForData )      // wir sind rekursiv drin, wieder raus
-        return FALSE;
+        return sal_False;
 
     // Verriegeln gegen Reentrance
-    bWaitForData = TRUE;
+    bWaitForData = sal_True;
 
     // falls gedruckt werden soll, warten wir bis die Daten vorhanden sind
     if( bSynchron )
@@ -184,7 +184,7 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
         if( pConnection->GetError() )
             nError = DDELINK_ERROR_DATA;
 
-        bWaitForData = FALSE;
+        bWaitForData = sal_False;
     }
     else
     {
@@ -209,12 +209,12 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
 }
 
 
-BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
+sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 {
 #if defined(WNT)
-    static BOOL bInWinExec = FALSE;
+    static sal_Bool bInWinExec = sal_False;
 #endif
-    USHORT nLinkType = pSvLink->GetUpdateMode();
+    sal_uInt16 nLinkType = pSvLink->GetUpdateMode();
     if( pConnection )       // Verbindung steht ja schon
     {
         // tja, dann nur noch als Abhaengig eintragen
@@ -225,17 +225,17 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
                         : 0 );
         AddConnectAdvise( pSvLink );
 
-        return TRUE;
+        return sal_True;
     }
 
     if( !pSvLink->GetLinkManager() )
-        return FALSE;
+        return sal_False;
 
     String sServer, sTopic;
     pSvLink->GetLinkManager()->GetDisplayNames( pSvLink, &sServer, &sTopic, &sItem );
 
     if( !sServer.Len() || !sTopic.Len() || !sItem.Len() )
-        return FALSE;
+        return sal_False;
 
     pConnection = new DdeConnection( sServer, sTopic );
     if( pConnection->GetError() )
@@ -244,7 +244,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
         // dann ist der Server oben, kennt nur nicht das Topic!
         if( sTopic.EqualsIgnoreCaseAscii( "SYSTEM" ) )
         {
-            BOOL bSysTopic;
+            sal_Bool bSysTopic;
             {
                 DdeConnection aTmp( sServer, String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "SYSTEM" ) ) );
                 bSysTopic = !aTmp.GetError();
@@ -253,7 +253,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
             if( bSysTopic )
             {
                 nError = DDELINK_ERROR_DATA;
-                return FALSE;
+                return sal_False;
             }
             // ansonsten unter Win/WinNT die Applikation direkt starten
         }
@@ -271,12 +271,12 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
                 nError = DDELINK_ERROR_APP;
             else
             {
-                USHORT i;
+                sal_uInt16 i;
                 for( i=0; i<5; i++ )
                 {
-                    bInWinExec = TRUE;
+                    bInWinExec = sal_True;
                     Application::Reschedule();
-                    bInWinExec = FALSE;
+                    bInWinExec = sal_False;
 
                     delete pConnection;
                     pConnection = new DdeConnection( sServer, sTopic );
@@ -308,7 +308,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
     }
 
     if( pConnection->GetError() )
-        return FALSE;
+        return sal_False;
 
     AddDataAdvise( pSvLink,
                 SotExchange::GetFormatMimeType( pSvLink->GetContentType()),
@@ -317,7 +317,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
                         : 0 );
     AddConnectAdvise( pSvLink );
     SetUpdateTimeout( 0 );
-    return TRUE;
+    return sal_True;
 }
 
 void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl )
@@ -330,9 +330,9 @@ void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link
     }
 }
 
-BOOL SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
+sal_Bool SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
 {
-    USHORT nFmt = 0;
+    sal_uInt16 nFmt = 0;
     switch( rReq.GetFormat() )
     {
     case FORMAT_RTF:
@@ -359,7 +359,7 @@ BOOL SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
     return 0 != nFmt;
 }
 
-BOOL SvDDEObject::IsPending() const
+sal_Bool SvDDEObject::IsPending() const
 /*  [Beschreibung]
 
     Die Methode stellt fest, ob aus einem DDE-Object die Daten gelesen
@@ -373,14 +373,14 @@ BOOL SvDDEObject::IsPending() const
     return bWaitForData;
 }
 
-BOOL SvDDEObject::IsDataComplete() const
+sal_Bool SvDDEObject::IsDataComplete() const
 {
     return bWaitForData;
 }
 
 IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
 {
-    ULONG nFmt = pData->GetFormat();
+    sal_uIntPtr nFmt = pData->GetFormat();
     switch( nFmt )
     {
     case FORMAT_GDIMETAFILE:
@@ -406,7 +406,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
                 aVal <<= aSeq;
                 DataChanged( SotExchange::GetFormatMimeType(
                                                 pData->GetFormat() ), aVal );
-                bWaitForData = FALSE;
+                bWaitForData = sal_False;
             }
         }
     }
@@ -416,7 +416,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
 
 IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData )
 {
-    BOOL bValid = (BOOL)(ULONG)pData;
+    sal_Bool bValid = (sal_Bool)(sal_uIntPtr)pData;
     if( !bValid && ( pRequest || pLink ))
     {
         DdeTransaction* pReq = 0;
@@ -434,13 +434,13 @@ IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData )
             else if( pReq == pRequest )
             {
                 // das wars dann
-                bWaitForData = FALSE;
+                bWaitForData = sal_False;
             }
         }
     }
     else
         // das warten ist beendet
-        bWaitForData = FALSE;
+        bWaitForData = sal_False;
 
     return 0;
 }
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index b361df4468d3..4494cb9c20fa 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -48,11 +48,11 @@ class SvDDEObject : public SvLinkSource
     DdeRequest* pRequest;
     ::com::sun::star::uno::Any * pGetData;
 
-    BYTE bWaitForData : 1;                  // wird auf Daten gewartet?
-    BYTE nError     : 7;                    // Error Code fuer den Dialog
+    sal_uInt8 bWaitForData : 1;                     // wird auf Daten gewartet?
+    sal_uInt8 nError        : 7;                    // Error Code fuer den Dialog
 
 
-    BOOL ImplHasOtherFormat( DdeTransaction& );
+    sal_Bool ImplHasOtherFormat( DdeTransaction& );
     DECL_LINK( ImplGetDDEData, DdeData* );
     DECL_LINK( ImplDoneDDEData, void* );
 
@@ -62,15 +62,15 @@ protected:
 public:
     SvDDEObject();
 
-    virtual BOOL    GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+    virtual sal_Bool    GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                                 const String & aMimeType,
-                                BOOL bSynchron = FALSE );
+                                sal_Bool bSynchron = sal_False );
 
-    virtual BOOL    Connect( SvBaseLink * );
+    virtual sal_Bool    Connect( SvBaseLink * );
     virtual void    Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl );
 
-    virtual BOOL    IsPending() const;
-    virtual BOOL    IsDataComplete() const;
+    virtual sal_Bool    IsPending() const;
+    virtual sal_Bool    IsDataComplete() const;
 };
 
 }
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 934b4051a638..e689b3f22282 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -63,7 +63,7 @@ class SvxInternalLink : public sfx2::SvLinkSource
 public:
     SvxInternalLink() {}
 
-    virtual BOOL Connect( sfx2::SvBaseLink* );
+    virtual sal_Bool Connect( sfx2::SvBaseLink* );
 };
 
 
@@ -78,7 +78,7 @@ LinkManager::LinkManager(SfxObjectShell* p)
 LinkManager::~LinkManager()
 {
     SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData();
-    for( USHORT n = aLinkTbl.Count(); n; --n, ++ppRef )
+    for( sal_uInt16 n = aLinkTbl.Count(); n; --n, ++ppRef )
     {
         if( (*ppRef)->Is() )
         {
@@ -99,16 +99,16 @@ LinkManager::~LinkManager()
 void LinkManager::Remove( SvBaseLink *pLink )
 {
     // keine Links doppelt einfuegen
-    int bFound = FALSE;
+    int bFound = sal_False;
     SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData();
-    for( USHORT n = aLinkTbl.Count(); n; --n, ++ppRef )
+    for( sal_uInt16 n = aLinkTbl.Count(); n; --n, ++ppRef )
     {
         if( pLink == *(*ppRef) )
         {
             (*(*ppRef))->Disconnect();
             (*(*ppRef))->SetLinkManager( NULL );
             (*(*ppRef)).Clear();
-            bFound = TRUE;
+            bFound = sal_True;
         }
 
         // falls noch leere rum stehen sollten, weg damit
@@ -124,7 +124,7 @@ void LinkManager::Remove( SvBaseLink *pLink )
 }
 
 
-void LinkManager::Remove( USHORT nPos, USHORT nCnt )
+void LinkManager::Remove( sal_uInt16 nPos, sal_uInt16 nCnt )
 {
     if( nCnt && nPos < aLinkTbl.Count() )
     {
@@ -132,7 +132,7 @@ void LinkManager::Remove( USHORT nPos, USHORT nCnt )
             nCnt = aLinkTbl.Count() - nPos;
 
         SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData() + nPos;
-        for( USHORT n = nCnt; n; --n, ++ppRef )
+        for( sal_uInt16 n = nCnt; n; --n, ++ppRef )
         {
             if( (*ppRef)->Is() )
             {
@@ -146,29 +146,29 @@ void LinkManager::Remove( USHORT nPos, USHORT nCnt )
 }
 
 
-BOOL LinkManager::Insert( SvBaseLink* pLink )
+sal_Bool LinkManager::Insert( SvBaseLink* pLink )
 {
     // keine Links doppelt einfuegen
-    for( USHORT n = 0; n < aLinkTbl.Count(); ++n )
+    for( sal_uInt16 n = 0; n < aLinkTbl.Count(); ++n )
     {
         SvBaseLinkRef* pTmp = aLinkTbl[ n ];
         if( !pTmp->Is() )
             aLinkTbl.DeleteAndDestroy( n-- );
 
         if( pLink == *pTmp )
-            return FALSE;
+            return sal_False;
     }
 
     SvBaseLinkRef* pTmp = new SvBaseLinkRef( pLink );
     pLink->SetLinkManager( this );
     aLinkTbl.Insert( pTmp, aLinkTbl.Count() );
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL LinkManager::InsertLink( SvBaseLink * pLink,
-                                USHORT nObjType,
-                                USHORT nUpdateMode,
+sal_Bool LinkManager::InsertLink( SvBaseLink * pLink,
+                                sal_uInt16 nObjType,
+                                sal_uInt16 nUpdateMode,
                                 const String* pName )
 {
     // unbedingt zuerst
@@ -180,13 +180,13 @@ BOOL LinkManager::InsertLink( SvBaseLink * pLink,
 }
 
 
-BOOL LinkManager::InsertDDELink( SvBaseLink * pLink,
+sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink,
                                     const String& rServer,
                                     const String& rTopic,
                                     const String& rItem )
 {
     if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
-        return FALSE;
+        return sal_False;
 
     String sCmd;
     ::sfx2::MakeLnkName( sCmd, &rServer, rTopic, rItem );
@@ -197,11 +197,11 @@ BOOL LinkManager::InsertDDELink( SvBaseLink * pLink,
 }
 
 
-BOOL LinkManager::InsertDDELink( SvBaseLink * pLink )
+sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink )
 {
     DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" );
     if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
-        return FALSE;
+        return sal_False;
 
     if( pLink->GetObjType() == OBJECT_CLIENT_SO )
         pLink->SetObjType( OBJECT_CLIENT_DDE );
@@ -211,13 +211,13 @@ BOOL LinkManager::InsertDDELink( SvBaseLink * pLink )
 
 
 // erfrage die Strings fuer den Dialog
-BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
+sal_Bool LinkManager::GetDisplayNames( const SvBaseLink * pLink,
                                         String* pType,
                                         String* pFile,
                                         String* pLinkStr,
                                         String* pFilter ) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     const String sLNm( pLink->GetLinkSourceName() );
     if( sLNm.Len() )
     {
@@ -227,7 +227,7 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
             case OBJECT_CLIENT_GRF:
             case OBJECT_CLIENT_OLE:
                 {
-                    USHORT nPos = 0;
+                    sal_uInt16 nPos = 0;
                     String sFile( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) );
                     String sRange( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) );
 
@@ -246,12 +246,12 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
                                             ? RID_SVXSTR_FILELINK
                                             : RID_SVXSTR_GRAFIKLINK ));
                     }
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
                 break;
             case OBJECT_CLIENT_DDE:
                 {
-                    USHORT nTmp = 0;
+                    sal_uInt16 nTmp = 0;
                     String sCmd( sLNm );
                     String sServer( sCmd.GetToken( 0, cTokenSeperator, nTmp ) );
                     String sTopic( sCmd.GetToken( 0, cTokenSeperator, nTmp ) );
@@ -262,7 +262,7 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
                         *pFile = sTopic;
                     if( pLinkStr )
                         *pLinkStr = sCmd.Copy( nTmp );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
                 break;
             default:
@@ -275,9 +275,9 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
 
 
 void LinkManager::UpdateAllLinks(
-    BOOL bAskUpdate,
-    BOOL /*bCallErrHdl*/,
-    BOOL bUpdateGrfLinks,
+    sal_Bool bAskUpdate,
+    sal_Bool /*bCallErrHdl*/,
+    sal_Bool bUpdateGrfLinks,
     Window* pParentWin )
 {
     SvStringsDtor aApps, aTopics, aItems;
@@ -286,7 +286,7 @@ void LinkManager::UpdateAllLinks(
     // erstmal eine Kopie vom Array machen, damit sich updatende Links in
     // Links in ... nicht dazwischen funken!!
     SvPtrarr aTmpArr( 255, 50 );
-    USHORT n;
+    sal_uInt16 n;
     for( n = 0; n < aLinkTbl.Count(); ++n )
     {
         SvBaseLink* pLink = *aLinkTbl[ n ];
@@ -303,8 +303,8 @@ void LinkManager::UpdateAllLinks(
         SvBaseLink* pLink = (SvBaseLink*)aTmpArr[ n ];
 
         // suche erstmal im Array nach dem Eintrag
-        USHORT nFndPos = USHRT_MAX;
-        for( USHORT i = 0; i < aLinkTbl.Count(); ++i )
+        sal_uInt16 nFndPos = USHRT_MAX;
+        for( sal_uInt16 i = 0; i < aLinkTbl.Count(); ++i )
             if( pLink == *aLinkTbl[ i ] )
             {
                 nFndPos = i;
@@ -324,7 +324,7 @@ void LinkManager::UpdateAllLinks(
             int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute();
             if( RET_YES != nRet )
                 return ;        // es soll nichts geupdatet werden
-            bAskUpdate = FALSE;     // einmal reicht
+            bAskUpdate = sal_False;     // einmal reicht
         }
 
         pLink->Update();
@@ -354,20 +354,20 @@ SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
        }
 }
 
-BOOL LinkManager::InsertServer( SvLinkSource* pObj )
+sal_Bool LinkManager::InsertServer( SvLinkSource* pObj )
 {
     // keine doppelt einfuegen
     if( !pObj || USHRT_MAX != aServerTbl.GetPos( pObj ) )
-        return FALSE;
+        return sal_False;
 
     aServerTbl.Insert( pObj, aServerTbl.Count() );
-    return TRUE;
+    return sal_True;
 }
 
 
 void LinkManager::RemoveServer( SvLinkSource* pObj )
 {
-    USHORT nPos = aServerTbl.GetPos( pObj );
+    sal_uInt16 nPos = aServerTbl.GetPos( pObj );
     if( USHRT_MAX != nPos )
         aServerTbl.Remove( nPos, 1 );
 }
@@ -387,14 +387,14 @@ void MakeLnkName( String& rName, const String* pType, const String& rFile,
         ((rName += cTokenSeperator ) += *pFilter).EraseLeadingChars().EraseTrailingChars();
 }
 
-BOOL LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
-                                    USHORT nFileType,
+sal_Bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
+                                    sal_uInt16 nFileType,
                                     const String& rFileNm,
                                     const String* pFilterNm,
                                     const String* pRange )
 {
     if( !( OBJECT_CLIENT_SO & rLink.GetObjType() ))
-        return FALSE;
+        return sal_False;
 
     String sCmd( rFileNm );
     sCmd += ::sfx2::cTokenSeperator;
@@ -406,11 +406,11 @@ BOOL LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
     return InsertLink( &rLink, nFileType, sfx2::LINKUPDATE_ONCALL, &sCmd );
 }
 
-BOOL LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink )
+sal_Bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink )
 {
     if( OBJECT_CLIENT_FILE == ( OBJECT_CLIENT_FILE & rLink.GetObjType() ))
         return InsertLink( &rLink, rLink.GetObjType(), sfx2::LINKUPDATE_ONCALL );
-    return FALSE;
+    return sal_False;
 }
 
 // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
@@ -421,7 +421,7 @@ void LinkManager::CancelTransfers()
     sfx2::SvBaseLink* pLnk;
 
     const sfx2::SvBaseLinks& rLnks = GetLinks();
-    for( USHORT n = rLnks.Count(); n; )
+    for( sal_uInt16 n = rLnks.Count(); n; )
         if( 0 != ( pLnk = &(*rLnks[ --n ])) &&
             OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & pLnk->GetObjType()) &&
             0 != ( pFileObj = (SvFileObject*)pLnk->GetObj() ) )
@@ -435,9 +435,9 @@ void LinkManager::CancelTransfers()
     // dann die entsprechenden Informationen als String.
     // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
     // - das braucht Informationen ueber Load/Abort/Error
-ULONG LinkManager::RegisterStatusInfoId()
+sal_uIntPtr LinkManager::RegisterStatusInfoId()
 {
-    static ULONG nFormat = 0;
+    static sal_uIntPtr nFormat = 0;
 
     if( !nFormat )
     {
@@ -452,11 +452,11 @@ ULONG LinkManager::RegisterStatusInfoId()
 
 // ----------------------------------------------------------------------
 
-BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
+sal_Bool LinkManager::GetGraphicFromAny( const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue,
                                 Graphic& rGrf )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
     if( rValue.hasValue() && ( rValue >>= aSeq ) )
     {
@@ -469,7 +469,7 @@ BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
         case SOT_FORMATSTR_ID_SVXB:
             {
                 aMemStm >> rGrf;
-                bRet = TRUE;
+                bRet = sal_True;
             }
             break;
         case FORMAT_GDIMETAFILE:
@@ -477,7 +477,7 @@ BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
                 GDIMetaFile aMtf;
                 aMtf.Read( aMemStm );
                 rGrf = aMtf;
-                bRet = TRUE;
+                bRet = sal_True;
             }
             break;
         case FORMAT_BITMAP:
@@ -485,7 +485,7 @@ BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
                 Bitmap aBmp;
                 aMemStm >> aBmp;
                 rGrf = aBmp;
-                bRet = TRUE;
+                bRet = sal_True;
             }
             break;
         }
@@ -506,10 +506,10 @@ String lcl_DDE_RelToAbs( const String& rTopic, const String& rBaseURL )
     return sRet;
 }
 
-BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
+sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 {
     SfxObjectShell* pFndShell = 0;
-    USHORT nUpdateMode = com::sun::star::document::UpdateDocMode::NO_UPDATE;
+    sal_uInt16 nUpdateMode = com::sun::star::document::UpdateDocMode::NO_UPDATE;
     String sTopic, sItem, sReferer;
     if( pLink->GetLinkManager() &&
         pLink->GetLinkManager()->GetDisplayNames( pLink, 0, &sTopic, &sItem )
@@ -527,7 +527,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 
         TypeId aType( TYPE(SfxObjectShell) );
 
-        BOOL bFirst = TRUE;
+        sal_Bool bFirst = sal_True;
         SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
         if( pShell && pShell->GetMedium() )
         {
@@ -542,7 +542,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 
         if ( !pShell )
         {
-            bFirst = FALSE;
+            bFirst = sal_False;
             pShell = SfxObjectShell::GetFirst( &aType, sal_False );
         }
 
@@ -564,7 +564,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 
             if( bFirst )
             {
-                bFirst = FALSE;
+                bFirst = sal_False;
                 pShell = SfxObjectShell::GetFirst( &aType, sal_False );
             }
             else
@@ -576,7 +576,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 
     // empty topics are not allowed - which document is it
     if( !sTopic.Len() )
-        return FALSE;
+        return sal_False;
 
     if( !pFndShell )
     {
@@ -588,12 +588,12 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
             INET_PROT_HTTP != aURL.GetProtocol() )
         {
             SfxStringItem aName( SID_FILE_NAME, sTopic );
-            SfxBoolItem aMinimized(SID_MINIMIZED, TRUE);
-            SfxBoolItem aHidden(SID_HIDDEN, TRUE);
+            SfxBoolItem aMinimized(SID_MINIMIZED, sal_True);
+            SfxBoolItem aHidden(SID_HIDDEN, sal_True);
             SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
             SfxStringItem aReferer( SID_REFERER, sReferer );
             SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode );
-            SfxBoolItem aReadOnly(SID_DOC_READONLY, TRUE);
+            SfxBoolItem aReadOnly(SID_DOC_READONLY, sal_True);
 
             // #i14200# (DDE-link crashes wordprocessor)
             SfxAllItemSet aArgs( SFX_APP()->GetPool() );
@@ -608,13 +608,13 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
         }
     }
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( pFndShell )
     {
         sfx2::SvLinkSource* pNewSrc = pFndShell->DdeCreateLinkSource( sItem );
         if( pNewSrc )
         {
-            bRet = TRUE;
+            bRet = sal_True;
 
             ::com::sun::star::datatransfer::DataFlavor aFl;
             SotExchange::GetFormatDataFlavor( pLink->GetContentType(), aFl );
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index e9fbde42328f..ee6e4fba588b 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -68,7 +68,7 @@ void SvLinkSourceTimer::Timeout()
 }
 
 static void StartTimer( SvLinkSourceTimer ** ppTimer, SvLinkSource * pOwner,
-                        ULONG nTimeout )
+                        sal_uIntPtr nTimeout )
 {
     if( !*ppTimer )
     {
@@ -83,17 +83,17 @@ struct SvLinkSource_Entry_Impl
 {
     SvBaseLinkRef       xSink;
     String              aDataMimeType;
-    USHORT              nAdviseModes;
-    BOOL                bIsDataSink;
+    sal_uInt16              nAdviseModes;
+    sal_Bool                bIsDataSink;
 
     SvLinkSource_Entry_Impl( SvBaseLink* pLink, const String& rMimeType,
-                                USHORT nAdvMode )
+                                sal_uInt16 nAdvMode )
         : xSink( pLink ), aDataMimeType( rMimeType ),
-            nAdviseModes( nAdvMode ), bIsDataSink( TRUE )
+            nAdviseModes( nAdvMode ), bIsDataSink( sal_True )
     {}
 
     SvLinkSource_Entry_Impl( SvBaseLink* pLink )
-        : xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( FALSE )
+        : xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( sal_False )
     {}
 
     ~SvLinkSource_Entry_Impl();
@@ -111,7 +111,7 @@ class SvLinkSource_EntryIter_Impl
 {
     SvLinkSource_Array_Impl aArr;
     const SvLinkSource_Array_Impl& rOrigArr;
-    USHORT nPos;
+    sal_uInt16 nPos;
 public:
     SvLinkSource_EntryIter_Impl( const SvLinkSource_Array_Impl& rArr );
     ~SvLinkSource_EntryIter_Impl();
@@ -169,7 +169,7 @@ struct SvLinkSource_Impl
     SvLinkSource_Array_Impl aArr;
     String              aDataMimeType;
     SvLinkSourceTimer * pTimer;
-    ULONG               nTimeout;
+    sal_uIntPtr             nTimeout;
     com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
     m_xInputStreamToLoadFrom;
     sal_Bool m_bIsReadOnly;
@@ -224,12 +224,12 @@ void  SvLinkSource::Closed()
             p->xSink->Closed();
 }
 
-ULONG SvLinkSource::GetUpdateTimeout() const
+sal_uIntPtr SvLinkSource::GetUpdateTimeout() const
 {
     return pImpl->nTimeout;
 }
 
-void SvLinkSource::SetUpdateTimeout( ULONG nTimeout )
+void SvLinkSource::SetUpdateTimeout( sal_uIntPtr nTimeout )
 {
     pImpl->nTimeout = nTimeout;
     if( pImpl->pTimer )
@@ -249,7 +249,7 @@ void SvLinkSource::SendDataChanged()
 
             Any aVal;
             if( ( p->nAdviseModes & ADVISEMODE_NODATA ) ||
-                GetData( aVal, sDataMimeType, TRUE ) )
+                GetData( aVal, sDataMimeType, sal_True ) )
             {
                 p->xSink->DataChanged( sDataMimeType, aVal );
 
@@ -258,7 +258,7 @@ void SvLinkSource::SendDataChanged()
 
                 if( p->nAdviseModes & ADVISEMODE_ONLYONCE )
                 {
-                    USHORT nFndPos = pImpl->aArr.GetPos( p );
+                    sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
                     if( USHRT_MAX != nFndPos )
                         pImpl->aArr.DeleteAndDestroy( nFndPos );
                 }
@@ -286,7 +286,7 @@ void SvLinkSource::NotifyDataChanged()
             {
                 Any aVal;
                 if( ( p->nAdviseModes & ADVISEMODE_NODATA ) ||
-                    GetData( aVal, p->aDataMimeType, TRUE ) )
+                    GetData( aVal, p->aDataMimeType, sal_True ) )
                 {
                     p->xSink->DataChanged( p->aDataMimeType, aVal );
 
@@ -295,7 +295,7 @@ void SvLinkSource::NotifyDataChanged()
 
                     if( p->nAdviseModes & ADVISEMODE_ONLYONCE )
                     {
-                        USHORT nFndPos = pImpl->aArr.GetPos( p );
+                        sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
                         if( USHRT_MAX != nFndPos )
                             pImpl->aArr.DeleteAndDestroy( nFndPos );
                     }
@@ -335,7 +335,7 @@ void SvLinkSource::DataChanged( const String & rMimeType,
 
                 if( p->nAdviseModes & ADVISEMODE_ONLYONCE )
                 {
-                    USHORT nFndPos = pImpl->aArr.GetPos( p );
+                    sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
                     if( USHRT_MAX != nFndPos )
                         pImpl->aArr.DeleteAndDestroy( nFndPos );
                 }
@@ -353,7 +353,7 @@ void SvLinkSource::DataChanged( const String & rMimeType,
 
 // only one link is correct
 void SvLinkSource::AddDataAdvise( SvBaseLink * pLink, const String& rMimeType,
-                                    USHORT nAdviseModes )
+                                    sal_uInt16 nAdviseModes )
 {
     SvLinkSource_Entry_ImplPtr pNew = new SvLinkSource_Entry_Impl(
                     pLink, rMimeType, nAdviseModes );
@@ -366,7 +366,7 @@ void SvLinkSource::RemoveAllDataAdvise( SvBaseLink * pLink )
     for( SvLinkSource_Entry_ImplPtr p = aIter.Curr(); p; p = aIter.Next() )
         if( p->bIsDataSink && &p->xSink == pLink )
         {
-            USHORT nFndPos = pImpl->aArr.GetPos( p );
+            sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
             if( USHRT_MAX != nFndPos )
                 pImpl->aArr.DeleteAndDestroy( nFndPos );
         }
@@ -385,46 +385,46 @@ void SvLinkSource::RemoveConnectAdvise( SvBaseLink * pLink )
     for( SvLinkSource_Entry_ImplPtr p = aIter.Curr(); p; p = aIter.Next() )
         if( !p->bIsDataSink && &p->xSink == pLink )
         {
-            USHORT nFndPos = pImpl->aArr.GetPos( p );
+            sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
             if( USHRT_MAX != nFndPos )
                 pImpl->aArr.DeleteAndDestroy( nFndPos );
         }
 }
 
-BOOL SvLinkSource::HasDataLinks( const SvBaseLink* pLink ) const
+sal_Bool SvLinkSource::HasDataLinks( const SvBaseLink* pLink ) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     const SvLinkSource_Entry_Impl* p;
-    for( USHORT n = 0, nEnd = pImpl->aArr.Count(); n < nEnd; ++n )
+    for( sal_uInt16 n = 0, nEnd = pImpl->aArr.Count(); n < nEnd; ++n )
         if( ( p = pImpl->aArr[ n ] )->bIsDataSink &&
             ( !pLink || &p->xSink == pLink ) )
         {
-            bRet = TRUE;
+            bRet = sal_True;
             break;
         }
     return bRet;
 }
 
-// TRUE => waitinmg for data
-BOOL SvLinkSource::IsPending() const
+// sal_True => waitinmg for data
+sal_Bool SvLinkSource::IsPending() const
 {
-    return FALSE;
+    return sal_False;
 }
 
-// TRUE => data complete loaded
-BOOL SvLinkSource::IsDataComplete() const
+// sal_True => data complete loaded
+sal_Bool SvLinkSource::IsDataComplete() const
 {
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvLinkSource::Connect( SvBaseLink* )
+sal_Bool SvLinkSource::Connect( SvBaseLink* )
 {
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvLinkSource::GetData( ::com::sun::star::uno::Any &, const String &, BOOL )
+sal_Bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const String &, sal_Bool )
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SvLinkSource::Edit( Window *, SvBaseLink *, const Link& )
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 6a51783a8a04..95c24e4a77ab 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -49,7 +49,7 @@ namespace sfx2
 
 TYPEINIT0( SvBaseLink )
 
-static DdeTopic* FindTopic( const String &, USHORT* = 0 );
+static DdeTopic* FindTopic( const String &, sal_uInt16* = 0 );
 
 class  ImplDdeItem;
 
@@ -78,10 +78,10 @@ struct ImplBaseLinkData
     struct tClientType
     {
         // gilt fuer alle Links
-        ULONG               nCntntType; // Update Format
+        sal_uIntPtr             nCntntType; // Update Format
         // nicht Ole-Links
-        BOOL            bIntrnlLnk; // ist es ein interner Link
-        USHORT          nUpdateMode;// UpdateMode
+        sal_Bool            bIntrnlLnk; // ist es ein interner Link
+        sal_uInt16          nUpdateMode;// UpdateMode
     };
 
     struct tDDEType
@@ -96,7 +96,7 @@ struct ImplBaseLinkData
     ImplBaseLinkData()
     {
         ClientType.nCntntType = 0;
-        ClientType.bIntrnlLnk = FALSE;
+        ClientType.bIntrnlLnk = sal_False;
         ClientType.nUpdateMode = 0;
         DDEType.pItem = NULL;
     }
@@ -108,26 +108,26 @@ class ImplDdeItem : public DdeGetPutItem
     SvBaseLink* pLink;
     DdeData aData;
     Sequence< sal_Int8 > aSeq;          // Datacontainer for DdeData !!!
-    BOOL bIsValidData : 1;
-    BOOL bIsInDTOR : 1;
+    sal_Bool bIsValidData : 1;
+    sal_Bool bIsInDTOR : 1;
 public:
     ImplDdeItem( SvBaseLink& rLink, const String& rStr )
-        : DdeGetPutItem( rStr ), pLink( &rLink ), bIsValidData( FALSE ),
-        bIsInDTOR( FALSE )
+        : DdeGetPutItem( rStr ), pLink( &rLink ), bIsValidData( sal_False ),
+        bIsInDTOR( sal_False )
     {}
     virtual ~ImplDdeItem();
 
-    virtual DdeData* Get( ULONG );
-    virtual BOOL Put( const DdeData* );
-    virtual void AdviseLoop( BOOL );
+    virtual DdeData* Get( sal_uIntPtr );
+    virtual sal_Bool Put( const DdeData* );
+    virtual void AdviseLoop( sal_Bool );
 
     void Notify()
     {
-        bIsValidData = FALSE;
+        bIsValidData = sal_False;
         DdeGetPutItem::NotifyClient();
     }
 
-    BOOL IsInDTOR() const { return bIsInDTOR; }
+    sal_Bool IsInDTOR() const { return bIsInDTOR; }
 };
 
 
@@ -142,8 +142,8 @@ SvBaseLink::SvBaseLink()
     pImpl = new BaseLink_Impl();
     nObjType = OBJECT_CLIENT_SO;
     pImplData = new ImplBaseLinkData;
-    bVisible = bSynchron = bUseCache = TRUE;
-    bWasLastEditOK = FALSE;
+    bVisible = bSynchron = bUseCache = sal_True;
+    bWasLastEditOK = sal_False;
 }
 
 /************************************************************************
@@ -152,18 +152,18 @@ SvBaseLink::SvBaseLink()
 |*    Beschreibung
 *************************************************************************/
 
-SvBaseLink::SvBaseLink( USHORT nUpdateMode, ULONG nContentType )
+SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
 {
     pImpl = new BaseLink_Impl();
     nObjType = OBJECT_CLIENT_SO;
     pImplData = new ImplBaseLinkData;
-    bVisible = bSynchron = bUseCache = TRUE;
-    bWasLastEditOK = FALSE;
+    bVisible = bSynchron = bUseCache = sal_True;
+    bWasLastEditOK = sal_False;
 
     // falls es ein Ole-Link wird,
     pImplData->ClientType.nUpdateMode = nUpdateMode;
     pImplData->ClientType.nCntntType = nContentType;
-    pImplData->ClientType.bIntrnlLnk = FALSE;
+    pImplData->ClientType.bIntrnlLnk = sal_False;
 }
 
 /************************************************************************
@@ -172,10 +172,10 @@ SvBaseLink::SvBaseLink( USHORT nUpdateMode, ULONG nContentType )
 |*    Beschreibung
 *************************************************************************/
 
-SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSource* pObj )
+SvBaseLink::SvBaseLink( const String& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj )
 {
-    bVisible = bSynchron = bUseCache = TRUE;
-    bWasLastEditOK = FALSE;
+    bVisible = bSynchron = bUseCache = sal_True;
+    bWasLastEditOK = sal_False;
     aLinkName = rLinkName;
     pImplData = new ImplBaseLinkData;
     nObjType = nObjectType;
@@ -188,7 +188,7 @@ SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSourc
 
     if( OBJECT_DDE_EXTERN == nObjType )
     {
-        USHORT nItemStt = 0;
+        sal_uInt16 nItemStt = 0;
         DdeTopic* pTopic = FindTopic( aLinkName, &nItemStt );
         if( pTopic )
         {
@@ -248,7 +248,7 @@ IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName )
 |*    Beschreibung
 *************************************************************************/
 
-void SvBaseLink::SetObjType( USHORT nObjTypeP )
+void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP )
 {
     DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" );
     DBG_ASSERT( !xObj.Is(), "object exist" );
@@ -333,7 +333,7 @@ String  SvBaseLink::GetLinkSourceName() const
 |*    Beschreibung
 *************************************************************************/
 
-void SvBaseLink::SetUpdateMode( USHORT nMode )
+void SvBaseLink::SetUpdateMode( sal_uInt16 nMode )
 {
     if( ( OBJECT_CLIENT_SO & nObjType ) &&
         pImplData->ClientType.nUpdateMode != nMode )
@@ -358,7 +358,7 @@ void SvBaseLink::clearStreamToLoadFrom()
 }
 // <--
 
-BOOL SvBaseLink::Update()
+sal_Bool SvBaseLink::Update()
 {
     if( OBJECT_CLIENT_SO & nObjType )
     {
@@ -383,13 +383,13 @@ BOOL SvBaseLink::Update()
                 if( OBJECT_CLIENT_DDE == nObjType &&
                     LINKUPDATE_ONCALL == GetUpdateMode() && xObj.Is() )
                     xObj->RemoveAllDataAdvise( this );
-                return TRUE;
+                return sal_True;
             }
             if( xObj.Is() )
             {
                 // sollten wir asynschron sein?
                 if( xObj->IsPending() )
-                    return TRUE;
+                    return sal_True;
 
                 // dann brauchen wir das Object auch nicht mehr
                 AddNextRef();
@@ -398,19 +398,19 @@ BOOL SvBaseLink::Update()
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-USHORT SvBaseLink::GetUpdateMode() const
+sal_uInt16 SvBaseLink::GetUpdateMode() const
 {
     return ( OBJECT_CLIENT_SO & nObjType )
             ? pImplData->ClientType.nUpdateMode
-            : sal::static_int_cast< USHORT >( LINKUPDATE_ONCALL );
+            : sal::static_int_cast< sal_uInt16 >( LINKUPDATE_ONCALL );
 }
 
 
-void SvBaseLink::_GetRealObject( BOOL bConnect)
+void SvBaseLink::_GetRealObject( sal_Bool bConnect)
 {
     if( !pImpl->m_pLinkMgr )
         return;
@@ -427,12 +427,12 @@ void SvBaseLink::_GetRealObject( BOOL bConnect)
             nObjType = OBJECT_INTERN;
             xObj = pImpl->m_pLinkMgr->CreateObj( this );
 
-            pImplData->ClientType.bIntrnlLnk = TRUE;
+            pImplData->ClientType.bIntrnlLnk = sal_True;
             nObjType = OBJECT_CLIENT_DDE;       // damit wir wissen was es mal war !!
         }
         else
         {
-            pImplData->ClientType.bIntrnlLnk = FALSE;
+            pImplData->ClientType.bIntrnlLnk = sal_False;
             xObj = pImpl->m_pLinkMgr->CreateObj( this );
         }
     }
@@ -443,7 +443,7 @@ void SvBaseLink::_GetRealObject( BOOL bConnect)
         Disconnect();
 }
 
-ULONG SvBaseLink::GetContentType() const
+sal_uIntPtr SvBaseLink::GetContentType() const
 {
     if( OBJECT_CLIENT_SO & nObjType )
         return pImplData->ClientType.nCntntType;
@@ -452,14 +452,14 @@ ULONG SvBaseLink::GetContentType() const
 }
 
 
-BOOL SvBaseLink::SetContentType( ULONG nType )
+sal_Bool SvBaseLink::SetContentType( sal_uIntPtr nType )
 {
     if( OBJECT_CLIENT_SO & nObjType )
     {
         pImplData->ClientType.nCntntType = nType;
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 LinkManager* SvBaseLink::GetLinkManager()
@@ -530,7 +530,7 @@ void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl )
     if ( !bAsync )
     {
         ExecuteEdit( String() );
-        bWasLastEditOK = FALSE;
+        bWasLastEditOK = sal_False;
         if ( pImpl->m_aEndEditLink.IsSet() )
             pImpl->m_aEndEditLink.Call( this );
     }
@@ -549,7 +549,7 @@ bool SvBaseLink::ExecuteEdit( const String& _rNewName )
             {
                 sError = SfxResId( STR_DDE_ERROR );
 
-                USHORT nFndPos = sError.Search( '%' );
+                sal_uInt16 nFndPos = sError.Search( '%' );
                 if( STRING_NOTFOUND != nFndPos )
                 {
                     sError.Erase( nFndPos, 1 ).Insert( sApp, nFndPos );
@@ -592,14 +592,14 @@ FileDialogHelper* SvBaseLink::GetFileDialog( sal_uInt32 nFlags, const String& rF
 
 ImplDdeItem::~ImplDdeItem()
 {
-    bIsInDTOR = TRUE;
+    bIsInDTOR = sal_True;
     // damit im Disconnect nicht jemand auf die Idee kommt, den Pointer zu
     // loeschen!!
     SvBaseLinkRef aRef( pLink );
     aRef->Disconnect();
 }
 
-DdeData* ImplDdeItem::Get( ULONG nFormat )
+DdeData* ImplDdeItem::Get( sal_uIntPtr nFormat )
 {
     if( pLink->GetObj() )
     {
@@ -615,25 +615,25 @@ DdeData* ImplDdeItem::Get( ULONG nFormat )
             {
                 aData = DdeData( (const char *)aSeq.getConstArray(), aSeq.getLength(), nFormat );
 
-                bIsValidData = TRUE;
+                bIsValidData = sal_True;
                 return &aData;
             }
         }
     }
     aSeq.realloc( 0 );
-    bIsValidData = FALSE;
+    bIsValidData = sal_False;
     return 0;
 }
 
 
-BOOL ImplDdeItem::Put( const DdeData*  )
+sal_Bool ImplDdeItem::Put( const DdeData*  )
 {
     DBG_ERROR( "ImplDdeItem::Put not implemented" );
-    return FALSE;
+    return sal_False;
 }
 
 
-void ImplDdeItem::AdviseLoop( BOOL bOpen )
+void ImplDdeItem::AdviseLoop( sal_Bool bOpen )
 {
     // Verbindung wird geschlossen, also Link abmelden
     if( pLink->GetObj() )
@@ -658,13 +658,13 @@ void ImplDdeItem::AdviseLoop( BOOL bOpen )
 }
 
 
-static DdeTopic* FindTopic( const String & rLinkName, USHORT* pItemStt )
+static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt )
 {
     if( 0 == rLinkName.Len() )
         return 0;
 
     String sNm( rLinkName );
-    USHORT nTokenPos = 0;
+    sal_uInt16 nTokenPos = 0;
     String sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) );
 
     DdeServices& rSvc = DdeService::GetServices();
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index ba91d9c1117b..90b93cc3748e 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -73,7 +73,7 @@ public:
 
                                 SfxModule_Impl();
                                 ~SfxModule_Impl();
-    ImageList*                  GetImageList( ResMgr*, BOOL, BOOL bHiContrast = FALSE );
+    ImageList*                  GetImageList( ResMgr*, sal_Bool, sal_Bool bHiContrast = sal_False );
 };
 
 SfxModule_Impl::SfxModule_Impl()
@@ -94,7 +94,7 @@ SfxModule_Impl::~SfxModule_Impl()
     delete pImgListHiBig;
 }
 
-ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig, BOOL bHiContrast )
+ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, sal_Bool bBig, sal_Bool bHiContrast )
 {
     ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig: pImgListBig ) :
                                 ( bHiContrast ? pImgListHiSmall : pImgListSmall );
@@ -131,7 +131,7 @@ ResMgr* SfxModule::GetResMgr()
 
 //====================================================================
 /*
-SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
+SfxModule::SfxModule( ResMgr* pMgrP, sal_Bool bDummyP,
                       SfxObjectFactory* pFactoryP )
     : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
 {
@@ -140,7 +140,7 @@ SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
         pFactoryP->SetModule_Impl( this );
 }
 */
-SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
+SfxModule::SfxModule( ResMgr* pMgrP, sal_Bool bDummyP,
                       SfxObjectFactory* pFactoryP, ... )
     : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
 {
@@ -187,7 +187,7 @@ SfxModule::~SfxModule()
         {
             // Das Modul wird noch vor dem DeInitialize zerst"ort, also auis dem Array entfernen
             SfxModuleArr_Impl& rArr = GetModules_Impl();
-            for( USHORT nPos = rArr.Count(); nPos--; )
+            for( sal_uInt16 nPos = rArr.Count(); nPos--; )
             {
                 if( rArr[ nPos ] == this )
                 {
@@ -220,7 +220,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
         pImpl->pFactArr = new SfxChildWinFactArr_Impl;
 
 //#ifdef DBG_UTIL
-    for (USHORT nFactory=0; nFactory<pImpl->pFactArr->Count(); ++nFactory)
+    for (sal_uInt16 nFactory=0; nFactory<pImpl->pFactArr->Count(); ++nFactory)
     {
         if (pFact->nId ==  (*pImpl->pFactArr)[nFactory]->nId)
         {
@@ -237,13 +237,13 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
 
 //-------------------------------------------------------------------------
 
-void SfxModule::RegisterChildWindowContext( USHORT nId,
+void SfxModule::RegisterChildWindowContext( sal_uInt16 nId,
         SfxChildWinContextFactory *pFact)
 {
     DBG_ASSERT( pImpl, "Kein echtes Modul!" );
 
-    USHORT nCount = pImpl->pFactArr->Count();
-    for (USHORT nFactory=0; nFactory<nCount; ++nFactory)
+    sal_uInt16 nCount = pImpl->pFactArr->Count();
+    for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory)
     {
         SfxChildWinFactory *pF = (*pImpl->pFactArr)[nFactory];
         if ( nId == pF->nId )
@@ -266,7 +266,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact )
         pImpl->pTbxCtrlFac = new SfxTbxCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pImpl->pTbxCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImpl->pTbxCtrlFac->Count(); n++ )
     {
         SfxTbxCtrlFactory *pF = (*pImpl->pTbxCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -288,7 +288,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact )
         pImpl->pStbCtrlFac = new SfxStbCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pImpl->pStbCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImpl->pStbCtrlFac->Count(); n++ )
     {
         SfxStbCtrlFactory *pF = (*pImpl->pStbCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -310,7 +310,7 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact )
         pImpl->pMenuCtrlFac = new SfxMenuCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pImpl->pMenuCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImpl->pMenuCtrlFac->Count(); n++ )
     {
         SfxMenuCtrlFactory *pF = (*pImpl->pMenuCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -352,17 +352,17 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
     return pImpl->pFactArr;
 }
 
-ImageList* SfxModule::GetImageList_Impl( BOOL bBig )
+ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig )
 {
-    return pImpl->GetImageList( pResMgr, bBig, FALSE );
+    return pImpl->GetImageList( pResMgr, bBig, sal_False );
 }
 
-ImageList* SfxModule::GetImageList_Impl( BOOL bBig, BOOL bHiContrast )
+ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig, sal_Bool bHiContrast )
 {
     return pImpl->GetImageList( pResMgr, bBig, bHiContrast );
 }
 
-SfxTabPage* SfxModule::CreateTabPage( USHORT, Window*, const SfxItemSet& )
+SfxTabPage* SfxModule::CreateTabPage( sal_uInt16, Window*, const SfxItemSet& )
 {
     return NULL;
 }
@@ -379,7 +379,7 @@ void SfxModule::DestroyModules_Impl()
     if ( pModules )
     {
         SfxModuleArr_Impl& rModules = *pModules;
-        for( USHORT nPos = rModules.Count(); nPos--; )
+        for( sal_uInt16 nPos = rModules.Count(); nPos--; )
     {
         SfxModule* pMod = rModules.GetObject(nPos);
         delete pMod;
@@ -387,22 +387,22 @@ void SfxModule::DestroyModules_Impl()
     }
 }
 
-void SfxModule::Invalidate( USHORT nId )
+void SfxModule::Invalidate( sal_uInt16 nId )
 {
     for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame ) )
         if ( pFrame->GetObjectShell()->GetModule() == this )
             Invalidate_Impl( pFrame->GetBindings(), nId );
 }
 
-BOOL SfxModule::IsActive() const
+sal_Bool SfxModule::IsActive() const
 {
     SfxViewFrame* pFrame = SfxViewFrame::Current();
     if ( pFrame && pFrame->GetObjectShell()->GetFactory().GetModule() == this )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
-bool SfxModule::IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const
+bool SfxModule::IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const
 {
     if ( i_nId != SID_TASKPANE )
         // by default, assume it is
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 96f4c6b91f5b..dbeb25d8c6b9 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -185,7 +185,7 @@ namespace sfx2
 {
 //.........................................................................
 
-    void HandleTaskPaneList( Window* pWindow, BOOL bAddToList )
+    void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList )
     {
         Window* pParent = pWindow->GetParent();
         DBG_ASSERT( pParent, "HandleTaskPaneList(): every window here should have a parent" );
@@ -227,7 +227,7 @@ namespace sfx2
         {
             nStartPos = aBoundary.endPos;
             String sSearchToken( rSearchString.Copy(
-                (USHORT)aBoundary.startPos, (USHORT)aBoundary.endPos - (USHORT)aBoundary.startPos ) );
+                (sal_uInt16)aBoundary.startPos, (sal_uInt16)aBoundary.endPos - (sal_uInt16)aBoundary.startPos ) );
             if ( sSearchToken.Len() > 0 && ( sSearchToken.Len() > 1 || sSearchToken.GetChar(0) != '.' ) )
             {
                 if ( bForSearch && sSearchToken.GetChar( sSearchToken.Len() - 1 ) != '*' )
@@ -269,7 +269,7 @@ struct IndexEntry_Impl
 };
 
 #define NEW_ENTRY( url, bool ) \
-    (void*)(ULONG)( new IndexEntry_Impl( url, bool ) )
+    (void*)(sal_uIntPtr)( new IndexEntry_Impl( url, bool ) )
 
 // struct ContentEntry_Impl ----------------------------------------------
 
@@ -317,7 +317,7 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId )
 
 ContentListBox_Impl::~ContentListBox_Impl()
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     SvLBoxEntry* pEntry = GetEntry( nPos++ );
     while ( pEntry )
     {
@@ -337,7 +337,7 @@ void ContentListBox_Impl::InitRoot()
         SfxContentHelper::GetHelpTreeViewContents( aHelpTreeviewURL );
 
     const ::rtl::OUString* pEntries  = aList.getConstArray();
-    UINT32 i, nCount = aList.getLength();
+    sal_uInt32 i, nCount = aList.getLength();
     for ( i = 0; i < nCount; ++i )
     {
         String aRow( pEntries[i] );
@@ -347,7 +347,7 @@ void ContentListBox_Impl::InitRoot()
         aURL = aRow.GetToken( 0, '\t', nIdx );
         sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0);
         sal_Bool bIsFolder = ( '1' == cFolder );
-        SvLBoxEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, TRUE );
+        SvLBoxEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, sal_True );
         if ( bIsFolder )
             pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) );
     }
@@ -382,7 +382,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
                     SfxContentHelper::GetHelpTreeViewContents( aTmpURL );
 
                 const ::rtl::OUString* pEntries  = aList.getConstArray();
-                UINT32 i, nCount = aList.getLength();
+                sal_uInt32 i, nCount = aList.getLength();
                 for ( i = 0; i < nCount; ++i )
                 {
                     String aRow( pEntries[i] );
@@ -395,7 +395,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
                     SvLBoxEntry* pEntry = NULL;
                     if ( bIsFolder )
                     {
-                        pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, TRUE );
+                        pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, sal_True );
                         pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) );
                     }
                     else
@@ -500,15 +500,15 @@ IndexBox_Impl::IndexBox_Impl( Window* pParent, const ResId& rResId ) :
     ComboBox( pParent, rResId )
 
 {
-    EnableAutocomplete( TRUE );
-    EnableUserDraw( TRUE );
+    EnableAutocomplete( sal_True );
+    EnableUserDraw( sal_True );
 }
 
 // -----------------------------------------------------------------------
 
 void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
 {
-    IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(ULONG)GetEntryData( rUDEvt.GetItemId() );
+    IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(sal_uIntPtr)GetEntryData( rUDEvt.GetItemId() );
     if ( pEntry && pEntry->m_bSubEntry )
     {
         // indent sub entries
@@ -516,11 +516,11 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
         aPos.X() += 8;
         aPos.Y() += ( rUDEvt.GetRect().GetHeight() - rUDEvt.GetDevice()->GetTextHeight() ) / 2;
         String aEntry( GetEntry( rUDEvt.GetItemId() ) );
-        USHORT nPos = aEntry.Search( ';' );
+        sal_uInt16 nPos = aEntry.Search( ';' );
         rUDEvt.GetDevice()->DrawText( aPos, ( nPos != STRING_NOTFOUND ) ? aEntry.Copy( nPos + 1 ) : aEntry );
     }
     else
-        DrawEntry( rUDEvt, FALSE, TRUE, TRUE );
+        DrawEntry( rUDEvt, sal_False, sal_True, sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -542,16 +542,16 @@ long IndexBox_Impl::Notify( NotifyEvent& rNEvt )
 
 void IndexBox_Impl::SelectExecutableEntry()
 {
-    USHORT nPos = GetEntryPos( GetText() );
+    sal_uInt16 nPos = GetEntryPos( GetText() );
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
-        USHORT nOldPos = nPos;
+        sal_uInt16 nOldPos = nPos;
         String aEntryText;
-        IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(ULONG)GetEntryData( nPos );
-        USHORT nCount = GetEntryCount();
+        IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(sal_uIntPtr)GetEntryData( nPos );
+        sal_uInt16 nCount = GetEntryCount();
         while ( nPos < nCount && ( !pEntry || pEntry->m_aURL.Len() == 0 ) )
         {
-            pEntry = (IndexEntry_Impl*)(ULONG)GetEntryData( ++nPos );
+            pEntry = (IndexEntry_Impl*)(sal_uIntPtr)GetEntryData( ++nPos );
             aEntryText = GetEntry( nPos );
         }
 
@@ -645,7 +645,7 @@ void IndexTabPage_Impl::InitializeIndex()
         append[k] = sal_Unicode( ' ' );
 
     sfx2::KeywordInfo aInfo;
-    aIndexCB.SetUpdateMode( FALSE );
+    aIndexCB.SetUpdateMode( sal_False );
 
     try
     {
@@ -679,7 +679,7 @@ void IndexTabPage_Impl::InitializeIndex()
                  ( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) )
             {
                 sal_Bool insert;
-                USHORT nPos;
+                sal_uInt16 nPos;
                 int ndx,tmp;
                 ::rtl::OUString aIndex, aTempString;
                 ::rtl::OUStringBuffer aData( 128 );            // Capacity of up to 128 characters
@@ -745,7 +745,7 @@ void IndexTabPage_Impl::InitializeIndex()
         DBG_ERROR( "IndexTabPage_Impl::InitializeIndex(): unexpected exception" );
     }
 
-    aIndexCB.SetUpdateMode( TRUE );
+    aIndexCB.SetUpdateMode( sal_True );
 
     if ( sKeyword.Len() > 0 )
         aKeywordLink.Call( this );
@@ -758,9 +758,9 @@ void IndexTabPage_Impl::InitializeIndex()
 
 void IndexTabPage_Impl::ClearIndex()
 {
-    USHORT nCount = aIndexCB.GetEntryCount();
-    for ( USHORT i = 0; i < nCount; ++i )
-        delete (IndexEntry_Impl*)(ULONG)aIndexCB.GetEntryData(i);
+    sal_uInt16 nCount = aIndexCB.GetEntryCount();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
+        delete (IndexEntry_Impl*)(sal_uIntPtr)aIndexCB.GetEntryData(i);
     aIndexCB.Clear();
 }
 
@@ -869,7 +869,7 @@ void IndexTabPage_Impl::SetFactory( const String& rFactory )
 String IndexTabPage_Impl::GetSelectEntry() const
 {
     String aRet;
-    IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(ULONG)aIndexCB.GetEntryData( aIndexCB.GetEntryPos( aIndexCB.GetText() ) );
+    IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(sal_uIntPtr)aIndexCB.GetEntryData( aIndexCB.GetEntryPos( aIndexCB.GetText() ) );
     if ( pEntry )
         aRet = pEntry->m_aURL;
     return aRet;
@@ -894,7 +894,7 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const
     sal_Bool bRet = sal_False;
     if ( sKeyword.Len() > 0 )
     {
-        USHORT nPos = aIndexCB.GetEntryPos( sKeyword );
+        sal_uInt16 nPos = aIndexCB.GetEntryPos( sKeyword );
         bRet = ( nPos != LISTBOX_ENTRY_NOTFOUND );
     }
 
@@ -908,10 +908,10 @@ sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
     sal_Bool bRet = sal_False;
     if ( sKeyword.Len() > 0 )
     {
-        USHORT nEntries = aIndexCB.GetEntryCount();
+        sal_uInt16 nEntries = aIndexCB.GetEntryCount();
         String sIndexItem;
         const vcl::I18nHelper& rI18nHelper = GetSettings().GetLocaleI18nHelper();
-        for ( USHORT n = 0; n < nEntries; n++)
+        for ( sal_uInt16 n = 0; n < nEntries; n++)
         {
             sIndexItem = aIndexCB.GetEntry( n );
             if (rI18nHelper.MatchString( sIndexItem, sKeyword ))
@@ -1011,12 +1011,12 @@ SearchTabPage_Impl::SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl
         if ( aUserItem >>= aTemp )
         {
             aUserData = String( aTemp );
-            BOOL bChecked = ( 1 == aUserData.GetToken(0).ToInt32() ) ? TRUE : FALSE;
+            sal_Bool bChecked = ( 1 == aUserData.GetToken(0).ToInt32() ) ? sal_True : sal_False;
             aFullWordsCB.Check( bChecked );
-            bChecked = ( 1 == aUserData.GetToken(1).ToInt32() ) ? TRUE : FALSE;
+            bChecked = ( 1 == aUserData.GetToken(1).ToInt32() ) ? sal_True : sal_False;
             aScopeCB.Check( bChecked );
 
-            for ( USHORT i = 2; i < aUserData.GetTokenCount(); ++i )
+            for ( sal_uInt16 i = 2; i < aUserData.GetTokenCount(); ++i )
             {
                 String aToken = aUserData.GetToken(i);
                 aSearchED.InsertEntry( INetURLObject::decode(
@@ -1039,9 +1039,9 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
     nChecked = aScopeCB.IsChecked() ? 1 : 0;
     aUserData += String::CreateFromInt32( nChecked );
     aUserData += ';';
-    USHORT nCount = Min( aSearchED.GetEntryCount(), (USHORT)10 );  // save only 10 entries
+    sal_uInt16 nCount = Min( aSearchED.GetEntryCount(), (sal_uInt16)10 );  // save only 10 entries
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         rtl::OUString aText = aSearchED.GetEntry(i);
         aUserData += String(INetURLObject::encode(
@@ -1059,9 +1059,9 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
 
 void SearchTabPage_Impl::ClearSearchResults()
 {
-    USHORT nCount = aResultsLB.GetEntryCount();
-    for ( USHORT i = 0; i < nCount; ++i )
-        delete (String*)(ULONG)aResultsLB.GetEntryData(i);
+    sal_uInt16 nCount = aResultsLB.GetEntryCount();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
+        delete (String*)(sal_uIntPtr)aResultsLB.GetEntryData(i);
     aResultsLB.Clear();
     aResultsLB.Update();
 }
@@ -1070,7 +1070,7 @@ void SearchTabPage_Impl::ClearSearchResults()
 
 void SearchTabPage_Impl::RememberSearchText( const String& rSearchText )
 {
-    for ( USHORT i = 0; i < aSearchED.GetEntryCount(); ++i )
+    for ( sal_uInt16 i = 0; i < aSearchED.GetEntryCount(); ++i )
     {
         if ( rSearchText == aSearchED.GetEntry(i) )
         {
@@ -1103,7 +1103,7 @@ IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG )
             aSearchURL += DEFINE_CONST_UNICODE("&Scope=Heading");
         Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aSearchURL );
         const ::rtl::OUString* pFacs  = aFactories.getConstArray();
-        UINT32 i, nCount = aFactories.getLength();
+        sal_uInt32 i, nCount = aFactories.getLength();
         for ( i = 0; i < nCount; ++i )
         {
             String aRow( pFacs[i] );
@@ -1112,8 +1112,8 @@ IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG )
             aTitle = aRow.GetToken( 0, '\t', nIdx );
             aType = aRow.GetToken( 0, '\t', nIdx );
             String* pURL = new String( aRow.GetToken( 0, '\t', nIdx ) );
-            USHORT nPos = aResultsLB.InsertEntry( aTitle );
-            aResultsLB.SetEntryData( nPos, (void*)(ULONG)pURL );
+            sal_uInt16 nPos = aResultsLB.InsertEntry( aTitle );
+            aResultsLB.SetEntryData( nPos, (void*)(sal_uIntPtr)pURL );
         }
         LeaveWait();
 
@@ -1214,7 +1214,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 String SearchTabPage_Impl::GetSelectEntry() const
 {
     String aRet;
-    String* pData = (String*)(ULONG)aResultsLB.GetEntryData( aResultsLB.GetSelectEntryPos() );
+    String* pData = (String*)(sal_uIntPtr)aResultsLB.GetEntryData( aResultsLB.GetSelectEntryPos() );
     if ( pData )
         aRet = String( *pData );
     return aRet;
@@ -1282,11 +1282,11 @@ BookmarksBox_Impl::~BookmarksBox_Impl()
     SvtHistoryOptions aHistOpt;
     aHistOpt.Clear( eHELPBOOKMARKS );
     rtl::OUString sEmpty;
-    USHORT nCount = GetEntryCount();
-    for ( USHORT i = 0; i < nCount; ++i )
+    sal_uInt16 nCount = GetEntryCount();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         String aTitle = GetEntry(i);
-        String* pURL = (String*)(ULONG)GetEntryData(i);
+        String* pURL = (String*)(sal_uIntPtr)GetEntryData(i);
         aHistOpt.AppendItem( eHELPBOOKMARKS, rtl::OUString( *pURL ), sEmpty, rtl::OUString( aTitle ), sEmpty );
         delete pURL;
     }
@@ -1294,7 +1294,7 @@ BookmarksBox_Impl::~BookmarksBox_Impl()
 
 // -----------------------------------------------------------------------
 
-void BookmarksBox_Impl::DoAction( USHORT nAction )
+void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
 {
     switch ( nAction )
     {
@@ -1304,19 +1304,19 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
 
         case MID_RENAME :
            {
-            USHORT nPos = GetSelectEntryPos();
+            sal_uInt16 nPos = GetSelectEntryPos();
             if ( nPos != LISTBOX_ENTRY_NOTFOUND )
             {
                 SfxAddHelpBookmarkDialog_Impl aDlg( this, sal_True );
                 aDlg.SetTitle( GetEntry( nPos ) );
                 if ( aDlg.Execute() == RET_OK )
                 {
-                    String* pURL = (String*)(ULONG)GetEntryData( nPos );
+                    String* pURL = (String*)(sal_uIntPtr)GetEntryData( nPos );
                     RemoveEntry( nPos );
                     rtl::OUString aImageURL = IMAGE_URL;
                     aImageURL += INetURLObject( *pURL ).GetHost();
                     nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL ) );
-                    SetEntryData( nPos, (void*)(ULONG)( new String( *pURL ) ) );
+                    SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( *pURL ) ) );
                     SelectEntryPos( nPos );
                     delete pURL;
                 }
@@ -1326,11 +1326,11 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
 
         case MID_DELETE :
         {
-            USHORT nPos = GetSelectEntryPos();
+            sal_uInt16 nPos = GetSelectEntryPos();
             if ( nPos != LISTBOX_ENTRY_NOTFOUND )
             {
                 RemoveEntry( nPos );
-                USHORT nCount = GetEntryCount();
+                sal_uInt16 nCount = GetEntryCount();
                 if ( nCount )
                 {
                     if ( nPos >= nCount )
@@ -1348,10 +1348,10 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
 long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
 {
     long nRet = 0;
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( EVENT_KEYINPUT == nType )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
         if ( KEY_DELETE == nCode && GetEntryCount() > 0 )
         {
             DoAction( MID_DELETE );
@@ -1403,7 +1403,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindo
     ::rtl::OUString aTitle;
     ::rtl::OUString aURL;
 
-    UINT32 i, nCount = aBookmarkSeq.getLength();
+    sal_uInt32 i, nCount = aBookmarkSeq.getLength();
     for ( i = 0; i < nCount; ++i )
     {
         GetBookmarkEntry_Impl( aBookmarkSeq[i], aTitle, aURL );
@@ -1476,7 +1476,7 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 String BookmarksTabPage_Impl::GetSelectEntry() const
 {
     String aRet;
-    String* pData = (String*)(ULONG)aBookmarksBox.GetEntryData( aBookmarksBox.GetSelectEntryPos() );
+    String* pData = (String*)(sal_uIntPtr)aBookmarksBox.GetEntryData( aBookmarksBox.GetSelectEntryPos() );
     if ( pData )
         aRet = String( *pData );
     return aRet;
@@ -1488,8 +1488,8 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU
 {
     rtl::OUString aImageURL = IMAGE_URL;
     aImageURL += INetURLObject( rURL ).GetHost();
-    USHORT nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL ) );
-    aBookmarksBox.SetEntryData( nPos, (void*)(ULONG)( new String( rURL ) ) );
+    sal_uInt16 nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL ) );
+    aBookmarksBox.SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( rURL ) ) );
 }
 
 // class SfxHelpIndexWindow_Impl -----------------------------------------
@@ -1611,7 +1611,7 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* _pParent )
     SvtViewOptions aViewOpt( E_TABDIALOG, CONFIGNAME_INDEXWIN );
     if ( aViewOpt.Exists() )
         nPageId = aViewOpt.GetPageID();
-    aTabCtrl.SetCurPageId( (USHORT)nPageId );
+    aTabCtrl.SetCurPageId( (sal_uInt16)nPageId );
     ActivatePageHdl( &aTabCtrl );
     aActiveLB.SetSelectHdl( LINK( this, SfxHelpIndexWindow_Impl, SelectHdl ) );
     nMinWidth = ( aActiveLB.GetSizePixel().Width() / 2 );
@@ -1632,8 +1632,8 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
     DELETEZ( pSPage );
     DELETEZ( pBPage );
 
-    for ( USHORT i = 0; i < aActiveLB.GetEntryCount(); ++i )
-        delete (String*)(ULONG)aActiveLB.GetEntryData(i);
+    for ( sal_uInt16 i = 0; i < aActiveLB.GetEntryCount(); ++i )
+        delete (String*)(sal_uIntPtr)aActiveLB.GetEntryData(i);
 
     SvtViewOptions aViewOpt( E_TABDIALOG, CONFIGNAME_INDEXWIN );
     aViewOpt.SetPageID( (sal_Int32)aTabCtrl.GetCurPageId() );
@@ -1647,7 +1647,7 @@ void SfxHelpIndexWindow_Impl::Initialize()
     AppendConfigToken_Impl( aHelpURL, sal_True );
     Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpURL );
     const ::rtl::OUString* pFacs  = aFactories.getConstArray();
-    UINT32 i, nCount = aFactories.getLength();
+    sal_uInt32 i, nCount = aFactories.getLength();
     for ( i = 0; i < nCount; ++i )
     {
         String aRow( pFacs[i] );
@@ -1657,11 +1657,11 @@ void SfxHelpIndexWindow_Impl::Initialize()
         aType = aRow.GetToken( 0, '\t', nIdx );
         aURL = aRow.GetToken( 0, '\t', nIdx );
         String* pFactory = new String( INetURLObject( aURL ).GetHost() );
-        USHORT nPos = aActiveLB.InsertEntry( aTitle );
-        aActiveLB.SetEntryData( nPos, (void*)(ULONG)pFactory );
+        sal_uInt16 nPos = aActiveLB.InsertEntry( aTitle );
+        aActiveLB.SetEntryData( nPos, (void*)(sal_uIntPtr)pFactory );
     }
 
-    aActiveLB.SetDropDownLineCount( (USHORT)nCount );
+    aActiveLB.SetDropDownLineCount( (sal_uInt16)nCount );
     if ( aActiveLB.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
         SetActiveFactory();
 }
@@ -1677,9 +1677,9 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
         InitHdl( NULL );
     }
 
-    for ( USHORT i = 0; i < aActiveLB.GetEntryCount(); ++i )
+    for ( sal_uInt16 i = 0; i < aActiveLB.GetEntryCount(); ++i )
     {
-        String* pFactory = (String*)(ULONG)aActiveLB.GetEntryData(i);
+        String* pFactory = (String*)(sal_uIntPtr)aActiveLB.GetEntryData(i);
         pFactory->ToLowerAscii();
         if ( *pFactory == pIPage->GetFactory() )
         {
@@ -1695,7 +1695,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
 
 // -----------------------------------------------------------------------
 
-HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( USHORT& rCurId )
+HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId )
 {
     rCurId = aTabCtrl.GetCurPageId();
     HelpTabPage_Impl* pPage = NULL;
@@ -1735,7 +1735,7 @@ HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( USHORT& rCurId )
 
 IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl )
 {
-    USHORT nId = 0;
+    sal_uInt16 nId = 0;
     TabPage* pPage = GetCurrentPage( nId );
     pTabCtrl->SetTabPage( nId, pPage );
     return 0;
@@ -1768,7 +1768,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, InitHdl, Timer *, EMPTYARG )
 
 IMPL_LINK( SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, EMPTYARG )
 {
-    String* pFactory = (String*)(ULONG)aActiveLB.GetEntryData( aActiveLB.GetSelectEntryPos() );
+    String* pFactory = (String*)(sal_uIntPtr)aActiveLB.GetEntryData( aActiveLB.GetSelectEntryPos() );
     if ( pFactory )
     {
         String aFactory( *pFactory );
@@ -1790,7 +1790,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl *, EMPTYARG )
     if( !bIndex)
         bIndex = pIPage->HasKeywordIgnoreCase();
     // then set index or search page as current.
-    USHORT nPageId = ( bIndex ) ? HELP_INDEX_PAGE_INDEX :  HELP_INDEX_PAGE_SEARCH;
+    sal_uInt16 nPageId = ( bIndex ) ? HELP_INDEX_PAGE_INDEX :  HELP_INDEX_PAGE_SEARCH;
     if ( nPageId != aTabCtrl.GetCurPageId() )
     {
         aTabCtrl.SetCurPageId( nPageId );
@@ -1834,20 +1834,20 @@ void SfxHelpIndexWindow_Impl::Resize()
 long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
     long nDone = 0;
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() )
     {
          const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nCode = rKeyCode.GetCode();
+        sal_uInt16 nCode = rKeyCode.GetCode();
 
         if (  KEY_TAB == nCode )
         {
             // don't exit index pane with <TAB>
-            USHORT nPageId = 0;
+            sal_uInt16 nPageId = 0;
             HelpTabPage_Impl* pCurPage = GetCurrentPage( nPageId );
             Control* pControl = pCurPage->GetLastFocusControl();
-            BOOL bShift = rKeyCode.IsShift();
-            BOOL bCtrl = rKeyCode.IsMod1();
+            sal_Bool bShift = rKeyCode.IsShift();
+            sal_Bool bCtrl = rKeyCode.IsMod1();
             if ( !bCtrl && bShift && aActiveLB.HasChildPathFocus() )
             {
                 pControl->GrabFocus();
@@ -1865,7 +1865,7 @@ long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                     nPageId++;
                 else
                     nPageId = HELP_INDEX_PAGE_FIRST;
-                aTabCtrl.SetCurPageId( (USHORT)nPageId );
+                aTabCtrl.SetCurPageId( (sal_uInt16)nPageId );
                 ActivatePageHdl( &aTabCtrl );
                 nDone = 1;
             }
@@ -1963,9 +1963,9 @@ void SfxHelpIndexWindow_Impl::AddBookmarks( const String& rTitle, const String&
 bool SfxHelpIndexWindow_Impl::IsValidFactory( const String& _rFactory )
 {
     bool bValid = false;
-    for ( USHORT i = 0; i < aActiveLB.GetEntryCount(); ++i )
+    for ( sal_uInt16 i = 0; i < aActiveLB.GetEntryCount(); ++i )
     {
-        String* pFactory = (String*)(ULONG)aActiveLB.GetEntryData(i);
+        String* pFactory = (String*)(sal_uIntPtr)aActiveLB.GetEntryData(i);
         if ( *pFactory == _rFactory )
         {
             bValid = true;
@@ -2227,7 +2227,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
 
     // Attention: This check boy knows two states:
     // 1) Reading of the config key fails with an exception or by getting an empty Any (!) => check box must be hidden
-    // 2) We read TRUE/FALSE => check box must be shown and enabled/disabled
+    // 2) We read sal_True/sal_False => check box must be shown and enabled/disabled
 
     bool bHideBox = true;
     sal_Bool bHelpAtStartup = sal_False;
@@ -2364,7 +2364,7 @@ Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const
 bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode )
 {
     bool bRet = false;
-    USHORT nCode = _rKeyCode.GetCode();
+    sal_uInt16 nCode = _rKeyCode.GetCode();
 
     // the keys <STRG><A> (select all), <STRG><C> (copy),
     //          <STRG><F> (find), <STRG><P> (print) and <STRG><W> (close window)
@@ -2573,7 +2573,7 @@ void SfxHelpTextWindow_Impl::Resize()
 long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
     long nDone = 0;
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( EVENT_COMMAND == nType && rNEvt.GetCommandEvent() )
     {
         const CommandEvent* pCmdEvt = rNEvt.GetCommandEvent();
@@ -2652,7 +2652,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             if( SvtMenuOptions().IsEntryHidingEnabled() == sal_False )
                 aMenu.SetMenuFlags( aMenu.GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
 
-            USHORT nId = aMenu.Execute( this, aPos );
+            sal_uInt16 nId = aMenu.Execute( this, aPos );
             pHelpWin->DoAction( nId );
             nDone = 1;
         }
@@ -2661,8 +2661,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     {
          const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
          const KeyCode& rKeyCode = pKEvt->GetKeyCode();
-        USHORT nKeyGroup = rKeyCode.GetGroup();
-        USHORT nKey = rKeyCode.GetCode();
+        sal_uInt16 nKeyGroup = rKeyCode.GetGroup();
+        sal_uInt16 nKey = rKeyCode.GetCode();
         if ( KEYGROUP_ALPHA == nKeyGroup &&  !isHandledKey( rKeyCode ) )
         {
             // do nothing disables the writer accelerators
@@ -2868,23 +2868,23 @@ void SfxHelpWindow_Impl::Split()
     nIndexSize = GetItemSize( INDEXWIN_ID );
     nTextSize = GetItemSize( TEXTWIN_ID );
 
-    BOOL        bMod = FALSE;
+    sal_Bool        bMod = sal_False;
     if( nIndexSize < nMinSplitSize )
     {
         nIndexSize = nMinSplitSize;
         nTextSize = nMaxSplitSize;
 
-        bMod = TRUE;
+        bMod = sal_True;
     }
     else if( nTextSize < nMinSplitSize )
     {
         nTextSize = nMinSplitSize;
         nIndexSize = nMaxSplitSize;
 
-        bMod = TRUE;
+        bMod = sal_True;
     }
     else
-        bMod = FALSE;
+        bMod = sal_False;
 
     if( bMod )
     {
@@ -2993,7 +2993,7 @@ void SfxHelpWindow_Impl::LoadConfig()
         {
             aUserData = String( aTemp );
             DBG_ASSERT( aUserData.GetTokenCount() == 6, "invalid user data" );
-            USHORT nIdx = 0;
+            sal_uInt16 nIdx = 0;
             nIndexSize = aUserData.GetToken( 0, ';', nIdx ).ToInt32();
             nTextSize = aUserData.GetToken( 0, ';', nIdx ).ToInt32();
             sal_Int32 nWidth = aUserData.GetToken( 0, ';', nIdx ).ToInt32();
@@ -3086,9 +3086,9 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG )
     ::rtl::OUString sHelpURL;
 
 //  INetURLObject aObj(aEntry);
-//  BOOL bComplete = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
+//  sal_Bool bComplete = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
 
-    BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
+    sal_Bool bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
 
     if (bComplete)
         sHelpURL = ::rtl::OUString(aEntry);
@@ -3266,7 +3266,7 @@ long SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     {
         // Backward == <ALT><LEFT> or <BACKSPACE> Forward == <ALT><RIGHT>
          const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nKey = rKeyCode.GetCode();
+        sal_uInt16 nKey = rKeyCode.GetCode();
         if ( ( rKeyCode.IsMod2() && ( KEY_LEFT == nKey || KEY_RIGHT == nKey ) ) ||
              ( !rKeyCode.GetModifier() && KEY_BACKSPACE == nKey && !pIndexWin->HasFocusOnEdit() ) )
         {
@@ -3309,7 +3309,7 @@ void SfxHelpWindow_Impl::SetHelpURL( const String& rURL )
 
 // -----------------------------------------------------------------------
 
-void SfxHelpWindow_Impl::DoAction( USHORT nActionId )
+void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId )
 {
     switch ( nActionId )
     {
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 95a5bfe52230..fb34640f93ef 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -64,7 +64,7 @@ private:
     String      m_sURL;
 
 public:
-    OpenStatusListener_Impl() : m_bFinished( FALSE ), m_bSuccess( FALSE ) {}
+    OpenStatusListener_Impl() : m_bFinished( sal_False ), m_bSuccess( sal_False ) {}
 
     virtual void SAL_CALL   dispatchFinished( const ::com::sun::star::frame::DispatchResultEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL   disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
@@ -267,7 +267,7 @@ public:
 class BookmarksBox_Impl : public ListBox
 {
 private:
-    void                DoAction( USHORT nAction );
+    void                DoAction( sal_uInt16 nAction );
 
 public:
     BookmarksBox_Impl( Window* pParent, const ResId& rResId );
@@ -331,7 +331,7 @@ private:
 
     void                Initialize();
     void                SetActiveFactory();
-    HelpTabPage_Impl*   GetCurrentPage( USHORT& rCurId );
+    HelpTabPage_Impl*   GetCurrentPage( sal_uInt16& rCurId );
 
     inline ContentTabPage_Impl*     GetContentPage();
     inline IndexTabPage_Impl*       GetIndexPage();
@@ -566,7 +566,7 @@ public:
 
     void                SetFactory( const String& rFactory );
     void                SetHelpURL( const String& rURL );
-    void                DoAction( USHORT nActionId );
+    void                DoAction( sal_uInt16 nActionId );
     void                CloseWindow();
 
     void                UpdateToolbox();
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 328bca2522b5..6bd233949ddf 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -68,7 +68,7 @@ using namespace ::cppu;
 
 //-----------------------------------------------------------------------------
 
-USHORT  SvxOpenGrfErr2ResId(    short   err     )
+sal_uInt16  SvxOpenGrfErr2ResId(    short   err     )
 {
     switch( err )
     {
@@ -118,10 +118,10 @@ SvxOpenGraphicDialog::~SvxOpenGraphicDialog()
 
 short SvxOpenGraphicDialog::Execute()
 {
-    USHORT  nImpRet;
-    BOOL    bQuitLoop(FALSE);
+    sal_uInt16  nImpRet;
+    sal_Bool    bQuitLoop(sal_False);
 
-    while( bQuitLoop == FALSE &&
+    while( bQuitLoop == sal_False &&
            mpImpl->aFileDlg.Execute() == ERRCODE_NONE )
     {
         if( GetPath().Len() )
@@ -131,14 +131,14 @@ short SvxOpenGraphicDialog::Execute()
 
             // check whether we can load the graphic
             String  aCurFilter( GetCurrentFilter() );
-            USHORT  nFormatNum = pFilter->GetImportFormatNumber( aCurFilter );
-            USHORT  nRetFormat = 0;
-            USHORT  nFound = USHRT_MAX;
+            sal_uInt16  nFormatNum = pFilter->GetImportFormatNumber( aCurFilter );
+            sal_uInt16  nRetFormat = 0;
+            sal_uInt16  nFound = USHRT_MAX;
 
             // non-local?
             if ( INET_PROT_FILE != aObj.GetProtocol() )
             {
-                SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, TRUE );
+                SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, sal_True );
                 aMed.DownLoad();
                 SvStream* pStream = aMed.GetInStream();
 
@@ -169,7 +169,7 @@ short SvxOpenGraphicDialog::Execute()
             if ( nFound == USHRT_MAX )
             {
                 WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, String( SfxResId( SvxOpenGrfErr2ResId(nImpRet) ) ) );
-                bQuitLoop = aWarningBox.Execute()==RET_RETRY ? FALSE : TRUE;
+                bQuitLoop = aWarningBox.Execute()==RET_RETRY ? sal_False : sal_True;
             }
             else
             {
@@ -284,7 +284,7 @@ void SvxOpenGraphicDialog::SetCurrentFilter(const String&   rStr)
     mpImpl->aFileDlg.SetCurrentFilter(rStr);
 }
 
-void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId )
+void SvxOpenGraphicDialog::SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId )
 {
     mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId );
 }
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index 2406709aede9..7cbf2a19e628 100644
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.hxx
@@ -33,17 +33,17 @@ namespace sfx2
 {
     // source in newhelp.cxx
 
-    void HandleTaskPaneList( Window* pWindow, BOOL bAddToList );
+    void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList );
         // pWindow: just a system window or something which is child of a system window
 
     inline void AddToTaskPaneList( Window* pWindowToBeHandled )
     {
-        HandleTaskPaneList( pWindowToBeHandled, TRUE );
+        HandleTaskPaneList( pWindowToBeHandled, sal_True );
     }
 
     inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled )
     {
-        HandleTaskPaneList( pWindowToBeHandled, FALSE );
+        HandleTaskPaneList( pWindowToBeHandled, sal_False );
     }
 }
 
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index bab37281cb05..855369c11bc9 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -190,7 +190,7 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
 
     // --> OD 2009-07-01 #159496#
     // do not release solar mutex due to crash regarding accessibility
-//    ULONG nSolarCount = Application::ReleaseSolarMutex();
+//    sal_uIntPtr nSolarCount = Application::ReleaseSolarMutex();
     // <--
     try
     {
@@ -901,17 +901,17 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow
     return sHelpText;
 }
 
-BOOL SfxHelp::SearchKeyword( const XubString& rKeyword )
+sal_Bool SfxHelp::SearchKeyword( const XubString& rKeyword )
 {
     return Start_Impl( String(), NULL, rKeyword );
 }
 
-BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
+sal_Bool SfxHelp::Start( const String& rURL, const Window* pWindow )
 {
     return Start_Impl( rURL, pWindow, String() );
 }
 
-BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword )
+sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword )
 {
     // check if help is available
     String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
@@ -922,7 +922,7 @@ BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const Strin
         // no factories -> no help -> error message and return
         NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
         aErrBox.Execute();
-        return FALSE;
+        return sal_False;
     }
 
     /* rURL may be
@@ -992,7 +992,7 @@ BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const Strin
     else
         pHelpWindow = (SfxHelpWindow_Impl*)VCLUnoHelper::GetWindow(xHelp->getComponentWindow());
     if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
-        return FALSE;
+        return sal_False;
 
 #ifdef DBG_UTIL
     ByteString aTmp("SfxHelp: HelpId = ");
@@ -1009,7 +1009,7 @@ BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const Strin
     if ( xTopWindow.is() )
         xTopWindow->toFront();
 
-    return TRUE;
+    return sal_True;
 }
 
 String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName )
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 0074faac192f..59a753fdb2c4 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -100,7 +100,7 @@ osl::Mutex* SfxPickList::GetOrCreateMutex()
     return pMutex;
 }
 
-void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const String& aURLString, sal_uInt32 nNo )
+void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const String& aURLString, sal_uInt32 nNo )
 {
     String aPickEntry;
 
@@ -292,8 +292,8 @@ void SfxPickList::CreateMenuEntries( Menu* pMenu )
     {
         PickListEntry* pEntry = GetPickListEntry( i );
 
-        pMenu->InsertItem( (USHORT)(START_ITEMID_PICKLIST + i), aEmptyString );
-        CreatePicklistMenuTitle( pMenu, (USHORT)(START_ITEMID_PICKLIST + i), pEntry->aName, i );
+        pMenu->InsertItem( (sal_uInt16)(START_ITEMID_PICKLIST + i), aEmptyString );
+        CreatePicklistMenuTitle( pMenu, (sal_uInt16)(START_ITEMID_PICKLIST + i), pEntry->aName, i );
     }
 
     bPickListMenuInitializing = sal_False;
@@ -314,7 +314,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex )
         String aFilter( pPick->aFilter );
         aGuard.clear();
 
-        USHORT nPos=aFilter.Search('|');
+        sal_uInt16 nPos=aFilter.Search('|');
         if( nPos != STRING_NOTFOUND )
         {
             String aOptions(aFilter.Copy( nPos ).GetBuffer()+1);
@@ -328,7 +328,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex )
     }
 }
 
-void SfxPickList::ExecuteMenuEntry( USHORT nId )
+void SfxPickList::ExecuteMenuEntry( sal_uInt16 nId )
 {
     ExecuteEntry( (sal_uInt32)( nId - START_ITEMID_PICKLIST ) );
 }
@@ -446,7 +446,7 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     return;
 
                 // ignore hidden documents
-                if ( !SfxViewFrame::GetFirst( pDocSh, TRUE ) )
+                if ( !SfxViewFrame::GetFirst( pDocSh, sal_True ) )
                     return;
 
                 ::rtl::OUString  aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST);
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/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index b9799f5818b7..c9c9e06ae248 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -76,7 +76,7 @@ static void menu_deactivate_cb( GtkWidget *pMenu )
     gtk_menu_popdown( GTK_MENU( pMenu ) );
 }
 
-static GdkPixbuf * ResIdToPixbuf( USHORT nResId )
+static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId )
 {
     ResId aResId( SV_ICON_SMALL_START + nResId, *pVCLResMgr );
     BitmapEx aIcon( aResId );
@@ -120,7 +120,7 @@ static GdkPixbuf * ResIdToPixbuf( USHORT nResId )
         pInSalAlpha.ReleaseAccess( pSalAlpha );
 
     return gdk_pixbuf_new_from_data( pPixbufData,
-        GDK_COLORSPACE_RGB, TRUE, 8,
+        GDK_COLORSPACE_RGB, sal_True, 8,
         aSize.Width(), aSize.Height(),
         aSize.Width() * 4,
         (GdkPixbufDestroyNotify) g_free,
@@ -138,7 +138,7 @@ static void oustring_delete (gpointer  data,
 
 static void add_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
                       OUString *pOverrideLabel,
-                      USHORT nResId, GCallback pFnCallback )
+                      sal_uInt16 nResId, GCallback pFnCallback )
 {
     OUString *pURL = new OUString (OStringToOUString( pAsciiURL,
                                                       RTL_TEXTENCODING_UTF8 ));
@@ -171,7 +171,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
 static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
-                              USHORT nResId, GCallback pFnCallback )
+                              sal_uInt16 nResId, GCallback pFnCallback )
 {
     SvtDynamicMenuOptions aOpt;
     Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( E_NEWMENU );
@@ -311,7 +311,7 @@ layout_menu( GtkMenu *menu,
     else
         (*y) += ebox->allocation.height;
 
-    *push_in = TRUE;
+    *push_in = sal_True;
 }
 }
 
@@ -319,14 +319,14 @@ static gboolean display_menu_cb( GtkWidget *,
                                  GdkEventButton *event, GtkWidget *pMenu )
 {
     if (event->button == 2)
-        return FALSE;
+        return sal_False;
 
 #ifdef TEMPLATE_DIALOG_MORE_POLISHED
     if (event->button == 1 &&
         event->type == GDK_2BUTTON_PRESS)
     {
         open_template_cb( NULL );
-        return TRUE;
+        return sal_True;
     }
     if (event->button == 3)
     {
@@ -338,7 +338,7 @@ static gboolean display_menu_cb( GtkWidget *,
     gtk_menu_popup( GTK_MENU( pMenu ), NULL, NULL,
                     layout_menu, NULL, 0, event->time );
 
-    return TRUE;
+    return sal_True;
 }
 
 extern "C" {
@@ -347,7 +347,7 @@ extern "C" {
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
         gtk_widget_show_all( GTK_WIDGET( pTrayIcon ) );
-        return FALSE;
+        return sal_False;
     }
 }
 
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 2224643bc88f..0692b85afcda 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -76,7 +76,7 @@ namespace css = ::com::sun::star;
 
 struct ResIdToResName
 {
-    USHORT      nId;
+    sal_uInt16      nId;
     const char* pName;
 };
 
@@ -305,23 +305,23 @@ throw (css::uno::RuntimeException)
     {
         if ( eLayoutEvent == css::frame::LayoutManagerEvents::VISIBLE )
         {
-            m_pWrkWin->MakeVisible_Impl( TRUE );
+            m_pWrkWin->MakeVisible_Impl( sal_True );
             m_pWrkWin->ShowChilds_Impl();
-            m_pWrkWin->ArrangeChilds_Impl( TRUE );
+            m_pWrkWin->ArrangeChilds_Impl( sal_True );
         }
         else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE )
         {
-            m_pWrkWin->MakeVisible_Impl( FALSE );
+            m_pWrkWin->MakeVisible_Impl( sal_False );
             m_pWrkWin->HideChilds_Impl();
-            m_pWrkWin->ArrangeChilds_Impl( TRUE );
+            m_pWrkWin->ArrangeChilds_Impl( sal_True );
         }
         else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK )
         {
-            m_pWrkWin->Lock_Impl( TRUE );
+            m_pWrkWin->Lock_Impl( sal_True );
         }
         else if ( eLayoutEvent == css::frame::LayoutManagerEvents::UNLOCK )
         {
-            m_pWrkWin->Lock_Impl( FALSE );
+            m_pWrkWin->Lock_Impl( sal_False );
         }
     }
 }
@@ -333,7 +333,7 @@ typedef std::hash_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap;
 static sal_Bool bMapInitialized = sal_False;
 static ToolBarResIdToResourceURLMap aResIdToResourceURLMap;
 
-static rtl::OUString GetResourceURLFromResId( USHORT nResId )
+static rtl::OUString GetResourceURLFromResId( sal_uInt16 nResId )
 {
     if ( !bMapInitialized )
     {
@@ -359,20 +359,20 @@ static rtl::OUString GetResourceURLFromResId( USHORT nResId )
         return rtl::OUString();
 }
 
-BOOL IsAppWorkWinToolbox_Impl( USHORT nPos )
+sal_Bool IsAppWorkWinToolbox_Impl( sal_uInt16 nPos )
 {
     switch ( nPos )
     {
         case SFX_OBJECTBAR_APPLICATION :
         case SFX_OBJECTBAR_MACRO:
         case SFX_OBJECTBAR_FULLSCREEN:
-            return TRUE;
+            return sal_True;
         default:
-            return FALSE;
+            return sal_False;
     }
 }
 
-USHORT TbxMatch( USHORT nPos )
+sal_uInt16 TbxMatch( sal_uInt16 nPos )
 {
     switch ( nPos )
     {
@@ -395,9 +395,9 @@ USHORT TbxMatch( USHORT nPos )
     }
 }
 
-USHORT ChildAlignValue(SfxChildAlignment eAlign)
+sal_uInt16 ChildAlignValue(SfxChildAlignment eAlign)
 {
-    USHORT ret = 17;
+    sal_uInt16 ret = 17;
 
     switch (eAlign)
     {
@@ -456,9 +456,9 @@ USHORT ChildAlignValue(SfxChildAlignment eAlign)
     return ret;
 }
 
-USHORT ChildTravelValue( SfxChildAlignment eAlign )
+sal_uInt16 ChildTravelValue( SfxChildAlignment eAlign )
 {
-    USHORT ret = 17;
+    sal_uInt16 ret = 17;
 
     switch (eAlign)
     {
@@ -520,12 +520,12 @@ USHORT ChildTravelValue( SfxChildAlignment eAlign )
 void SfxWorkWindow::Sort_Impl()
 {
     aSortedList.Remove(0, aSortedList.Count());
-    for (USHORT i=0; i<pChilds->Count(); i++)
+    for (sal_uInt16 i=0; i<pChilds->Count(); i++)
     {
         SfxChild_Impl *pCli = (*pChilds)[i];
         if (pCli)
         {
-            USHORT k;
+            sal_uInt16 k;
             for (k=0; k<aSortedList.Count(); k++)
 //              if ( (*pChilds)[aSortedList[k]]->eAlign > pCli->eAlign )
                 if (ChildAlignValue((*pChilds)[aSortedList[k]]->eAlign) >
@@ -535,7 +535,7 @@ void SfxWorkWindow::Sort_Impl()
         }
     }
 
-    bSorted = TRUE;
+    bSorted = sal_True;
 }
 
 
@@ -559,7 +559,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra
     }
 
     // Die ben"otigten SplitWindows (je eins f"ur jede Seite) werden erzeugt
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         // Die SplitWindows sind direkte ChildWindows des WorkWindows und enthalten
         // die angedockten Fenster.
@@ -589,12 +589,12 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
     pActiveChild( 0 ),
     nChilds( 0 ),
     nOrigMode( 0 ),
-    bSorted( TRUE ),
-    bDockingAllowed(TRUE),
-    bInternalDockingAllowed(TRUE),
-    bAllChildsVisible(TRUE),
-    bIsFullScreen( FALSE ),
-    bShowStatusBar( TRUE ),
+    bSorted( sal_True ),
+    bDockingAllowed(sal_True),
+    bInternalDockingAllowed(sal_True),
+    bAllChildsVisible(sal_True),
+    bIsFullScreen( sal_False ),
+    bShowStatusBar( sal_True ),
     m_nLock( 0 ),
     m_aStatusBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" )),
     m_aLayoutManagerPropName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )),
@@ -612,7 +612,7 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
     // F"ur die ObjectBars wird ein fester Platz in der ChildList reserviert,
     // damit sie immer in einer definierten Reihenfolge kommen.
     SfxChild_Impl* pChild=0;
-    for (USHORT n=0; n < SFX_OBJECTBAR_MAX; ++n)
+    for (sal_uInt16 n=0; n < SFX_OBJECTBAR_MAX; ++n)
         pChilds->Insert(0,pChild);
 
     // create and initialize layout manager listener
@@ -632,7 +632,7 @@ SfxWorkWindow::~SfxWorkWindow()
     DBG_DTOR(SfxWorkWindow, 0);
 
     // SplitWindows l"oschen
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         SfxSplitWindow *p = pSplit[n];
         if (p->GetWindowCount())
@@ -657,7 +657,7 @@ SystemWindow* SfxWorkWindow::GetTopWindow() const
     return (SystemWindow*) pRet;
 }
 
-void SfxWorkWindow::Lock_Impl( BOOL bLock )
+void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
 {
     if ( bLock )
         m_nLock++;
@@ -677,7 +677,7 @@ void SfxWorkWindow::ChangeWindow_Impl( Window *pNew )
 {
     Window *pOld = pWorkWin;
     pWorkWin = pNew;
-    for ( USHORT nPos = 0; nPos < pChilds->Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos )
     {
         SfxChild_Impl *pCli = (*pChilds)[nPos];
         if ( pCli && pCli->pWin && pCli->pWin->GetParent() == pOld )
@@ -689,14 +689,14 @@ void SfxWorkWindow::ChangeWindow_Impl( Window *pNew )
 
 void SfxWorkWindow::SaveStatus_Impl()
 {
-    USHORT nCount = pChildWins->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pChildWins->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxChildWin_Impl* pCW = (*pChildWins)[n];
         SfxChildWindow *pChild = pCW->pWin;
         if (pChild)
         {
-            USHORT nFlags = pCW->aInfo.nFlags;
+            sal_uInt16 nFlags = pCW->aInfo.nFlags;
             pCW->aInfo = pChild->GetInfo();
             pCW->aInfo.nFlags |= nFlags;
             SaveStatus_Impl(pChild, pCW->aInfo);
@@ -716,7 +716,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
 
     // SplitWindows locken (d.h. Resize-Reaktion an den
     // DockingWindows unterdr"ucken)
-    USHORT n;
+    sal_uInt16 n;
     for ( n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         SfxSplitWindow *p = pSplit[n];
@@ -733,7 +733,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
         if (pChild)
         {
 /*
-            USHORT nFlags = pCW->aInfo.nFlags;
+            sal_uInt16 nFlags = pCW->aInfo.nFlags;
             pCW->aInfo = pChild->GetInfo();
             pCW->aInfo.nFlags |= nFlags;
             SaveStatus_Impl(pChild, pCW->aInfo);
@@ -762,7 +762,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
         //(*pChildWins)[n] = 0;
     }
 
-    //pChildWins->Remove((USHORT)0, nCount);
+    //pChildWins->Remove((sal_uInt16)0, nCount);
 
     Reference< com::sun::star::frame::XFrame > xFrame = GetFrameInterface();
     Reference< com::sun::star::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY );
@@ -787,10 +787,10 @@ void SfxWorkWindow::DeleteControllers_Impl()
         ResetStatusBar_Impl();
 
         // ObjectBars l"oschen( zuletzt, damit pChilds nicht tote Pointer enh"alt )
-        for ( USHORT i = 0; i < aObjBarList.size(); i++ )
+        for ( sal_uInt16 i = 0; i < aObjBarList.size(); i++ )
         {
             // Nicht jede Position mu\s belegt sein
-            USHORT nId = aObjBarList[i].nId;
+            sal_uInt16 nId = aObjBarList[i].nId;
             if ( nId )
                 aObjBarList[i].nId = 0;
         }
@@ -799,7 +799,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
     // ObjectBars werden alle auf einmal released, da sie einen
     // festen zusammenh"angenden  Bereich im Array pChilds belegen
     pChilds->Remove(0, SFX_OBJECTBAR_MAX);
-    bSorted = FALSE;
+    bSorted = sal_False;
 
     nChilds = 0;
 }
@@ -807,12 +807,12 @@ void SfxWorkWindow::DeleteControllers_Impl()
 //====================================================================
 // Virtuelle Methode zum Anordnen der Childfenster.
 
-void SfxWorkWindow::ArrangeChilds_Impl( BOOL /*bForce*/)
+void SfxWorkWindow::ArrangeChilds_Impl( sal_Bool /*bForce*/)
 {
     Arrange_Impl();
 }
 
-void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( BOOL bForce )
+void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
 {
     if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce ))
         return;
@@ -881,7 +881,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
     Size aSize;
     Rectangle aTmp( aClientArea );
 
-    for ( USHORT n=0; n<aSortedList.Count(); ++n )
+    for ( sal_uInt16 n=0; n<aSortedList.Count(); ++n )
     {
         SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
         if ( !pCli->pWin )
@@ -900,7 +900,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
             aSize = pCli->pWin->GetSizePixel();
 
         SvBorder aTemp = aBorder;
-        BOOL bAllowHiding = TRUE;
+        sal_Bool bAllowHiding = sal_True;
         switch ( pCli->eAlign )
         {
             case SFX_ALIGN_HIGHESTTOP:
@@ -910,7 +910,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
                 aSize.Width() = aTmp.GetWidth();
                 if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW )
                     aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize );
-                bAllowHiding = FALSE;
+                bAllowHiding = sal_False;
                 aBorder.Top() += aSize.Height();
                 aPos = aTmp.TopLeft();
                 aTmp.Top() += aSize.Height();
@@ -940,7 +940,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
                 aSize.Height() = aTmp.GetHeight();
                 if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW )
                     aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize );
-                bAllowHiding = FALSE;
+                bAllowHiding = sal_False;
                 aBorder.Left() += aSize.Width();
                 aPos = aTmp.TopLeft();
                 aTmp.Left() += aSize.Width();
@@ -965,12 +965,12 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
             default:
                 pCli->aSize = pCli->pWin->GetSizePixel();
-                pCli->bResize = FALSE;
+                pCli->bResize = sal_False;
                 continue;
         }
 
         pCli->pWin->SetPosSizePixel( aPos, aSize );
-        pCli->bResize = FALSE;
+        pCli->bResize = sal_False;
         pCli->aSize = aSize;
         if( bAllowHiding && !RequestTopToolSpacePixel_Impl( aBorder ) )
         {
@@ -1012,13 +1012,13 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
 void SfxWorkWindow::Close_Impl()
 {
-    for (USHORT n=0; n<pChildWins->Count(); n++)
+    for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
     {
         SfxChildWin_Impl *pCW  = (*pChildWins)[n];
         SfxChildWindow *pChild = pCW->pWin;
         if (pChild)
         {
-            USHORT nFlags = pCW->aInfo.nFlags;
+            sal_uInt16 nFlags = pCW->aInfo.nFlags;
             pCW->aInfo = pChild->GetInfo();
             pCW->aInfo.nFlags |= nFlags;
             SaveStatus_Impl(pChild, pCW->aInfo);
@@ -1026,23 +1026,23 @@ void SfxWorkWindow::Close_Impl()
     }
 }
 
-BOOL SfxWorkWindow::PrepareClose_Impl()
+sal_Bool SfxWorkWindow::PrepareClose_Impl()
 {
-    for (USHORT n=0; n<pChildWins->Count(); n++)
+    for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
     {
         SfxChildWin_Impl *pCW  = (*pChildWins)[n];
         SfxChildWindow *pChild = pCW->pWin;
         if ( pChild && !pChild->QueryClose() )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
 SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
-                    SfxChildAlignment eAlign, BOOL bCanGetFocus )
+                    SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
 {
     DBG_CHKTHIS(SfxWorkWindow, 0);
     DBG_ASSERT( pChilds->Count() < 255, "too many childs" );
@@ -1058,7 +1058,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
     pChild->bCanGetFocus = bCanGetFocus;
 
     pChilds->Insert(pChilds->Count(), pChild);
-    bSorted = FALSE;
+    bSorted = sal_False;
     nChilds++;
     return (*pChilds)[pChilds->Count()-1];
 }
@@ -1077,11 +1077,11 @@ void SfxWorkWindow::AlignChild_Impl( Window& rWindow,
     if ( pChild )
     {
         if (pChild->eAlign != eAlign)
-            bSorted = FALSE;
+            bSorted = sal_False;
 
         pChild->eAlign = eAlign;
         pChild->aSize = rNewSize;
-        pChild->bResize = TRUE;
+        pChild->bResize = sal_True;
     }
     else {
         DBG_ERROR( "aligning unregistered child" );
@@ -1096,7 +1096,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
 //  DBG_ASSERT( pChilds, "releasing unregistered child" );
 
     SfxChild_Impl *pChild = 0;
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < pChilds->Count(); ++nPos )
     {
         pChild = (*pChilds)[nPos];
@@ -1107,7 +1107,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
 
     if ( nPos < pChilds->Count() )
     {
-        bSorted = FALSE;
+        bSorted = sal_False;
         nChilds--;
         pChilds->Remove(nPos);
         delete pChild;
@@ -1124,8 +1124,8 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
     DBG_CHKTHIS(SfxWorkWindow, 0);
 
     SfxChild_Impl *pChild = 0;
-    USHORT nCount = pChilds->Count();
-    for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+    sal_uInt16 nCount = pChilds->Count();
+    for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
     {
         pChild = (*pChilds)[nPos];
         if ( pChild )
@@ -1145,7 +1145,7 @@ void SfxWorkWindow::ShowChilds_Impl()
     bool bInvisible = ( !IsVisible_Impl() || ( !pWorkWin->IsReallyVisible() && !pWorkWin->IsReallyShown() ));
 
     SfxChild_Impl *pCli = 0;
-    for ( USHORT nPos = 0; nPos < pChilds->Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos )
     {
         SfxChildWin_Impl* pCW = 0;
         pCli = (*pChilds)[nPos];
@@ -1154,7 +1154,7 @@ void SfxWorkWindow::ShowChilds_Impl()
         {
             // We have to find the SfxChildWin_Impl to retrieve the
             // SFX_CHILDWIN flags that can influence visibility.
-            for (USHORT n=0; n<pChildWins->Count(); n++)
+            for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
             {
                 SfxChildWin_Impl* pCWin = (*pChildWins)[n];
                 SfxChild_Impl*    pChild  = pCWin->pCli;
@@ -1177,21 +1177,21 @@ void SfxWorkWindow::ShowChilds_Impl()
 
             if ( CHILD_VISIBLE == (pCli->nVisible & CHILD_VISIBLE) && bVisible )
             {
-                USHORT nFlags = pCli->bSetFocus ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE;
+                sal_uInt16 nFlags = pCli->bSetFocus ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE;
                 switch ( pCli->pWin->GetType() )
                 {
                     case RSC_DOCKINGWINDOW :
-                        ((DockingWindow*)pCli->pWin)->Show( TRUE, nFlags );
+                        ((DockingWindow*)pCli->pWin)->Show( sal_True, nFlags );
                         break;
                     case RSC_SPLITWINDOW :
-                        ((SplitWindow*)pCli->pWin)->Show( TRUE, nFlags );
+                        ((SplitWindow*)pCli->pWin)->Show( sal_True, nFlags );
                         break;
                     default:
-                        pCli->pWin->Show( TRUE, nFlags );
+                        pCli->pWin->Show( sal_True, nFlags );
                         break;
                 }
 
-                pCli->bSetFocus = FALSE;
+                pCli->bSetFocus = sal_False;
             }
             else
             {
@@ -1214,7 +1214,7 @@ void SfxWorkWindow::ShowChilds_Impl()
 void SfxWorkWindow::HideChilds_Impl()
 {
     SfxChild_Impl *pChild = 0;
-    for ( USHORT nPos = pChilds->Count(); nPos > 0; --nPos )
+    for ( sal_uInt16 nPos = pChilds->Count(); nPos > 0; --nPos )
     {
         pChild = (*pChilds)[nPos-1];
         if (pChild && pChild->pWin)
@@ -1236,7 +1236,7 @@ void SfxWorkWindow::HideChilds_Impl()
 
 void SfxWorkWindow::ResetObjectBars_Impl()
 {
-    USHORT n;
+    sal_uInt16 n;
     for ( n = 0; n < aObjBarList.size(); n++ )
         aObjBarList[n].bDestroy = sal_True;
 
@@ -1244,24 +1244,24 @@ void SfxWorkWindow::ResetObjectBars_Impl()
         (*pChildWins)[n]->nId = 0;
 }
 
-void SfxWorkWindow::NextObjectBar_Impl( USHORT )
+void SfxWorkWindow::NextObjectBar_Impl( sal_uInt16 )
 {
 }
 
-USHORT SfxWorkWindow::HasNextObjectBar_Impl( USHORT, String* )
+sal_uInt16 SfxWorkWindow::HasNextObjectBar_Impl( sal_uInt16, String* )
 {
     return 0;
 }
 
 //------------------------------------------------------------------------
 
-void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
+void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
             SfxInterface* pIFace, const String *pName)
 {
     DBG_ASSERT( (nPos & SFX_POSITION_MASK) < SFX_OBJECTBAR_MAX,
                 "object bar position overflow" );
 
-    USHORT nRealPos = nPos & SFX_POSITION_MASK;
+    sal_uInt16 nRealPos = nPos & SFX_POSITION_MASK;
     if ( pParent && IsAppWorkWinToolbox_Impl( nRealPos ) )
     {
         pParent->SetObjectBar_Impl( nPos, nResId, pIFace, pName );
@@ -1270,7 +1270,7 @@ void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
 
     SfxObjectBar_Impl aObjBar;
     aObjBar.pIFace = pIFace;
-    aObjBar.nId = sal::static_int_cast<USHORT>(nResId);
+    aObjBar.nId = sal::static_int_cast<sal_uInt16>(nResId);
     aObjBar.nPos = nRealPos;
     aObjBar.nMode = (nPos & SFX_VISIBILITY_MASK);
     if (pName)
@@ -1278,7 +1278,7 @@ void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
     else
         aObjBar.aName.Erase();
 
-    for ( USHORT n=0; n<aObjBarList.size(); n++ )
+    for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ )
     {
         if ( aObjBarList[n].nId == aObjBar.nId )
         {
@@ -1292,7 +1292,7 @@ void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
 
 //------------------------------------------------------------------------
 
-FASTBOOL SfxWorkWindow::KnowsObjectBar_Impl( USHORT nPos ) const
+bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
 
 /*  [Beschreibung]
 
@@ -1302,29 +1302,29 @@ FASTBOOL SfxWorkWindow::KnowsObjectBar_Impl( USHORT nPos ) const
 */
 
 {
-    USHORT nRealPos = nPos & SFX_POSITION_MASK;
+    sal_uInt16 nRealPos = nPos & SFX_POSITION_MASK;
     if ( pParent && IsAppWorkWinToolbox_Impl( nRealPos ) )
         return pParent->KnowsObjectBar_Impl( nPos );
 
-    for ( USHORT n=0; n<aObjBarList.size(); n++ )
+    for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ )
     {
         if ( aObjBarList[n].nPos == nRealPos )
-            return TRUE;
+            return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 //------------------------------------------------------------------------
 
-BOOL SfxWorkWindow::IsVisible_Impl( USHORT nMode ) const
+sal_Bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const
 {
     switch( nUpdateMode )
     {
         case SFX_VISIBILITY_STANDARD:
-            return TRUE;
+            return sal_True;
         case SFX_VISIBILITY_UNVISIBLE:
-            return FALSE;
+            return sal_False;
         case SFX_VISIBILITY_PLUGSERVER:
         case SFX_VISIBILITY_PLUGCLIENT:
         case SFX_VISIBILITY_CLIENT:
@@ -1336,7 +1336,7 @@ BOOL SfxWorkWindow::IsVisible_Impl( USHORT nMode ) const
     }
 }
 
-Window* SfxWorkWindow::GetObjectBar_Impl( USHORT, sal_uInt32 )
+Window* SfxWorkWindow::GetObjectBar_Impl( sal_uInt16, sal_uInt32 )
 {
     return NULL;
 }
@@ -1365,7 +1365,7 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl()
             pWork = pWork->GetParent_Impl();
         }
 
-        ArrangeChilds_Impl( FALSE );
+        ArrangeChilds_Impl( sal_False );
 
         pWork = pParent;
         while ( pWork )
@@ -1445,7 +1445,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
 {
     // SplitWindows locken (d.h. Resize-Reaktion an den
     // DockingWindows unterdr"ucken)
-    USHORT n;
+    sal_uInt16 n;
     for ( n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         SfxSplitWindow *p = pSplit[n];
@@ -1482,18 +1482,18 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
     xLayoutManager->lock();
     for ( n = 0; n < aObjBarList.size(); ++n )
     {
-        USHORT      nId      = aObjBarList[n].nId;
+        sal_uInt16      nId      = aObjBarList[n].nId;
         sal_Bool    bDestroy = aObjBarList[n].bDestroy;
 
         // die Modi bestimmen, f"ur die die ToolBox gilt
-        USHORT nTbxMode = aObjBarList[n].nMode;
-        FASTBOOL bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
+        sal_uInt16 nTbxMode = aObjBarList[n].nMode;
+        bool bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
                                   ( nTbxMode & SFX_VISIBILITY_FULLSCREEN );
         nTbxMode &= ~SFX_VISIBILITY_FULLSCREEN;
         nTbxMode &= ~SFX_VISIBILITY_VIEWER;
 
         // wird in diesem Kontext eine ToolBox gefordert?
-        FASTBOOL bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode );
+        bool bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode );
         if ( bDestroy )
         {
             rtl::OUString aTbxId( m_aTbxTypeName );
@@ -1535,7 +1535,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
     {
         SfxSplitWindow *p = pSplit[n];
         if (p->GetWindowCount())
-            p->Lock(FALSE);
+            p->Lock(sal_False);
     }
 }
 
@@ -1552,11 +1552,11 @@ bool SfxWorkWindow::AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW
 void SfxWorkWindow::UpdateChildWindows_Impl()
 {
     // alle vorhandenen oder in den Kontext gekommenen ChildWindows
-    for ( USHORT n=0; n<pChildWins->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pChildWins->Count(); n++ )
     {
         SfxChildWin_Impl *pCW = (*pChildWins)[n];
         SfxChildWindow *pChildWin = pCW->pWin;
-        BOOL bCreate = FALSE;
+        sal_Bool bCreate = sal_False;
         if ( pCW->nId && !pCW->bDisabled  && (pCW->aInfo.nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE || IsVisible_Impl( pCW->nVisibility ) ) )
         {
             // Im Kontext ist ein geeignetes ChildWindow erlaubt;
@@ -1580,7 +1580,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
                         bCreate = ( eAlign == SFX_ALIGN_NOALIGNMENT );
                 }
                 else
-                    bCreate = TRUE;
+                    bCreate = sal_True;
 
                 if ( bCreate )
                     bCreate = AllowChildWindowCreation_Impl( *pCW );
@@ -1588,7 +1588,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
                 // Momentan kein Fenster da, aber es ist eingeschaltet; Fenster
                 // und ggf. Context erzeugen
                 if ( bCreate )
-                    CreateChildWin_Impl( pCW, FALSE );
+                    CreateChildWin_Impl( pCW, sal_False );
 
                 if ( !bAllChildsVisible )
                 {
@@ -1643,10 +1643,10 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
     }
 }
 
-void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
+void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, sal_Bool bSetFocus )
 {
     if ( pCW->aInfo.bVisible != 42 )
-        pCW->aInfo.bVisible = TRUE;
+        pCW->aInfo.bVisible = sal_True;
 
     SfxChildWindow *pChildWin = SfxChildWindow::CreateChildWindow( pCW->nId, pWorkWin, &GetBindings(), pCW->aInfo);
     if (pChildWin)
@@ -1666,12 +1666,12 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
         pCW->aInfo.nFlags |= aInfo.nFlags;
 
         // Nein !! Sonst kann man keine Fenster defaultmaessig ausschalten ( Partwindow! )
-//      pCW->aInfo.bVisible = TRUE;
+//      pCW->aInfo.bVisible = sal_True;
 
         // Erzeugung war erfolgreich
         GetBindings().Invalidate(pCW->nId);
 
-        USHORT nPos = pChildWin->GetPosition();
+        sal_uInt16 nPos = pChildWin->GetPosition();
         if (nPos != CHILDWIN_NOPOS)
         {
             DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
@@ -1718,11 +1718,11 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
 
 void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
 {
-    USHORT nId = pCW->nSaveId;
+    sal_uInt16 nId = pCW->nSaveId;
     SfxChildWindow *pChildWin = pCW->pWin;
 
     // vorhandenes Fenster geht aus dem Kontext und wird daher entfernt
-    USHORT nPos = pChildWin->GetPosition();
+    sal_uInt16 nPos = pChildWin->GetPosition();
     if (nPos != CHILDWIN_NOPOS)
     {
 /*
@@ -1739,7 +1739,7 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
     }
 
     // Information in der INI-Datei sichern
-    USHORT nFlags = pCW->aInfo.nFlags;
+    sal_uInt16 nFlags = pCW->aInfo.nFlags;
     pCW->aInfo = pChildWin->GetInfo();
     pCW->aInfo.nFlags |= nFlags;
     SaveStatus_Impl(pChildWin, pCW->aInfo);
@@ -1775,25 +1775,25 @@ void SfxWorkWindow::ResetStatusBar_Impl()
 void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, SfxShell*, SfxBindings& )
 {
     if ( nResId && bShowStatusBar && IsVisible_Impl() )
-        aStatBar.nId = sal::static_int_cast<USHORT>(nResId);
+        aStatBar.nId = sal::static_int_cast<sal_uInt16>(nResId);
 }
 
 #define SFX_ITEMTYPE_STATBAR 4
 
-void SfxWorkWindow::SetTempStatusBar_Impl( BOOL bSet )
+void SfxWorkWindow::SetTempStatusBar_Impl( sal_Bool bSet )
 {
     if ( aStatBar.bTemp != bSet && bShowStatusBar && IsVisible_Impl() )
     {
-        BOOL bOn = FALSE;
-        BOOL bReset = FALSE;
+        sal_Bool bOn = sal_False;
+        sal_Bool bReset = sal_False;
         if ( bSet && !aStatBar.nId )
         {
-            bReset = TRUE;
+            bReset = sal_True;
             SetStatusBar_Impl( SFX_ITEMTYPE_STATBAR, SFX_APP(), GetBindings() );
         }
 
         if ( aStatBar.nId && aStatBar.bOn && !bIsFullScreen )
-            bOn = TRUE;
+            bOn = sal_True;
 
         aStatBar.bTemp = bSet;
         if ( !bOn || bReset || (!bSet && aStatBar.nId ) )
@@ -1839,7 +1839,7 @@ void SfxWorkWindow::UpdateStatusBar_Impl()
 
 //------------------------------------------------------------------------
 /*
-void SfxWorkWindow::SetObjectBarVisibility_Impl( USHORT nMask )
+void SfxWorkWindow::SetObjectBarVisibility_Impl( sal_uInt16 nMask )
 {
     switch( nMask )
     {
@@ -1853,7 +1853,7 @@ void SfxWorkWindow::SetObjectBarVisibility_Impl( USHORT nMask )
         nUpdateMode = nMask;
 }*/
 
-void SfxWorkWindow::MakeVisible_Impl( BOOL bVis )
+void SfxWorkWindow::MakeVisible_Impl( sal_Bool bVis )
 {
     if ( bVis )
         nOrigMode = SFX_VISIBILITY_STANDARD;
@@ -1864,15 +1864,15 @@ void SfxWorkWindow::MakeVisible_Impl( BOOL bVis )
         nUpdateMode = nOrigMode;
 }
 
-BOOL SfxWorkWindow::IsVisible_Impl()
+sal_Bool SfxWorkWindow::IsVisible_Impl()
 {
     return nOrigMode != SFX_VISIBILITY_UNVISIBLE;
 }
 
 //------------------------------------------------------------------------
-void SfxWorkWindow::HidePopups_Impl(BOOL bHide, BOOL bParent, USHORT nId )
+void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent, sal_uInt16 nId )
 {
-    for ( USHORT n = 0; n < pChildWins->Count(); ++n )
+    for ( sal_uInt16 n = 0; n < pChildWins->Count(); ++n )
     {
         SfxChildWindow *pCW = (*pChildWins)[n]->pWin;
         if (pCW && pCW->GetAlignment() == SFX_ALIGN_NOALIGNMENT && pCW->GetType() != nId)
@@ -1900,10 +1900,10 @@ void SfxWorkWindow::HidePopups_Impl(BOOL bHide, BOOL bParent, USHORT nId )
 //------------------------------------------------------------------------
 
 void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
-            SfxDockingConfig eConfig, USHORT nId)
+            SfxDockingConfig eConfig, sal_uInt16 nId)
 {
     SfxDockingWindow* pDockWin=0;
-    USHORT nPos = USHRT_MAX;
+    sal_uInt16 nPos = USHRT_MAX;
     Window *pWin=0;
     SfxChildWin_Impl *pCW = 0;
 
@@ -1914,7 +1914,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
     else
     {
         // configure direct childwindow
-        for (USHORT n=0; n<pChildWins->Count(); n++)
+        for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
         {
             pCW = (*pChildWins)[n];
             SfxChildWindow *pChild = pCW->pWin;
@@ -1960,7 +1960,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
                 pWin = pSplitWin->GetSplitWindow();
                 if ( pSplitWin->GetWindowCount() == 1 )
-                    ((SplitWindow*)pWin)->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+                    ((SplitWindow*)pWin)->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             }
         }
 
@@ -1977,7 +1977,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
         Sort_Impl();
 
     SfxChild_Impl *pChild = 0;
-    USHORT n;
+    sal_uInt16 n;
     for ( n=0; n<aSortedList.Count(); ++n )
     {
         pChild = (*pChilds)[aSortedList[n]];
@@ -2001,13 +2001,13 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             Rectangle aOuterRect( GetTopRect_Impl() );
             aOuterRect.SetPos( pWorkWin->OutputToScreenPixel( aOuterRect.TopLeft() ));
             Rectangle aInnerRect( aOuterRect );
-            BOOL bTbx = (eChild == SFX_CHILDWIN_OBJECTBAR);
+            sal_Bool bTbx = (eChild == SFX_CHILDWIN_OBJECTBAR);
 
             // Das gerade betroffene Fenster wird bei der Berechnung des
             // inneren Rechtecks mit eingeschlossen!
-            for ( USHORT m=0; m<aSortedList.Count(); ++m )
+            for ( sal_uInt16 m=0; m<aSortedList.Count(); ++m )
             {
-                USHORT i=aSortedList[m];
+                sal_uInt16 i=aSortedList[m];
                 SfxChild_Impl* pCli = (*pChilds)[i];
 
                 if ( pCli && pCli->nVisible == CHILD_VISIBLE && pCli->pWin )
@@ -2130,7 +2130,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
                 if ( eChild == SFX_CHILDWIN_DOCKINGWINDOW || eAlign == SFX_ALIGN_NOALIGNMENT)
                 {
                     // configuration inside the SplitWindow, no change for the SplitWindows' configuration
-                    pCli->bResize = TRUE;
+                    pCli->bResize = sal_True;
                     pCli->aSize = pDockWin->GetSizePixel();
                 }
             }
@@ -2139,7 +2139,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             {
                 if( pCli->eAlign != eAlign )
                 {
-                    bSorted = FALSE;
+                    bSorted = sal_False;
                     pCli->eAlign = eAlign;
                 }
 
@@ -2150,7 +2150,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             if ( pCW && pCW->pWin )
             {
                 // store changed configuration
-                USHORT nFlags = pCW->aInfo.nFlags;
+                sal_uInt16 nFlags = pCW->aInfo.nFlags;
                 pCW->aInfo = pCW->pWin->GetInfo();
                 pCW->aInfo.nFlags |= nFlags;
                 if ( eConfig != SFX_MOVEDOCKINGWINDOW )
@@ -2165,10 +2165,10 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
 //--------------------------------------------------------------------
 
-void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, USHORT nMode )
+void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, sal_Bool bEnabled, sal_uInt16 nMode )
 {
-    USHORT nInter = (USHORT) ( lId >> 16 );
-    USHORT nId = (USHORT) ( lId & 0xFFFF );
+    sal_uInt16 nInter = (sal_uInt16) ( lId >> 16 );
+    sal_uInt16 nId = (sal_uInt16) ( lId & 0xFFFF );
 
     SfxChildWin_Impl *pCW=NULL;
     SfxWorkWindow *pWork = pParent;
@@ -2181,8 +2181,8 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
     if ( pWork )
     {
         // Dem Parent schon bekannt ?
-        USHORT nCount = pWork->pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pWork->pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pWork->pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pWork->pChildWins)[n];
@@ -2193,8 +2193,8 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
     if ( !pCW )
     {
         // Kein Parent oder dem Parent noch unbekannt, dann bei mir suchen
-        USHORT nCount = pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pChildWins)[n];
@@ -2231,10 +2231,10 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
 //--------------------------------------------------------------------
 // Der An/Aus-Status eines ChildWindows wird umgeschaltet.
 
-void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
+void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus)
 {
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
         if ((*pChildWins)[n]->nId == nId)
             break;
@@ -2261,15 +2261,15 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
                 {
                     if ( pChild->QueryClose() )
                     {
-                        pCW->bCreate = FALSE;
+                        pCW->bCreate = sal_False;
                         if ( pChild->IsHideAtToggle() )
                         {
-                            ShowChildWindow_Impl( nId, FALSE, bSetFocus );
+                            ShowChildWindow_Impl( nId, sal_False, bSetFocus );
                         }
                         else
                         {
                             // Fenster soll ausgeschaltet werdem
-                            pChild->SetVisible_Impl( FALSE );
+                            pChild->SetVisible_Impl( sal_False );
                             RemoveChildWin_Impl( pCW );
                         }
                     }
@@ -2277,7 +2277,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
                 else
                 {
                     // no actual Window exists, yet => just remember the "switched off" state
-                    pCW->bCreate = FALSE;
+                    pCW->bCreate = sal_False;
                 }
             }
             else
@@ -2287,7 +2287,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
                 {
                     if ( pChild )
                     {
-                        ShowChildWindow_Impl( nId, TRUE, bSetFocus );
+                        ShowChildWindow_Impl( nId, sal_True, bSetFocus );
                     }
                     else
                     {
@@ -2295,7 +2295,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
                         CreateChildWin_Impl( pCW, bSetFocus );
                         if ( !pCW->pWin )
                             // no success
-                            pCW->bCreate = FALSE;
+                            pCW->bCreate = sal_False;
                     }
                 }
             }
@@ -2342,10 +2342,10 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
 
 //--------------------------------------------------------------------
 
-BOOL SfxWorkWindow::HasChildWindow_Impl(USHORT nId)
+sal_Bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId)
 {
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
         if ((*pChildWins)[n]->nSaveId == nId)
             break;
@@ -2360,10 +2360,10 @@ BOOL SfxWorkWindow::HasChildWindow_Impl(USHORT nId)
     if ( pParent )
         return pParent->HasChildWindow_Impl( nId );
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SfxWorkWindow::IsFloating( USHORT nId )
+sal_Bool SfxWorkWindow::IsFloating( sal_uInt16 nId )
 {
     SfxChildWin_Impl *pCW=NULL;
     SfxWorkWindow *pWork = pParent;
@@ -2376,8 +2376,8 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
     if ( pWork )
     {
         // Dem Parent schon bekannt ?
-        USHORT nCount = pWork->pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pWork->pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pWork->pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pWork->pChildWins)[n];
@@ -2388,8 +2388,8 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
     if ( !pCW )
     {
         // Kein Parent oder dem Parent noch unbekannt, dann bei mir suchen
-        USHORT nCount = pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pChildWins)[n];
@@ -2402,7 +2402,7 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
         // Ist neu, also initialisieren; je nach Flag beim Parent oder bei
         // mir eintragen
         pCW = new SfxChildWin_Impl( nId );
-        pCW->bEnable = FALSE;
+        pCW->bEnable = sal_False;
         pCW->nId = 0;
         pCW->nVisibility = 0;
         InitializeChild_Impl( pCW );
@@ -2416,16 +2416,16 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
     if ( pCW->aInfo.GetExtraData_Impl( &eAlign ) )
         return( eAlign == SFX_ALIGN_NOALIGNMENT );
     else
-        return TRUE;
+        return sal_True;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxWorkWindow::KnowsChildWindow_Impl(USHORT nId)
+sal_Bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId)
 {
     SfxChildWin_Impl *pCW=0;
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
     {
         pCW = (*pChildWins)[n];
@@ -2436,18 +2436,18 @@ BOOL SfxWorkWindow::KnowsChildWindow_Impl(USHORT nId)
     if (n<nCount)
     {
         if ( !(pCW->aInfo.nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE) && !IsVisible_Impl(  pCW->nVisibility ) )
-            return FALSE;
+            return sal_False;
         return pCW->bEnable;
     }
     else if ( pParent )
         return pParent->KnowsChildWindow_Impl( nId );
     else
-        return FALSE;
+        return sal_False;
 }
 
 //--------------------------------------------------------------------
 
-void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
+void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus)
 {
     SfxChildWin_Impl *pCW=NULL;
     SfxWorkWindow *pWork = pParent;
@@ -2460,8 +2460,8 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
     if ( pWork )
     {
         // Dem Parent schon bekannt ?
-        USHORT nCount = pWork->pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pWork->pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pWork->pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pWork->pChildWins)[n];
@@ -2472,8 +2472,8 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
     if ( !pCW )
     {
         // Kein Parent oder dem Parent noch unbekannt, dann bei mir suchen
-        USHORT nCount = pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pChildWins)[n];
@@ -2499,11 +2499,11 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
 
 //--------------------------------------------------------------------
 
-void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFocus)
+void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus)
 {
-    USHORT nCount = pChildWins->Count();
+    sal_uInt16 nCount = pChildWins->Count();
     SfxChildWin_Impl* pCW=0;
-    USHORT n;
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
     {
         pCW = (*pChildWins)[n];
@@ -2545,14 +2545,14 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFoc
         }
         else if ( bVisible )
         {
-            SetChildWindow_Impl( nId, TRUE, bSetFocus );
+            SetChildWindow_Impl( nId, sal_True, bSetFocus );
             pChildWin = pCW->pWin;
         }
 
         if ( pChildWin )
         {
             pChildWin->SetVisible_Impl( bVisible );
-            USHORT nFlags = pCW->aInfo.nFlags;
+            sal_uInt16 nFlags = pCW->aInfo.nFlags;
             pCW->aInfo = pChildWin->GetInfo();
             pCW->aInfo.nFlags |= nFlags;
             if ( !pCW->bCreate )
@@ -2587,10 +2587,10 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFoc
 
 //--------------------------------------------------------------------
 
-SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(USHORT nId)
+SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId)
 {
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
         if ((*pChildWins)[n]->nSaveId == nId)
              break;
@@ -2609,10 +2609,10 @@ void SfxWorkWindow::ResetChildWindows_Impl()
 //  if ( pParent )
 //      pParent->ResetChildWindows_Impl();
 
-    for ( USHORT n = 0; n < pChildWins->Count(); ++n )
+    for ( sal_uInt16 n = 0; n < pChildWins->Count(); ++n )
     {
         (*pChildWins)[n]->nId = 0;
-        (*pChildWins)[n]->bEnable = FALSE;
+        (*pChildWins)[n]->bEnable = sal_False;
     }
 }
 
@@ -2640,14 +2640,14 @@ Rectangle SfxFrameWorkWin_Impl::GetTopRect_Impl()
 // Virtuelle Methode, um herauszufinden, ob ein Child-Fenster noch Platz
 // in der ClientArea des parent findet.
 
-BOOL SfxWorkWindow::RequestTopToolSpacePixel_Impl( SvBorder aBorder )
+sal_Bool SfxWorkWindow::RequestTopToolSpacePixel_Impl( SvBorder aBorder )
 {
     if ( !IsDockingAllowed() ||
             aClientArea.GetWidth() < aBorder.Left() + aBorder.Right() ||
             aClientArea.GetHeight() < aBorder.Top() + aBorder.Bottom() )
-        return FALSE;
+        return sal_False;
     else
-        return TRUE;;
+        return sal_True;;
 }
 
 void SfxWorkWindow::SaveStatus_Impl(SfxChildWindow *pChild, const SfxChildWinInfo &rInfo)
@@ -2663,7 +2663,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
     SfxApplication *pApp = SFX_APP();
     {
         SfxChildWinFactArr_Impl &rFactories = pApp->GetChildWinFactories_Impl();
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
         {
             pFact = rFactories[nFactory];
             if ( pFact->nId == pCW->nSaveId )
@@ -2672,7 +2672,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
                 SfxChildWindow::InitializeChildWinFactory_Impl(
                                             pCW->nSaveId, pCW->aInfo);
                 pCW->bCreate = pCW->aInfo.bVisible;
-                USHORT nFlags = pFact->aInfo.nFlags;
+                sal_uInt16 nFlags = pFact->aInfo.nFlags;
                 if ( nFlags & SFX_CHILDWIN_TASK )
                     pCW->aInfo.nFlags |= SFX_CHILDWIN_TASK;
                 if ( nFlags & SFX_CHILDWIN_CANTGETFOCUS )
@@ -2693,7 +2693,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
         if ( pFactories )
         {
             SfxChildWinFactArr_Impl &rFactories = *pFactories;
-            for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+            for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
             {
                 pFact = rFactories[nFactory];
                 if ( pFact->nId == pCW->nSaveId )
@@ -2702,7 +2702,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
                     SfxChildWindow::InitializeChildWinFactory_Impl(
                                                 pCW->nSaveId, pCW->aInfo);
                     pCW->bCreate = pCW->aInfo.bVisible;
-                    USHORT nFlags = pFact->aInfo.nFlags;
+                    sal_uInt16 nFlags = pFact->aInfo.nFlags;
                     if ( nFlags & SFX_CHILDWIN_TASK )
                         pCW->aInfo.nFlags |= SFX_CHILDWIN_TASK;
                     if ( nFlags & SFX_CHILDWIN_CANTGETFOCUS )
@@ -2745,7 +2745,7 @@ SfxSplitWindow* SfxWorkWindow::GetSplitWindow_Impl( SfxChildAlignment eAlign )
     }
 }
 
-void SfxWorkWindow::MakeChildsVisible_Impl( BOOL bVis )
+void SfxWorkWindow::MakeChildsVisible_Impl( sal_Bool bVis )
 {
     if ( pParent )
         pParent->MakeChildsVisible_Impl( bVis );
@@ -2755,7 +2755,7 @@ void SfxWorkWindow::MakeChildsVisible_Impl( BOOL bVis )
     {
         if ( !bSorted )
             Sort_Impl();
-        for ( USHORT n=0; n<aSortedList.Count(); ++n )
+        for ( sal_uInt16 n=0; n<aSortedList.Count(); ++n )
         {
             SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
             if ( (pCli->eAlign == SFX_ALIGN_NOALIGNMENT) || (IsDockingAllowed() && bInternalDockingAllowed) )
@@ -2766,7 +2766,7 @@ void SfxWorkWindow::MakeChildsVisible_Impl( BOOL bVis )
     {
         if ( !bSorted )
             Sort_Impl();
-        for ( USHORT n=0; n<aSortedList.Count(); ++n )
+        for ( sal_uInt16 n=0; n<aSortedList.Count(); ++n )
         {
             SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
             pCli->nVisible &= ~CHILD_ACTIVE;
@@ -2774,14 +2774,14 @@ void SfxWorkWindow::MakeChildsVisible_Impl( BOOL bVis )
     }
 }
 
-BOOL SfxWorkWindow::IsAutoHideMode( const SfxSplitWindow *pSplitWin )
+sal_Bool SfxWorkWindow::IsAutoHideMode( const SfxSplitWindow *pSplitWin )
 {
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
-        if ( pSplit[n] != pSplitWin && pSplit[n]->IsAutoHide( TRUE ) )
-            return TRUE;
+        if ( pSplit[n] != pSplitWin && pSplit[n]->IsAutoHide( sal_True ) )
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -2790,7 +2790,7 @@ void SfxWorkWindow::EndAutoShow_Impl( Point aPos )
     if ( pParent )
         pParent->EndAutoShow_Impl( aPos );
 
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         SfxSplitWindow *p = pSplit[n];
         if ( p && p->IsAutoHide() )
@@ -2813,7 +2813,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
         pParent->ArrangeAutoHideWindows( pActSplitWin );
 
     Rectangle aArea( aUpperClientArea );
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         // Es werden entweder Dummyfenster oder Fenster im AutoShow-Modus
         // ( nicht gepinned, FadeIn ) behandelt.
@@ -2821,7 +2821,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
         // soll daf"ur gerade die Gr"o\se berechnet werden, bevor es angezeigt
         // wird.
         SfxSplitWindow* pSplitWin = pSplit[n];
-        BOOL bDummyWindow = !pSplitWin->IsFadeIn();
+        sal_Bool bDummyWindow = !pSplitWin->IsFadeIn();
         Window *pDummy = pSplitWin->GetSplitWindow();
         Window *pWin = bDummyWindow ? pDummy : pSplitWin;
         if ( (pSplitWin->IsPinned() && !bDummyWindow) || (!pWin->IsVisible() && pActSplitWin != pSplitWin) )
@@ -2932,12 +2932,12 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
     }
 }
 
-Rectangle SfxWorkWindow::GetFreeArea( BOOL bAutoHide ) const
+Rectangle SfxWorkWindow::GetFreeArea( sal_Bool bAutoHide ) const
 {
     if ( bAutoHide )
     {
         Rectangle aArea( aClientArea );
-        for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+        for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
         {
             if ( pSplit[n]->IsPinned() || !pSplit[n]->IsVisible() )
                 continue;
@@ -2966,7 +2966,7 @@ Rectangle SfxWorkWindow::GetFreeArea( BOOL bAutoHide ) const
         return aClientArea;
 }
 
-SfxChildWinController_Impl::SfxChildWinController_Impl( USHORT nID, SfxWorkWindow *pWork )
+SfxChildWinController_Impl::SfxChildWinController_Impl( sal_uInt16 nID, SfxWorkWindow *pWork )
     : SfxControllerItem( nID, pWork->GetBindings() )
     , pWorkwin( pWork )
 {}
@@ -2977,15 +2977,15 @@ SfxChildWinController_Impl::SfxChildWinController_Impl( USHORT nID, SfxWorkWindo
 }
 
 void SfxChildWinController_Impl::StateChanged(
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* )
 {
     pWorkwin->DisableChildWindow_Impl( nSID, eState == SFX_ITEM_DISABLED );
 }
 
-void SfxWorkWindow::DisableChildWindow_Impl( USHORT nId, BOOL bDisable )
+void SfxWorkWindow::DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable )
 {
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
         if ((*pChildWins)[n]->nSaveId == nId)
              break;
@@ -3008,16 +3008,16 @@ Window* SfxWorkWindow::GetActiveChild_Impl()
     return pActiveChild;
 }
 
-BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
+sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
 {
     // Alle Kinder gem"a\s Liste sortieren
     SvUShorts aList;
-    for ( USHORT i=SFX_OBJECTBAR_MAX; i<pChilds->Count(); i++)
+    for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<pChilds->Count(); i++)
     {
         SfxChild_Impl *pCli = (*pChilds)[i];
         if ( pCli && pCli->bCanGetFocus && pCli->pWin )
         {
-            USHORT k;
+            sal_uInt16 k;
             for (k=0; k<aList.Count(); k++)
                 if ( ChildTravelValue((*pChilds)[aList[k]]->eAlign) > ChildTravelValue(pCli->eAlign) )
                     break;
@@ -3026,17 +3026,17 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
     }
 
     if ( aList.Count() == 0 )
-        return FALSE;
+        return sal_False;
 
-    USHORT nTopValue  = ChildTravelValue( SFX_ALIGN_LOWESTTOP );
-    for ( USHORT i=0; i<aList.Count(); i++ )
+    sal_uInt16 nTopValue  = ChildTravelValue( SFX_ALIGN_LOWESTTOP );
+    for ( sal_uInt16 i=0; i<aList.Count(); i++ )
     {
         SfxChild_Impl* pCli = (*pChilds)[aList[i]];
         if ( pCli->pWin && ChildTravelValue( pCli->eAlign ) > nTopValue )
             break;
     }
 
-    USHORT n = bForward ? 0 : aList.Count()-1;
+    sal_uInt16 n = bForward ? 0 : aList.Count()-1;
     SfxChild_Impl *pAct=NULL;
     if ( pActiveChild )
     {
@@ -3058,14 +3058,14 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
     n = n + 1;
     if ( pAct )
     {
-        for ( USHORT i=0; i<SFX_SPLITWINDOWS_MAX; i++ )
+        for ( sal_uInt16 i=0; i<SFX_SPLITWINDOWS_MAX; i++ )
         {
             // Eventuell ist pAct ein Splitwindow
             SfxSplitWindow *p = pSplit[i];
             if ( pAct->pWin == p )
             {
                 if( p->ActivateNextChild_Impl( bForward ) )
-                    return TRUE;
+                    return sal_True;
                 break;
             }
         }
@@ -3078,7 +3078,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
             n = n-1;
 
         if ( n == 0 || n == aList.Count()-1 )
-            return FALSE;
+            return sal_False;
     }
 
     for( ;; )
@@ -3087,7 +3087,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
         if ( pCli->pWin )
         {
             SfxChild_Impl* pNext = pCli;
-            for ( USHORT i=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+            for ( sal_uInt16 i=0; n<SFX_SPLITWINDOWS_MAX; n++ )
             {
                 // Eventuell ist pNext ein Splitwindow
                 SfxSplitWindow *p = pSplit[i];
@@ -3097,7 +3097,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
                     p->SetActiveWindow_Impl( NULL );
                     pNext = NULL;
                     if( p->ActivateNextChild_Impl( bForward ) )
-                        return TRUE;
+                        return sal_True;
                     break;
                 }
             }
@@ -3106,7 +3106,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
             {
                 pNext->pWin->GrabFocus();
                 pActiveChild = pNext->pWin;
-                return TRUE;
+                return sal_True;
             }
         }
 
@@ -3119,17 +3119,17 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
             break;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-void SfxWorkWindow::SetObjectBarCustomizeMode_Impl( BOOL )
+void SfxWorkWindow::SetObjectBarCustomizeMode_Impl( sal_Bool )
 {
 }
 
 void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& )
 {
-    USHORT n;
-    USHORT nCount = pChildWins->Count();
+    sal_uInt16 n;
+    sal_uInt16 nCount = pChildWins->Count();
     for (n=0; n<nCount; n++)
     {
         SfxChildWin_Impl*pCW = (*pChildWins)[n];
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index df35593a9a18..dde66315720f 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -39,7 +39,7 @@
 //====================================================================
 // add nOffset to each bit-value in the set
 
-BitSet BitSet::operator<<( USHORT nOffset ) const
+BitSet BitSet::operator<<( sal_uInt16 nOffset ) const
 {
     DBG_MEMTEST();
     // create a work-copy, return it if nothing to shift
@@ -48,17 +48,17 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
         return aSet;
 
     // compute the shiftment in long-words and bits
-    USHORT nBlockDiff = nOffset / 32;
-    ULONG nBitValDiff = nOffset % 32;
+    sal_uInt16 nBlockDiff = nOffset / 32;
+    sal_uIntPtr nBitValDiff = nOffset % 32;
 
     // compute the new number of bits
-    for ( USHORT nBlock = 0; nBlock < nBlockDiff; ++nBlock )
+    for ( sal_uInt16 nBlock = 0; nBlock < nBlockDiff; ++nBlock )
         aSet.nCount = aSet.nCount - CountBits( *(aSet.pBitmap+nBlock) );
     aSet.nCount = aSet.nCount -
         CountBits( *(aSet.pBitmap+nBlockDiff) >> (32-nBitValDiff) );
 
     // shift complete long-words
-    USHORT nTarget, nSource;
+    sal_uInt16 nTarget, nSource;
     for ( nTarget = 0, nSource = nBlockDiff;
           (nSource+1) < aSet.nBlocks;
           ++nTarget, ++nSource )
@@ -76,7 +76,7 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
     // shorten the block-array
     if ( nTarget < aSet.nBlocks )
     {
-        ULONG* pNewMap = new ULONG[nTarget];
+        sal_uIntPtr* pNewMap = new sal_uIntPtr[nTarget];
         memcpy( pNewMap, aSet.pBitmap, 4 * nTarget );
         delete [] aSet.pBitmap;
         aSet.pBitmap = pNewMap;
@@ -90,7 +90,7 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
 
 // substracts nOffset from each bit-value in the set
 
-BitSet BitSet::operator>>( USHORT ) const
+BitSet BitSet::operator>>( sal_uInt16 ) const
 {
     DBG_MEMTEST();
     return BitSet();
@@ -108,7 +108,7 @@ void BitSet::CopyFrom( const BitSet& rSet )
     if ( rSet.nBlocks )
     {
         DBG_MEMTEST();
-        pBitmap = new ULONG[nBlocks];
+        pBitmap = new sal_uIntPtr[nBlocks];
         memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
     }
     else
@@ -141,13 +141,13 @@ BitSet::BitSet( const BitSet& rOrig )
 
 // creates a bitset from an array
 
-BitSet::BitSet( USHORT* pArray, USHORT nSize ):
+BitSet::BitSet( sal_uInt16* pArray, sal_uInt16 nSize ):
     nCount(nSize)
 {
     DBG_MEMTEST();
     // find the highest bit to set
-    USHORT nMax = 0;
-    for ( USHORT n = 0; n < nCount; ++n )
+    sal_uInt16 nMax = 0;
+    for ( sal_uInt16 n = 0; n < nCount; ++n )
         if ( pArray[n] > nMax )
             nMax = pArray[n];
 
@@ -156,15 +156,15 @@ BitSet::BitSet( USHORT* pArray, USHORT nSize ):
     {
         // allocate memory for all blocks needed
         nBlocks = nMax / 32 + 1;
-        pBitmap = new ULONG[nBlocks];
+        pBitmap = new sal_uIntPtr[nBlocks];
         memset( pBitmap, 0, 4 * nBlocks );
 
         // set all the bits
-        for ( USHORT n = 0; n < nCount; ++n )
+        for ( sal_uInt16 n = 0; n < nCount; ++n )
         {
             // compute the block no. and bitvalue
-            USHORT nBlock = n / 32;
-            ULONG nBitVal = 1L << (n % 32);
+            sal_uInt16 nBlock = n / 32;
+            sal_uIntPtr nBitVal = 1L << (n % 32);
 
             // set a single bit
             if ( ( *(pBitmap+nBlock) & nBitVal ) == 0 )
@@ -220,16 +220,16 @@ BitSet& BitSet::operator=( const BitSet& rOrig )
 
 // assignment from a single bit
 
-BitSet& BitSet::operator=( USHORT nBit )
+BitSet& BitSet::operator=( sal_uInt16 nBit )
 {
     DBG_MEMTEST();
     delete [] pBitmap;
 
     nBlocks = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
     nCount = 1;
 
-    pBitmap = new ULONG[nBlocks];
+    pBitmap = new sal_uIntPtr[nBlocks];
     memset( pBitmap + nBlocks, 0, 4 * nBlocks );
 
     *(pBitmap+nBlocks) = nBitVal;
@@ -241,11 +241,11 @@ BitSet& BitSet::operator=( USHORT nBit )
 
 // creates the asymetric difference with another bitset
 
-BitSet& BitSet::operator-=(USHORT nBit)
+BitSet& BitSet::operator-=(sal_uInt16 nBit)
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
       return *this;
@@ -266,12 +266,12 @@ BitSet& BitSet::operator-=(USHORT nBit)
 BitSet& BitSet::operator|=( const BitSet& rSet )
 {
     DBG_MEMTEST();
-    USHORT nMax = Min(nBlocks, rSet.nBlocks);
+    sal_uInt16 nMax = Min(nBlocks, rSet.nBlocks);
 
     // expand the bitmap
     if ( nBlocks < rSet.nBlocks )
     {
-        ULONG *pNewMap = new ULONG[rSet.nBlocks];
+        sal_uIntPtr *pNewMap = new sal_uIntPtr[rSet.nBlocks];
         memset( pNewMap + nBlocks, 0, 4 * (rSet.nBlocks - nBlocks) );
 
         if ( pBitmap )
@@ -284,10 +284,10 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
     }
 
     // add the bits blocks by block
-    for ( USHORT nBlock = 0; nBlock < nMax; ++nBlock )
+    for ( sal_uInt16 nBlock = 0; nBlock < nMax; ++nBlock )
     {
         // compute numberof additional bits
-        ULONG nDiff = ~*(pBitmap+nBlock) & *(rSet.pBitmap+nBlock);
+        sal_uIntPtr nDiff = ~*(pBitmap+nBlock) & *(rSet.pBitmap+nBlock);
         nCount = nCount + CountBits(nDiff);
 
         *(pBitmap+nBlock) |= *(rSet.pBitmap+nBlock);
@@ -300,15 +300,15 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
 
 // unites with a single bit
 
-BitSet& BitSet::operator|=( USHORT nBit )
+BitSet& BitSet::operator|=( sal_uInt16 nBit )
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
     {
-        ULONG *pNewMap = new ULONG[nBlock+1];
+        sal_uIntPtr *pNewMap = new sal_uIntPtr[nBlock+1];
         memset( pNewMap + nBlocks, 0, 4 * (nBlock - nBlocks + 1) );
 
         if ( pBitmap )
@@ -333,14 +333,14 @@ BitSet& BitSet::operator|=( USHORT nBit )
 
 // determines if the bit is set (may be the only one)
 
-BOOL BitSet::Contains( USHORT nBit ) const
+sal_Bool BitSet::Contains( sal_uInt16 nBit ) const
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
-        return FALSE;
+        return sal_False;
     return ( nBitVal & *(pBitmap+nBlock) ) == nBitVal;
 }
 
@@ -348,27 +348,27 @@ BOOL BitSet::Contains( USHORT nBit ) const
 
 // determines if the bitsets are equal
 
-BOOL BitSet::operator==( const BitSet& rSet ) const
+sal_Bool BitSet::operator==( const BitSet& rSet ) const
 {
     DBG_MEMTEST();
     if ( nBlocks != rSet.nBlocks )
-        return FALSE;
+        return sal_False;
 
-    USHORT nBlock = nBlocks;
+    sal_uInt16 nBlock = nBlocks;
     while ( nBlock-- > 0 )
         if ( *(pBitmap+nBlock) != *(rSet.pBitmap+nBlock) )
-            return FALSE;
+            return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
 // counts the number of 1-bits in the parameter
 
-USHORT BitSet::CountBits( ULONG nBits )
+sal_uInt16 BitSet::CountBits( sal_uIntPtr nBits )
 {
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     int nBit = 32;
     while ( nBit-- && nBits )
     {   if ( ( (long)nBits ) < 0 )
@@ -380,15 +380,15 @@ USHORT BitSet::CountBits( ULONG nBits )
 
 //--------------------------------------------------------------------
 
-USHORT IndexBitSet::GetFreeIndex()
+sal_uInt16 IndexBitSet::GetFreeIndex()
 {
-  for(USHORT i=0;i<USHRT_MAX;i++)
+  for(sal_uInt16 i=0;i<USHRT_MAX;i++)
     if(!Contains(i))
       {
         *this|=i;
         return i;
       }
-  DBG_ASSERT(FALSE, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
+  DBG_ASSERT(sal_False, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
   return 0;
 }
 
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 06e17e232041..f73e6e5498ad 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -132,7 +132,7 @@ using namespace ::vos;
 #include <sfx2/viewfrm.hxx>
 
 static SfxFilterList_Impl* pFilterArr = 0;
-static BOOL bFirstRead = TRUE;
+static sal_Bool bFirstRead = sal_True;
 
 static void CreateFilterArr()
 {
@@ -286,7 +286,7 @@ SfxFilterMatcher::SfxFilterMatcher( const String& rName )
 
     String aName = SfxObjectShell::GetServiceNameFromFactory( rName );
     DBG_ASSERT(aName.Len(), "Found boes type :-)");
-    for ( USHORT n=0; n<pImplArr->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImplArr->Count(); n++ )
     {
         // find the impl-Data of any comparable FilterMatcher that was created before
         SfxFilterMatcher_Impl* pImp = pImplArr->GetObject(n);
@@ -322,7 +322,7 @@ void SfxFilterMatcher_Impl::Update()
     {
         // this List was already used
         pList->Clear();
-        for ( USHORT n=0; n<pFilterArr->Count(); n++ )
+        for ( sal_uInt16 n=0; n<pFilterArr->Count(); n++ )
         {
             SfxFilter* pFilter = pFilterArr->GetObject(n);
             if ( pFilter->GetServiceName() == String(aName) )
@@ -545,7 +545,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
     const SfxFilter* pFilter = pOldFilter;
 
     sal_Bool bPreview = rMedium.IsPreview_Impl();
-    SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, FALSE);
+    SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False);
     if ( bPreview && rMedium.IsRemote() && ( !pReferer || pReferer->GetValue().CompareToAscii("private:searchfolder:",21 ) != COMPARE_EQUAL ) )
         return ERRCODE_ABORT;
 
@@ -775,7 +775,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!");
@@ -808,7 +808,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf
                 }
             }
 
-            SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, FALSE );
+            SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, sal_False );
         }
     }
 
@@ -911,7 +911,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
     const ::rtl::OUString& rName,
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
-    BOOL bUpdate
+    sal_Bool bUpdate
     )
 {
     ::rtl::OUString sFilterName( rName );
@@ -1052,16 +1052,16 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
         }
 
         SfxFilter* pFilter = bUpdate ? (SfxFilter*) SfxFilter::GetFilterByName( sFilterName ) : 0;
-        BOOL bNew = FALSE;
+        sal_Bool bNew = sal_False;
         if (!pFilter)
         {
-            bNew = TRUE;
+            bNew = sal_True;
             pFilter = new SfxFilter( sFilterName             ,
                                      sExtension              ,
                                      nFlags                  ,
                                      nClipboardId            ,
                                      sType                   ,
-                                     (USHORT)nDocumentIconId ,
+                                     (sal_uInt16)nDocumentIconId ,
                                      sMimeType               ,
                                      sUserData               ,
                                      sServiceName );
@@ -1073,7 +1073,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
             pFilter->nFormatType  = nFlags;
             pFilter->lFormat      = nClipboardId;
             pFilter->aTypeName    = sType;
-            pFilter->nDocIcon     = (USHORT)nDocumentIconId;
+            pFilter->nDocIcon     = (sal_uInt16)nDocumentIconId;
             pFilter->aMimeType    = sMimeType;
             pFilter->aUserData    = sUserData;
             pFilter->aServiceName = sServiceName;
@@ -1094,13 +1094,13 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
     }
 }
 
-void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
+void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
 {
     RTL_LOGFILE_CONTEXT( aMeasure, "sfx2 (as96863) ::SfxFilterContainer::ReadFilters" );
     if ( !pFilterArr )
         CreateFilterArr();
 
-    bFirstRead = FALSE;
+    bFirstRead = sal_False;
     SfxFilterList_Impl& rList = *pFilterArr;
 
     try
@@ -1130,10 +1130,10 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
                 // and change it back for all valid filters afterwards.
                 if( rList.Count() > 0 )
                 {
-                    bUpdate = TRUE;
-                    USHORT nCount = (USHORT)rList.Count();
+                    bUpdate = sal_True;
+                    sal_uInt16 nCount = (sal_uInt16)rList.Count();
                     SfxFilter* pFilter;
-                    for (USHORT f=0; f<nCount; ++f)
+                    for (sal_uInt16 f=0; f<nCount; ++f)
                     {
                         pFilter = NULL;
                         pFilter = rList.GetObject(f);
@@ -1155,9 +1155,9 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
                     // Otherwise you have to check more then 300 filter names manually .-)
                     // And conditional breakpoints on unicode values seams not to be supported .-(
                     #ifdef DEBUG
-                    bool bDBGStop = FALSE;
+                    bool bDBGStop = sal_False;
                     if (sFilterName.indexOf(::rtl::OUString::createFromAscii("DBG_"))>-1)
-                        bDBGStop = TRUE;
+                        bDBGStop = sal_True;
                     #endif
 
                     ReadSingleFilter_Impl( sFilterName, xTypeCFG, xFilterCFG, bUpdate );
@@ -1173,7 +1173,7 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
     if ( pImplArr && bUpdate )
     {
         // global filter arry was modified, factory specific ones might need an update too
-        for ( USHORT n=0; n<pImplArr->Count(); n++ )
+        for ( sal_uInt16 n=0; n<pImplArr->Count(); n++ )
             pImplArr->GetObject(n)->Update();
     }
 }
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/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 8ecfa6b3081a..fb850b624695 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -75,10 +75,10 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
     // bug #41665# auch so.
     // Netscape l"a\st aber ein direktes Setzen auf 0 nicht zu, IE4.0 schon.
     // Den Bug machen wir nicht mit!
-    BOOL bMarginWidth = FALSE, bMarginHeight = FALSE;
+    sal_Bool bMarginWidth = sal_False, bMarginHeight = sal_False;
 
-    USHORT nArrLen = pOptions->Count();
-    for ( USHORT i=0; i<nArrLen; i++ )
+    sal_uInt16 nArrLen = pOptions->Count();
+    for ( sal_uInt16 i=0; i<nArrLen; i++ )
     {
         const HTMLOption *pOption = (*pOptions)[i];
         switch( pOption->GetToken() )
@@ -106,7 +106,7 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
 //              aMargin.Width() = 1;
             if( !bMarginHeight )
                 aMargin.Height() = 0;
-            bMarginWidth = TRUE;
+            bMarginWidth = sal_True;
             break;
         case HTML_O_MARGINHEIGHT:
             aMargin.Height() = pOption->GetNumber();
@@ -115,7 +115,7 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
 //              aMargin.Height() = 1;
             if( !bMarginWidth )
                 aMargin.Width() = 0;
-            bMarginHeight = TRUE;
+            bMarginHeight = sal_True;
             break;
         case HTML_O_SCROLLING:
             pFrame->SetScrollingMode(
@@ -125,33 +125,33 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
         case HTML_O_FRAMEBORDER:
         {
             String aStr = pOption->GetString();
-            BOOL bBorder = TRUE;
+            sal_Bool bBorder = sal_True;
             if ( aStr.EqualsIgnoreCaseAscii("NO") ||
                  aStr.EqualsIgnoreCaseAscii("0") )
-                bBorder = FALSE;
+                bBorder = sal_False;
             pFrame->SetFrameBorder( bBorder );
             break;
         }
         case HTML_O_NORESIZE:
-            pFrame->SetResizable( FALSE );
+            pFrame->SetResizable( sal_False );
             break;
         default:
             if ( pOption->GetTokenString().EqualsIgnoreCaseAscii(
                                                         HTML_O_READONLY ) )
             {
                 String aStr = pOption->GetString();
-                BOOL bReadonly = TRUE;
+                sal_Bool bReadonly = sal_True;
                 if ( aStr.EqualsIgnoreCaseAscii("FALSE") )
-                    bReadonly = FALSE;
+                    bReadonly = sal_False;
                 pFrame->SetReadOnly( bReadonly );
             }
             else if ( pOption->GetTokenString().EqualsIgnoreCaseAscii(
                                                         HTML_O_EDIT ) )
             {
                 String aStr = pOption->GetString();
-                BOOL bEdit = TRUE;
+                sal_Bool bEdit = sal_True;
                 if ( aStr.EqualsIgnoreCaseAscii("FALSE") )
-                    bEdit = FALSE;
+                    bEdit = sal_False;
                 pFrame->SetEditable( bEdit );
             }
 
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index e17151c6e322..9330608d9f8b 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -87,7 +87,7 @@ const sal_Char __FAR_DATA SfxFrameHTMLWriter::sNewLine[] = "\015\012";
 void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                                   const sal_Char *pIndent,
                                   const String& rName,
-                                  const String& rContent, BOOL bHTTPEquiv,
+                                  const String& rContent, sal_Bool bHTTPEquiv,
                                      rtl_TextEncoding eDestEnc,
                                   String *pNonConvertableChars  )
 {
@@ -121,7 +121,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
     {
         String aContentType = String::CreateFromAscii( sHTML_MIME_text_html );
         aContentType.AppendAscii( pCharSet );
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, TRUE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, sal_True,
                  eDestEnc, pNonConvertableChars );
     }
 
@@ -136,7 +136,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         if( rTitle.Len() )
             HTMLOutFuncs::Out_String( rStrm, rTitle, eDestEnc, pNonConvertableChars );
     }
-    HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, FALSE );
+    HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, sal_False );
 
     // Target-Frame
     if( i_xDocProps.is() )
@@ -159,7 +159,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
     // Who we are
     String sGenerator( SfxResId( STR_HTML_GENERATOR ) );
     sGenerator.SearchAndReplaceAscii( "%1", String( DEFINE_CONST_UNICODE( TOOLS_INETDEF_OS ) ) );
-    OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, FALSE, eDestEnc, pNonConvertableChars );
+    OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars );
 
     if( i_xDocProps.is() )
     {
@@ -179,14 +179,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
                         rBaseURL, rReloadURL));
             }
 
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, TRUE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, sal_True,
                      eDestEnc, pNonConvertableChars );
         }
 
         // Author
         const String& rAuthor = i_xDocProps->getAuthor();
         if( rAuthor.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // created
@@ -196,13 +196,13 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         String sOut = String::CreateFromInt32(aD.GetDate());
         sOut += ';';
         sOut += String::CreateFromInt32(aT.GetTime());
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, FALSE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, sal_False,
                  eDestEnc, pNonConvertableChars );
 
         // changedby
         const String& rChangedBy = i_xDocProps->getModifiedBy();
         if( rChangedBy.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // changed
@@ -212,26 +212,26 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         sOut = String::CreateFromInt32(aD2.GetDate());
         sOut += ';';
         sOut += String::CreateFromInt32(aT2.GetTime());
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, FALSE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, sal_False,
                  eDestEnc, pNonConvertableChars );
 
         // Subject
         const String& rTheme = i_xDocProps->getSubject();
         if( rTheme.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // Description
         const String& rComment = i_xDocProps->getDescription();
         if( rComment.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, sal_False,
                      eDestEnc, pNonConvertableChars);
 
         // Keywords
         String Keywords = ::comphelper::string::convertCommaSeparated(
             i_xDocProps->getKeywords());
         if( Keywords.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, sal_False,
                      eDestEnc, pNonConvertableChars);
 
         uno::Reference < script::XTypeConverter > xConverter(
@@ -255,7 +255,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
                 aStr >>= str;
                 String valstr(str);
                 valstr.EraseTrailingChars();
-                OutMeta( rStrm, pIndent, name, valstr, FALSE,
+                OutMeta( rStrm, pIndent, name, valstr, sal_False,
                          eDestEnc, pNonConvertableChars );
             } catch (uno::Exception &) {
                 // may happen with concurrent modification...
@@ -276,7 +276,7 @@ void SfxFrameHTMLWriter::OutHeader( rtl_TextEncoding eDestEnc )
 
     Out_DocInfo( Strm(), &pDoc->GetDocInfo(), "\t", eDestEnc );
     Strm() << sNewLine;
-    HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_head, FALSE ) << sNewLine;
+    HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_head, sal_False ) << sNewLine;
 
 //! OutScript();            // Hier fehlen noch die Scripten im Header
 }
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 091651fedbc2..3493981e5a25 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -335,10 +335,10 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rF
 
     if ( pFiles )
     {
-        ULONG nCount = pFiles->Count();
+        sal_uIntPtr nCount = pFiles->Count();
         uno::Sequence < OUString > aRet( nCount );
         OUString* pRet = aRet.getArray();
-        for ( ULONG i = 0; i < nCount; ++i )
+        for ( sal_uIntPtr i = 0; i < nCount; ++i )
         {
             OUString* pFile = pFiles->GetObject(i);
             pRet[i] = *( pFile );
@@ -418,7 +418,7 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
             pProperties = new StringList_Impl;
             uno::Reference< sdbc::XRow > xRow( xResultSet, uno::UNO_QUERY );
             uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
-            ULONG nFolderPos = LIST_APPEND;
+            sal_uIntPtr nFolderPos = LIST_APPEND;
 
             try
             {
@@ -442,7 +442,7 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
                     aRow += '\t';
                     aRow += bFolder ? '1' : '0';
                     OUString* pRow = new OUString( aRow );
-                    ULONG nPos = LIST_APPEND;
+                    sal_uIntPtr nPos = LIST_APPEND;
                     if ( bFolder )
                     {
                         if ( LIST_APPEND == nFolderPos )
@@ -471,10 +471,10 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
 
     if ( pProperties )
     {
-        ULONG nCount = pProperties->Count();
+        sal_uIntPtr nCount = pProperties->Count();
         uno::Sequence < OUString > aRet( nCount );
         OUString* pRet = aRet.getArray();
-        for ( ULONG i = 0; i < nCount; ++i )
+        for ( sal_uIntPtr i = 0; i < nCount; ++i )
         {
             OUString* pProperty = pProperties->GetObject(i);
             pRet[i] = *( pProperty );
@@ -564,10 +564,10 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
 
     if ( pList )
     {
-        ULONG nCount = pList->Count();
+        sal_uIntPtr nCount = pList->Count();
         uno::Sequence < OUString > aRet( nCount );
         OUString* pRet = aRet.getArray();
-        for ( ULONG i = 0; i < nCount; ++i )
+        for ( sal_uIntPtr i = 0; i < nCount; ++i )
         {
             OUString* pEntry = pList->GetObject(i);
             pRet[i] = *( pEntry );
@@ -647,10 +647,10 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
 
     if ( pProperties )
     {
-        ULONG nCount = pProperties->Count();
+        sal_uIntPtr nCount = pProperties->Count();
         uno::Sequence < OUString > aRet( nCount );
         OUString* pRet = aRet.getArray();
-        for ( ULONG i = 0; i < nCount; ++i )
+        for ( sal_uIntPtr i = 0; i < nCount; ++i )
         {
             OUString* pProperty = pProperties->GetObject(i);
             pRet[i] = *( pProperty );
@@ -801,9 +801,9 @@ ErrCode SfxContentHelper::QueryDiskSpace( const String& rPath, sal_Int64& rFreeB
 
 // -----------------------------------------------------------------------
 
-ULONG SfxContentHelper::GetSize( const String& rContent )
+sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
 {
-    ULONG nSize = 0;
+    sal_uIntPtr nSize = 0;
     sal_Int64 nTemp = 0;
     INetURLObject aObj( rContent );
     DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
@@ -820,7 +820,7 @@ ULONG SfxContentHelper::GetSize( const String& rContent )
     {
         DBG_ERRORFILE( "Any other exception" );
     }
-    nSize = (UINT32)nTemp;
+    nSize = (sal_uInt32)nTemp;
     return nSize;
 }
 
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 4154ddc6301b..0b5315eab809 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -43,13 +43,13 @@ MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
 
 SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( pStrm )
         delete pStrm, pStrm = 0;
 
     ByteString sLine, sVersion;
-    ULONG nStt = 0, nEnd = 0;
-    USHORT nIndex = 0;
+    sal_uIntPtr nStt = 0, nEnd = 0;
+    sal_uInt16 nIndex = 0;
 
     rStream.Seek(STREAM_SEEK_TO_BEGIN);
     rStream.ResetError();
@@ -63,16 +63,16 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
             nIndex = 0;
             ByteString sTmp( sLine.GetToken( 0, ':', nIndex ) );
             if( sTmp == "StartHTML" )
-                nStt = (ULONG)(sLine.Erase( 0, nIndex ).ToInt32());
+                nStt = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
             else if( sTmp == "EndHTML" )
-                nEnd = (ULONG)(sLine.Erase( 0, nIndex ).ToInt32());
+                nEnd = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
             else if( sTmp == "SourceURL" )
                 sBaseURL = String(S2U(sLine.Erase( 0, nIndex )));
 
             if( nEnd && nStt &&
                 ( sBaseURL.Len() || rStream.Tell() >= nStt ))
             {
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             }
         }
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 978239239cea..9559de4069b0 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -35,13 +35,13 @@
 
 // -----------------------------------------------------------------------
 
-SfxPtrArr::SfxPtrArr( BYTE nInitSize, BYTE nGrowSize ):
+SfxPtrArr::SfxPtrArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nMSCBug > 0 )
         pData = new void*[nMSCBug];
@@ -106,7 +106,7 @@ void SfxPtrArr::Append( void* aElem )
     // musz das Array umkopiert werden?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         void** pNewData = new void*[nNewSize];
         if ( pData )
         {
@@ -114,7 +114,7 @@ void SfxPtrArr::Append( void* aElem )
             memmove( pNewData, pData, sizeof(void*)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -126,11 +126,11 @@ void SfxPtrArr::Append( void* aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 SfxPtrArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // einfache Aufgaben erfordern einfache Loesungen!
     if ( nLen == 0 )
@@ -150,8 +150,8 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // auf die naechste Grow-Grenze aufgerundet verkleinern
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         void** pNewData = new void*[nNewSize];
@@ -166,7 +166,7 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
         delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -174,71 +174,71 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(void*) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Remove( void* aElem )
+sal_Bool SfxPtrArr::Remove( void* aElem )
 {
     DBG_MEMTEST();
     // einfache Aufgaben ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // rueckwaerts, da meist der letzte zuerst wieder entfernt wird
     void* *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
+sal_Bool SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
 {
     DBG_MEMTEST();
     // einfache Aufgaben ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // rueckwaerts, da meist der letzte zuerst wieder entfernt wird
     void* *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aOldElem )
         {
             pData[nUsed-n-1] = aNewElem;
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Contains( const void* rItem ) const
+sal_Bool SfxPtrArr::Contains( const void* rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         void* p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void SfxPtrArr::Insert( USHORT nPos, void* rElem )
+void SfxPtrArr::Insert( sal_uInt16 nPos, void* rElem )
 {
     DBG_MEMTEST();
     DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
@@ -246,7 +246,7 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
     if ( nUnused == 0 )
     {
         // auf die naechste Grow-Grenze aufgerundet vergroeszern
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         void** pNewData = new void*[nNewSize];
 
         if ( pData )
@@ -255,7 +255,7 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
             memmove( pNewData, pData, sizeof(void*)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -271,13 +271,13 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
 
 // class ByteArr ---------------------------------------------------------
 
-ByteArr::ByteArr( BYTE nInitSize, BYTE nGrowSize ):
+ByteArr::ByteArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nInitSize > 0 )
         pData = new char[nMSCBug];
@@ -341,7 +341,7 @@ void ByteArr::Append( char aElem )
     // musz das Array umkopiert werden?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         char* pNewData = new char[nNewSize];
         if ( pData )
         {
@@ -349,7 +349,7 @@ void ByteArr::Append( char aElem )
             memmove( pNewData, pData, sizeof(char)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -361,11 +361,11 @@ void ByteArr::Append( char aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 ByteArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // einfache Aufgaben erfordern einfache Loesungen!
     if ( nLen == 0 )
@@ -385,8 +385,8 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // auf die naechste Grow-Grenze aufgerundet verkleinern
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         char* pNewData = new char[nNewSize];
@@ -401,7 +401,7 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
         delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -409,58 +409,58 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(char) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ByteArr::Remove( char aElem )
+sal_Bool ByteArr::Remove( char aElem )
 {
     DBG_MEMTEST();
     // einfache Aufgaben ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // rueckwaerts, da meist der letzte zuerst wieder entfernt wird
     char *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ByteArr::Contains( const char rItem ) const
+sal_Bool ByteArr::Contains( const char rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         char p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void ByteArr::Insert( USHORT nPos, char rElem )
+void ByteArr::Insert( sal_uInt16 nPos, char rElem )
 {
     DBG_MEMTEST();
     // musz das Array umkopiert werden?
     if ( nUnused == 0 )
     {
         // auf die naechste Grow-Grenze aufgerundet vergroeszern
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         char* pNewData = new char[nNewSize];
 
         if ( pData )
@@ -469,7 +469,7 @@ void ByteArr::Insert( USHORT nPos, char rElem )
             memmove( pNewData, pData, sizeof(char)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -485,7 +485,7 @@ void ByteArr::Insert( USHORT nPos, char rElem )
 
 // -----------------------------------------------------------------------
 
-char ByteArr::operator[]( USHORT nPos ) const
+char ByteArr::operator[]( sal_uInt16 nPos ) const
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -494,7 +494,7 @@ char ByteArr::operator[]( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-char& ByteArr::operator [] (USHORT nPos)
+char& ByteArr::operator [] (sal_uInt16 nPos)
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -503,13 +503,13 @@ char& ByteArr::operator [] (USHORT nPos)
 
 // class WordArr ---------------------------------------------------------
 
-WordArr::WordArr( BYTE nInitSize, BYTE nGrowSize ):
+WordArr::WordArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nInitSize > 0 )
         pData = new short[nMSCBug];
@@ -573,7 +573,7 @@ void WordArr::Append( short aElem )
     // musz das Array umkopiert werden?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         short* pNewData = new short[nNewSize];
         if ( pData )
         {
@@ -581,7 +581,7 @@ void WordArr::Append( short aElem )
             memmove( pNewData, pData, sizeof(short)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -593,11 +593,11 @@ void WordArr::Append( short aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 WordArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // einfache Aufgaben erfordern einfache Loesungen!
     if ( nLen == 0 )
@@ -617,8 +617,8 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // auf die naechste Grow-Grenze aufgerundet verkleinern
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         short* pNewData = new short[nNewSize];
@@ -633,7 +633,7 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
             delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -641,58 +641,58 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(short) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL WordArr::Remove( short aElem )
+sal_Bool WordArr::Remove( short aElem )
 {
     DBG_MEMTEST();
     // einfache Aufgaben ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // rueckwaerts, da meist der letzte zuerst wieder entfernt wird
     short *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL WordArr::Contains( const short rItem ) const
+sal_Bool WordArr::Contains( const short rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         short p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void WordArr::Insert( USHORT nPos, short rElem )
+void WordArr::Insert( sal_uInt16 nPos, short rElem )
 {
     DBG_MEMTEST();
     // musz das Array umkopiert werden?
     if ( nUnused == 0 )
     {
         // auf die naechste Grow-Grenze aufgerundet vergroeszern
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         short* pNewData = new short[nNewSize];
 
         if ( pData )
@@ -701,7 +701,7 @@ void WordArr::Insert( USHORT nPos, short rElem )
             memmove( pNewData, pData, sizeof(short)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -717,7 +717,7 @@ void WordArr::Insert( USHORT nPos, short rElem )
 
 // -----------------------------------------------------------------------
 
-short WordArr::operator[]( USHORT nPos ) const
+short WordArr::operator[]( sal_uInt16 nPos ) const
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -726,7 +726,7 @@ short WordArr::operator[]( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-short& WordArr::operator [] (USHORT nPos)
+short& WordArr::operator [] (sal_uInt16 nPos)
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx
index 49938c729b36..ae3b0807bbe4 100644
--- a/sfx2/source/bastyp/misc.cxx
+++ b/sfx2/source/bastyp/misc.cxx
@@ -46,7 +46,7 @@ String SearchAndReplace( const String &rSource,
                          const String &rReplacement )
 {
     String aTarget( rSource );
-    USHORT nPos = rSource.Search( rToReplace );
+    sal_uInt16 nPos = rSource.Search( rToReplace );
     if ( nPos != STRING_NOTFOUND )
     {
         aTarget.Erase( nPos, rToReplace.Len() );
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 9650c8155d84..3c4c78e9d630 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -81,14 +81,14 @@ struct SfxProgress_Impl
 {
     Reference < XStatusIndicator > xStatusInd;
     String                  aText, aStateText;
-    ULONG                   nMax;
+    sal_uIntPtr                 nMax;
     clock_t                 nCreate;
     clock_t                 nNextReschedule;
-    BOOL                    bLocked, bAllDocs;
-    BOOL                    bWaitMode;
-    BOOL                    bAllowRescheduling;
-    BOOL                    bRunning;
-    BOOL                    bIsStatusText;
+    sal_Bool                    bLocked, bAllDocs;
+    sal_Bool                    bWaitMode;
+    sal_Bool                    bAllowRescheduling;
+    sal_Bool                    bRunning;
+    sal_Bool                    bIsStatusText;
 
     SfxProgress*            pActiveProgress;
     SfxObjectShellRef       xObjSh;
@@ -96,7 +96,7 @@ struct SfxProgress_Impl
     SfxViewFrame*           pView;
 
                             SfxProgress_Impl( const String& );
-    void                    Enable_Impl( BOOL );
+    void                    Enable_Impl( sal_Bool );
 
 };
 
@@ -114,11 +114,11 @@ struct SfxProgress_Impl
 #define aTypeLibInfo aProgressTypeLibImpl
 
 //========================================================================
-extern ULONG Get10ThSec();
+extern sal_uIntPtr Get10ThSec();
 
 // -----------------------------------------------------------------------
 
-void SfxProgress_Impl::Enable_Impl( BOOL bEnable )
+void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
 {
     SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
     SfxViewFrame *pFrame= SfxViewFrame::GetFirst(pDoc);
@@ -157,11 +157,11 @@ SfxProgress::SfxProgress
     const String&   rText,  /* Text, der in der Statuszeile vor den Statusmonitor
                                erscheint */
 
-    ULONG           nRange, /* Maximalwert des Bereiches */
+    sal_uIntPtr         nRange, /* Maximalwert des Bereiches */
 
-    BOOL            bAll    /* alle Dokumente oder nur das Dokument des ViewFrames
-                               disablen (FALSE) */
-    ,BOOL           bWait   /* initial den Wait-Pointer aktivieren (TRUE) */
+    sal_Bool            bAll    /* alle Dokumente oder nur das Dokument des ViewFrames
+                               disablen (sal_False) */
+    ,sal_Bool           bWait   /* initial den Wait-Pointer aktivieren (sal_True) */
 )
 
 /*  [Beschreibung]
@@ -176,17 +176,17 @@ SfxProgress::SfxProgress
 
 :   pImp( new SfxProgress_Impl( rText ) ),
     nVal(0),
-    bSuspended(TRUE)
+    bSuspended(sal_True)
 {
-    pImp->bRunning = TRUE;
+    pImp->bRunning = sal_True;
     pImp->bAllowRescheduling = Application::IsInExecute();;
 
     pImp->xObjSh = pObjSh;
     pImp->aText = rText;
     pImp->nMax = nRange;
-    pImp->bLocked = FALSE;
+    pImp->bLocked = sal_False;
     pImp->bWaitMode = bWait;
-    pImp->bIsStatusText = FALSE;
+    pImp->bIsStatusText = sal_False;
     pImp->nCreate = Get10ThSec();
     pImp->nNextReschedule = pImp->nCreate;
     DBG( DbgOutf( "SfxProgress: created for '%s' at %luds",
@@ -219,7 +219,7 @@ SfxProgress::~SfxProgress()
     if ( pImp->xStatusInd.is() )
         pImp->xStatusInd->end();
 
-    if( pImp->bIsStatusText == TRUE )
+    if( pImp->bIsStatusText == sal_True )
         GetpApp()->HideStatusText( );
     delete pImp;
 }
@@ -243,7 +243,7 @@ void SfxProgress::Stop()
 
     if ( !pImp->bRunning )
         return;
-    pImp->bRunning = FALSE;
+    pImp->bRunning = sal_False;
     DBG( DbgOutf( "SfxProgress: destroyed at %luds", Get10ThSec() ) );
 
     Suspend();
@@ -252,7 +252,7 @@ void SfxProgress::Stop()
     else
         SFX_APP()->SetProgress_Impl(0);
     if ( pImp->bLocked )
-        pImp->Enable_Impl(TRUE);
+        pImp->Enable_Impl(sal_True);
 }
 
 // -----------------------------------------------------------------------
@@ -299,7 +299,7 @@ IMPL_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus*, pStatus )
     {
         GetpApp()->ShowStatusText( aString );
         if( pThis )
-            pThis->pImp->bIsStatusText = TRUE;
+            pThis->pImp->bIsStatusText = sal_True;
     }
     return 0;
 }
@@ -308,7 +308,7 @@ IMPL_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus*, pStatus )
 // -----------------------------------------------------------------------
 
 // muss in AppDaten
-static ULONG nLastTime = 0;
+static sal_uIntPtr nLastTime = 0;
 
 long TimeOut_Impl( void*, void* pArgV )
 {
@@ -325,11 +325,11 @@ long TimeOut_Impl( void*, void* pArgV )
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::SetStateText
+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 */
 )
 
 {
@@ -339,11 +339,11 @@ BOOL SfxProgress::SetStateText
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::SetState
+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]
 
@@ -353,7 +353,7 @@ BOOL SfxProgress::SetState
 
     [R"uckgabewert]
 
-    BOOL                TRUE
+    sal_Bool                TRUE
                         Fortfahren mit der Aktion
 
                         FALSE
@@ -363,12 +363,12 @@ BOOL SfxProgress::SetState
 {
     // wurde via Stop-Button angehalten?
 //  if ( pImp->IsCancelled() )
-//      return FALSE;
+//      return sal_False;
 
-    if( pImp->pActiveProgress ) return TRUE;
+    if( pImp->pActiveProgress ) return sal_True;
 
     // neuen Wert "ubernehmen
-    BOOL bOver=FALSE;
+    sal_Bool bOver=sal_False;
     nVal = nNewVal;
 
     // neuer Range?
@@ -377,7 +377,7 @@ BOOL SfxProgress::SetState
         DBG( DbgOutf( "SfxProgress: range changed from %lu to %lu",
                       pImp->nMax, nNewRange ) );
         pImp->nMax = nNewRange;
-        bOver = TRUE;
+        bOver = sal_True;
     }
 
     if ( !pImp->xStatusInd.is() )
@@ -397,7 +397,7 @@ BOOL SfxProgress::SetState
             {
                 // don't show status indicator for hidden documents (only valid while loading)
                 SfxMedium* pMedium = pObjSh->GetMedium();
-                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, FALSE );
+                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False );
                 if ( !pHiddenItem || !pHiddenItem->GetValue() )
                 {
                     // not in a view, perhaps it's just loading
@@ -409,7 +409,7 @@ BOOL SfxProgress::SetState
                     //}
                     //else
                     {
-                        SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, FALSE );
+                        SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False );
                         Reference< XStatusIndicator > xInd;
                         if ( pIndicatorItem && (pIndicatorItem->GetValue()>>=xInd) )
                             pImp->xStatusInd = xInd;
@@ -436,7 +436,7 @@ BOOL SfxProgress::SetState
         pImp->xStatusInd->setValue( nNewVal );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -480,7 +480,7 @@ void SfxProgress::Resume()
                 pFrame->GetBindings().ENTERREGISTRATIONS();
         }
 
-        bSuspended = FALSE;
+        bSuspended = sal_False;
     }
 }
 
@@ -501,7 +501,7 @@ void SfxProgress::Suspend()
     if ( !bSuspended )
     {
         DBG( DbgOutf( "SfxProgress: suspended" ) );
-        bSuspended = TRUE;
+        bSuspended = sal_True;
 
         if ( pImp->xStatusInd.is() )
         {
@@ -543,7 +543,7 @@ void SfxProgress::Lock()
                  ( eMode == SFX_CREATE_MODE_PREVIEW ) )
             {
                 DBG( DbgOutf( "SfxProgress: not locked because EMBEDDED/PREVIEW found" ) );
-                pImp->bAllowRescheduling = FALSE;
+                pImp->bAllowRescheduling = sal_False;
             }
         }
     }
@@ -554,14 +554,14 @@ void SfxProgress::Lock()
              ( eMode == SFX_CREATE_MODE_PREVIEW ) )
         {
             DBG( DbgOutf( "SfxProgress: not locked because ObjectShell is EMBEDDED/PREVIEW" ) );
-            pImp->bAllowRescheduling = FALSE;
+            pImp->bAllowRescheduling = sal_False;
         }
     }
 
-    pImp->Enable_Impl( FALSE );
+    pImp->Enable_Impl( sal_False );
 
     DBG( DbgOutf( "SfxProgress: locked" ) );
-    pImp->bLocked = TRUE;
+    pImp->bLocked = sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -573,8 +573,8 @@ void SfxProgress::UnLock()
         return;
 
     DBG( DbgOutf( "SfxProgress: unlocked" ) );
-    pImp->bLocked = FALSE;
-    pImp->Enable_Impl(TRUE);
+    pImp->bLocked = sal_False;
+    pImp->Enable_Impl(sal_True);
 }
 
 // -----------------------------------------------------------------------
@@ -608,7 +608,7 @@ void SfxProgress::Reschedule()
 
 void SfxProgress::SetWaitMode
 (
-    BOOL    bWait       /*  TRUE
+    sal_Bool    bWait       /*  TRUE
                             Wartecursor wird verwendet
 
                             FALSE
@@ -654,7 +654,7 @@ void SfxProgress::SetWaitMode
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::GetWaitMode() const
+sal_Bool SfxProgress::GetWaitMode() const
 
 /*  [Beschreibung]
 
@@ -748,6 +748,6 @@ FASTBOOL SfxProgress::StatusBarManagerGone_Impl
 */
 
 {
-    return TRUE;
+    return sal_True;
 }
 
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 8a4b434f460b..7d86043308ce 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -73,7 +73,7 @@ static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] =
     { 0,                    0                   }
 };
 
-SfxHTMLParser::SfxHTMLParser( SvStream& rStream, BOOL bIsNewDoc,
+SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc,
                               SfxMedium *pMed ) :
     HTMLParser( rStream, bIsNewDoc ),
     pMedium( pMed ), pDLMedium( 0 ),
@@ -89,7 +89,7 @@ SfxHTMLParser::SfxHTMLParser( SvStream& rStream, BOOL bIsNewDoc,
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
 
     // If the file starts with a BOM, switch to UCS2.
-    SetSwitchToUCS2( TRUE );
+    SetSwitchToUCS2( sal_True );
 }
 
 __EXPORT SfxHTMLParser::~SfxHTMLParser()
@@ -98,7 +98,7 @@ __EXPORT SfxHTMLParser::~SfxHTMLParser()
     delete pDLMedium;
 }
 
-BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
+sal_Bool SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
                                     const HTMLOptions * pOptions)
 {
     DBG_ASSERT( pImageMap, "ParseMapOptions: keine Image-Map" );
@@ -106,7 +106,7 @@ BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
 
     String aName;
 
-    for( USHORT i=pOptions->Count(); i; )
+    for( sal_uInt16 i=pOptions->Count(); i; )
     {
         const HTMLOption *pOption = (*pOptions)[--i];
         switch( pOption->GetToken() )
@@ -123,23 +123,23 @@ BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
     return aName.Len() > 0;
 }
 
-BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
                                      const HTMLOptions * pOptions,
-                                     USHORT nEventMouseOver,
-                                     USHORT nEventMouseOut )
+                                     sal_uInt16 nEventMouseOver,
+                                     sal_uInt16 nEventMouseOut )
 {
     DBG_ASSERT( pImageMap, "ParseAreaOptions: keine Image-Map" );
     DBG_ASSERT( pOptions, "ParseAreaOptions: keine Optionen" );
 
-    USHORT nShape = IMAP_OBJ_RECTANGLE;
+    sal_uInt16 nShape = IMAP_OBJ_RECTANGLE;
     SvULongs aCoords;
     String aName, aHRef, aAlt, aTarget, sEmpty;
-    BOOL bNoHRef = FALSE;
+    sal_Bool bNoHRef = sal_False;
     SvxMacroTableDtor aMacroTbl;
 
-    for( USHORT i=pOptions->Count(); i; )
+    for( sal_uInt16 i=pOptions->Count(); i; )
     {
-        USHORT nEvent = 0;
+        sal_uInt16 nEvent = 0;
         ScriptType eScrpType = STARBASIC;
         const HTMLOption *pOption = (*pOptions)[--i];
         switch( pOption->GetToken() )
@@ -151,13 +151,13 @@ BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseUR
             pOption->GetEnum( nShape, aAreaShapeOptEnums );
             break;
         case HTML_O_COORDS:
-            pOption->GetNumbers( aCoords, TRUE );
+            pOption->GetNumbers( aCoords, sal_True );
             break;
         case HTML_O_HREF:
             aHRef = INetURLObject::GetAbsURL( rBaseURL, pOption->GetString() );
             break;
         case HTML_O_NOHREF:
-            bNoHRef = TRUE;
+            bNoHRef = sal_True;
             break;
         case HTML_O_ALT:
             aAlt = pOption->GetString();
@@ -195,7 +195,7 @@ IMAPOBJ_SETEVENT:
     if( bNoHRef )
         aHRef.Erase();
 
-    BOOL bNewArea = TRUE;
+    sal_Bool bNewArea = sal_True;
     switch( nShape )
     {
     case IMAP_OBJ_RECTANGLE:
@@ -224,9 +224,9 @@ IMAPOBJ_SETEVENT:
     case IMAP_OBJ_POLYGON:
         if( aCoords.Count() >=6 )
         {
-            USHORT nCount = aCoords.Count() / 2;
+            sal_uInt16 nCount = aCoords.Count() / 2;
             Polygon aPoly( nCount );
-            for( USHORT i=0; i<nCount; i++ )
+            for( sal_uInt16 i=0; i<nCount; i++ )
                 aPoly[i] = Point( aCoords[2*i], aCoords[2*i+1] );
             IMapPolygonObject aMapPObj( aPoly, aHRef, aAlt, String(), aTarget, aName,
                                         !bNoHRef );
@@ -236,7 +236,7 @@ IMAPOBJ_SETEVENT:
         }
         break;
     default:
-        bNewArea = FALSE;
+        bNewArea = sal_False;
     }
 
     return bNewArea;
@@ -250,7 +250,7 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     if( pDLMedium )
         return;
 
-    pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY, FALSE );
+    pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY, sal_False );
     if( pSh )
     {
         // Medium registrieren, damit abgebrochen werden kann
@@ -264,13 +264,13 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     }
 
     // Download anstossen (Achtung: Kann auch synchron sein).
-    if ( TRUE /*pMedium->GetDoneLink() == Link()*/ )
+    if ( sal_True /*pMedium->GetDoneLink() == Link()*/ )
         pDLMedium->DownLoad();
     else
     {
-        // Downloading-Flag auf TRUE setzen. Es werden dann auch
+        // Downloading-Flag auf sal_True setzen. Es werden dann auch
         // Data-Available-Links, wenn wir in den Pending-Staus gelangen.
-        SetDownloadingFile( TRUE );
+        SetDownloadingFile( sal_True );
         pDLMedium->DownLoad( STATIC_LINK( this, SfxHTMLParser, FileDownloadDone ) );
 
         // Wenn das Dowsnloading-Flag noch gesetzt ist erfolgt der Download
@@ -287,17 +287,17 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     }
 }
 
-BOOL SfxHTMLParser::GetFileDownloadMIME( String& rMIME )
+sal_Bool SfxHTMLParser::GetFileDownloadMIME( String& rMIME )
 {
     return pDLMedium && pDLMedium->GetErrorCode()==0 &&
            pDLMedium->GetMIMEAndRedirect(rMIME)==0;
 }
 
-BOOL SfxHTMLParser::FinishFileDownload( String& rStr )
+sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr )
 {
     String aStr;
 
-    BOOL bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
+    sal_Bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
     if( bOK )
     {
         SvStream* pStream = pDLMedium->GetInStream();
@@ -342,7 +342,7 @@ IMPL_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void*, EMPTYARG )
 {
     // Der Download ist jetzt abgeschlossen. Ausserdem muss/darf der
     // Data-Available-Link wieder durchgelassen werden.
-    pThis->SetDownloadingFile( FALSE );
+    pThis->SetDownloadingFile( sal_False );
 
     // ... und einmal aufrufen, damit weitergelesen wird.
     pThis->CallAsyncCallLink();
@@ -357,7 +357,7 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader )
     if( pHTTPHeader )
     {
         SvKeyValue aKV;
-        for( BOOL bCont = pHTTPHeader->GetFirst( aKV ); bCont;
+        for( sal_Bool bCont = pHTTPHeader->GetFirst( aKV ); bCont;
              bCont = pHTTPHeader->GetNext( aKV ) )
         {
             if( aKV.GetKey().EqualsIgnoreCaseAscii(
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index cf1cd983f76e..0ed0aab649cf 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -39,7 +39,7 @@
 
 static ResMgr* pMgr=NULL;
 
-SfxResId::SfxResId( USHORT nId ) :
+SfxResId::SfxResId( sal_uInt16 nId ) :
 
     ResId( nId, *GetResMgr() )
 {
@@ -51,7 +51,7 @@ SfxResId::SfxResId( USHORT nId ) :
 //
 //============================================================================
 
-SfxSimpleResId::SfxSimpleResId(USHORT nID):
+SfxSimpleResId::SfxSimpleResId(sal_uInt16 nID):
     m_sText( SFX_APP()->GetSimpleResManager()->ReadString(nID) )
 {}
 
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 2ab7b1c9602b..59d3107532a4 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -66,7 +66,7 @@ using namespace com::sun::star;
 SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& rTbl )
 {
     DelDtor();
-    for (USHORT n=0; n<rTbl.Count(); n++ )
+    for (sal_uInt16 n=0; n<rTbl.Count(); n++ )
     {
         SfxEventName* pTmp = ((SfxEventNamesList&)rTbl).GetObject(n);
         SfxEventName *pNew = new SfxEventName( *pTmp );
@@ -94,19 +94,19 @@ int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
     const SfxEventNamesList& rOther = ( (SfxEventNamesItem&) rAttr ).aEventsList;
 
     if ( rOwn.Count() != rOther.Count() )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT nNo = 0; nNo < rOwn.Count(); ++nNo )
+    for ( sal_uInt16 nNo = 0; nNo < rOwn.Count(); ++nNo )
     {
         const SfxEventName *pOwn = rOwn.GetObject(nNo);
         const SfxEventName *pOther = rOther.GetObject(nNo);
         if (    pOwn->mnId != pOther->mnId ||
                 pOwn->maEventName != pOther->maEventName ||
                 pOwn->maUIName != pOther->maUIName )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 
 }
 
@@ -125,25 +125,25 @@ SfxPoolItem* SfxEventNamesItem::Clone( SfxItemPool *) const
     return new SfxEventNamesItem(*this);
 }
 
-SfxPoolItem* SfxEventNamesItem::Create(SvStream &, USHORT) const
+SfxPoolItem* SfxEventNamesItem::Create(SvStream &, sal_uInt16) const
 {
     DBG_ERROR("not streamable!");
     return new SfxEventNamesItem(Which());
 }
 
-SvStream& SfxEventNamesItem::Store(SvStream &rStream, USHORT ) const
+SvStream& SfxEventNamesItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
     DBG_ERROR("not streamable!");
     return rStream;
 }
 
-USHORT SfxEventNamesItem::GetVersion( USHORT ) const
+sal_uInt16 SfxEventNamesItem::GetVersion( sal_uInt16 ) const
 {
     DBG_ERROR("not streamable!");
     return 0;
 }
 
-void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, USHORT nID )
+void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, sal_uInt16 nID )
 {
     aEventsList.Insert( new SfxEventName( nID, rName, rUIName.Len() ? rUIName : rName ) );
 }
@@ -287,7 +287,7 @@ void SfxEventConfiguration::ConfigureEvent( rtl::OUString aName, const SvxMacro&
 }
 
 // -------------------------------------------------------------------------------------------------------
-SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, BOOL bBlowUp )
+SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp )
 {
     return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp );
 }
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index cf04de2cb3a4..d8e4258e60d4 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -91,7 +91,7 @@ DBG_NAME(SfxBindingsInvalidateAll)
 
 //====================================================================
 
-static USHORT nTimeOut = 300;
+static sal_uInt16 nTimeOut = 300;
 
 #define TIMEOUT_FIRST       nTimeOut
 #define TIMEOUT_UPDATING     20
@@ -100,7 +100,7 @@ static USHORT nTimeOut = 300;
 static sal_uInt32 nCache1 = 0;
 static sal_uInt32 nCache2 = 0;
 
-typedef std::hash_map< USHORT, bool > InvalidateSlotMap;
+typedef std::hash_map< sal_uInt16, bool > InvalidateSlotMap;
 
 //====================================================================
 
@@ -399,7 +399,7 @@ void SfxBindings::Update_Impl
 {
     if( pCache->GetDispatch().is() && pCache->GetItemLink() )
     {
-        pCache->SetCachedState(TRUE);
+        pCache->SetCachedState(sal_True);
         if ( !pCache->GetInternalController() )
             return;
     }
@@ -467,7 +467,7 @@ void SfxBindings::InvalidateSlotsInMap_Impl()
 
 //--------------------------------------------------------------------
 
-void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( USHORT nId )
+void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId )
 {
     pImp->m_aInvalidateSlots[nId] = sal_True;
 }
@@ -504,10 +504,10 @@ void SfxBindings::Update
 
         if (pCache)
         {
-            BOOL bInternalUpdate = TRUE;
+            sal_Bool bInternalUpdate = sal_True;
             if( pCache->GetDispatch().is() && pCache->GetItemLink() )
             {
-                pCache->SetCachedState(TRUE);
+                pCache->SetCachedState(sal_True);
                 bInternalUpdate = ( pCache->GetInternalController() != 0 );
             }
 
@@ -1027,16 +1027,16 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
 //--------------------------------------------------------------------
 void SfxBindings::RegisterInternal_Impl( SfxControllerItem& rItem )
 {
-    Register_Impl( rItem, TRUE );
+    Register_Impl( rItem, sal_True );
 
 }
 
 void SfxBindings::Register( SfxControllerItem& rItem )
 {
-    Register_Impl( rItem, FALSE );
+    Register_Impl( rItem, sal_False );
 }
 
-void SfxBindings::Register_Impl( SfxControllerItem& rItem, BOOL bInternal )
+void SfxBindings::Register_Impl( SfxControllerItem& rItem, sal_Bool bInternal )
 {
     DBG_MEMTEST();
     DBG_ASSERT( nRegLevel > 0, "registration without EnterRegistrations" );
@@ -1150,14 +1150,14 @@ sal_Bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_
     return ( pRet != 0 );
 }
 
-void SfxBindings::ExecuteGlobal_Impl( USHORT nId )
+void SfxBindings::ExecuteGlobal_Impl( sal_uInt16 nId )
 {
     if( nId && pDispatcher )
-        Execute_Impl( nId, NULL, 0, SFX_CALLMODE_ASYNCHRON, NULL, TRUE );
+        Execute_Impl( nId, NULL, 0, SFX_CALLMODE_ASYNCHRON, NULL, sal_True );
 }
 
 const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode,
-                        const SfxPoolItem **ppInternalArgs, BOOL bGlobalOnly )
+                        const SfxPoolItem **ppInternalArgs, sal_Bool bGlobalOnly )
 {
     SfxStateCache *pCache = GetStateCache( nId );
     if ( !pCache )
@@ -1377,10 +1377,10 @@ void SfxBindings::UpdateSlotServer_Impl()
                 ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
             //if ( xFrame.is() )
             //    xFrame->contextChanged();
-            pImp->bContextChanged = FALSE;
+            pImp->bContextChanged = sal_False;
         }
         else
-            pImp->bContextChanged = TRUE;
+            pImp->bContextChanged = sal_True;
     }
 
     const sal_uInt16 nCount = pImp->pCaches->Count();
@@ -1466,7 +1466,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
         pRealSlot->GetSlotId(), pRealSlot->GetWhich(rPool), pRealSlot, pCache );
     rFound.Insert( pFound );
 
-    USHORT nSlot = pRealSlot->GetSlotId();
+    sal_uInt16 nSlot = pRealSlot->GetSlotId();
     if ( !(nSlot >= SID_VERB_START && nSlot <= SID_VERB_END) )
     {
         pInterface = pInterface->GetRealInterfaceForSlot( pRealSlot );
@@ -1496,10 +1496,10 @@ SfxItemSet* SfxBindings::CreateSet_Impl
         }
 
         // Mu\s der Slot "uberhaupt upgedatet werden ?
-        FASTBOOL bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
+        bool bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
 
         // Bugfix #26161#: Es reicht nicht, nach der selben Shell zu fragen !!
-        FASTBOOL bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
+        bool bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
 
         // Wenn der Slot ein nicht-dirty MasterSlot ist, dann ist vielleicht
         // einer seiner Slaves dirty ? Dann wird der Masterslot doch eingef"ugt.
@@ -1543,7 +1543,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
     // aus den Ranges ein Set erzeugen
     sal_uInt16 *pRanges = new sal_uInt16[rFound.Count() * 2 + 1];
     int j = 0;
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while ( i < rFound.Count() )
     {
         pRanges[j++] = rFound[i]->nWhichId;
@@ -1729,7 +1729,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
     pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
 
     // at least 10 loops and further if more jobs are available but no input
-    FASTBOOL bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
+    bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
     sal_uInt16 nLoops = 10;
     pImp->bInNextJob = sal_True;
     const sal_uInt16 nCount = pImp->pCaches->Count();
@@ -1913,7 +1913,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
     {
         if ( pImp->bContextChanged )
         {
-            pImp->bContextChanged = FALSE;
+            pImp->bContextChanged = sal_False;
             /*
             ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
                 ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
@@ -2125,12 +2125,12 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState )
 
             if ( !pDisp )
             {
-                BOOL bDeleteCache = FALSE;
+                sal_Bool bDeleteCache = sal_False;
                 if ( !pCache )
                 {
                     pCache = new SfxStateCache( nSlot );
                     pCache->GetSlotServer( *GetDispatcher_Impl(), pImp->xProv );
-                    bDeleteCache = TRUE;
+                    bDeleteCache = sal_True;
                 }
 
                 SfxItemState eState = SFX_ITEM_SET;
@@ -2346,7 +2346,7 @@ SystemWindow* SfxBindings::GetSystemWindow() const
     return pTop->GetFrame().GetTopWindow_Impl();
 }
 
-BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
+sal_Bool SfxBindings::ExecuteCommand_Impl( const String& rCommand )
 {
     ::com::sun::star::util::URL aURL;
     aURL.Complete = rCommand;
@@ -2375,10 +2375,10 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
             ::comphelper::UiEventsLogger::logDispatch(aURL, source);
         }
         new SfxAsyncExec_Impl( aURL, xDisp );
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxBindings::GetRecorder() const
@@ -2395,7 +2395,7 @@ void SfxBindings::ContextChanged_Impl()
 {
     if ( !pImp->bInUpdate && ( !pImp->bContextChanged || !pImp->bAllMsgDirty ) )
     {
-        InvalidateAll( TRUE );
+        InvalidateAll( sal_True );
     }
 }
 
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 9376b81fa0ff..e90b680ffa13 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -45,7 +45,7 @@ DBG_NAME(SfxControllerItem);
 //--------------------------------------------------------------------
 #ifdef DBG_UTIL
 
-void SfxControllerItem::CheckConfigure_Impl( ULONG nType )
+void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType )
 {
     // echter Slot? (also kein Separator etc.)
     if ( !nId )
@@ -77,9 +77,9 @@ SfxControllerItem* SfxControllerItem::GetItemLink()
 
 //--------------------------------------------------------------------
 
-// returns TRUE if this binding is really bound to a function
+// returns sal_True if this binding is really bound to a function
 
-BOOL SfxControllerItem::IsBound() const
+sal_Bool SfxControllerItem::IsBound() const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
@@ -90,13 +90,13 @@ BOOL SfxControllerItem::IsBound() const
 
 // returns the associated function-id or 0 if none
 
-// USHORT SfxControllerItem::GetId() const;
+// sal_uInt16 SfxControllerItem::GetId() const;
 
 //====================================================================
 
 // registeres with the id at the bindings
 
-void SfxControllerItem::Bind( USHORT nNewId, SfxBindings *pBindinx )
+void SfxControllerItem::Bind( sal_uInt16 nNewId, SfxBindings *pBindinx )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
@@ -115,7 +115,7 @@ void SfxControllerItem::Bind( USHORT nNewId, SfxBindings *pBindinx )
     pBindings->Register(*this);
 }
 
-void SfxControllerItem::BindInternal_Impl( USHORT nNewId, SfxBindings *pBindinx )
+void SfxControllerItem::BindInternal_Impl( sal_uInt16 nNewId, SfxBindings *pBindinx )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
@@ -261,7 +261,7 @@ SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLin
 
 // changes the id of unbound functions (e.g. for sub-menu-ids)
 
-void SfxControllerItem::SetId( USHORT nItemId )
+void SfxControllerItem::SetId( sal_uInt16 nItemId )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
@@ -286,7 +286,7 @@ SfxControllerItem::SfxControllerItem():
 
 // creates a representation of the function nId and registeres it
 
-SfxControllerItem::SfxControllerItem( USHORT nID, SfxBindings &rBindings ):
+SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ):
     nId(nID),
     pNext(this),
     pBindings(&rBindings)
@@ -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()
 )
@@ -364,7 +364,7 @@ void SfxStatusForwarder::StateChanged
 //--------------------------------------------------------------------
 
 SfxStatusForwarder::SfxStatusForwarder(
-            USHORT              nSlotId,
+            sal_uInt16              nSlotId,
             SfxControllerItem&  rMaster ):
     SfxControllerItem( nSlotId, rMaster.GetBindings() ),
     pMaster( &rMaster )
@@ -448,7 +448,7 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const
         {
             SfxShell *pSh = pDispat->GetShell( pServer->GetShellLevel() );
             SfxItemPool &rPool = pSh->GetPool();
-            USHORT nWhich = rPool.GetWhich( nId );
+            sal_uInt16 nWhich = rPool.GetWhich( nId );
             return rPool.GetMetric( nWhich );
         }
     }
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index ddf3422744cb..9b403e3ddab4 100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -796,11 +796,11 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
         SfxBindings *pBind = GetBindings();
         while ( pBind )
         {
-            pBind->HidePopupCtrls_Impl( FALSE );
+            pBind->HidePopupCtrls_Impl( sal_False );
             pBind = pBind->GetSubBindings_Impl();
         }
 
-        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( FALSE, FALSE, 1 );
+        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( sal_False, sal_False, 1 );
     }
 
     if ( pImp->aToDoStack.Count() )
@@ -882,7 +882,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
     for ( sal_uInt16 i = 0; i < pImp->aStack.Count(); ++i )
         pImp->aStack.Top(i)->DoDeactivate_Impl(pImp->pFrame, bMDI);
 
-    BOOL bHidePopups = bMDI && pImp->pFrame;
+    sal_Bool bHidePopups = bMDI && pImp->pFrame;
     if ( pNew && pImp->pFrame )
     {
         com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xOldFrame(
@@ -892,7 +892,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
             GetFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
 
         if ( xOldFrame == xMyFrame )
-            bHidePopups = FALSE;
+            bHidePopups = sal_False;
     }
 
     if ( bHidePopups )
@@ -901,11 +901,11 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
         SfxBindings *pBind = GetBindings();
         while ( pBind )
         {
-            pBind->HidePopupCtrls_Impl( TRUE );
+            pBind->HidePopupCtrls_Impl( sal_True );
             pBind = pBind->GetSubBindings_Impl();
         }
 
-        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( TRUE, FALSE, 1 );
+        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( sal_True, sal_False, 1 );
     }
 
     Flush();
@@ -1036,7 +1036,7 @@ void SfxDispatcher::_Execute
                 if ( &rShell == pDispat->pImp->aStack.Top(n) )
                 {
                     if ( eCallMode & SFX_CALLMODE_RECORD )
-                        rReq.AllowRecording( TRUE );
+                        rReq.AllowRecording( sal_True );
                     pDispat->pImp->xPoster->Post(new SfxRequest(rReq));
 //                    pDispat->pImp->xPoster->Post(new Executer(new SfxRequest(rReq), &rSlot, n ));
                     return;
@@ -1283,11 +1283,11 @@ const SfxPoolItem* SfxDispatcher::Execute( const SfxExecuteItem& rItem )
 
 //--------------------------------------------------------------------
 const SfxPoolItem*  SfxDispatcher::Execute(
-    USHORT nSlot,
+    sal_uInt16 nSlot,
     SfxCallMode nCall,
     SfxItemSet* pArgs,
     SfxItemSet* pInternalArgs,
-    USHORT nModi)
+    sal_uInt16 nModi)
 {
     if ( IsLocked(nSlot) )
         return 0;
@@ -1408,9 +1408,9 @@ const SfxPoolItem* SfxDispatcher::Execute
 //--------------------------------------------------------------------
 const SfxPoolItem*  SfxDispatcher::Execute
 (
-    USHORT nSlot,
+    sal_uInt16 nSlot,
     SfxCallMode eCall,
-    USHORT nModi,
+    sal_uInt16 nModi,
     const SfxItemSet &rArgs
 )
 {
@@ -1797,10 +1797,10 @@ void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bo
             // check for toolboxes that are exclusively for a viewer
             if ( pImp->pFrame)
             {
-                BOOL bViewerTbx = SFX_VISIBILITY_VIEWER == ( nPos & SFX_VISIBILITY_VIEWER );
+                sal_Bool bViewerTbx = SFX_VISIBILITY_VIEWER == ( nPos & SFX_VISIBILITY_VIEWER );
                 SfxObjectShell* pSh = pImp->pFrame->GetObjectShell();
                 SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False );
-                BOOL bIsViewer = pItem && pItem->GetValue();
+                sal_Bool bIsViewer = pItem && pItem->GetValue();
                 if ( bIsViewer != bViewerTbx )
                     continue;
             }
@@ -1980,7 +1980,7 @@ void SfxDispatcher::FlushImpl()
         {
             // tats"aechlich poppen
             SfxShell* pPopped = 0;
-            FASTBOOL bFound = sal_False;
+            bool bFound = sal_False;
             do
             {
                 DBG_ASSERT( pImp->aStack.Count(), "popping from empty stack" );
@@ -2343,12 +2343,12 @@ sal_Bool SfxDispatcher::_FindServer
         if ( pSlot )
         {
             // Slot geh"ort zum Container?
-            FASTBOOL bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
-            FASTBOOL bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
+            bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
+            bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
 
             // Shell geh"ort zum Server?
             // AppDispatcher oder IPFrame-Dispatcher
-            FASTBOOL bIsServerShell = !pImp->pFrame || bIsInPlace;
+            bool bIsServerShell = !pImp->pFrame || bIsInPlace;
 
             // Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf
             // einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen.
@@ -2360,7 +2360,7 @@ sal_Bool SfxDispatcher::_FindServer
 
             // Shell geh"ort zum Container?
             // AppDispatcher oder kein IPFrameDispatcher
-            FASTBOOL bIsContainerShell = !pImp->pFrame || !bIsInPlace;
+            bool bIsContainerShell = !pImp->pFrame || !bIsInPlace;
             // Shell und Slot passen zusammen
             if ( !( ( bIsContainerSlot && bIsContainerShell ) ||
                     ( !bIsContainerSlot && bIsServerShell ) ) )
@@ -2458,12 +2458,12 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
         if ( pSlot )
         {
             // Slot geh"ort zum Container?
-            FASTBOOL bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
-            FASTBOOL bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
+            bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
+            bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
 
             // Shell geh"ort zum Server?
             // AppDispatcher oder IPFrame-Dispatcher
-            FASTBOOL bIsServerShell = !pImp->pFrame || bIsInPlace;
+            bool bIsServerShell = !pImp->pFrame || bIsInPlace;
 
             // Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf
             // einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen.
@@ -2475,7 +2475,7 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
 
             // Shell geh"ort zum Container?
             // AppDispatcher oder kein IPFrameDispatcher
-            FASTBOOL bIsContainerShell = !pImp->pFrame || !bIsInPlace;
+            bool bIsContainerShell = !pImp->pFrame || !bIsInPlace;
 
             // Shell und Slot passen zusammen
             if ( !( ( bIsContainerSlot && bIsContainerShell ) ||
@@ -2529,7 +2529,7 @@ sal_Bool SfxDispatcher::_FillState
     {
         DBG_ASSERT(bFlushed, "Dispatcher not flushed after retrieving slot servers!");
         if ( !bFlushed )
-            return FALSE;
+            return sal_False;
         // Flush();
 
         // Objekt ermitteln und Message an diesem Objekt aufrufen
@@ -2748,8 +2748,8 @@ void SfxDispatcher::Lock( sal_Bool bLock )
     pImp->bLocked = bLock;
     if ( !bLock )
     {
-        USHORT nCount = pImp->aReqArr.Count();
-        for ( USHORT i=0; i<nCount; i++ )
+        sal_uInt16 nCount = pImp->aReqArr.Count();
+        for ( sal_uInt16 i=0; i<nCount; i++ )
             pImp->xPoster->Post( pImp->aReqArr[i] );
         pImp->aReqArr.Remove( 0, nCount );
     }
@@ -2903,7 +2903,7 @@ SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSlot, const SfxPoolItem* &rp
     return SFX_ITEM_DISABLED;
 }
 
-SfxItemState SfxDispatcher::QueryState( USHORT nSID, ::com::sun::star::uno::Any& rAny )
+SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny )
 {
     SfxShell *pShell = 0;
     const SfxSlot *pSlot = 0;
@@ -2919,12 +2919,12 @@ SfxItemState SfxDispatcher::QueryState( USHORT nSID, ::com::sun::star::uno::Any&
             ::com::sun::star::uno::Any aState;
             if ( !pItem->ISA(SfxVoidItem) )
             {
-                USHORT nSubId( 0 );
+                sal_uInt16 nSubId( 0 );
                 SfxItemPool& rPool = pShell->GetPool();
-                USHORT nWhich = rPool.GetWhich( nSID );
+                sal_uInt16 nWhich = rPool.GetWhich( nSID );
                 if ( rPool.GetMetric( nWhich ) == SFX_MAPUNIT_TWIP )
                     nSubId |= CONVERT_TWIPS;
-                pItem->QueryValue( aState, (BYTE)nSubId );
+                pItem->QueryValue( aState, (sal_uInt8)nSubId );
             }
             rAny = aState;
 
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 04a820d8e0ac..87879656021e 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -62,9 +62,9 @@ SfxMacroStatement::SfxMacroStatement
 (
     const SfxShell& /*rShell*/,     // <SfxShell>, die den Request ausf"uhrte
     const String&   /*rTarget*/,    // Name des Zielobjektes vor der Ausf"urhung
-    BOOL            /*bAbsolute*/,  // obsolet
+    sal_Bool            /*bAbsolute*/,  // obsolet
     const SfxSlot&  rSlot,          // der <SfxSlot>, der das Statement abspielen kann
-    BOOL            bRequestDone,   // wurde der Request tats"achlich ausgef"uhrt
+    sal_Bool            bRequestDone,   // wurde der Request tats"achlich ausgef"uhrt
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rArgs
 )
 
@@ -91,7 +91,7 @@ SfxMacroStatement::SfxMacroStatement
     die Selektion auch deskriptiv z.B. als 'CellSelection("A5-D8")')
     angesprochen werden, dazu mu\ jedoch vom Anwendungsprogrammierer der
     Konstruktor <SfxMacroStatement::SfxMacroStatement(const String&,
-    const SfxSlot&,BOOL,SfxArguments*)> verwendet werden.
+    const SfxSlot&,sal_Bool,SfxArguments*)> verwendet werden.
 
     F"ur das so bezeichnete Objekt wird dann je nach Typ des Slots
     eine Zuweisung an eines seiner Properties oder der Aufruf einer seiner
@@ -112,7 +112,7 @@ SfxMacroStatement::SfxMacroStatement
 
     [Querverweise]
 
-    <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,BOOL,SfxArguments*)>
+    <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,sal_Bool,SfxArguments*)>
     <SfxMacroStatement::SfxMacroStatement(const String&)>
 */
 
@@ -126,11 +126,11 @@ SfxMacroStatement::SfxMacroStatement
         return;
 /*
     // Objekt-Typ bestimmen
-    FASTBOOL bIsApp = rShell.ISA(SfxApplication);
-    FASTBOOL bIsDoc = rShell.ISA(SfxObjectShell);
-    FASTBOOL bIsWin = !bIsApp && !bIsDoc &&
+    bool bIsApp = rShell.ISA(SfxApplication);
+    bool bIsDoc = rShell.ISA(SfxObjectShell);
+    bool bIsWin = !bIsApp && !bIsDoc &&
                       ( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) );
-    FASTBOOL bIsSel = !bIsApp && !bIsDoc && !bIsWin;
+    bool bIsSel = !bIsApp && !bIsDoc && !bIsWin;
 
     // Objekt nicht schon im Slot-Namen enthalten?
     if ( bIsSel || rSlot.pName[0] == '.' )
@@ -229,7 +229,7 @@ SfxMacroStatement::SfxMacroStatement
 (
     const String&   rTarget,        // Objekt, was beim Playing angesprochen wird
     const SfxSlot&  rSlot,          // der <SfxSlot>, der das Statement abspielen kann
-    BOOL            bRequestDone,   // wurde der Request tats"achlich ausgef"uhrt
+    sal_Bool            bRequestDone,   // wurde der Request tats"achlich ausgef"uhrt
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rArgs
 )
 
@@ -239,7 +239,7 @@ SfxMacroStatement::SfxMacroStatement
     [Querverweise]
 
     <SfxMacroStatement::SfxMacroStatement(const String&)>
-    <SfxMacroStatement::SfxMacroStatement(const SfxShell&,BOOL,const SfxSlot&,BOOL,SfxArguments*)>
+    <SfxMacroStatement::SfxMacroStatement(const SfxShell&,sal_Bool,const SfxSlot&,sal_Bool,SfxArguments*)>
 */
 
 :   nSlotId( rSlot.GetSlotId() ),
@@ -270,13 +270,13 @@ SfxMacroStatement::SfxMacroStatement
 
     [Querverweise]
 
-    <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,BOOL,SfxArguments*)>
-    <SfxMacroStatement::SfxMacroStatement(const SfxShell&,BOOL,const SfxSlot&,BOOL,SfxArguments*)>
+    <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,sal_Bool,SfxArguments*)>
+    <SfxMacroStatement::SfxMacroStatement(const SfxShell&,sal_Bool,const SfxSlot&,sal_Bool,SfxArguments*)>
 */
 
 :   nSlotId( 0 ),
        aStatement( rStatement ),
-    bDone( TRUE ),
+    bDone( sal_True ),
     pDummy( 0 )
 {
 }
@@ -320,7 +320,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
 (
     SfxMacro*       /*pMacro*/,         // darin wird aufgezeichnet
     const SfxSlot&  rSlot,          // der Slot, der das Statement abspielen kann
-    BOOL            bRequestDone,   // TRUE=wurde ausgef"uhrt, FALSE=abgebrochen
+    sal_Bool            bRequestDone,   // sal_True=wurde ausgef"uhrt, sal_False=abgebrochen
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& /*rArgs*/
 )
 
@@ -346,7 +346,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
 
     // alle zusammengesuchten Parameter rausschreiben
     if ( aArgs.getLength() )
-        for ( USHORT nArg = 0; nArg < aArgs.getLength(); ++nArg )
+        for ( sal_uInt16 nArg = 0; nArg < aArgs.getLength(); ++nArg )
         {
             // den Parameter textuell darstellen
             String aArg;
@@ -377,8 +377,8 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
 
                 // Anf"uhrungszeichen werden verdoppelt
                 XubString aRecordable( sTemp );
-                USHORT nPos = 0;
-                while ( TRUE )
+                sal_uInt16 nPos = 0;
+                while ( sal_True )
                 {
                     nPos = aRecordable.SearchAndReplace( DEFINE_CONST_UNICODE('"'), DEFINE_CONST_UNICODE("\"\""), nPos );
                     if ( STRING_NOTFOUND == nPos )
@@ -387,8 +387,8 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
                 }
 
                 // nicht druckbare Zeichen werden als chr$(...) geschrieben
-                FASTBOOL bPrevReplaced = FALSE;
-                for ( USHORT n = 0; n < aRecordable.Len(); ++n )
+                bool bPrevReplaced = sal_False;
+                for ( sal_uInt16 n = 0; n < aRecordable.Len(); ++n )
                 {
                     sal_Unicode cChar = aRecordable.GetChar(n);
                     if ( !( cChar>=32 && cChar!=127 ) ) // ALS ERSATZ FUER String::IsPrintable()!
@@ -411,10 +411,10 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
                             aRecordable.Insert( aReplacement, n + 1 );
                             n = n + aReplacement.Len();
                         }
-                        bPrevReplaced = TRUE;
+                        bPrevReplaced = sal_True;
                     }
                     else
-                        bPrevReplaced = FALSE;
+                        bPrevReplaced = sal_False;
 
                     // Argument in Anf"uhrungszeichen
                     aArg = '"';
@@ -425,7 +425,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
                 case SbxBYTE:
                 {
                     // als Zahl darstellen
-                    aArg = (USHORT) rVar.GetByte();
+                    aArg = (sal_uInt16) rVar.GetByte();
                     break;
                 }
 */
@@ -696,7 +696,7 @@ String SfxMacro::GenerateSource() const
 {
     DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
     String aSource;
-    for ( USHORT n = 0; n < pImp->aList.Count(); ++n )
+    for ( sal_uInt16 n = 0; n < pImp->aList.Count(); ++n )
     {
         aSource += pImp->aList.GetObject(n)->GetStatement();
         if ( (n+1) < pImp->aList.Count() )
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index b0cdd58d2645..c5e46620a908 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -39,7 +39,7 @@ TYPEINIT1(SfxMacroInfoItem, SfxPoolItem);
 // -----------------------------------------------------------------------
 
 SfxMacroInfoItem::SfxMacroInfoItem(
-    USHORT nWhichId,        // Slot-ID
+    sal_uInt16 nWhichId,        // Slot-ID
     const BasicManager* pMgr,
     const String &rLibName,
     const String &rModuleName,
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/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 9d3661ef1bc1..9cda943c8509 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -52,20 +52,20 @@ struct SfxSIDRegistration_Impl
 {
     String          _aGroup;
     String          _aName;
-    USHORT          _nSID;
+    sal_uInt16          _nSID;
 };
 
 struct SfxSlotType_Impl
 {
-    USHORT  nId;
+    sal_uInt16  nId;
     TypeId  nType;
 
-    SfxSlotType_Impl( USHORT nTheId, TypeId nTheType ):
+    SfxSlotType_Impl( sal_uInt16 nTheId, TypeId nTheType ):
         nId(nTheId), nType(nTheType)
     {}
 };
 
-DECL_2BYTEARRAY(SfxSlotGroupArr_Impl, USHORT, 6, 4)
+DECL_2BYTEARRAY(SfxSlotGroupArr_Impl, sal_uInt16, 6, 4)
 DECL_PTRARRAY(SfxInterfaceArr_Impl, SfxInterface*, 6, 3)
 DECL_PTRARRAY(SfxSlotTypeArr_Impl, SfxSlotType_Impl*, 8, 8)
 
@@ -98,7 +98,7 @@ SfxSlotPool::~SfxSlotPool()
     delete _pGroups;
     if ( _pTypes )
     {
-        for ( USHORT n =_pTypes->Count(); n--; )
+        for ( sal_uInt16 n =_pTypes->Count(); n--; )
             delete _pTypes->GetObject(n);
         delete _pTypes;
     }
@@ -131,14 +131,14 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
         {
             // Die Groups im parent Slotpool sind auch hier bekannt
             SfxSlotGroupArr_Impl& rGroups = *_pParentPool->_pGroups;
-            for ( USHORT n=0; n<rGroups.Count(); n++ )
+            for ( sal_uInt16 n=0; n<rGroups.Count(); n++ )
                 _pGroups->Append( rGroups[n] );
         }
     }
 
     if ( !_pTypes )
         _pTypes = new SfxSlotTypeArr_Impl;
-    for ( USHORT nFunc = 0; nFunc < rInterface.Count(); ++nFunc )
+    for ( sal_uInt16 nFunc = 0; nFunc < rInterface.Count(); ++nFunc )
     {
         SfxSlot *pDef = rInterface[nFunc];
         if ( pDef->GetGroupId() && /* pDef->GetGroupId() != GID_INTERN && */
@@ -153,7 +153,7 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
         const TypeId &rTypeId = pDef->GetType()->Type();
         if ( /*rTypeId != TYPE(SfxVoidItem) &&*/ rTypeId != 0 )
         {
-            USHORT nPos;
+            sal_uInt16 nPos;
             for ( nPos = 0; nPos < _pTypes->Count(); ++nPos )
             {
                 if ( _pTypes->GetObject(nPos)->nId == pDef->GetSlotId() )
@@ -174,12 +174,12 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
 
 //====================================================================
 
-TypeId SfxSlotPool::GetSlotType( USHORT nId ) const
+TypeId SfxSlotPool::GetSlotType( sal_uInt16 nId ) const
 {
     const SfxSlot* pSlot = (const_cast <SfxSlotPool*> (this))->GetSlot( nId );
     return pSlot ? pSlot->GetType()->Type() : 0;
 /*
-    for ( USHORT nPos = 0; nPos < _pTypes->Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < _pTypes->Count(); ++nPos )
     {
         if ( _pTypes->GetObject(nPos)->nId == nId )
             return _pTypes->GetObject(nPos)->nType;
@@ -204,13 +204,13 @@ void SfxSlotPool::ReleaseInterface( SfxInterface& rInterface )
 
 // get the first SfxMessage for a special Id (e.g. for getting check-mode)
 
-const SfxSlot* SfxSlotPool::GetSlot( USHORT nId )
+const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId )
 {
     DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // Zun"achst die eigenen Interfaces absuchen
-    for ( USHORT nInterf = 0; nInterf < _pInterfaces->Count(); ++nInterf )
+    for ( sal_uInt16 nInterf = 0; nInterf < _pInterfaces->Count(); ++nInterf )
     {
         const SfxSlot *pDef = _pInterfaces->GetObject(nInterf)->GetSlot(nId);
         if ( pDef )
@@ -225,7 +225,7 @@ const SfxSlot* SfxSlotPool::GetSlot( USHORT nId )
 
 // skips to the next group
 
-String SfxSlotPool::SeekGroup( USHORT nNo )
+String SfxSlotPool::SeekGroup( sal_uInt16 nNo )
 {
     DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
@@ -237,7 +237,7 @@ String SfxSlotPool::SeekGroup( USHORT nNo )
         if ( _pParentPool )
         {
             // Meistens stimmt die Reihenfolge der Ids "uberein
-            USHORT nParentCount = _pParentPool->_pGroups->Count();
+            sal_uInt16 nParentCount = _pParentPool->_pGroups->Count();
             if ( nNo < nParentCount && (*_pGroups)[nNo] == (*_pParentPool->_pGroups)[nNo] )
                 _pParentPool->_nCurGroup = nNo;
             else
@@ -245,7 +245,7 @@ String SfxSlotPool::SeekGroup( USHORT nNo )
                 // Ansonsten mu\s gesucht werden
                 // Wenn die Gruppe im parent pool nicht gefunden wird, wird
                 // _nCurGroup au\serhalb des g"ultigen Bereiches gesetzt
-                USHORT i;
+                sal_uInt16 i;
                 for ( i=1; i<nParentCount; i++ )
                     if ( (*_pGroups)[nNo] == (*_pParentPool->_pGroups)[i] )
                         break;
@@ -270,7 +270,7 @@ String SfxSlotPool::SeekGroup( USHORT nNo )
 
 //--------------------------------------------------------------------
 
-USHORT SfxSlotPool::GetGroupCount()
+sal_uInt16 SfxSlotPool::GetGroupCount()
 {
     return _pGroups->Count();
 }
@@ -280,13 +280,13 @@ USHORT SfxSlotPool::GetGroupCount()
 
 // internal search loop
 
-const SfxSlot* SfxSlotPool::SeekSlot( USHORT nStartInterface )
+const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
 {
     DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // Die Numerierung der interfaces startet beim parent pool
-    USHORT nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
+    sal_uInt16 nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
 
     // sind wir am Ende des Parent-Pools angekommen?
     if ( nStartInterface < nFirstInterface &&
@@ -302,7 +302,7 @@ const SfxSlot* SfxSlotPool::SeekSlot( USHORT nStartInterface )
     }
 
     // find the first func-def with the current group id
-    USHORT nCount = _pInterfaces->Count() + nFirstInterface;
+    sal_uInt16 nCount = _pInterfaces->Count() + nFirstInterface;
     for ( _nCurInterface = nStartInterface;
             _nCurInterface < nCount;
           ++_nCurInterface )
@@ -331,7 +331,7 @@ const SfxSlot* SfxSlotPool::NextSlot()
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // Die Numerierung der interfaces startet beim parent pool
-    USHORT nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
+    sal_uInt16 nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
 
     if ( _nCurInterface < nFirstInterface && _nCurGroup >= _pParentPool->_pGroups->Count() )
         _nCurInterface = nFirstInterface;
@@ -348,7 +348,7 @@ const SfxSlot* SfxSlotPool::NextSlot()
             return SeekSlot( nFirstInterface );
     }
 
-    USHORT nInterface = _nCurInterface - nFirstInterface;
+    sal_uInt16 nInterface = _nCurInterface - nFirstInterface;
     // possibly we are already at the end
     if ( nInterface >= _pInterfaces->Count() )
         return 0;
@@ -386,17 +386,17 @@ SfxInterface* SfxSlotPool::FirstInterface()
 SfxInterface* SfxSlotPool::NextInterface()
 {
     _nCurInterface++;
-    USHORT nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
+    sal_uInt16 nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
     if ( _nCurInterface < nFirstInterface )
         return (*_pParentPool->_pInterfaces)[_nCurInterface];
-    USHORT nInterface = _nCurInterface - nFirstInterface;
+    sal_uInt16 nInterface = _nCurInterface - nFirstInterface;
     return nInterface < _pInterfaces->Count() ? (*_pInterfaces)[nInterface] : 0;
 }
 
 const SfxSlot* SfxSlotPool::GetUnoSlot( const String& rName )
 {
     const SfxSlot *pSlot = NULL;
-    for ( USHORT nInterface=0; nInterface<_pInterfaces->Count(); nInterface++ )
+    for ( sal_uInt16 nInterface=0; nInterface<_pInterfaces->Count(); nInterface++ )
     {
         pSlot = (*_pInterfaces)[nInterface]->GetSlot( rName );
         if ( pSlot )
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index d0ce2abae773..f73a7f4acf4b 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -69,18 +69,18 @@ SfxCompareSlots_Impl( const void* pSmaller, const void* pBigger )
 
 struct SfxObjectUI_Impl
 {
-    USHORT  nPos;
+    sal_uInt16  nPos;
     ResId   aResId;
-    BOOL    bVisible;
-    BOOL    bContext;
+    sal_Bool    bVisible;
+    sal_Bool    bContext;
     String* pName;
     sal_uInt32  nFeature;
 
-    SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat) :
+    SfxObjectUI_Impl(sal_uInt16 n, const ResId& rResId, sal_Bool bVis, sal_uInt32 nFeat) :
         nPos(n),
         aResId(rResId.GetId(), *rResId.GetResMgr()),
         bVisible(bVis),
-        bContext(FALSE),
+        bContext(sal_False),
         pName(0),
         nFeature(nFeat)
     {
@@ -102,12 +102,12 @@ struct SfxInterface_Impl
     ResId                   aPopupRes;      // registered PopupMenu
     ResId                   aStatBarRes;    // registered StatusBar
     SfxModule*              pModule;
-    BOOL                    bRegistered;
+    sal_Bool                    bRegistered;
 
     SfxInterface_Impl() :
         aPopupRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager()),
         aStatBarRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager())
-    , bRegistered(FALSE)
+    , bRegistered(sal_False)
     {
         pObjectBars   = new SfxObjectUIArr_Impl;
         pChildWindows = new SfxObjectUIArr_Impl;
@@ -115,7 +115,7 @@ struct SfxInterface_Impl
 
     ~SfxInterface_Impl()
     {
-        USHORT n;
+        sal_uInt16 n;
         for (n=0; n<pObjectBars->Count(); n++)
             delete (*pObjectBars)[n];
         delete pObjectBars;
@@ -126,7 +126,7 @@ struct SfxInterface_Impl
     }
 };
 
-static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr );
+static SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr );
 
 //====================================================================
 
@@ -137,7 +137,7 @@ SfxInterface::SfxInterface( const char *pClassName,
                             const ResId& rNameResId,
                             SfxInterfaceId nId,
                             const SfxInterface* pParent,
-                            SfxSlot &rSlotMap, USHORT nSlotCount ):
+                            SfxSlot &rSlotMap, sal_uInt16 nSlotCount ):
     pName(pClassName),
     pGenoType(pParent),
     nClassId(nId),
@@ -150,7 +150,7 @@ SfxInterface::SfxInterface( const char *pClassName,
 
 void SfxInterface::Register( SfxModule* pMod )
 {
-    pImpData->bRegistered = TRUE;
+    pImpData->bRegistered = sal_True;
     pImpData->pModule = pMod;
     if ( pMod )
         pMod->GetSlotPool()->RegisterInterface(*this);
@@ -158,7 +158,7 @@ void SfxInterface::Register( SfxModule* pMod )
         SFX_APP()->GetAppSlotPool_Impl().RegisterInterface(*this);
 }
 
-void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
+void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
 {
     pSlots = &rSlotMap;
     nCount = nSlotCount;
@@ -172,7 +172,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
         qsort( pSlots, nCount, sizeof(SfxSlot), SfxCompareSlots_Impl );
 
         // link masters and slaves
-        USHORT nIter = 1;
+        sal_uInt16 nIter = 1;
         for ( pIter = pSlots; nIter <= nCount; ++pIter, ++nIter )
         {
             //! hier bitte sinnvoll pruefen
@@ -196,7 +196,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
                 if ( 0 == pIter->GetNextSlot() )
                 {
                     SfxSlot *pLastSlot = pIter;
-                    for ( USHORT n = nIter; n < Count(); ++n )
+                    for ( sal_uInt16 n = nIter; n < Count(); ++n )
                     {
                         SfxSlot *pCurSlot = (pSlots+n);
                         if ( pCurSlot->nMasterSlotId == pIter->nMasterSlotId )
@@ -212,7 +212,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
             {
                 // Slots verweisen im Ring auf den n"achten mit derselben Statusmethode
                 SfxSlot *pLastSlot = pIter;
-                for ( USHORT n = nIter; n < Count(); ++n )
+                for ( sal_uInt16 n = nIter; n < Count(); ++n )
                 {
                     SfxSlot *pCurSlot = (pSlots+n);
                     if ( pCurSlot->GetStateFnc() == pIter->GetStateFnc() )
@@ -228,7 +228,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
 #ifdef DBG_UTIL
     else
     {
-        USHORT nIter = 1;
+        sal_uInt16 nIter = 1;
         for ( SfxSlot *pNext = pIter+1; nIter < nCount; ++pNext, ++nIter )
         {
 
@@ -308,7 +308,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
 SfxInterface::~SfxInterface()
 {
     SfxModule *pMod = pImpData->pModule;
-    BOOL bRegistered = pImpData->bRegistered;
+    sal_Bool bRegistered = pImpData->bRegistered;
     delete pImpData;
     DBG_ASSERT( bRegistered, "Interface not registered!" );
     if ( bRegistered )
@@ -325,7 +325,7 @@ SfxInterface::~SfxInterface()
 // searches for the specified func
 
 
-const SfxSlot* SfxInterface::GetSlot( USHORT nFuncId ) const
+const SfxSlot* SfxInterface::GetSlot( sal_uInt16 nFuncId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxInterface, 0);
@@ -348,7 +348,7 @@ const SfxSlot* SfxInterface::GetSlot( const String& rCommand ) const
     if ( aCommand.SearchAscii( UNO_COMMAND ) == 0 )
          aCommand.Erase( 0, sizeof( UNO_COMMAND )-1 );
 
-    for ( USHORT n=0; n<nCount; n++ )
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         if ( (pSlots+n)->pUnoName &&
              aCommand.CompareIgnoreCaseToAscii( (pSlots+n)->GetUnoName() ) == COMPARE_EQUAL )
@@ -381,7 +381,7 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
 //--------------------------------------------------------------------
 
 
-const SfxSlot* SfxInterface::GetRealSlot( USHORT nSlotId ) const
+const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxInterface, 0);
@@ -410,26 +410,26 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId )
 
 //--------------------------------------------------------------------
 
-void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId,
+void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId,
         const String *pStr )
 {
     RegisterObjectBar( nPos, rResId, 0UL, pStr );
 }
 
 
-void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
 {
     SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr );
     if ( pUI )
         pImpData->pObjectBars->Append(pUI);
 }
 
-SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
 {
     if ((nPos & SFX_VISIBILITY_MASK) == 0)
         nPos |= SFX_VISIBILITY_STANDARD;
 
-    SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(nPos, rResId, TRUE, nFeature);
+    SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(nPos, rResId, sal_True, nFeature);
 
     if (pStr == 0)
     {
@@ -449,13 +449,13 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_
     return pUI;
 }
 
-const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
+const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Gibt es Toolbars in der Superklasse ?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // Die der Superklasse kommen zuerst
             return pGenoType->GetObjectBarResId( nNo );
@@ -464,7 +464,7 @@ const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->aResId;
@@ -473,13 +473,13 @@ const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
 //--------------------------------------------------------------------
 
 
-USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
+sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Gibt es Toolbars in der Superklasse ?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // Die der Superklasse kommen zuerst
             return pGenoType->GetObjectBarPos( nNo );
@@ -488,7 +488,7 @@ USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->nPos;
@@ -497,7 +497,7 @@ USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
 //--------------------------------------------------------------------
 
 
-USHORT SfxInterface::GetObjectBarCount() const
+sal_uInt16 SfxInterface::GetObjectBarCount() const
 {
     if (pGenoType && ! pGenoType->HasName())
         return pImpData->pObjectBars->Count() + pGenoType->GetObjectBarCount();
@@ -506,14 +506,14 @@ USHORT SfxInterface::GetObjectBarCount() const
 }
 
 //--------------------------------------------------------------------
-void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, const String* pChildWinName)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, const String* pChildWinName)
 {
     RegisterChildWindow( nId, bContext, 0UL, pChildWinName );
 }
 
-void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, sal_uInt32 nFeature, const String*)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, sal_uInt32 nFeature, const String*)
 {
-    SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), TRUE, nFeature);
+    SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), sal_True, nFeature);
     pUI->bContext = bContext;
     pImpData->pChildWindows->Append(pUI);
 }
@@ -524,12 +524,12 @@ void SfxInterface::RegisterStatusBar(const ResId& rResId)
 }
 
 
-sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
+sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const
 {
     if ( pGenoType )
     {
         // Gibt es ChildWindows in der Superklasse ?
-        USHORT nBaseCount = pGenoType->GetChildWindowCount();
+        sal_uInt16 nBaseCount = pGenoType->GetChildWindowCount();
         if ( nNo < nBaseCount )
             // Die der Superklasse kommen zuerst
             return pGenoType->GetChildWindowId( nNo );
@@ -538,7 +538,7 @@ sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nCWCount = pImpData->pChildWindows->Count();
+    sal_uInt16 nCWCount = pImpData->pChildWindows->Count();
     DBG_ASSERT( nNo<nCWCount,"ChildWindow ist unbekannt!" );
 #endif
     sal_uInt32 nRet = (*pImpData->pChildWindows)[nNo]->aResId.GetId();
@@ -547,12 +547,12 @@ sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
     return nRet;
 }
 
-sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
+sal_uInt32 SfxInterface::GetChildWindowFeature (sal_uInt16 nNo) const
 {
     if ( pGenoType )
     {
         // Gibt es ChildWindows in der Superklasse ?
-        USHORT nBaseCount = pGenoType->GetChildWindowCount();
+        sal_uInt16 nBaseCount = pGenoType->GetChildWindowCount();
         if ( nNo < nBaseCount )
             // Die der Superklasse kommen zuerst
             return pGenoType->GetChildWindowFeature( nNo );
@@ -561,7 +561,7 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nCWCount = pImpData->pChildWindows->Count();
+    sal_uInt16 nCWCount = pImpData->pChildWindows->Count();
     DBG_ASSERT( nNo<nCWCount,"ChildWindow ist unbekannt!" );
 #endif
     return (*pImpData->pChildWindows)[nNo]->nFeature;
@@ -570,7 +570,7 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
 //--------------------------------------------------------------------
 
 
-USHORT SfxInterface::GetChildWindowCount() const
+sal_uInt16 SfxInterface::GetChildWindowCount() const
 {
     if (pGenoType)
         return pImpData->pChildWindows->Count() + pGenoType->GetChildWindowCount();
@@ -595,13 +595,13 @@ const ResId& SfxInterface::GetStatusBarResId() const
 
 
 
-const String* SfxInterface::GetObjectBarName ( USHORT nNo ) const
+const String* SfxInterface::GetObjectBarName ( sal_uInt16 nNo ) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Gibt es Toolbars in der Superklasse ?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // Die der Superklasse kommen zuerst
             return pGenoType->GetObjectBarName( nNo );
@@ -610,19 +610,19 @@ const String* SfxInterface::GetObjectBarName ( USHORT nNo ) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->pName;
 }
 
-sal_uInt32 SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
+sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Gibt es Toolbars in der Superklasse ?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // Die der Superklasse kommen zuerst
             return pGenoType->GetObjectBarFeature( nNo );
@@ -631,19 +631,19 @@ sal_uInt32 SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->nFeature;
 }
 
-BOOL SfxInterface::IsObjectBarVisible(USHORT nNo) const
+sal_Bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Gibt es Toolbars in der Superklasse ?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // Die der Superklasse kommen zuerst
             return pGenoType->IsObjectBarVisible( nNo );
@@ -652,7 +652,7 @@ BOOL SfxInterface::IsObjectBarVisible(USHORT nNo) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->bVisible;
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index bee4a5c87675..9fb17332c27d 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -59,7 +59,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener ,
     public:
         SFX_DECL_XINTERFACE_XTYPEPROVIDER
 
-        SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const rtl::OUString& aCommand );
+        SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand );
         virtual ~SfxQueryStatus_Impl();
 
         // Query method
@@ -79,7 +79,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener ,
         sal_Bool                                                                   m_bQueryInProgress;
         SfxItemState                                                               m_eState;
         SfxPoolItem*                                                               m_pItem;
-        USHORT                                                                     m_nSlotID;
+        sal_uInt16                                                                     m_nSlotID;
         osl::Condition                                                             m_aCondition;
         ::com::sun::star::util::URL                                                m_aCommand;
         com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >         m_xDispatch;
@@ -88,7 +88,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener ,
 SFX_IMPL_XINTERFACE_2( SfxQueryStatus_Impl, OWeakObject, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
 SFX_IMPL_XTYPEPROVIDER_2( SfxQueryStatus_Impl, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
 
-SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const OUString& rCommand ) :
+SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) :
     cppu::OWeakObject(),
     m_bQueryInProgress( sal_False ),
     m_eState( SFX_ITEM_DISABLED ),
@@ -222,7 +222,7 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem )
 
 //*************************************************************************
 
-SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const OUString& rCommand )
+SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand )
 {
     m_pSfxQueryStatusImpl = new SfxQueryStatus_Impl( rDispatchProvider, nSlotId, rCommand );
     m_xStatusListener     = Reference< XStatusListener >(
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 88a52d0ad0bf..ec6f9a7428e9 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -76,13 +76,13 @@ struct SfxRequest_Impl: public SfxListener
     SfxPoolItem*        pRetVal;     // R"uckgabewert geh"ort sich selbst
     SfxShell*           pShell;      // ausgef"uhrt an dieser Shell
     const SfxSlot*      pSlot;       // ausgef"uhrter Slot
-    USHORT              nModifier;   // welche Modifier waren gedrueckt?
-    BOOL                bDone;       // "uberhaupt ausgef"uhrt
-    BOOL                bIgnored;    // vom User abgebrochen
-    BOOL                bCancelled;  // nicht mehr zustellen
-    BOOL                bUseTarget;  // aTarget wurde von Applikation gesetzt
-    USHORT              nCallMode;   // Synch/Asynch/API/Record
-    BOOL                bAllowRecording;
+    sal_uInt16              nModifier;   // welche Modifier waren gedrueckt?
+    sal_Bool                bDone;       // "uberhaupt ausgef"uhrt
+    sal_Bool                bIgnored;    // vom User abgebrochen
+    sal_Bool                bCancelled;  // nicht mehr zustellen
+    sal_Bool                bUseTarget;  // aTarget wurde von Applikation gesetzt
+    sal_uInt16              nCallMode;   // Synch/Asynch/API/Record
+    sal_Bool                bAllowRecording;
     SfxAllItemSet*      pInternalArgs;
     SfxViewFrame*       pViewFrame;
 
@@ -92,9 +92,9 @@ struct SfxRequest_Impl: public SfxListener
                         : pAnti( pOwner)
                         , pPool(0)
                         , nModifier(0)
-                        , bCancelled(FALSE)
+                        , bCancelled(sal_False)
                         , nCallMode( SFX_CALLMODE_SYNCHRON )
-                        , bAllowRecording( FALSE )
+                        , bAllowRecording( sal_False )
                         , pInternalArgs( 0 )
                         , pViewFrame(0)
                         {}
@@ -162,8 +162,8 @@ SfxRequest::SfxRequest
     DBG_MEMTEST();
 
     pImp->bAllowRecording = rOrig.pImp->bAllowRecording;
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
@@ -186,7 +186,7 @@ SfxRequest::SfxRequest
 SfxRequest::SfxRequest
 (
     SfxViewFrame*   pViewFrame,
-    USHORT          nSlotId
+    sal_uInt16          nSlotId
 
 )
 
@@ -205,16 +205,16 @@ SfxRequest::SfxRequest
 {
     DBG_MEMTEST();
 
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->SetPool( &pViewFrame->GetPool() );
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
     pImp->nCallMode = SFX_CALLMODE_SYNCHRON;
-    pImp->bUseTarget = FALSE;
+    pImp->bUseTarget = sal_False;
     pImp->pViewFrame = pViewFrame;
-    if( pImp->pViewFrame->GetDispatcher()->GetShellAndSlot_Impl( nSlotId, &pImp->pShell, &pImp->pSlot, TRUE, TRUE ) )
+    if( pImp->pViewFrame->GetDispatcher()->GetShellAndSlot_Impl( nSlotId, &pImp->pShell, &pImp->pSlot, sal_True, sal_True ) )
     {
         pImp->SetPool( &pImp->pShell->GetPool() );
         pImp->xRecorder = SfxRequest::GetMacroRecorder( pViewFrame );
@@ -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
 )
@@ -248,14 +248,14 @@ SfxRequest::SfxRequest
 {
     DBG_MEMTEST();
 
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->SetPool( &rPool );
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
     pImp->nCallMode = nMode;
-    pImp->bUseTarget = FALSE;
+    pImp->bUseTarget = sal_False;
 }
 
 SfxRequest::SfxRequest
@@ -271,14 +271,14 @@ SfxRequest::SfxRequest
 {
     DBG_MEMTEST();
 
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->SetPool( &rPool );
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
     pImp->nCallMode = nMode;
-    pImp->bUseTarget = FALSE;
+    pImp->bUseTarget = sal_False;
     TransformParameters( nSlot, rArgs, *pArgs, pSlot );
 }
 
@@ -286,8 +286,8 @@ SfxRequest::SfxRequest
 
 SfxRequest::SfxRequest
 (
-    USHORT                  nSlotId,
-    USHORT                  nMode,
+    sal_uInt16                  nSlotId,
+    sal_uInt16                  nMode,
     const SfxAllItemSet&    rSfxArgs
 )
 
@@ -299,37 +299,37 @@ SfxRequest::SfxRequest
 {
     DBG_MEMTEST();
 
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->SetPool( rSfxArgs.GetPool() );
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
     pImp->nCallMode = nMode;
-    pImp->bUseTarget = FALSE;
+    pImp->bUseTarget = sal_False;
 }
 //--------------------------------------------------------------------
 
-USHORT SfxRequest::GetCallMode() const
+sal_uInt16 SfxRequest::GetCallMode() const
 {
     return pImp->nCallMode;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxRequest::IsSynchronCall() const
+sal_Bool SfxRequest::IsSynchronCall() const
 {
     return SFX_CALLMODE_SYNCHRON == ( SFX_CALLMODE_SYNCHRON & pImp->nCallMode );
 }
 
 //--------------------------------------------------------------------
 
-void SfxRequest::SetSynchronCall( BOOL bSynchron )
+void SfxRequest::SetSynchronCall( sal_Bool bSynchron )
 {
     if ( bSynchron )
         pImp->nCallMode |= SFX_CALLMODE_SYNCHRON;
     else
-        pImp->nCallMode &= ~(USHORT) SFX_CALLMODE_SYNCHRON;
+        pImp->nCallMode &= ~(sal_uInt16) SFX_CALLMODE_SYNCHRON;
 }
 
 void SfxRequest::SetInternalArgs_Impl( const SfxAllItemSet& rArgs )
@@ -456,7 +456,7 @@ void SfxRequest::AppendItem(const SfxPoolItem &rItem)
 
 //--------------------------------------------------------------------
 
-void SfxRequest::RemoveItem( USHORT nID )
+void SfxRequest::RemoveItem( sal_uInt16 nID )
 {
     if (pArgs)
     {
@@ -470,8 +470,8 @@ void SfxRequest::RemoveItem( USHORT nID )
 
 const SfxPoolItem* SfxRequest::GetArg
 (
-    USHORT          nSlotId,    // Slot-Id oder Which-Id des Parameters
-    FASTBOOL        bDeep,      // FALSE: nicht in Parent-ItemSets suchen
+    sal_uInt16          nSlotId,    // Slot-Id oder Which-Id des Parameters
+    bool        bDeep,      // false: nicht in Parent-ItemSets suchen
     TypeId          aType       // != 0:  RTTI Pruefung mit Assertion
 )   const
 {
@@ -483,7 +483,7 @@ const SfxPoolItem* SfxRequest::GetArg
 const SfxPoolItem* SfxRequest::GetItem
 (
     const SfxItemSet* pArgs,
-    USHORT          nSlotId,    // Slot-Id oder Which-Id des Parameters
+    sal_uInt16          nSlotId,    // Slot-Id oder Which-Id des Parameters
     bool            bDeep,      // false: nicht in Parent-ItemSets suchen
     TypeId          aType       // != 0:  RTTI Pruefung mit Assertion
 )
@@ -509,12 +509,12 @@ const SfxPoolItem* SfxRequest::GetItem
                 ...
                 // ein Beispiel ohne Verwendung des Makros
                 const SfxInt32Item *pPosItem = (const SfxUInt32Item*)
-                    rReq.GetArg( SID_POS, FALSE, TYPE(SfxInt32Item) );
-                USHORT nPos = pPosItem ? pPosItem->GetValue() : 0;
+                    rReq.GetArg( SID_POS, sal_False, TYPE(SfxInt32Item) );
+                sal_uInt16 nPos = pPosItem ? pPosItem->GetValue() : 0;
 
                 // ein Beispiel mit Verwendung des Makros
-                SFX_REQUEST_ARG(rReq, pSizeItem, SfxInt32Item, SID_SIZE, FALSE);
-                USHORT nSize = pSizeItem ? pPosItem->GetValue() : 0;
+                SFX_REQUEST_ARG(rReq, pSizeItem, SfxInt32Item, SID_SIZE, sal_False);
+                sal_uInt16 nSize = pSizeItem ? pPosItem->GetValue() : 0;
 
                 ...
             }
@@ -528,7 +528,7 @@ const SfxPoolItem* SfxRequest::GetItem
     if ( pArgs )
     {
         // ggf. in Which-Id umrechnen
-        USHORT nWhich = pArgs->GetPool()->GetWhich(nSlotId);
+        sal_uInt16 nWhich = pArgs->GetPool()->GetWhich(nSlotId);
 
         // ist das Item gesetzt oder bei bDeep==TRUE verf"ugbar?
         const SfxPoolItem *pItem = 0;
@@ -574,11 +574,11 @@ void SfxRequest::Done
                                     erfragt wurden, ggf. 0 falls keine
                                     Parameter gesetzt wurden */
 
-    FASTBOOL            bKeep   /*  TRUE (default)
+    bool            bKeep   /*  true (default)
                                     'rSet' wird gepeichert und ist "uber
                                     GetArgs() abfragbar
 
-                                    FALSE
+                                    false
                                     'rSet' wird nicht kopiert (schneller) */
 )
 
@@ -634,7 +634,7 @@ void SfxRequest::Done
 //--------------------------------------------------------------------
 
 
-void SfxRequest::Done( BOOL bRelease )
+void SfxRequest::Done( sal_Bool bRelease )
 //  [<SfxRequest::Done(SfxItemSet&)>]
 {
     Done_Impl( pArgs );
@@ -652,7 +652,7 @@ void SfxRequest::ForgetAllArgs()
 
 //--------------------------------------------------------------------
 
-BOOL SfxRequest::IsCancelled() const
+sal_Bool SfxRequest::IsCancelled() const
 {
     return pImp->bCancelled;
 }
@@ -668,7 +668,7 @@ void SfxRequest::Cancel()
 */
 
 {
-    pImp->bCancelled = TRUE;
+    pImp->bCancelled = sal_True;
     pImp->SetPool( 0 );
     DELETEZ( pArgs );
 }
@@ -694,7 +694,7 @@ void SfxRequest::Ignore()
 
 {
     // als tats"achlich ausgef"uhrt markieren
-    pImp->bIgnored = TRUE;
+    pImp->bIgnored = sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -715,7 +715,7 @@ void SfxRequest::Done_Impl
 
 {
     // als tats"achlich ausgef"uhrt markieren
-    pImp->bDone = TRUE;
+    pImp->bDone = sal_True;
 
     // nicht Recorden
     if ( !pImp->xRecorder.is() )
@@ -751,8 +751,8 @@ void SfxRequest::Done_Impl
     {
         // des Property als SfxPoolItem besorgen
         const SfxPoolItem *pItem;
-        USHORT nWhich = rPool.GetWhich(pImp->pSlot->GetSlotId());
-        SfxItemState eState = pSet ? pSet->GetItemState( nWhich, FALSE, &pItem ) : SFX_ITEM_UNKNOWN;
+        sal_uInt16 nWhich = rPool.GetWhich(pImp->pSlot->GetSlotId());
+        SfxItemState eState = pSet ? pSet->GetItemState( nWhich, sal_False, &pItem ) : SFX_ITEM_UNKNOWN;
 #ifdef DBG_UTIL
         if ( SFX_ITEM_SET != eState )
         {
@@ -786,13 +786,13 @@ void SfxRequest::Done_Impl
             for ( const SfxPoolItem* pItem = aIter.FirstItem(); pItem; pItem = aIter.NextItem() )
             {
                 // die Slot-Id f"ur das einzelne Item ermitteln
-                USHORT nSlotId = rPool.GetSlotId( pItem->Which() );
+                sal_uInt16 nSlotId = rPool.GetSlotId( pItem->Which() );
                 if ( nSlotId == nSlot )
                 {
                     // mit Hosentr"ager und G"urtel reparieren des falschen Flags
                     DBG_ERROR( "recursion RecordPerItem - use RecordPerSet!" );
                     SfxSlot *pSlot = (SfxSlot*) pImp->pSlot;
-                    pSlot->nFlags &= ~((ULONG)SFX_SLOT_RECORDPERITEM);
+                    pSlot->nFlags &= ~((sal_uIntPtr)SFX_SLOT_RECORDPERITEM);
                     pSlot->nFlags &=  SFX_SLOT_RECORDPERSET;
                 }
 
@@ -813,7 +813,7 @@ void SfxRequest::Done_Impl
 
 //--------------------------------------------------------------------
 
-BOOL SfxRequest::IsDone() const
+sal_Bool SfxRequest::IsDone() const
 
 /*  [Beschreibung]
 
@@ -823,7 +823,7 @@ BOOL SfxRequest::IsDone() const
     der Kontext f"ur diesen Request falsch war, dieses aber nicht "uber
     eine separate <SfxShell> realisiert wurde.
 
-    SfxRequest-Instanzen, die hier FALSE liefern, werden nicht recorded.
+    SfxRequest-Instanzen, die hier sal_False liefern, werden nicht recorded.
 
 
     [Querverweise]
@@ -881,7 +881,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe
     return xRecorder;
 }
 
-BOOL SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
+sal_Bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
 {
     return GetMacroRecorder( pView ).is();
 }
@@ -889,12 +889,12 @@ BOOL SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
 
 //--------------------------------------------------------------------
 
-BOOL SfxRequest::IsAPI() const
+sal_Bool SfxRequest::IsAPI() const
 
 /*  [Beschreibung]
 
-    Liefert TRUE, wenn dieser SfxRequest von einer API (z.B. BASIC)
-    erzeugt wurde, sonst FALSE.
+    Liefert sal_True, wenn dieser SfxRequest von einer API (z.B. BASIC)
+    erzeugt wurde, sonst sal_False.
 */
 
 {
@@ -904,15 +904,15 @@ BOOL SfxRequest::IsAPI() const
 //--------------------------------------------------------------------
 
 
-FASTBOOL SfxRequest::IsRecording() const
+bool SfxRequest::IsRecording() const
 
 /*  [Beschreibung]
 
-    Liefert TRUE, wenn dieser SfxRequest recorded werden soll, d.h.
+    Liefert sal_True, wenn dieser SfxRequest recorded werden soll, d.h.
     1. zu Zeit ein Makro aufgezeichnet wird
     2. dieser Request "uberhaupt aufgezeichnet wird
     3. der Request nicht von reiner API (z.B. BASIC) ausgeht,
-    sonst FALSE.
+    sonst sal_False.
 */
 
 {
@@ -920,13 +920,13 @@ FASTBOOL SfxRequest::IsRecording() const
 }
 
 //--------------------------------------------------------------------
-void SfxRequest::SetModifier( USHORT nModi )
+void SfxRequest::SetModifier( sal_uInt16 nModi )
 {
     pImp->nModifier = nModi;
 }
 
 //--------------------------------------------------------------------
-USHORT SfxRequest::GetModifier() const
+sal_uInt16 SfxRequest::GetModifier() const
 {
     return pImp->nModifier;
 }
@@ -954,17 +954,17 @@ void SfxRequest::SetTarget( const String &rTarget )
 
 {
     pImp->aTarget = rTarget;
-    pImp->bUseTarget = TRUE;
+    pImp->bUseTarget = sal_True;
 }
 
-void SfxRequest::AllowRecording( BOOL bSet )
+void SfxRequest::AllowRecording( sal_Bool bSet )
 {
     pImp->bAllowRecording = bSet;
 }
 
-BOOL SfxRequest::AllowsRecording() const
+sal_Bool SfxRequest::AllowsRecording() const
 {
-    BOOL bAllow = pImp->bAllowRecording;
+    sal_Bool bAllow = pImp->bAllowRecording;
     if( !bAllow )
         bAllow = ( SFX_CALLMODE_API != ( SFX_CALLMODE_API & pImp->nCallMode ) ) &&
                  ( SFX_CALLMODE_RECORD == ( SFX_CALLMODE_RECORD & pImp->nCallMode ) );
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index c2cf5f164e7c..96f305f58389 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::util;
 SFX_IMPL_XINTERFACE_3( SfxStatusListener, OWeakObject, ::com::sun::star::lang::XComponent, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
 SFX_IMPL_XTYPEPROVIDER_3( SfxStatusListener, ::com::sun::star::lang::XComponent, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
 
-SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const OUString& rCommand ) :
+SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) :
     cppu::OWeakObject(),
     m_nSlotID( nSlotId ),
     m_xDispatchProvider( rDispatchProvider )
@@ -79,7 +79,7 @@ SfxStatusListener::~SfxStatusListener()
 }
 
 // old sfx controller item C++ API
-void SfxStatusListener::StateChanged( USHORT, SfxItemState, const SfxPoolItem* )
+void SfxStatusListener::StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* )
 {
     // must be implemented by sub class
 }
@@ -100,7 +100,7 @@ void SfxStatusListener::Bind()
     }
 }
 
-void SfxStatusListener::Bind( USHORT nSlotId, const rtl::OUString& rNewCommand )
+void SfxStatusListener::Bind( sal_uInt16 nSlotId, const rtl::OUString& rNewCommand )
 {
     // first remove old listener, if we have a dispatch object
     Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index d1605754680a..be365349888f 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -82,10 +82,10 @@ struct SfxShell_Impl: public SfxBroadcaster
     SfxViewFrame*               pFrame;     // Frame, falls <UI-aktiv>
     SfxRepeatTarget*            pRepeatTarget;
 //    SbxObjectRef                xParent;
-    BOOL                        bInAppBASIC;
-    BOOL                        bActive;
-    ULONG                       nDisableFlags;
-    ULONG                       nHelpId;
+    sal_Bool                        bInAppBASIC;
+    sal_Bool                        bActive;
+    sal_uIntPtr                     nDisableFlags;
+    sal_uIntPtr                       nHelpId;
     svtools::AsynchronLink*     pExecuter;
     svtools::AsynchronLink*     pUpdater;
     SfxVerbSlotArr_Impl         aSlotArr;
@@ -149,9 +149,9 @@ SfxShell::SfxShell()
     pImp->pViewSh = 0;
     pImp->pFrame = 0;
     pImp->pRepeatTarget = 0;
-    pImp->bInAppBASIC = FALSE;
+    pImp->bInAppBASIC = sal_False;
     pImp->nHelpId = 0L;
-    pImp->bActive = FALSE;
+    pImp->bActive = sal_False;
     pImp->nDisableFlags = 0;
 }
 
@@ -175,9 +175,9 @@ SfxShell::SfxShell( SfxViewShell *pViewSh )
     pImp->pViewSh = pViewSh;
     pImp->pFrame = 0;
     pImp->pRepeatTarget = 0;
-    pImp->bInAppBASIC = FALSE;
+    pImp->bInAppBASIC = sal_False;
     pImp->nHelpId = 0L;
-    pImp->bActive = FALSE;
+    pImp->bActive = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -310,7 +310,7 @@ SfxViewFrame* SfxShell::GetFrame() const
 
 const SfxPoolItem* SfxShell::GetItem
 (
-    USHORT  nSlotId         // Slot-Id des zu erfragenden <SfxPoolItem>s
+    sal_uInt16  nSlotId         // Slot-Id des zu erfragenden <SfxPoolItem>s
 )   const
 
 /*  [Beschreibung]
@@ -327,11 +327,11 @@ const SfxPoolItem* SfxShell::GetItem
     [Querverweise]
 
     <SfxShell::PutItem(const SfxPoolItem&)>
-    <SfxShell::RemoveItem(USHORT)>
+    <SfxShell::RemoveItem(sal_uInt16)>
 */
 
 {
-    for ( USHORT nPos = 0; nPos < pImp->aItems.Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pImp->aItems.Count(); ++nPos )
         if ( pImp->aItems.GetObject(nPos)->Which() == nSlotId )
             return pImp->aItems.GetObject(nPos);
     return 0;
@@ -341,7 +341,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]
@@ -356,11 +356,11 @@ void SfxShell::RemoveItem
     [Querverweise]
 
     <SfxShell::PutItem(const SfxPoolItem&)>
-    <SfxShell::GetItem(USHORT)>
+    <SfxShell::GetItem(sal_uInt16)>
 */
 
 {
-    for ( USHORT nPos = 0; nPos < pImp->aItems.Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pImp->aItems.Count(); ++nPos )
         if ( pImp->aItems.GetObject(nPos)->Which() == nSlotId )
         {
             // Item entfernen und l"oschen
@@ -400,8 +400,8 @@ void SfxShell::PutItem
 
     [Querverweise]
 
-    <SfxShell::RemoveItem(USHORT)>
-    <SfxShell::GetItem(USHORT)>
+    <SfxShell::RemoveItem(sal_uInt16)>
+    <SfxShell::GetItem(sal_uInt16)>
 */
 
 {
@@ -412,9 +412,9 @@ void SfxShell::PutItem
     // MSC auf WNT/W95 machte hier Mist, Vorsicht bei Umstellungen
     const SfxPoolItem *pItem = rItem.Clone();
     SfxPoolItemHint aItemHint( (SfxPoolItem*) pItem );
-    const USHORT nWhich = rItem.Which();
+    const sal_uInt16 nWhich = rItem.Which();
     SfxPoolItem **ppLoopItem = (SfxPoolItem**) pImp->aItems.GetData();
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < pImp->aItems.Count(); ++nPos, ++ppLoopItem )
     {
         if ( (*ppLoopItem)->Which() == nWhich )
@@ -430,12 +430,12 @@ void SfxShell::PutItem
             {
                 SfxBindings* pBindings = pDispat->GetBindings();
                 pBindings->Broadcast( aItemHint );
-                USHORT nSlotId = nWhich; //pItem->GetSlotId();
+                sal_uInt16 nSlotId = nWhich; //pItem->GetSlotId();
                 SfxStateCache* pCache = pBindings->GetStateCache( nSlotId );
                 if ( pCache )
                 {
-                    pCache->SetState( SFX_ITEM_AVAILABLE, pItem->Clone(), TRUE );
-                    pCache->SetCachedState( TRUE );
+                    pCache->SetState( SFX_ITEM_AVAILABLE, pItem->Clone(), sal_True );
+                    pCache->SetCachedState( sal_True );
                 }
             }
             return;
@@ -523,7 +523,7 @@ void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr )
 
     pUndoMgr = pNewUndoMgr;
     if ( pUndoMgr )
-        pUndoMgr->SetMaxUndoActionCount( (USHORT) SvtUndoOptions().GetUndoCount() );
+        pUndoMgr->SetMaxUndoActionCount( (sal_uInt16) SvtUndoOptions().GetUndoCount() );
 }
 
 //--------------------------------------------------------------------
@@ -579,7 +579,7 @@ void SfxShell::SetRepeatTarget( SfxRepeatTarget *pTarget )
 
 void SfxShell::Invalidate
 (
-    USHORT          nId     /* Zu invalidierende Slot-Id oder Which-Id.
+    sal_uInt16          nId     /* Zu invalidierende Slot-Id oder Which-Id.
                                Falls diese 0 ist (default), werden
                                alle z.Zt. von dieser Shell bedienten
                                Slot-Ids invalidiert. */
@@ -592,8 +592,8 @@ void SfxShell::Invalidate
     die von der Subclass ererbt sind, werden ebenfalls invalidert.
 
     [Querverweise]
-    <SfxBindings::Invalidate(USHORT)>
-    <SfxBindings::InvalidateAll(BOOL)>
+    <SfxBindings::Invalidate(sal_uInt16)>
+    <SfxBindings::InvalidateAll(sal_Bool)>
 */
 
 {
@@ -606,11 +606,11 @@ void SfxShell::Invalidate
     Invalidate_Impl( GetViewShell()->GetViewFrame()->GetBindings(), nId );
 }
 
-void SfxShell::Invalidate_Impl( SfxBindings& rBindings, USHORT nId )
+void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId )
 {
     if ( nId == 0 )
     {
-        rBindings.InvalidateShell( *this, FALSE );
+        rBindings.InvalidateShell( *this, sal_False );
     }
     else
     {
@@ -646,12 +646,12 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, USHORT nId )
 
 //--------------------------------------------------------------------
 
-void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
+void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
 
 /*  [Beschreibung]
 
     Diese Methode steuert die Aktivierung der SfxShell-Instanz. Zun"achst
-    wird durch Aufruf der virtuellen Methode <SfxShell::Activate(BOOL)>
+    wird durch Aufruf der virtuellen Methode <SfxShell::Activate(sal_Bool)>
     der Subclass die M"oglichkeit gegeben, auf das Event zu reagieren.
 
     Bei bMDI == TRUE wird das zugeh"orige SbxObject 'scharfgeschaltet',
@@ -679,7 +679,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
     {
         // Frame merken, in dem aktiviert wird
         pImp->pFrame = pFrame;
-        pImp->bActive = TRUE;
+        pImp->bActive = sal_True;
     }
 
     // Subklasse benachrichtigen
@@ -688,7 +688,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
 
 //--------------------------------------------------------------------
 
-void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
+void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
 
 /*  [Beschreibung]
 
@@ -698,7 +698,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
     k"onnen.
 
     Dann erh"alt in jedem Fall die Subclass durch Aufruf der virtuellen
-    Methode <SfxShell::Deactivate(BOOL)> die M"oglichkeit auf das Event
+    Methode <SfxShell::Deactivate(sal_Bool)> die M"oglichkeit auf das Event
     zu reagieren.
 */
 
@@ -723,7 +723,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
     {
         // austragen
         pImp->pFrame = 0;
-        pImp->bActive = FALSE;
+        pImp->bActive = sal_False;
     }
 
     // Subklasse benachrichtigen
@@ -732,7 +732,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
 
 //--------------------------------------------------------------------
 
-BOOL SfxShell::IsActive() const
+sal_Bool SfxShell::IsActive() const
 {
     return pImp->bActive;
 }
@@ -741,7 +741,7 @@ BOOL SfxShell::IsActive() const
 
 void SfxShell::Activate
 (
-    BOOL    /*bMDI*/        /*  TRUE
+    sal_Bool    /*bMDI*/        /*  TRUE
                             der <SfxDispatcher>, auf dem die SfxShell sich
                             befindet, ist aktiv geworden oder die SfxShell
                             Instanz wurde auf einen aktiven SfxDispatcher
@@ -764,7 +764,7 @@ void SfxShell::Activate
 
 
     [Querverweise]
-    StarView SystemWindow::Activate(BOOL)
+    StarView SystemWindow::Activate(sal_Bool)
 */
 
 {
@@ -774,7 +774,7 @@ void SfxShell::Activate
 
 void SfxShell::Deactivate
 (
-    BOOL    /*bMDI*/        /*  TRUE
+    sal_Bool    /*bMDI*/        /*  TRUE
                             der <SfxDispatcher>, auf dem die SfxShell sich
                             befindet, ist inaktiv geworden oder die SfxShell
                             Instanz wurde auf einen aktiven SfxDispatcher
@@ -797,7 +797,7 @@ void SfxShell::Deactivate
 
 
     [Querverweise]
-    StarView SystemWindow::Dectivate(BOOL)
+    StarView SystemWindow::Dectivate(sal_Bool)
 */
 
 {
@@ -857,7 +857,7 @@ ResMgr* SfxShell::GetResMgr() const
 
 //--------------------------------------------------------------------
 
-FASTBOOL SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
+bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 
 /*  [Beschreibung]
 
@@ -867,7 +867,7 @@ FASTBOOL SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 {
     // Slot-Status holen
     SfxItemPool &rPool = GetPool();
-    const USHORT nId = rSlot.GetWhich( rPool );
+    const sal_uInt16 nId = rSlot.GetWhich( rPool );
     SfxItemSet aSet(rPool, nId, nId);
     SfxStateFunc pFunc = rSlot.GetStateFnc();
     CallState( pFunc, aSet );
@@ -887,7 +887,7 @@ long ShellCall_Impl( void* pObj, void* pArg )
  */
 
 //--------------------------------------------------------------------
-const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, BOOL bAsync )
+const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, sal_Bool bAsync )
 {
     if( !bAsync )
         return ExecuteSlot( rReq, (SfxInterface*)0L );
@@ -938,14 +938,14 @@ const SfxPoolItem* SfxShell::ExecuteSlot
 
     [Querverweise]
 
-    <SfxShell::GetSlotState(USHORT,const SfxInterface*,SfxItemSet*)>
+    <SfxShell::GetSlotState(sal_uInt16,const SfxInterface*,SfxItemSet*)>
 */
 
 {
     if ( !pIF )
         pIF = GetInterface();
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     const SfxSlot* pSlot = NULL;
     if ( nSlot >= SID_VERB_START && nSlot <= SID_VERB_END )
         pSlot = GetVerbSlot_Impl(nSlot);
@@ -964,7 +964,7 @@ const SfxPoolItem* SfxShell::ExecuteSlot
 
 const SfxPoolItem* SfxShell::GetSlotState
 (
-    USHORT              nSlotId,    // Slot-Id des zu befragenden Slots
+    sal_uInt16              nSlotId,    // Slot-Id des zu befragenden Slots
     const SfxInterface* pIF,        // default = 0 bedeutet virtuell besorgen
     SfxItemSet*         pStateSet   // SfxItemSet der Slot-State-Methode
 )
@@ -1032,7 +1032,7 @@ const SfxPoolItem* SfxShell::GetSlotState
         SfxStateFunc pFunc = pSlot->GetStateFnc();
         if ( pFunc )
             CallState( pFunc, aSet );
-        eState = aSet.GetItemState( nSlotId, TRUE, &pItem );
+        eState = aSet.GetItemState( nSlotId, sal_True, &pItem );
 
         // ggf. Default-Item besorgen
         if ( eState == SFX_ITEM_DEFAULT )
@@ -1089,18 +1089,18 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
     {
         SfxBindings *pBindings =
             pViewSh->GetViewFrame()->GetDispatcher()->GetBindings();
-        USHORT nCount = pImp->aSlotArr.Count();
-        for (USHORT n1=0; n1<nCount ; n1++)
+        sal_uInt16 nCount = pImp->aSlotArr.Count();
+        for (sal_uInt16 n1=0; n1<nCount ; n1++)
         {
-            USHORT nId = SID_VERB_START + n1;
-            pBindings->Invalidate(nId, FALSE, TRUE);
+            sal_uInt16 nId = SID_VERB_START + n1;
+            pBindings->Invalidate(nId, sal_False, sal_True);
         }
     }
 
-    USHORT nr=0;
+    sal_uInt16 nr=0;
     for (sal_Int32 n=0; n<aVerbs.getLength(); n++)
     {
-        USHORT nSlotId = SID_VERB_START + nr++;
+        sal_uInt16 nSlotId = SID_VERB_START + nr++;
         DBG_ASSERT(nSlotId <= SID_VERB_END, "Zuviele Verben!");
         if (nSlotId > SID_VERB_END)
             break;
@@ -1132,7 +1132,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
         else
             pNewSlot->pNextSlot = pNewSlot;
 
-        pImp->aSlotArr.Insert(pNewSlot, (USHORT) n);
+        pImp->aSlotArr.Insert(pNewSlot, (sal_uInt16) n);
     }
 
     pImp->aVerbList = aVerbs;
@@ -1143,7 +1143,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
         // abgeholt, es reicht also, ein neues StatusUpdate anzuregen
         SfxBindings *pBindings = pViewSh->GetViewFrame()->GetDispatcher()->
                 GetBindings();
-        pBindings->Invalidate( SID_OBJECT, TRUE, TRUE );
+        pBindings->Invalidate( SID_OBJECT, sal_True, sal_True );
     }
 }
 
@@ -1158,11 +1158,11 @@ const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& S
 
 void SfxShell::VerbExec(SfxRequest& rReq)
 {
-    USHORT nId = rReq.GetSlot();
+    sal_uInt16 nId = rReq.GetSlot();
     SfxViewShell *pViewShell = GetViewShell();
     if ( pViewShell )
     {
-        BOOL bReadOnly = pViewShell->GetObjectShell()->IsReadOnly();
+        sal_Bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly();
         com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aList = pViewShell->GetVerbs();
         for (sal_Int32 n=0, nVerb=0; n<aList.getLength(); n++)
         {
@@ -1192,12 +1192,12 @@ void SfxShell::VerbState(SfxItemSet& )
 
 //--------------------------------------------------------------------
 
-const SfxSlot* SfxShell::GetVerbSlot_Impl(USHORT nId) const
+const SfxSlot* SfxShell::GetVerbSlot_Impl(sal_uInt16 nId) const
 {
     com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > rList = pImp->aVerbList;
 
     DBG_ASSERT(nId >= SID_VERB_START && nId <= SID_VERB_END,"Falsche VerbId!");
-    USHORT nIndex = nId - SID_VERB_START;
+    sal_uInt16 nIndex = nId - SID_VERB_START;
     DBG_ASSERT(nIndex < rList.getLength(),"Falsche VerbId!");
 
     if (nIndex < rList.getLength())
@@ -1208,14 +1208,14 @@ const SfxSlot* SfxShell::GetVerbSlot_Impl(USHORT nId) const
 
 //--------------------------------------------------------------------
 
-void SfxShell::SetHelpId(ULONG nId)
+void SfxShell::SetHelpId(sal_uIntPtr nId)
 {
     pImp->nHelpId = nId;
 }
 
 //--------------------------------------------------------------------
 
-ULONG SfxShell::GetHelpId() const
+sal_uIntPtr SfxShell::GetHelpId() const
 {
     return pImp->nHelpId;
 }
@@ -1239,8 +1239,8 @@ sal_Bool SfxShell::HasUIFeature( sal_uInt32 )
 
 long DispatcherUpdate_Impl( void*, void* pArg )
 {
-    ((SfxDispatcher*) pArg)->Update_Impl( TRUE );
-    ((SfxDispatcher*) pArg)->GetBindings()->InvalidateAll(FALSE);
+    ((SfxDispatcher*) pArg)->Update_Impl( sal_True );
+    ((SfxDispatcher*) pArg)->GetBindings()->InvalidateAll(sal_False);
     return 0;
 }
 
@@ -1256,26 +1256,26 @@ void SfxShell::UIFeatureChanged()
             pImp->pUpdater = new svtools::AsynchronLink( Link( this, DispatcherUpdate_Impl ) );
 
         // Mehrfachaufrufe gestattet
-        pImp->pUpdater->Call( pFrame->GetDispatcher(), TRUE );
+        pImp->pUpdater->Call( pFrame->GetDispatcher(), sal_True );
     }
 }
 
-void SfxShell::SetDisableFlags( ULONG nFlags )
+void SfxShell::SetDisableFlags( sal_uIntPtr nFlags )
 {
     pImp->nDisableFlags = nFlags;
 }
 
-ULONG SfxShell::GetDisableFlags() const
+sal_uIntPtr SfxShell::GetDisableFlags() const
 {
     return pImp->nDisableFlags;
 }
 
-SfxItemSet* SfxShell::CreateItemSet( USHORT )
+SfxItemSet* SfxShell::CreateItemSet( sal_uInt16 )
 {
     return NULL;
 }
 
-void SfxShell::ApplyItemSet( USHORT, const SfxItemSet& )
+void SfxShell::ApplyItemSet( sal_uInt16, const SfxItemSet& )
 {
 }
 
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index cb24fe34e9b6..df627a19e6fb 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -88,17 +88,17 @@ int SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const
 }
 
 
-sal_Bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     String aValue;
-    BOOL bIsString = FALSE;
+    sal_Bool bIsString = sal_False;
     sal_Bool bValue = sal_False;
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
     {
         case 0:
         case MID_SCRIPT_ORGANIZER_LANGUAGE:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = aLanguage;
             break;
         default:
@@ -113,7 +113,7 @@ sal_Bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, BYT
     return sal_True;
 }
 
-sal_Bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     ::rtl::OUString aValue;
     sal_Bool bRet = sal_False;
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 3fdd14369856..889cf97b1b6c 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -366,7 +366,7 @@ void SfxStateCache::SetState
 (
     SfxItemState        eState,     // <SfxItemState> von 'pState'
     const SfxPoolItem*  pState,     // Status des Slots, ggf. 0 oder -1
-    BOOL bMaybeDirty
+    sal_Bool bMaybeDirty
 )
 
 /*  [Beschreibung]
@@ -386,7 +386,7 @@ void SfxStateCache::SetState
 
 //--------------------------------------------------------------------
 
-void SfxStateCache::SetVisibleState( BOOL bShow )
+void SfxStateCache::SetVisibleState( sal_Bool bShow )
 {
     SfxItemState        eState( SFX_ITEM_AVAILABLE );
     const SfxPoolItem*  pState( NULL );
@@ -411,7 +411,7 @@ void SfxStateCache::SetVisibleState( BOOL bShow )
         }
         else
         {
-            pState = new SfxVisibilityItem( nId, FALSE );
+            pState = new SfxVisibilityItem( nId, sal_False );
             bDeleteItem = sal_True;
         }
 
@@ -438,7 +438,7 @@ void SfxStateCache::SetState_Impl
 (
     SfxItemState        eState,     // <SfxItemState> von 'pState'
     const SfxPoolItem*  pState,     // Status des Slots, ggf. 0 oder -1
-    BOOL bMaybeDirty
+    sal_Bool bMaybeDirty
 )
 {
     (void)bMaybeDirty; //unused
@@ -457,10 +457,10 @@ void SfxStateCache::SetState_Impl
     DBG_PROFSTART(SfxStateCacheSetState);
 
     // m"ussen die Controller "uberhaupt benachrichtigt werden?
-    FASTBOOL bNotify = bItemDirty;
+    bool bNotify = bItemDirty;
     if ( !bItemDirty )
     {
-        FASTBOOL bBothAvailable = pLastItem && pState &&
+        bool bBothAvailable = pLastItem && pState &&
                     !IsInvalidItem(pState) && !IsInvalidItem(pLastItem);
         DBG_ASSERT( !bBothAvailable || pState != pLastItem, "setting state with own item" );
         if ( bBothAvailable )
@@ -504,7 +504,7 @@ void SfxStateCache::SetState_Impl
 
 // alten Status in allen Controllern nochmal setzen
 
-void SfxStateCache::SetCachedState( BOOL bAlways )
+void SfxStateCache::SetCachedState( sal_Bool bAlways )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxStateCache, 0);
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f85d0d8e9e49..2a54e5b1c638 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -605,12 +605,12 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util
             }
             else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_BOOL], 4 ))
             {
-                // BOOL support
+                // sal_Bool support
                 rArgs[nLen].Value <<= aValue.toBoolean();
             }
             else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_BYTE], 4 ))
             {
-                // BYTE support
+                // sal_uInt8 support
                 rArgs[nLen].Value <<= sal_Int8( aValue.toInt32() );
             }
             else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_LONG], 4 ))
@@ -650,7 +650,7 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util
 
 SfxMapUnit SfxDispatchController_Impl::GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlotId )
 {
-    USHORT nWhich = rPool.GetWhich( nSlotId );
+    sal_uInt16 nWhich = rPool.GetWhich( nSlotId );
     return rPool.GetMetric( nWhich );
 }
 
@@ -770,7 +770,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             {
                 const SfxSlot *pSlot = 0;
                 if ( pDispatcher->GetShellAndSlot_Impl( GetId(), &pShell, &pSlot, sal_False,
-                        SFX_CALLMODE_MODAL==(nCall&SFX_CALLMODE_MODAL), FALSE ) )
+                        SFX_CALLMODE_MODAL==(nCall&SFX_CALLMODE_MODAL), sal_False ) )
                 {
                     if ( bMasterSlave )
                     {
@@ -851,10 +851,10 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             aEvent.Source = (::com::sun::star::frame::XDispatch*) pDispatch;
             if ( bSuccess && pItem && !pItem->ISA(SfxVoidItem) )
             {
-                USHORT nSubId( 0 );
+                sal_uInt16 nSubId( 0 );
                 if ( eMapUnit == SFX_MAPUNIT_TWIP )
                     nSubId |= CONVERT_TWIPS;
-                pItem->QueryValue( aEvent.Result, (BYTE)nSubId );
+                pItem->QueryValue( aEvent.Result, (sal_uInt8)nSubId );
             }
 
             rListener->dispatchFinished( aEvent );
@@ -957,7 +957,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
         if ( ( eState >= SFX_ITEM_AVAILABLE ) && pState && !IsInvalidItem( pState ) && !pState->ISA(SfxVoidItem) )
         {
             // Retrieve metric from pool to have correct sub ID when calling QueryValue
-            USHORT     nSubId( 0 );
+            sal_uInt16     nSubId( 0 );
             SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
 
             // retrieve the core metric
@@ -975,7 +975,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
             if ( eMapUnit == SFX_MAPUNIT_TWIP )
                 nSubId |= CONVERT_TWIPS;
 
-            pState->QueryValue( aState, (BYTE)nSubId );
+            pState->QueryValue( aState, (sal_uInt8)nSubId );
         }
         else if ( eState == SFX_ITEM_DONTCARE )
         {
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 5a7f8a1fd900..c7f9bbeec244 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -62,7 +62,7 @@ class SfxModelessDialog_Impl : public SfxListener
 public:
     ByteString      aWinState;
     SfxChildWindow* pMgr;
-    BOOL            bConstructed;
+    sal_Bool            bConstructed;
     void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     Timer           aMoveTimer;
@@ -86,7 +86,7 @@ class SfxFloatingWindow_Impl : public SfxListener
 public:
     ByteString      aWinState;
     SfxChildWindow* pMgr;
-    BOOL            bConstructed;
+    sal_Bool            bConstructed;
     Timer           aMoveTimer;
 
     void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -274,7 +274,7 @@ void SfxModelessDialog::StateChanged( StateChangedType nStateChange )
             }
         }
 
-        pImp->bConstructed = TRUE;
+        pImp->bConstructed = sal_True;
     }
 
     ModelessDialog::StateChanged( nStateChange );
@@ -334,7 +334,7 @@ IMPL_LINK( SfxModelessDialog, TimerHdl, Timer*, EMPTYARG)
     {
         if ( !IsRollUp() )
             aSize = GetSizePixel();
-        ULONG nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+        sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
         if ( GetStyle() & WB_SIZEABLE )
             nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
         pImp->aWinState = GetWindowState( nMask );
@@ -353,7 +353,7 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
     pImp( new SfxModelessDialog_Impl )
 {
     pImp->pMgr = pCW;
-    pImp->bConstructed = FALSE;
+    pImp->bConstructed = sal_False;
     SetUniqueId( GetHelpId() );
     SetHelpId("");
     if ( pBindinx )
@@ -372,7 +372,7 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
     pImp( new SfxModelessDialog_Impl )
 {
     pImp->pMgr = pCW;
-    pImp->bConstructed = FALSE;
+    pImp->bConstructed = sal_False;
     SetUniqueId( GetHelpId() );
     SetHelpId("");
     if ( pBindinx )
@@ -539,7 +539,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
     pImp( new SfxFloatingWindow_Impl )
 {
     pImp->pMgr = pCW;
-    pImp->bConstructed = FALSE;
+    pImp->bConstructed = sal_False;
     SetUniqueId( GetHelpId() );
     SetHelpId("");
     if ( pBindinx )
@@ -559,7 +559,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
     pImp( new SfxFloatingWindow_Impl )
 {
     pImp->pMgr = pCW;
-    pImp->bConstructed = FALSE;
+    pImp->bConstructed = sal_False;
     SetUniqueId( GetHelpId() );
     SetHelpId("");
     if ( pBindinx )
@@ -649,7 +649,7 @@ IMPL_LINK( SfxFloatingWindow, TimerHdl, Timer*, EMPTYARG)
     {
         if ( !IsRollUp() )
             aSize = GetSizePixel();
-        ULONG nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+        sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
         if ( GetStyle() & WB_SIZEABLE )
             nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
         pImp->aWinState = GetWindowState( nMask );
@@ -666,7 +666,7 @@ void SfxFloatingWindow::StateChanged( StateChangedType nStateChange )
         // FloatingWindows are not centered by default
         if ( pImp->aWinState.Len() )
             SetWindowState( pImp->aWinState );
-        pImp->bConstructed = TRUE;
+        pImp->bConstructed = sal_True;
     }
 
     FloatingWindow::StateChanged( nStateChange );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 3d848d4d5648..b8c2bec4ba5a 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -117,26 +117,26 @@ bool operator==(const util::DateTime &i_rLeft, const util::DateTime &i_rRight)
 
 TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem);
 
-const USHORT HI_NAME = 1;
-const USHORT HI_TYPE = 2;
-const USHORT HI_VALUE = 3;
-const USHORT HI_ACTION = 4;
+const sal_uInt16 HI_NAME = 1;
+const sal_uInt16 HI_TYPE = 2;
+const sal_uInt16 HI_VALUE = 3;
+const sal_uInt16 HI_ACTION = 4;
 
 static const char DOCUMENT_SIGNATURE_MENU_CMD[]      = "Signature";
 
 //------------------------------------------------------------------------
-String CreateSizeText( ULONG nSize, BOOL bExtraBytes = TRUE, BOOL bSmartExtraBytes = FALSE );
-String CreateSizeText( ULONG nSize, BOOL bExtraBytes, BOOL bSmartExtraBytes )
+String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes = sal_True, sal_Bool bSmartExtraBytes = sal_False );
+String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes, sal_Bool bSmartExtraBytes )
 {
     String aUnitStr = ' ';
     aUnitStr += String( SfxResId(STR_BYTES) );
-    ULONG nSize1 = nSize;
-    ULONG nSize2 = nSize1;
-    ULONG nMega = 1024 * 1024;
-    ULONG nGiga = nMega * 1024;
+    sal_uIntPtr nSize1 = nSize;
+    sal_uIntPtr nSize2 = nSize1;
+    sal_uIntPtr nMega = 1024 * 1024;
+    sal_uIntPtr nGiga = nMega * 1024;
     double fSize = nSize;
     int nDec = 0;
-    BOOL bGB = FALSE;
+    sal_Bool bGB = sal_False;
 
     if ( nSize1 >= 10000 && nSize1 < nMega )
     {
@@ -159,7 +159,7 @@ String CreateSizeText( ULONG nSize, BOOL bExtraBytes, BOOL bSmartExtraBytes )
         nSize1 /= nGiga;
         aUnitStr = ' ';
         aUnitStr += String( SfxResId(STR_GB) );
-        bGB = TRUE;
+        bGB = sal_True;
         fSize /= nGiga;
         nDec = 3;
     }
@@ -198,7 +198,7 @@ String ConvertDateTime_Impl( const String& rName,
      const String pDelim ( DEFINE_CONST_UNICODE( ", "));
      String aStr( rWrapper.getDate( aD ) );
      aStr += pDelim;
-     aStr += rWrapper.getTime( aT, TRUE, FALSE );
+     aStr += rWrapper.getTime( aT, sal_True, sal_False );
      String aAuthor = rName;
      aAuthor.EraseLeadingChars();
      if ( aAuthor.Len() )
@@ -510,13 +510,13 @@ void SfxDocumentInfoItem::AddCustomProperty( const ::rtl::OUString& sName, const
     m_aCustomProperties.push_back( pProp );
 }
 
-sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
+sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
 {
     String aValue;
     sal_Int32 nValue = 0;
     sal_Bool bValue = sal_False;
-    BOOL bIsInt = FALSE;
-    BOOL bIsString = FALSE;
+    sal_Bool bIsInt = sal_False;
+    sal_Bool bIsString = sal_False;
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
     {
@@ -530,31 +530,31 @@ sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
             bValue = isAutoloadEnabled();
             break;
         case MID_DOCINFO_AUTOLOADSECS:
-            bIsInt = TRUE;
+            bIsInt = sal_True;
             nValue = getAutoloadDelay();
             break;
         case MID_DOCINFO_AUTOLOADURL:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getAutoloadURL();
             break;
         case MID_DOCINFO_DEFAULTTARGET:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getDefaultTarget();
             break;
         case MID_DOCINFO_DESCRIPTION:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getDescription();
             break;
         case MID_DOCINFO_KEYWORDS:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getKeywords();
             break;
         case MID_DOCINFO_SUBJECT:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getSubject();
             break;
         case MID_DOCINFO_TITLE:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getTitle();
             break;
         default:
@@ -571,7 +571,7 @@ sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 
-sal_Bool SfxDocumentInfoItem::PutValue( const Any& rVal, BYTE nMemberId )
+sal_Bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId )
 {
     ::rtl::OUString aValue;
     sal_Int32 nValue=0;
@@ -669,16 +669,16 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItem
 
 //------------------------------------------------------------------------
 
-BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
+sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
 {
     // Pruefung, ob eine Aenderung vorliegt
-    const BOOL bTitleMod = aTitleEd.IsModified();
-    const BOOL bThemeMod = aThemaEd.IsModified();
-    const BOOL bKeywordsMod = aKeywordsEd.IsModified();
-    const BOOL bCommentMod = aCommentEd.IsModified();
+    const sal_Bool bTitleMod = aTitleEd.IsModified();
+    const sal_Bool bThemeMod = aThemaEd.IsModified();
+    const sal_Bool bKeywordsMod = aKeywordsEd.IsModified();
+    const sal_Bool bCommentMod = aCommentEd.IsModified();
     if( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
     {
-        return FALSE;
+        return sal_False;
     }
 
     // Erzeugung der Ausgabedaten
@@ -690,7 +690,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
     if ( pDlg )
         pExSet = pDlg->GetExampleSet();
 
-    if ( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+    if ( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
         pInfo = pInfoItem;
     else if ( pItem )
         pInfo = new SfxDocumentInfoItem( *(const SfxDocumentInfoItem *)pItem );
@@ -698,7 +698,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
     if ( !pInfo )
     {
         DBG_ERRORFILE( "SfxDocumentDescPage::FillItemSet(): no item found" );
-        return FALSE;
+        return sal_False;
     }
 
     if( bTitleMod )
@@ -723,7 +723,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
         delete pInfo;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -737,13 +737,13 @@ void SfxDocumentDescPage::Reset(const SfxItemSet &rSet)
      aKeywordsEd.SetText( pInfoItem->getKeywords() );
      aCommentEd.SetText( pInfoItem->getDescription() );
 
-     SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+     SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
      if ( pROItem && pROItem->GetValue() )
      {
-        aTitleEd.SetReadOnly( TRUE );
-        aThemaEd.SetReadOnly( TRUE );
-        aKeywordsEd.SetReadOnly( TRUE );
-        aCommentEd.SetReadOnly( TRUE );
+        aTitleEd.SetReadOnly( sal_True );
+        aThemaEd.SetReadOnly( sal_True );
+        aKeywordsEd.SetReadOnly( sal_True );
+        aCommentEd.SetReadOnly( sal_True );
     }
 }
 
@@ -824,8 +824,8 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet )
     aUnknownSize    ( SfxResId( STR_UNKNOWNSIZE ) ),
     aMultiSignedStr ( SfxResId( STR_MULTSIGNED ) ),
 
-    bEnableUseUserData  ( FALSE ),
-    bHandleDelete       ( FALSE )
+    bEnableUseUserData  ( sal_False ),
+    bHandleDelete       ( sal_False )
 
 {
     FreeResource();
@@ -891,7 +891,7 @@ IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG )
     const Time aTime( 0 );
     aTimeLogValFt.SetText( aLocaleWrapper.getDuration( aTime ) );
     aDocNoValFt.SetText( '1' );
-    bHandleDelete = TRUE;
+    bHandleDelete = sal_True;
     return 0;
 }
 
@@ -954,16 +954,16 @@ SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet& rItemSet
 
 void SfxDocumentPage::EnableUseUserData()
 {
-    bEnableUseUserData = TRUE;
+    bEnableUseUserData = sal_True;
     aUseUserDataCB.Show();
     aDeleteBtn.Show();
 }
 
 //------------------------------------------------------------------------
 
-BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if ( !bHandleDelete && bEnableUseUserData &&
          aUseUserDataCB.GetState() != aUseUserDataCB.GetSavedValue() &&
@@ -972,10 +972,10 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
         const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
         const SfxPoolItem* pItem;
 
-        if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+        if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
         {
             SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem;
-            BOOL bUseData = ( STATE_CHECK == aUseUserDataCB.GetState() );
+            sal_Bool bUseData = ( STATE_CHECK == aUseUserDataCB.GetState() );
             pInfoItem->SetUseUserData( bUseData );
 /*
             if ( !bUseData )
@@ -992,7 +992,7 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
             }
 */
             rSet.Put( SfxDocumentInfoItem( *pInfoItem ) );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -1000,10 +1000,10 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
     {
         const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+        if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
         {
             SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem;
-            BOOL bUseAuthor = bEnableUseUserData && aUseUserDataCB.IsChecked();
+            sal_Bool bUseAuthor = bEnableUseUserData && aUseUserDataCB.IsChecked();
             SfxDocumentInfoItem newItem( *pInfoItem );
             newItem.resetUserData( bUseAuthor
                 ? SvtUserOptions().GetFullName()
@@ -1011,22 +1011,22 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
             pInfoItem->SetUseUserData( STATE_CHECK == aUseUserDataCB.GetState() );
             newItem.SetUseUserData( STATE_CHECK == aUseUserDataCB.GetState() );
 
-            newItem.SetDeleteUserData( TRUE );
+            newItem.SetDeleteUserData( sal_True );
             rSet.Put( newItem );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
     if ( aNameED.IsModified() && aNameED.GetText().Len() )
     {
         rSet.Put( SfxStringItem( ID_FILETP_TITLE, aNameED.GetText() ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
-    if ( /* aReadOnlyCB.IsModified() */ TRUE )
+    if ( /* aReadOnlyCB.IsModified() */ sal_True )
     {
         rSet.Put( SfxBoolItem( ID_FILETP_READONLY, aReadOnlyCB.IsChecked() ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -1056,7 +1056,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     String aFactory( aFile );
     if ( aFile.Len() > 2 && aFile.GetChar(0) == '[' )
     {
-        USHORT nPos = aFile.Search( ']' );
+        sal_uInt16 nPos = aFile.Search( ']' );
         aFactory = aFile.Copy( 1, nPos-1  );
         aFile = aFile.Copy( nPos+1 );
     }
@@ -1064,13 +1064,13 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     // determine name
     String aName;
     const SfxPoolItem* pItem = 0;
-    if ( SFX_ITEM_SET != rSet.GetItemState( ID_FILETP_TITLE, FALSE, &pItem ) )
+    if ( SFX_ITEM_SET != rSet.GetItemState( ID_FILETP_TITLE, sal_False, &pItem ) )
     {
         INetURLObject aURL(aFile);
         aName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET );
         if ( !aName.Len() || aURL.GetProtocol() == INET_PROT_PRIVATE )
             aName = String( SfxResId( STR_NONAME ) );
-        aNameED.SetReadOnly( TRUE );
+        aNameED.SetReadOnly( sal_True );
     }
     else
     {
@@ -1081,7 +1081,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     aNameED.ClearModifyFlag();
 
     // determine RO-Flag
-    if ( SFX_ITEM_UNKNOWN == rSet.GetItemState( ID_FILETP_READONLY, FALSE, &pItem )
+    if ( SFX_ITEM_UNKNOWN == rSet.GetItemState( ID_FILETP_READONLY, sal_False, &pItem )
          || !pItem )
         aReadOnlyCB.Hide();
     else
@@ -1092,7 +1092,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     aURL.SetSmartProtocol( INET_PROT_FILE );
     aURL.SetSmartURL( aFactory);
     const String& rMainURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
-    aBmp1.SetImage( SvFileInformationManager::GetImage( aURL, TRUE ) );
+    aBmp1.SetImage( SvFileInformationManager::GetImage( aURL, sal_True ) );
 
     // determine size and type
     String aSizeText( aUnknownSize );
@@ -1147,12 +1147,12 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     TriState eState = (TriState)m_bUseUserData;
 
     if ( STATE_DONTKNOW == eState )
-        aUseUserDataCB.EnableTriState( TRUE );
+        aUseUserDataCB.EnableTriState( sal_True );
 
     aUseUserDataCB.SetState( eState );
     aUseUserDataCB.SaveValue();
     aUseUserDataCB.Enable( bEnableUseUserData );
-    bHandleDelete = FALSE;
+    bHandleDelete = sal_False;
     aDeleteBtn.Enable( bEnableUseUserData );
 }
 
@@ -1197,7 +1197,7 @@ SfxInternetPage::SfxInternetPage( Window* pParent, const SfxItemSet& rItemSet )
             pFrame->GetTargetList( aList );
 
             String*         pObj;
-            for( USHORT nPos = ( USHORT ) aList.Count() ; nPos ; )
+            for( sal_uInt16 nPos = ( sal_uInt16 ) aList.Count() ; nPos ; )
             {
                 pObj = aList.GetObject( --nPos );
                 aCBFrame.InsertEntry( *pObj );
@@ -1235,30 +1235,30 @@ void SfxInternetPage::ChangeState( STATE eNewState )
     switch( eState )
     {
         case S_Init:
-            EnableNoUpdate( TRUE );
-            EnableReload( FALSE );
-            EnableForward( FALSE );
+            EnableNoUpdate( sal_True );
+            EnableReload( sal_False );
+            EnableForward( sal_False );
             break;
         case S_NoUpdate:
-            EnableNoUpdate( FALSE );
+            EnableNoUpdate( sal_False );
             if( eNewState == S_Reload )
-                EnableReload( TRUE );
+                EnableReload( sal_True );
             else
-                EnableForward( TRUE );
+                EnableForward( sal_True );
             break;
         case S_Reload:
-            EnableReload( FALSE );
+            EnableReload( sal_False );
             if( eNewState == S_NoUpdate )
-                EnableNoUpdate( TRUE );
+                EnableNoUpdate( sal_True );
             else
-                EnableForward( TRUE );
+                EnableForward( sal_True );
             break;
         case S_Forward:
-            EnableForward( FALSE );
+            EnableForward( sal_False );
             if( eNewState == S_NoUpdate )
-                EnableNoUpdate( TRUE );
+                EnableNoUpdate( sal_True );
             else
-                EnableReload( TRUE );
+                EnableReload( sal_True );
             break;
         default:
             DBG_ERROR( "*SfxInternetPage::SetState(): unhandled state!" );
@@ -1269,7 +1269,7 @@ void SfxInternetPage::ChangeState( STATE eNewState )
 
 //------------------------------------------------------------------------
 
-void SfxInternetPage::EnableNoUpdate( BOOL bEnable )
+void SfxInternetPage::EnableNoUpdate( sal_Bool bEnable )
 {
     if( bEnable )
         aRBNoAutoUpdate.Check();
@@ -1277,7 +1277,7 @@ void SfxInternetPage::EnableNoUpdate( BOOL bEnable )
 
 //------------------------------------------------------------------------
 
-void SfxInternetPage::EnableReload( BOOL bEnable )
+void SfxInternetPage::EnableReload( sal_Bool bEnable )
 {
     aFTEvery.Enable( bEnable );
     aNFReload.Enable( bEnable );
@@ -1289,7 +1289,7 @@ void SfxInternetPage::EnableReload( BOOL bEnable )
 
 //------------------------------------------------------------------------
 
-void SfxInternetPage::EnableForward( BOOL bEnable )
+void SfxInternetPage::EnableForward( sal_Bool bEnable )
 {
     aFTAfter.Enable( bEnable );
     aNFAfter.Enable( bEnable );
@@ -1357,7 +1357,7 @@ IMPL_LINK( SfxInternetPage, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG )
 
 //------------------------------------------------------------------------
 
-BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
 {
     const SfxPoolItem*          pItem = NULL;
     SfxDocumentInfoItem*        pInfo = NULL;
@@ -1367,7 +1367,7 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet )
     if( pDlg )
         pExSet = pDlg->GetExampleSet();
 
-    if( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+    if( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
         pInfo = pInfoItem;
     else if ( pItem )
         pInfo = new SfxDocumentInfoItem( *(const SfxDocumentInfoItem*)pItem );
@@ -1375,33 +1375,33 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet )
     if ( !pInfo )
     {
         DBG_ERRORFILE( "SfxInternetPage::FillItemSet(): no item found" );
-        return FALSE;
+        return sal_False;
     }
 
     DBG_ASSERT( eState != S_Init, "*SfxInternetPage::FillItemSet(): state init is not acceptable at this point!" );
 
-    BOOL                        bEnableReload = FALSE;
+    sal_Bool                        bEnableReload = sal_False;
     ::std::auto_ptr< String >   aURL( NULL );
     ::std::auto_ptr< String >   aFrame( NULL );
-    ULONG                       nDelay = 0;
+    sal_uIntPtr                     nDelay = 0;
 
     switch( eState )
     {
         case S_NoUpdate:
             break;
         case S_Reload:
-            bEnableReload = TRUE;
+            bEnableReload = sal_True;
             aURL = ::std::auto_ptr< String >( new String() );
             aFrame = ::std::auto_ptr< String >( new String() );
-            nDelay = static_cast<ULONG>(aNFReload.GetValue());
+            nDelay = static_cast<sal_uIntPtr>(aNFReload.GetValue());
             break;
         case S_Forward:
             DBG_ASSERT( aEDForwardURL.GetText().Len(), "+SfxInternetPage::FillItemSet(): empty URL should be not possible for forward option!" );
 
-            bEnableReload = TRUE;
+            bEnableReload = sal_True;
             aURL = ::std::auto_ptr< String >( new String( URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aEDForwardURL.GetText(), URIHelper::GetMaybeFileHdl(), true ) ) );
             aFrame = ::std::auto_ptr< String >( new String( aCBFrame.GetText() ) );
-            nDelay = static_cast<ULONG>(aNFAfter.GetValue());
+            nDelay = static_cast<sal_uIntPtr>(aNFAfter.GetValue());
             break;
               default:
                   break;
@@ -1419,7 +1419,7 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet )
     rSet.Put( *pInfo );
     if( pInfo != pInfoItem )
         delete pInfo;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -1434,7 +1434,7 @@ SfxTabPage *SfxInternetPage::Create( Window* pParent, const SfxItemSet& rItemSet
 void SfxInternetPage::Reset( const SfxItemSet& rSet )
 {
     pInfoItem = &( SfxDocumentInfoItem& ) rSet.Get( SID_DOCINFO );
-    SFX_ITEMSET_ARG( &rSet, pURLItem, SfxStringItem, SID_BASEURL, FALSE );
+    SFX_ITEMSET_ARG( &rSet, pURLItem, SfxStringItem, SID_BASEURL, sal_False );
     DBG_ASSERT( pURLItem, "No BaseURL provided for InternetTabPage!" );
     if ( pURLItem )
         aBaseURL = pURLItem->GetValue();
@@ -1462,7 +1462,7 @@ void SfxInternetPage::Reset( const SfxItemSet& rSet )
     ChangeState( eNewState );
 
     // #102907# ------------------------
-    SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+    SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
     if ( pROItem && pROItem->GetValue() )
     {
         aRBNoAutoUpdate.Disable();
@@ -1513,7 +1513,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
         &(const SfxDocumentInfoItem &)rItemSet.Get( SID_DOCINFO );
 
 #ifdef DBG_UTIL
-    SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, FALSE );
+    SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, sal_False );
     DBG_ASSERT( pURLItem, "No BaseURL provided for InternetTabPage!" );
 #endif
 
@@ -1521,7 +1521,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
     const SfxPoolItem* pItem = 0;
     String aTitle( GetText() );
     if ( SFX_ITEM_SET !=
-         rItemSet.GetItemState( SID_EXPLORER_PROPS_START, FALSE, &pItem ) )
+         rItemSet.GetItemState( SID_EXPLORER_PROPS_START, sal_False, &pItem ) )
     {
         // Dateiname
         String aFile( pInfoItem->GetValue() );
@@ -1558,7 +1558,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
 
 // -----------------------------------------------------------------------
 
-void SfxDocumentInfoDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
+void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     if ( TP_DOCINFODOC == nId )
         ( (SfxDocumentPage&)rPage ).EnableUseUserData();
@@ -1949,7 +1949,7 @@ bool CustomPropertiesWindow::IsLineValid( CustomPropertyLine* pLine ) const
     {
         sal_uInt32 nTemp = nIndex;
         bIsValid = const_cast< SvNumberFormatter& >(
-            m_aNumberFormatter ).IsNumberFormat( sValue, nIndex, fDummy ) != FALSE;
+            m_aNumberFormatter ).IsNumberFormat( sValue, nIndex, fDummy ) != sal_False;
         if ( bIsValid && nTemp != nIndex )
             // sValue is a number but the format doesn't match the index
             bIsValid = false;
@@ -2000,7 +2000,7 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa
 
     Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL };
     Window** pCurrent = pWindows;
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     while ( *pCurrent )
     {
         Rectangle aRect = pHeaderBar->GetItemRect( pHeaderBar->GetItemId( nPos++ ) );
@@ -2041,9 +2041,9 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa
         ( m_aRemoveButton.GetPosPixel().Y() * 2 ) + m_aRemoveButton.GetSizePixel().Height();
 }
 
-USHORT CustomPropertiesWindow::GetVisibleLineCount() const
+sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
 {
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     std::vector< CustomPropertyLine* >::const_iterator pIter;
     for ( pIter = m_aCustomPropertiesLines.begin();
             pIter != m_aCustomPropertiesLines.end(); ++pIter )
@@ -2254,7 +2254,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
                 double nValue = 0;
                 sal_uInt32 nIndex = const_cast< SvNumberFormatter& >(
                     m_aNumberFormatter ).GetFormatIndex( NF_NUMBER_SYSTEM );
-                BOOL bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ).
+                sal_Bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ).
                     IsNumberFormat( pLine->m_aValueEdit.GetText(), nIndex, nValue );
                 if ( bIsNum )
                     aPropertiesSeq[i].Value <<= makeAny( nValue );
@@ -2401,9 +2401,9 @@ IMPL_LINK( SfxCustomPropertiesPage, AddHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
 {
-    BOOL bModified = FALSE;
+    sal_Bool bModified = sal_False;
     const SfxPoolItem*      pItem = NULL;
     SfxDocumentInfoItem*    pInfo = NULL;
     bool                    bMustDelete = false;
@@ -2411,7 +2411,7 @@ BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
     if ( GetTabDialog() && GetTabDialog()->GetExampleSet() )
     {
         if( SFX_ITEM_SET !=
-                GetTabDialog()->GetExampleSet()->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+                GetTabDialog()->GetExampleSet()->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
             pInfo = &( SfxDocumentInfoItem& )rSet.Get( SID_DOCINFO );
         else
         {
@@ -2432,7 +2432,7 @@ BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
         }
     }
 
-    bModified = TRUE; //!!!
+    bModified = sal_True; //!!!
     if ( bModified )
         rSet.Put( *pInfo );
     if ( bMustDelete )
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 4f55dfde21a7..76bd38377eb8 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -75,7 +75,7 @@ class SfxTitleDockingWindow;
 class SfxTitleDockingWindow : public SfxDockingWindow
 {
     Window*             m_pWrappedWindow;
-    USHORT              m_nID;
+    sal_uInt16              m_nID;
 
 public:
                         SfxTitleDockingWindow(
@@ -83,7 +83,7 @@ public:
                             SfxChildWindow* pChildWin ,
                             Window* pParent ,
                             WinBits nBits,
-                            USHORT  nID);
+                            sal_uInt16  nID);
     virtual             ~SfxTitleDockingWindow();
 
     Window*             GetWrappedWindow() const { return m_pWrappedWindow; }
@@ -93,7 +93,7 @@ public:
     virtual long        Notify( NotifyEvent& rNEvt );
     virtual void        Resize();
     virtual void        Resizing( Size& rSize );
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
 };
 
 namespace
@@ -138,7 +138,7 @@ static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >&
 }
 
 SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
-                                      USHORT nId ,
+                                      sal_uInt16 nId ,
                                       SfxBindings* pBindings ,
                                       SfxChildWinInfo* pInfo )
                     : SfxChildWindow( pParentWnd , nId )
@@ -242,7 +242,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
     pWindow->SetOutputSizePixel( Size( 270, 240 ) );
 
     ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
-    SetHideNotDelete( TRUE );
+    SetHideNotDelete( sal_True );
 }
 
 SfxChildWindow*  SfxDockingWrapper::CreateImpl(
@@ -262,7 +262,7 @@ void SfxDockingWrapper::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal
     // pre-register a couple of docking windows
     for (int i=0; i < NUM_OF_DOCKINGWINDOWS; i++ )
     {
-        USHORT nID = USHORT(SID_DOCKWIN_START+i);
+        sal_uInt16 nID = sal_uInt16(SID_DOCKWIN_START+i);
         SfxChildWinFactory *pFact = new SfxChildWinFactory( SfxDockingWrapper::CreateImpl, nID, 0xffff );
         pFact->aInfo.nFlags |= nFlags;
         pFact->aInfo.bVisible = bVis;
@@ -281,7 +281,7 @@ SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind ,
                                               SfxChildWindow* pChildWin ,
                                               Window* pParent ,
                                               WinBits nBits,
-                                              USHORT  nID ) :
+                                              sal_uInt16  nID ) :
                           SfxDockingWindow( pBind ,
                                             pChildWin ,
                                             pParent ,
@@ -341,7 +341,7 @@ void SfxTitleDockingWindow::Resizing( Size &rSize )
         m_pWrappedWindow->SetSizePixel( GetOutputSizePixel() );
 }
 
-BOOL SfxTitleDockingWindow::Close()
+sal_Bool SfxTitleDockingWindow::Close()
 {
     return SfxDockingWindow::Close();
 }
@@ -351,9 +351,9 @@ namespace
     struct ChildrenRegisteredMap : public rtl::Static< bool, ChildrenRegisteredMap > {};
 }
 
-static bool lcl_checkDockingWindowID( USHORT nID )
+static bool lcl_checkDockingWindowID( sal_uInt16 nID )
 {
-    if (nID < SID_DOCKWIN_START || nID >= USHORT(SID_DOCKWIN_START+NUM_OF_DOCKINGWINDOWS))
+    if (nID < SID_DOCKWIN_START || nID >= sal_uInt16(SID_DOCKWIN_START+NUM_OF_DOCKINGWINDOWS))
         return false;
     else
         return true;
@@ -391,7 +391,7 @@ static SfxWorkWindow* lcl_getWorkWindowFromXFrame( const uno::Reference< frame::
 void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName )
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
-    USHORT nID = USHORT(rDockingWindowName.toInt32());
+    sal_uInt16 nID = sal_uInt16(rDockingWindowName.toInt32());
 
     // Check the range of the provided ID otherwise nothing will happen
     if ( lcl_checkDockingWindowID( nID ))
@@ -418,7 +418,7 @@ bool SAL_CALL IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFr
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
-    USHORT nID = USHORT(rDockingWindowName.toInt32());
+    sal_uInt16 nID = sal_uInt16(rDockingWindowName.toInt32());
 
     // Check the range of the provided ID otherwise nothing will happen
     if ( lcl_checkDockingWindowID( nID ))
@@ -441,25 +441,25 @@ friend class SfxDockingWindow;
 
     SfxChildAlignment   eLastAlignment;
     SfxChildAlignment   eDockAlignment;
-    BOOL                bConstructed;
+    sal_Bool                bConstructed;
     Size                aMinSize;
     SfxSplitWindow*     pSplitWin;
-    BOOL                bSplitable;
-//  BOOL                bAutoHide;
+    sal_Bool                bSplitable;
+//  sal_Bool                bAutoHide;
     Timer               aMoveTimer;
 
     // Folgende members sind nur in der Zeit von StartDocking bis EndDocking
     // g"ultig:
-    BOOL                bEndDocked;
+    sal_Bool                bEndDocked;
     Size                aSplitSize;
     long                nHorizontalSize;
     long                nVerticalSize;
-    USHORT              nLine;
-    USHORT              nPos;
-    USHORT              nDockLine;
-    USHORT              nDockPos;
-    BOOL                bNewLine;
-    BOOL                bDockingPrevented;
+    sal_uInt16              nLine;
+    sal_uInt16              nPos;
+    sal_uInt16              nDockLine;
+    sal_uInt16              nDockPos;
+    sal_Bool                bNewLine;
+    sal_Bool                bDockingPrevented;
     ByteString          aWinState;
 
     SfxChildAlignment   GetLastAlignment() const
@@ -525,7 +525,7 @@ void SfxDockingWindow::Resize()
 
 //-------------------------------------------------------------------------
 
-BOOL SfxDockingWindow::PrepareToggleFloatingMode()
+sal_Bool SfxDockingWindow::PrepareToggleFloatingMode()
 
 /*  [Beschreibung]
 
@@ -538,24 +538,24 @@ BOOL SfxDockingWindow::PrepareToggleFloatingMode()
 
 {
     if (!pImp->bConstructed)
-        return TRUE;
+        return sal_True;
 
     if ( (Application::IsInModalMode() && IsFloatingMode()) || !pMgr )
-        return FALSE;
+        return sal_False;
 
     if ( pImp->bDockingPrevented )
-        return FALSE;
+        return sal_False;
 
     if (!IsFloatingMode())
     {
         // Testen, ob FloatingMode erlaubt ist
         if ( CheckAlignment(GetAlignment(),SFX_ALIGN_NOALIGNMENT) != SFX_ALIGN_NOALIGNMENT )
-            return FALSE;
+            return sal_False;
 
         if ( pImp->pSplitWin )
         {
             // Das DockingWindow sitzt in einem SplitWindow und wird abgerissen
-            pImp->pSplitWin->RemoveWindow(this/*, FALSE*/);
+            pImp->pSplitWin->RemoveWindow(this/*, sal_False*/);
             pImp->pSplitWin = 0;
         }
     }
@@ -565,15 +565,15 @@ BOOL SfxDockingWindow::PrepareToggleFloatingMode()
 
         // Testen, ob es erlaubt ist, anzudocken
         if (CheckAlignment(GetAlignment(),pImp->GetLastAlignment()) == SFX_ALIGN_NOALIGNMENT)
-            return FALSE;
+            return sal_False;
 
         // Testen, ob das Workwindow gerade ein Andocken erlaubt
         SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
         if ( !pWorkWin->IsDockingAllowed() || !pWorkWin->IsInternalDockingAllowed() )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -697,13 +697,13 @@ void SfxDockingWindow::StartDocking()
         pImp->pSplitWin->GetWindowPos(this, pImp->nLine, pImp->nPos);
         pImp->nDockLine = pImp->nLine;
         pImp->nDockPos = pImp->nPos;
-        pImp->bNewLine = FALSE;
+        pImp->bNewLine = sal_False;
     }
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
+sal_Bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 
 /*  [Beschreibung]
 
@@ -714,7 +714,7 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 */
 {
     if ( Application::IsInModalMode() )
-        return TRUE;
+        return sal_True;
 
     if ( !pImp->bConstructed || !pMgr )
     {
@@ -724,16 +724,16 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 
     SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
     if ( pImp->bDockingPrevented || !pWorkWin->IsInternalDockingAllowed() )
-        return FALSE;
+        return sal_False;
 
-    BOOL bFloatMode = FALSE;
+    sal_Bool bFloatMode = sal_False;
 
     if ( GetOuterRect().IsInside( rPos ) && !IsDockingPrevented() )
     {
         // Maus innerhalb OuterRect : Alignment und Rectangle berechnen
         SfxChildAlignment eAlign = CalcAlignment(rPos, rRect);
         if (eAlign == SFX_ALIGN_NOALIGNMENT)
-            bFloatMode = TRUE;
+            bFloatMode = sal_True;
         pImp->SetDockAlignment(eAlign);
     }
     else
@@ -741,8 +741,8 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
         // Maus nicht innerhalb OuterRect : muss FloatingWindow sein
         // Ist das erlaubt ?
         if (CheckAlignment(pImp->GetDockAlignment(),SFX_ALIGN_NOALIGNMENT) != SFX_ALIGN_NOALIGNMENT)
-            return FALSE;
-        bFloatMode = TRUE;
+            return sal_False;
+        bFloatMode = sal_True;
         if ( SFX_ALIGN_NOALIGNMENT != pImp->GetDockAlignment() )
         {
             // wg. SV-Bug darf rRect nur ver"andert werden, wenn sich das
@@ -806,7 +806,7 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 
 //-------------------------------------------------------------------------
 
-void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
+void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
 
 /*  [Beschreibung]
 
@@ -820,7 +820,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
         return;
 
     SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
-    BOOL bReArrange = FALSE;
+    sal_Bool bReArrange = sal_False;
     SfxChildIdentifier eIdent = SFX_CHILDWIN_DOCKINGWINDOW;
     if ( pImp->bSplitable )
     {
@@ -831,7 +831,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
         // Wenn neu angedockt wird, machen PrepareToggleFloatingMode()
         // und ToggleFloatingMode() das Ummelden.
         if ( !bFloatMode )
-            bReArrange = TRUE;
+            bReArrange = sal_True;
     }
 
     if ( bReArrange )
@@ -841,7 +841,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
             // Vor dem Show() mu\s das Ummelden passiert sein, daher kann nicht
             // die Basisklasse gerufen werden
             if ( IsFloatingMode() || !pImp->bSplitable )
-                Show( FALSE, SHOW_NOFOCUSCHANGE );
+                Show( sal_False, SHOW_NOFOCUSCHANGE );
 
             // Die Gr"o\se f"urs Toggeln setzen
             pImp->aSplitSize = rRect.GetSize();
@@ -849,11 +849,11 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
             {
                 SetFloatingMode( bFloatMode );
                 if ( IsFloatingMode() || !pImp->bSplitable )
-                    Show( TRUE, SHOW_NOFOCUSCHANGE );
+                    Show( sal_True, SHOW_NOFOCUSCHANGE );
             }
             else
             {
-                pImp->pSplitWin->RemoveWindow(this,FALSE);
+                pImp->pSplitWin->RemoveWindow(this,sal_False);
                 pImp->nLine = pImp->nDockLine;
                 pImp->nPos = pImp->nDockPos;
                 pImp->pSplitWin->ReleaseWindow_Impl(this);
@@ -873,9 +873,9 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
     }
     else
     {
-        pImp->bEndDocked = TRUE;
+        pImp->bEndDocked = sal_True;
         DockingWindow::EndDocking(rRect, bFloatMode);
-        pImp->bEndDocked = FALSE;
+        pImp->bEndDocked = sal_False;
     }
 
     SetAlignment( IsFloatingMode() ? SFX_ALIGN_NOALIGNMENT : pImp->GetDockAlignment() );
@@ -938,18 +938,18 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     }
 
     pImp = new SfxDockingWindow_Impl;
-    pImp->bConstructed = FALSE;
+    pImp->bConstructed = sal_False;
     pImp->pSplitWin = 0;
-    pImp->bEndDocked = FALSE;
-    pImp->bDockingPrevented = FALSE;
+    pImp->bEndDocked = sal_False;
+    pImp->bDockingPrevented = sal_False;
 
-    pImp->bSplitable = TRUE;
-//  pImp->bAutoHide = FALSE;
+    pImp->bSplitable = sal_True;
+//  pImp->bAutoHide = sal_False;
 
     // Zun"achst auf Defaults setzen; das Alignment wird in der Subklasse gesetzt
     pImp->nLine = pImp->nDockLine = 0;
     pImp->nPos  = pImp->nDockPos = 0;
-    pImp->bNewLine = FALSE;
+    pImp->bNewLine = sal_False;
     pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);
     pImp->aMoveTimer.SetTimeout(50);
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
@@ -992,18 +992,18 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     }
 
     pImp = new SfxDockingWindow_Impl;
-    pImp->bConstructed = FALSE;
+    pImp->bConstructed = sal_False;
     pImp->pSplitWin = 0;
-    pImp->bEndDocked = FALSE;
-    pImp->bDockingPrevented = FALSE;
+    pImp->bEndDocked = sal_False;
+    pImp->bDockingPrevented = sal_False;
 
-    pImp->bSplitable = TRUE;
-//  pImp->bAutoHide = FALSE;
+    pImp->bSplitable = sal_True;
+//  pImp->bAutoHide = sal_False;
 
     // Zun"achst auf Defaults setzen; das Alignment wird in der Subklasse gesetzt
     pImp->nLine = pImp->nDockLine = 0;
     pImp->nPos  = pImp->nDockPos = 0;
-    pImp->bNewLine = FALSE;
+    pImp->bNewLine = sal_False;
     pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);
     pImp->aMoveTimer.SetTimeout(50);
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
@@ -1026,12 +1026,12 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
     {
         // Bugfix #39771
         pImp->SetDockAlignment( SFX_ALIGN_NOALIGNMENT );
-        pImp->bConstructed = TRUE;
+        pImp->bConstructed = sal_True;
         return;
     }
 
     if ( pInfo->nFlags & SFX_CHILDWIN_FORCEDOCK )
-        pImp->bDockingPrevented = TRUE;
+        pImp->bDockingPrevented = sal_True;
 
     pImp->aSplitSize = GetOutputSizePixel();
     if ( !GetFloatingSize().Width() )
@@ -1049,14 +1049,14 @@ 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
-            USHORT n1 = pInfo->aExtraString.Search('(', nPos);
+            sal_uInt16 n1 = pInfo->aExtraString.Search('(', nPos);
             if ( n1 != STRING_NOTFOUND )
             {
-                USHORT n2 = pInfo->aExtraString.Search(')', n1);
+                sal_uInt16 n2 = pInfo->aExtraString.Search(')', n1);
                 if ( n2 != STRING_NOTFOUND )
                 {
                     // extract alignment information from extrastring
@@ -1073,7 +1073,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
             pImp->aWinState = pInfo->aWinState;
 
             // check for valid alignment
-            SfxChildAlignment eLocalAlignment = (SfxChildAlignment) (USHORT) aStr.ToInt32();
+            SfxChildAlignment eLocalAlignment = (SfxChildAlignment) (sal_uInt16) aStr.ToInt32();
             if ( pImp->bDockingPrevented )
                 // docking prevented, ignore old configuration and take alignment from default
                 aStr.Erase();
@@ -1093,7 +1093,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
             if ( nPos != STRING_NOTFOUND )
             {
                 aStr.Erase(0, nPos+1);
-                pImp->SetLastAlignment( (SfxChildAlignment) (USHORT) aStr.ToInt32() );
+                pImp->SetLastAlignment( (SfxChildAlignment) (sal_uInt16) aStr.ToInt32() );
             }
 
             nPos = aStr.Search(',');
@@ -1104,8 +1104,8 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
                 aStr.Erase(0, nPos+1);
                 if ( GetPosSizeFromString( aStr, aPos, pImp->aSplitSize ) )
                 {
-                    pImp->nLine = pImp->nDockLine = (USHORT) aPos.X();
-                    pImp->nPos  = pImp->nDockPos  = (USHORT) aPos.Y();
+                    pImp->nLine = pImp->nDockLine = (sal_uInt16) aPos.X();
+                    pImp->nPos  = pImp->nDockPos  = (sal_uInt16) aPos.Y();
                     pImp->nVerticalSize = pImp->aSplitSize.Height();
                     pImp->nHorizontalSize = pImp->aSplitSize.Width();
                     if ( GetSplitSizeFromString( aStr, pImp->aSplitSize ))
@@ -1139,7 +1139,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
 
     // detect floating mode
     // toggeling mode will not execute code in handlers, because pImp->bConstructed is not set yet
-    BOOL bFloatMode = IsFloatingMode();
+    sal_Bool bFloatMode = IsFloatingMode();
     if ( bFloatMode != ((GetAlignment() == SFX_ALIGN_NOALIGNMENT)) )
     {
         bFloatMode = !bFloatMode;
@@ -1199,12 +1199,12 @@ void SfxDockingWindow::Initialize_Impl()
     if ( !pMgr )
     {
         // Bugfix #39771
-        pImp->bConstructed = TRUE;
+        pImp->bConstructed = sal_True;
         return;
     }
 
     FloatingWindow* pFloatWin = GetFloatingWindow();
-    BOOL bSet = FALSE;
+    sal_Bool bSet = sal_False;
     if ( pFloatWin )
     {
         bSet = !pFloatWin->IsDefaultPos();
@@ -1213,7 +1213,7 @@ void SfxDockingWindow::Initialize_Impl()
     {
         Point aPos = GetFloatingPos();
         if ( aPos != Point() )
-            bSet = TRUE;
+            bSet = sal_True;
     }
 
     if ( !bSet)
@@ -1243,7 +1243,7 @@ void SfxDockingWindow::Initialize_Impl()
     }
 
     // allow calling of docking handlers
-    pImp->bConstructed = TRUE;
+    pImp->bConstructed = sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -1271,9 +1271,9 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
 
     rInfo.aWinState = pImp->aWinState;
     rInfo.aExtraString = DEFINE_CONST_UNICODE("AL:(");
-    rInfo.aExtraString += String::CreateFromInt32((USHORT) GetAlignment());
+    rInfo.aExtraString += String::CreateFromInt32((sal_uInt16) GetAlignment());
     rInfo.aExtraString += ',';
-    rInfo.aExtraString += String::CreateFromInt32 ((USHORT) pImp->GetLastAlignment());
+    rInfo.aExtraString += String::CreateFromInt32 ((sal_uInt16) pImp->GetLastAlignment());
     if ( pImp->bSplitable )
     {
         Point aPos(pImp->nLine, pImp->nPos);
@@ -1385,7 +1385,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         aInRect.Bottom() -= nTBBorder/2;
 
     // calculate alignment resulting from docking rectangle
-    BOOL bBecomesFloating = FALSE;
+    sal_Bool bBecomesFloating = sal_False;
     SfxChildAlignment eDockAlign = pImp->GetDockAlignment();
     Rectangle aDockingRect( rRect );
     if ( !IsFloatingMode() )
@@ -1404,7 +1404,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
     Rectangle aIntersect = GetOuterRect().GetIntersection( aDockingRect );
     if ( aIntersect.IsEmpty() )
         // docking rectangle completely outside docking area -> floating mode
-        bBecomesFloating = TRUE;
+        bBecomesFloating = sal_True;
     else
     {
         // create a small test rect around the mouse position and use this one
@@ -1418,7 +1418,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         Rectangle aIntersectRect = aInRect.GetIntersection( aSmallDockingRect );
         if ( aIntersectRect == aSmallDockingRect )
             // docking rectangle completely inside (shrinked) inner area -> floating mode
-            bBecomesFloating = TRUE;
+            bBecomesFloating = sal_True;
     }
 
     if ( bBecomesFloating )
@@ -1431,7 +1431,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         Point aInPosTL( aPos.X()-aInRect.Left(), aPos.Y()-aInRect.Top() );
         Point aInPosBR( aPos.X()-aInRect.Left() + aDockingRect.GetWidth(), aPos.Y()-aInRect.Top() + aDockingRect.GetHeight() );
         Size  aInSize = aInRect.GetSize();
-        BOOL  bNoChange = FALSE;
+        sal_Bool  bNoChange = sal_False;
 
         // check if alignment is still unchanged
         switch ( GetAlignment() )
@@ -1442,7 +1442,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 if (aInPosTL.X() <= 0)
                 {
                     eDockAlign = GetAlignment();
-                    bNoChange = TRUE;
+                    bNoChange = sal_True;
                 }
                 break;
             case SFX_ALIGN_TOP:
@@ -1451,7 +1451,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 if ( aInPosTL.Y() <= 0)
                 {
                     eDockAlign = GetAlignment();
-                    bNoChange = TRUE;
+                    bNoChange = sal_True;
                 }
                 break;
             case SFX_ALIGN_RIGHT:
@@ -1460,7 +1460,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 if ( aInPosBR.X() >= aInSize.Width())
                 {
                     eDockAlign = GetAlignment();
-                    bNoChange = TRUE;
+                    bNoChange = sal_True;
                 }
                 break;
             case SFX_ALIGN_BOTTOM:
@@ -1469,7 +1469,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 if ( aInPosBR.Y() >= aInSize.Height())
                 {
                     eDockAlign = GetAlignment();
-                    bNoChange = TRUE;
+                    bNoChange = sal_True;
                 }
                 break;
             default:
@@ -1479,7 +1479,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         if ( !bNoChange )
         {
             // alignment will change, test alignment according to distance of the docking rectangles edges
-            BOOL bForbidden = TRUE;
+            sal_Bool bForbidden = sal_True;
             if ( aInPosTL.X() <= 0)
             {
                 eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SFX_ALIGN_LEFT);
@@ -1528,7 +1528,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
     }
     else if ( pImp->bSplitable )
     {
-        USHORT nLine, nPos;
+        sal_uInt16 nLine, nPos;
         SfxSplitWindow *pSplitWin = pWorkWin->GetSplitWindow_Impl(eDockAlign);
         aPos = pSplitWin->ScreenToOutputPixel( aPos );
         if ( pSplitWin->GetWindowPos( aPos, nLine, nPos ) )
@@ -1536,7 +1536,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
             // mouse over splitwindow, get line and position
             pImp->nDockLine = nLine;
             pImp->nDockPos = nPos;
-            pImp->bNewLine = FALSE;
+            pImp->bNewLine = sal_False;
         }
         else
         {
@@ -1556,18 +1556,18 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 // if this window is the only one in the last line, it can't be docked as new line in the same splitwindow
                 pImp->nDockLine = pImp->nLine;
                 pImp->nDockPos = pImp->nPos;
-                pImp->bNewLine = FALSE;
+                pImp->bNewLine = sal_False;
             }
             else
             {
                 // create new line
                 pImp->nDockLine = pSplitWin->GetLineCount();
                 pImp->nDockPos = 0;
-                pImp->bNewLine = TRUE;
+                pImp->bNewLine = sal_True;
             }
         }
 
-        BOOL bChanged = pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || eDockAlign != GetAlignment();
+        sal_Bool bChanged = pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || eDockAlign != GetAlignment();
         if ( !bChanged && !IsFloatingMode() )
         {
             // window only sightly moved, no change of any property
@@ -1753,7 +1753,7 @@ SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment,
 
 //-------------------------------------------------------------------------
 
-BOOL SfxDockingWindow::Close()
+sal_Bool SfxDockingWindow::Close()
 
 /*  [Beschreibung]
 
@@ -1768,12 +1768,12 @@ BOOL SfxDockingWindow::Close()
     // Execute mit Parametern, da Toggle von einigen ChildWindows ignoriert
     // werden kann
     if ( !pMgr )
-        return TRUE;
+        return sal_True;
 
-    SfxBoolItem aValue( pMgr->GetType(), FALSE);
+    SfxBoolItem aValue( pMgr->GetType(), sal_False);
     pBindings->GetDispatcher_Impl()->Execute(
         pMgr->GetType(), SFX_CALLMODE_RECORD | SFX_CALLMODE_ASYNCHRON, &aValue, 0L );
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -1885,7 +1885,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
         // also base class rufen, sonst erf"ahrt der parent nichts
         // if ( rEvt.GetWindow() == this )  PB: #i74693# not necessary any longer
         DockingWindow::Notify( rEvt );
-        return TRUE;
+        return sal_True;
     }
     else if( rEvt.GetType() == EVENT_KEYINPUT )
     {
@@ -1893,7 +1893,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
         if ( !DockingWindow::Notify( rEvt ) && SfxViewShell::Current() )
             // dann auch global g"ultige Acceleratoren verwenden
             return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() );
-        return TRUE;
+        return sal_True;
     }
     else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
     {
@@ -1905,9 +1905,9 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
 }
 
 
-USHORT SfxDockingWindow::GetWinBits_Impl() const
+sal_uInt16 SfxDockingWindow::GetWinBits_Impl() const
 {
-    USHORT nBits = 0;
+    sal_uInt16 nBits = 0;
 //  if ( pImp->bAutoHide )
 //      nBits |= SWIB_AUTOHIDE;
     return nBits;
@@ -1940,27 +1940,27 @@ void SfxDockingWindow::Reappear_Impl()
     }
 }
 
-BOOL SfxDockingWindow::IsAutoHide_Impl() const
+sal_Bool SfxDockingWindow::IsAutoHide_Impl() const
 {
     if ( pImp->pSplitWin )
         return !pImp->pSplitWin->IsFadeIn();
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL SfxDockingWindow::IsPinned_Impl() const
+sal_Bool SfxDockingWindow::IsPinned_Impl() const
 {
     if ( pImp->pSplitWin )
         return pImp->pSplitWin->IsPinned();
     else
-        return TRUE;
+        return sal_True;
 }
-void SfxDockingWindow::AutoShow( BOOL bShow )
+void SfxDockingWindow::AutoShow( sal_Bool bShow )
 {
     AutoShow_Impl(bShow);
 }
 
-void SfxDockingWindow::AutoShow_Impl( BOOL bShow )
+void SfxDockingWindow::AutoShow_Impl( sal_Bool bShow )
 {
     if ( pImp->pSplitWin )
     {
@@ -1972,7 +1972,7 @@ void SfxDockingWindow::AutoShow_Impl( BOOL bShow )
 }
 
 /*
-void SfxDockingWindow::Pin_Impl( BOOL bPinned )
+void SfxDockingWindow::Pin_Impl( sal_Bool bPinned )
 {
     if ( pImp->pSplitWin )
         pImp->pSplitWin->Pin_Impl( bPinned );
@@ -1984,7 +1984,7 @@ SfxSplitWindow* SfxDockingWindow::GetSplitWindow_Impl() const
     return pImp->pSplitWin;
 }
 
-void SfxDockingWindow::FadeIn( BOOL /*bFadeIn*/ )
+void SfxDockingWindow::FadeIn( sal_Bool /*bFadeIn*/ )
 {
 }
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index b740453cf5ff..0f3b35648061 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1433,8 +1433,8 @@ void lcl_saveLastURLs(SvStringsDtor*&                                    rpURLLi
                       ::comphelper::SequenceAsVector< ::rtl::OUString >& lLastURLs )
 {
     lLastURLs.clear();
-    USHORT c = rpURLList->Count();
-    USHORT i = 0;
+    sal_uInt16 c = rpURLList->Count();
+    sal_uInt16 i = 0;
     for (i=0; i<c; ++i)
         lLastURLs.push_back(*(rpURLList->GetObject(i)));
 }
@@ -1522,15 +1522,15 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
         // check password checkbox if the document had password before
         if( mbHasPassword )
         {
-            SFX_ITEMSET_ARG( rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION, FALSE );
+            SFX_ITEMSET_ARG( rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION, sal_False );
             mbPwdCheckBoxState = ( pPassItem != NULL && pPassItem->GetValue() );
 
             // in case the document has password to modify, the dialog should be shown
-            SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, FALSE );
+            SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, sal_False );
             mbPwdCheckBoxState |= ( pPassToModifyItem && pPassToModifyItem->GetValue().hasValue() );
         }
 
-        SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE );
+        SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False );
         if ( pSelectItem )
             mbSelection = pSelectItem->GetValue();
         else
@@ -1957,7 +1957,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
 
     // create the list of filters
     mpGraphicFilter = new GraphicFilter;
-    USHORT i, j, nCount = mpGraphicFilter->GetImportFormatCount();
+    sal_uInt16 i, j, nCount = mpGraphicFilter->GetImportFormatCount();
 
     // compute the extension string for all known import filters
     String aExtensions;
@@ -1966,7 +1966,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
     {
         j = 0;
         String sWildcard;
-        while( TRUE )
+        while( sal_True )
         {
             sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ );
             if ( !sWildcard.Len() )
@@ -2006,7 +2006,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
         String aExt;
         j = 0;
         String sWildcard;
-        while( TRUE )
+        while( sal_True )
         {
             sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ );
             if ( !sWildcard.Len() )
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 91190b575e1c..6c559139ddd2 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -84,7 +84,7 @@ namespace sfx2
         SfxFilterFlags              m_nMustFlags;
         SfxFilterFlags              m_nDontFlags;
 
-        ULONG                       mnPostUserEventId;
+        sal_uIntPtr                     mnPostUserEventId;
 
         ErrCode                     mnError;
 
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index 51ed3bc5304a..68fab9fed333 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -52,31 +52,31 @@ TriState lclConvertToTriState( bool bKnown, bool bIsKnownFlag, bool bIsUnknownFl
 
 // ----------------------------------------------------------------------------
 
-USHORT ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, USHORT nSlot )
+sal_uInt16 ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
     return rItemSet.GetPool()->GetWhich( nSlot );
 }
 
-bool ItemWrapperHelper::IsKnownItem( const SfxItemSet& rItemSet, USHORT nSlot )
+bool ItemWrapperHelper::IsKnownItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
-    return rItemSet.GetItemState( GetWhichId( rItemSet, nSlot ), TRUE ) != SFX_ITEM_UNKNOWN;
+    return rItemSet.GetItemState( GetWhichId( rItemSet, nSlot ), sal_True ) != SFX_ITEM_UNKNOWN;
 }
 
-const SfxPoolItem* ItemWrapperHelper::GetUniqueItem( const SfxItemSet& rItemSet, USHORT nSlot )
+const SfxPoolItem* ItemWrapperHelper::GetUniqueItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
-    USHORT nWhich = GetWhichId( rItemSet, nSlot );
-    return (rItemSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_DEFAULT) ? rItemSet.GetItem( nWhich, TRUE ) : 0;
+    sal_uInt16 nWhich = GetWhichId( rItemSet, nSlot );
+    return (rItemSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_DEFAULT) ? rItemSet.GetItem( nWhich, sal_True ) : 0;
 }
 
-const SfxPoolItem& ItemWrapperHelper::GetDefaultItem( const SfxItemSet& rItemSet, USHORT nSlot )
+const SfxPoolItem& ItemWrapperHelper::GetDefaultItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
     return rItemSet.GetPool()->GetDefaultItem( GetWhichId( rItemSet, nSlot ) );
 }
 
-void ItemWrapperHelper::RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, USHORT nSlot )
+void ItemWrapperHelper::RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot )
 {
-    USHORT nWhich = GetWhichId( rDestSet, nSlot );
-    if( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
+    sal_uInt16 nWhich = GetWhichId( rDestSet, nSlot );
+    if( rOldSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_DEFAULT )
         rDestSet.ClearItem( nWhich );
 }
 
@@ -133,12 +133,12 @@ void CheckBoxWrapper::SetControlDontKnow( bool bSet )
     GetControl().SetState( bSet ? STATE_DONTKNOW : STATE_NOCHECK );
 }
 
-BOOL CheckBoxWrapper::GetControlValue() const
+sal_Bool CheckBoxWrapper::GetControlValue() const
 {
     return GetControl().IsChecked();
 }
 
-void CheckBoxWrapper::SetControlValue( BOOL bValue )
+void CheckBoxWrapper::SetControlValue( sal_Bool bValue )
 {
     GetControl().Check( bValue );
 }
@@ -302,7 +302,7 @@ TriState ItemConnectionBase::GetShowState( bool bKnown ) const
 // Standard connections
 // ============================================================================
 
-DummyItemConnection::DummyItemConnection( USHORT nSlot, Window& rWindow, ItemConnFlags nFlags ) :
+DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, ItemConnFlags nFlags ) :
     ItemConnectionBase( nFlags ),
     DummyWindowWrapper( rWindow ),
     mnSlot( nSlot )
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 8c05fa424263..6664e393ed5a 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -158,7 +158,7 @@ void SfxMailModel::ClearList( AddressList_Impl* pList )
 {
     if ( pList )
     {
-        ULONG i, nCount = pList->Count();
+        sal_uIntPtr i, nCount = pList->Count();
         for ( i = 0; i < nCount; ++i )
             delete pList->GetObject(i);
         pList->Clear();
@@ -170,7 +170,7 @@ void SfxMailModel::MakeValueList( AddressList_Impl* pList, String& rValueList )
     rValueList.Erase();
     if ( pList )
     {
-        ULONG i, nCount = pList->Count();
+        sal_uIntPtr i, nCount = pList->Count();
         for ( i = 0; i < nCount; ++i )
         {
             if ( rValueList.Len() > 0 )
@@ -977,7 +977,7 @@ SfxMailModel::SendMailResult SfxMailModel::SaveAndSend( const css::uno::Referenc
 
 // functions -------------------------------------------------------------
 
-BOOL CreateFromAddress_Impl( String& rFrom )
+sal_Bool CreateFromAddress_Impl( String& rFrom )
 
 /*  [Beschreibung]
 
@@ -988,8 +988,8 @@ BOOL CreateFromAddress_Impl( String& rFrom )
 
     [R"uckgabewert]
 
-    TRUE:   Adresse konnte erzeugt werden.
-    FALSE:  Adresse konnte nicht erzeugt werden.
+    sal_True:   Adresse konnte erzeugt werden.
+    sal_False:  Adresse konnte nicht erzeugt werden.
 */
 
 {
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index d97847f5b6e0..454c42896cfe 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -84,7 +84,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
     pStyle( &( (SfxStyleDialog*)pParent->GetParent() )->GetStyleSheet() ),
 
     pItem       ( 0 ),
-    bModified   ( FALSE ),
+    bModified   ( sal_False ),
     aName       ( pStyle->GetName() ),
     aFollow     ( pStyle->GetFollow() ),
     aParent     ( pStyle->GetParent() ),
@@ -132,7 +132,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
     {
         // NullString als Name -> Name generieren
         String aNoName( SfxResId( STR_NONAME ) );
-        USHORT nNo = 1;
+        sal_uInt16 nNo = 1;
         String aNo( aNoName );
         aNoName += String::CreateFromInt32( nNo );
         while ( pPool->Find( aNoName ) )
@@ -156,7 +156,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
 
         aNameMLE.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
         aNameMLE.SetText( pStyle->GetName() );
-        aNameMLE.EnableCursor( FALSE );
+        aNameMLE.EnableCursor( sal_False );
         aNameMLE.Show();
     }
 
@@ -208,9 +208,9 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
         aBaseFt.Disable();
         aBaseLb.Disable();
     }
-    USHORT nCount = pFamilies->Count();
+    sal_uInt16 nCount = pFamilies->Count();
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < nCount; ++i )
     {
         pItem = pFamilies->GetObject(i);
@@ -219,15 +219,15 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
             break;
     }
 
-    USHORT nStyleFilterIdx = 0xffff;
+    sal_uInt16 nStyleFilterIdx = 0xffff;
 
     if ( i < nCount )
     {
         // Filterflags
         const SfxStyleFilter& rList = pItem->GetFilterList();
-        nCount = (USHORT)rList.Count();
-        USHORT nIdx = 0;
-        USHORT nMask = pStyle->GetMask() & ~SFXSTYLEBIT_USERDEF;
+        nCount = (sal_uInt16)rList.Count();
+        sal_uInt16 nIdx = 0;
+        sal_uInt16 nMask = pStyle->GetMask() & ~SFXSTYLEBIT_USERDEF;
 
         if ( !nMask )   // Benutzervorlage?
             nMask = pStyle->GetMask();
@@ -322,7 +322,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
     if ( pBox->IsEnabled() )
     {
         // ist der aktuelle Eintrag, dessen Namen modifizieren wurde
-        const BOOL bSelect = pBox->GetSelectEntry() == aBuf;
+        const sal_Bool bSelect = pBox->GetSelectEntry() == aBuf;
         pBox->RemoveEntry( aBuf );
         pBox->InsertEntry( rNew );
 
@@ -414,7 +414,7 @@ IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
 
 //-------------------------------------------------------------------------
 
-BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
 
 /*  [Beschreibung]
 
@@ -429,9 +429,9 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
 
     [R"uckgabewert]
 
-    BOOL                        TRUE:  es hat eine "Anderung der Daten
+    sal_Bool                        sal_True:  es hat eine "Anderung der Daten
                                        stattgefunden
-                                FALSE: es hat keine "Anderung der Daten
+                                    sal_False: es hat keine "Anderung der Daten
                                        stattgefunden
 
     [Querverweise]
@@ -441,7 +441,7 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
 */
 
 {
-    const USHORT nFilterIdx = aFilterLb.GetSelectEntryPos();
+    const sal_uInt16 nFilterIdx = aFilterLb.GetSelectEntryPos();
 
     // Filter setzen
 
@@ -449,16 +449,16 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
          nFilterIdx != aFilterLb.GetSavedValue()    &&
          aFilterLb.IsEnabled() )
     {
-        bModified = TRUE;
+        bModified = sal_True;
         DBG_ASSERT( pItem, "kein Item" );
         // geht nur bei Benutzervorlagen
 #if OSL_DEBUG_LEVEL > 1
-        USHORT nIdx = (USHORT)(long)aFilterLb.GetEntryData( nFilterIdx );
+        sal_uInt16 nIdx = (sal_uInt16)(long)aFilterLb.GetEntryData( nFilterIdx );
         SfxFilterTupel* p;
         p = pItem->GetFilterList().GetObject( nIdx );
 #endif
-        USHORT nMask = pItem->GetFilterList().GetObject(
-            (USHORT)(long)aFilterLb.GetEntryData( nFilterIdx ) )->nFlags |
+        sal_uInt16 nMask = pItem->GetFilterList().GetObject(
+            (sal_uInt16)(long)aFilterLb.GetEntryData( nFilterIdx ) )->nFlags |
             SFXSTYLEBIT_USERDEF;
         pStyle->SetMask( nMask );
     }
@@ -492,7 +492,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
 */
 
 {
-    bModified = FALSE;
+    bModified = sal_False;
     String sCmp( pStyle->GetName() );
 
     if ( sCmp != aName )
@@ -534,7 +534,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
 
     if ( aFilterLb.IsEnabled() )
     {
-        USHORT nCmp = pStyle->GetMask();
+        sal_uInt16 nCmp = pStyle->GetMask();
 
         if ( nCmp != nFlags )
             pStyle->SetMask( nFlags );
@@ -590,7 +590,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
     const SfxPoolItem* pPoolItem;
 
     if ( SFX_ITEM_SET ==
-         rSet.GetItemState( SID_ATTR_AUTO_STYLE_UPDATE, FALSE, &pPoolItem ) )
+         rSet.GetItemState( SID_ATTR_AUTO_STYLE_UPDATE, sal_False, &pPoolItem ) )
         aAutoCB.Check( ( (const SfxBoolItem*)pPoolItem )->GetValue() );
     aAutoCB.SaveValue();
 }
@@ -633,7 +633,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
             aNameEd.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
             return SfxTabPage::KEEP_PAGE;
         }
-        bModified = TRUE;
+        bModified = sal_True;
     }
 
     if ( pStyle->HasFollowSupport() && aFollowLb.IsEnabled() )
@@ -649,7 +649,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
                 aFollowLb.GrabFocus();
                 return SfxTabPage::KEEP_PAGE;
             }
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
 
@@ -669,7 +669,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
                 aBaseLb.GrabFocus();
                 return SfxTabPage::KEEP_PAGE;
             }
-            bModified = TRUE;
+            bModified = sal_True;
             nRet |= (int)SfxTabPage::REFRESH_SET;
         }
     }
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 290886528e24..fbfabe632009 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -42,7 +42,7 @@
 SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR );
 
 SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd ,
-                                                USHORT nId ,
+                                                sal_uInt16 nId ,
                                                 SfxBindings* pBindings ,
                                                 SfxChildWinInfo* pInfo )
                     : SfxChildWindow( pParentWnd , nId )
@@ -55,7 +55,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd ,
     pWindow->SetOutputSizePixel( Size( 270, 240 ) );
 
     ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
-    SetHideNotDelete( TRUE );
+    SetHideNotDelete( sal_True );
 }
 
 SfxNavigator::SfxNavigator( SfxBindings* pBind ,
@@ -88,13 +88,13 @@ void SfxNavigator::Resizing( Size &rSize )
         pCon->Resizing( rSize );
 }
 
-BOOL SfxNavigator::Close()
+sal_Bool SfxNavigator::Close()
 {
     SfxChildWindowContext *pCon = GetChildWindow_Impl()->GetContext_Impl();
     DBG_ASSERT( pCon, "Kein Context!" );
     if ( !pCon || pCon->Close() )
         return SfxDockingWindow::Close();
     else
-        return FALSE;
+        return sal_False;
 }
 
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/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 455479b9d125..d9c1ea80636d 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -190,7 +190,7 @@ SfxPasswordDialog::SfxPasswordDialog( Window* pParent, const String* pGroupText
 
 // -----------------------------------------------------------------------
 
-void SfxPasswordDialog::SetMinLen( USHORT nLen )
+void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
 {
     mnMinLen = nLen;
     EditModifyHdl( NULL );
@@ -198,7 +198,7 @@ void SfxPasswordDialog::SetMinLen( USHORT nLen )
 
 // -----------------------------------------------------------------------
 
-void SfxPasswordDialog::SetMaxLen( USHORT nLen )
+void SfxPasswordDialog::SetMaxLen( sal_uInt16 nLen )
 {
     maPasswordED.SetMaxTextLen( nLen );
     maConfirmED.SetMaxTextLen( nLen );
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 6b26cf9fb504..e6182880b963 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -46,8 +46,8 @@
 // - statics -
 // -----------
 
-static USHORT   aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
-static BOOL     bOutputForPrinter = TRUE;
+static sal_uInt16   aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
+static sal_Bool     bOutputForPrinter = sal_True;
 
 #define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ]))
 
@@ -88,12 +88,12 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, con
 
     if( bOutputForPrinter )
     {
-        aPrinterOutputRB.Check( TRUE );
+        aPrinterOutputRB.Check( sal_True );
         aOutputGB.SetText( OutputDevice::GetNonMnemonicString( aPrinterOutputRB.GetText() ) );
     }
     else
     {
-        aPrintFileOutputRB.Check( TRUE );
+        aPrintFileOutputRB.Check( sal_True );
         aOutputGB.SetText( OutputDevice::GetNonMnemonicString( aPrintFileOutputRB.GetText() ) );
     }
 
@@ -163,12 +163,12 @@ Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow )
 
 // -----------------------------------------------------------------------------
 
-BOOL SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
+sal_Bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
 {
     SvtPrintWarningOptions  aWarnOptions;
     SvtPrinterOptions       aPrinterOptions;
     SvtPrintFileOptions     aPrintFileOptions;
-    BOOL                    bModified = FALSE;
+    sal_Bool                    bModified = sal_False;
 
 
     if( aPaperSizeCB.IsChecked() != aPaperSizeCB.GetSavedValue())
@@ -231,29 +231,29 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu
     aReduceTransparencyCB.Check( pCurrentOptions->IsReduceTransparency() );
 
     if( pCurrentOptions->GetReducedTransparencyMode() == PRINTER_TRANSPARENCY_AUTO )
-        aReduceTransparencyAutoRB.Check( TRUE );
+        aReduceTransparencyAutoRB.Check( sal_True );
     else
-        aReduceTransparencyNoneRB.Check( TRUE );
+        aReduceTransparencyNoneRB.Check( sal_True );
 
     aReduceGradientsCB.Check( pCurrentOptions->IsReduceGradients() );
 
     if( pCurrentOptions->GetReducedGradientMode() == PRINTER_GRADIENT_STRIPES )
-        aReduceGradientsStripesRB.Check( TRUE );
+        aReduceGradientsStripesRB.Check( sal_True );
     else
-        aReduceGradientsColorRB.Check( TRUE );
+        aReduceGradientsColorRB.Check( sal_True );
 
     aReduceGradientsStepCountNF.SetValue( pCurrentOptions->GetReducedGradientStepCount() );
 
     aReduceBitmapsCB.Check( pCurrentOptions->IsReduceBitmaps() );
 
     if( pCurrentOptions->GetReducedBitmapMode() == PRINTER_BITMAP_OPTIMAL )
-        aReduceBitmapsOptimalRB.Check( TRUE );
+        aReduceBitmapsOptimalRB.Check( sal_True );
     else if( pCurrentOptions->GetReducedBitmapMode() == PRINTER_BITMAP_NORMAL )
-        aReduceBitmapsNormalRB.Check( TRUE );
+        aReduceBitmapsNormalRB.Check( sal_True );
     else
-        aReduceBitmapsResolutionRB.Check( TRUE );
+        aReduceBitmapsResolutionRB.Check( sal_True );
 
-    const USHORT nDPI = pCurrentOptions->GetReducedBitmapResolution();
+    const sal_uInt16 nDPI = pCurrentOptions->GetReducedBitmapResolution();
 
     if( nDPI < aDPIArray[ 0 ] )
         aReduceBitmapsResolutionLB.SelectEntryPos( 0 );
@@ -263,7 +263,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu
         {
             if( nDPI >= aDPIArray[ i ] )
             {
-                aReduceBitmapsResolutionLB.SelectEntryPos( (USHORT) i );
+                aReduceBitmapsResolutionLB.SelectEntryPos( (sal_uInt16) i );
                 i = -1;
             }
         }
@@ -387,12 +387,12 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt
     pCurrentOptions->SetReducedTransparencyMode( aReduceTransparencyAutoRB.IsChecked() ? PRINTER_TRANSPARENCY_AUTO : PRINTER_TRANSPARENCY_NONE );
     pCurrentOptions->SetReduceGradients( aReduceGradientsCB.IsChecked() );
     pCurrentOptions->SetReducedGradientMode( aReduceGradientsStripesRB.IsChecked() ? PRINTER_GRADIENT_STRIPES : PRINTER_GRADIENT_COLOR  );
-    pCurrentOptions->SetReducedGradientStepCount( (USHORT) aReduceGradientsStepCountNF.GetValue() );
+    pCurrentOptions->SetReducedGradientStepCount( (sal_uInt16) aReduceGradientsStepCountNF.GetValue() );
     pCurrentOptions->SetReduceBitmaps( aReduceBitmapsCB.IsChecked() );
     pCurrentOptions->SetReducedBitmapMode( aReduceBitmapsOptimalRB.IsChecked() ? PRINTER_BITMAP_OPTIMAL :
                                            ( aReduceBitmapsNormalRB.IsChecked() ? PRINTER_BITMAP_NORMAL : PRINTER_BITMAP_RESOLUTION ) );
-    pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ Min( (USHORT) aReduceBitmapsResolutionLB.GetSelectEntryPos(),
-                                                            (USHORT)( sizeof( aDPIArray ) / sizeof( aDPIArray[ 0 ] ) - 1 ) ) ] );
+    pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ Min( (sal_uInt16) aReduceBitmapsResolutionLB.GetSelectEntryPos(),
+                                                            (sal_uInt16)( sizeof( aDPIArray ) / sizeof( aDPIArray[ 0 ] ) - 1 ) ) ] );
     pCurrentOptions->SetReducedBitmapIncludesTransparency( aReduceBitmapsTransparencyCB.IsChecked() );
     pCurrentOptions->SetConvertToGreyscales( aConvertToGreyscalesCB.IsChecked() );
 }
@@ -402,7 +402,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const BOOL bReduceTransparency = aReduceTransparencyCB.IsChecked();
+    const sal_Bool bReduceTransparency = aReduceTransparencyCB.IsChecked();
 
     aReduceTransparencyAutoRB.Enable( bReduceTransparency );
     aReduceTransparencyNoneRB.Enable( bReduceTransparency );
@@ -417,7 +417,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const BOOL bEnable = aReduceGradientsCB.IsChecked();
+    const sal_Bool bEnable = aReduceGradientsCB.IsChecked();
 
     aReduceGradientsStripesRB.Enable( bEnable );
     aReduceGradientsColorRB.Enable( bEnable );
@@ -433,7 +433,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, p
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const BOOL bEnable = aReduceBitmapsCB.IsChecked();
+    const sal_Bool bEnable = aReduceBitmapsCB.IsChecked();
 
     aReduceBitmapsOptimalRB.Enable( bEnable );
     aReduceBitmapsNormalRB.Enable( bEnable );
@@ -451,7 +451,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBo
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton*, pButton )
 {
     (void)pButton; //unused
-    const BOOL bEnable = aReduceGradientsCB.IsChecked() && aReduceGradientsStripesRB.IsChecked();
+    const sal_Bool bEnable = aReduceGradientsCB.IsChecked() && aReduceGradientsStripesRB.IsChecked();
 
     aReduceGradientsStepCountNF.Enable( bEnable );
 
@@ -463,7 +463,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, Radi
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton*, pButton )
 {
     (void)pButton; //unused
-    const BOOL bEnable = aReduceBitmapsCB.IsChecked() && aReduceBitmapsResolutionRB.IsChecked();
+    const sal_Bool bEnable = aReduceBitmapsCB.IsChecked() && aReduceBitmapsResolutionRB.IsChecked();
 
     aReduceBitmapsResolutionLB.Enable( bEnable );
 
@@ -478,7 +478,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*,
     {
         aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
         ImplUpdateControls( &maPrinterOptions );
-        bOutputForPrinter = TRUE;
+        bOutputForPrinter = sal_True;
         // --> OD 2008-06-25 #i63982#
         ImplSetAccessibleNames();
         // <--
@@ -497,7 +497,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton
     {
         aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
         ImplUpdateControls( &maPrintFileOptions );
-        bOutputForPrinter = FALSE;
+        bOutputForPrinter = sal_False;
         // --> OD 2008-06-25 #i63982#
         ImplSetAccessibleNames();
         // <--
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index aaabdd3e5d74..7b24a3862811 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -148,21 +148,21 @@ static rtl::OUString GetLabelFromCommandURL( const rtl::OUString& rCommandURL, c
 SFX_IMPL_FLOATINGWINDOW( SfxRecordingFloatWrapper_Impl, SID_RECORDING_FLOATWINDOW );
 
 SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd ,
-                                                USHORT nId ,
+                                                sal_uInt16 nId ,
                                                 SfxBindings* pBind ,
                                                 SfxChildWinInfo* pInfo )
                     : SfxChildWindow( pParentWnd, nId )
                     , pBindings( pBind )
 {
     pWindow = new SfxRecordingFloat_Impl( pBindings, this, pParentWnd );
-    SetWantsFocus( FALSE );
+    SetWantsFocus( sal_False );
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
     ( ( SfxFloatingWindow* ) pWindow )->Initialize( pInfo );
 }
 
 SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl()
 {
-    SfxBoolItem aItem( FN_PARAM_1, TRUE );
+    SfxBoolItem aItem( FN_PARAM_1, sal_True );
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder();
     if ( xRecorder.is() )
         pBindings->GetDispatcher()->Execute( SID_STOP_RECORDING, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
@@ -171,7 +171,7 @@ SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl()
 sal_Bool SfxRecordingFloatWrapper_Impl::QueryClose()
 {
     // asking for recorded macro should be replaced if index access is available!
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder();
     if ( xRecorder.is() && xRecorder->getRecordedMacro().getLength() )
     {
@@ -221,7 +221,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
     aTbx.SetSelectHdl( LINK( this, SfxRecordingFloat_Impl, Select ) );
 
     // start recording
-    SfxBoolItem aItem( SID_RECORDMACRO, TRUE );
+    SfxBoolItem aItem( SID_RECORDMACRO, sal_True );
     GetBindings().GetDispatcher()->Execute( SID_RECORDMACRO, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
 }
 
@@ -240,9 +240,9 @@ SfxRecordingFloat_Impl::~SfxRecordingFloat_Impl()
     }
 }
 
-BOOL SfxRecordingFloat_Impl::Close()
+sal_Bool SfxRecordingFloat_Impl::Close()
 {
-    BOOL bRet = SfxFloatingWindow::Close();
+    sal_Bool bRet = SfxFloatingWindow::Close();
     return bRet;
 }
 
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 2ac8f6a43fee..abad2c341c01 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -62,7 +62,7 @@ namespace
     enum RedlineFunc    { RF_ON, RF_PROTECT };
 
 /*
-    bool QueryIsEnabled( USHORT _nSlot )
+    bool QueryIsEnabled( sal_uInt16 _nSlot )
     {
         bool bRes = false;
         SfxViewShell* pViewSh = SfxViewShell::Current();
@@ -77,7 +77,7 @@ namespace
     }
 */
 
-    bool QueryState( USHORT _nSlot, bool& _rValue )
+    bool QueryState( sal_uInt16 _nSlot, bool& _rValue )
     {
         bool bRet = false;
         SfxViewShell* pViewSh = SfxViewShell::Current();
@@ -99,7 +99,7 @@ namespace
         bool bRet = false;
         if (_eMode != RL_NONE)
         {
-            USHORT nSlot = _eMode == RL_WRITER ? FN_REDLINE_PROTECT : SID_CHG_PROTECT;
+            sal_uInt16 nSlot = _eMode == RL_WRITER ? FN_REDLINE_PROTECT : SID_CHG_PROTECT;
             bRet = QueryState( nSlot, _rValue );
         }
         return bRet;
@@ -111,7 +111,7 @@ namespace
         bool bRet = false;
         if (_eMode != RL_NONE)
         {
-            USHORT nSlot = _eMode == RL_WRITER ? FN_REDLINE_ON : FID_CHG_RECORD;
+            sal_uInt16 nSlot = _eMode == RL_WRITER ? FN_REDLINE_ON : FID_CHG_RECORD;
             bRet = QueryState( nSlot, _rValue );
         }
         return bRet;
@@ -204,7 +204,7 @@ struct SfxSecurityPage_Impl
     SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet );
     ~SfxSecurityPage_Impl();
 
-    BOOL    FillItemSet_Impl( SfxItemSet & );
+    sal_Bool    FillItemSet_Impl( SfxItemSet & );
     void    Reset_Impl( const SfxItemSet & );
 };
 
@@ -283,7 +283,7 @@ SfxSecurityPage_Impl::~SfxSecurityPage_Impl()
 }
 
 
-BOOL SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
+sal_Bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
 {
     bool bModified = false;
 
@@ -355,7 +355,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
             SfxDispatcher* pDisp = pViewSh->GetDispatcher();
             if (SFX_ITEM_AVAILABLE <= pDisp->QueryState( SID_HTML_MODE, pItem ))
             {
-                USHORT nMode = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
+                sal_uInt16 nMode = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
                 bIsHTMLDoc = ( ( nMode & HTMLMODE_ON ) != 0 );
             }
         }
@@ -402,9 +402,9 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
             // A Calc document that is shared will have 'm_eRedlingMode == RL_NONE'
             // In shared documents change recording and protection must be disabled,
             // similar to documents that do not support change recording at all.
-            m_aRecordChangesCB.Check( FALSE );
+            m_aRecordChangesCB.Check( sal_False );
             m_aRecordChangesCB.Disable();
-            m_aChangeProtectionPB.Check( FALSE );
+            m_aChangeProtectionPB.Check( sal_False );
             m_aChangeProtectionPB.Disable();
         }
     }
@@ -530,7 +530,7 @@ SfxSecurityPage::~SfxSecurityPage()
 }
 
 
-BOOL SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet )
+sal_Bool SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet )
 {
     bool bModified = false;
     DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" );
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index d4cc7950612f..2eb332f9d5d9 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -64,10 +64,10 @@ using namespace ::rtl;
 
 struct SfxDock_Impl
 {
-    USHORT              nType;
+    sal_uInt16              nType;
     SfxDockingWindow*   pWin;           // SplitWindow hat dieses Fenster
-    BOOL                bNewLine;
-    BOOL                bHide;          // SplitWindow hatte dieses Fenster
+    sal_Bool                bNewLine;
+    sal_Bool                bHide;          // SplitWindow hatte dieses Fenster
     long                nSize;
 };
 
@@ -86,31 +86,31 @@ class SfxEmptySplitWin_Impl : public SplitWindow
 friend class SfxSplitWindow;
 
     SfxSplitWindow*     pOwner;
-    BOOL                bFadeIn;
-    BOOL                bAutoHide;
-    BOOL                bSplit;
-    BOOL                bEndAutoHide;
+    sal_Bool                bFadeIn;
+    sal_Bool                bAutoHide;
+    sal_Bool                bSplit;
+    sal_Bool                bEndAutoHide;
     Timer               aTimer;
     Point               aLastPos;
-    USHORT              nState;
+    sal_uInt16              nState;
 
                         SfxEmptySplitWin_Impl( SfxSplitWindow *pParent )
                             : SplitWindow( pParent->GetParent(), WinBits( WB_BORDER | WB_3DLOOK ) )
                             , pOwner( pParent )
-                            , bFadeIn( FALSE )
-                            , bAutoHide( FALSE )
-                            , bSplit( FALSE )
-                            , bEndAutoHide( FALSE )
+                            , bFadeIn( sal_False )
+                            , bAutoHide( sal_False )
+                            , bSplit( sal_False )
+                            , bEndAutoHide( sal_False )
                             , nState( 1 )
                         {
                             aTimer.SetTimeoutHdl(
                                 LINK(pOwner, SfxSplitWindow, TimerHdl ) );
                             aTimer.SetTimeout( 200 );
-//                            EnableDrop( TRUE );
+//                            EnableDrop( sal_True );
                             SetAlign( pOwner->GetAlign() );
                             Actualize();
                             ShowAutoHideButton( pOwner->IsAutoHideButtonVisible() );
-                            ShowFadeInHideButton( TRUE );
+                            ShowFadeInHideButton( sal_True );
                         }
 
                         ~SfxEmptySplitWin_Impl()
@@ -146,7 +146,7 @@ void SfxEmptySplitWin_Impl::AutoHide()
 {
     pOwner->SetPinned_Impl( !pOwner->bPinned );
     pOwner->SaveConfig_Impl();
-    bAutoHide = TRUE;
+    bAutoHide = sal_True;
     FadeIn();
 }
 
@@ -154,7 +154,7 @@ void SfxEmptySplitWin_Impl::FadeIn()
 {
     if (!bAutoHide )
         bAutoHide = IsFadeNoButtonMode();
-    pOwner->SetFadeIn_Impl( TRUE );
+    pOwner->SetFadeIn_Impl( sal_True );
     pOwner->Show_Impl();
     if ( bAutoHide )
     {
@@ -184,7 +184,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt )
 //-------------------------------------------------------------------------
 
 SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
-        SfxWorkWindow *pW, BOOL bWithButtons, WinBits nBits )
+        SfxWorkWindow *pW, sal_Bool bWithButtons, WinBits nBits )
 
 /*  [Beschreibung]
 
@@ -198,15 +198,15 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     eAlign(eAl),
     pWorkWin(pW),
     pDockArr( new SfxDockArr_Impl ),
-    bLocked(FALSE),
-    bPinned(TRUE),
+    bLocked(sal_False),
+    bPinned(sal_True),
     pEmptyWin(NULL),
     pActive(NULL)
 {
     if ( bWithButtons )
     {
-        ShowAutoHideButton( FALSE );    // no autohide button (pin) anymore
-        ShowFadeOutButton( TRUE );
+        ShowAutoHideButton( sal_False );    // no autohide button (pin) anymore
+        ShowFadeOutButton( sal_True );
     }
 
     // SV-Alignment setzen
@@ -224,7 +224,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
             break;
         case SFX_ALIGN_BOTTOM:
             eTbxAlign = WINDOWALIGN_BOTTOM;
-            bPinned = TRUE;
+            bPinned = sal_True;
             break;
         default:
             eTbxAlign = WINDOWALIGN_TOP;  // some sort of default...
@@ -235,7 +235,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     pEmptyWin = new SfxEmptySplitWin_Impl( this );
     if ( bPinned )
     {
-        pEmptyWin->bFadeIn = TRUE;
+        pEmptyWin->bFadeIn = sal_True;
         pEmptyWin->nState = 2;
     }
 
@@ -250,27 +250,27 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
         OUString aTemp;
         if ( aUserItem >>= aTemp )
             aWinData = String( aTemp );
-        if ( aWinData.Len() && aWinData.GetChar( (USHORT) 0 ) == 'V' )
+        if ( aWinData.Len() && aWinData.GetChar( (sal_uInt16) 0 ) == 'V' )
         {
-            pEmptyWin->nState = (USHORT) aWinData.GetToken( 1, ',' ).ToInt32();
+            pEmptyWin->nState = (sal_uInt16) aWinData.GetToken( 1, ',' ).ToInt32();
             if ( pEmptyWin->nState & 2 )
-                pEmptyWin->bFadeIn = TRUE;
+                pEmptyWin->bFadeIn = sal_True;
             //bPinned = !( pEmptyWin->nState & 1 );
-            bPinned = TRUE; // always assume pinned - floating mode not used anymore
+            bPinned = sal_True; // always assume pinned - floating mode not used anymore
 
-            USHORT i=2;
-            USHORT nCount = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
-            for ( USHORT n=0; n<nCount; n++ )
+            sal_uInt16 i=2;
+            sal_uInt16 nCount = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
+            for ( sal_uInt16 n=0; n<nCount; n++ )
             {
                 SfxDock_Impl *pDock = new SfxDock_Impl;
                 pDock->pWin = 0;
-                pDock->bNewLine = FALSE;
-                pDock->bHide = TRUE;
-                pDock->nType = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
+                pDock->bNewLine = sal_False;
+                pDock->bHide = sal_True;
+                pDock->nType = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
                 if ( !pDock->nType )
                 {
                     // K"onnte NewLine bedeuten
-                    pDock->nType = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
+                    pDock->nType = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
                     if ( !pDock->nType )
                     {
                         // Lesefehler
@@ -278,7 +278,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
                         break;
                     }
                     else
-                        pDock->bNewLine = TRUE;
+                        pDock->bNewLine = sal_True;
                 }
 
                 pDockArr->Insert(pDock,n);
@@ -287,8 +287,8 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     }
     else
     {
-        bPinned = TRUE;
-        pEmptyWin->bFadeIn = TRUE;
+        bPinned = sal_True;
+        pEmptyWin->bFadeIn = sal_True;
         pEmptyWin->nState = 2;
     }
 
@@ -324,8 +324,8 @@ void SfxSplitWindow::SaveConfig_Impl()
     aWinData += String::CreateFromInt32( pEmptyWin->nState );
     aWinData += ',';
 
-    USHORT nCount = 0;
-    USHORT n;
+    sal_uInt16 nCount = 0;
+    sal_uInt16 n;
     for ( n=0; n<pDockArr->Count(); n++ )
     {
         SfxDock_Impl *pDock = (*pDockArr)[n];
@@ -361,8 +361,8 @@ void SfxSplitWindow::StartSplit()
 
     if ( pEmptyWin )
     {
-        pEmptyWin->bFadeIn = TRUE;
-        pEmptyWin->bSplit = TRUE;
+        pEmptyWin->bFadeIn = sal_True;
+        pEmptyWin->bSplit = sal_True;
     }
 
     Rectangle aRect = pWorkWin->GetFreeArea( !bPinned );
@@ -399,17 +399,17 @@ void SfxSplitWindow::SplitResize()
 void SfxSplitWindow::Split()
 {
     if ( pEmptyWin )
-        pEmptyWin->bSplit = FALSE;
+        pEmptyWin->bSplit = sal_False;
 
     SplitWindow::Split();
 
-    USHORT nCount = pDockArr->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxDock_Impl *pD = (*pDockArr)[n];
         if ( pD->pWin )
         {
-            USHORT nId = pD->nType;
+            sal_uInt16 nId = pD->nType;
             long nSize    = GetItemSize( nId, SWIB_FIXED );
             long nSetSize = GetItemSize( GetSet( nId ) );
             Size aSize;
@@ -445,13 +445,13 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 */
 {
     short nLine = -1;       // damit erstes Fenster nLine auf 0 hochsetzen kann
-    USHORT nL;
-    USHORT nPos = 0;
-    BOOL bNewLine = TRUE;
-    BOOL bSaveConfig = FALSE;
+    sal_uInt16 nL;
+    sal_uInt16 nPos = 0;
+    sal_Bool bNewLine = sal_True;
+    sal_Bool bSaveConfig = sal_False;
     SfxDock_Impl *pFoundDock=0;
-    USHORT nCount = pDockArr->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxDock_Impl *pDock = (*pDockArr)[n];
         if ( pDock->bNewLine )
@@ -463,7 +463,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
             // Neue Zeile
             nPos = 0;
-            bNewLine = TRUE;
+            bNewLine = sal_True;
         }
 
         if ( pDock->pWin )
@@ -483,7 +483,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
             }
 
             // Zeile ist schon er"offnet
-            bNewLine = FALSE;
+            bNewLine = sal_False;
             if ( pFoundDock )
                 break;
         }
@@ -509,18 +509,18 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
     {
         // Nicht gefunden, am Ende einf"ugen
         pFoundDock = new SfxDock_Impl;
-        pFoundDock->bHide = TRUE;
+        pFoundDock->bHide = sal_True;
         pDockArr->Insert( pFoundDock, nCount );
         pFoundDock->nType = pDockWin->GetType();
         nLine++;
         nPos = 0;
-        bNewLine = TRUE;
+        bNewLine = sal_True;
         pFoundDock->bNewLine = bNewLine;
-        bSaveConfig = TRUE;
+        bSaveConfig = sal_True;
     }
 
     pFoundDock->pWin = pDockWin;
-    pFoundDock->bHide = FALSE;
+    pFoundDock->bHide = sal_False;
     InsertWindow_Impl( pFoundDock, rSize, nLine, nPos, bNewLine );
     if ( bSaveConfig )
         SaveConfig_Impl();
@@ -528,7 +528,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
 //-------------------------------------------------------------------------
 
-void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, BOOL bSave)
+void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSave)
 
 /*  [Beschreibung]
 
@@ -537,18 +537,18 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, BOOL bSave)
 
 {
     SfxDock_Impl *pDock=0;
-    USHORT nCount = pDockArr->Count();
-    BOOL bFound = FALSE;
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    sal_Bool bFound = sal_False;
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         pDock = (*pDockArr)[n];
         if ( pDock->nType == pDockWin->GetType() )
         {
             if ( pDock->bNewLine && n<nCount-1 )
-                (*pDockArr)[n+1]->bNewLine = TRUE;
+                (*pDockArr)[n+1]->bNewLine = sal_True;
 
             // Fenster hat schon eine Position, die vergessen wir
-            bFound = TRUE;
+            bFound = sal_True;
             pDockArr->Remove(n);
             break;
         }
@@ -564,7 +564,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, BOOL bSave)
 //-------------------------------------------------------------------------
 
 void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
-                        USHORT nLine, USHORT nPos, BOOL bNewLine)
+                        sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
 
 /*  [Beschreibung]
 
@@ -573,7 +573,7 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
 */
 
 {
-    USHORT nL, nP;
+    sal_uInt16 nL, nP;
     GetWindowPos( pDockWin, nL, nP );
 
     if ( nLine > nL && GetItemCount( GetItemId( nL, 0 ) ) == 1 )
@@ -595,7 +595,7 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
 //-------------------------------------------------------------------------
 
 void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize,
-                        USHORT nLine, USHORT nPos, BOOL bNewLine)
+                        sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
 
 /*  [Beschreibung]
 
@@ -604,9 +604,9 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
 */
 {
-    ReleaseWindow_Impl( pDockWin, FALSE );
+    ReleaseWindow_Impl( pDockWin, sal_False );
     SfxDock_Impl *pDock = new SfxDock_Impl;
-    pDock->bHide = FALSE;
+    pDock->bHide = sal_False;
     pDock->nType = pDockWin->GetType();
     pDock->bNewLine = bNewLine;
     pDock->pWin = pDockWin;
@@ -617,11 +617,11 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
     // Das Fenster mu\s vor dem ersten Fenster eingef"ugt werden, das die
     // gleiche oder eine gr"o\sere Position hat als pDockWin.
-    USHORT nCount = pDockArr->Count();
+    sal_uInt16 nCount = pDockArr->Count();
 
     // Wenn gar kein Fenster gefunden wird, wird als erstes eingef"ugt
-    USHORT nInsertPos = 0;
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nInsertPos = 0;
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxDock_Impl *pD = (*pDockArr)[n];
 
@@ -631,7 +631,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
             // Wenn kein geeignetes Fenster hinter der gew"unschten Einf"ugeposition
             // gefunden wird, wird am Ende eingef"ugt
             nInsertPos = nCount;
-            USHORT nL=0, nP=0;
+            sal_uInt16 nL=0, nP=0;
             GetWindowPos( pD->pWin, nL, nP );
 
             if ( (nL == nLine && nP == nPos) || nL > nLine )
@@ -642,8 +642,8 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
                     DBG_ASSERT(pD->bNewLine, "Keine neue Zeile?");
 
                     // Das Fenster wird auf nPos==0 eingeschoben
-                    pD->bNewLine = FALSE;
-                    pDock->bNewLine = TRUE;
+                    pD->bNewLine = sal_False;
+                    pDock->bNewLine = sal_True;
                 }
 
                 nInsertPos = n;
@@ -661,7 +661,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
 void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
                         const Size& rSize,
-                        USHORT nLine, USHORT nPos, BOOL bNewLine)
+                        sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
 
 /*  [Beschreibung]
 
@@ -672,7 +672,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
 {
     SfxDockingWindow* pDockWin = pDock->pWin;
 
-    USHORT nItemBits = pDockWin->GetWinBits_Impl();
+    sal_uInt16 nItemBits = pDockWin->GetWinBits_Impl();
 
     long nWinSize, nSetSize;
     if ( IsHorizontal() )
@@ -688,24 +688,24 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
 
     pDock->nSize = nWinSize;
 
-    BOOL bUpdateMode = IsUpdateMode();
+    sal_Bool bUpdateMode = IsUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
 
     if ( bNewLine || nLine == GetItemCount( 0 ) )
     {
         // Es soll nicht in eine vorhandene Zeile eingef"ugt werden, sondern
         // eine neue erzeugt werden
 
-        USHORT nId = 1;
-        for ( USHORT n=0; n<GetItemCount(0); n++ )
+        sal_uInt16 nId = 1;
+        for ( sal_uInt16 n=0; n<GetItemCount(0); n++ )
         {
             if ( GetItemId(n) >= nId )
                 nId = GetItemId(n)+1;
         }
 
         // Eine neue nLine-te Zeile erzeugen
-        USHORT nBits = nItemBits;
+        sal_uInt16 nBits = nItemBits;
         if ( GetAlign() == WINDOWALIGN_TOP || GetAlign() == WINDOWALIGN_BOTTOM )
             nBits |= SWIB_COLSET;
         InsertItem( nId, nSetSize, nLine, 0, nBits );
@@ -716,8 +716,8 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
     // so macht, wie man erwartet; "Pixel" macht eigentlich nur Sinn, wenn
     // auch Items mit prozentualen oder relativen Gr"o\sen dabei sind.
     nItemBits |= SWIB_PERCENTSIZE;
-    bLocked = TRUE;
-    USHORT nSet = GetItemId( nLine );
+    bLocked = sal_True;
+    sal_uInt16 nSet = GetItemId( nLine );
     InsertItem( pDockWin->GetType(), pDockWin, nWinSize, nPos, nSet, nItemBits );
 
     // Splitwindows werden im SFX einmal angelegt und beim Einf"ugen des ersten
@@ -728,21 +728,21 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
         // wird vom SfxDockingwindow veranla\st (->SfxWorkWindow::ConfigChild_Impl)
         if ( !bPinned && !IsFloatingMode() )
         {
-            bPinned = TRUE;
-            BOOL bFadeIn = ( pEmptyWin->nState & 2 ) != 0;
-            pEmptyWin->bFadeIn = FALSE;
-            SetPinned_Impl( FALSE );
+            bPinned = sal_True;
+            sal_Bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0;
+            pEmptyWin->bFadeIn = sal_False;
+            SetPinned_Impl( sal_False );
             pEmptyWin->Actualize();
             DBG_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE;
             pWorkWin->ArrangeChilds_Impl();
             if ( bFadeIn )
                 FadeIn();
         }
         else
         {
-            BOOL bFadeIn = ( pEmptyWin->nState & 2 ) != 0;
-            pEmptyWin->bFadeIn = FALSE;
+            sal_Bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0;
+            pEmptyWin->bFadeIn = sal_False;
             pEmptyWin->Actualize();
 #ifdef DBG_UTIL
             if ( !bPinned || !pEmptyWin->bFadeIn )
@@ -754,7 +754,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
                 DBG_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering real Splitwindow" );
             }
 #endif
-            pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE;
             pWorkWin->ArrangeChilds_Impl();
             if ( bFadeIn )
                 FadeIn();
@@ -764,13 +764,13 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
     }
 
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
-    bLocked = FALSE;
+        SetUpdateMode( sal_True );
+    bLocked = sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
+void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide )
 
 /*  [Beschreibung]
 
@@ -778,7 +778,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
     gehidet.
 */
 {
-    USHORT nSet = GetSet( pDockWin->GetType() );
+    sal_uInt16 nSet = GetSet( pDockWin->GetType() );
 
     // Splitwindows werden im SFX einmal angelegt und nach dem Entfernen
     // des letzten DockingWindows unsichtbar gemacht.
@@ -788,7 +788,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
         // veranla\st!
         Hide();
         pEmptyWin->aTimer.Stop();
-        USHORT nRealState = pEmptyWin->nState;
+        sal_uInt16 nRealState = pEmptyWin->nState;
         FadeOut_Impl();
         pEmptyWin->Hide();
 #ifdef DBG_UTIL
@@ -807,8 +807,8 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
     }
 
     SfxDock_Impl *pDock=0;
-    USHORT nCount = pDockArr->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         pDock = (*pDockArr)[n];
         if ( pDock->nType == pDockWin->GetType() )
@@ -821,10 +821,10 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
 
     // Fenster removen, und wenn es das letzte der Zeile war, auch die Zeile
     // ( Zeile = ItemSet )
-    BOOL bUpdateMode = IsUpdateMode();
+    sal_Bool bUpdateMode = IsUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
-    bLocked = TRUE;
+        SetUpdateMode( sal_False );
+    bLocked = sal_True;
 
     RemoveItem( pDockWin->GetType() );
 
@@ -832,14 +832,14 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
         RemoveItem( nSet );
 
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
-    bLocked = FALSE;
+        SetUpdateMode( sal_True );
+    bLocked = sal_False;
 };
 
 //-------------------------------------------------------------------------
 
-BOOL SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
-                                        USHORT& rLine, USHORT& rPos ) const
+sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
+                                        sal_uInt16& rLine, sal_uInt16& rPos ) const
 /*  [Beschreibung]
 
     Liefert die Id des Itemsets und die des Items f"ur das "ubergebene
@@ -847,19 +847,19 @@ BOOL SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
 */
 
 {
-    USHORT nSet = GetSet ( pWindow->GetType() );
+    sal_uInt16 nSet = GetSet ( pWindow->GetType() );
     if ( nSet == SPLITWINDOW_ITEM_NOTFOUND )
-        return FALSE;
+        return sal_False;
 
     rPos  = GetItemPos( pWindow->GetType(), nSet );
     rLine = GetItemPos( nSet );
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxSplitWindow::GetWindowPos( const Point& rTestPos,
-                                      USHORT& rLine, USHORT& rPos ) const
+sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos,
+                                      sal_uInt16& rLine, sal_uInt16& rPos ) const
 /*  [Beschreibung]
 
     Liefert die Id des Itemsets und die des Items f"ur das DockingWindow
@@ -868,19 +868,19 @@ BOOL SfxSplitWindow::GetWindowPos( const Point& rTestPos,
 */
 
 {
-    USHORT nId = GetItemId( rTestPos );
+    sal_uInt16 nId = GetItemId( rTestPos );
     if ( nId == 0 )
-        return FALSE;
+        return sal_False;
 
-    USHORT nSet = GetSet ( nId );
+    sal_uInt16 nSet = GetSet ( nId );
     rPos  = GetItemPos( nId, nSet );
     rLine = GetItemPos( nSet );
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxSplitWindow::GetLineCount() const
+sal_uInt16 SfxSplitWindow::GetLineCount() const
 
 /*  [Beschreibung]
 
@@ -892,33 +892,33 @@ USHORT SfxSplitWindow::GetLineCount() const
 
 //-------------------------------------------------------------------------
 
-long SfxSplitWindow::GetLineSize( USHORT nLine ) const
+long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const
 
 /*  [Beschreibung]
 
     Liefert die "Zeilenh"ohe" des nLine-ten Itemsets.
 */
 {
-    USHORT nId = GetItemId( nLine );
+    sal_uInt16 nId = GetItemId( nLine );
     return GetItemSize( nId );
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxSplitWindow::GetWindowCount( USHORT nLine ) const
+sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const
 
 /*  [Beschreibung]
 
     Liefert die
 */
 {
-    USHORT nId = GetItemId( nLine );
+    sal_uInt16 nId = GetItemId( nLine );
     return GetItemCount( nId );
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxSplitWindow::GetWindowCount() const
+sal_uInt16 SfxSplitWindow::GetWindowCount() const
 
 /*  [Beschreibung]
 
@@ -942,11 +942,11 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
     if ( pTimer )
         pTimer->Stop();
 
-    if ( CursorIsOverRect( FALSE ) || !pTimer )
+    if ( CursorIsOverRect( sal_False ) || !pTimer )
     {
         // Wenn der Mauszeiger innerhalb des Fensters liegt, SplitWindow anzeigen
         // und Timer zum Schlie\sen aufsetzen
-        pEmptyWin->bAutoHide = TRUE;
+        pEmptyWin->bAutoHide = sal_True;
         if ( !IsVisible() )
             pEmptyWin->FadeIn();
 
@@ -969,16 +969,16 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
         // (Benutzer ist einfach mit der Maus "uber pEmptyWin gefahren)
         if ( IsVisible() )
         {
-            pEmptyWin->bEndAutoHide = FALSE;
+            pEmptyWin->bEndAutoHide = sal_False;
             if ( !Application::IsInModalMode() &&
                   !PopupMenu::IsInExecute() &&
-                  !pEmptyWin->bSplit && !HasChildPathFocus( TRUE ) )
+                  !pEmptyWin->bSplit && !HasChildPathFocus( sal_True ) )
             {
                 // W"ahrend ein modaler Dialog oder ein Popupmenu offen sind
                 // oder w"ahrend des Splittens auf keinen Fall zumachen; auch
                 // solange eines der Children den Focus hat, bleibt das
                 // das Fenster offen
-                pEmptyWin->bEndAutoHide = TRUE;
+                pEmptyWin->bEndAutoHide = sal_True;
             }
 
             if ( pEmptyWin->bEndAutoHide )
@@ -1010,9 +1010,9 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
 
 //-------------------------------------------------------------------------
 
-BOOL SfxSplitWindow::CursorIsOverRect( BOOL bForceAdding ) const
+sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const
 {
-    BOOL bVisible = IsVisible();
+    sal_Bool bVisible = IsVisible();
 
     // Auch das kollabierte SplitWindow ber"ucksichtigen
     Point aPos = pEmptyWin->GetParent()->OutputToScreenPixel( pEmptyWin->GetPosPixel() );
@@ -1045,8 +1045,8 @@ BOOL SfxSplitWindow::CursorIsOverRect( BOOL bForceAdding ) const
     }
 
     if ( aRect.IsInside( OutputToScreenPixel( ((Window*)this)->GetPointerPosPixel() ) ) )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -1059,19 +1059,19 @@ SplitWindow* SfxSplitWindow::GetSplitWindow()
 }
 
 //-------------------------------------------------------------------------
-BOOL SfxSplitWindow::IsFadeIn() const
+sal_Bool SfxSplitWindow::IsFadeIn() const
 {
     return pEmptyWin->bFadeIn;
 }
 
-BOOL SfxSplitWindow::IsAutoHide( BOOL bSelf ) const
+sal_Bool SfxSplitWindow::IsAutoHide( sal_Bool bSelf ) const
 {
     return bSelf ? pEmptyWin->bAutoHide && !pEmptyWin->bEndAutoHide : pEmptyWin->bAutoHide;
 }
 
 //-------------------------------------------------------------------------
 
-void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
+void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn )
 {
     if ( bPinned == bOn )
         return;
@@ -1091,13 +1091,13 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
             Hide();
             pEmptyWin->Actualize();
             DBG_TRACE( "SfxSplitWindow::SetPinned_Impl - registering empty Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
         }
 
         Point aPos( GetPosPixel() );
         aPos = GetParent()->OutputToScreenPixel( aPos );
         SetFloatingPos( aPos );
-        SetFloatingMode( TRUE );
+        SetFloatingMode( sal_True );
         GetFloatingWindow()->SetOutputSizePixel( GetOutputSizePixel() );
 
         if ( pEmptyWin->bFadeIn )
@@ -1107,7 +1107,7 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
     {
         pEmptyWin->nState &= ~1;
         SetOutputSizePixel( GetFloatingWindow()->GetOutputSizePixel() );
-        SetFloatingMode( FALSE );
+        SetFloatingMode( sal_False );
 
         if ( pEmptyWin->bFadeIn )
         {
@@ -1116,7 +1116,7 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
             pWorkWin->ReleaseChild_Impl( *pEmptyWin );
             pEmptyWin->Hide();
             DBG_TRACE( "SfxSplitWindow::SetPinned_Impl - registering real Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *this, eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
         }
     }
 
@@ -1126,7 +1126,7 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
 
 //-------------------------------------------------------------------------
 
-void SfxSplitWindow::SetFadeIn_Impl( BOOL bOn )
+void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn )
 {
     if ( bOn == pEmptyWin->bFadeIn )
         return;
@@ -1150,14 +1150,14 @@ void SfxSplitWindow::SetFadeIn_Impl( BOOL bOn )
             pWorkWin->ReleaseChild_Impl( *pEmptyWin );
             pEmptyWin->Hide();
             DBG_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *this, eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
             pWorkWin->ArrangeChilds_Impl();
             pWorkWin->ShowChilds_Impl();
         }
     }
     else
     {
-        pEmptyWin->bAutoHide = FALSE;
+        pEmptyWin->bAutoHide = sal_False;
         pEmptyWin->nState &= ~2;
         if ( !IsFloatingMode() )
         {
@@ -1167,7 +1167,7 @@ void SfxSplitWindow::SetFadeIn_Impl( BOOL bOn )
             Hide();
             pEmptyWin->Actualize();
             DBG_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
             pWorkWin->ArrangeChilds_Impl();
             pWorkWin->ShowChilds_Impl();
             pWorkWin->ArrangeAutoHideWindows( this );
@@ -1187,13 +1187,13 @@ void SfxSplitWindow::AutoHide()
     if ( !bPinned )
     {
         // Es "schwebt", also wieder andocken
-        SetPinned_Impl( TRUE );
+        SetPinned_Impl( sal_True );
         pWorkWin->ArrangeChilds_Impl();
     }
     else
     {
         // In den "Schwebezustand" bringen
-        SetPinned_Impl( FALSE );
+        SetPinned_Impl( sal_False );
         pWorkWin->ArrangeChilds_Impl();
         pWorkWin->ArrangeAutoHideWindows( this );
     }
@@ -1206,11 +1206,11 @@ void SfxSplitWindow::FadeOut_Impl()
 {
     if ( pEmptyWin->aTimer.IsActive() )
     {
-        pEmptyWin->bAutoHide = FALSE;
+        pEmptyWin->bAutoHide = sal_False;
         pEmptyWin->aTimer.Stop();
     }
 
-    SetFadeIn_Impl( FALSE );
+    SetFadeIn_Impl( sal_False );
     Show_Impl();
 }
 
@@ -1222,14 +1222,14 @@ void SfxSplitWindow::FadeOut()
 
 void SfxSplitWindow::FadeIn()
 {
-    SetFadeIn_Impl( TRUE );
+    SetFadeIn_Impl( sal_True );
     Show_Impl();
 }
 
 void SfxSplitWindow::Show_Impl()
 {
-    USHORT nCount = pDockArr->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxDock_Impl *pDock = (*pDockArr)[n];
         if ( pDock->pWin )
@@ -1237,17 +1237,17 @@ void SfxSplitWindow::Show_Impl()
     }
 }
 /*
-void SfxSplitWindow::Pin_Impl( BOOL bPin )
+void SfxSplitWindow::Pin_Impl( sal_Bool bPin )
 {
     if ( bPinned != bPin )
         AutoHide();
 }
 */
-BOOL SfxSplitWindow::ActivateNextChild_Impl( BOOL bForward )
+sal_Bool SfxSplitWindow::ActivateNextChild_Impl( sal_Bool bForward )
 {
     // Wenn kein pActive, auf erstes bzw. letztes Fenster gehen ( bei !bForward wird erst in der loop dekrementiert )
-    USHORT nCount = pDockArr->Count();
-    USHORT n = bForward ? 0 : nCount;
+    sal_uInt16 nCount = pDockArr->Count();
+    sal_uInt16 n = bForward ? 0 : nCount;
 
     // Wenn Focus innerhalb, dann ein Fenster vor oder zur"uck, wenn m"oglich
     if ( pActive )
@@ -1268,31 +1268,31 @@ BOOL SfxSplitWindow::ActivateNextChild_Impl( BOOL bForward )
     if ( bForward )
     {
         // N"achstes Fenster suchen
-        for ( USHORT nNext=n; nNext<nCount; nNext++ )
+        for ( sal_uInt16 nNext=n; nNext<nCount; nNext++ )
         {
             SfxDock_Impl *pD = (*pDockArr)[nNext];
             if ( pD->pWin )
             {
                 pD->pWin->GrabFocus();
-                return TRUE;
+                return sal_True;
             }
         }
     }
     else
     {
         // Vorheriges Fenster suchen
-        for ( USHORT nNext=n; nNext--; )
+        for ( sal_uInt16 nNext=n; nNext--; )
         {
             SfxDock_Impl *pD = (*pDockArr)[nNext];
             if ( pD->pWin )
             {
                 pD->pWin->GrabFocus();
-                return TRUE;
+                return sal_True;
             }
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void SfxSplitWindow::SetActiveWindow_Impl( SfxDockingWindow* pWin )
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index f4d2392c9017..ff3cd08b01c8 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno;
 namespace sfx2 {
 
 #define USERITEM_NAME       DEFINE_CONST_OUSTRING("UserItem")
-#define MAX_SAVE_COUNT      (USHORT)10
+#define MAX_SAVE_COUNT      (sal_uInt16)10
 
 // ============================================================================
 // SearchDialog
@@ -113,7 +113,7 @@ void SearchDialog::LoadConfig()
         }
     }
     else
-        m_aWrapAroundBox.Check( TRUE );
+        m_aWrapAroundBox.Check( sal_True );
 }
 
 void SearchDialog::SaveConfig()
@@ -121,7 +121,7 @@ void SearchDialog::SaveConfig()
     SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName );
     aViewOpt.SetWindowState( rtl::OUString::createFromAscii( m_sWinState.GetBuffer() ) );
     String sUserData;
-    USHORT i = 0, nCount = Min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT );
+    sal_uInt16 i = 0, nCount = Min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT );
     for ( ; i < nCount; ++i )
     {
         sUserData += m_aSearchEdit.GetEntry(i);
@@ -144,7 +144,7 @@ void SearchDialog::SaveConfig()
 IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG )
 {
     String sSrchTxt = m_aSearchEdit.GetText();
-    USHORT nPos = m_aSearchEdit.GetEntryPos( sSrchTxt );
+    sal_uInt16 nPos = m_aSearchEdit.GetEntryPos( sSrchTxt );
     if ( nPos > 0 && nPos != COMBOBOX_ENTRY_NOTFOUND )
         m_aSearchEdit.RemoveEntry( nPos );
     if ( nPos > 0 )
@@ -168,9 +168,9 @@ void SearchDialog::SetFocusOnEdit()
     m_aSearchEdit.GrabFocus();
 }
 
-BOOL SearchDialog::Close()
+sal_Bool SearchDialog::Close()
 {
-    BOOL bRet = ModelessDialog::Close();
+    sal_Bool bRet = ModelessDialog::Close();
     m_aCloseHdl.Call( this );
     return bRet;
 }
@@ -181,7 +181,7 @@ void SearchDialog::StateChanged( StateChangedType nStateChange )
     {
         if ( m_sWinState.Len() )
             SetWindowState( m_sWinState );
-        m_bIsConstructed = TRUE;
+        m_bIsConstructed = sal_True;
     }
 
     ModelessDialog::StateChanged( nStateChange );
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index a33677c6b2ae..ba6fac0fdee8 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -54,17 +54,17 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) :
     Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILY_ITEM ) )
 
 {
-    ULONG nMask = ReadLongRes();
+    sal_uIntPtr nMask = ReadLongRes();
 
     if(nMask & RSC_SFX_STYLE_ITEM_LIST)
     {
-        ULONG nCount = ReadLongRes();
-        for( ULONG i = 0; i < nCount; i++ )
+        sal_uIntPtr nCount = ReadLongRes();
+        for( sal_uIntPtr i = 0; i < nCount; i++ )
         {
             SfxFilterTupel *pTupel = new SfxFilterTupel;
             pTupel->aName = ReadStringRes();
             long lFlags = ReadLongRes();
-            pTupel->nFlags = (USHORT)lFlags;
+            pTupel->nFlags = (sal_uInt16)lFlags;
             aFilterList.Insert(pTupel, LIST_APPEND);
         }
     }
@@ -83,7 +83,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) :
     }
     if(nMask & RSC_SFX_STYLE_ITEM_STYLEFAMILY)
     {
-        nFamily = (USHORT)ReadLongRes();
+        nFamily = (sal_uInt16)ReadLongRes();
     }
     else
         nFamily = SFX_STYLE_FAMILY_PARA;
@@ -116,11 +116,11 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem()
 
 SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) :
 
-    Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILIES ).SetAutoRelease( FALSE ) ),
+    Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILIES ).SetAutoRelease( sal_False ) ),
     aEntryList( 4, 1 )
 {
-    ULONG nCount = ReadLongRes();
-    for( ULONG i = 0; i < nCount; i++ )
+    sal_uIntPtr nCount = ReadLongRes();
+    for( sal_uIntPtr i = 0; i < nCount; i++ )
     {
         const ResId aResId((RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr());
         SfxStyleFamilyItem *pItem = new SfxStyleFamilyItem(aResId);
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index e1d01de94955..1a155458995f 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -51,7 +51,7 @@ SfxStyleDialog::SfxStyleDialog
     Window* pParent,            // Parent
     const ResId& rResId,        // ResId
     SfxStyleSheetBase& rStyle,  // zu bearbeitendes StyleSheet
-    BOOL bFreeRes,              // Flag Resourcen freigeben
+    sal_Bool bFreeRes,              // Flag Resourcen freigeben
     const String* pUserBtnTxt
 ) :
 
@@ -64,7 +64,7 @@ SfxStyleDialog::SfxStyleDialog
                   rStyle.GetItemSet().Clone(),
                   // auch ohne ParentSupport TRUE "ubergeben, aber erweitert
                   // um den StandardButton zu unterdr"ucken
-                  rStyle.HasParentSupport() ? TRUE : 2,
+                  rStyle.HasParentSupport() ? sal_True : 2,
                   pUserBtnTxt ),
 
     pStyle( &rStyle )
@@ -72,7 +72,7 @@ SfxStyleDialog::SfxStyleDialog
 {
     AddTabPage( ID_TABPAGE_MANAGESTYLES,
                 String( SfxResId( STR_TABPAGE_MANAGESTYLES ) ),
-                SfxManageStyleSheetPage::Create, 0, FALSE, 0 );
+                SfxManageStyleSheetPage::Create, 0, sal_False, 0 );
 
     // bei neuer Vorlage immer die Verwaltungsseite als aktuelle
     // Seite setzen
@@ -154,11 +154,11 @@ IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton )
 
     const SfxItemSet* pInSet = GetInputSetImpl();
     SfxWhichIter aIter( *pInSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
 
     while ( nWhich )
     {
-        SfxItemState eState = pInSet->GetItemState( nWhich, FALSE );
+        SfxItemState eState = pInSet->GetItemState( nWhich, sal_False );
 
         if ( SFX_ITEM_DEFAULT == eState )
             pExampleSet->ClearItem( nWhich );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d149bea792dc..e9c66e2a5f13 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -68,34 +68,34 @@ TYPEINIT1(LAYOUT_NS_SFX_TABDIALOG SfxTabDialogItem,SfxSetItem);
 
 struct TabPageImpl
 {
-    BOOL                        mbStandard;
+    sal_Bool                        mbStandard;
     sfx::ItemConnectionArray    maItemConn;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
-    TabPageImpl() : mbStandard( FALSE ) {}
+    TabPageImpl() : mbStandard( sal_False ) {}
 };
 
 NAMESPACE_LAYOUT_SFX_TABDIALOG
 
 struct Data_Impl
 {
-    USHORT nId;                  // Die ID
+    sal_uInt16 nId;                  // Die ID
     CreateTabPage fnCreatePage;  // Pointer auf die Factory
     GetTabPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion
     SfxTabPage* pTabPage;        // die TabPage selber
-    BOOL bOnDemand;              // Flag: ItemSet onDemand
-    BOOL bRefresh;               // Flag: Seite mu\s neu initialisiert werden
+    sal_Bool bOnDemand;              // Flag: ItemSet onDemand
+    sal_Bool bRefresh;               // Flag: Seite mu\s neu initialisiert werden
 
     // Konstruktor
-    Data_Impl( USHORT Id, CreateTabPage fnPage,
-               GetTabPageRanges fnRanges, BOOL bDemand ) :
+    Data_Impl( sal_uInt16 Id, CreateTabPage fnPage,
+               GetTabPageRanges fnRanges, sal_Bool bDemand ) :
 
         nId         ( Id ),
         fnCreatePage( fnPage ),
         fnGetRanges ( fnRanges ),
         pTabPage    ( 0 ),
         bOnDemand   ( bDemand ),
-        bRefresh    ( FALSE )
+        bRefresh    ( sal_False )
     {
         if ( !fnCreatePage  )
         {
@@ -114,7 +114,7 @@ SfxTabDialogItem::SfxTabDialogItem( const SfxTabDialogItem& rAttr, SfxItemPool*
 {
 }
 
-SfxTabDialogItem::SfxTabDialogItem( USHORT nId, const SfxItemSet& rItemSet )
+SfxTabDialogItem::SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet )
     : SfxSetItem( nId, rItemSet )
 {
 }
@@ -124,7 +124,7 @@ SfxPoolItem* __EXPORT SfxTabDialogItem::Clone(SfxItemPool* pToPool) const
     return new SfxTabDialogItem( *this, pToPool );
 }
 
-SfxPoolItem* __EXPORT SfxTabDialogItem::Create(SvStream& /*rStream*/, USHORT /*nVersion*/) const
+SfxPoolItem* __EXPORT SfxTabDialogItem::Create(SvStream& /*rStream*/, sal_uInt16 /*nVersion*/) const
 {
     DBG_ERROR( "Use it only in UI!" );
     return NULL;
@@ -135,7 +135,7 @@ class SfxTabDialogController : public SfxControllerItem
     SfxTabDialog*   pDialog;
     const SfxItemSet*     pSet;
 public:
-                    SfxTabDialogController( USHORT nSlotId, SfxBindings& rBindings, SfxTabDialog* pDlg )
+                    SfxTabDialogController( sal_uInt16 nSlotId, SfxBindings& rBindings, SfxTabDialog* pDlg )
                         : SfxControllerItem( nSlotId, rBindings )
                         , pDialog( pDlg )
                         , pSet( NULL )
@@ -144,7 +144,7 @@ public:
                     ~SfxTabDialogController();
 
     DECL_LINK(      Execute_Impl, void* );
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 };
 
 SfxTabDialogController::~SfxTabDialogController()
@@ -167,21 +167,21 @@ IMPL_LINK( SfxTabDialogController, Execute_Impl, void*, pVoid )
     return 0;
 }
 
-void SfxTabDialogController::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
+void SfxTabDialogController::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
 {
     const SfxSetItem* pSetItem = PTR_CAST( SfxSetItem, pState );
     if ( pSetItem )
     {
         pSet = pDialog->pSet = pSetItem->GetItemSet().Clone();
-        BOOL bDialogStarted = FALSE;
-        for ( USHORT n=0; n<pDialog->aTabCtrl.GetPageCount(); n++ )
+        sal_Bool bDialogStarted = sal_False;
+        for ( sal_uInt16 n=0; n<pDialog->aTabCtrl.GetPageCount(); n++ )
         {
-            USHORT nPageId = pDialog->aTabCtrl.GetPageId( n );
+            sal_uInt16 nPageId = pDialog->aTabCtrl.GetPageId( n );
             SfxTabPage* pTabPage = dynamic_cast<SfxTabPage*> (pDialog->aTabCtrl.GetTabPage( nPageId ));
             if ( pTabPage )
             {
                 pTabPage->Reset( pSetItem->GetItemSet() );
-                bDialogStarted = TRUE;
+                bDialogStarted = sal_True;
             }
         }
 
@@ -196,7 +196,7 @@ DECL_PTRARRAY(SfxTabDlgData_Impl, Data_Impl *, 4,4)
 
 struct TabDlg_Impl
 {
-    BOOL                bModified       : 1,
+    sal_Bool                bModified       : 1,
                         bModal          : 1,
                         bInOK           : 1,
                         bHideResetBtn   : 1;
@@ -205,25 +205,25 @@ struct TabDlg_Impl
     PushButton*         pApplyButton;
     SfxTabDialogController* pController;
 
-    TabDlg_Impl( BYTE nCnt ) :
+    TabDlg_Impl( sal_uInt8 nCnt ) :
 
-        bModified       ( FALSE ),
-        bModal          ( TRUE ),
-        bInOK           ( FALSE ),
-        bHideResetBtn   ( FALSE ),
+        bModified       ( sal_False ),
+        bModal          ( sal_True ),
+        bInOK           ( sal_False ),
+        bHideResetBtn   ( sal_False ),
         pData           ( new SfxTabDlgData_Impl( nCnt ) ),
         pApplyButton    ( NULL ),
         pController     ( NULL )
     {}
 };
 
-Data_Impl* Find( SfxTabDlgData_Impl& rArr, USHORT nId, USHORT* pPos = 0 );
+Data_Impl* Find( SfxTabDlgData_Impl& rArr, sal_uInt16 nId, sal_uInt16* pPos = 0 );
 
-Data_Impl* Find( SfxTabDlgData_Impl& rArr, USHORT nId, USHORT* pPos )
+Data_Impl* Find( SfxTabDlgData_Impl& rArr, sal_uInt16 nId, sal_uInt16* pPos )
 {
-    const USHORT nCount = rArr.Count();
+    const sal_uInt16 nCount = rArr.Count();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         Data_Impl* pObj = rArr[i];
 
@@ -263,7 +263,7 @@ SfxTabPage::SfxTabPage( Window *pParent,
     TabPage( pParent, rResId ),
 
     pSet                ( &rAttrSet ),
-    bHasExchangeSupport ( FALSE ),
+    bHasExchangeSupport ( sal_False ),
     pTabDlg             ( NULL ),
     pImpl               ( new TabPageImpl )
 
@@ -273,7 +273,7 @@ SfxTabPage::SfxTabPage( Window *pParent,
 SfxTabPage:: SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ) :
     TabPage(pParent, nStyle),
     pSet                ( &rAttrSet ),
-    bHasExchangeSupport ( FALSE ),
+    bHasExchangeSupport ( sal_False ),
     pTabDlg             ( NULL ),
     pImpl               ( new TabPageImpl )
 {
@@ -295,7 +295,7 @@ SfxTabPage::~SfxTabPage()
 
 // -----------------------------------------------------------------------
 
-BOOL SfxTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxTabPage::FillItemSet( SfxItemSet& rSet )
 {
     return pImpl->maItemConn.DoFillItemSet( rSet, GetItemSet() );
 }
@@ -367,19 +367,19 @@ void SfxTabPage::FillUserData()
 
 // -----------------------------------------------------------------------
 
-BOOL SfxTabPage::IsReadOnly() const
+sal_Bool SfxTabPage::IsReadOnly() const
 
 /*  [Description]
 
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep )
+const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep )
 
 /*  [Beschreibung]
 
@@ -390,13 +390,13 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot, sa
 
 {
     const SfxItemPool* pPool = rSet.GetPool();
-    USHORT nWh = pPool->GetWhich( nSlot, bDeep );
+    sal_uInt16 nWh = pPool->GetWhich( nSlot, bDeep );
     const SfxPoolItem* pItem = 0;
 #ifdef DEBUG
     SfxItemState eState;
     eState =
 #endif
-            rSet.GetItemState( nWh, TRUE, &pItem );  // -Wall required??
+            rSet.GetItemState( nWh, sal_True, &pItem );  // -Wall required??
 
     if ( !pItem && nWh != nSlot )
         pItem = &pPool->GetDefaultItem( nWh );
@@ -406,7 +406,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot, sa
 // -----------------------------------------------------------------------
 
 const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
-                                           USHORT nSlot, sal_Bool bDeep )
+                                           sal_uInt16 nSlot, sal_Bool bDeep )
 
 /*  [Beschreibung]
 
@@ -416,7 +416,7 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
 
 {
     const SfxItemSet& rOldSet = GetItemSet();
-    USHORT nWh = GetWhich( nSlot, bDeep );
+    sal_uInt16 nWh = GetWhich( nSlot, bDeep );
     const SfxPoolItem* pItem = 0;
 
     if ( pImpl->mbStandard && rOldSet.GetParent() )
@@ -432,7 +432,7 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
 // -----------------------------------------------------------------------
 
 const SfxPoolItem* SfxTabPage::GetExchangeItem( const SfxItemSet& rSet,
-                                                USHORT nSlot )
+                                                sal_uInt16 nSlot )
 
 /*  [Beschreibung]
 
@@ -489,11 +489,11 @@ void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection )
     aBaseFmtBtn ( this ),\
     pSet        ( ItemSetPtr ),\
     pOutSet     ( 0 ),\
-    pImpl       ( new TabDlg_Impl( (BYTE)aTabCtrl.GetPageCount() ) ), \
+    pImpl       ( new TabDlg_Impl( (sal_uInt8)aTabCtrl.GetPageCount() ) ), \
     pRanges     ( 0 ), \
     nResId      ( rResId.GetId() ), \
     nAppPageId  ( USHRT_MAX ), \
-    bItemsReset ( FALSE ),\
+    bItemsReset ( sal_False ),\
     bFmt        ( bEditFmt ),\
     pExampleSet ( 0 )
 
@@ -512,7 +512,7 @@ SfxTabDialog::SfxTabDialog
     const ResId& rResId,            // ResourceId
     const SfxItemSet* pItemSet,     // Itemset mit den Daten;
                                     // kann NULL sein, wenn Pages onDemand
-    BOOL bEditFmt,      // Flag: es werden Vorlagen bearbeitet
+    sal_Bool bEditFmt,      // Flag: es werden Vorlagen bearbeitet
                         // wenn ja -> zus"atzlicher Button f"ur Standard
     const String* pUserButtonText   // Text fuer BenutzerButton;
                                     // wenn != 0, wird der UserButton erzeugt
@@ -538,7 +538,7 @@ SfxTabDialog::SfxTabDialog
     const ResId& rResId,            // ResourceId
     const SfxItemSet* pItemSet,     // Itemset mit den Daten; kann NULL sein,
                                     // wenn Pages onDemand
-    BOOL bEditFmt,      // Flag: es werden Vorlagen bearbeitet
+    sal_Bool bEditFmt,      // Flag: es werden Vorlagen bearbeitet
                         // wenn ja -> zus"atzlicher Button f"ur Standard
     const String* pUserButtonText   // Text f"ur BenutzerButton;
                                     // wenn != 0, wird der UserButton erzeugt
@@ -561,9 +561,9 @@ SfxTabDialog::SfxTabDialog
 (
     Window* pParent,                // Parent-Fenster
     const ResId& rResId,            // ResourceId
-    USHORT nSetId,
+    sal_uInt16 nSetId,
     SfxBindings& rBindings,
-    BOOL bEditFmt,      // Flag: es werden Vorlagen bearbeitet
+    sal_Bool bEditFmt,      // Flag: es werden Vorlagen bearbeitet
                         // wenn ja -> zus"atzlicher Button f"ur Standard
     const String* pUserButtonText   // Text f"ur BenutzerButton;
                                     // wenn != 0, wird der UserButton erzeugt
@@ -576,7 +576,7 @@ SfxTabDialog::SfxTabDialog
     pImpl->pController = new SfxTabDialogController( nSetId, rBindings, this );
     rBindings.LEAVEREGISTRATIONS();
 
-    EnableApplyButton( TRUE );
+    EnableApplyButton( sal_True );
     SetApplyHandler( LINK( pImpl->pController, SfxTabDialogController, Execute_Impl ) );
 
     rBindings.Invalidate( nSetId );
@@ -608,8 +608,8 @@ SfxTabDialog::~SfxTabDialog()
 #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */
     aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
 
-    const USHORT nCount = pImpl->pData->Count();
-    for ( USHORT i = 0; i < nCount; ++i )
+    const sal_uInt16 nCount = pImpl->pData->Count();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         Data_Impl* pDataObject = pImpl->pData->GetObject(i);
 
@@ -644,7 +644,7 @@ SfxTabDialog::~SfxTabDialog()
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
+void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText )
 
 /*  [Beschreibung]
 
@@ -683,13 +683,13 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
         aBaseFmtBtn.SetHelpId( HID_TABDLG_STANDARD_BTN );
 
         // bFmt = tempor"ares Flag im Ctor() "ubergeben,
-        // wenn bFmt == 2, dann auch TRUE,
+        // wenn bFmt == 2, dann auch sal_True,
         // zus"atzlich Ausblendung vom StandardButton,
-        // nach der Initialisierung wieder auf TRUE setzen
+        // nach der Initialisierung wieder auf sal_True setzen
         if ( bFmtFlag != 2 )
             aBaseFmtBtn.Show();
         else
-            bFmtFlag = TRUE;
+            bFmtFlag = sal_True;
     }
 
     if ( pSet )
@@ -704,7 +704,7 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
 void SfxTabDialog::RemoveResetButton()
 {
     aResetBtn.Hide();
-    pImpl->bHideResetBtn = TRUE;
+    pImpl->bHideResetBtn = sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -738,10 +738,10 @@ void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl )
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::Start( BOOL bShow )
+void SfxTabDialog::Start( sal_Bool bShow )
 {
     aCancelBtn.SetClickHdl( LINK( this, SfxTabDialog, CancelHdl ) );
-    pImpl->bModal = FALSE;
+    pImpl->bModal = sal_False;
     Start_Impl();
 
     if ( bShow )
@@ -770,7 +770,7 @@ Link SfxTabDialog::GetApplyHandler() const
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::EnableApplyButton(BOOL bEnable)
+void SfxTabDialog::EnableApplyButton(sal_Bool bEnable)
 {
     if ( IsApplyButtonEnabled() == bEnable )
         // nothing to do
@@ -804,7 +804,7 @@ void SfxTabDialog::EnableApplyButton(BOOL bEnable)
 
 // -----------------------------------------------------------------------
 
-BOOL SfxTabDialog::IsApplyButtonEnabled() const
+sal_Bool SfxTabDialog::IsApplyButtonEnabled() const
 {
     return ( NULL != pImpl->pApplyButton );
 }
@@ -828,7 +828,7 @@ PushButton* SfxTabDialog::GetApplyButton()
 void SfxTabDialog::Start_Impl()
 {
     DBG_ASSERT( pImpl->pData->Count() == aTabCtrl.GetPageCount(), "not all pages registered" );
-    USHORT nActPage = aTabCtrl.GetPageId( 0 );
+    sal_uInt16 nActPage = aTabCtrl.GetPageId( 0 );
 
     // load old settings, when exists
     SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
@@ -839,13 +839,13 @@ void SfxTabDialog::Start_Impl()
 #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */
 
         // initiale TabPage aus Programm/Hilfe/Konfig
-        nActPage = (USHORT)aDlgOpt.GetPageID();
+        nActPage = (sal_uInt16)aDlgOpt.GetPageID();
 
         if ( USHRT_MAX != nAppPageId )
             nActPage = nAppPageId;
         else
         {
-            USHORT nAutoTabPageId = SFX_APP()->Get_Impl()->nAutoTabPageId;
+            sal_uInt16 nAutoTabPageId = SFX_APP()->Get_Impl()->nAutoTabPageId;
             if ( nAutoTabPageId )
                 nActPage = nAutoTabPageId;
         }
@@ -860,19 +860,19 @@ void SfxTabDialog::Start_Impl()
     ActivatePageHdl( &aTabCtrl );
 }
 
-void SfxTabDialog::AddTabPage( USHORT nId, BOOL bItemsOnDemand )
+void SfxTabDialog::AddTabPage( sal_uInt16 nId, sal_Bool bItemsOnDemand )
 {
     AddTabPage( nId, 0, 0, bItemsOnDemand );
 }
 
-void SfxTabDialog::AddTabPage( USHORT nId, const String &rRiderText, BOOL bItemsOnDemand, USHORT nPos )
+void SfxTabDialog::AddTabPage( sal_uInt16 nId, const String &rRiderText, sal_Bool bItemsOnDemand, sal_uInt16 nPos )
 {
     AddTabPage( nId, rRiderText, 0, 0, bItemsOnDemand, nPos );
 }
 
 #ifdef SV_HAS_RIDERBITMAPS
 
-void SfxTabDialog::AddTabPage( USHORT nId, const Bitmap &rRiderBitmap, BOOL bItemsOnDemand, USHORT nPos )
+void SfxTabDialog::AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, sal_Bool bItemsOnDemand, sal_uInt16 nPos )
 {
     AddTabPage( nId, rRiderBitmap, 0, 0, bItemsOnDemand, nPos );
 }
@@ -891,11 +891,11 @@ void SfxTabDialog::AddTabPage
 */
 
 (
-    USHORT nId,                     // ID der Seite
+    sal_uInt16 nId,                     // ID der Seite
     CreateTabPage pCreateFunc,      // Pointer auf die Factory-Methode
     GetTabPageRanges pRangesFunc,   // Pointer auf die Methode f"ur das
                                     // Erfragen der Ranges onDemand
-    BOOL bItemsOnDemand             // gibt an, ob das Set dieser Seite beim
+    sal_Bool bItemsOnDemand             // gibt an, ob das Set dieser Seite beim
                                     // Erzeugen der Seite erfragt wird
 )
 {
@@ -915,12 +915,12 @@ void SfxTabDialog::AddTabPage
 */
 
 (
-    USHORT nId,
+    sal_uInt16 nId,
     const String& rRiderText,
     CreateTabPage pCreateFunc,
     GetTabPageRanges pRangesFunc,
-    BOOL bItemsOnDemand,
-    USHORT nPos
+    sal_Bool bItemsOnDemand,
+    sal_uInt16 nPos
 )
 {
     DBG_ASSERT( TAB_PAGE_NOTFOUND == aTabCtrl.GetPagePos( nId ),
@@ -943,12 +943,12 @@ void SfxTabDialog::AddTabPage
 */
 
 (
-    USHORT nId,
+    sal_uInt16 nId,
     const Bitmap &rRiderBitmap,
     CreateTabPage pCreateFunc,
     GetTabPageRanges pRangesFunc,
-    BOOL bItemsOnDemand,
-    USHORT nPos
+    sal_Bool bItemsOnDemand,
+    sal_uInt16 nPos
 )
 {
     DBG_ASSERT( TAB_PAGE_NOTFOUND == aTabCtrl.GetPagePos( nId ),
@@ -961,7 +961,7 @@ void SfxTabDialog::AddTabPage
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::RemoveTabPage( USHORT nId )
+void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
 
 /*  [Beschreibung]
 
@@ -969,7 +969,7 @@ void SfxTabDialog::RemoveTabPage( USHORT nId )
 */
 
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     aTabCtrl.RemovePage( nId );
     Data_Impl* pDataObject = Find( *pImpl->pData, nId, &nPos );
 
@@ -1012,7 +1012,7 @@ void SfxTabDialog::PageCreated
 */
 
 (
-    USHORT,         // Id der erzeugten Seite
+    sal_uInt16,         // Id der erzeugten Seite
     SfxTabPage&     // Referenz auf die erzeugte Seite
 )
 {
@@ -1035,7 +1035,7 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl()
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* SfxTabDialog::GetTabPage( USHORT nPageId ) const
+SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const
 
 /*  [Beschreibung]
 
@@ -1043,7 +1043,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( USHORT nPageId ) const
 */
 
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     Data_Impl* pDataObject = Find( *pImpl->pData, nPageId, &nPos );
 
     if ( pDataObject )
@@ -1053,7 +1053,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( USHORT nPageId ) const
 
 // -----------------------------------------------------------------------
 
-BOOL SfxTabDialog::IsInOK() const
+sal_Bool SfxTabDialog::IsInOK() const
 
 /*  [Beschreibung]
 
@@ -1077,25 +1077,25 @@ short SfxTabDialog::Ok()
 
     [R"uckgabewert]
 
-    RET_OK: wenn mindestens eine Seite TRUE als Returnwert von
+    RET_OK: wenn mindestens eine Seite sal_True als Returnwert von
             FillItemSet geliefert hat, sonst RET_CANCEL.
 */
 
 {
-    pImpl->bInOK = TRUE;
+    pImpl->bInOK = sal_True;
 
     if ( !pOutSet )
     {
         if ( !pExampleSet && pSet )
-            pOutSet = pSet->Clone( FALSE ); // ohne Items
+            pOutSet = pSet->Clone( sal_False ); // ohne Items
         else if ( pExampleSet )
             pOutSet = new SfxItemSet( *pExampleSet );
     }
-    BOOL bModified = FALSE;
+    sal_Bool bModified = sal_False;
 
-    const USHORT nCount = pImpl->pData->Count();
+    const sal_uInt16 nCount = pImpl->pData->Count();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         Data_Impl* pDataObject = pImpl->pData->GetObject(i);
         SfxTabPage* pTabPage = pDataObject->pTabPage;
@@ -1114,7 +1114,7 @@ short SfxTabDialog::Ok()
 
                 if ( pTabPage->FillItemSet( aTmp ) )
                 {
-                    bModified |= TRUE;
+                    bModified |= sal_True;
                     pExampleSet->Put( aTmp );
                     pOutSet->Put( aTmp );
                 }
@@ -1123,10 +1123,10 @@ short SfxTabDialog::Ok()
     }
 
     if ( pImpl->bModified || ( pOutSet && pOutSet->Count() > 0 ) )
-        bModified |= TRUE;
+        bModified |= sal_True;
 
     if ( bFmt == 2 )
-        bModified |= TRUE;
+        bModified |= sal_True;
     return bModified ? RET_OK : RET_CANCEL;
 }
 
@@ -1141,7 +1141,7 @@ IMPL_LINK( SfxTabDialog, CancelHdl, Button*, pButton )
 
 // -----------------------------------------------------------------------
 
-SfxItemSet* SfxTabDialog::CreateInputItemSet( USHORT )
+SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
 
 /*  [Beschreibung]
 
@@ -1184,7 +1184,7 @@ IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
 */
 
 {
-    pImpl->bInOK = TRUE;
+    pImpl->bInOK = sal_True;
 
     if ( OK_Impl() )
     {
@@ -1203,7 +1203,7 @@ IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
 
 bool SfxTabDialog::PrepareLeaveCurrentPage()
 {
-    USHORT const nId = aTabCtrl.GetCurPageId();
+    sal_uInt16 const nId = aTabCtrl.GetCurPageId();
     SfxTabPage* pPage = dynamic_cast<SfxTabPage*> (aTabCtrl.GetTabPage( nId ));
     bool bEnd = !pPage;
 
@@ -1275,7 +1275,7 @@ IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG )
 */
 
 {
-    const USHORT nId = aTabCtrl.GetCurPageId();
+    const sal_uInt16 nId = aTabCtrl.GetCurPageId();
     Data_Impl* pDataObject = Find( *pImpl->pData, nId );
     DBG_ASSERT( pDataObject, "Id nicht bekannt" );
 
@@ -1303,7 +1303,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
 */
 
 {
-    const USHORT nId = aTabCtrl.GetCurPageId();
+    const sal_uInt16 nId = aTabCtrl.GetCurPageId();
     Data_Impl* pDataObject = Find( *pImpl->pData, nId );
     DBG_ASSERT( pDataObject, "Id nicht bekannt" );
     bFmt = 2;
@@ -1314,17 +1314,17 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
             pExampleSet = new SfxItemSet( *pSet );
 
         const SfxItemPool* pPool = pSet->GetPool();
-        const USHORT* pTmpRanges = (pDataObject->fnGetRanges)();
+        const sal_uInt16* pTmpRanges = (pDataObject->fnGetRanges)();
         SfxItemSet aTmpSet( *pExampleSet );
 
         while ( *pTmpRanges )
         {
-            const USHORT* pU = pTmpRanges + 1;
+            const sal_uInt16* pU = pTmpRanges + 1;
 
             if ( *pTmpRanges == *pU )
             {
                 // Range mit zwei gleichen Werten -> nur ein Item setzen
-                USHORT nWh = pPool->GetWhich( *pTmpRanges );
+                sal_uInt16 nWh = pPool->GetWhich( *pTmpRanges );
                 pExampleSet->ClearItem( nWh );
                 aTmpSet.ClearItem( nWh );
                 // am OutSet mit InvalidateItem,
@@ -1334,13 +1334,13 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
             else
             {
                 // richtiger Range mit mehreren Werten
-                USHORT nTmp = *pTmpRanges, nTmpEnd = *pU;
+                sal_uInt16 nTmp = *pTmpRanges, nTmpEnd = *pU;
                 DBG_ASSERT( nTmp <= nTmpEnd, "Range ist falsch sortiert" );
 
                 if ( nTmp > nTmpEnd )
                 {
                     // wenn wirklich falsch sortiert, dann neu setzen
-                    USHORT nTmp1 = nTmp;
+                    sal_uInt16 nTmp1 = nTmp;
                     nTmp = nTmpEnd;
                     nTmpEnd = nTmp1;
                 }
@@ -1348,7 +1348,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
                 while ( nTmp <= nTmpEnd )
                 {
                     // "uber den Range iterieren, und die Items setzen
-                    USHORT nWh = pPool->GetWhich( nTmp );
+                    sal_uInt16 nWh = pPool->GetWhich( nTmp );
                     pExampleSet->ClearItem( nWh );
                     aTmpSet.ClearItem( nWh );
                     // am OutSet mit InvalidateItem,
@@ -1363,7 +1363,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
         // alle Items neu gesetzt -> dann an der aktuellen Page Reset() rufen
         DBG_ASSERT( pDataObject->pTabPage, "die Page ist weg" );
         pDataObject->pTabPage->Reset( aTmpSet );
-        pDataObject->pTabPage->pImpl->mbStandard = TRUE;
+        pDataObject->pTabPage->pImpl->mbStandard = sal_True;
     }
     return 1;
 }
@@ -1383,14 +1383,14 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     Handler, der vor dem Umschalten auf eine andere Seite
     durch Starview gerufen wird.
     Existiert die Seite noch nicht, so wird sie erzeugt und
-    die virtuelle Methode <SfxTabDialog::PageCreated( USHORT, SfxTabPage &)>
+    die virtuelle Methode <SfxTabDialog::PageCreated( sal_uInt16, SfxTabPage &)>
     gerufen. Existiert die Seite bereits, so wird ggf.
     <SfxTabPage::Reset(const SfxItemSet &)> oder
     <SfxTabPage::ActivatePage(const SfxItemSet &)> gerufen.
 */
 
 {
-    USHORT const nId = pTabCtrl->GetCurPageId();
+    sal_uInt16 const nId = pTabCtrl->GetCurPageId();
 
     DBG_ASSERT( pImpl->pData->Count(), "keine Pages angemeldet" );
     SFX_APP();
@@ -1472,7 +1472,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     }
     else if ( pDataObject->bRefresh )
         pTabPage->Reset( *pSet );
-    pDataObject->bRefresh = FALSE;
+    pDataObject->bRefresh = sal_False;
 
 #if ENABLE_LAYOUT_SFX_TABDIALOG
     pTabCtrl->GetPagePos (nId);
@@ -1480,7 +1480,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 
     if ( pExampleSet )
         pTabPage->ActivatePage( *pExampleSet );
-    BOOL bReadOnly = pTabPage->IsReadOnly();
+    sal_Bool bReadOnly = pTabPage->IsReadOnly();
     ( bReadOnly || pImpl->bHideResetBtn ) ? aResetBtn.Hide() : aResetBtn.Show();
     return 0;
 }
@@ -1499,7 +1499,7 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
 */
 
 {
-    USHORT nId = pTabCtrl->GetCurPageId();
+    sal_uInt16 nId = pTabCtrl->GetCurPageId();
     SFX_APP();
     SfxTabPage *pPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
     DBG_ASSERT( pPage, "keine aktive Page" );
@@ -1556,22 +1556,22 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
         pSet = GetRefreshedSet();
         DBG_ASSERT( pSet, "GetRefreshedSet() liefert NULL" );
         // alle Pages als neu zu initialsieren flaggen
-        const USHORT nCount = pImpl->pData->Count();
+        const sal_uInt16 nCount = pImpl->pData->Count();
 
-        for ( USHORT i = 0; i < nCount; ++i )
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
             Data_Impl* pObj = (*pImpl->pData)[i];
 
             if ( pObj->pTabPage != pPage ) // eigene Page nicht mehr refreshen
-                pObj->bRefresh = TRUE;
+                pObj->bRefresh = sal_True;
             else
-                pObj->bRefresh = FALSE;
+                pObj->bRefresh = sal_False;
         }
     }
     if ( nRet & SfxTabPage::LEAVE_PAGE )
-        return TRUE;
+        return sal_True;
     else
-        return FALSE;
+        return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -1584,13 +1584,13 @@ const SfxItemSet* SfxTabDialog::GetOutputItemSet
 
     [Querverweise]
 
-    <SfxTabDialog::AddTabPage(USHORT, CreateTabPage, GetTabPageRanges, BOOL)>
-    <SfxTabDialog::AddTabPage(USHORT, const String &, CreateTabPage, GetTabPageRanges, BOOL, USHORT)>
-    <SfxTabDialog::AddTabPage(USHORT, const Bitmap &, CreateTabPage, GetTabPageRanges, BOOL, USHORT)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, CreateTabPage, GetTabPageRanges, sal_Bool)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const String &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const Bitmap &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
 */
 
 (
-    USHORT nId  // die Id, unter der die Seite bei AddTabPage()
+    sal_uInt16 nId  // die Id, unter der die Seite bei AddTabPage()
                 // hinzugef"ugt wurde.
 ) const
 {
@@ -1640,12 +1640,12 @@ extern "C" int TabDlgCmpUS_Impl( const void* p1, const void* p2 )
 */
 
 {
-    return *(USHORT*)p1 - *(USHORT*)p2;
+    return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
 }
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::ShowPage( USHORT nId )
+void SfxTabDialog::ShowPage( sal_uInt16 nId )
 
 /*  [Beschreibung]
 
@@ -1659,7 +1659,7 @@ void SfxTabDialog::ShowPage( USHORT nId )
 
 // -----------------------------------------------------------------------
 
-const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
+const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
 
 /*  [Beschreibung]
 
@@ -1669,9 +1669,9 @@ const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
 
     [Querverweise]
 
-    <SfxTabDialog::AddTabPage(USHORT, CreateTabPage, GetTabPageRanges, BOOL)>
-    <SfxTabDialog::AddTabPage(USHORT, const String &, CreateTabPage, GetTabPageRanges, BOOL, USHORT)>
-    <SfxTabDialog::AddTabPage(USHORT, const Bitmap &, CreateTabPage, GetTabPageRanges, BOOL, USHORT)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, CreateTabPage, GetTabPageRanges, sal_Bool)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const String &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const Bitmap &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
 
     [R"uckgabewert]
 
@@ -1690,19 +1690,19 @@ const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
     if ( pRanges )
         return pRanges;
     SvUShorts aUS( 16, 16 );
-    USHORT nCount = pImpl->pData->Count();
+    sal_uInt16 nCount = pImpl->pData->Count();
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < nCount; ++i )
     {
         Data_Impl* pDataObject = pImpl->pData->GetObject(i);
 
         if ( pDataObject->fnGetRanges )
         {
-            const USHORT* pTmpRanges = (pDataObject->fnGetRanges)();
-            const USHORT* pIter = pTmpRanges;
+            const sal_uInt16* pTmpRanges = (pDataObject->fnGetRanges)();
+            const sal_uInt16* pIter = pTmpRanges;
 
-            USHORT nLen;
+            sal_uInt16 nLen;
             for( nLen = 0; *pIter; ++nLen, ++pIter )
                 ;
             aUS.Insert( pTmpRanges, nLen, aUS.Count() );
@@ -1723,12 +1723,12 @@ const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
     // sortieren
     if ( aUS.Count() > 1 )
         qsort( (void*)aUS.GetData(),
-               aUS.Count(), sizeof(USHORT), TabDlgCmpUS_Impl );
+               aUS.Count(), sizeof(sal_uInt16), TabDlgCmpUS_Impl );
 
     // Ranges erzeugen
     //!! Auskommentiert, da fehlerhaft
     /*
-    pRanges = new USHORT[aUS.Count() * 2 + 1];
+    pRanges = new sal_uInt16[aUS.Count() * 2 + 1];
     int j = 0;
     i = 0;
 
@@ -1744,8 +1744,8 @@ const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
     pRanges[j] = 0;     // terminierende NULL
     */
 
-    pRanges = new USHORT[aUS.Count() + 1];
-    memcpy(pRanges, aUS.GetData(), sizeof(USHORT) * aUS.Count());
+    pRanges = new sal_uInt16[aUS.Count() + 1];
+    memcpy(pRanges, aUS.GetData(), sizeof(sal_uInt16) * aUS.Count());
     pRanges[aUS.Count()] = 0;
     return pRanges;
 }
@@ -1761,7 +1761,7 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )
 */
 
 {
-    FASTBOOL bSet = ( pSet != NULL );
+    bool bSet = ( pSet != NULL );
 
     pSet = pInSet;
 
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 1c2faac4e8a3..8974363a02d1 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -184,8 +184,8 @@ namespace sfx2
                         aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) );
                         const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() );
 
-                        const BOOL bHiContrast( Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
-                        const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, FALSE, bHiContrast ) );
+                        const sal_Bool bHiContrast( Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
+                        const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, sal_False, bHiContrast ) );
                         return aPanelImage.GetXGraphic();
                     }
 
@@ -244,7 +244,7 @@ namespace sfx2
     SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE );
 
     //------------------------------------------------------------------------------------------------------------------
-    TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, USHORT i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo )
+    TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo )
         :SfxChildWindow( i_pParent, i_nId )
     {
         pWindow = new TaskPaneDockingWindow( i_pBindings, *this, i_pParent,
@@ -255,7 +255,7 @@ namespace sfx2
         pWindow->SetOutputSizePixel( Size( 300, 450 ) );
 
         dynamic_cast< SfxDockingWindow* >( pWindow )->Initialize( i_pInfo );
-        SetHideNotDelete( TRUE );
+        SetHideNotDelete( sal_True );
 
         pWindow->Show();
     }
@@ -923,7 +923,7 @@ namespace sfx2
 
         ModuleTaskPane&         m_rTaskPane;
         TitledDockingWindow&    m_rDockingWindow;
-        USHORT                  m_nViewMenuID;
+        sal_uInt16                  m_nViewMenuID;
         PanelSelectorLayout     m_eCurrentLayout;
         PanelDescriptors        m_aPanelRepository;
         bool                    m_bTogglingPanelVisibility;
@@ -1042,11 +1042,11 @@ namespace sfx2
         switch ( i_pMenu->GetCurItemId() )
         {
             case MID_UNLOCK_TASK_PANEL:
-                m_rDockingWindow.SetFloatingMode( TRUE );
+                m_rDockingWindow.SetFloatingMode( sal_True );
                 break;
 
             case MID_LOCK_TASK_PANEL:
-                m_rDockingWindow.SetFloatingMode( FALSE );
+                m_rDockingWindow.SetFloatingMode( sal_False );
                 break;
 
             case MID_LAYOUT_DRAWERS:
@@ -1233,7 +1233,7 @@ namespace sfx2
 
         // Add one entry for every tool panel element to individually make
         // them visible or hide them.
-        USHORT nIndex = MID_FIRST_PANEL;
+        sal_uInt16 nIndex = MID_FIRST_PANEL;
         for ( size_t i=0; i<m_aPanelRepository.size(); ++i, ++nIndex )
         {
             const PanelDescriptor& rPanelDesc( m_aPanelRepository[i] );
@@ -1263,7 +1263,7 @@ namespace sfx2
                 String( SfxResId( STR_SFX_UNDOCK ) )
             );
 
-        pMenu->RemoveDisabledEntries( FALSE, FALSE );
+        pMenu->RemoveDisabledEntries( sal_False, sal_False );
 
         return pMenu;
     }
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b10e634be231..54df29e63e4a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -97,7 +97,7 @@ using namespace ::com::sun::star::uno;
 #define SFX_TEMPLDLG_MIDVSPACE      3
 #define SFX_TEMPLDLG_FILTERHEIGHT   100
 
-static USHORT nLastItemId = USHRT_MAX;
+static sal_uInt16 nLastItemId = USHRT_MAX;
 
 // filter box has maximum 12 entries visible
 #define MAX_FILTER_ENTRIES          12
@@ -231,7 +231,7 @@ void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     nModifier = rMEvt.GetModifier();
 
-    BOOL bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), TRUE ) );
+    sal_Bool bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), sal_True ) );
     if( bHitEmptySpace && ( rMEvt.GetClicks() == 2 ) && rMEvt.IsMod1() )
         Control::MouseButtonDown( rMEvt );
     else
@@ -264,7 +264,7 @@ sal_Int8 DropListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
 sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
 //  rEvt.maDropEvent.Context->acceptDrop( DND_ACTION_NONE );
-//  rEvt.maDropEvent.Context->dropComplete( TRUE );
+//  rEvt.maDropEvent.Context->dropComplete( sal_True );
 
     sal_Int8 nRet = DND_ACTION_NONE;
     SfxObjectShell* pDocShell = pDialog->GetObjectShell();
@@ -380,8 +380,8 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
     //added by BerryJia for fixing Bug102739 2002-9-9 17:00(Beijing Time)
     if( !( GetSelectionCount() > 0 ) )
     {
-        pDialog->EnableEdit( FALSE );
-        pDialog->EnableDel( FALSE );
+        pDialog->EnableEdit( sal_False );
+        pDialog->EnableDel( sal_False );
     }
     return pDialog->CreateContextMenu();
 }
@@ -389,7 +389,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
 //-------------------------------------------------------------------------
 
 SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd,
-        USHORT nId,  SfxBindings *p, SfxChildWinInfo *pInfo) :
+        sal_uInt16 nId,  SfxBindings *p, SfxChildWinInfo *pInfo) :
     SfxChildWindow(pParentWnd, nId)
 {
     SfxTemplateDialog *pWin = new SfxTemplateDialog(p, this, pParentWnd);
@@ -430,13 +430,13 @@ private:
 protected:
     virtual void    Command( const CommandEvent& rMEvt );
     virtual long    Notify( NotifyEvent& rNEvt );
-    virtual BOOL    DoubleClickHdl();
+    virtual sal_Bool    DoubleClickHdl();
     virtual long    ExpandingHdl();
     virtual void    ExpandedHdl();
-    virtual BOOL    NotifyMoving(SvLBoxEntry*  pTarget,
+    virtual sal_Bool    NotifyMoving(SvLBoxEntry*  pTarget,
                                      SvLBoxEntry*  pEntry,
                                      SvLBoxEntry*& rpNewParent,
-                                     ULONG&        rNewChildPos);
+                                     sal_uIntPtr&        rNewChildPos);
 public:
     StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle = 0);
 
@@ -456,7 +456,7 @@ public:
 void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries& rEntries) const
 {
     SvLBoxEntry *pEntry;
-    USHORT nCount=0;
+    sal_uInt16 nCount=0;
     for(pEntry=(SvLBoxEntry*)FirstVisible();pEntry;pEntry=(SvLBoxEntry*)NextVisible(pEntry))
     {
         if(IsExpanded(pEntry))
@@ -472,7 +472,7 @@ PopupMenu* StyleTreeListBox_Impl::CreateContextMenu()
     return pDialog->CreateContextMenu();
 }
 
-BOOL StyleTreeListBox_Impl::DoubleClickHdl()
+sal_Bool StyleTreeListBox_Impl::DoubleClickHdl()
 
 /*  [Beschreibung]
 
@@ -483,7 +483,7 @@ BOOL StyleTreeListBox_Impl::DoubleClickHdl()
 */
 {
     aDoubleClickLink.Call(this);
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -526,10 +526,10 @@ long StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
 
 //-------------------------------------------------------------------------
 
-BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry*  pTarget,
+sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry*  pTarget,
                                          SvLBoxEntry*  pEntry,
                                          SvLBoxEntry*& rpNewParent,
-                                         ULONG& lPos)
+                                         sal_uIntPtr& lPos)
 /*  [Beschreibung]
 
     NotifyMoving Handler; dieser leitet per Link das Event an den Dialog
@@ -539,10 +539,10 @@ BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry*  pTarget,
 */
 {
     if(!pTarget || !pEntry)
-        return FALSE;
+        return sal_False;
     aParent = GetEntryText(pTarget);
     aStyle  = GetEntryText(pEntry);
-    const BOOL bRet = (BOOL)aDropLink.Call(this);
+    const sal_Bool bRet = (sal_Bool)aDropLink.Call(this);
     rpNewParent = pTarget;
     lPos=0;
     IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
@@ -552,7 +552,7 @@ BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry*  pTarget,
             GetEntryText(pTmpEntry),GetEntryText(pEntry));
         pTmpEntry=NextSibling(pTmpEntry),lPos++) ;
 
-    return bRet? (BOOL)2: FALSE;
+    return bRet? (sal_Bool)2: sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -570,7 +570,7 @@ long  StyleTreeListBox_Impl::ExpandingHdl()
 */
 {
     pCurEntry = GetCurEntry();
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -590,7 +590,7 @@ void  StyleTreeListBox_Impl::ExpandedHdl()
 {
     SvLBoxEntry *pEntry = GetHdlEntry();
     if(!IsExpanded(pEntry) && pCurEntry != GetCurEntry())
-        SelectAll( FALSE );
+        SelectAll( sal_False );
     pCurEntry = 0;
 }
 
@@ -628,14 +628,14 @@ struct StyleTree_Impl
     String aName;
     String aParent;
     StyleTreeArr_Impl *pChilds;
-    BOOL bIsExpanded;
-    BOOL HasParent() const { return aParent.Len() != 0; }
+    sal_Bool bIsExpanded;
+    sal_Bool HasParent() const { return aParent.Len() != 0; }
 
     StyleTree_Impl(const String &rName, const String &rParent):
         aName(rName), aParent(rParent), pChilds(0), bIsExpanded(0) {}
     ~StyleTree_Impl();
-    void Put(StyleTree_Impl* pIns, ULONG lPos=ULONG_MAX);
-    ULONG Count();
+    void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX);
+    sal_uIntPtr Count();
 };
 
 typedef StyleTree_Impl* StyleTree_ImplPtr;
@@ -643,7 +643,7 @@ SV_DECL_PTRARR_DEL(StyleTreeArr_Impl, StyleTree_ImplPtr, 16, 8)
 SV_IMPL_PTRARR(StyleTreeArr_Impl, StyleTree_ImplPtr)
 
 
-ULONG StyleTree_Impl::Count()
+sal_uIntPtr StyleTree_Impl::Count()
 {
     return pChilds ? pChilds->Count() : 0L;
 }
@@ -657,35 +657,35 @@ StyleTree_Impl::~StyleTree_Impl()
 
 //-------------------------------------------------------------------------
 
-void StyleTree_Impl::Put(StyleTree_Impl* pIns, ULONG lPos)
+void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
 {
     if ( !pChilds )
         pChilds = new StyleTreeArr_Impl;
 
     if ( ULONG_MAX == lPos )
         lPos = pChilds->Count();
-    pChilds->Insert( pIns, (USHORT)lPos );
+    pChilds->Insert( pIns, (sal_uInt16)lPos );
 }
 
 //-------------------------------------------------------------------------
 
 StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
 {
-    const USHORT nCount = rArr.Count();
+    const sal_uInt16 nCount = rArr.Count();
     // Alle unter ihren Parents einordnen
-    USHORT i;
+    sal_uInt16 i;
     for(i = 0; i < nCount; ++i)
     {
         StyleTree_ImplPtr pEntry = rArr[i];
         if(pEntry->HasParent())
         {
-            for(USHORT j = 0; j < nCount; ++j)
+            for(sal_uInt16 j = 0; j < nCount; ++j)
             {
                 StyleTree_ImplPtr pCmp = rArr[j];
                 if(pCmp->aName == pEntry->aParent)
                 {
                     // initial sortiert einfuegen
-                    USHORT ii;
+                    sal_uInt16 ii;
                     IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
                     const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator();
                     for ( ii = 0;
@@ -713,14 +713,14 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
 //-------------------------------------------------------------------------
 
 
-inline BOOL IsExpanded_Impl( const ExpandedEntries& rEntries,
+inline sal_Bool IsExpanded_Impl( const ExpandedEntries& rEntries,
                              const String &rStr)
 {
-    USHORT nCount=rEntries.Count();
-    for(USHORT n=0;n<nCount;n++)
+    sal_uInt16 nCount=rEntries.Count();
+    for(sal_uInt16 n=0;n<nCount;n++)
         if(*rEntries[n]==rStr)
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 
@@ -731,8 +731,8 @@ SvLBoxEntry* FillBox_Impl(SvTreeListBox *pBox,
                                  SvLBoxEntry* pParent = 0)
 {
     SvLBoxEntry* pNewEntry = pBox->InsertEntry(pEntry->aName, pParent);
-    const USHORT nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0;
-    for(USHORT i = 0; i < nCount; ++i)
+    const sal_uInt16 nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0;
+    for(sal_uInt16 i = 0; i < nCount; ++i)
         FillBox_Impl(pBox, (*pEntry->pChilds)[i], rEntries, pNewEntry);
     return pNewEntry;
 }
@@ -763,20 +763,20 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx
     nActFilter              ( 0 ),
     nAppFilter              ( 0 ),
 
-    bDontUpdate             ( FALSE ),
-    bIsWater                ( FALSE ),
-    bEnabled                ( TRUE ),
-    bUpdate                 ( FALSE ),
-    bUpdateFamily           ( FALSE ),
-    bCanEdit                ( FALSE ),
-    bCanDel                 ( FALSE ),
-    bCanNew                 ( TRUE ),
-    bWaterDisabled          ( FALSE ),
-    bNewByExampleDisabled   ( FALSE ),
-    bUpdateByExampleDisabled( FALSE ),
-    bTreeDrag               ( TRUE ),
-    bHierarchical           ( FALSE ),
-    bBindingUpdate          ( TRUE )
+    bDontUpdate             ( sal_False ),
+    bIsWater                ( sal_False ),
+    bEnabled                ( sal_True ),
+    bUpdate                 ( sal_False ),
+    bUpdateFamily           ( sal_False ),
+    bCanEdit                ( sal_False ),
+    bCanDel                 ( sal_False ),
+    bCanNew                 ( sal_True ),
+    bWaterDisabled          ( sal_False ),
+    bNewByExampleDisabled   ( sal_False ),
+    bUpdateByExampleDisabled( sal_False ),
+    bTreeDrag               ( sal_True ),
+    bHierarchical           ( sal_False ),
+    bBindingUpdate          ( sal_True )
 {
     aFmtLb.SetHelpId( HID_TEMPLATE_FMT );
     aFilterLb.SetHelpId( HID_TEMPLATE_FILTER );
@@ -807,20 +807,20 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Mod
     nActFilter              ( 0 ),
     nAppFilter              ( 0 ),
 
-    bDontUpdate             ( FALSE ),
-    bIsWater                ( FALSE ),
-    bEnabled                ( TRUE ),
-    bUpdate                 ( FALSE ),
-    bUpdateFamily           ( FALSE ),
-    bCanEdit                ( FALSE ),
-    bCanDel                 ( FALSE ),
-    bCanNew                 ( TRUE ),
-    bWaterDisabled          ( FALSE ),
-    bNewByExampleDisabled   ( FALSE ),
-    bUpdateByExampleDisabled( FALSE ),
-    bTreeDrag               ( TRUE ),
-    bHierarchical           ( FALSE ),
-    bBindingUpdate          ( TRUE )
+    bDontUpdate             ( sal_False ),
+    bIsWater                ( sal_False ),
+    bEnabled                ( sal_True ),
+    bUpdate                 ( sal_False ),
+    bUpdateFamily           ( sal_False ),
+    bCanEdit                ( sal_False ),
+    bCanDel                 ( sal_False ),
+    bCanNew                 ( sal_True ),
+    bWaterDisabled          ( sal_False ),
+    bNewByExampleDisabled   ( sal_False ),
+    bUpdateByExampleDisabled( sal_False ),
+    bTreeDrag               ( sal_True ),
+    bHierarchical           ( sal_False ),
+    bBindingUpdate          ( sal_True )
 
 {
     aFmtLb.SetStyle( aFmtLb.GetStyle() | WB_SORT );
@@ -828,7 +828,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Mod
 
 //-------------------------------------------------------------------------
 
-USHORT SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(USHORT nId)
+sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId)
 {
     const SfxStyleFamilyItem *pItem=pStyleFamilies->GetObject(nId);
     return SfxFamilyIdToNId(pItem->GetFamily())-1;
@@ -836,7 +836,7 @@ USHORT SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(USHORT nId)
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::EnableEdit(BOOL bEnable)
+void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable)
 {
     SfxCommonTemplateDialog_Impl::EnableEdit( bEnable );
     if( !bEnable || !bUpdateByExampleDisabled )
@@ -846,9 +846,9 @@ void SfxTemplateDialog_Impl::EnableEdit(BOOL bEnable)
 //-------------------------------------------------------------------------
 
 
-USHORT SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(USHORT nId)
+sal_uInt16 SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(sal_uInt16 nId)
 {
-    for ( USHORT i=0;i<pStyleFamilies->Count();i++ )
+    for ( sal_uInt16 i=0;i<pStyleFamilies->Count();i++ )
         if ( SfxFamilyIdToNId(pStyleFamilies->GetObject(i)->GetFamily()) == nId+1 )
             return i;
     DBG_ERROR("Style Nummer nicht gefunden");
@@ -861,7 +861,7 @@ USHORT SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(USHORT nId)
 void SfxCommonTemplateDialog_Impl::ReadResource()
 {
     // globale Benutzer-Resource auslesen
-    USHORT i;
+    sal_uInt16 i;
     for(i = 0; i < MAX_FAMILIES; ++i)
         pFamilyState[i] = 0;
 
@@ -877,20 +877,20 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
     else
         pStyleFamilies = new SfxStyleFamilies( aFamId );
 
-    nActFilter = pCurObjShell ? static_cast< USHORT >( LoadFactoryStyleFilter( pCurObjShell ) ) : 0xFFFF;
+    nActFilter = pCurObjShell ? static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ) : 0xFFFF;
     if ( pCurObjShell && 0xFFFF == nActFilter )
         nActFilter = pCurObjShell->GetAutoStyleFilterIndex();
 
         // Einfuegen in die Toolbox
         // umgekehrte Reihenfolge, da immer vorne eingefuegt wird.
-    USHORT nCount = pStyleFamilies->Count();
+    sal_uInt16 nCount = pStyleFamilies->Count();
 
     pBindings->ENTERREGISTRATIONS();
 
     for(i = 0; i < nCount; ++i)
     {
-        USHORT nSlot = 0;
-        switch((USHORT)pStyleFamilies->GetObject(i)->GetFamily())
+        sal_uInt16 nSlot = 0;
+        switch((sal_uInt16)pStyleFamilies->GetObject(i)->GetFamily())
         {
             case SFX_STYLE_FAMILY_CHAR: nSlot = SID_STYLE_FAMILY1; break;
             case SFX_STYLE_FAMILY_PARA: nSlot = SID_STYLE_FAMILY2; break;
@@ -942,14 +942,14 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
     for( ; nCount--; )
     {
         const SfxStyleFamilyItem *pItem = pStyleFamilies->GetObject( nCount );
-        USHORT nId = SfxFamilyIdToNId( pItem->GetFamily() );
+        sal_uInt16 nId = SfxFamilyIdToNId( pItem->GetFamily() );
         InsertFamilyItem( nId, pItem );
     }
 
     LoadedFamilies();
 
-    USHORT nStart = SID_STYLE_FAMILY1;
-    USHORT nEnd = SID_STYLE_FAMILY4;
+    sal_uInt16 nStart = SID_STYLE_FAMILY1;
+    sal_uInt16 nEnd = SID_STYLE_FAMILY4;
 
     for ( i = nStart; i <= nEnd; i++ )
         pBindings->Update(i);
@@ -963,7 +963,7 @@ void SfxCommonTemplateDialog_Impl::ClearResource()
 {
     ClearFamilyList();
     DELETEX(pStyleFamilies);
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < MAX_FAMILIES; ++i )
         DELETEX(pFamilyState[i]);
     for ( i = 0; i < COUNT_BOUND_FUNC; ++i )
@@ -1001,7 +1001,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
     GetWindow()->Hide();
     DELETEX(pStyleFamilies);
     DELETEZ( m_pStyleFamiliesId );
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < MAX_FAMILIES; ++i )
         DELETEX(pFamilyState[i]);
     for ( i = 0; i < COUNT_BOUND_FUNC; ++i )
@@ -1020,7 +1020,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
 
 //-------------------------------------------------------------------------
 
-USHORT SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
+sal_uInt16 SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
 {
     switch ( nFamily )
     {
@@ -1035,10 +1035,10 @@ USHORT SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
 
 void SfxCommonTemplateDialog_Impl::SetAutomaticFilter()
 {
-    USHORT nCount = aFilterLb.GetEntryCount();
-    for ( USHORT i = 0; i < nCount; ++i )
+    sal_uInt16 nCount = aFilterLb.GetEntryCount();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
-        ULONG nFlags = (ULONG)aFilterLb.GetEntryData(i);
+        sal_uIntPtr nFlags = (sal_uIntPtr)aFilterLb.GetEntryData(i);
         if ( SFXSTYLEBIT_AUTO == nFlags )
         {
             // automatic entry found -> select it
@@ -1055,12 +1055,12 @@ void SfxCommonTemplateDialog_Impl::SetAutomaticFilter()
 // Hilfsfunktion: Zugriff auf aktuelles Family-Item
 const SfxStyleFamilyItem *SfxCommonTemplateDialog_Impl::GetFamilyItem_Impl() const
 {
-    const USHORT nCount = pStyleFamilies->Count();
-    for(USHORT i = 0; i < nCount; ++i)
+    const sal_uInt16 nCount = pStyleFamilies->Count();
+    for(sal_uInt16 i = 0; i < nCount; ++i)
     {
         const SfxStyleFamilyItem *pItem = pStyleFamilies->GetObject(i);
 //        if(!pItem)continue;
-        USHORT nId = SfxFamilyIdToNId(pItem->GetFamily());
+        sal_uInt16 nId = SfxFamilyIdToNId(pItem->GetFamily());
         if(nId == nActFamily)
             return pItem;
     }
@@ -1079,7 +1079,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
     if( pStyle )
         EnableEdit( !(pStyle->GetMask() & SFXSTYLEBIT_READONLY) );
     else
-        EnableEdit(FALSE);
+        EnableEdit(sal_False);
 
     if ( pTreeBox )
     {
@@ -1098,18 +1098,18 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
             }
         }
         else
-            pTreeBox->SelectAll( FALSE );
+            pTreeBox->SelectAll( sal_False );
     }
     else
     {
-        BOOL bSelect = ( rStr.Len() > 0 );
+        sal_Bool bSelect = ( rStr.Len() > 0 );
         if ( bSelect )
         {
             SvLBoxEntry* pEntry = (SvLBoxEntry*)aFmtLb.FirstVisible();
             while ( pEntry && aFmtLb.GetEntryText( pEntry ) != rStr )
                 pEntry = (SvLBoxEntry*)aFmtLb.NextVisible( pEntry );
             if ( !pEntry )
-                bSelect = FALSE;
+                bSelect = sal_False;
             else
             {
                 aFmtLb.MakeVisible( pEntry );
@@ -1121,8 +1121,8 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
 
         if ( !bSelect )
         {
-            aFmtLb.SelectAll( FALSE );
-            EnableEdit(FALSE);
+            aFmtLb.SelectAll( sal_False );
+            EnableEdit(sal_False);
         }
     }
 }
@@ -1149,7 +1149,7 @@ String SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
 
 //-------------------------------------------------------------------------
 
-void SfxCommonTemplateDialog_Impl::EnableTreeDrag( BOOL bEnable )
+void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable )
 {
     if ( pStyleSheetPool )
     {
@@ -1192,14 +1192,14 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
         if(pTreeBox)
             ((const StyleTreeListBox_Impl *)pTreeBox)->
                 MakeExpanded_Impl( aEntries);
-        pTreeBox->SetUpdateMode( FALSE );
+        pTreeBox->SetUpdateMode( sal_False );
         pTreeBox->Clear();
-        const USHORT nCount = aArr.Count();
-        for(USHORT i = 0; i < nCount; ++i)
+        const sal_uInt16 nCount = aArr.Count();
+        for(sal_uInt16 i = 0; i < nCount; ++i)
             FillBox_Impl(pTreeBox, aArr[i], aEntries);
 
-//      EnableEdit(FALSE);
-        EnableItem(SID_STYLE_WATERCAN,FALSE);
+//      EnableEdit(sal_False);
+        EnableItem(SID_STYLE_WATERCAN,sal_False);
 
         SfxTemplateItem* pState = pFamilyState[nActFamily-1];
 
@@ -1212,7 +1212,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
                 pTreeBox->Expand( pEntry );
         }
 
-        pTreeBox->SetUpdateMode( TRUE );
+        pTreeBox->SetUpdateMode( sal_True );
 
         String aStyle;
         if(pState)  //Aktuellen Eintrag selektieren
@@ -1223,7 +1223,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
 }
 
 //-------------------------------------------------------------------------
-BOOL SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
+sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
 {
     return pTreeBox? pTreeBox->FirstSelected() != 0:
             aFmtLb.GetSelectionCount() != 0;
@@ -1233,7 +1233,7 @@ BOOL SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
 //-------------------------------------------------------------------------
 
 // intern: Aktualisierung der Anzeige
-void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags, was aktualisiert werden soll (s.o.)
+void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)     // Flags, was aktualisiert werden soll (s.o.)
 {
     DBG_ASSERT(nFlags, "nichts zu tun");
     const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
@@ -1241,8 +1241,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
     {
         // Ist beim Vorlagenkatalog der Fall
         SfxTemplateItem **ppItem = pFamilyState;
-        const USHORT nFamilyCount = pStyleFamilies->Count();
-        USHORT n;
+        const sal_uInt16 nFamilyCount = pStyleFamilies->Count();
+        sal_uInt16 n;
         for(n=0;n<nFamilyCount;n++)
             if(ppItem[StyleNrToInfoOffset(n)])break;
         if ( n == nFamilyCount )
@@ -1257,7 +1257,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
     const SfxStyleFamily eFam = pItem->GetFamily();
 
     SfxFilterTupel *pT = pItem->GetFilterList().GetObject(nActFilter);
-    USHORT nFilter = pT ? pItem->GetFilterList().GetObject(nActFilter)->nFlags : 0;
+    sal_uInt16 nFilter = pT ? pItem->GetFilterList().GetObject(nActFilter)->nFlags : 0;
     if(!nFilter)    // automatisch
         nFilter = nAppFilter;
 
@@ -1268,16 +1268,16 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
         pItem = GetFamilyItem_Impl();
         if((nFlags & UPDATE_FAMILY) == UPDATE_FAMILY)
         {
-            CheckItem(nActFamily, TRUE);    // Button in Toolbox checken
-            aFilterLb.SetUpdateMode(FALSE);
+            CheckItem(nActFamily, sal_True);    // Button in Toolbox checken
+            aFilterLb.SetUpdateMode(sal_False);
             aFilterLb.Clear();
             //insert hierarchical at the beginning
-            USHORT nPos = aFilterLb.InsertEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)), 0);
-            aFilterLb.SetEntryData( nPos, (void*)(ULONG)SFXSTYLEBIT_ALL );
+            sal_uInt16 nPos = aFilterLb.InsertEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)), 0);
+            aFilterLb.SetEntryData( nPos, (void*)(sal_uIntPtr)SFXSTYLEBIT_ALL );
             const SfxStyleFilter& rFilter = pItem->GetFilterList();
-            for(USHORT i = 0; i < rFilter.Count(); ++i)
+            for(sal_uInt16 i = 0; i < rFilter.Count(); ++i)
             {
-                ULONG nFilterFlags = rFilter.GetObject(i)->nFlags;
+                sal_uIntPtr nFilterFlags = rFilter.GetObject(i)->nFlags;
                 nPos = aFilterLb.InsertEntry( rFilter.GetObject(i)->aName );
                 aFilterLb.SetEntryData( nPos, (void*)nFilterFlags );
             }
@@ -1288,7 +1288,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
                 nActFilter = 0;
                 aFilterLb.SelectEntryPos(1);
                 SfxFilterTupel *pActT = rFilter.GetObject(nActFilter);
-                USHORT nFilterFlags = pActT ? rFilter.GetObject(nActFilter)->nFlags : 0;
+                sal_uInt16 nFilterFlags = pActT ? rFilter.GetObject(nActFilter)->nFlags : 0;
                 pStyleSheetPool->SetSearchMask(eFam, nFilterFlags);
             }
 
@@ -1298,7 +1298,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
 
             // show maximum 12 entries
             aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES );
-            aFilterLb.SetUpdateMode(TRUE);
+            aFilterLb.SetUpdateMode(sal_True);
         }
         else
         {
@@ -1313,8 +1313,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
 
         if(nFlags & UPDATE_FAMILY_LIST)
         {
-//          EnableEdit(FALSE);
-            EnableItem(SID_STYLE_WATERCAN,FALSE);
+//          EnableEdit(sal_False);
+            EnableItem(SID_STYLE_WATERCAN,sal_False);
 
             SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
             SvLBoxEntry* pEntry = aFmtLb.First();
@@ -1323,7 +1323,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
             while( pStyle )
             {
                 //Bubblesort
-                for( USHORT nPos = aStrings.Count() + 1 ; nPos-- ;)
+                for( sal_uInt16 nPos = aStrings.Count() + 1 ; nPos-- ;)
                 {
                     if( !nPos || *aStrings[nPos-1] < pStyle->GetName() )
                     {
@@ -1338,8 +1338,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
             }
 
 
-            USHORT nCount = aStrings.Count();
-            USHORT nPos = 0;
+            sal_uInt16 nCount = aStrings.Count();
+            sal_uInt16 nPos = 0;
             while( nPos < nCount && pEntry &&
                    *aStrings[ nPos ] == aFmtLb.GetEntryText( pEntry ) )
             {
@@ -1350,13 +1350,13 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)     // Flags
             if( nPos < nCount || pEntry )
             {
                 // Box mit den Vorlagen fuellen
-                aFmtLb.SetUpdateMode(FALSE);
+                aFmtLb.SetUpdateMode(sal_False);
                 aFmtLb.Clear();
 
                 nPos = 0;
                 while( nPos < nCount )
                     aFmtLb.InsertEntry( *aStrings.GetObject( nPos++ ));
-                aFmtLb.SetUpdateMode(TRUE);
+                aFmtLb.SetUpdateMode(sal_True);
             }
                 // aktuelle Vorlage anzeigen
             SfxTemplateItem *pState = pFamilyState[nActFamily-1];
@@ -1383,22 +1383,22 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
     if(pItem && !bWaterDisabled)
     {
         CheckItem(SID_STYLE_WATERCAN, pItem->GetValue());
-        EnableItem( SID_STYLE_WATERCAN, TRUE );
+        EnableItem( SID_STYLE_WATERCAN, sal_True );
     }
     else
         if(!bWaterDisabled)
-            EnableItem(SID_STYLE_WATERCAN, TRUE);
+            EnableItem(SID_STYLE_WATERCAN, sal_True);
         else
-            EnableItem(SID_STYLE_WATERCAN, FALSE);
+            EnableItem(SID_STYLE_WATERCAN, sal_False);
 
 //Waehrend Giesskannenmodus Statusupdates ignorieren.
 
-    USHORT nCount=pStyleFamilies->Count();
+    sal_uInt16 nCount=pStyleFamilies->Count();
     pBindings->EnterRegistrations();
-    for(USHORT n=0; n<nCount; n++)
+    for(sal_uInt16 n=0; n<nCount; n++)
     {
         SfxControllerItem *pCItem=pBoundItems[n];
-        BOOL bChecked = pItem && pItem->GetValue();
+        sal_Bool bChecked = pItem && pItem->GetValue();
         if( pCItem->IsBound() == bChecked )
         {
             if( !bChecked )
@@ -1416,16 +1416,16 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
 // (Aktualisierung erfolgt, wenn alle Stati aktualisiert worden sind.
 // Siehe auch: <SfxBindings::AddDoneHdl(const Link &)>
 
-void SfxCommonTemplateDialog_Impl::SetFamilyState( USHORT nSlotId, const SfxTemplateItem* pItem )
+void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* pItem )
 {
-    USHORT nIdx = nSlotId - SID_STYLE_FAMILY_START;
+    sal_uInt16 nIdx = nSlotId - SID_STYLE_FAMILY_START;
     DELETEZ(pFamilyState[nIdx]);
     if ( pItem )
         pFamilyState[nIdx] = new SfxTemplateItem(*pItem);
-    bUpdate = TRUE;
+    bUpdate = sal_True;
 
     // Wenn verwendete Vorlagen ( wie zum Teufel findet man das heraus ?? )
-    bUpdateFamily = TRUE;
+    bUpdateFamily = sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -1435,7 +1435,7 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( USHORT nSlotId, const SfxTemp
 
 void SfxCommonTemplateDialog_Impl::Update_Impl()
 {
-    BOOL bDocChanged=FALSE;
+    sal_Bool bDocChanged=sal_False;
     SfxStyleSheetBasePool* pNewPool = NULL;
     SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
     SfxObjectShell* pDocShell = pViewFrame->GetObjectShell();
@@ -1460,7 +1460,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
         {
             StartListening(*pNewPool);
             pStyleSheetPool = pNewPool;
-            bDocChanged=TRUE;
+            bDocChanged=sal_True;
         }
 //      InvalidateBindings();
     }
@@ -1468,7 +1468,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
     if (bUpdateFamily)
         UpdateFamily_Impl();
 
-    USHORT i;
+    sal_uInt16 i;
     for(i = 0; i < MAX_FAMILIES; ++i)
         if(pFamilyState[i])
             break;
@@ -1481,10 +1481,10 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
      // oder Default
      if(nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1] ) )
      {
-         CheckItem(nActFamily, FALSE);
+         CheckItem(nActFamily, sal_False);
          SfxTemplateItem **ppItem = pFamilyState;
-         const USHORT nFamilyCount = pStyleFamilies->Count();
-         USHORT n;
+         const sal_uInt16 nFamilyCount = pStyleFamilies->Count();
+         sal_uInt16 n;
          for(n=0;n<nFamilyCount;n++)
              if(ppItem[StyleNrToInfoOffset(n)])break;
          ppItem+=StyleNrToInfoOffset(n);
@@ -1497,8 +1497,8 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
      else if( bDocChanged )
      {
          // andere DocShell -> alles neu
-         CheckItem( nActFamily, TRUE );
-         nActFilter = static_cast< USHORT >( LoadFactoryStyleFilter( pDocShell ) );
+         CheckItem( nActFamily, sal_True );
+         nActFilter = static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pDocShell ) );
          if ( 0xFFFF == nActFilter )
             nActFilter = pDocShell->GetAutoStyleFilterIndex();
 
@@ -1513,7 +1513,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
      else
      {
          // anderer Filter fuer automatisch
-         CheckItem( nActFamily, TRUE );
+         CheckItem( nActFamily, sal_True );
          const SfxStyleFamilyItem *pStyleItem =  GetFamilyItem_Impl();
 #if OSL_DEBUG_LEVEL > 1
          SfxFilterTupel *pT;
@@ -1544,7 +1544,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
     (void)pTim; // unused
     if(!bDontUpdate)
     {
-        bDontUpdate=TRUE;
+        bDontUpdate=sal_True;
         if(!pTreeBox)
             UpdateStyles_Impl(UPDATE_FAMILY_LIST);
         else
@@ -1558,7 +1558,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
                 EnableDelete();
             }
         }
-        bDontUpdate=FALSE;
+        bDontUpdate=sal_False;
         DELETEZ(pTimer);
     }
     else
@@ -1587,7 +1587,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
                     )
                    )
                 {
-                    bUpdate = FALSE;
+                    bUpdate = sal_False;
                     Update_Impl();
                 }
                 else if ( bUpdateFamily )
@@ -1610,7 +1610,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
                             EnableEdit(
                                 !(pStyle->GetMask() & SFXSTYLEBIT_READONLY) );
                         else
-                            EnableEdit(FALSE);
+                            EnableEdit(sal_False);
                     }
                 }
                 break;
@@ -1620,7 +1620,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
         // Nicht sofort Update_Impl rufen, fuer den Fall da\s eines
         // der Dokumente ein internes InPlaceObjekt ist!
           case SFX_HINT_DOCCHANGED:
-            bUpdate = TRUE;
+            bUpdate = sal_True;
             break;
           case SFX_HINT_DYING:
           {
@@ -1635,7 +1635,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
     // es kann sein, da\s sich ein neuer erst anmeldet, nachdem der Timer
     // abgelaufen ist - macht sich schlecht in UpdateStyles_Impl() !
 
-    ULONG nId = rHint.ISA(SfxSimpleHint) ? ( (SfxSimpleHint&)rHint ).GetId() : 0;
+    sal_uIntPtr nId = rHint.ISA(SfxSimpleHint) ? ( (SfxSimpleHint&)rHint ).GetId() : 0;
 
     if(!bDontUpdate && nId != SFX_HINT_DYING &&
        (rHint.Type() == TYPE(SfxStyleSheetPoolHint)||
@@ -1660,8 +1660,8 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
 // oder als Folge von Neu oder Bearbeiten, wenn die aktuelle
 // Vorlage einem anderen Filter zugewiesen wurde.
 void SfxCommonTemplateDialog_Impl::FilterSelect(
-                USHORT nEntry,                  // Idx des neuen Filters
-                BOOL bForce )                   // Aktualisierung erzwingen, auch wenn der neue Filter gleich dem aktuellen ist
+                sal_uInt16 nEntry,                  // Idx des neuen Filters
+                sal_Bool bForce )                   // Aktualisierung erzwingen, auch wenn der neue Filter gleich dem aktuellen ist
 {
     if( nEntry != nActFilter || bForce )
     {
@@ -1691,9 +1691,9 @@ void SfxCommonTemplateDialog_Impl::FilterSelect(
 //-------------------------------------------------------------------------
 
 // Intern: Ausf"uhren von Funktionen "uber den Dispatcher
-BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
-    USHORT nId, const String &rStr, const String& rRefStr, USHORT nFamily,
-    USHORT nMask, USHORT *pIdx, const USHORT* pModifier)
+sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
+    sal_uInt16 nId, const String &rStr, const String& rRefStr, sal_uInt16 nFamily,
+    sal_uInt16 nMask, sal_uInt16 *pIdx, const sal_uInt16* pModifier)
 {
     SfxDispatcher &rDispatcher = *SFX_APP()->GetDispatcher_Impl();
     SfxStringItem aItem(nId, rStr);
@@ -1702,7 +1702,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
     SfxStringItem aUpdName(SID_STYLE_UPD_BY_EX_NAME, rStr);
     SfxStringItem aRefName( SID_STYLE_REFERENCE, rRefStr );
     const SfxPoolItem* pItems[ 6 ];
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     if( rStr.Len() )
         pItems[ nCount++ ] = &aItem;
     pItems[ nCount++ ] = &aFamily;
@@ -1722,26 +1722,26 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
 
     Deleted aDeleted;
     pbDeleted = &aDeleted;
-    USHORT nModi = pModifier ? *pModifier : 0;
+    sal_uInt16 nModi = pModifier ? *pModifier : 0;
     const SfxPoolItem* pItem = rDispatcher.Execute(
         nId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL,
         pItems, nModi );
 
     // FIXME: Dialog can be destroyed while in Execute() check stack variable for dtor flag!
     if ( !pItem || aDeleted() )
-        return FALSE;
+        return sal_False;
 
     if ( nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId )
     {
         SfxUInt16Item *pFilterItem = PTR_CAST(SfxUInt16Item, pItem);
         DBG_ASSERT(pFilterItem, "SfxUINT16Item erwartet");
-        USHORT nFilterFlags = pFilterItem->GetValue() & ~SFXSTYLEBIT_USERDEF;
+        sal_uInt16 nFilterFlags = pFilterItem->GetValue() & ~SFXSTYLEBIT_USERDEF;
         if(!nFilterFlags)       // Benutzervorlage?
             nFilterFlags = pFilterItem->GetValue();
         const SfxStyleFamilyItem *pFamilyItem = GetFamilyItem_Impl();
-        const USHORT nFilterCount = (USHORT) pFamilyItem->GetFilterList().Count();
+        const sal_uInt16 nFilterCount = (sal_uInt16) pFamilyItem->GetFilterList().Count();
 
-        for ( USHORT i = 0; i < nFilterCount; ++i )
+        for ( sal_uInt16 i = 0; i < nFilterCount; ++i )
         {
             const SfxFilterTupel *pTupel =
                 pFamilyItem->GetFilterList().GetObject(i);
@@ -1755,7 +1755,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
     // where the local stack object is already destroyed. This would
     // overwrite objects on the stack!! See #i100110
     pbDeleted = NULL;
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -1768,7 +1768,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
         if ( !bHierarchical )
         {
             // TreeView einschalten
-            bHierarchical=TRUE;
+            bHierarchical=sal_True;
             const String aSelectEntry( GetSelectedEntry());
             aFmtLb.Hide();
             // aFilterLb.Disable();
@@ -1804,7 +1804,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
         // Falls bHierarchical, kann sich die Familie geaendert haben
         // minus one since hierarchical is inserted at the start
         FilterSelect(pBox->GetSelectEntryPos() - 1, bHierarchical );
-        bHierarchical=FALSE;
+        bHierarchical=sal_False;
 //      UpdateStyles_Impl(UPDATE_FAMILY_LIST);  // Anzeige aktualisieren
     }
 
@@ -1814,11 +1814,11 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
 //-------------------------------------------------------------------------
 
 // Select-Handler der Toolbox
-void SfxCommonTemplateDialog_Impl::FamilySelect(USHORT nEntry)
+void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
 {
     if( nEntry != nActFamily )
     {
-        CheckItem( nActFamily, FALSE );
+        CheckItem( nActFamily, sal_False );
         nActFamily = nEntry;
         SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl();
         SfxUInt16Item aItem( SID_STYLE_FAMILY, nEntry );
@@ -1831,15 +1831,15 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(USHORT nEntry)
 
 //-------------------------------------------------------------------------
 
-void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
+void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
 {
     String aEmpty;
     switch(nEntry)
     {
         case SID_STYLE_WATERCAN:
         {
-            const BOOL bState = IsCheckedItem(nEntry);
-            BOOL bCheck;
+            const sal_Bool bState = IsCheckedItem(nEntry);
+            sal_Bool bCheck;
             SfxBoolItem aBool;
             // wenn eine Vorlage ausgewaehlt ist.
             if(!bState && aFmtLb.GetSelectionCount())
@@ -1848,13 +1848,13 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
                     GetSelectedEntry());
                 Execute_Impl(
                     SID_STYLE_WATERCAN, aTemplName, aEmpty,
-                    (USHORT)GetFamilyItem_Impl()->GetFamily() );
-                bCheck = TRUE;
+                    (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
+                bCheck = sal_True;
             }
             else
             {
                 Execute_Impl(SID_STYLE_WATERCAN, aEmpty, aEmpty, 0);
-                bCheck = FALSE;
+                bCheck = sal_False;
             }
             CheckItem(nEntry, bCheck);
             aBool.SetValue(bCheck);
@@ -1868,7 +1868,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
                 const SfxStyleFamily eFam=GetFamilyItem_Impl()->GetFamily();
 //pStyleSheetPool->GetSearchFamily();
                 const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
-                USHORT nFilter;
+                sal_uInt16 nFilter;
                 if(pItem&&nActFilter!=0xffff)
                 {
                     nFilter = pItem->GetFilterList().GetObject(
@@ -1889,7 +1889,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
                     const String aTemplName(pDlg->GetName());
                     Execute_Impl(SID_STYLE_NEW_BY_EXAMPLE,
                                  aTemplName, aEmpty,
-                                 (USHORT)GetFamilyItem_Impl()->GetFamily(),
+                                 (sal_uInt16)GetFamilyItem_Impl()->GetFamily(),
                                  nFilter);
                 }
                 pStyleSheetPool->SetSearchMask( eFam, nFilter );
@@ -1901,7 +1901,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
         {
             Execute_Impl(SID_STYLE_UPDATE_BY_EXAMPLE,
                     aEmpty, aEmpty,
-                    (USHORT)GetFamilyItem_Impl()->GetFamily());
+                    (sal_uInt16)GetFamilyItem_Impl()->GetFamily());
             break;
         }
         case SID_TEMPLATE_LOAD:
@@ -1975,11 +1975,11 @@ void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pOb
 
 IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox )
 {
-    bDontUpdate=TRUE;
+    bDontUpdate=sal_True;
     const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
     const SfxStyleFamily eFam = pItem->GetFamily();
     long ret= pStyleSheetPool->SetParent(eFam,pBox->GetStyle(), pBox->GetParent())? 1L: 0L;
-    bDontUpdate=FALSE;
+    bDontUpdate=sal_False;
     return ret;
 }
 
@@ -2000,7 +2000,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
 
         const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
         const SfxStyleFamily eFam=pItem->GetFamily();
-        USHORT nMask;
+        sal_uInt16 nMask;
         if(pItem&&nActFilter!=0xffff)
         {
             nMask = pItem->GetFilterList().GetObject(
@@ -2015,7 +2015,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
 
         Execute_Impl(SID_STYLE_NEW,
                      aEmpty, GetSelectedEntry(),
-                     ( USHORT )GetFamilyItem_Impl()->GetFamily(),
+                     ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
                      nMask);
 
         Application::SetDefDialogParent( pTmp );
@@ -2027,7 +2027,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
             if(!pTreeBox)
             {
 //                              aFilterLb.SelectEntryPos(nFilter);
-                FilterSelect(nActFilter, TRUE);
+                FilterSelect(nActFilter, sal_True);
             }
             else
             {
@@ -2051,7 +2051,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
 {
     if(IsInitialized() && HasSelectedStyle())
     {
-        USHORT nFilter = nActFilter;
+        sal_uInt16 nFilter = nActFilter;
         String aTemplName(GetSelectedEntry());
         const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
         const SfxStyleFamily eFam = pItem->GetFamily();
@@ -2065,7 +2065,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
         else
             Application::SetDefDialogParent( pWindow );
         if ( Execute_Impl( SID_STYLE_EDIT, aTemplName, String(),
-                          (USHORT)GetFamilyItem_Impl()->GetFamily(), 0, &nFilter ) )
+                          (sal_uInt16)GetFamilyItem_Impl()->GetFamily(), 0, &nFilter ) )
         {
 //          DBG_ASSERT(nFilter < aFilterLb.GetEntryCount(), "Filter ueberindiziert");
 //          aTemplName = pStyle->GetName();
@@ -2073,7 +2073,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
 /*                      if(!pTreeBox)
             {
                 //                              aFilterLb.SelectEntryPos(nFilter);
-                //                              FilterSelect(nFilter, TRUE);
+                //                              FilterSelect(nFilter, sal_True);
             }
             else
                 FillTreeBox();*/
@@ -2111,15 +2111,15 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
 
                 if ( pTreeBox ) // Damit die Treelistbox beim L"oschen nicht zuklappt
                 {
-                    bDontUpdate = TRUE;
+                    bDontUpdate = sal_True;
                 }
                 Execute_Impl( SID_STYLE_DELETE, aTemplName,
-                              String(), (USHORT)GetFamilyItem_Impl()->GetFamily() );
+                              String(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
 
                 if ( pTreeBox )
                 {
                     pTreeBox->RemoveParentKeepChilds( pTreeBox->FirstSelected() );
-                    bDontUpdate = FALSE;
+                    bDontUpdate = sal_False;
                 }
             }
         }
@@ -2136,7 +2136,7 @@ void    SfxCommonTemplateDialog_Impl::EnableDelete()
         const String aTemplName(GetSelectedEntry());
         const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
         const SfxStyleFamily eFam = pItem->GetFamily();
-        USHORT nFilter = 0;
+        sal_uInt16 nFilter = 0;
         if(pItem->GetFilterList().Count() > nActFilter)
             nFilter = pItem->GetFilterList().GetObject(nActFilter)->nFlags;
         if(!nFilter)    // automatisch
@@ -2147,16 +2147,16 @@ void    SfxCommonTemplateDialog_Impl::EnableDelete()
         DBG_ASSERT(pStyle, "Style nicht gefunden");
         if(pStyle && pStyle->IsUserDefined())
         {
-            EnableDel(TRUE);
+            EnableDel(sal_True);
         }
         else
         {
-            EnableDel(FALSE);
+            EnableDel(sal_False);
         }
     }
     else
     {
-        EnableDel(FALSE);
+        EnableDel(sal_False);
     }
 //  rBindings.Invalidate( SID_STYLE_DELETE );
 //  rBindings.Update( SID_STYLE_DELETE );
@@ -2188,10 +2188,10 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
     if ( IsInitialized() && 0 != pFamilyState[nActFamily-1] &&
          GetSelectedEntry().Len() )
     {
-        USHORT nModifier = aFmtLb.GetModifier();
+        sal_uInt16 nModifier = aFmtLb.GetModifier();
         Execute_Impl(SID_STYLE_APPLY,
                      GetSelectedEntry(), String(),
-                     ( USHORT )GetFamilyItem_Impl()->GetFamily(),
+                     ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
                      0, 0, &nModifier );
         if(ISA(SfxTemplateCatalog_Impl))
             ((SfxTemplateCatalog_Impl*) this)->pReal->EndDialog(RET_OK);
@@ -2219,9 +2219,9 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
                          aEmpty, aEmpty, 0);
             Execute_Impl(SID_STYLE_WATERCAN,
                          GetSelectedEntry(), aEmpty,
-                         ( USHORT )GetFamilyItem_Impl()->GetFamily());
+                         ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily());
         }
-//      EnableEdit(TRUE);
+//      EnableEdit(sal_True);
         EnableItem(SID_STYLE_WATERCAN, !bWaterDisabled);
         EnableDelete();
     }
@@ -2240,16 +2240,16 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
         nLastItemId = pMenu->GetCurItemId();
         Application::PostUserEvent(
             LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ), 0 );
-        return TRUE;
+        return sal_True;
     }
 
     switch(nLastItemId) {
     case ID_NEW: NewHdl(0); break;
     case ID_EDIT: EditHdl(0); break;
     case ID_DELETE: DeleteHdl(0); break;
-    default: return FALSE;
+    default: return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -2257,7 +2257,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
 void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin )
 {
     // Bug# 94152: This part should never be called, because before this happens, the TreeListBox should captured this!
-    DBG_ASSERT( FALSE, "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" );
+    DBG_ASSERT( sal_False, "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" );
 
     PopupMenu* pMenu = CreateContextMenu();
     pMenu->Execute( pWin, rPos );
@@ -2277,7 +2277,7 @@ SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
 
 // -----------------------------------------------------------------------
 
-void SfxCommonTemplateDialog_Impl::EnableExample_Impl(USHORT nId, BOOL bEnable)
+void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, sal_Bool bEnable)
 {
     if( nId == SID_STYLE_NEW_BY_EXAMPLE )
         bNewByExampleDisabled = !bEnable;
@@ -2296,9 +2296,9 @@ PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
 {
     if ( bBindingUpdate )
     {
-        pBindings->Invalidate( SID_STYLE_NEW, TRUE, FALSE );
+        pBindings->Invalidate( SID_STYLE_NEW, sal_True, sal_False );
         pBindings->Update( SID_STYLE_NEW );
-        bBindingUpdate = FALSE;
+        bBindingUpdate = sal_False;
     }
     PopupMenu* pMenu = new PopupMenu( SfxResId( MN_CONTEXT_TEMPLDLG ) );
     pMenu->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ) );
@@ -2317,7 +2317,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
     SfxCommonTemplateDialog_Impl( pB, pDlgWindow ),
 
     m_pFloat            ( pDlgWindow ),
-    m_bZoomIn           ( FALSE ),
+    m_bZoomIn           ( sal_False ),
     m_aActionTbL        ( pDlgWindow, this ),
     m_aActionTbR        ( pDlgWindow, SfxResId( TB_ACTION ) )
 
@@ -2338,17 +2338,17 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
 
 // ------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
+void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
 {
     m_aActionTbL.EnableItem( nId, bEnable );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyItem *pItem)
+void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamilyItem *pItem)
 {
     rtl::OString sHelpId;
-    switch( (USHORT) pItem->GetFamily() )
+    switch( (sal_uInt16) pItem->GetFamily() )
     {
         case SFX_STYLE_FAMILY_CHAR:     sHelpId = ".uno:CharStyle"; break;
         case SFX_STYLE_FAMILY_PARA:     sHelpId = ".uno:ParaStyle"; break;
@@ -2382,11 +2382,11 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
     pStyleFamilies->updateImages( *m_pStyleFamiliesId, bIsHighContrast ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL );
 
     // and set the new images on our toolbox
-    USHORT nLoop = pStyleFamilies->Count();
+    sal_uInt16 nLoop = pStyleFamilies->Count();
     for( ; nLoop--; )
     {
         const SfxStyleFamilyItem *pItem = pStyleFamilies->GetObject( nLoop );
-        USHORT nId = SfxFamilyIdToNId( pItem->GetFamily() );
+        sal_uInt16 nId = SfxFamilyIdToNId( pItem->GetFamily() );
         m_aActionTbL.SetItemImage( nId, pItem->GetImage() );
     }
 }
@@ -2410,15 +2410,15 @@ void SfxTemplateDialog_Impl::ClearFamilyList()
 
 void SfxCommonTemplateDialog_Impl::InvalidateBindings()
 {
-    pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, TRUE, FALSE);
+    pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, sal_True, sal_False);
     pBindings->Update( SID_STYLE_NEW_BY_EXAMPLE );
-    pBindings->Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE, TRUE, FALSE);
+    pBindings->Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE, sal_True, sal_False);
     pBindings->Update( SID_STYLE_UPDATE_BY_EXAMPLE );
-    pBindings->Invalidate( SID_STYLE_WATERCAN, TRUE, FALSE);
+    pBindings->Invalidate( SID_STYLE_WATERCAN, sal_True, sal_False);
     pBindings->Update( SID_STYLE_WATERCAN );
-    pBindings->Invalidate( SID_STYLE_NEW, TRUE, FALSE );
+    pBindings->Invalidate( SID_STYLE_NEW, sal_True, sal_False );
     pBindings->Update( SID_STYLE_NEW );
-    pBindings->Invalidate( SID_STYLE_DRAGHIERARCHIE, TRUE, FALSE );
+    pBindings->Invalidate( SID_STYLE_DRAGHIERARCHIE, sal_True, sal_False );
     pBindings->Update( SID_STYLE_DRAGHIERARCHIE );
 }
 
@@ -2453,9 +2453,9 @@ void SfxTemplateDialog_Impl::Resize()
     FloatingWindow *pF = m_pFloat->GetFloatingWindow();
     if ( pF )
     {
-//      if(pF->IsZoomedIn() && m_bZoomIn==FALSE)
+//      if(pF->IsZoomedIn() && m_bZoomIn==sal_False)
 //          pF->SetText(String(SfxResId( DLG_STYLE_DESIGNER )));
-//      if(!pF->IsZoomedIn() && m_bZoomIn==TRUE && GetFamilyItem_Impl())
+//      if(!pF->IsZoomedIn() && m_bZoomIn==sal_True && GetFamilyItem_Impl())
 //          UpdateStyles_Impl(UPDATE_FAMILY); //Bereich wieder in Titel schreiben
         m_bZoomIn = pF->IsRollUp();
         if ( m_bZoomIn )
@@ -2545,7 +2545,7 @@ void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::EnableItem(USHORT nMesId, BOOL bCheck)
+void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck)
 {
     String aEmpty;
     switch(nMesId)
@@ -2562,7 +2562,7 @@ void SfxTemplateDialog_Impl::EnableItem(USHORT nMesId, BOOL bCheck)
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::CheckItem(USHORT nMesId, BOOL bCheck)
+void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck)
 {
     switch(nMesId)
     {
@@ -2577,7 +2577,7 @@ void SfxTemplateDialog_Impl::CheckItem(USHORT nMesId, BOOL bCheck)
 
 //-------------------------------------------------------------------------
 
-BOOL SfxTemplateDialog_Impl::IsCheckedItem(USHORT nMesId)
+sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
 {
     switch(nMesId)
     {
@@ -2592,7 +2592,7 @@ BOOL SfxTemplateDialog_Impl::IsCheckedItem(USHORT nMesId)
 
 IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
 {
-    const USHORT nEntry = pBox->GetCurItemId();
+    const sal_uInt16 nEntry = pBox->GetCurItemId();
     FamilySelect(nEntry);
     return 0;
 }
@@ -2620,7 +2620,7 @@ IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
 
 IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
 {
-    const USHORT nEntry = pBox->GetCurItemId();
+    const sal_uInt16 nEntry = pBox->GetCurItemId();
     if(nEntry != SID_STYLE_NEW_BY_EXAMPLE ||
             TIB_DROPDOWN != (pBox->GetItemBits(nEntry)&TIB_DROPDOWN))
         ActionSelect(nEntry);
@@ -2629,7 +2629,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
 //-------------------------------------------------------------------------
 IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
 {
-    const USHORT nEntry = pBox->GetCurItemId();
+    const sal_uInt16 nEntry = pBox->GetCurItemId();
     if(nEntry == SID_STYLE_NEW_BY_EXAMPLE &&
             TIB_DROPDOWN == (pBox->GetItemBits(nEntry)&TIB_DROPDOWN))
     {
@@ -2687,7 +2687,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
 //-------------------------------------------------------------------------
 IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu)
 {
-    USHORT nMenuId = pMenu->GetCurItemId();
+    sal_uInt16 nMenuId = pMenu->GetCurItemId();
     ActionSelect(nMenuId);
     return 0;
 }
@@ -2808,7 +2808,7 @@ IMPL_LINK( SfxTemplateCatalog_Impl, OrgHdl, Button *, pButton )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateCatalog_Impl::EnableEdit( BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableEdit( sal_Bool bEnable )
 {
     SfxCommonTemplateDialog_Impl::EnableEdit( bEnable );
     aChangeBtn.Enable( bEnable );
@@ -2816,13 +2816,13 @@ void SfxTemplateCatalog_Impl::EnableEdit( BOOL bEnable )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateCatalog_Impl::EnableDel( BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableDel( sal_Bool bEnable )
 {
     SfxCommonTemplateDialog_Impl::EnableDel( bEnable );
     aDelBtn.Enable( bEnable );
 }
 
-void SfxTemplateCatalog_Impl::EnableNew(BOOL bEnable)
+void SfxTemplateCatalog_Impl::EnableNew(sal_Bool bEnable)
 {
     SfxCommonTemplateDialog_Impl::EnableNew( bEnable );
     aNewBtn.Enable( bEnable );
@@ -2832,7 +2832,7 @@ void SfxTemplateCatalog_Impl::EnableNew(BOOL bEnable)
 
 IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, FamListSelect, ListBox *, pList )
 {
-    const USHORT nEntry = aFamIds[pList->GetSelectEntryPos()];
+    const sal_uInt16 nEntry = aFamIds[pList->GetSelectEntryPos()];
     FamilySelect(nEntry);
     return 0;
 }
@@ -2840,14 +2840,14 @@ IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, FamListSelect, ListBox *, pList )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
+void SfxTemplateCatalog_Impl::EnableItem( sal_uInt16 nMesId, sal_Bool bCheck )
 {
     if ( nMesId == SID_STYLE_WATERCAN )
         aOkBtn.Enable( bCheck );
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
         return;
 
-/*      for(USHORT i=0;i<aFamIds.Count&&aFamIds[i]!=nMesId;i++);
+/*      for(sal_uInt16 i=0;i<aFamIds.Count&&aFamIds[i]!=nMesId;i++);
     if(i!=aFamIds.Count())
         aFamList.SelectEntry(aFamIds[i]);
     else
@@ -2857,22 +2857,22 @@ void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateCatalog_Impl::CheckItem(USHORT nMesId, BOOL /*bCheck*/)
+void SfxTemplateCatalog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool /*bCheck*/)
 {
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
         return;
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ ) ;
     aFamList.SelectEntryPos(i);
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxTemplateCatalog_Impl::IsCheckedItem(USHORT nMesId)
+sal_Bool SfxTemplateCatalog_Impl::IsCheckedItem(sal_uInt16 nMesId)
 {
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
-        return FALSE;
-    USHORT i;
+        return sal_False;
+    sal_uInt16 i;
     for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ )
         ;
     return aFamList.IsEntrySelected( String::CreateFromInt32(i) );
@@ -2882,10 +2882,10 @@ BOOL SfxTemplateCatalog_Impl::IsCheckedItem(USHORT nMesId)
 
 // Der Katalog muss nur das Disablen beherrschen, da waehrend seiner
 // Lebenszeit keine Selektionsaenderungen vorgenommen werden koennen
-void SfxTemplateCatalog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
 {
     if ( !bEnable )
-        for ( USHORT nPos = aFamIds.Count(); nPos--; )
+        for ( sal_uInt16 nPos = aFamIds.Count(); nPos--; )
             if ( aFamIds[ nPos ] == nId )
             {
                 aFamIds.Remove( nPos );
@@ -2893,7 +2893,7 @@ void SfxTemplateCatalog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
             }
 }
 
-void SfxTemplateCatalog_Impl::InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pItem )
+void SfxTemplateCatalog_Impl::InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pItem )
 {
     if ( nId > SFX_STYLE_FAMILY_PSEUDO || nId < SFX_STYLE_FAMILY_CHAR )
         return;
@@ -2914,21 +2914,21 @@ void SfxTemplateCatalog_Impl::PrepareDeleteAction()
 }
 
 
-void SfxCommonTemplateDialog_Impl::SetFamily( USHORT nId )
+void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId )
 {
     if ( nId != nActFamily )
     {
         if ( nActFamily != 0xFFFF )
-            CheckItem( nActFamily, FALSE );
+            CheckItem( nActFamily, sal_False );
         nActFamily = nId;
         if ( nId != 0xFFFF )
-            bUpdateFamily = TRUE;
+            bUpdateFamily = sal_True;
     }
 }
 
 void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
 {
-    bUpdateFamily = FALSE;
+    bUpdateFamily = sal_False;
 
     SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl();
     SfxViewFrame *pViewFrame = pDispat->GetFrame();
@@ -2944,10 +2944,10 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
             StartListening(*pOldStyleSheetPool);
     }
 
-    bWaterDisabled = FALSE;
-    bCanNew = TRUE;
-    bTreeDrag = TRUE;
-    bUpdateByExampleDisabled = FALSE;
+    bWaterDisabled = sal_False;
+    bCanNew = sal_True;
+    bTreeDrag = sal_True;
+    bUpdateByExampleDisabled = sal_False;
 
     if ( pStyleSheetPool )
     {
@@ -2966,7 +2966,7 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
          // nur, wenn dieser Bereich erlaubt ist
          0 != pFamilyState[ nActFamily - 1 ] )
         Execute_Impl( SID_STYLE_APPLY, GetSelectedEntry(),
-                      String(), (USHORT)GetFamilyItem_Impl()->GetFamily() );
+                      String(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
 }
 void SfxCommonTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
 {
@@ -3013,7 +3013,7 @@ DropToolBox_Impl::~DropToolBox_Impl()
 sal_Int8    DropToolBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
 {
     sal_Int8 nReturn = DND_ACTION_NONE;
-    USHORT nItemId = GetItemId( rEvt.maPosPixel );
+    sal_uInt16 nItemId = GetItemId( rEvt.maPosPixel );
     if(USHRT_MAX != nItemId && !IsItemChecked( nItemId ))
     {
         SetCurItemId(nItemId);
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 680880229324..5d41fc214786 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -256,11 +256,11 @@ namespace sfx2
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    USHORT TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
+    sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
     {
         // Add the menu before the closer button.
-        const USHORT nItemCount( m_aToolbox.GetItemCount() );
-        const USHORT nItemId( nItemCount + 1 );
+        const sal_uInt16 nItemCount( m_aToolbox.GetItemCount() );
+        const sal_uInt16 nItemId( nItemCount + 1 );
         m_aToolbox.InsertItem( nItemId, i_rItemText, TIB_DROPDOWNONLY, nItemCount > 0 ? nItemCount - 1 : TOOLBOX_APPEND );
         m_aToolbox.SetHelpId( nItemId, i_nHelpId );
         m_aToolbox.SetClickHdl( i_rCallback );
@@ -277,14 +277,14 @@ namespace sfx2
     //------------------------------------------------------------------------------------------------------------------
     IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox )
     {
-        const USHORT nId = pToolBox->GetCurItemId();
+        const sal_uInt16 nId = pToolBox->GetCurItemId();
 
         if ( nId == 1 )
         {
             // the closer
             EndTracking();
             const sal_uInt16 nChildWindowId( GetChildWindow_Impl()->GetType() );
-            const SfxBoolItem aVisibility( nChildWindowId, FALSE );
+            const SfxBoolItem aVisibility( nChildWindowId, sal_False );
             GetBindings().GetDispatcher()->Execute(
                 nChildWindowId,
                 SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
@@ -309,7 +309,7 @@ namespace sfx2
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, BOOL i_bFloatMode )
+    void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, sal_Bool i_bFloatMode )
     {
         SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode );
 
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 0e03106b0d5e..2b815a260e3a 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -47,7 +47,7 @@
 // Konstruktor
 
 SfxTemplateControllerItem::SfxTemplateControllerItem(
-        USHORT nSlotId,                 // ID
+        sal_uInt16 nSlotId,                 // ID
         SfxCommonTemplateDialog_Impl &rDlg, // Controller-Instanz, dem dieses Item zugeordnet ist.
         SfxBindings &rBindings):
     SfxControllerItem(nSlotId, rBindings),
@@ -68,7 +68,7 @@ SfxTemplateControllerItem::~SfxTemplateControllerItem()
 // Benachrichtigung "uber Status"anderung; wird an den
 // im Konstruktor "ubergebenen Controller propagiert
 
-void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
+void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pItem )
 {
     switch(nSID)
@@ -79,7 +79,7 @@ void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
         case SID_STYLE_FAMILY4:
         case SID_STYLE_FAMILY5:
         {
-            FASTBOOL bAvailable = SFX_ITEM_AVAILABLE == eState;
+            bool bAvailable = SFX_ITEM_AVAILABLE == eState;
             if ( !bAvailable )
                 rTemplateDlg.SetFamilyState(GetId(), 0);
             else {
@@ -88,9 +88,9 @@ void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
                 DBG_ASSERT(pStateItem != 0, "SfxTemplateItem erwartet");
                 rTemplateDlg.SetFamilyState( GetId(), pStateItem );
             }
-            BOOL bDisable = eState == SFX_ITEM_DISABLED;
+            sal_Bool bDisable = eState == SFX_ITEM_DISABLED;
             // Familie Disablen
-            USHORT nFamily = 0;
+            sal_uInt16 nFamily = 0;
             switch( GetId())
             {
                 case SID_STYLE_FAMILY1:
@@ -175,7 +175,7 @@ IMPL_STATIC_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
     {
         case 0 :
         case 1 :
-            pState = new SfxBoolItem(SID_STYLE_WATERCAN, pThis->nWaterCanState ? TRUE : FALSE);
+            pState = new SfxBoolItem(SID_STYLE_WATERCAN, pThis->nWaterCanState ? sal_True : sal_False);
         break;
     }
     pThis->rTemplateDlg.SetWaterCanState(pState);
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index 566c379df508..774c7e44e7a7 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -47,9 +47,9 @@ SfxTemplateItem::SfxTemplateItem() :
 
 SfxTemplateItem::SfxTemplateItem
 (
-    USHORT nWhichId,      // Slot-ID
+    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 )
 {
@@ -84,7 +84,7 @@ SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const
 }
 
 //-------------------------------------------------------------------------
-sal_Bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     ::com::sun::star::frame::status::Template aTemplate;
 
@@ -96,13 +96,13 @@ sal_Bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMe
 }
 
 //-------------------------------------------------------------------------
-sal_Bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     ::com::sun::star::frame::status::Template aTemplate;
 
     if ( rVal >>= aTemplate )
     {
-        SetValue( sal::static_int_cast< USHORT >( aTemplate.Value ) );
+        SetValue( sal::static_int_cast< sal_uInt16 >( aTemplate.Value ) );
         aStyle = aTemplate.StyleName;
         return sal_True;
     }
@@ -112,9 +112,9 @@ sal_Bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /
 
 //-------------------------------------------------------------------------
 
-BYTE SfxTemplateItem::GetFlagCount() const
+sal_uInt8 SfxTemplateItem::GetFlagCount() const
 {
-    return sizeof(USHORT) * 8;
+    return sizeof(sal_uInt16) * 8;
 }
 
 
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index f2a0cf2790f3..51219608b75e 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -155,7 +155,7 @@ static String ConvertDateTime_Impl(const DateTime& rTime, const LocaleDataWrappe
      const String pDelim ( DEFINE_CONST_UNICODE( ", "));
      String aStr(rWrapper.getDate(rTime));
      aStr += pDelim;
-     aStr += rWrapper.getTime(rTime, TRUE, FALSE);
+     aStr += rWrapper.getTime(rTime, sal_True, sal_False);
      return aStr;
 }
 
@@ -204,7 +204,7 @@ SfxVersionsTabListBox_Impl::SfxVersionsTabListBox_Impl( Window* pParent, const R
 {
 }
 
-SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, BOOL bIsSaveVersionOnClose )
+SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, sal_Bool bIsSaveVersionOnClose )
     : SfxModalDialog( NULL, SfxResId( DLG_VERSIONS ) )
     , aNewGroup( this, SfxResId( GB_NEWVERSIONS ) )
     , aSaveButton( this, SfxResId( PB_SAVE ) )
@@ -285,7 +285,7 @@ void SfxVersionDialog::Init_Impl()
     delete mpTable;
     mpTable = new SfxVersionTableDtor( aVersions );
     {
-        for ( USHORT n = 0; n < mpTable->Count(); ++n )
+        for ( sal_uInt16 n = 0; n < mpTable->Count(); ++n )
         {
             SfxVersionInfo *pInfo = mpTable->GetObject(n);
             String aEntry = ConvertDateTime_Impl( pInfo->aCreationDate, *mpLocaleWrapper );
@@ -300,7 +300,7 @@ void SfxVersionDialog::Init_Impl()
 
     aSaveCheckBox.Check( mbIsSaveVersionOnClose );
 
-    BOOL bEnable = !pObjShell->IsReadOnly();
+    sal_Bool bEnable = !pObjShell->IsReadOnly();
     aSaveButton.Enable( bEnable );
     aSaveCheckBox.Enable( bEnable );
 
@@ -323,7 +323,7 @@ void SfxVersionDialog::Open_Impl()
     SfxObjectShell *pObjShell = pViewFrame->GetObjectShell();
 
     SvLBoxEntry *pEntry = aVersionBox.FirstSelected();
-    ULONG nPos = aVersionBox.GetModel()->GetRelPos( pEntry );
+    sal_uIntPtr nPos = aVersionBox.GetModel()->GetRelPos( pEntry );
     SfxInt16Item aItem( SID_VERSION, (short)nPos+1 );
     SfxStringItem aTarget( SID_TARGETNAME, DEFINE_CONST_UNICODE("_blank") );
     SfxStringItem aReferer( SID_REFERER, DEFINE_CONST_UNICODE("private:user") );
@@ -410,20 +410,20 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     {
         SfxVersionInfo aInfo;
         aInfo.aAuthor = SvtUserOptions().GetFullName();
-        SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, aInfo, TRUE );
+        SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, aInfo, sal_True );
         short nRet = pDlg->Execute();
         if ( nRet == RET_OK )
         {
             SfxStringItem aComment( SID_DOCINFO_COMMENTS, aInfo.aComment );
-            pObjShell->SetModified( TRUE );
+            pObjShell->SetModified( sal_True );
             const SfxPoolItem* aItems[2];
             aItems[0] = &aComment;
             aItems[1] = NULL;
             pViewFrame->GetBindings().ExecuteSynchron( SID_SAVEDOC, aItems, 0 );
-            aVersionBox.SetUpdateMode( FALSE );
+            aVersionBox.SetUpdateMode( sal_False );
             aVersionBox.Clear();
             Init_Impl();
-            aVersionBox.SetUpdateMode( TRUE );
+            aVersionBox.SetUpdateMode( sal_True );
         }
 
         delete pDlg;
@@ -431,11 +431,11 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     if ( pButton == &aDeleteButton && pEntry )
     {
         pObjShell->GetMedium()->RemoveVersion_Impl( ((SfxVersionInfo*) pEntry->GetUserData())->aName );
-        pObjShell->SetModified( TRUE );
-        aVersionBox.SetUpdateMode( FALSE );
+        pObjShell->SetModified( sal_True );
+        aVersionBox.SetUpdateMode( sal_False );
         aVersionBox.Clear();
         Init_Impl();
-        aVersionBox.SetUpdateMode( TRUE );
+        aVersionBox.SetUpdateMode( sal_True );
     }
     else if ( pButton == &aOpenButton && pEntry )
     {
@@ -444,20 +444,20 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     else if ( pButton == &aViewButton && pEntry )
     {
         SfxVersionInfo* pInfo = (SfxVersionInfo*) pEntry->GetUserData();
-        SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, *pInfo, FALSE );
+        SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, *pInfo, sal_False );
         pDlg->Execute();
         delete pDlg;
     }
     else if ( pEntry && pButton == &aCompareButton )
     {
         SfxAllItemSet aSet( pObjShell->GetPool() );
-        ULONG nPos = aVersionBox.GetModel()->GetRelPos( pEntry );
+        sal_uIntPtr nPos = aVersionBox.GetModel()->GetRelPos( pEntry );
         aSet.Put( SfxInt16Item( SID_VERSION, (short)nPos+1 ) );
         aSet.Put( SfxStringItem( SID_FILE_NAME, pObjShell->GetMedium()->GetName() ) );
 
         SfxItemSet* pSet = pObjShell->GetMedium()->GetItemSet();
-        SFX_ITEMSET_ARG( pSet, pFilterItem, SfxStringItem, SID_FILTER_NAME, FALSE );
-        SFX_ITEMSET_ARG( pSet, pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, FALSE );
+        SFX_ITEMSET_ARG( pSet, pFilterItem, SfxStringItem, SID_FILTER_NAME, sal_False );
+        SFX_ITEMSET_ARG( pSet, pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False );
         if ( pFilterItem )
             aSet.Put( *pFilterItem );
         if ( pFilterOptItem )
@@ -470,7 +470,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     return 0L;
 }
 
-SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl ( Window *pParent, SfxVersionInfo& rInfo, BOOL bEdit )
+SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl ( Window *pParent, SfxVersionInfo& rInfo, sal_Bool bEdit )
     : SfxModalDialog( pParent, SfxResId( DLG_COMMENTS ) )
     , aDateTimeText( this, SfxResId( FT_DATETIME ) )
     , aSavedByText( this, SfxResId( FT_SAVEDBY ) )
@@ -496,7 +496,7 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl ( Window *pParent, SfxVersi
     {
         aOKButton.Hide();
         aCancelButton.Hide();
-        aEdit.SetReadOnly( TRUE );
+        aEdit.SetReadOnly( sal_True );
     }
     else
         aCloseButton.Hide();
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index ff0a15e20088..1ef90b67b173 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -381,7 +381,7 @@ const SfxObjectFactory* SfxObjectFactory::GetFactory( const String& rFactoryURL
 
 const SfxFilter* SfxObjectFactory::GetTemplateFilter() const
 {
-    USHORT nVersion=0;
+    sal_uInt16 nVersion=0;
     SfxFilterMatcher aMatcher ( String::CreateFromAscii( pShortName ) );
     SfxFilterMatcherIter aIter( &aMatcher );
     const SfxFilter *pFilter = 0;
@@ -391,7 +391,7 @@ const SfxFilter* SfxObjectFactory::GetTemplateFilter() const
         if( pTemp->IsOwnFormat() && pTemp->IsOwnTemplateFormat() && ( pTemp->GetVersion() > nVersion ) )
         {
             pFilter = pTemp;
-            nVersion = (USHORT) pTemp->GetVersion();
+            nVersion = (sal_uInt16) pTemp->GetVersion();
         }
 
         pTemp = aIter.Next();
@@ -476,7 +476,7 @@ sal_uInt16 SfxObjectFactory::GetViewNo_Impl( const sal_uInt16 i_nViewId, const s
 
 SfxViewFactory* SfxObjectFactory::GetViewFactoryByViewName( const String& i_rViewName ) const
 {
-    for (   USHORT nViewNo = 0;
+    for (   sal_uInt16 nViewNo = 0;
             nViewNo < GetViewFactoryCount();
             ++nViewNo
         )
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 434553bdb226..63b116ef75e8 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -727,7 +727,7 @@ const String& SfxMedium::GetPhysicalName() const
 //------------------------------------------------------------------
 void SfxMedium::CreateFileStream()
 {
-    ForceSynchronStream_Impl( TRUE );
+    ForceSynchronStream_Impl( sal_True );
     GetInStream();
     if( pInStream )
     {
@@ -767,7 +767,7 @@ sal_Bool SfxMedium::Commit()
 sal_Bool SfxMedium::IsStorage()
 {
     if ( pImp->xStorage.is() )
-        return TRUE;
+        return sal_True;
 
     if ( bTriedStorage )
         return pImp->bIsStorage;
@@ -781,13 +781,13 @@ sal_Bool SfxMedium::IsStorage()
         }
         pImp->bIsStorage = SotStorage::IsStorageFile( aURL ) && !SotStorage::IsOLEStorage( aURL);
         if ( !pImp->bIsStorage )
-            bTriedStorage = TRUE;
+            bTriedStorage = sal_True;
     }
     else if ( GetInStream() )
     {
         pImp->bIsStorage = SotStorage::IsStorageFile( pInStream ) && !SotStorage::IsOLEStorage( pInStream );
         if ( !pInStream->GetError() && !pImp->bIsStorage )
-            bTriedStorage = TRUE;
+            bTriedStorage = sal_True;
     }
 
     return pImp->bIsStorage;
@@ -1225,7 +1225,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
         // the error should be set in case it is storing process
         // or the document has been opened for editing explicitly
 
-        SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+        SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
         if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) )
             SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
         else
@@ -1337,7 +1337,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
 
     SFX_ITEMSET_ARG( pSet, pVersion, SfxInt16Item, SID_VERSION, sal_False);
 
-    BOOL bResetStorage = FALSE;
+    sal_Bool bResetStorage = sal_False;
     if ( pVersion && pVersion->GetValue() )
     {
         // Alle verf"ugbaren Versionen einlesen
@@ -1388,11 +1388,11 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
                     pImp->aVersions.realloc(0);
                 }
                 else
-                    bResetStorage = TRUE;
+                    bResetStorage = sal_True;
             }
         }
         else
-            bResetStorage = TRUE;
+            bResetStorage = sal_True;
     }
 
     if ( bResetStorage )
@@ -1645,7 +1645,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
             sal_Bool bTransactStarted = sal_False;
             SFX_ITEMSET_ARG( GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE, sal_False );
                SFX_ITEMSET_ARG( GetItemSet(), pRename, SfxBoolItem, SID_RENAME, sal_False );
-            sal_Bool bRename = pRename ? pRename->GetValue() : FALSE;
+            sal_Bool bRename = pRename ? pRename->GetValue() : sal_False;
             sal_Bool bOverWrite = pOverWrite ? pOverWrite->GetValue() : !bRename;
 
             try
@@ -2269,7 +2269,7 @@ void SfxMedium::GetMedium_Impl()
             {
                 GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, aFileName ) );
                 if( !(nStorOpenMode & STREAM_WRITE ) )
-                    GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, TRUE ) );
+                    GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
                 if (xInteractionHandler.is())
                     GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny(xInteractionHandler) ) );
             }
@@ -2413,7 +2413,7 @@ void SfxMedium::Init_Impl()
     Reference< XOutputStream > rOutStream;
 
     // TODO/LATER: handle lifetime of storages
-    pImp->bDisposeStorage = FALSE;
+    pImp->bDisposeStorage = sal_False;
 
     SFX_ITEMSET_ARG( pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False);
     if ( pSalvageItem && !pSalvageItem->GetValue().Len() )
@@ -2469,7 +2469,7 @@ void SfxMedium::Init_Impl()
     if ( aLogicName.Len() )
     {
         // if the logic name is set it should be set in MediaDescriptor as well
-        SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+        SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
         if ( !pFileNameItem )
         {
             // let the ItemSet be created if necessary
@@ -2515,7 +2515,7 @@ SfxMedium::SfxMedium( const SfxMedium& rMedium, sal_Bool bTemporary )
 
 //------------------------------------------------------------------
 
-void SfxMedium::UseInteractionHandler( BOOL bUse )
+void SfxMedium::UseInteractionHandler( sal_Bool bUse )
 {
     pImp->bAllowDefaultIntHdl = bUse;
 }
@@ -2649,12 +2649,12 @@ void SfxMedium::Close()
             pImp->xLockBytes.Clear();
             if ( pSet )
                 pSet->ClearItem( SID_INPUTSTREAM );
-            aStorage->SetDeleteStream( TRUE );
+            aStorage->SetDeleteStream( sal_True );
         }
         else if ( pStream && pStream == pOutStream )
         {
             pOutStream = NULL;
-            aStorage->SetDeleteStream( TRUE );
+            aStorage->SetDeleteStream( sal_True );
         } */
 
         CloseStorage();
@@ -2682,12 +2682,12 @@ void SfxMedium::CloseAndRelease()
             pImp->xLockBytes.Clear();
             if ( pSet )
                 pSet->ClearItem( SID_INPUTSTREAM );
-            aStorage->SetDeleteStream( TRUE );
+            aStorage->SetDeleteStream( sal_True );
         }
         else if ( pStream && pStream == pOutStream )
         {
             pOutStream = NULL;
-            aStorage->SetDeleteStream( TRUE );
+            aStorage->SetDeleteStream( sal_True );
         } */
 
         CloseStorage();
@@ -2811,7 +2811,7 @@ void SfxMedium::SetIsRemote_Impl()
         case INET_PROT_IMAP:
 //        case INET_PROT_OUT:
         case INET_PROT_VIM:
-            bRemote = TRUE; break;
+            bRemote = sal_True; break;
         default:
             bRemote = ( GetName().CompareToAscii( "private:msgid", 13 ) == COMPARE_EQUAL );
             break;
@@ -2888,8 +2888,8 @@ sal_Bool SfxMedium::Exists( sal_Bool /*bForceSession*/ )
 
 void SfxMedium::ReOpen()
 {
-    BOOL bUseInteractionHandler = pImp->bUseInteractionHandler;
-    pImp->bUseInteractionHandler = FALSE;
+    sal_Bool bUseInteractionHandler = pImp->bUseInteractionHandler;
+    pImp->bUseInteractionHandler = sal_False;
     GetMedium_Impl();
     pImp->bUseInteractionHandler = bUseInteractionHandler;
 }
@@ -2899,8 +2899,8 @@ void SfxMedium::ReOpen()
 void SfxMedium::CompleteReOpen()
 {
     // do not use temporary file for reopen and in case of success throw the temporary file away
-    BOOL bUseInteractionHandler = pImp->bUseInteractionHandler;
-    pImp->bUseInteractionHandler = FALSE;
+    sal_Bool bUseInteractionHandler = pImp->bUseInteractionHandler;
+    pImp->bUseInteractionHandler = sal_False;
 
     ::utl::TempFile* pTmpFile = NULL;
     if ( pImp->pTempFile )
@@ -2978,7 +2978,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
             // if an URL is provided in SalvageItem that means that the FileName refers to a temporary file
             // that must be copied here
 
-            SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+            SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
             if (!pFileNameItem) throw uno::RuntimeException();
             ::rtl::OUString aNewTempFileURL = SfxMedium::CreateTempCopyWithExt( pFileNameItem->GetValue() );
             if ( aNewTempFileURL.getLength() )
@@ -2995,16 +2995,16 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
         }
     }
 
-    BOOL bReadOnly = FALSE;
-    SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+    sal_Bool bReadOnly = sal_False;
+    SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
     if ( pReadOnlyItem && pReadOnlyItem->GetValue() )
-        bReadOnly = TRUE;
+        bReadOnly = sal_True;
 
-    SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+    SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
     if (!pFileNameItem) throw uno::RuntimeException();
     aLogicName = pFileNameItem->GetValue();
     nStorOpenMode = bReadOnly ? SFX_STREAM_READONLY : SFX_STREAM_READWRITE;
-    bDirect = FALSE;
+    bDirect = sal_False;
     Init_Impl();
 }
 
@@ -3022,7 +3022,7 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const Str
 
     Init_Impl();
     pImp->xStorage = rStor;
-    pImp->bDisposeStorage = FALSE;
+    pImp->bDisposeStorage = sal_False;
 
     // always take BaseURL first, could be overwritten by ItemSet
     GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) );
@@ -3104,7 +3104,7 @@ sal_uInt32 SfxMedium::GetMIMEAndRedirect( String& /*rName*/ )
     if( eProt == INET_PROT_FTP && SvBinding::ShouldUseFtpProxy( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
     {
         Any aAny( UCB_Helper::GetProperty( GetContent(), WID_FLAG_IS_FOLDER ) );
-        sal_Bool bIsFolder = FALSE;
+        sal_Bool bIsFolder = sal_False;
         if ( ( aAny >>= bIsFolder ) && bIsFolder )
             return ERRCODE_NONE;
     }
@@ -3304,7 +3304,7 @@ sal_uInt16 SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision )
 
         sal_uInt16 nKey;
         for ( nKey=0; nKey<aLongs.Count(); nKey++ )
-            if ( aLongs[nKey] > ( ULONG ) nKey+1 )
+            if ( aLongs[nKey] > ( sal_uIntPtr ) nKey+1 )
                 break;
 
         String aRevName = DEFINE_CONST_UNICODE( "Version" );
@@ -3595,7 +3595,7 @@ void SfxMedium::SetCharset( ::rtl::OUString aChs )
 
 sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature )
 {
-    sal_Bool bChanges = FALSE;
+    sal_Bool bChanges = sal_False;
 
     // the medium should be closed to be able to sign, the caller is responsible to close it
     if ( !IsOpen() && !GetError() )
@@ -3658,7 +3658,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::
 
                             // the temporary file has been written, commit it to the original file
                             Commit();
-                            bChanges = TRUE;
+                            bChanges = sal_True;
                         }
                     }
                     else
@@ -3677,7 +3677,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::
 
                             // the temporary file has been written, commit it to the original file
                             Commit();
-                            bChanges = TRUE;
+                            bChanges = sal_True;
                         }
                     }
                 }
@@ -3722,12 +3722,12 @@ void SfxMedium::SetCachedSignatureState_Impl( sal_uInt16 nState )
     pImp->m_nSignatureState = nState;
 }
 
-BOOL SfxMedium::HasStorage_Impl() const
+sal_Bool SfxMedium::HasStorage_Impl() const
 {
     return pImp->xStorage.is();
 }
 
-BOOL SfxMedium::IsOpen() const
+sal_Bool SfxMedium::IsOpen() const
 {
     return pInStream || pOutStream || pImp->xStorage.is();
 }
@@ -3834,7 +3834,7 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction
                 // remove the readonly state
                 sal_Bool bWasReadonly = sal_False;
                 nStorOpenMode = SFX_STREAM_READWRITE;
-                SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+                SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
                 if ( pReadOnlyItem && pReadOnlyItem->GetValue() )
                     bWasReadonly = sal_True;
                 GetItemSet()->ClearItem( SID_DOC_READONLY );
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index 1219d30d7b27..516f6c549b4b 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -177,7 +177,7 @@ String SfxFilter::GetTypeFromStorage( const SotStorage& rStg )
     return pType ? String::CreateFromAscii(pType) : String();
 }
 
-String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, BOOL bTemplate,
+String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, sal_Bool bTemplate,
                                         String* pFilterName )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
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/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 360854dc3dbf..e03f18691a09 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -111,9 +111,9 @@ SfxMedium* DocumentInserter::CreateMedium()
         DBG_ASSERT( m_pURLList->Count() == 1, "DocumentInserter::CreateMedium(): invalid URL list count" );
         String sURL = *( m_pURLList->GetObject(0) );
         pMedium = new SfxMedium(
-                sURL, SFX_STREAM_READONLY, FALSE,
+                sURL, SFX_STREAM_READONLY, sal_False,
                 SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet );
-        pMedium->UseInteractionHandler( TRUE );
+        pMedium->UseInteractionHandler( sal_True );
         SfxFilterMatcher* pMatcher = NULL;
         if ( m_sDocFactory.Len() )
             pMatcher = new SfxFilterMatcher( m_sDocFactory );
@@ -121,7 +121,7 @@ SfxMedium* DocumentInserter::CreateMedium()
             pMatcher = new SfxFilterMatcher();
 
         const SfxFilter* pFilter = NULL;
-        sal_uInt32 nError = pMatcher->DetectFilter( *pMedium, &pFilter, FALSE );
+        sal_uInt32 nError = pMatcher->DetectFilter( *pMedium, &pFilter, sal_False );
         if ( nError == ERRCODE_NONE && pFilter )
             pMedium->SetFilter( pFilter );
         else
@@ -145,16 +145,16 @@ SfxMediumList* DocumentInserter::CreateMediumList()
         sal_Int32 nCount = m_pURLList->Count();
         for ( ; i < nCount; ++i )
         {
-            String sURL = *( m_pURLList->GetObject( static_cast< USHORT >(i) ) );
+            String sURL = *( m_pURLList->GetObject( static_cast< sal_uInt16 >(i) ) );
             SfxMedium* pMedium = new SfxMedium(
-                    sURL, SFX_STREAM_READONLY, FALSE,
+                    sURL, SFX_STREAM_READONLY, sal_False,
                     SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet );
 
-            pMedium->UseInteractionHandler( TRUE );
+            pMedium->UseInteractionHandler( sal_True );
 
             SfxFilterMatcher aMatcher( m_sDocFactory );
             const SfxFilter* pFilter = NULL;
-            sal_uInt32 nError = aMatcher.DetectFilter( *pMedium, &pFilter, FALSE );
+            sal_uInt32 nError = aMatcher.DetectFilter( *pMedium, &pFilter, sal_False );
             if ( nError == ERRCODE_NONE && pFilter )
                 pMedium->SetFilter( pFilter );
             else
@@ -180,7 +180,7 @@ void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, SvStringsDtor*& _rpURL
     {
         _rpURLList = new SvStringsDtor;
 
-        for ( USHORT i = 0; i < aPathSeq.getLength(); ++i )
+        for ( sal_uInt16 i = 0; i < aPathSeq.getLength(); ++i )
         {
             INetURLObject aPathObj( aPathSeq[i] );
             String* pURL = new String( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index e6726e97e96d..7a3c4a66f443 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -112,8 +112,8 @@ void SfxDocumentTemplateDlg::Init()
     if(!pTemplates->IsConstructed())
         pTemplates->Construct();
 
-    const USHORT nCount = pTemplates->GetRegionCount();
-    for(USHORT i = 0; i < nCount; ++i)
+    const sal_uInt16 nCount = pTemplates->GetRegionCount();
+    for(sal_uInt16 i = 0; i < nCount; ++i)
         aRegionLb.InsertEntry(pTemplates->GetFullRegionName(i));
     if(!nCount)
         aRegionLb.InsertEntry(String(SfxResId(STR_STANDARD)));
@@ -144,10 +144,10 @@ IMPL_LINK( SfxDocumentTemplateDlg, OrganizeHdl, Button *, pButton )
     if(RET_OK == nRet)
     {
         // View aktualisieren
-        aRegionLb.SetUpdateMode( FALSE );
+        aRegionLb.SetUpdateMode( sal_False );
         aRegionLb.Clear();
         Init();
-        aRegionLb.SetUpdateMode( TRUE );
+        aRegionLb.SetUpdateMode( sal_True );
         aRegionLb.Invalidate();
         aRegionLb.Update();
         aCancelBt.SetText(String(SfxResId(STR_CLOSE)));
@@ -177,14 +177,14 @@ IMPL_LINK( SfxDocumentTemplateDlg, OkHdl, Control *, pControl )
 
 IMPL_LINK( SfxDocumentTemplateDlg, RegionSelect, ListBox *, pBox )
 {
-    const USHORT nRegion = pBox->GetSelectEntryPos();
-    const USHORT nCount = pTemplates->GetCount(nRegion);
-    aTemplateLb.SetUpdateMode(FALSE);
+    const sal_uInt16 nRegion = pBox->GetSelectEntryPos();
+    const sal_uInt16 nCount = pTemplates->GetCount(nRegion);
+    aTemplateLb.SetUpdateMode(sal_False);
     aTemplateLb.Clear();
-    for(USHORT i = 0; i < nCount; ++i)
+    for(sal_uInt16 i = 0; i < nCount; ++i)
         aTemplateLb.InsertEntry(pTemplates->GetName(nRegion, i));
     aTemplateLb.SelectEntryPos(0);
-    aTemplateLb.SetUpdateMode(TRUE);
+    aTemplateLb.SetUpdateMode(sal_True);
     aTemplateLb.Invalidate();
     aTemplateLb.Update();
     return 0;
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index f962542aac10..5b9b03f4b673 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -197,7 +197,7 @@ public:
     void                SetTargetURL( const OUString& rURL ) { maTargetURL = rURL; }
     void                SetHierarchyURL( const OUString& rURL) { maOwnURL = rURL; }
 
-    DocTempl_EntryData_Impl*     GetEntry( ULONG nIndex ) const;
+    DocTempl_EntryData_Impl*     GetEntry( sal_uIntPtr nIndex ) const;
     DocTempl_EntryData_Impl*     GetEntry( const OUString& rName ) const;
     DocTempl_EntryData_Impl*     GetByTargetURL( const OUString& rName ) const;
 
@@ -205,14 +205,14 @@ public:
     const OUString&     GetTargetURL();
     const OUString&     GetHierarchyURL();
 
-    ULONG               GetCount() const;
+    sal_uIntPtr               GetCount() const;
 
     void                SetTitle( const OUString& rTitle ) { maTitle = rTitle; }
 
     void                AddEntry( const OUString& rTitle,
                                   const OUString& rTargetURL,
-                                  USHORT *pPos = NULL );
-    void                DeleteEntry( ULONG nIndex );
+                                  sal_uInt16 *pPos = NULL );
+    void                DeleteEntry( sal_uIntPtr nIndex );
 
     int                 Compare( const OUString& rTitle ) const
                             { return maTitle.compareTo( rTitle ); }
@@ -258,12 +258,12 @@ public:
 
     void                Rescan();
 
-    void                DeleteRegion( ULONG nIndex );
+    void                DeleteRegion( sal_uIntPtr nIndex );
 
-    ULONG               GetRegionCount() const
+    sal_uIntPtr               GetRegionCount() const
                             { return maRegions.Count(); }
     RegionData_Impl*    GetRegion( const OUString& rName ) const;
-    RegionData_Impl*    GetRegion( ULONG nIndex ) const;
+    RegionData_Impl*    GetRegion( sal_uIntPtr nIndex ) const;
     void                GetTemplates( Content& rTargetFolder,
                                       Content& rParentFolder,
                                       RegionData_Impl* pRegion );
@@ -272,7 +272,7 @@ public:
                                       sal_Bool& rFound ) const;
 
     sal_Bool            GetTitleFromURL( const OUString& rURL, OUString& aTitle );
-    sal_Bool            InsertRegion( RegionData_Impl *pData, ULONG nPos = LIST_APPEND );
+    sal_Bool            InsertRegion( RegionData_Impl *pData, sal_uIntPtr nPos = LIST_APPEND );
     OUString            GetRootURL() const { return maRootURL; }
 
     uno::Reference< XDocumentTemplates >     getDocTemplates() { return mxTemplates; }
@@ -321,7 +321,7 @@ static sal_Bool getTextProperty_Impl( Content& rContent,
 
 String SfxDocumentTemplates::GetFullRegionName
 (
-    USHORT nIdx                     // Index des Bereiches
+    sal_uInt16 nIdx                     // Index des Bereiches
 )   const
 
 /*  [Beschreibung]
@@ -358,7 +358,7 @@ String SfxDocumentTemplates::GetFullRegionName
 
 const String& SfxDocumentTemplates::GetRegionName
 (
-    USHORT nIdx                 // Index des Bereiches
+    sal_uInt16 nIdx                 // Index des Bereiches
 )   const
 
 /*  [Beschreibung]
@@ -394,7 +394,7 @@ const String& SfxDocumentTemplates::GetRegionName
 
 //------------------------------------------------------------------------
 
-USHORT SfxDocumentTemplates::GetRegionNo
+sal_uInt16 SfxDocumentTemplates::GetRegionNo
 (
     const String &rRegion       // Name der Region
 )   const
@@ -406,7 +406,7 @@ USHORT SfxDocumentTemplates::GetRegionNo
 
     [R"uckgabewert]
 
-    USHORT          Index von 'rRegion' oder USHRT_MAX falls unbekannt
+    sal_uInt16          Index von 'rRegion' oder USHRT_MAX falls unbekannt
 
 */
 {
@@ -416,10 +416,10 @@ USHORT SfxDocumentTemplates::GetRegionNo
         return USHRT_MAX;
 
     sal_Bool    bFound;
-    ULONG       nIndex = pImp->GetRegionPos( rRegion, bFound );
+    sal_uIntPtr       nIndex = pImp->GetRegionPos( rRegion, bFound );
 
     if ( bFound )
-        return (USHORT) nIndex;
+        return (sal_uInt16) nIndex;
     else
         return USHRT_MAX;
 }
@@ -427,7 +427,7 @@ USHORT SfxDocumentTemplates::GetRegionNo
 
 //------------------------------------------------------------------------
 
-USHORT SfxDocumentTemplates::GetRegionCount() const
+sal_uInt16 SfxDocumentTemplates::GetRegionCount() const
 
 /*  [Beschreibung]
 
@@ -436,7 +436,7 @@ USHORT SfxDocumentTemplates::GetRegionCount() const
 
     [R"uckgabewert]
 
-    USHORT                  Anzahl der Bereiche
+    sal_uInt16                  Anzahl der Bereiche
 
 */
 {
@@ -445,14 +445,14 @@ USHORT SfxDocumentTemplates::GetRegionCount() const
     if ( !pImp->Construct() )
         return 0;
 
-    ULONG nCount = pImp->GetRegionCount();
+    sal_uIntPtr nCount = pImp->GetRegionCount();
 
-    return (USHORT) nCount;
+    return (sal_uInt16) nCount;
 }
 
 //------------------------------------------------------------------------
 
-sal_Bool SfxDocumentTemplates::IsRegionLoaded( USHORT nIdx ) const
+sal_Bool SfxDocumentTemplates::IsRegionLoaded( sal_uInt16 nIdx ) const
 {
     DocTemplLocker_Impl aLocker( *pImp );
 
@@ -469,7 +469,7 @@ sal_Bool SfxDocumentTemplates::IsRegionLoaded( USHORT nIdx ) const
 
 //------------------------------------------------------------------------
 
-USHORT SfxDocumentTemplates::GetCount
+sal_uInt16 SfxDocumentTemplates::GetCount
 (
     const String&   rName   /*  Name des Bereiches, dessen Eintrags-
                                 anzahl ermittelt werden soll */
@@ -494,19 +494,19 @@ USHORT SfxDocumentTemplates::GetCount
         return 0;
 
     RegionData_Impl *pData = pImp->GetRegion( rName );
-    ULONG            nCount = 0;
+    sal_uIntPtr            nCount = 0;
 
     if ( pData )
         nCount = pData->GetCount();
 
-    return (USHORT) nCount;
+    return (sal_uInt16) nCount;
 }
 
 //------------------------------------------------------------------------
 
-USHORT SfxDocumentTemplates::GetCount
+sal_uInt16 SfxDocumentTemplates::GetCount
 (
-    USHORT nRegion              /*  Index des Bereiches, dessen Eintrags-
+    sal_uInt16 nRegion              /*  Index des Bereiches, dessen Eintrags-
                                     anzahl ermittelt werden soll */
 
 )   const
@@ -527,20 +527,20 @@ USHORT SfxDocumentTemplates::GetCount
         return 0;
 
     RegionData_Impl *pData = pImp->GetRegion( nRegion );
-    ULONG            nCount = 0;
+    sal_uIntPtr            nCount = 0;
 
     if ( pData )
         nCount = pData->GetCount();
 
-    return (USHORT) nCount;
+    return (sal_uInt16) nCount;
 }
 
 //------------------------------------------------------------------------
 
 const String& SfxDocumentTemplates::GetName
 (
-    USHORT nRegion,     //  Index des Bereiches, in dem der Eintrag liegt
-    USHORT nIdx         //  Index des Eintrags
+    sal_uInt16 nRegion,     //  Index des Bereiches, in dem der Eintrag liegt
+    sal_uInt16 nIdx         //  Index des Eintrags
 )   const
 
 /*  [Beschreibung]
@@ -582,8 +582,8 @@ const String& SfxDocumentTemplates::GetName
 
 String SfxDocumentTemplates::GetFileName
 (
-    USHORT nRegion,     //  Index des Bereiches, in dem der Eintrag liegt
-    USHORT nIdx         //  Index des Eintrags
+    sal_uInt16 nRegion,     //  Index des Bereiches, in dem der Eintrag liegt
+    sal_uInt16 nIdx         //  Index des Eintrags
 )   const
 
 /*  [Beschreibung]
@@ -619,8 +619,8 @@ String SfxDocumentTemplates::GetFileName
 
 String SfxDocumentTemplates::GetPath
 (
-    USHORT  nRegion,    //  Index des Bereiches, in dem der Eintrag liegt
-    USHORT  nIdx        //  Index des Eintrags
+    sal_uInt16  nRegion,    //  Index des Bereiches, in dem der Eintrag liegt
+    sal_uInt16  nIdx        //  Index des Eintrags
 )   const
 
 /*  [Beschreibung]
@@ -656,7 +656,7 @@ String SfxDocumentTemplates::GetPath
 
 String SfxDocumentTemplates::GetTemplatePath
 (
-    USHORT          nRegion,    //  Index des Bereiches, in dem der Eintrag liegt
+    sal_uInt16          nRegion,    //  Index des Bereiches, in dem der Eintrag liegt
     const String&   rLongName   //  logischer Name des Eintrags
 )   const
 
@@ -845,7 +845,7 @@ sal_Bool SfxDocumentTemplates::SaveDir
 
 void SfxDocumentTemplates::NewTemplate
 (
-    USHORT          nRegion,    /*  Index des Bereiches, in dem die Vorlage
+    sal_uInt16          nRegion,    /*  Index des Bereiches, in dem die Vorlage
                                     angelegt werden soll */
 
     const String&   rLongName,  //  logischer Name der neuen Vorlage
@@ -889,10 +889,10 @@ void SfxDocumentTemplates::NewTemplate
 
 sal_Bool SfxDocumentTemplates::CopyOrMove
 (
-    USHORT  nTargetRegion,      //  Index des Zielbereiches
-    USHORT  nTargetIdx,         //  Index Zielposition
-    USHORT  nSourceRegion,      //  Index des Quellbereiches
-    USHORT  nSourceIdx,         /*  Index der zu kopierenden / zu verschiebenden
+    sal_uInt16  nTargetRegion,      //  Index des Zielbereiches
+    sal_uInt16  nTargetIdx,         //  Index Zielposition
+    sal_uInt16  nSourceRegion,      //  Index des Quellbereiches
+    sal_uInt16  nSourceIdx,         /*  Index der zu kopierenden / zu verschiebenden
                                     Dokumentvorlage */
     sal_Bool    bMove               //  kopieren / verschieben
 )
@@ -910,8 +910,8 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
                                     Aktion konnte nicht ausgef2uhrt werden
     [Querverweise]
 
-    <SfxDocumentTemplates::Move(USHORT,USHORT,USHORT,USHORT)>
-    <SfxDocumentTemplates::Copy(USHORT,USHORT,USHORT,USHORT)>
+    <SfxDocumentTemplates::Move(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16)>
+    <SfxDocumentTemplates::Copy(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16)>
 */
 
 {
@@ -1014,10 +1014,10 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
 
 sal_Bool SfxDocumentTemplates::Move
 (
-    USHORT nTargetRegion,       //  Index des Zielbereiches
-    USHORT nTargetIdx,          //  Index Zielposition
-    USHORT nSourceRegion,       //  Index des Quellbereiches
-    USHORT nSourceIdx           /*  Index der zu kopierenden / zu verschiebenden
+    sal_uInt16 nTargetRegion,       //  Index des Zielbereiches
+    sal_uInt16 nTargetIdx,          //  Index Zielposition
+    sal_uInt16 nSourceRegion,       //  Index des Quellbereiches
+    sal_uInt16 nSourceIdx           /*  Index der zu kopierenden / zu verschiebenden
                                     Dokumentvorlage */
 )
 
@@ -1036,7 +1036,7 @@ sal_Bool SfxDocumentTemplates::Move
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyOrMove(USHORT,USHORT,USHORT,USHORT,sal_Bool)>
+    <SfxDocumentTemplates::CopyOrMove(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16,sal_Bool)>
 */
 {
     DocTemplLocker_Impl aLocker( *pImp );
@@ -1049,10 +1049,10 @@ sal_Bool SfxDocumentTemplates::Move
 
 sal_Bool SfxDocumentTemplates::Copy
 (
-    USHORT nTargetRegion,       //  Index des Zielbereiches
-    USHORT nTargetIdx,          //  Index Zielposition
-    USHORT nSourceRegion,       //  Index des Quellbereiches
-    USHORT nSourceIdx           /*  Index der zu kopierenden / zu verschiebenden
+    sal_uInt16 nTargetRegion,       //  Index des Zielbereiches
+    sal_uInt16 nTargetIdx,          //  Index Zielposition
+    sal_uInt16 nSourceRegion,       //  Index des Quellbereiches
+    sal_uInt16 nSourceIdx           /*  Index der zu kopierenden / zu verschiebenden
                                     Dokumentvorlage */
 )
 
@@ -1071,7 +1071,7 @@ sal_Bool SfxDocumentTemplates::Copy
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyOrMove(USHORT,USHORT,USHORT,USHORT,sal_Bool)>
+    <SfxDocumentTemplates::CopyOrMove(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16,sal_Bool)>
 */
 
 {
@@ -1085,9 +1085,9 @@ sal_Bool SfxDocumentTemplates::Copy
 
 sal_Bool SfxDocumentTemplates::CopyTo
 (
-    USHORT          nRegion,    /*  Bereich der Vorlage, die exportiert werden
+    sal_uInt16          nRegion,    /*  Bereich der Vorlage, die exportiert werden
                                     soll  */
-    USHORT          nIdx,       /*  Index der Vorlage, die exportiert werden
+    sal_uInt16          nIdx,       /*  Index der Vorlage, die exportiert werden
                                     soll */
     const String&   rName       /*  Dateiname, unter dem die Vorlage angelegt
                                     werden soll */
@@ -1109,7 +1109,7 @@ sal_Bool SfxDocumentTemplates::CopyTo
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyFrom(USHORT,USHORT,String&)>
+    <SfxDocumentTemplates::CopyFrom(sal_uInt16,sal_uInt16,String&)>
 */
 
 {
@@ -1164,9 +1164,9 @@ sal_Bool SfxDocumentTemplates::CopyTo
 
 sal_Bool SfxDocumentTemplates::CopyFrom
 (
-    USHORT      nRegion,        /*  Bereich, in den die Vorlage importiert
+    sal_uInt16      nRegion,        /*  Bereich, in den die Vorlage importiert
                                     werden soll */
-    USHORT      nIdx,           //  Index der neuen Vorlage in diesem Bereich
+    sal_uInt16      nIdx,           //  Index der neuen Vorlage in diesem Bereich
     String&     rName           /*  Dateiname der Vorlage, die importiert
                                     werden soll, als out-Parameter der (auto-
                                     matisch aus dem Dateinamen generierte)
@@ -1188,7 +1188,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyTo(USHORT,USHORT,const String&)>
+    <SfxDocumentTemplates::CopyTo(sal_uInt16,sal_uInt16,const String&)>
 */
 
 {
@@ -1313,8 +1313,8 @@ sal_Bool SfxDocumentTemplates::CopyFrom
 
 sal_Bool SfxDocumentTemplates::Delete
 (
-    USHORT nRegion,             //  Index des Bereiches
-    USHORT nIdx                 /*  Index des Eintrags oder USHRT_MAX,
+    sal_uInt16 nRegion,             //  Index des Bereiches
+    sal_uInt16 nIdx                 /*  Index des Eintrags oder USHRT_MAX,
                                     wenn ein Verzeichnis gemeint ist. */
 )
 
@@ -1334,7 +1334,7 @@ sal_Bool SfxDocumentTemplates::Delete
 
     [Querverweise]
 
-    <SfxDocumentTemplates::InsertDir(const String&,USHORT)>
+    <SfxDocumentTemplates::InsertDir(const String&,sal_uInt16)>
     <SfxDocumentTemplates::KillDir(SfxTemplateDir&)>
     <SfxDocumentTemplates::SaveDir(SfxTemplateDir&)>
 */
@@ -1384,7 +1384,7 @@ sal_Bool SfxDocumentTemplates::Delete
 sal_Bool SfxDocumentTemplates::InsertDir
 (
     const String&   rText,      //  der logische Name des neuen Bereiches
-    USHORT          nRegion     //  Index des Bereiches
+    sal_uInt16          nRegion     //  Index des Bereiches
 )
 
 /*  [Beschreibung]
@@ -1438,8 +1438,8 @@ sal_Bool SfxDocumentTemplates::InsertDir
 sal_Bool SfxDocumentTemplates::SetName
 (
     const String&   rName,      //  Der zu setzende Name
-    USHORT          nRegion,    //  Index des Bereiches
-    USHORT          nIdx        /*  Index des Eintrags oder USHRT_MAX,
+    sal_uInt16          nRegion,    //  Index des Bereiches
+    sal_uInt16          nIdx        /*  Index des Eintrags oder USHRT_MAX,
                                     wenn ein Verzeichnis gemeint ist. */
 )
 
@@ -1550,8 +1550,8 @@ sal_Bool SfxDocumentTemplates::Rescan()
 
 SfxObjectShellRef SfxDocumentTemplates::CreateObjectShell
 (
-    USHORT nRegion,         //  Index des Bereiches
-    USHORT nIdx             //  Index des Eintrags
+    sal_uInt16 nRegion,         //  Index des Bereiches
+    sal_uInt16 nIdx             //  Index des Eintrags
 )
 
 /*  [Beschreibung]
@@ -1567,7 +1567,7 @@ SfxObjectShellRef SfxDocumentTemplates::CreateObjectShell
     [Querverweise]
 
     <SfxTemplateDirEntry::CreateObjectShell()>
-    <SfxDocumentTemplates::DeleteObjectShell(USHORT, USHORT)>
+    <SfxDocumentTemplates::DeleteObjectShell(sal_uInt16, sal_uInt16)>
 */
 
 {
@@ -1592,8 +1592,8 @@ SfxObjectShellRef SfxDocumentTemplates::CreateObjectShell
 
 sal_Bool SfxDocumentTemplates::DeleteObjectShell
 (
-    USHORT nRegion,         //  Index des Bereiches
-    USHORT nIdx             //  Index des Eintrags
+    sal_uInt16 nRegion,         //  Index des Bereiches
+    sal_uInt16 nIdx             //  Index des Eintrags
 )
 
 /*  [Beschreibung]
@@ -1612,7 +1612,7 @@ sal_Bool SfxDocumentTemplates::DeleteObjectShell
     [Querverweise]
 
     <SfxTemplateDirEntry::DeleteObjectShell()>
-    <SfxDocumentTemplates::CreateObjectShell(USHORT, USHORT)>
+    <SfxDocumentTemplates::CreateObjectShell(sal_uInt16, sal_uInt16)>
 */
 
 {
@@ -1673,9 +1673,9 @@ sal_Bool SfxDocumentTemplates::GetFull
         return sal_False;
 
     DocTempl_EntryData_Impl* pEntry = NULL;
-    const USHORT nCount = GetRegionCount();
+    const sal_uInt16 nCount = GetRegionCount();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         RegionData_Impl *pRegion = pImp->GetRegion( i );
 
@@ -1739,16 +1739,16 @@ sal_Bool SfxDocumentTemplates::GetLogicNames
     DocTempl_EntryData_Impl  *pEntry = NULL;
     sal_Bool         bFound = sal_False;
 
-    ULONG nCount = GetRegionCount();
+    sal_uIntPtr nCount = GetRegionCount();
 
-    for ( ULONG i=0; !bFound && (i<nCount); i++ )
+    for ( sal_uIntPtr i=0; !bFound && (i<nCount); i++ )
     {
         pData = pImp->GetRegion( i );
         if ( pData )
         {
-            ULONG nChildCount = pData->GetCount();
+            sal_uIntPtr nChildCount = pData->GetCount();
 
-            for ( ULONG j=0; !bFound && (j<nChildCount); j++ )
+            for ( sal_uIntPtr j=0; !bFound && (j<nChildCount); j++ )
             {
                 pEntry = pData->GetEntry( j );
                 if ( pEntry->GetTargetURL() == aPath )
@@ -1913,7 +1913,7 @@ SfxObjectShellRef DocTempl_EntryData_Impl::CreateObjectShell()
             SfxMedium *pMed=new SfxMedium(
                 aTargetURL,(STREAM_STD_READWRITE | STREAM_SHARE_DENYALL),  sal_False, 0 );
             const SfxFilter* pFilter = NULL;
-            pMed->UseInteractionHandler(TRUE);
+            pMed->UseInteractionHandler(sal_True);
             if( pSfxApp->GetFilterMatcher().GuessFilter(
                 *pMed, &pFilter, SFX_FILTER_TEMPLATE, 0 ) ||
                 (pFilter && !pFilter->IsOwnFormat()) ||
@@ -1923,7 +1923,7 @@ SfxObjectShellRef DocTempl_EntryData_Impl::CreateObjectShell()
                                      aTargetURL );
                 delete pMed;
                 mbDidConvert=sal_True;
-                ULONG lErr;
+                sal_uIntPtr lErr;
                 if ( mxObjShell.Is() ) {
                     lErr = pSfxApp->LoadTemplate( mxObjShell,aTargetURL);
                     if( lErr != ERRCODE_NONE )
@@ -1954,7 +1954,7 @@ SfxObjectShellRef DocTempl_EntryData_Impl::CreateObjectShell()
 }
 
 //------------------------------------------------------------------------
-BOOL DocTempl_EntryData_Impl::DeleteObjectShell()
+sal_Bool DocTempl_EntryData_Impl::DeleteObjectShell()
 {
     sal_Bool bRet = sal_True;
 
@@ -2072,8 +2072,8 @@ long RegionData_Impl::GetEntryPos( const OUString& rTitle,
                                    sal_Bool& rFound ) const
 {
 #if 1   // Don't use binary search today
-    ULONG i;
-    ULONG nCount = maEntries.Count();
+    sal_uIntPtr i;
+    sal_uIntPtr nCount = maEntries.Count();
 
     for ( i=0; i<nCount; i++ )
     {
@@ -2132,7 +2132,7 @@ long RegionData_Impl::GetEntryPos( const OUString& rTitle,
 // -----------------------------------------------------------------------
 void RegionData_Impl::AddEntry( const OUString& rTitle,
                                 const OUString& rTargetURL,
-                                USHORT *pPos )
+                                sal_uInt16 *pPos )
 {
     INetURLObject aLinkObj( GetHierarchyURL() );
     aLinkObj.insertName( rTitle, false,
@@ -2161,7 +2161,7 @@ void RegionData_Impl::AddEntry( const OUString& rTitle,
 }
 
 // -----------------------------------------------------------------------
-ULONG RegionData_Impl::GetCount() const
+sal_uIntPtr RegionData_Impl::GetCount() const
 {
     return maEntries.Count();
 }
@@ -2227,9 +2227,9 @@ DocTempl_EntryData_Impl* RegionData_Impl::GetByTargetURL( const OUString& rName
 {
     DocTempl_EntryData_Impl *pEntry;
 
-    ULONG nCount = maEntries.Count();
+    sal_uIntPtr nCount = maEntries.Count();
 
-    for ( ULONG i=0; i<nCount; i++ )
+    for ( sal_uIntPtr i=0; i<nCount; i++ )
     {
         pEntry = maEntries.GetObject( i );
         if ( pEntry && ( pEntry->GetTargetURL() == rName ) )
@@ -2240,20 +2240,20 @@ DocTempl_EntryData_Impl* RegionData_Impl::GetByTargetURL( const OUString& rName
 }
 
 // -----------------------------------------------------------------------
-DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( ULONG nIndex ) const
+DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( sal_uIntPtr nIndex ) const
 {
     return maEntries.GetObject( nIndex );
 }
 
 // -----------------------------------------------------------------------
-void RegionData_Impl::DeleteEntry( ULONG nIndex )
+void RegionData_Impl::DeleteEntry( sal_uIntPtr nIndex )
 {
     DocTempl_EntryData_Impl *pEntry = maEntries.GetObject( nIndex );
 
     if ( pEntry )
     {
         delete pEntry;
-        maEntries.Remove( (ULONG) nIndex );
+        maEntries.Remove( (sal_uIntPtr) nIndex );
     }
 }
 
@@ -2299,7 +2299,7 @@ void SfxDocTemplate_Impl::DecrementLock()
 }
 
 // -----------------------------------------------------------------------
-RegionData_Impl* SfxDocTemplate_Impl::GetRegion( ULONG nIndex ) const
+RegionData_Impl* SfxDocTemplate_Impl::GetRegion( sal_uIntPtr nIndex ) const
 {
     return maRegions.GetObject( nIndex );
 }
@@ -2308,10 +2308,10 @@ RegionData_Impl* SfxDocTemplate_Impl::GetRegion( ULONG nIndex ) const
 RegionData_Impl* SfxDocTemplate_Impl::GetRegion( const OUString& rName )
     const
 {
-    ULONG nCount = maRegions.Count();
+    sal_uIntPtr nCount = maRegions.Count();
     RegionData_Impl *pData;
 
-    for ( ULONG i=0; i<nCount; i++ )
+    for ( sal_uIntPtr i=0; i<nCount; i++ )
     {
         pData = maRegions.GetObject( i );
 
@@ -2323,14 +2323,14 @@ RegionData_Impl* SfxDocTemplate_Impl::GetRegion( const OUString& rName )
 }
 
 // -----------------------------------------------------------------------
-void SfxDocTemplate_Impl::DeleteRegion( ULONG nIndex )
+void SfxDocTemplate_Impl::DeleteRegion( sal_uIntPtr nIndex )
 {
     RegionData_Impl* pRegion = maRegions.GetObject( nIndex );
 
     if ( pRegion )
     {
         delete pRegion;
-        maRegions.Remove( (ULONG) nIndex );
+        maRegions.Remove( (sal_uIntPtr) nIndex );
     }
 }
 
@@ -2587,7 +2587,7 @@ long SfxDocTemplate_Impl::GetRegionPos( const OUString& rTitle,
 
 // -----------------------------------------------------------------------
 sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew,
-                                            ULONG nPos )
+                                            sal_uIntPtr nPos )
 {
     ::osl::MutexGuard   aGuard( maMutex );
     RegionData_Impl    *pData = maRegions.First();
@@ -2601,7 +2601,7 @@ sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew,
         // first
 
         if ( pNew->GetTitle() == maStandardGroup )
-            maRegions.Insert( pNew, (ULONG) 0 );
+            maRegions.Insert( pNew, (sal_uIntPtr) 0 );
         else
             maRegions.Insert( pNew, nPos );
     }
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index a84f4a718dc3..dd6218034bc7 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -129,7 +129,7 @@ using namespace ::comphelper;
 class WaitWindow_Impl : public WorkWindow
 {
     Rectangle   _aRect;
-    USHORT      _nTextStyle;
+    sal_uInt16      _nTextStyle;
     String      _aText;
 
     public:
@@ -387,8 +387,8 @@ public:
                                   const OUString& rTargetURL,
                                   const OUString& rType,
                                   const OUString& rHierURL );
-    ULONG               count() { return maEntries.Count(); }
-    DocTemplates_EntryData_Impl*     getEntry( ULONG nPos ) { return maEntries.GetObject( nPos ); }
+    sal_uIntPtr               count() { return maEntries.Count(); }
+    DocTemplates_EntryData_Impl*     getEntry( sal_uIntPtr nPos ) { return maEntries.GetObject( nPos ); }
 };
 
 DECLARE_LIST( GroupList_Impl, GroupData_Impl* )
@@ -550,9 +550,9 @@ void SfxDocTplService_Impl::readFolderList()
 
     NamePair_Impl*  pPair;
 
-    USHORT nCount = (USHORT)( Min( aShortNames.Count(), aLongNames.Count() ) );
+    sal_uInt16 nCount = (sal_uInt16)( Min( aShortNames.Count(), aLongNames.Count() ) );
 
-    for ( USHORT i=0; i<nCount; i++ )
+    for ( sal_uInt16 i=0; i<nCount; i++ )
     {
         pPair = new NamePair_Impl;
         pPair->maShortName  = aShortNames.GetString( i );
@@ -595,11 +595,11 @@ void SfxDocTplService_Impl::getDirList()
     // TODO/LATER: let use service, register listener
     INetURLObject   aURL;
     String          aDirs = SvtPathOptions().GetTemplatePath();
-    USHORT          nCount = aDirs.GetTokenCount( C_DELIM );
+    sal_uInt16          nCount = aDirs.GetTokenCount( C_DELIM );
 
     maTemplateDirs = Sequence< OUString >( nCount );
 
-    for ( USHORT i=0; i<nCount; i++ )
+    for ( sal_uInt16 i=0; i<nCount; i++ )
     {
         aURL.SetSmartProtocol( INET_PROT_FILE );
         aURL.SetURL( aDirs.GetToken( i, C_DELIM ) );
@@ -1249,8 +1249,8 @@ void SfxDocTplService_Impl::doUpdate()
                                  OUString( RTL_CONSTASCII_USTRINGPARAM( TARGET_DIR_URL ) ),
                                  makeAny( pGroup->getTargetURL() ) );
 
-                ULONG nCount = pGroup->count();
-                for ( ULONG i=0; i<nCount; i++ )
+                sal_uIntPtr nCount = pGroup->count();
+                for ( sal_uIntPtr i=0; i<nCount; i++ )
                 {
                     DocTemplates_EntryData_Impl *pData = pGroup->getEntry( i );
                     if ( ! pData->getInUse() )
@@ -2463,7 +2463,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
         {
             while ( xResultSet->next() )
             {
-                BOOL             bUpdateType = sal_False;
+                sal_Bool             bUpdateType = sal_False;
                 DocTemplates_EntryData_Impl  *pData;
 
                 OUString aTitle( xRow->getString( 1 ) );
@@ -2728,8 +2728,8 @@ void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup )
         setProperty( aGroup, aAdditionalProp, makeAny( pGroup->getTargetURL() ) );
         pGroup->setHierarchyURL( aNewGroupURL );
 
-        ULONG nCount = pGroup->count();
-        for ( ULONG i=0; i<nCount; i++ )
+        sal_uIntPtr nCount = pGroup->count();
+        for ( sal_uIntPtr i=0; i<nCount; i++ )
         {
             DocTemplates_EntryData_Impl *pData = pGroup->getEntry( i );
             addToHierarchy( pGroup, pData ); // add entry to hierarchy
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index c017a5779cdd..9b67da63ab74 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -81,7 +81,7 @@
 #include <svl/svstdarr.hxx>
 
 static const char cDelim = ':';
-BOOL SfxOrganizeListBox_Impl::bDropMoveOk = TRUE;
+sal_Bool SfxOrganizeListBox_Impl::bDropMoveOk = sal_True;
 
 using namespace ::com::sun::star;
 
@@ -145,8 +145,8 @@ friend class SfxOrganizeListBox_Impl;
     bool                    bExecDropFinished;
 
     // save some variables for the asynchronous file dialog
-    USHORT                  m_nRegion;
-    USHORT                  m_nIndex;
+    sal_uInt16                  m_nRegion;
+    sal_uInt16                  m_nIndex;
     String                  m_sExtension4Save;
 
     SfxOrganizeListBox_Impl aLeftLb;
@@ -169,8 +169,8 @@ friend class SfxOrganizeListBox_Impl;
 
     SvStringsDtor*          GetAllFactoryURLs_Impl() const;
     sal_Bool                GetServiceName_Impl( String& rFactoryURL, String& rFileURL ) const;
-    long                    Dispatch_Impl( USHORT nId, Menu* _pMenu );
-    String                  GetPath_Impl( BOOL bOpen, const String& rFileName );
+    long                    Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu );
+    String                  GetPath_Impl( sal_Bool bOpen, const String& rFileName );
     ::com::sun::star::uno::Sequence< ::rtl::OUString >
                             GetPaths_Impl( const String& rFileName );
     void                    InitBitmaps( void );
@@ -188,7 +188,7 @@ friend class SfxOrganizeListBox_Impl;
     DECL_LINK( ExportHdl, sfx2::FileDialogHelper* );
     DECL_LINK( AddFilesHdl, sfx2::FileDialogHelper* );
 
-    BOOL        DontDelete_Impl( SvLBoxEntry* pEntry );
+    sal_Bool        DontDelete_Impl( SvLBoxEntry* pEntry );
     void        OkHdl( Button* );
 
 public:
@@ -307,8 +307,8 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent,
     aLeftLb.Show();
     aRightLb.Show();
 
-    aLeftLb.SelectAll( FALSE );
-    aRightLb.SelectAll( FALSE );
+    aLeftLb.SelectAll( sal_False );
+    aRightLb.SelectAll( sal_False );
     aRightLb.GrabFocus();
 }
 
@@ -341,8 +341,8 @@ void SfxOrganizeDlg_Impl::InitBitmaps( void )
 
 //=========================================================================
 
-BOOL QueryDelete_Impl(Window *pParent,      // Parent der QueryBox
-                             USHORT nId,            // Resource Id
+sal_Bool QueryDelete_Impl(Window *pParent,      // Parent der QueryBox
+                             sal_uInt16 nId,            // Resource Id
                              const String &rTemplateName)   // Name der zu l"oschenden Vorlage
 /*  [Beschreibung]
 
@@ -392,7 +392,7 @@ void ErrorDelete_Impl(Window *pParent, const String &rName, sal_Bool bFolder = s
 struct ImpPath_Impl
 {
     SvUShorts   aUS;
-    USHORT      nRef;
+    sal_uInt16      nRef;
 
     ImpPath_Impl();
     ImpPath_Impl( const ImpPath_Impl& rCopy );
@@ -408,13 +408,13 @@ ImpPath_Impl::ImpPath_Impl() : aUS(5), nRef(1)
 
 ImpPath_Impl::ImpPath_Impl( const ImpPath_Impl& rCopy ) :
 
-    aUS ( (BYTE)rCopy.aUS.Count() ),
+    aUS ( (sal_uInt8)rCopy.aUS.Count() ),
     nRef( 1 )
 
 {
-    const USHORT nCount = rCopy.aUS.Count();
+    const sal_uInt16 nCount = rCopy.aUS.Count();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
         aUS.Insert( rCopy.aUS[i], i );
 }
 
@@ -423,7 +423,7 @@ ImpPath_Impl::ImpPath_Impl( const ImpPath_Impl& rCopy ) :
 /*  [Beschreibung]
 
     Implementierungsklasse; Darstellung einer Position in der Outline-
-    Listbox als USHORT-Array; dieses beschreibt die Position jeweil
+    Listbox als sal_uInt16-Array; dieses beschreibt die Position jeweil
     als relative Postion zum "ubergeordneten Eintrag
 
 */
@@ -454,8 +454,8 @@ public:
         if(!--pData->nRef)
             delete pData;
     }
-    USHORT Count() const { return pData->aUS.Count(); }
-    USHORT operator[]( USHORT i ) const
+    sal_uInt16 Count() const { return pData->aUS.Count(); }
+    sal_uInt16 operator[]( sal_uInt16 i ) const
     {
         return i < Count()? pData->aUS[i]: INDEX_IGNORE;
     }
@@ -471,7 +471,7 @@ Path::Path(SvLBox *pBox, SvLBoxEntry *pEntry) :
         return;
     SvLBoxEntry *pParent = pBox->GetParent(pEntry);
     do {
-        pData->aUS.Insert((USHORT)pBox->GetModel()->GetRelPos(pEntry), 0);
+        pData->aUS.Insert((sal_uInt16)pBox->GetModel()->GetRelPos(pEntry), 0);
         if(0 == pParent)
             break;
         pEntry = pParent;
@@ -494,8 +494,8 @@ void Path::NewImp()
 
 SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
                                SvLBoxEntry *pEntry,
-                               USHORT &rRegion,
-                               USHORT &rOffset)
+                               sal_uInt16 &rRegion,
+                               sal_uInt16 &rOffset)
 /*  [Beschreibung]
 
     Bereich und Position innerhalb eines Bereiches f"ur eine
@@ -505,9 +505,9 @@ SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
 
     SvLBox *pBox            Listbox, an der das Ereignis auftrat
     SvLBoxEntry *pEntry     Eintrag, dessen Position ermittelt werden soll
-    USHORT &rRegion         der Bereich innerhalb der Bereiche der
+    sal_uInt16 &rRegion         der Bereich innerhalb der Bereiche der
                             Dokumentvorlagen (Out-Parameter)
-    USHORT &rOffset         die Position innerhalb des Bereiches
+    sal_uInt16 &rOffset         die Position innerhalb des Bereiches
                             Dokumentvorlagen (Out-Parameter)
 
     [Querverweise]
@@ -525,23 +525,23 @@ SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
     }
     if(0 == pBox->GetModel()->GetDepth(pEntry))
     {
-        rRegion = (USHORT)pBox->GetModel()->GetRelPos(pEntry);
+        rRegion = (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry);
         rOffset = USHRT_MAX;
         return pEntry;
     }
     SvLBoxEntry *pParent = pBox->GetParent(pEntry);
-    rRegion = (USHORT)pBox->GetModel()->GetRelPos(pParent);
-    rOffset = (USHORT)pBox->GetModel()->GetRelPos(pEntry);
+    rRegion = (sal_uInt16)pBox->GetModel()->GetRelPos(pParent);
+    rOffset = (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry);
     return pEntry;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, BOOL bSelect )
+sal_Bool SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
 {
     if(!bSelect)
         return SvTreeListBox::Select(pEntry,bSelect);
-    USHORT nLevel = GetDocLevel();
+    sal_uInt16 nLevel = GetDocLevel();
     if(GetModel()->GetDepth(pEntry)+nLevel<3)
         return SvTreeListBox::Select(pEntry,bSelect);
 
@@ -556,12 +556,12 @@ BOOL SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, BOOL bSelect )
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)
 /*  [Beschreibung]
 
     Verschieben oder Kopieren von Dokumentvorlagen
@@ -573,11 +573,11 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
     SvLBoxEntry* pTarget        Ziel-Eintrag, auf den verschoben werden soll
     SvLBoxEntry *&pNewParent    der Parent der an der Zielposition erzeugten
                                 Eintrags (Out-Parameter)
-    ULONG &rIdx                 Index des Zieleintrags
-    BOOL bCopy                  Flag f"ur Kopieren / Verschieben
+    sal_uIntPtr &rIdx                 Index des Zieleintrags
+    sal_Bool bCopy                  Flag f"ur Kopieren / Verschieben
 
 
-    [Returnwert]                BOOL: Erfolg oder Mi"serfolg
+    [Returnwert]                sal_Bool: Erfolg oder Mi"serfolg
 
     [Querverweise]
 
@@ -585,27 +585,27 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
+                                            sal_uIntPtr &rIdx)>
 */
 
 {
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
 
     if(pSource)
     {
-        USHORT nTargetRegion = 0, nTargetIndex = 0;
+        sal_uInt16 nTargetRegion = 0, nTargetIndex = 0;
         GetIndices_Impl(this, pTarget, nTargetRegion, nTargetIndex);
 
-        USHORT nSourceRegion = 0, nSourceIndex = 0;
+        sal_uInt16 nSourceRegion = 0, nSourceIndex = 0;
         GetIndices_Impl(pSourceBox, pSource, nSourceRegion, nSourceIndex);
 
         bOk =  bCopy ?
@@ -647,12 +647,12 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)
 /*  [Beschreibung]
 
     Verschieben oder Kopieren von Dokumentinhalten
@@ -664,11 +664,11 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
     SvLBoxEntry* pTarget        Ziel-Eintrag, auf den verschoben werden soll
     SvLBoxEntry *&pNewParent    der Parent der an der Zielposition erzeugten
                                 Eintrags (Out-Parameter)
-    ULONG &rIdx                 Index des Zieleintrags
-    BOOL bCopy                  Flag f"ur Kopieren / Verschieben
+    sal_uIntPtr &rIdx                 Index des Zieleintrags
+    sal_Bool bCopy                  Flag f"ur Kopieren / Verschieben
 
 
-    [Returnwert]                BOOL: Erfolg oder Mi"serfolg
+    [Returnwert]                sal_Bool: Erfolg oder Mi"serfolg
 
     [Querverweise]
 
@@ -676,22 +676,22 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
+                                            sal_uIntPtr &rIdx)>
 */
 
 {
     SfxErrorContext aEc( ERRCTX_SFX_MOVEORCOPYCONTENTS, this);
-    BOOL bOk = FALSE, bKeepExpansion = FALSE;
-    BOOL bRemovedFromSource = FALSE;
+    sal_Bool bOk = sal_False, bKeepExpansion = sal_False;
+    sal_Bool bRemovedFromSource = sal_False;
     Path aSource(pSourceBox, pSource);
     Path aTarget(this, pTarget);
 
@@ -700,9 +700,9 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
     SfxObjectShellRef aSourceDoc = ((SfxOrganizeListBox_Impl *)pSourceBox)->GetObjectShell(aSource);
     SfxObjectShellRef aTargetDoc = GetObjectShell(aTarget);
 
-    const USHORT nSLevel =
+    const sal_uInt16 nSLevel =
         ((SfxOrganizeListBox_Impl *)pSourceBox)->GetDocLevel();
-    const USHORT nTLevel = GetDocLevel();
+    const sal_uInt16 nTLevel = GetDocLevel();
 
     if(aSourceDoc.Is() && aTargetDoc.Is())
     {
@@ -713,8 +713,8 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
         if (aTargetDoc->GetStyleSheetPool())
             aTargetDoc->GetStyleSheetPool()->SetSearchMask(
                 SFX_STYLE_FAMILY_ALL, SFXSTYLEBIT_USERDEF | SFXSTYLEBIT_USED);
-        USHORT p[3];
-        USHORT nIdxDeleted = INDEX_IGNORE;
+        sal_uInt16 p[3];
+        sal_uInt16 nIdxDeleted = INDEX_IGNORE;
         p[0]=aTarget[nTLevel+1];
         p[1]=aTarget[nTLevel+2];
         if(p[1]!=INDEX_IGNORE)p[1]++;
@@ -741,12 +741,12 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                 RequestingChilds(pParentIter);
             SvLBoxEntry *pChildIter = 0;
 
-            USHORT i = 0;
+            sal_uInt16 i = 0;
             while(i < 2 && p[i+1] != INDEX_IGNORE)
             {
                 pChildIter = FirstChild(pParentIter);
                 // bis zum Index der aktuellen Ebene
-                for(USHORT j = 0; j < p[i]; ++j)
+                for(sal_uInt16 j = 0; j < p[i]; ++j)
                     pChildIter = NextSibling(pChildIter);
                 // gfs Fuellen bei Items onDemand
                 ++i;
@@ -762,7 +762,7 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                pNewParent->HasChildsOnDemand() &&
                !GetModel()->HasChilds(pNewParent))
             {
-                bOk = FALSE;
+                bOk = sal_False;
                 if(!bCopy)
                     pSourceBox->GetModel()->Remove(pSource);
             }
@@ -771,7 +771,7 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
             if(nIdxDeleted != INDEX_IGNORE)
             {
                 pChildIter = FirstChild(pParentIter);
-                for(USHORT j = 0; j < nIdxDeleted; ++j)
+                for(sal_uInt16 j = 0; j < nIdxDeleted; ++j)
                     pChildIter = NextSibling(pChildIter);
                 if( pChildIter && pChildIter != pSource )
                 {
@@ -779,7 +779,7 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                     GetModel()->Remove(pChildIter);
                 }
                 else
-                    bOk = FALSE;
+                    bOk = sal_False;
             }
             if(!bCopy && &aSourceDoc != &aTargetDoc)
             {
@@ -794,15 +794,15 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
     }
 //  rIdx++;
     return (((rIdx != INDEX_IGNORE)|| bRemovedFromSource) && bOk )
-        ? bKeepExpansion? (BOOL)2: TRUE: FALSE;
+        ? bKeepExpansion? (sal_Bool)2: sal_True: sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
+sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                         SvLBoxEntry* pSource,
                                         SvLBoxEntry *&pNewParent,
-                                        ULONG &rIdx)
+                                        sal_uIntPtr &rIdx)
 
 /*  [Beschreibung]
 
@@ -815,10 +815,10 @@ BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
     SvLBoxEntry *pSource        Quell-Eintrag, der verschoben werden soll
     SvLBoxEntry *&pNewParent    der Parent der an der Zielposition erzeugten
                                 Eintrags (Out-Parameter)
-    ULONG &rIdx                 Index des Zieleintrags
+    sal_uIntPtr &rIdx                 Index des Zieleintrags
 
 
-    [Returnwert]                BOOL: Erfolg oder Mi"serfolg
+    [Returnwert]                sal_Bool: Erfolg oder Mi"serfolg
 
     [Querverweise]
 
@@ -826,22 +826,22 @@ BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
     <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
+                                            sal_uIntPtr &rIdx)>
 */
 
 {
-    BOOL bOk =  FALSE;
+    sal_Bool bOk =  sal_False;
     SvLBox* pSourceBox = GetSourceView();
     if ( !pSourceBox )
         pSourceBox = pDlg->pSourceView;
@@ -851,19 +851,19 @@ BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
 
     if ( pSourceBox->GetModel()->GetDepth( pSource ) <= GetDocLevel() &&
                       GetModel()->GetDepth( pTarget ) <= GetDocLevel() )
-        bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, FALSE );
+        bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_False );
     else
-        bOk = MoveOrCopyContents(pSourceBox, pSource, pTarget, pNewParent, rIdx, FALSE );
+        bOk = MoveOrCopyContents(pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_False );
 
     return bOk;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
+sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                         SvLBoxEntry* pSource,
                                         SvLBoxEntry *&pNewParent,
-                                        ULONG &rIdx)
+                                        sal_uIntPtr &rIdx)
 /*  [Beschreibung]
 
     Benachrichtigung, da"s ein Eintrag kopiert werden soll
@@ -875,10 +875,10 @@ BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
     SvLBoxEntry *pSource        Quell-Eintrag, der kopiert werden soll
     SvLBoxEntry *&pNewParent    der Parent der an der Zielposition erzeugten
                                 Eintrags (Out-Parameter)
-    ULONG &rIdx                 Index des Zieleintrags
+    sal_uIntPtr &rIdx                 Index des Zieleintrags
 
 
-    [Returnwert]                BOOL: Erfolg oder Mi"serfolg
+    [Returnwert]                sal_Bool: Erfolg oder Mi"serfolg
 
     [Querverweise]
 
@@ -886,21 +886,21 @@ BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
     <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
+                                            sal_uIntPtr &rIdx)>
 */
 {
-    BOOL bOk =  FALSE;
+    sal_Bool bOk =  sal_False;
     SvLBox* pSourceBox = GetSourceView();
     if ( !pSourceBox )
         pSourceBox = pDlg->pSourceView;
@@ -909,16 +909,16 @@ BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
         pTarget = pDlg->pTargetEntry;
     if ( pSourceBox->GetModel()->GetDepth( pSource ) <= GetDocLevel() &&
                      GetModel()->GetDepth( pTarget ) <= GetDocLevel() )
-        bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, TRUE );
+        bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_True );
     else
-        bOk = MoveOrCopyContents( pSourceBox, pSource, pTarget, pNewParent, rIdx, TRUE );
+        bOk = MoveOrCopyContents( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_True );
 
     return bOk;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection&  )
+sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection&  )
 
 /*  [Beschreibung]
 
@@ -934,14 +934,14 @@ BOOL SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection&  )
         GetModel()->GetDepth(pEntry) < 2 )
     {
         pDlg->pSuspend = new SuspendAccel( &pDlg->aEditAcc );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rText)
+sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rText)
 
 /*  [Beschreibung]
 
@@ -951,8 +951,8 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
 
     [Returnwert]
 
-    BOOL                TRUE: der Name soll in der Anzeige ge"andert werden
-                        FALSE:der Name soll nicht ge"andert werden
+    sal_Bool                sal_True: der Name soll in der Anzeige ge"andert werden
+                            sal_False:der Name soll nicht ge"andert werden
 
     [Querverweise]
     <SfxOrganizeListBox_Impl::EditingEntry(SvLBoxEntry* pEntry, const String& rText)>
@@ -968,16 +968,16 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
         ErrorBox aBox( this, SfxResId( MSG_ERROR_EMPTY_NAME ) );
         aBox.GrabFocus();
         aBox.Execute();
-        return FALSE;
+        return sal_False;
     }
     if ( !IsUniqName_Impl( rText, pParent, pEntry ) )
     {
         ErrorBox aBox( this, SfxResId( MSG_ERROR_UNIQ_NAME ) );
         aBox.GrabFocus();
         aBox.Execute();
-        return FALSE;
+        return sal_False;
     }
-    USHORT nRegion = 0, nIndex = 0;
+    sal_uInt16 nRegion = 0, nIndex = 0;
     GetIndices_Impl( this, pEntry, nRegion, nIndex );
     String aOldName;
     if ( USHRT_MAX != nIndex )
@@ -990,7 +990,7 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
         SfxResId aResId( USHRT_MAX != nIndex ? MSG_ERROR_RENAME_TEMPLATE
                                              : MSG_ERROR_RENAME_TEMPLATE_REGION );
         ErrorBox( this, aResId ).Execute();
-        return FALSE;
+        return sal_False;
     }
 /*
     else
@@ -998,44 +998,44 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
         SfxTemplateOrganizeDlg* pDlg = (SfxTemplateOrganizeDlg*)Window::GetParent();
     }
 */
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
 DragDropMode SfxOrganizeListBox_Impl::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry )
 {
-    USHORT nSourceLevel = GetModel()->GetDepth( pEntry );
+    sal_uInt16 nSourceLevel = GetModel()->GetDepth( pEntry );
     if ( VIEW_FILES == GetViewType() )
         ++nSourceLevel;
     if ( nSourceLevel >= 2 )
-        bDropMoveOk = FALSE;
+        bDropMoveOk = sal_False;
     else
-        bDropMoveOk = TRUE;
+        bDropMoveOk = sal_True;
 
     return GetDragDropMode();
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvLBoxEntry* pEntry )
+sal_Bool SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvLBoxEntry* pEntry )
 {
     if(!pEntry)
-        return FALSE;
+        return sal_False;
     SvLBox *pSource = GetSourceView();
     SvLBoxEntry *pSourceEntry = pSource->FirstSelected();
     if(pEntry == pSourceEntry)
-        return FALSE;
-    USHORT nSourceLevel = pSource->GetModel()->GetDepth(pSourceEntry);
+        return sal_False;
+    sal_uInt16 nSourceLevel = pSource->GetModel()->GetDepth(pSourceEntry);
     if(VIEW_FILES == ((SfxOrganizeListBox_Impl *)pSource)->GetViewType())
         ++nSourceLevel;
-    USHORT nTargetLevel = GetModel()->GetDepth(pEntry);
+    sal_uInt16 nTargetLevel = GetModel()->GetDepth(pEntry);
     if(VIEW_FILES == GetViewType())
         ++nTargetLevel;
     Path aSource(pSource, pSourceEntry);
     Path aTarget(this, pEntry);
-    const USHORT SL = ((SfxOrganizeListBox_Impl *)pSource)->GetDocLevel();
-    const USHORT TL = GetDocLevel();
+    const sal_uInt16 SL = ((SfxOrganizeListBox_Impl *)pSource)->GetDocLevel();
+    const sal_uInt16 TL = GetDocLevel();
 
     return( (nSourceLevel == 1 && nTargetLevel == 0 &&
             VIEW_TEMPLATES ==
@@ -1074,7 +1074,7 @@ sal_Int8 SfxOrganizeListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
     TransferableDataHelper aHelper( rEvt.maDropEvent.Transferable );
     sal_uInt32 nFormatCount = aHelper.GetFormatCount();
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     for ( sal_uInt32 i = 0; i < nFormatCount; ++i )
     {
         String aFileName;
@@ -1086,7 +1086,7 @@ sal_Int8 SfxOrganizeListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
             bSuccess |= pMgr->InsertFile( this, aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
         }
     }
-    bDropMoveOk = TRUE;
+    bDropMoveOk = sal_True;
     sal_Int8 nRet = rEvt.mnAction;
     if ( !bSuccess )
     {
@@ -1119,7 +1119,7 @@ void SfxOrganizeListBox_Impl::DragFinished( sal_Int8 nDropAction )
 
 //-------------------------------------------------------------------------
 
-inline USHORT SfxOrganizeListBox_Impl::GetDocLevel() const
+inline sal_uInt16 SfxOrganizeListBox_Impl::GetDocLevel() const
 
 /*  [Beschreibung]
 
@@ -1128,7 +1128,7 @@ inline USHORT SfxOrganizeListBox_Impl::GetDocLevel() const
 
     [Returnwert]
 
-    USHORT              Die Ebene der Dokumente
+    sal_uInt16              Die Ebene der Dokumente
 
 */
 
@@ -1206,14 +1206,14 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
         SfxErrorContext aEc(ERRCTX_SFX_CREATEOBJSH, pDlg->pDialog);
         if(VIEW_TEMPLATES == GetViewType() && 0 == GetModel()->GetDepth(pEntry))
         {
-            USHORT i = (USHORT)GetModel()->GetRelPos(pEntry);
-            const USHORT nEntryCount = pMgr->GetTemplates()->GetCount(i);
-            for(USHORT j = 0; j < nEntryCount; ++j)
-                InsertEntryByBmpType( pMgr->GetTemplates()->GetName( i, j ), BMPTYPE_DOC, pEntry, TRUE );
+            sal_uInt16 i = (sal_uInt16)GetModel()->GetRelPos(pEntry);
+            const sal_uInt16 nEntryCount = pMgr->GetTemplates()->GetCount(i);
+            for(sal_uInt16 j = 0; j < nEntryCount; ++j)
+                InsertEntryByBmpType( pMgr->GetTemplates()->GetName( i, j ), BMPTYPE_DOC, pEntry, sal_True );
         }
         else
         {
-            const USHORT nDocLevel = GetDocLevel();
+            const sal_uInt16 nDocLevel = GetDocLevel();
             Path aPath(this, pEntry);
 
             // it is ok to use the SfxObjectShellRef here since the object that
@@ -1221,16 +1221,16 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
             SfxObjectShellRef aRef = GetObjectShell(aPath);
             if(aRef.Is())
             {
-                const USHORT nCount = aRef->GetContentCount(
+                const sal_uInt16 nCount = aRef->GetContentCount(
                     aPath[nDocLevel+1], aPath[nDocLevel+2]);
                 String aText;
                 Bitmap aClosedBmp, aOpenedBmp;
-                const BOOL bCanHaveChilds =
+                const sal_Bool bCanHaveChilds =
                     aRef->CanHaveChilds(aPath[nDocLevel+1],
                                         aPath[nDocLevel+2]);
-                for(USHORT i = 0; i < nCount; ++i)
+                for(sal_uInt16 i = 0; i < nCount; ++i)
                 {
-                    BOOL bDeletable;
+                    sal_Bool bDeletable;
                     aRef->GetContent(
                         aText, aClosedBmp, aOpenedBmp, eColorMode, bDeletable,
                         i, aPath[nDocLevel+1], aPath[nDocLevel+2]);
@@ -1267,7 +1267,7 @@ long SfxOrganizeListBox_Impl::ExpandingHdl()
     if ( !(nImpFlags & SVLBOX_IS_EXPANDING) )
     {
         SvLBoxEntry* pEntry  = GetHdlEntry();
-        const USHORT nLevel = GetModel()->GetDepth(pEntry);
+        const sal_uInt16 nLevel = GetModel()->GetDepth(pEntry);
         if((eViewType == VIEW_FILES && nLevel == 0) ||
            (eViewType == VIEW_TEMPLATES && nLevel == 1))
         {
@@ -1286,12 +1286,12 @@ long SfxOrganizeListBox_Impl::ExpandingHdl()
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText,
+sal_Bool SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText,
                                          SvLBoxEntry* pParent, SvLBoxEntry *pEntry) const
 
 /*  [Beschreibung]
@@ -1305,7 +1305,7 @@ BOOL SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText,
 
     [Returnwert]
 
-    BOOL                     TRUE, wenn der Name eindeutig ist, sonst FALSE
+    sal_Bool                     sal_True, wenn der Name eindeutig ist, sonst sal_False
 */
 
 {
@@ -1313,18 +1313,18 @@ BOOL SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText,
     while(pChild)  {
         const String aEntryText(GetEntryText(pChild));
         if(COMPARE_EQUAL == aEntryText.CompareIgnoreCaseToAscii(rText)&&(!pEntry || pEntry!=pChild))
-            return FALSE;
+            return sal_False;
         pChild = NextSibling(pChild);
     }
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) const
+sal_uInt16 SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) const
 {
     SvLBoxEntry* pChild = FirstChild(pParent);
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     while(pChild)  {
         pChild = NextSibling(pChild);
         ++nCount;
@@ -1335,7 +1335,7 @@ USHORT SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) const
 //-------------------------------------------------------------------------
 
 SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
-    SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData )
+    SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos, void* pUserData )
 {
     SvLBoxEntry*    pEntry = NULL;
     const Image*    pExp = NULL;
@@ -1444,30 +1444,30 @@ void SfxOrganizeListBox_Impl::Reset()
 {
     DBG_ASSERT( pMgr != 0, "kein Manager" );
     // Inhalte l"oschen
-    SetUpdateMode(FALSE);
+    SetUpdateMode(sal_False);
     Clear();
     if ( VIEW_TEMPLATES == eViewType )
     {
-        const USHORT nCount = pMgr->GetTemplates()->GetRegionCount();
-        for ( USHORT i = 0; i < nCount; ++i )
-            InsertEntryByBmpType( pMgr->GetTemplates()->GetFullRegionName(i), BMPTYPE_FOLDER, 0, TRUE );
+        const sal_uInt16 nCount = pMgr->GetTemplates()->GetRegionCount();
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
+            InsertEntryByBmpType( pMgr->GetTemplates()->GetFullRegionName(i), BMPTYPE_FOLDER, 0, sal_True );
     }
     else
     {
         const SfxObjectList& rList = pMgr->GetObjectList();
-        const USHORT nCount = rList.Count();
-        for ( USHORT i = 0; i < nCount; ++i )
-            InsertEntryByBmpType( rList.GetBaseName(i), BMPTYPE_DOC, 0, TRUE );
+        const sal_uInt16 nCount = rList.Count();
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
+            InsertEntryByBmpType( rList.GetBaseName(i), BMPTYPE_DOC, 0, sal_True );
 
     }
-    SetUpdateMode(TRUE);
+    SetUpdateMode(sal_True);
     Invalidate();
     Update();
 }
 
 //-------------------------------------------------------------------------
 
-const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
+const Image &SfxOrganizeListBox_Impl::GetClosedBmp(sal_uInt16 nLevel) const
 
 /*  [Beschreibung]
 
@@ -1476,7 +1476,7 @@ const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
 
     [Parameter]
 
-    USHORT nLevel       Angabe der Ebene, 2 Ebenen sind erlaubt
+    sal_uInt16 nLevel       Angabe der Ebene, 2 Ebenen sind erlaubt
 
     [Returnwert]
 
@@ -1485,7 +1485,7 @@ const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
 */
 
 {
-    BOOL            bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool            bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     const Image*    pRet = NULL;
 
     switch( nLevel )
@@ -1501,7 +1501,7 @@ const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
 
 //-------------------------------------------------------------------------
 
-const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(USHORT nLevel) const
+const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(sal_uInt16 nLevel) const
 
 /*  [Beschreibung]
 
@@ -1510,7 +1510,7 @@ const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(USHORT nLevel) const
 
     [Parameter]
 
-    USHORT nLevel       Angabe der Ebene, 2 Ebenen sind erlaubt
+    sal_uInt16 nLevel       Angabe der Ebene, 2 Ebenen sind erlaubt
 
     [Returnwert]
 
@@ -1519,7 +1519,7 @@ const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(USHORT nLevel) const
 */
 
 {
-    BOOL         bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool         bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     const Image* pRet = NULL;
 
     switch( nLevel )
@@ -1544,7 +1544,7 @@ PopupMenu* SfxOrganizeListBox_Impl::CreateContextMenu()
 
 //-------------------------------------------------------------------------
 
-String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName )
+String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool bOpen, const String& rFileName )
 
 /*  [Beschreibung]
 
@@ -1553,7 +1553,7 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName )
 
     [Parameter]
 
-    BOOL bOpen                      Flag: "Offnen / Speichern
+    sal_Bool bOpen                      Flag: "Offnen / Speichern
     const String& rFileName         aktueller Dateiname als Vorschlag
 
     [R"uckgabewert]                 Dateiname mit Pfad oder Leerstring, wenn
@@ -1734,9 +1734,9 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName )
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry )
+sal_Bool SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry )
 {
-    USHORT nDepth = pFocusBox->GetModel()->GetDepth(pEntry);
+    sal_uInt16 nDepth = pFocusBox->GetModel()->GetDepth(pEntry);
     if(SfxOrganizeListBox_Impl::VIEW_FILES ==
        pFocusBox->GetViewType())
         nDepth++;
@@ -1748,16 +1748,16 @@ BOOL SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry )
        (0 == nDepth && pFocusBox->GetLevelCount_Impl(0) < 2))
         //Mindestens eine Vorlage behalten
     {
-        return TRUE;
+        return sal_True;
     }
 
-    USHORT nRegion = 0, nIndex = 0;
+    sal_uInt16 nRegion = 0, nIndex = 0;
     GetIndices_Impl( pFocusBox, pEntry, nRegion, nIndex );
     const SfxDocumentTemplates* pTemplates = aMgr.GetTemplates();
     if ( !pTemplates || !pTemplates->HasUserContents( nRegion, nIndex ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 SvStringsDtor* SfxOrganizeDlg_Impl::GetAllFactoryURLs_Impl( ) const
@@ -1785,7 +1785,7 @@ sal_Bool SfxOrganizeDlg_Impl::GetServiceName_Impl( String& rName, String& rFileU
     sal_Bool bRet = sal_False;
     const SfxDocumentTemplates* pTemplates = aMgr.GetTemplates();
     SvLBoxEntry* pEntry = pFocusBox ? pFocusBox->FirstSelected() : NULL;
-    USHORT nRegion = 0, nIndex = 0;
+    sal_uInt16 nRegion = 0, nIndex = 0;
     GetIndices_Impl( pFocusBox, pEntry, nRegion, nIndex );
     rFileURL = pTemplates->GetPath( nRegion, nIndex );
     if ( rFileURL.Len() > 0 )
@@ -1795,13 +1795,13 @@ sal_Bool SfxOrganizeDlg_Impl::GetServiceName_Impl( String& rName, String& rFileU
             uno::Reference< embed::XStorage > xStorage = ::comphelper::OStorageHelper::GetStorageFromURL(
                                                     rFileURL,
                                                     embed::ElementModes::READ );
-            ULONG nFormat = SotStorage::GetFormatID( xStorage );
+            sal_uIntPtr nFormat = SotStorage::GetFormatID( xStorage );
             const SfxFilter* pFilter =
                 SFX_APP()->GetFilterMatcher().GetFilter4ClipBoardId( nFormat );
             if ( pFilter )
             {
                 rName = pFilter->GetServiceName();
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
         catch( uno::Exception& )
@@ -1811,7 +1811,7 @@ sal_Bool SfxOrganizeDlg_Impl::GetServiceName_Impl( String& rName, String& rFileU
     return bRet;
 }
 
-long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
+long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu )
 
 /*  [Beschreibung]
 
@@ -1819,7 +1819,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
 
     [Parameter]
 
-    USHORT nId                      ID des Events
+    sal_uInt16 nId                      ID des Events
 
     [R"uckgabewert]                 1: Event wurde verarbeitet,
                                     0: Event wurde nicht verarbeitet (SV-Menu)
@@ -1843,14 +1843,14 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
                     const String aNoName( SfxResId(STR_NONAME) );
                     SvLBoxEntry* pParent = pFocusBox->GetParent(pEntry);
                     String aName(aNoName);
-                    USHORT n = 1;
+                    sal_uInt16 n = 1;
                     while(!pFocusBox->IsUniqName_Impl(aName, pParent))
                     {
                         aName = aNoName;
                         aName += String::CreateFromInt32( n++ );
                     }
                     aMgr.InsertDir( pFocusBox, aName,
-                            (USHORT)pFocusBox->GetModel()->GetRelPos(pEntry)+1);
+                            (sal_uInt16)pFocusBox->GetModel()->GetRelPos(pEntry)+1);
                 }
             }
             break;
@@ -1860,13 +1860,13 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
         {
             if(!pEntry || DontDelete_Impl(pEntry))
                 return 1;
-            const USHORT nDepth = pFocusBox->GetModel()->GetDepth(pEntry);
+            const sal_uInt16 nDepth = pFocusBox->GetModel()->GetDepth(pEntry);
             if(nDepth < 2)
             {
                 if(0 == nDepth && pFocusBox->GetLevelCount_Impl(0) < 2) return 1;
                 if(SfxOrganizeListBox_Impl::VIEW_TEMPLATES == pFocusBox->GetViewType())
                 {
-                    USHORT nResId = nDepth? STR_DELETE_TEMPLATE :
+                    sal_uInt16 nResId = nDepth? STR_DELETE_TEMPLATE :
                                             STR_DELETE_REGION;
                     if( !QueryDelete_Impl(
                         pDialog, nResId, pFocusBox->GetEntryText(pEntry)))
@@ -1878,10 +1878,10 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
                         if(RET_NO == aQBox.Execute())
                             return 1;
                     }
-                    USHORT nRegion = 0, nIndex = 0;
+                    sal_uInt16 nRegion = 0, nIndex = 0;
                     GetIndices_Impl(pFocusBox, pEntry, nRegion, nIndex);
 
-                    USHORT nDeleteInd = ( STR_DELETE_REGION == nResId? USHRT_MAX: nIndex );
+                    sal_uInt16 nDeleteInd = ( STR_DELETE_REGION == nResId? USHRT_MAX: nIndex );
                     if ( !aMgr.Delete( pFocusBox, nRegion, nDeleteInd ) )
                         ErrorDelete_Impl(
                             pDialog,
@@ -1914,7 +1914,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
         {
             if(!pEntry)
                 return 1;
-            USHORT nRegion = 0, nIndex = 0;
+            sal_uInt16 nRegion = 0, nIndex = 0;
             GetIndices_Impl( pFocusBox, pEntry, nRegion, nIndex );
             const SfxStringItem aName( SID_FILE_NAME, aMgr.GetTemplates()->GetPath( nRegion, nIndex ) );
             const SfxStringItem aLongName( SID_FILE_LONGNAME, pFocusBox->GetEntryText( pEntry ) );
@@ -1946,7 +1946,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
             m_nRegion = 0;
             m_nIndex = 0;
             GetIndices_Impl( pFocusBox, pEntry, m_nRegion, m_nIndex );
-            GetPath_Impl( FALSE, aMgr.GetTemplates()->GetFileName( m_nRegion, m_nIndex ) );
+            GetPath_Impl( sal_False, aMgr.GetTemplates()->GetFileName( m_nRegion, m_nIndex ) );
             break;
         }
 
@@ -1970,7 +1970,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
             SfxObjectShellRef aRef = pFocusBox->GetObjectShell( aPath );
             if ( aRef.Is() )
             {
-                const USHORT nDocLevel = pFocusBox->GetDocLevel();
+                const sal_uInt16 nDocLevel = pFocusBox->GetDocLevel();
                 if ( !pPrt )
                     pPrt = new Printer;
                 SvLBoxEntry *pDocEntry = pEntry;
@@ -2071,7 +2071,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AccelSelect_Impl, Accelerator *, pAccel )
 void SfxOrganizeDlg_Impl::OkHdl(Button *pButton)
 {
     if(pFocusBox && pFocusBox->IsEditingActive())
-        pFocusBox->EndEditing(FALSE);
+        pFocusBox->EndEditing(sal_False);
     pButton->Click();
 }
 
@@ -2093,12 +2093,12 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
 */
 {
     if ( pFocusBox && pFocusBox->IsEditingActive() )
-        pFocusBox->EndEditing( FALSE );
-    BOOL bEnable = ( pFocusBox && pFocusBox->GetSelectionCount() );
+        pFocusBox->EndEditing( sal_False );
+    sal_Bool bEnable = ( pFocusBox && pFocusBox->GetSelectionCount() );
     SvLBoxEntry* pEntry = bEnable ? pFocusBox->FirstSelected() : NULL;
-    const USHORT nDepth =
+    const sal_uInt16 nDepth =
         ( bEnable && pFocusBox->GetSelectionCount() ) ? pFocusBox->GetModel()->GetDepth( pEntry ) : 0;
-    const USHORT nDocLevel = bEnable ? pFocusBox->GetDocLevel() : 0;
+    const sal_uInt16 nDocLevel = bEnable ? pFocusBox->GetDocLevel() : 0;
     int eVT = pFocusBox ? pFocusBox->GetViewType() : 0;
         // nur Vorlagen anlegen
     pMenu->EnableItem( ID_NEW, bEnable && 0 == nDepth && SfxOrganizeListBox_Impl::VIEW_TEMPLATES == eVT );
@@ -2119,14 +2119,14 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
     pMenu->EnableItem( ID_RESCAN,
                        SfxOrganizeListBox_Impl::VIEW_TEMPLATES == aRightLb.GetViewType() ||
                        SfxOrganizeListBox_Impl::VIEW_TEMPLATES == aLeftLb.GetViewType() );
-    BOOL bPrint = bEnable && nDepth > pFocusBox->GetDocLevel();
+    sal_Bool bPrint = bEnable && nDepth > pFocusBox->GetDocLevel();
     if ( bPrint && pPrt )
         bPrint = !pPrt->IsPrinting() && !pPrt->IsJobActive();
     if ( bPrint && bEnable )
     {
         // only styles printable
         Path aPath( pFocusBox, pFocusBox->FirstSelected() );
-        USHORT nIndex = aPath[ nDocLevel + 1 ];
+        sal_uInt16 nIndex = aPath[ nDocLevel + 1 ];
         bPrint = ( nIndex == CONTENT_STYLE );
                 }
     pMenu->EnableItem( ID_PRINT, bPrint );
@@ -2137,17 +2137,17 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
         bEnable = GetServiceName_Impl( aFactoryURL, aFileURL );
     }
     else if ( bEnable )
-        bEnable = FALSE;
+        bEnable = sal_False;
     pMenu->EnableItem( ID_DEFAULT_TEMPLATE, bEnable );
 
     bEnable = sal_True;
     SvStringsDtor* pList = GetAllFactoryURLs_Impl();
-    USHORT nCount = pList->Count();
+    sal_uInt16 nCount = pList->Count();
     if ( nCount > 0 )
     {
         PopupMenu* pSubMenu = new PopupMenu;
-        USHORT nItemId = ID_RESET_DEFAULT_TEMPLATE + 1;
-        for ( USHORT i = 0; i < nCount; ++i )
+        sal_uInt16 nItemId = ID_RESET_DEFAULT_TEMPLATE + 1;
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
             String aObjFacURL( *pList->GetObject(i) );
             String aTitle = SvFileInformationManager::GetDescription(
@@ -2187,7 +2187,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, GetFocus_Impl, SfxOrganizeListBox_Impl *, pBox )
 
 {
     if(pFocusBox && pFocusBox != pBox)
-        pFocusBox->SelectAll(FALSE);
+        pFocusBox->SelectAll(sal_False);
     pFocusBox = pBox;
     aFilesBtn.Enable( SfxOrganizeListBox_Impl::VIEW_FILES ==
                       pFocusBox->GetViewType() );
@@ -2392,7 +2392,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, ExportHdl, sfx2::FileDialogHelper *, EMPTYARG )
     {
         INetURLObject aPathObj( aPaths[0] );
         aPathObj.setFinalSlash();
-        for ( USHORT i = 1; i < nCount; ++i )
+        for ( sal_uInt16 i = 1; i < nCount; ++i )
         {
             if ( 1 == i )
                 aPathObj.Append( aPaths[i] );
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 04c3e78a7e7b..848e042daa45 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -40,15 +40,15 @@
 
 DBG_NAME(SfxFrameDescriptor);
 
-#define VERSION (USHORT) 3
+#define VERSION (sal_uInt16) 3
 
 struct SfxFrameDescriptor_Impl
 {
     Wallpaper*  pWallpaper;
     SfxItemSet* pArgs;
-    BOOL        bEditable;
+    sal_Bool        bEditable;
 
-    SfxFrameDescriptor_Impl() : pWallpaper( NULL ), pArgs( NULL ), bEditable( TRUE ) {}
+    SfxFrameDescriptor_Impl() : pWallpaper( NULL ), pArgs( NULL ), bEditable( sal_True ) {}
     ~SfxFrameDescriptor_Impl()
     {
         delete pWallpaper;
@@ -63,10 +63,10 @@ SfxFrameDescriptor::SfxFrameDescriptor() :
     eSizeSelector( SIZE_ABS ),
     nHasBorder( BORDER_YES ),
     nItemId( 0 ),
-    bResizeHorizontal( TRUE ),
-    bResizeVertical( TRUE ),
-    bHasUI( TRUE ),
-    bReadOnly( FALSE )
+    bResizeHorizontal( sal_True ),
+    bResizeVertical( sal_True ),
+    bHasUI( sal_True ),
+    bReadOnly( sal_False )
 {
     DBG_CTOR(SfxFrameDescriptor, 0);
 
@@ -110,31 +110,31 @@ void SfxFrameDescriptor::SetActualURL( const INetURLObject& rURL )
     SetActualURL(String(rURL.GetMainURL( INetURLObject::DECODE_TO_IURI )));
 }
 
-void SfxFrameDescriptor::SetEditable( BOOL bSet )
+void SfxFrameDescriptor::SetEditable( sal_Bool bSet )
 {
     pImp->bEditable = bSet;
 }
 
-BOOL SfxFrameDescriptor::IsEditable() const
+sal_Bool SfxFrameDescriptor::IsEditable() const
 {
     return pImp->bEditable;
 }
 
-BOOL SfxFrameDescriptor::CompareOriginal( SfxFrameDescriptor& rDescr ) const
+sal_Bool SfxFrameDescriptor::CompareOriginal( SfxFrameDescriptor& rDescr ) const
 {
     if( aURL != rDescr.aURL )
-        return FALSE;
+        return sal_False;
     else
-        return TRUE;
+        return sal_True;
 }
 
-BOOL SfxFrameDescriptor::CheckContent() const
+sal_Bool SfxFrameDescriptor::CheckContent() const
 {
-    BOOL bRet = !( aURL == aActualURL );
+    sal_Bool bRet = !( aURL == aActualURL );
     return bRet;
 }
 
-void SfxFrameDescriptor::UnifyContent( BOOL bTakeActual )
+void SfxFrameDescriptor::UnifyContent( sal_Bool bTakeActual )
 {
     if ( bTakeActual )
         aURL = aActualURL;
@@ -142,7 +142,7 @@ void SfxFrameDescriptor::UnifyContent( BOOL bTakeActual )
         aActualURL = aURL;
 }
 
-SfxFrameDescriptor* SfxFrameDescriptor::Clone( BOOL bWithIds ) const
+SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const
 {
     SfxFrameDescriptor *pFrame = new SfxFrameDescriptor;
 
@@ -176,9 +176,9 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( BOOL bWithIds ) const
     return pFrame;
 }
 
-USHORT SfxFrameDescriptor::GetWinBits() const
+sal_uInt16 SfxFrameDescriptor::GetWinBits() const
 {
-    USHORT nBits = 0;
+    sal_uInt16 nBits = 0;
     if ( eSizeSelector == SIZE_REL )
         nBits |= SWIB_RELATIVESIZE;
     if ( eSizeSelector == SIZE_PERCENT )
@@ -190,7 +190,7 @@ USHORT SfxFrameDescriptor::GetWinBits() const
     return nBits;
 }
 
-BOOL SfxFrameDescriptor::HasFrameBorder() const
+sal_Bool SfxFrameDescriptor::HasFrameBorder() const
 {
     return (nHasBorder & BORDER_YES) != 0;
 }
@@ -228,7 +228,7 @@ const Wallpaper* SfxFrameDescriptor::GetWallpaper() const
     return pImp->pWallpaper;
 }
 
-USHORT SfxFrameDescriptor::GetItemPos() const
+sal_uInt16 SfxFrameDescriptor::GetItemPos() const
 {
     return USHRT_MAX;
 }
@@ -249,13 +249,13 @@ SfxFrameProperties::SfxFrameProperties( const SfxFrameDescriptor *pD )
     , bHasBorder( pD->HasFrameBorder() )
     , bBorderSet( pD->IsFrameBorderSet() )
     , bResizable( pD->IsResizable() )
-    , bSetResizable( FALSE )
-    , bIsRootSet( FALSE )
-    , bIsInColSet( FALSE )
-    , bHasBorderInherited( FALSE )
+    , bSetResizable( sal_False )
+    , bIsRootSet( sal_False )
+    , bIsInColSet( sal_False )
+    , bHasBorderInherited( sal_False )
     , pFrame( pD->Clone() )
 {
-    bBorderSet = TRUE;
+    bBorderSet = sal_True;
 }
 
 SfxFrameProperties& SfxFrameProperties::operator =(
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index f7df58ffd397..0bd63da878a3 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -185,10 +185,10 @@ throw( uno::RuntimeException )
         if ( xDisp.is() )
             xDisp->dispatch( aTargetURL, aProps );
 
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL IFrameObject::cancel() throw( com::sun::star::uno::RuntimeException )
@@ -275,7 +275,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const ::rtl::OUString& aPropertyNam
         sal_Bool bIsAutoBorder = sal_Bool();
         if ( (aAny >>= bIsAutoBorder) )
         {
-            BOOL bBorder = maFrmDescr.IsFrameBorderOn();
+            sal_Bool bBorder = maFrmDescr.IsFrameBorderOn();
             maFrmDescr.ResetBorder();
             if ( bIsAutoBorder )
                 maFrmDescr.SetFrameBorder( bBorder );
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 932f6f10ecb0..955d231898f9 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -134,13 +134,13 @@ void SfxPreviewWin_Impl::ImpPaint(
     Point aPoint;
     if (dRatio>dRatioPreV)
     {
-        aSize=Size(nWidth, (USHORT)(nWidth/dRatio));
-        aPoint=Point( 0, (USHORT)((nHeight-aSize.Height())/2));
+        aSize=Size(nWidth, (sal_uInt16)(nWidth/dRatio));
+        aPoint=Point( 0, (sal_uInt16)((nHeight-aSize.Height())/2));
     }
     else
     {
-        aSize=Size((USHORT)(nHeight*dRatio), nHeight);
-        aPoint=Point((USHORT)((nWidth-aSize.Width())/2),0);
+        aSize=Size((sal_uInt16)(nHeight*dRatio), nHeight);
+        aPoint=Point((sal_uInt16)((nWidth-aSize.Width())/2),0);
     }
     Point bPoint=Point(nWidth,nHeight)-aPoint;
 
@@ -181,7 +181,7 @@ SfxPreviewWin::SfxPreviewWin(
 
     // #107818# This preview window is for document previews.  Therefore
     // right-to-left mode should be off
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 void SfxPreviewWin::Paint( const Rectangle& rRect )
@@ -201,7 +201,7 @@ void SfxPreviewWin::Paint( const Rectangle& rRect )
     DBG_ASSERT( aTmpSize.Height() * aTmpSize.Width(), "size of first page is 0, overload GetFirstPageSize or set vis-area!" );
 
     aMtf.SetPrefSize( aTmpSize );
-    aDevice.EnableOutput( FALSE );
+    aDevice.EnableOutput( sal_False );
     aDevice.SetMapMode( rDocShell->GetMapUnit() );
     aDevice.SetDrawMode( GetDrawMode() );
     aMtf.Record( &aDevice );
@@ -265,7 +265,7 @@ class SfxNewFileDialog_Impl
     String aNone;
     String sLoadTemplate;
 
-    USHORT nFlags;
+    sal_uInt16 nFlags;
     SfxDocumentTemplates aTemplates;
     SfxObjectShellLock xDocShell;
     SfxNewFileDialog* pAntiImpl;
@@ -280,23 +280,23 @@ class SfxNewFileDialog_Impl
     DECL_LINK( Expand, MoreButton * );
     DECL_LINK( PreviewClick, CheckBox * );
     DECL_LINK( LoadFile, PushButton* );
-    USHORT  GetSelectedTemplatePos() const;
+    sal_uInt16  GetSelectedTemplatePos() const;
 
 public:
 
-    SfxNewFileDialog_Impl( SfxNewFileDialog* pAntiImplP, USHORT nFlags );
+    SfxNewFileDialog_Impl( SfxNewFileDialog* pAntiImplP, sal_uInt16 nFlags );
     ~SfxNewFileDialog_Impl();
 
-        // Liefert FALSE, wenn '- Keine -' als Vorlage eingestellt ist
-        // Nur wenn IsTemplate() TRUE liefert, koennen Vorlagennamen
+        // Liefert sal_False, wenn '- Keine -' als Vorlage eingestellt ist
+        // Nur wenn IsTemplate() sal_True liefert, koennen Vorlagennamen
         // erfragt werden
-    BOOL IsTemplate() const;
+    sal_Bool IsTemplate() const;
     String GetTemplateRegion() const;
     String GetTemplateName() const;
     String GetTemplateFileName() const;
 
-    USHORT  GetTemplateFlags()const;
-    void    SetTemplateFlags(USHORT nSet);
+    sal_uInt16  GetTemplateFlags()const;
+    void    SetTemplateFlags(sal_uInt16 nSet);
 };
 
 
@@ -318,11 +318,11 @@ IMPL_LINK( SfxNewFileDialog_Impl, Update, void *, EMPTYARG )
     if ( xDocShell.Is() )
     {
         if ( xDocShell->GetProgress() )
-            return FALSE;
+            return sal_False;
         xDocShell.Clear();
     }
 
-    const USHORT nEntry = GetSelectedTemplatePos();
+    const sal_uInt16 nEntry = GetSelectedTemplatePos();
     if(!nEntry)
     {
         ClearInfo();
@@ -366,24 +366,24 @@ IMPL_LINK( SfxNewFileDialog_Impl, Update, void *, EMPTYARG )
             Application::SetDefDialogParent( pAntiImpl );
             SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,pAntiImpl);
             SfxApplication *pSfxApp = SFX_APP();
-            ULONG lErr;
+            sal_uIntPtr lErr;
             SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() );
-            pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) );
-            pSet->Put( SfxBoolItem( SID_PREVIEW, TRUE ) );
-            lErr = pSfxApp->LoadTemplate( xDocShell, aFileName, TRUE, pSet );
+            pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
+            pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) );
+            lErr = pSfxApp->LoadTemplate( xDocShell, aFileName, sal_True, pSet );
             if( lErr )
                 ErrorHandler::HandleError(lErr);
             Application::SetDefDialogParent( pParent );
             if ( !xDocShell.Is() )
             {
                 aPreviewWin.SetObjectShell( 0 );
-                return FALSE;
+                return sal_False;
             }
         }
 
         aPreviewWin.SetObjectShell( xDocShell );
     }
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -393,20 +393,20 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox )
     if ( xDocShell.Is() && xDocShell->GetProgress() )
         return 0;
 
-    const USHORT nRegion = pBox->GetSelectEntryPos();
-    const USHORT nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0;
-    aTemplateLb.SetUpdateMode(FALSE);
+    const sal_uInt16 nRegion = pBox->GetSelectEntryPos();
+    const sal_uInt16 nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0;
+    aTemplateLb.SetUpdateMode(sal_False);
     aTemplateLb.Clear();
     String aSel=aRegionLb.GetSelectEntry();
-    USHORT nc=aSel.Search('(');
+    sal_uInt16 nc=aSel.Search('(');
     if (nc-1&&nc!=STRING_NOTFOUND)
         aSel.Erase(nc-1);
     if (aSel.CompareIgnoreCaseToAscii( String(SfxResId(STR_STANDARD)) )==COMPARE_EQUAL)
         aTemplateLb.InsertEntry(aNone);
-    for (USHORT i = 0; i < nCount; ++i)
+    for (sal_uInt16 i = 0; i < nCount; ++i)
         aTemplateLb.InsertEntry(aTemplates.GetName(nRegion, i));
     aTemplateLb.SelectEntryPos(0);
-    aTemplateLb.SetUpdateMode(TRUE);
+    aTemplateLb.SetUpdateMode(sal_True);
     aTemplateLb.Invalidate();
     aTemplateLb.Update();
     return 0;
@@ -428,7 +428,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, PreviewClick, CheckBox *, pBox )
     if ( xDocShell.Is() && xDocShell->GetProgress() )
         return 0;
 
-    USHORT nEntry = GetSelectedTemplatePos();
+    sal_uInt16 nEntry = GetSelectedTemplatePos();
     if ( nEntry && pBox->IsChecked() )
     {
         if(!Update(0))
@@ -481,11 +481,11 @@ IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, LoadFile, PushButton *, EMPTYARG
 IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, LoadFile, PushButton *, EMPTYARG )
 //-------------------------------------------------------------------------
 
-USHORT  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
+sal_uInt16  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
 {
-    USHORT nEntry=aTemplateLb.GetSelectEntryPos();
+    sal_uInt16 nEntry=aTemplateLb.GetSelectEntryPos();
     String aSel=aRegionLb.GetSelectEntry().Copy();
-    USHORT nc=aSel.Search('(');
+    sal_uInt16 nc=aSel.Search('(');
     if (nc-1&&nc!=STRING_NOTFOUND)
         aSel.Erase(nc-1);
     if (aSel.CompareIgnoreCaseToAscii(String(SfxResId(STR_STANDARD)))!=COMPARE_EQUAL)
@@ -497,7 +497,7 @@ USHORT  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
 
 //-------------------------------------------------------------------------
 
-BOOL SfxNewFileDialog_Impl::IsTemplate() const
+sal_Bool SfxNewFileDialog_Impl::IsTemplate() const
 {
     return GetSelectedTemplatePos()!=0;
 
@@ -542,9 +542,9 @@ void AdjustPosSize_Impl(Window *pWin, short nMoveOffset, short nSizeOffset)
     pWin->SetPosSizePixel(aPos, aSize);
 }
 //-------------------------------------------------------------------------
-USHORT  SfxNewFileDialog_Impl::GetTemplateFlags()const
+sal_uInt16  SfxNewFileDialog_Impl::GetTemplateFlags()const
 {
-    USHORT nRet = aTextStyleCB.IsChecked() ? SFX_LOAD_TEXT_STYLES : 0;
+    sal_uInt16 nRet = aTextStyleCB.IsChecked() ? SFX_LOAD_TEXT_STYLES : 0;
     if(aFrameStyleCB.IsChecked())
         nRet |= SFX_LOAD_FRAME_STYLES;
     if(aPageStyleCB.IsChecked())
@@ -556,7 +556,7 @@ USHORT  SfxNewFileDialog_Impl::GetTemplateFlags()const
     return nRet;
 }
 //-------------------------------------------------------------------------
-void    SfxNewFileDialog_Impl::SetTemplateFlags(USHORT nSet)
+void    SfxNewFileDialog_Impl::SetTemplateFlags(sal_uInt16 nSet)
 {
     aTextStyleCB.Check(  0 != (nSet&SFX_LOAD_TEXT_STYLES ));
     aFrameStyleCB.Check( 0 != (nSet&SFX_LOAD_FRAME_STYLES));
@@ -568,7 +568,7 @@ void    SfxNewFileDialog_Impl::SetTemplateFlags(USHORT nSet)
 //-------------------------------------------------------------------------
 
 SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
-    SfxNewFileDialog* pAntiImplP, USHORT nFl)
+    SfxNewFileDialog* pAntiImplP, sal_uInt16 nFl)
     :   aRegionFt( pAntiImplP, SfxResId( FT_REGION ) ),
         aRegionLb( pAntiImplP, SfxResId( LB_REGION ) ),
         aTemplateFt( pAntiImplP, SfxResId( FT_TEMPLATE ) ),
@@ -654,7 +654,7 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
     }
 
     String &rExtra = pAntiImplP->GetExtraData();
-    USHORT nTokCount = rExtra.GetTokenCount( '|' );
+    sal_uInt16 nTokCount = rExtra.GetTokenCount( '|' );
     if( nTokCount > 0 && nFlags )
         MORE_BTN(SetState( rExtra.GetToken( 0, '|' ) == 'Y' ));
     if( nTokCount > 1 && nFlags )
@@ -668,10 +668,10 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
         aTemplates.Update( sal_True /* be smart */ );
     }
     // fill the list boxes
-    const USHORT nCount = aTemplates.GetRegionCount();
+    const sal_uInt16 nCount = aTemplates.GetRegionCount();
     if (nCount)
     {
-        for(USHORT i = 0; i < nCount; ++i)
+        for(sal_uInt16 i = 0; i < nCount; ++i)
             aRegionLb.InsertEntry(aTemplates.GetFullRegionName(i));
         aRegionLb.SetSelectHdl(LINK(this, SfxNewFileDialog_Impl, RegionSelect));
     }
@@ -697,7 +697,7 @@ SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl()
     delete pMoreBt;
 }
 //-------------------------------------------------------------------------
-SfxNewFileDialog::SfxNewFileDialog(Window *pParent, USHORT nFlags)
+SfxNewFileDialog::SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags)
     : SfxModalDialog( pParent, SfxResId( DLG_NEW_FILE ) )
 {
     pImpl = new SfxNewFileDialog_Impl( this, nFlags );
@@ -708,7 +708,7 @@ SfxNewFileDialog::~SfxNewFileDialog()
     delete pImpl;
 }
 //-------------------------------------------------------------------------
-BOOL SfxNewFileDialog::IsTemplate() const
+sal_Bool SfxNewFileDialog::IsTemplate() const
 {
     return pImpl->IsTemplate();
 }
@@ -728,13 +728,13 @@ String SfxNewFileDialog::GetTemplateFileName() const
     return pImpl->GetTemplateFileName();
 }
 //-------------------------------------------------------------------------
-USHORT SfxNewFileDialog::GetTemplateFlags()const
+sal_uInt16 SfxNewFileDialog::GetTemplateFlags()const
 {
     return pImpl->GetTemplateFlags();
 
 }
 //-------------------------------------------------------------------------
-void    SfxNewFileDialog::SetTemplateFlags(USHORT nSet)
+void    SfxNewFileDialog::SetTemplateFlags(sal_uInt16 nSet)
 {
     pImpl->SetTemplateFlags(nSet);
 }
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 4aea842e44e9..b389f980185d 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -140,7 +140,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHig
     ::boost::shared_ptr<GDIMetaFile> pFile(new GDIMetaFile);
 
     VirtualDevice aDevice;
-    aDevice.EnableOutput( FALSE );
+    aDevice.EnableOutput( sal_False );
 
     // adjust the output device if HC-metafile is requested
     if ( bHighContrast )
@@ -252,7 +252,7 @@ void SfxObjectShell::UpdateTime_Impl(
     // Initialize some local member! Its neccessary for wollow operations!
     DateTime    aNow                    ;   // Date and time at current moment
     Time        n24Time     (24,0,0,0)  ;   // Time-value for 24 hours - see follow calculation
-    ULONG       nDays       = 0         ;   // Count of days between now and last editing
+    sal_uIntPtr     nDays       = 0         ;   // Count of days between now and last editing
     Time        nAddTime    (0)         ;   // Value to add on aOldTime
 
     // Safe impossible cases!
@@ -328,9 +328,9 @@ void SfxObjectShell::SetOrganizerSearchMask(
 
 //--------------------------------------------------------------------
 
-USHORT SfxObjectShell::GetContentCount(
-    USHORT nIdx1,
-    USHORT /*nIdx2*/)
+sal_uInt16 SfxObjectShell::GetContentCount(
+    sal_uInt16 nIdx1,
+    sal_uInt16 /*nIdx2*/)
 {
     switch(nIdx1)
     {
@@ -359,7 +359,7 @@ USHORT SfxObjectShell::GetContentCount(
 
 //--------------------------------------------------------------------
 //TODO/CLEANUP: remove this method (it's virtual)
-void  SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT)
+void  SfxObjectShell::TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2, sal_uInt16)
 {
     if(nIdx1==CONTENT_STYLE && nIdx2 != INDEX_IGNORE) //StyleSheets
     {
@@ -368,23 +368,23 @@ void  SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT)
     }
 }
 
-BOOL   SfxObjectShell::CanHaveChilds(USHORT nIdx1,
-                                       USHORT nIdx2)
+sal_Bool   SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1,
+                                       sal_uInt16 nIdx2)
 {
     switch(nIdx1) {
     case INDEX_IGNORE:
-        return TRUE;
+        return sal_True;
     case CONTENT_STYLE:
-        return INDEX_IGNORE == nIdx2 || !GetStyleSheetPool()? FALSE: TRUE;
+        return INDEX_IGNORE == nIdx2 || !GetStyleSheetPool()? sal_False: sal_True;
     case CONTENT_MACRO:
-//!!    return INDEX_IGNORE == nIdx2? FALSE: TRUE;
-        return FALSE;
+//!!    return INDEX_IGNORE == nIdx2? sal_False: sal_True;
+        return sal_False;
 /*
     case CONTENT_CONFIG:
-        return INDEX_IGNORE == nIdx2 ? FALSE : TRUE;
+        return INDEX_IGNORE == nIdx2 ? sal_False : sal_True;
  */
     }
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -392,10 +392,10 @@ BOOL   SfxObjectShell::CanHaveChilds(USHORT nIdx1,
 void SfxObjectShell::GetContent(String &rText,
                                 Bitmap &rClosedBitmap,
                                 Bitmap &rOpenedBitmap,
-                                BOOL &bCanDel,
-                                USHORT i,
-                                USHORT nIdx1,
-                                USHORT nIdx2 )
+                                sal_Bool &bCanDel,
+                                sal_uInt16 i,
+                                sal_uInt16 nIdx1,
+                                sal_uInt16 nIdx2 )
 {
     DBG_ERRORFILE( "Non high contrast method called. Please update calling code!" );
     SfxObjectShell::GetContent( rText, rClosedBitmap, rOpenedBitmap, BMP_COLOR_NORMAL, bCanDel, i, nIdx1, nIdx2 );
@@ -407,20 +407,20 @@ void   SfxObjectShell::GetContent(String &rText,
                                   Bitmap &rClosedBitmap,
                                   Bitmap &rOpenedBitmap,
                                   BmpColorMode eColorMode,
-                                  BOOL &bCanDel,
-                                  USHORT i,
-                                  USHORT nIdx1,
-                                  USHORT /*nIdx2*/ )
+                                  sal_Bool &bCanDel,
+                                  sal_uInt16 i,
+                                  sal_uInt16 nIdx1,
+                                  sal_uInt16 /*nIdx2*/ )
 {
-    bCanDel=TRUE;
+    bCanDel=sal_True;
 
     switch(nIdx1)
     {
         case INDEX_IGNORE:
         {
-            USHORT nTextResId = 0;
-            USHORT nClosedBitmapResId = 0; // evtl. sp"ater mal unterschiedliche
-            USHORT nOpenedBitmapResId = 0; // "     "       "   "
+            sal_uInt16 nTextResId = 0;
+            sal_uInt16 nClosedBitmapResId = 0; // evtl. sp"ater mal unterschiedliche
+            sal_uInt16 nOpenedBitmapResId = 0; // "     "       "   "
             switch(i)
             {
                 case CONTENT_STYLE:
@@ -508,7 +508,7 @@ Bitmap SfxObjectShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily )
 
 Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode eColorMode )
 {
-    USHORT nResId = 0;
+    sal_uInt16 nResId = 0;
     switch(eFamily)
     {
         case SFX_STYLE_FAMILY_CHAR:
@@ -537,16 +537,16 @@ Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode
 
 //--------------------------------------------------------------------
 
-BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
-                              USHORT nSourceIdx1,
-                              USHORT nSourceIdx2,
-                              USHORT /*nSourceIdx3*/,
-                              USHORT &nIdx1,
-                              USHORT &nIdx2,
-                              USHORT &/*nIdx3*/,
-                              USHORT &/*nDeleted*/)
+sal_Bool SfxObjectShell::Insert(SfxObjectShell &rSource,
+                              sal_uInt16 nSourceIdx1,
+                              sal_uInt16 nSourceIdx2,
+                              sal_uInt16 /*nSourceIdx3*/,
+                              sal_uInt16 &nIdx1,
+                              sal_uInt16 &nIdx2,
+                              sal_uInt16 &/*nIdx3*/,
+                              sal_uInt16 &/*nDeleted*/)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if (INDEX_IGNORE == nIdx1 && CONTENT_STYLE == nSourceIdx1)
         nIdx1 = CONTENT_STYLE;
@@ -577,8 +577,8 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
             SfxStyleFamily eOldFamily = pHisSheet->GetFamily();
 
             SfxStyleSheetBase* pExist = pMyPool->Find(aOldName, eOldFamily);
-            // USHORT nOldHelpId = pExist->GetHelpId(??? VB ueberlegt sich was);
-            BOOL bUsedOrUserDefined;
+            // sal_uInt16 nOldHelpId = pExist->GetHelpId(??? VB ueberlegt sich was);
+            sal_Bool bUsedOrUserDefined;
             if( pExist )
             {
                 bUsedOrUserDefined =
@@ -586,13 +586,13 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
                 if( ErrorHandler::HandleError(
                     *new MessageInfo( ERRCODE_SFXMSG_STYLEREPLACE, aOldName ) )
                     != ERRCODE_BUTTON_OK )
-                    return FALSE;
+                    return sal_False;
                 else
                 {
                     pMyPool->Replace( *pHisSheet, *pExist );
-                    SetModified( TRUE );
+                    SetModified( sal_True );
                     nIdx2 = nIdx1 = INDEX_IGNORE;
-                    return TRUE;
+                    return sal_True;
                 }
             }
 
@@ -656,13 +656,13 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
                 }
             }
 
-            SetModified( TRUE );
+            SetModified( sal_True );
             if( !bUsedOrUserDefined ) nIdx2 = nIdx1 = INDEX_IGNORE;
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else
-            bRet = FALSE;
+            bRet = sal_False;
     }
 /*
     else if (nSourceIdx1 == CONTENT_CONFIG)
@@ -673,7 +673,7 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
         if ( !GetConfigManager() )
         {
             SetConfigManager(new SfxConfigManager(0, pCfgMgr));
-            SetTemplateConfig(FALSE);
+            SetTemplateConfig(sal_False);
             if (this == Current())
                 GetConfigManager()->Activate(pCfgMgr);
         }
@@ -681,9 +681,9 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
         if (GetConfigManager()->CopyItem(
             nSourceIdx2, nIdx2, rSource.GetConfigManager()))
         {
-            SetModified(TRUE);
-            bRet = TRUE;
-            SFX_APP()->GetDispatcher_Impl()->Update_Impl(TRUE);
+            SetModified(sal_True);
+            bRet = sal_True;
+            SFX_APP()->GetDispatcher_Impl()->Update_Impl(sal_True);
         }
     }
 */
@@ -692,14 +692,14 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
 
 //--------------------------------------------------------------------
 
-BOOL SfxObjectShell::Remove
+sal_Bool SfxObjectShell::Remove
 (
-    USHORT nIdx1,
-    USHORT nIdx2,
-    USHORT /*nIdx3*/
+    sal_uInt16 nIdx1,
+    sal_uInt16 nIdx2,
+    sal_uInt16 /*nIdx3*/
 )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if (CONTENT_STYLE == nIdx1)
     {
@@ -712,7 +712,7 @@ BOOL SfxObjectShell::Remove
         String aEmpty;
         SfxStyleFamily  eFamily = pMySheet->GetFamily();
         pMyPool->Remove(pMySheet);
-        bRet = TRUE;
+        bRet = sal_True;
 
         SfxStyleSheetBase* pTestSheet = pMyPool->First();
         while (pTestSheet)
@@ -734,7 +734,7 @@ BOOL SfxObjectShell::Remove
             pTestSheet = pMyPool->Next();
         }
 
-        SetModified( TRUE );
+        SetModified( sal_True );
     }
 
     return bRet;
@@ -742,12 +742,12 @@ BOOL SfxObjectShell::Remove
 
 //--------------------------------------------------------------------
 
-BOOL SfxObjectShell::Print
+sal_Bool SfxObjectShell::Print
 (
     Printer&        rPrt,
-    USHORT          nIdx1,
-    USHORT          /*nIdx2*/,
-    USHORT          /*nIdx3*/,
+    sal_uInt16          nIdx1,
+    sal_uInt16          /*nIdx2*/,
+    sal_uInt16          /*nIdx3*/,
     const String*   pObjectName
 )
 
@@ -763,10 +763,10 @@ BOOL SfxObjectShell::Print
             SetOrganizerSearchMask(pStylePool);
             SfxStyleSheetIterator* pIter = pStylePool->CreateIterator(
                 pStylePool->GetSearchFamily(), pStylePool->GetSearchMask() );
-            USHORT nStyles = pIter->Count();
+            sal_uInt16 nStyles = pIter->Count();
             SfxStyleSheetBase *pStyle = pIter->First();
             if ( !pStyle )
-                return TRUE;
+                return sal_True;
 
             // pepare adaptor for old style StartPage/EndPage printing
             boost::shared_ptr< Printer > pPrinter( new Printer( rPrt.GetJobSetup() ) );
@@ -780,8 +780,8 @@ BOOL SfxObjectShell::Print
             aFont.SetWeight(WEIGHT_BOLD);
             pPrinter->SetFont(aFont);
             const Size aPageSize(pPrinter->GetOutputSize());
-            const USHORT nXIndent = 200;
-            USHORT nYIndent = 200;
+            const sal_uInt16 nXIndent = 200;
+            sal_uInt16 nYIndent = 200;
             Point aOutPos(nXIndent, nYIndent);
             String aHeader(SfxResId(STR_PRINT_STYLES_HEADER));
             if ( pObjectName )
@@ -817,13 +817,13 @@ BOOL SfxObjectShell::Print
                 pPrinter->SetFont(aFont);
                 aStr = pStyle->GetDescription();
                 const char cDelim = ' ';
-                USHORT nStart = 0, nIdx = 0;
+                sal_uInt16 nStart = 0, nIdx = 0;
 
                 nTextHeight = pPrinter->GetTextHeight();
                 // break text into lines
                 while(nIdx < aStr.Len())
                 {
-                    USHORT  nOld = nIdx;
+                    sal_uInt16  nOld = nIdx;
                     long nTextWidth;
                     nIdx = aStr.Search(cDelim, nStart);
                     nTextWidth = pPrinter->GetTextWidth(aStr, nStart, nIdx-nStart);
@@ -844,7 +844,7 @@ BOOL SfxObjectShell::Print
                     }
                     else
                     {
-                        USHORT nChar = 1;
+                        sal_uInt16 nChar = 1;
                         while(
                             nStart + nChar < aStr.Len() &&
                             aOutPos.X() + pPrinter->GetTextWidth(
@@ -875,9 +875,9 @@ BOOL SfxObjectShell::Print
             break;
         }
       default:
-          return FALSE;
+          return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -912,7 +912,7 @@ void SfxObjectShell::LoadStyles
     DBG_ASSERT(pMyPool, "Dest-DocumentShell ohne StyleSheetPool");
     pSourcePool->SetSearchMask(SFX_STYLE_FAMILY_ALL, 0xffff);
     Styles_Impl *pFound = new Styles_Impl[pSourcePool->Count()];
-    USHORT nFound = 0;
+    sal_uInt16 nFound = 0;
 
     SfxStyleSheetBase *pSource = pSourcePool->First();
     while ( pSource )
@@ -931,7 +931,7 @@ void SfxObjectShell::LoadStyles
         pSource = pSourcePool->Next();
     }
 
-    for ( USHORT i = 0; i < nFound; ++i )
+    for ( sal_uInt16 i = 0; i < nFound; ++i )
     {
         pFound[i].pDest->GetItemSet().PutExtended(pFound[i].pSource->GetItemSet(), SFX_ITEM_DONTCARE, SFX_ITEM_DEFAULT);
 //      pFound[i].pDest->SetHelpId(pFound[i].pSource->GetHelpId());
@@ -1005,13 +1005,13 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
     {
         // check existence of template storage
         aTemplURL = aFoundName;
-        BOOL bLoad = FALSE;
+        sal_Bool bLoad = sal_False;
 
         // should the document checked against changes in the template ?
         if ( IsQueryLoadTemplate() )
         {
             // load document info of template
-            BOOL bOK = FALSE;
+            sal_Bool bOK = sal_False;
             util::DateTime aTemplDate;
             try
             {
@@ -1028,7 +1028,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
                 if ( aAny >>= aTemplDate )
                 {
                     // get modify date from document info
-                    bOK = TRUE;
+                    bOK = sal_True;
                 }
             }
             catch ( Exception& )
@@ -1045,21 +1045,21 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
                     // ask user
                     if( bCanUpdateFromTemplate == document::UpdateDocMode::QUIET_UPDATE
                     || bCanUpdateFromTemplate == document::UpdateDocMode::FULL_UPDATE )
-                        bLoad = TRUE;
+                        bLoad = sal_True;
                     else if ( bCanUpdateFromTemplate == document::UpdateDocMode::ACCORDING_TO_CONFIG )
                     {
                         String sMessage( SfxResId( STR_QRYTEMPL_MESSAGE ) );
                         sMessage.SearchAndReplace( String::CreateFromAscii("$(ARG1)"), aTemplName );
                         sfx2::QueryTemplateBox aBox( GetDialogParent(), sMessage );
                         if ( RET_YES == aBox.Execute() )
-                            bLoad = TRUE;
+                            bLoad = sal_True;
                     }
 
                     if( !bLoad )
                     {
                         // user refuses, so don't ask again for this document
-                        SetQueryLoadTemplate(FALSE);
-                        SetModified( TRUE );
+                        SetQueryLoadTemplate(sal_False);
+                        SetModified( sal_True );
                     }
                 }
             }
@@ -1146,14 +1146,14 @@ sal_Bool SfxObjectShell::IsUseUserData() const
 void SfxObjectShell::SetQueryLoadTemplate( sal_Bool bNew )
 {
     if ( pImp->bQueryLoadTemplate != bNew )
-        SetModified( TRUE );
+        SetModified( sal_True );
     pImp->bQueryLoadTemplate = bNew;
 }
 
 void SfxObjectShell::SetUseUserData( sal_Bool bNew )
 {
     if ( pImp->bUseUserData != bNew )
-        SetModified( TRUE );
+        SetModified( sal_True );
     pImp->bUseUserData = bNew;
 }
 
@@ -1170,14 +1170,14 @@ sal_Bool SfxObjectShell::IsSaveVersionOnClose() const
 void SfxObjectShell::SetLoadReadonly( sal_Bool bNew )
 {
     if ( pImp->bLoadReadonly != bNew )
-        SetModified( TRUE );
+        SetModified( sal_True );
     pImp->bLoadReadonly = bNew;
 }
 
 void SfxObjectShell::SetSaveVersionOnClose( sal_Bool bNew )
 {
     if ( pImp->bSaveVersionOnClose != bNew )
-        SetModified( TRUE );
+        SetModified( sal_True );
     pImp->bSaveVersionOnClose = bNew;
 }
 
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 1c2105c210b9..a83335ea9fcd 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -101,7 +101,7 @@ void SfxObjectShell::OnDocumentPrinterChanged( Printer* /*pNewPrinter*/ )
 }
 
 // -----------------------------------------------------------------------
-Rectangle SfxObjectShell::GetVisArea( USHORT nAspect ) const
+Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const
 {
     if( nAspect == ASPECT_CONTENT )
         return pImp->m_aVisArea;
@@ -131,7 +131,7 @@ void SfxObjectShell::SetVisArea( const Rectangle & rVisArea )
         if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
         {
             if ( IsEnableSetModified() )
-                SetModified( TRUE );
+                SetModified( sal_True );
 
                SFX_APP()->NotifyEvent(SfxEventHint( SFX_EVENT_VISAREACHANGED, GlobalEventConfig::GetEventName(STR_EVENT_VISAREACHANGED), this));
 
@@ -184,7 +184,7 @@ void SfxObjectShell::SetVisAreaSize( const Size & rVisSize )
 }
 
 // -----------------------------------------------------------------------
-ULONG SfxObjectShell::GetMiscStatus() const
+sal_uIntPtr SfxObjectShell::GetMiscStatus() const
 {
     return 0;
 }
@@ -213,7 +213,7 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip
     rDesc.maSize = OutputDevice::LogicToLogic( GetVisArea().GetSize(), GetMapUnit(), MAP_100TH_MM );
     rDesc.maDragStartPos = Point();
     rDesc.maDisplayName = String();
-    rDesc.mbCanLink = FALSE;
+    rDesc.mbCanLink = sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -221,7 +221,7 @@ void SfxObjectShell::DoDraw( OutputDevice* pDev,
                             const Point & rObjPos,
                             const Size & rSize,
                             const JobSetup & rSetup,
-                            USHORT nAspect )
+                            sal_uInt16 nAspect )
 {
     MapMode aMod = pDev->GetMapMode();
     Size aSize = GetVisArea( nAspect ).GetSize();
@@ -245,7 +245,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
                                const Fraction & rScaleX,
                                const Fraction & rScaleY,
                                const JobSetup & rSetup,
-                               USHORT nAspect )
+                               sal_uInt16 nAspect )
 {
     Rectangle aVisArea  = GetVisArea( nAspect );
     // MapUnit des Ziels
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 2980d984fd78..01fb87f29eac 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -64,7 +64,7 @@ SfxPoolItem* SfxObjectShellItem::Clone( SfxItemPool *) const
 
 //--------------------------------------------------------------------
 
-sal_Bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     if ( pObjSh )
     {
@@ -76,12 +76,12 @@ sal_Bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*
     {
         rVal <<= ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >();
     }
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
-sal_Bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This item MUST have a model. Please don't change this, there are UNO-based
     // implementations which need it!!
@@ -100,21 +100,21 @@ sal_Bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
                 if ( nHandle )
                 {
                     pObjSh = reinterpret_cast< SfxObjectShell* >(sal::static_int_cast<sal_IntPtr>( nHandle ));
-                    return TRUE;
+                    return sal_True;
                 }
             }
         }
 
         pObjSh = 0;
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //=========================================================================
 
-SfxObjectItem::SfxObjectItem( USHORT nWhichId, SfxShell *pSh )
+SfxObjectItem::SfxObjectItem( sal_uInt16 nWhichId, SfxShell *pSh )
 :   SfxPoolItem( nWhichId ),
     _pSh( pSh )
 {}
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 3b27db855e39..d961c2df3aef 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1733,7 +1733,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
     catch ( const uno::Exception& )
     {
         aException = ::cppu::getCaughtException();
-        bCaughtException = TRUE;
+        bCaughtException = sal_True;
         nErr = ERRCODE_BASIC_INTERNAL_ERROR;
     }
 
@@ -1934,7 +1934,7 @@ sal_Bool SfxObjectShell::IsSecure()
         if ( GetMedium()->GetContent().is() )
         {
             Any aAny( ::utl::UCBContentHelper::GetProperty( aURL.GetMainURL( INetURLObject::NO_DECODE ), String( RTL_CONSTASCII_USTRINGPARAM("IsProtected")) ) );
-            sal_Bool bIsProtected = FALSE;
+            sal_Bool bIsProtected = sal_False;
             if ( ( aAny >>= bIsProtected ) && bIsProtected )
                 return sal_False;
             else
@@ -1947,7 +1947,7 @@ sal_Bool SfxObjectShell::IsSecure()
         return sal_False;
 }
 
-void SfxObjectShell::SetWaitCursor( BOOL bSet ) const
+void SfxObjectShell::SetWaitCursor( sal_Bool bSet ) const
 {
     for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, this ) )
     {
@@ -1969,7 +1969,7 @@ String SfxObjectShell::GetAPIName() const
     return aName;
 }
 
-void SfxObjectShell::Invalidate( USHORT nId )
+void SfxObjectShell::Invalidate( sal_uInt16 nId )
 {
     for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, this ) )
         Invalidate_Impl( pFrame->GetBindings(), nId );
@@ -1992,7 +1992,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium )
 {
     Window* pWindow = 0;
     SfxItemSet* pSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet();
-    SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE );
+    SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False );
     if ( pUnoItem )
     {
         uno::Reference < frame::XFrame > xFrame( pUnoItem->GetFrame() );
@@ -2002,7 +2002,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium )
     if ( !pWindow )
     {
         SfxFrame* pFrame = 0;
-        SFX_ITEMSET_ARG( pSet, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE );
+        SFX_ITEMSET_ARG( pSet, pFrameItem, SfxFrameItem, SID_DOCFRAME, sal_False );
         if( pFrameItem && pFrameItem->GetFrame() )
             // get target frame from ItemSet
             pFrame = pFrameItem->GetFrame();
@@ -2036,7 +2036,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium )
     return pWindow;
 }
 
-String SfxObjectShell::UpdateTitle( SfxMedium* pMed, USHORT nDocViewNumber )
+String SfxObjectShell::UpdateTitle( SfxMedium* pMed, sal_uInt16 nDocViewNumber )
 {
     // Titel des Fensters
     String aTitle;
@@ -2077,29 +2077,29 @@ void SfxObjectShell::SetCreateMode_Impl( SfxObjectCreateMode nMode )
     eCreateMode = nMode;
 }
 
-BOOL SfxObjectShell::IsInPlaceActive()
+sal_Bool SfxObjectShell::IsInPlaceActive()
 {
     if ( eCreateMode != SFX_CREATE_MODE_EMBEDDED )
-        return FALSE;
+        return sal_False;
 
     SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this );
     return pFrame && pFrame->GetFrame().IsInPlace();
 }
 
-BOOL SfxObjectShell::IsUIActive()
+sal_Bool SfxObjectShell::IsUIActive()
 {
     if ( eCreateMode != SFX_CREATE_MODE_EMBEDDED )
-        return FALSE;
+        return sal_False;
 
     SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this );
     return pFrame && pFrame->GetFrame().IsInPlace() && pFrame->GetFrame().GetWorkWindow_Impl()->IsVisible_Impl();
 }
 
-void SfxObjectShell::UIActivate( BOOL )
+void SfxObjectShell::UIActivate( sal_Bool )
 {
 }
 
-void SfxObjectShell::InPlaceActivate( BOOL )
+void SfxObjectShell::InPlaceActivate( sal_Bool )
 {
 }
 
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index e53e7148e561..73d836938183 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -295,7 +295,7 @@ sal_Bool SfxObjectShell::APISaveAs_Impl
     SfxItemSet*   aParams
 )
 {
-    BOOL bOk = sal_False;
+    sal_Bool bOk = sal_False;
 
     {DBG_CHKTHIS(SfxObjectShell, 0);}
 
@@ -345,7 +345,7 @@ sal_Bool SfxObjectShell::APISaveAs_Impl
         }
 
         // prevent picklist-entry
-        GetMedium()->SetUpdatePickList( FALSE );
+        GetMedium()->SetUpdatePickList( sal_False );
     }
 
     return bOk;
@@ -357,7 +357,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 {
     {DBG_CHKTHIS(SfxObjectShell, 0);}
 
-    USHORT nId = rReq.GetSlot();
+    sal_uInt16 nId = rReq.GetSlot();
 
     if( SID_SIGNATURE == nId || SID_MACRO_SIGNATURE == nId )
     {
@@ -406,7 +406,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         case SID_DOCINFO:
         {
-            SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO, FALSE);
+            SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO, sal_False);
             if ( pDocInfItem )
             {
                 // parameter, e.g. from replayed macro
@@ -416,8 +416,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             else
             {
                 // no argument containing DocInfo; check optional arguments
-                BOOL bReadOnly = IsReadOnly();
-                SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE);
+                sal_Bool bReadOnly = IsReadOnly();
+                SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False);
                 if ( pROItem )
                     // override readonly attribute of document
                     // e.g. if a readonly document is saved elsewhere and user asks for editing DocInfo before
@@ -442,7 +442,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                     IsUseUserData() );
                 if ( !GetSlotState( SID_DOCTEMPLATE ) )
                     // templates not supported
-                    aDocInfoItem.SetTemplate(FALSE);
+                    aDocInfoItem.SetTemplate(sal_False);
 
                 SfxItemSet aSet(GetPool(), SID_DOCINFO, SID_DOCINFO, SID_DOC_READONLY, SID_DOC_READONLY,
                                 SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL,
@@ -456,7 +456,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 SfxDocumentInfoDialog *pDlg = CreateDocumentInfoDialog(0, aSet);
                 if ( RET_OK == pDlg->Execute() )
                 {
-                    SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO, FALSE);
+                    SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO, sal_False);
                     if ( pDocInfoItem )
                     {
                         // user has done some changes to DocumentInfo
@@ -492,7 +492,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             // derived class may decide to abort this
             if( !QuerySlotExecutable( nId ) )
             {
-                rReq.SetReturnValue( SfxBoolItem( 0, FALSE ) );
+                rReq.SetReturnValue( SfxBoolItem( 0, sal_False ) );
                 return;
             }
 
@@ -517,7 +517,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 if ( nId == SID_SAVEASDOC )
                 {
                     // in case of plugin mode the SaveAs operation means SaveTo
-                    SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, FALSE );
+                    SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, sal_False );
                     if ( pViewOnlyItem && pViewOnlyItem->GetValue() )
                         rReq.AppendItem( SfxBoolItem( SID_SAVETO, sal_True ) );
                 }
@@ -525,7 +525,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 // TODO/LATER: do the following GUI related actions in standalown method
                 // ========================================================================================================
                 // Introduce a status indicator for GUI operation
-                SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, FALSE );
+                SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False );
                 if ( !pStatusIndicatorItem )
                 {
                     // get statusindicator
@@ -564,7 +564,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 }
 
                 // Introduce an interaction handler for GUI operation
-                SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE );
+                SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False );
                 if ( !pInteractionHandlerItem )
                 {
                     uno::Reference< task::XInteractionHandler > xInteract;
@@ -599,8 +599,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 // ========================================================================================================
 
                 sal_Bool bPreselectPassword = sal_False;
-                SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, FALSE );
-                SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, FALSE );
+                SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False );
+                SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, sal_False );
                 if ( pOldEncryptionDataItem || pOldPasswordItem )
                     bPreselectPassword = sal_True;
 
@@ -643,7 +643,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                                      NULL );
                 rReq.SetArgs( aResultParams );
 
-                SFX_REQUEST_ARG( rReq, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, FALSE );
+                SFX_REQUEST_ARG( rReq, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, sal_False );
                 ::rtl::OUString aFilterName = pFilterNameItem ? ::rtl::OUString( pFilterNameItem->GetValue() )
                                                               : ::rtl::OUString();
                 const SfxFilter* pFilt = GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName );
@@ -680,14 +680,14 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             // by default versions should be preserved always except in case of an explicit
             // SaveAs via GUI, so the flag must be reset to guarantee this
             pImp->bPreserveVersions = sal_True;
-            ULONG lErr=GetErrorCode();
+            sal_uIntPtr lErr=GetErrorCode();
 
             if ( !lErr && nErrorCode )
                 lErr = nErrorCode;
 
             if ( lErr && nErrorCode == ERRCODE_NONE )
             {
-                SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, FALSE );
+                SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, sal_False );
                 if ( pWarnItem && pWarnItem->GetValue() )
                     nErrorCode = lErr;
             }
@@ -730,8 +730,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 return;
             }
 
-            BOOL bInFrameSet = FALSE;
-            USHORT nFrames=0;
+            sal_Bool bInFrameSet = sal_False;
+            sal_uInt16 nFrames=0;
             pFrame = SfxViewFrame::GetFirst( this );
             while ( pFrame )
             {
@@ -740,7 +740,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                     // Auf dieses Dokument existiert noch eine Sicht, die
                     // in einem FrameSet liegt; diese darf nat"urlich nicht
                     // geclosed werden
-                    bInFrameSet = TRUE;
+                    bInFrameSet = sal_True;
                 }
                 else
                     nFrames++;
@@ -761,8 +761,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             }
 
             // Parameter auswerten
-            SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, FALSE);
-            SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, FALSE);
+            SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, sal_False);
+            SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, sal_False);
             if ( pSaveItem )
             {
                 if ( pSaveItem->GetValue() )
@@ -785,22 +785,22 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                     }
                 }
                 else
-                    SetModified(FALSE);
+                    SetModified(sal_False);
             }
 
             // Benutzer bricht ab?
             if ( !PrepareClose( 2 ) )
             {
-                rReq.SetReturnValue( SfxBoolItem(0, FALSE) );
+                rReq.SetReturnValue( SfxBoolItem(0, sal_False) );
                 rReq.Done();
                 return;
             }
 
-            SetModified( FALSE );
-            ULONG lErr = GetErrorCode();
+            SetModified( sal_False );
+            sal_uIntPtr lErr = GetErrorCode();
             ErrorHandler::HandleError(lErr);
 
-            rReq.SetReturnValue( SfxBoolItem(0, TRUE) );
+            rReq.SetReturnValue( SfxBoolItem(0, sal_True) );
             rReq.Done();
             rReq.ReleaseArgs(); // da der Pool in Close zerst"ort wird
             DoClose();
@@ -833,9 +833,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 }
             }
 
-            SFX_REQUEST_ARG(rReq, pRegionItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, FALSE);
-            SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_TEMPLATE_NAME, FALSE);
-            SFX_REQUEST_ARG(rReq, pRegionNrItem, SfxUInt16Item, SID_TEMPLATE_REGION, FALSE);
+            SFX_REQUEST_ARG(rReq, pRegionItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False);
+            SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
+            SFX_REQUEST_ARG(rReq, pRegionNrItem, SfxUInt16Item, SID_TEMPLATE_REGION, sal_False);
             if ( (!pRegionItem && !pRegionNrItem ) || !pNameItem )
             {
                 DBG_ASSERT( rReq.IsAPI(), "non-API call without Arguments" );
@@ -891,10 +891,10 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 
     // Picklisten-Eintrag verhindern
     if ( rReq.IsAPI() )
-        GetMedium()->SetUpdatePickList( FALSE );
+        GetMedium()->SetUpdatePickList( sal_False );
     else if ( rReq.GetArgs() )
     {
-        SFX_ITEMSET_GET( *rReq.GetArgs(), pPicklistItem, SfxBoolItem, SID_PICKLIST, FALSE );
+        SFX_ITEMSET_GET( *rReq.GetArgs(), pPicklistItem, SfxBoolItem, SID_PICKLIST, sal_False );
         if ( pPicklistItem )
             GetMedium()->SetUpdatePickList( pPicklistItem->GetValue() );
     }
@@ -910,7 +910,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
     DBG_CHKTHIS(SfxObjectShell, 0);
     SfxWhichIter aIter( rSet );
 
-    for ( USHORT nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() )
+    for ( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() )
     {
         switch ( nWhich )
         {
@@ -944,7 +944,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
                 }
             case SID_SAVEDOC:
                 {
-                    BOOL bMediumRO = IsReadOnlyMedium();
+                    sal_Bool bMediumRO = IsReadOnlyMedium();
                     if ( !bMediumRO && GetMedium() && IsModified() )
                         rSet.Put(SfxStringItem(
                             nWhich, String(SfxResId(STR_SAVEDOC))));
@@ -1118,7 +1118,7 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq)
 void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet)
 {
     SfxWhichIter aIter(rSet);
-    for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
+    for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
     {
         switch ( nSID )
         {
@@ -1200,7 +1200,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
     {
         case SID_ACTIVATE:
         {
-            SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, TRUE );
+            SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, sal_True );
             if ( pFrame )
                 pFrame->GetFrame().Appear();
             rReq.SetReturnValue( SfxObjectItem( 0, pFrame ) );
@@ -1219,7 +1219,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
                 if ( aFileName.Len() )
                 {
                     SfxStringItem aName( SID_FILE_NAME, aFileName );
-                    SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, TRUE );
+                    SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, sal_True );
                     SFX_APP()->GetAppDispatcher_Impl()->Execute(
                         SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aName,
                         &aCreateView, 0L);
@@ -1384,7 +1384,7 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent )
             if ( (bHasSign && QueryBox( NULL, SfxResId( MSG_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN ) ).Execute() == RET_YES)
               || (!bHasSign && QueryBox( NULL, SfxResId( RID_XMLSEC_QUERY_SAVEBEFORESIGN ) ).Execute() == RET_YES) )
             {
-                USHORT nId = SID_SAVEDOC;
+                sal_uInt16 nId = SID_SAVEDOC;
                 if ( !GetMedium() || !GetMedium()->GetName().Len() )
                     nId = SID_SAVEASDOC;
                 SfxRequest aSaveRequest( nId, 0, GetPool() );
@@ -1472,22 +1472,22 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent )
 
 sal_uInt16 SfxObjectShell::GetDocumentSignatureState()
 {
-    return ImplGetSignatureState( FALSE );
+    return ImplGetSignatureState( sal_False );
 }
 
 void SfxObjectShell::SignDocumentContent()
 {
-    ImplSign( FALSE );
+    ImplSign( sal_False );
 }
 
 sal_uInt16 SfxObjectShell::GetScriptingSignatureState()
 {
-    return ImplGetSignatureState( TRUE );
+    return ImplGetSignatureState( sal_True );
 }
 
 void SfxObjectShell::SignScriptingContent()
 {
-    ImplSign( TRUE );
+    ImplSign( sal_True );
 }
 
 // static
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 60921e825e20..9a86e962cac6 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -195,7 +195,7 @@ sal_Bool SfxObjectShell::SaveAs( SfxMedium& rMedium )
 
 //-------------------------------------------------------------------------
 
-sal_Bool SfxObjectShell::QuerySlotExecutable( USHORT /*nSlotId*/ )
+sal_Bool SfxObjectShell::QuerySlotExecutable( sal_uInt16 /*nSlotId*/ )
 {
     return sal_True;
 }
@@ -889,7 +889,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
 
         if( xFilterCFG.is() )
         {
-            BOOL bAbort = FALSE;
+            sal_Bool bAbort = sal_False;
             try {
                 const SfxFilter* pFilter = pMedium->GetFilter();
                 Sequence < PropertyValue > aProps;
@@ -949,7 +949,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
                                                 pSet->Put( *pFilterData );
                                     }
                                     else
-                                        bAbort = TRUE;
+                                        bAbort = sal_True;
                                 }
                             }
 
@@ -1081,7 +1081,7 @@ sal_Bool SfxObjectShell::DoSave()
     return bOk;
 }
 
-void Lock_Impl( SfxObjectShell* pDoc, BOOL bLock )
+void Lock_Impl( SfxObjectShell* pDoc, sal_Bool bLock )
 {
     SfxViewFrame *pFrame= SfxViewFrame::GetFirst( pDoc );
     while ( pFrame )
@@ -1569,7 +1569,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
 
         if( bOk && !bCopyTo )
             // we also don't touch any graphical replacements here
-            bOk = SaveChildren( TRUE );
+            bOk = SaveChildren( sal_True );
     }
 
     if ( bOk )
@@ -1769,8 +1769,8 @@ sal_Bool SfxObjectShell::SaveTo_Impl
 #define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer
             // Header for a single-valued ASCII EA data item
             typedef struct _EA_ASCII_header {
-            USHORT      usAttr;                 /* value: EAT_ASCII                        */
-            USHORT      usLen;                  /* length of data                          */
+            sal_uInt16      usAttr;                 /* value: EAT_ASCII                        */
+            sal_uInt16      usLen;                  /* length of data                          */
             CHAR        szType[_MAX_PATH];      /* ASCII data fits in here ...             */
             } EA_ASCII_HEADER;
             char   filePath[_MAX_PATH];
@@ -1812,7 +1812,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
             eaAscii.usLen = strlen( eaAscii.szType);
             // fill libc EA data structure
             eaType.flags = 0;
-            eaType.size = sizeof(USHORT)*2 + eaAscii.usLen;
+            eaType.size = sizeof(sal_uInt16)*2 + eaAscii.usLen;
             eaType.value = &eaAscii;
             // put EA to file
             rc = _ea_put( &eaType, filePath, 0, ".TYPE");
@@ -1966,7 +1966,7 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
 
 //-------------------------------------------------------------------------
 
-sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, BOOL bCommit )
+sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
 {
     sal_Bool bOk = sal_False;
     {
@@ -2293,7 +2293,7 @@ sal_Bool SfxObjectShell::InsertFrom( SfxMedium& rMedium )
         const OUString sInputStream ( RTL_CONSTASCII_USTRINGPARAM ( "InputStream" ) );
 
         sal_Bool bHasInputStream = sal_False;
-        BOOL bHasBaseURL = FALSE;
+        sal_Bool bHasBaseURL = sal_False;
         sal_Int32 i;
         sal_Int32 nEnd = lDescriptor.getLength();
 
@@ -2388,7 +2388,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium )
         const OUString sInputStream ( RTL_CONSTASCII_USTRINGPARAM ( "InputStream" ) );
 
         sal_Bool bHasInputStream = sal_False;
-        BOOL bHasBaseURL = FALSE;
+        sal_Bool bHasBaseURL = sal_False;
         sal_Int32 i;
         sal_Int32 nEnd = lDescriptor.getLength();
 
@@ -2479,9 +2479,9 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium )
         // put in the REAL file name, and copy all PropertyValues
         const OUString sOutputStream ( RTL_CONSTASCII_USTRINGPARAM ( "OutputStream" ) );
         const OUString sStream ( RTL_CONSTASCII_USTRINGPARAM ( "StreamForOutput" ) );
-        BOOL bHasOutputStream = FALSE;
-        BOOL bHasStream = FALSE;
-        BOOL bHasBaseURL = FALSE;
+        sal_Bool bHasOutputStream = sal_False;
+        sal_Bool bHasStream = sal_False;
+        sal_Bool bHasBaseURL = sal_False;
         sal_Int32 i;
         sal_Int32 nEnd = aOldArgs.getLength();
 
@@ -2678,7 +2678,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet )
     DBG_CHKTHIS(SfxObjectShell, 0);
 
     pImp->bIsSaving = sal_True;
-    sal_Bool bSaved = FALSE;
+    sal_Bool bSaved = sal_False;
     SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False);
     if ( pSalvageItem )
     {
@@ -2772,7 +2772,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl
     SfxMedium *pActMed = GetMedium();
     const INetURLObject aActName(pActMed->GetName());
 
-    BOOL bWasReadonly = IsReadOnly();
+    sal_Bool bWasReadonly = IsReadOnly();
 
     if ( aURL == aActName && aURL != INetURLObject( OUString::createFromAscii( "private:stream" ) )
         && IsReadOnly() )
@@ -2968,7 +2968,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
             if ( !bCopyTo )
             {
                 // reconnect to the old medium
-                BOOL bRet( FALSE );
+                sal_Bool bRet( sal_False );
                 bRet = DoSaveCompleted( pMedium );
                 DBG_ASSERT( bRet, "Error in DoSaveCompleted, can't be handled!");
             }
@@ -3062,7 +3062,7 @@ sal_uInt16 SfxObjectShell::GetHiddenInformationState( sal_uInt16 nStates )
 sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent )
 {
     sal_Int16 nRet = RET_YES;
-    USHORT nResId = 0;
+    sal_uInt16 nResId = 0;
     SvtSecurityOptions::EOption eOption = static_cast< SvtSecurityOptions::EOption >( -1 );
 
     switch ( eFact )
@@ -3242,7 +3242,7 @@ uno::Reference< embed::XStorage > SfxObjectShell::GetStorage()
 }
 
 
-sal_Bool SfxObjectShell::SaveChildren( BOOL bObjectsOnly )
+sal_Bool SfxObjectShell::SaveChildren( sal_Bool bObjectsOnly )
 {
     RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::SaveChildren" );
 
@@ -3348,7 +3348,7 @@ sal_Bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >&
 
 #ifdef DBG_UTIL
     // check for wrong creation of object container
-    BOOL bHasContainer = ( pImp->mpObjectContainer != 0 );
+    sal_Bool bHasContainer = ( pImp->mpObjectContainer != 0 );
 #endif
 
     if ( !xStorage.is() || xStorage == GetStorage() )
@@ -3496,7 +3496,7 @@ sal_Bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorag
     sal_Bool bResult = sal_False;
 #ifdef DBG_UTIL
     // check for wrong creation of object container
-    BOOL bHasContainer = ( pImp->mpObjectContainer != 0 );
+    sal_Bool bHasContainer = ( pImp->mpObjectContainer != 0 );
 #endif
     if ( xStorage.is() )
     {
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 32d50de40d51..8573c4afc0f4 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -128,10 +128,10 @@ const SfxItemPropertyMapEntry* lcl_GetDocInfoPropertyMap()
     return aDocInfoPropertyMap_Impl;
 }
 
-static USHORT aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
+static sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
                                    31, 31, 30, 31, 30, 31 };
 
-inline USHORT DaysInMonth( USHORT nMonth, USHORT nYear )
+inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
 {
     if ( nMonth != 2 )
         return aDaysInMonth[nMonth-1];
@@ -708,7 +708,7 @@ void SAL_CALL SfxDocumentInfoObject::removeProperty(const ::rtl::OUString& sName
     return xPropSet->removeProperty(sName);
 }
 
-BOOL equalsDateTime( const util::DateTime& D1, const util::DateTime& D2 )
+sal_Bool equalsDateTime( const util::DateTime& D1, const util::DateTime& D2 )
 {
     return D1.HundredthSeconds == D2.HundredthSeconds &&
            D1.Seconds == D2.Seconds &&
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index a5141662fa3d..4255e9bd2939 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -815,7 +815,7 @@ void SfxObjectShell::InitBasicManager_Impl()
         changed to return the Basic manager currently under construction, when
         called repeatedly.
 
-        The variable pImp->bBasicInitialized will be set to TRUE after
+        The variable pImp->bBasicInitialized will be set to sal_True after
         construction now, to ensure that the recursive call of the function
         lcl_getBasicManagerForDocument() will be routed into this function too.
 
@@ -826,7 +826,7 @@ void SfxObjectShell::InitBasicManager_Impl()
     DBG_ASSERT( !pImp->bBasicInitialized && !pImp->pBasicManager->isValid(), "Lokaler BasicManager bereits vorhanden");
     pImp->pBasicManager->reset( BasicManagerRepository::getDocumentBasicManager( GetModel() ) );
     DBG_ASSERT( pImp->pBasicManager->isValid(), "SfxObjectShell::InitBasicManager_Impl: did not get a BasicManager!" );
-    pImp->bBasicInitialized = TRUE;
+    pImp->bBasicInitialized = sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -941,7 +941,7 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact )
     String aPrefix = String::CreateFromAscii( "private:factory/" );
     if ( aPrefix.Len() == aFact.Match( aPrefix ) )
         aFact.Erase( 0, aPrefix.Len() );
-    USHORT nPos = aFact.Search( '?' );
+    sal_uInt16 nPos = aFact.Search( '?' );
     String aParam;
     if ( nPos != STRING_NOTFOUND )
     {
@@ -1034,8 +1034,8 @@ SfxObjectShell* SfxObjectShell::CreateAndLoadObject( const SfxItemSet& rSet, Sfx
 {
     uno::Sequence < beans::PropertyValue > aProps;
     TransformItems( SID_OPENDOC, rSet, aProps );
-    SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE);
-    SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, FALSE);
+    SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False);
+    SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False);
     ::rtl::OUString aURL;
     ::rtl::OUString aTarget = rtl::OUString::createFromAscii("_blank");
     if ( pFileNameItem )
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index d6192542d1a1..2e0df56ba141 100755
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -590,14 +590,14 @@ void SfxOleFileTimeProperty::ImplSave( SvStream& rStrm )
 {
     DateTime aDateTimeUtc(
             Date(
-                static_cast< USHORT >( maDateTime.Day ),
-                static_cast< USHORT >( maDateTime.Month ),
-                static_cast< USHORT >( maDateTime.Year ) ),
+                static_cast< sal_uInt16 >( maDateTime.Day ),
+                static_cast< sal_uInt16 >( maDateTime.Month ),
+                static_cast< sal_uInt16 >( maDateTime.Year ) ),
             Time(
-                static_cast< ULONG >( maDateTime.Hours ),
-                static_cast< ULONG >( maDateTime.Minutes ),
-                static_cast< ULONG >( maDateTime.Seconds ),
-                static_cast< ULONG >( maDateTime.HundredthSeconds ) ) );
+                static_cast< sal_uIntPtr >( maDateTime.Hours ),
+                static_cast< sal_uIntPtr >( maDateTime.Minutes ),
+                static_cast< sal_uIntPtr >( maDateTime.Seconds ),
+                static_cast< sal_uIntPtr >( maDateTime.HundredthSeconds ) ) );
     // invalid time stamp is not converted to UTC
     // heuristic to detect editing durations (which we assume to be < 1 year):
     // check only the year, not the entire date
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 9ff8c73acbf6..8c731845554f 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -105,7 +105,7 @@ throw( uno::RuntimeException )
 {
     uno::Reference< plugin::XPluginManager > xPMgr( mxFact->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.plugin.PluginManager") ), uno::UNO_QUERY );
     if (!xPMgr.is() )
-        return FALSE;
+        return sal_False;
 
     if ( SvtMiscOptions().IsPluginsEnabled() )
     {
@@ -115,10 +115,10 @@ throw( uno::RuntimeException )
         pWin->SetBackground();
         pWin->Show();
 
-        ULONG nCount = maCmdList.Count();
+        sal_uIntPtr nCount = maCmdList.Count();
         uno::Sequence < ::rtl::OUString > aCmds( nCount ), aArgs( nCount );
         ::rtl::OUString *pCmds = aCmds.getArray(), *pArgs = aArgs.getArray();
-        for( ULONG i = 0; i < nCount; i++ )
+        for( sal_uIntPtr i = 0; i < nCount; i++ )
         {
             SvCommand & rCmd = maCmdList.GetObject( i );
             pCmds[i] = rCmd.GetCommand();
@@ -136,7 +136,7 @@ throw( uno::RuntimeException )
             {
                 pWin->xWindow = xWindow;
                 pWin->Resize();
-                xWindow->setVisible( TRUE );
+                xWindow->setVisible( sal_True );
             }
 
             try
@@ -165,10 +165,10 @@ throw( uno::RuntimeException )
         // we must destroy the plugin before the parent is destroyed
         xWindow->addEventListener( this );
         xFrame->setComponent( xWindow, uno::Reference < frame::XController >() );
-        return mxPlugin.is() ? TRUE : FALSE;
+        return mxPlugin.is() ? sal_True : sal_False;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL PluginObject::cancel() throw( com::sun::star::uno::RuntimeException )
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index d088f6981f49..8bf97ba5b435 100755
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -422,8 +422,8 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
             rtl::OUString aTmp;
             if ( ( rProp.Value >>= aTmp ) == sal_False )
                 throw ::com::sun::star::lang::IllegalArgumentException();
-            USHORT nCount = pPrinter->GetPaperBinCount();
-            for (USHORT nBin=0; nBin<nCount; nBin++)
+            sal_uInt16 nCount = pPrinter->GetPaperBinCount();
+            for (sal_uInt16 nBin=0; nBin<nCount; nBin++)
             {
                 ::rtl::OUString aName( pPrinter->GetPaperBinName(nBin) );
                 if ( aName == aTmp )
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 13a42e3721c4..32b46bb67e4d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -511,10 +511,10 @@ SfxSaveGuard::~SfxSaveGuard()
     m_pData->m_bSaving = sal_False;
 
     // m_bSuicide was set e.g. in case somewhere tried to close a document, while it was used for
-    // storing at the same time. Further m_bSuicide was set to TRUE only if close(TRUE) was called.
+    // storing at the same time. Further m_bSuicide was set to sal_True only if close(sal_True) was called.
     // So the owner ship was delegated to the place where a veto exception was thrown.
     // Now we have to call close() again and delegate the owner ship to the next one, which
-    // cant accept that. Close(FALSE) cant work in this case. Because then the document will may be never closed ...
+    // cant accept that. Close(sal_False) cant work in this case. Because then the document will may be never closed ...
 
     if ( m_pData->m_bSuicide )
     {
@@ -1860,7 +1860,7 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
         }
 
         // !TODO: currently not working
-        //SFX_ITEMSET_ARG( pParams, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE );
+        //SFX_ITEMSET_ARG( pParams, pFrameItem, SfxFrameItem, SID_DOCFRAME, sal_False );
         //if( pFrameItem && pFrameItem->GetFrame() )
         //{
         //  SfxFrame* pFrame = pFrameItem->GetFrame();
@@ -1889,7 +1889,7 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
             if ( nError == ERRCODE_IO_BROKENPACKAGE && xHandler.is() )
             {
                 ::rtl::OUString aDocName = pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE );
+                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
                 if ( !pRepairItem || !pRepairItem->GetValue() )
                 {
                     RequestPackageReparation aRequest( aDocName );
@@ -1948,12 +1948,12 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
 
         if ( nError )
         {
-            BOOL bSilent = FALSE;
+            sal_Bool bSilent = sal_False;
             SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSilentItem, SfxBoolItem, SID_SILENT, sal_False);
             if( pSilentItem )
                 bSilent = pSilentItem->GetValue();
 
-              BOOL bWarning = ((nError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
+              sal_Bool bWarning = ((nError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
             if ( nError != ERRCODE_IO_BROKENPACKAGE && !bSilent )
             {
                 // broken package was handled already
@@ -1979,7 +1979,7 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
             }
         }
 
-        BOOL bHidden = FALSE;
+        sal_Bool bHidden = sal_False;
         SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHidItem, SfxBoolItem, SID_HIDDEN, sal_False);
         if ( pHidItem )
             bHidden = pHidItem->GetValue();
@@ -2028,7 +2028,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
                 aDesc.maSize = OutputDevice::LogicToLogic( aSize, aMapUnit, MAP_100TH_MM );
                 aDesc.maDragStartPos = Point();
                 aDesc.maDisplayName = String();
-                aDesc.mbCanLink = FALSE;
+                aDesc.mbCanLink = sal_False;
 
                 SvMemoryStream aMemStm( 1024, 1024 );
                 aMemStm << aDesc;
@@ -2044,7 +2044,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
                 try
                 {
                     utl::TempFile aTmp;
-                    aTmp.EnableKillingFile( TRUE );
+                    aTmp.EnableKillingFile( sal_True );
                     storeToURL( aTmp.GetURL(), uno::Sequence < beans::PropertyValue >() );
                     SvStream* pStream = aTmp.GetStream( STREAM_READ );
                     const sal_uInt32 nLen = pStream->Seek( STREAM_SEEK_TO_END );
@@ -3090,7 +3090,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData()
         for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst( m_pData->m_pObjectShell ); pFrame;
                 pFrame = SfxViewFrame::GetNext( *pFrame, m_pData->m_pObjectShell ) )
         {
-            BOOL bIsActive = ( pFrame == pActFrame );
+            sal_Bool bIsActive = ( pFrame == pActFrame );
             pFrame->GetViewShell()->WriteUserDataSequence( aSeq );
             aAny <<= aSeq;
             xCont->insertByIndex( bIsActive ? 0 : nCount, aAny );
@@ -3361,7 +3361,7 @@ static void ConvertSlotsToCommands( SfxObjectShell* pDoc, uno::Reference< contai
                     rtl::OUString aSlot( aCommand.copy( 5 ));
 
                     // We have to replace the old "slot-Command" with our new ".uno:-Command"
-                    const SfxSlot* pSlot = pModule->GetSlotPool()->GetSlot( USHORT( aSlot.toInt32() ));
+                    const SfxSlot* pSlot = pModule->GetSlotPool()->GetSlot( sal_uInt16( aSlot.toInt32() ));
                     if ( pSlot )
                     {
                         rtl::OUStringBuffer aStrBuf( aUnoCmd );
@@ -3611,12 +3611,12 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const uno::Reference< XSTORAGE >& x
     pMedium->GetItemSet()->Put( aSet );
 
     // allow to use an interactionhandler (if there is one)
-    pMedium->UseInteractionHandler( TRUE );
+    pMedium->UseInteractionHandler( sal_True );
 
     SFX_ITEMSET_ARG( &aSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE, sal_False);
-    BOOL bTemplate = pTemplateItem && pTemplateItem->GetValue();
+    sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue();
     m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC );
-    m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = FALSE;
+    m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = sal_False;
 
     // load document
     if ( !m_pData->m_pObjectShell->DoLoad(pMedium) )
@@ -3669,11 +3669,11 @@ void SAL_CALL SfxBaseModel::storeToStorage( const uno::Reference< XSTORAGE >& xS
 
         // BaseURL is part of the ItemSet
         SfxMedium aMedium( xStorage, String(), &aSet );
-        aMedium.CanDisposeStorage_Impl( FALSE );
+        aMedium.CanDisposeStorage_Impl( sal_False );
         if ( aMedium.GetFilter() )
         {
             // storing without a valid filter will often crash
-            bSuccess = m_pData->m_pObjectShell->DoSaveObjectAs( aMedium, TRUE );
+            bSuccess = m_pData->m_pObjectShell->DoSaveObjectAs( aMedium, sal_True );
             m_pData->m_pObjectShell->DoSaveCompleted( NULL );
         }
     }
@@ -3712,7 +3712,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const uno::Reference< XSTORAGE >& x
                                             nError ? nError : ERRCODE_IO_GENERAL );
     }
 
-    m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = FALSE;
+    m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = sal_False;
 }
 
 uno::Reference< XSTORAGE > SAL_CALL SfxBaseModel::getDocumentStorage()
@@ -4037,9 +4037,9 @@ namespace sfx { namespace intern {
 SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const
 {
     SfxViewFrame* pViewFrame = NULL;
-    for (   pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), FALSE );
+    for (   pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), sal_False );
             pViewFrame;
-            pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), FALSE )
+            pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), sal_False )
         )
     {
         if ( pViewFrame->GetFrame().GetFrameInterface() == i_rFrame )
@@ -4146,18 +4146,18 @@ css::uno::Reference< css::frame::XController2 > SAL_CALL SfxBaseModel::createVie
     // some initial view settings, coming from our most recent attachResource call
     ::comphelper::NamedValueCollection aDocumentLoadArgs( getArgs() );
     if ( aDocumentLoadArgs.getOrDefault( "ViewOnly", false ) )
-        pViewFrame->GetFrame().SetMenuBarOn_Impl( FALSE );
+        pViewFrame->GetFrame().SetMenuBarOn_Impl( sal_False );
 
     const sal_Int16 nPluginMode = aDocumentLoadArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
     if ( nPluginMode == 1 )
     {
-        pViewFrame->ForceOuterResize_Impl( FALSE );
-        pViewFrame->GetBindings().HidePopups( TRUE );
+        pViewFrame->ForceOuterResize_Impl( sal_False );
+        pViewFrame->GetBindings().HidePopups( sal_True );
 
         SfxFrame& rFrame = pViewFrame->GetFrame();
         // MBA: layoutmanager of inplace frame starts locked and invisible
-        rFrame.GetWorkWindow_Impl()->MakeVisible_Impl( FALSE );
-        rFrame.GetWorkWindow_Impl()->Lock_Impl( TRUE );
+        rFrame.GetWorkWindow_Impl()->MakeVisible_Impl( sal_False );
+        rFrame.GetWorkWindow_Impl()->Lock_Impl( sal_True );
 
         rFrame.GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
         pViewFrame->GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index 63c165bea7eb..32d1cf2cf6fd 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -72,7 +72,7 @@ public:
 class CntItemPool: public SfxItemPool
 {
     static CntItemPool* _pThePool;
-    USHORT              _nRefs;
+    sal_uInt16              _nRefs;
 
 protected:
              CntItemPool();
@@ -80,7 +80,7 @@ protected:
 
 public:
     static CntItemPool* Acquire();
-    static USHORT       Release();
+    static sal_uInt16       Release();
 };
 
 //----------------------------------------------------------------------------
@@ -95,7 +95,7 @@ SfxItemPool* NoChaos::GetItemPool()
 
 //----------------------------------------------------------------------------
 // static
-USHORT NoChaos::ReleaseItemPool()
+sal_uInt16 NoChaos::ReleaseItemPool()
 {
     // Release CHAOS item pool.
     return CntItemPool::Release();
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/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 1b3a943c4690..7da892ca89c9 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -126,11 +126,11 @@ public:
     SfxProgress*                        pProgress;
     ISfxTemplateCommon*                 pTemplateCommon;
 
-    USHORT                              nDocModalMode;              // counts documents in modal mode
-    USHORT                              nAutoTabPageId;
-    USHORT                              nRescheduleLocks;
-    USHORT                              nInReschedule;
-    USHORT                              nAsynchronCalls;
+    sal_uInt16                              nDocModalMode;              // counts documents in modal mode
+    sal_uInt16                              nAutoTabPageId;
+    sal_uInt16                              nRescheduleLocks;
+    sal_uInt16                              nInReschedule;
+    sal_uInt16                              nAsynchronCalls;
 
     rtl::Reference< sfx2::appl::ImeStatusWindow > m_xImeStatusWindow;
 
@@ -152,19 +152,19 @@ public:
     SfxDispatcher*              pAppDispat;     // Dispatcher falls kein Doc
     SfxInterface**              pInterfaces;
 
-    USHORT                      nDocNo;             // Laufende Doc-Nummer (AutoName)
-    USHORT                      nInterfaces;
+    sal_uInt16                      nDocNo;             // Laufende Doc-Nummer (AutoName)
+    sal_uInt16                      nInterfaces;
 
-    BOOL                        bDispatcherLocked:1;    // nichts ausf"uhren
-    BOOL                        bDowning:1;   // TRUE ab Exit und danach
-    BOOL                        bInQuit : 1;
-    BOOL                        bInvalidateOnUnlock : 1;
-    BOOL                        bODFVersionWarningLater : 1;
+    sal_Bool                        bDispatcherLocked:1;    // nichts ausf"uhren
+    sal_Bool                        bDowning:1;   // sal_True ab Exit und danach
+    sal_Bool                        bInQuit : 1;
+    sal_Bool                        bInvalidateOnUnlock : 1;
+    sal_Bool                        bODFVersionWarningLater : 1;
 
                                 SfxAppData_Impl( SfxApplication* );
                                 ~SfxAppData_Impl();
 
-    void                        UpdateApplicationSettings( BOOL bDontHide );
+    void                        UpdateApplicationSettings( sal_Bool bDontHide );
     SfxDocumentTemplates*       GetDocumentTemplates();
     void                        DeInitDDE();
 
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 83ed69ccb78e..4964cf30233d 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -130,7 +130,7 @@ public:
     virtual void SAL_CALL       disposing( const EVENTOBJECT& Source )
                                     throw( RUNTIMEEXCEPTION );
 
-    static SvxMacro*            ConvertToMacro( const ANY& rElement, SfxObjectShell* pDoc, BOOL bNormalizeMacro );
+    static SvxMacro*            ConvertToMacro( const ANY& rElement, SfxObjectShell* pDoc, sal_Bool bNormalizeMacro );
     static void                 NormalizeMacro( const ANY& rIn, ANY& rOut, SfxObjectShell* pDoc );
     static void                 NormalizeMacro(
                                     const ::comphelper::NamedValueCollection& i_eventDescriptor,
diff --git a/sfx2/source/inc/fltfnc.hxx b/sfx2/source/inc/fltfnc.hxx
index 0a078a33c5be..bac498b6f765 100644
--- a/sfx2/source/inc/fltfnc.hxx
+++ b/sfx2/source/inc/fltfnc.hxx
@@ -29,7 +29,7 @@
 
 #include <sfx2/fcontnr.hxx>
 
-BOOL SfxIsHelpEntryURL( const String &rURL, const String &rExtMask );
+sal_Bool SfxIsHelpEntryURL( const String &rURL, const String &rExtMask );
 
 #endif
 
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/mailmodel.hxx b/sfx2/source/inc/mailmodel.hxx
index 43e938d46800..148c99095edb 100644
--- a/sfx2/source/inc/mailmodel.hxx
+++ b/sfx2/source/inc/mailmodel.hxx
@@ -100,6 +100,6 @@ public:
     SendMailResult      Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const rtl::OUString& rType );
 };
 
-BOOL CreateFromAddress_Impl( String& rFrom );
+sal_Bool CreateFromAddress_Impl( String& rFrom );
 
 #endif // INCLUDED_SFX_MAILMODEL_HXX
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/nfltdlg.hxx b/sfx2/source/inc/nfltdlg.hxx
index 371fa96c57a2..09a5c0a2c5ec 100644
--- a/sfx2/source/inc/nfltdlg.hxx
+++ b/sfx2/source/inc/nfltdlg.hxx
@@ -57,7 +57,7 @@ public:
     SfxFilterDialog( Window * pParent,
                      SfxMedium* pMed,
                      const SfxFilterMatcher &rMatcher,
-                     const String *pDefFilter, BOOL bShowConvert = TRUE );
+                     const String *pDefFilter, sal_Bool bShowConvert = sal_True );
 
     String GetSelectEntry() const;
 };
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/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index 5667a6c1e67a..b8e5bb35068c 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -38,7 +38,7 @@ class SfxRecordingFloatWrapper_Impl : public SfxChildWindow
     SfxBindings*        pBindings;
 public:
                         SfxRecordingFloatWrapper_Impl( Window* pParent ,
-                                                USHORT nId ,
+                                                sal_uInt16 nId ,
                                                 SfxBindings* pBindings ,
                                                 SfxChildWinInfo* pInfo );
                         ~SfxRecordingFloatWrapper_Impl();
@@ -57,7 +57,7 @@ public:
                             SfxChildWindow* pChildWin ,
                             Window* pParent );
     virtual             ~SfxRecordingFloat_Impl();
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
     virtual void        FillInfo( SfxChildWinInfo& rInfo ) const;
     virtual void        StateChanged( StateChangedType nStateChange );
 
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/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 5454da573cb5..5c01b0d53259 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -155,29 +155,29 @@ struct StringList_Impl : private Resource
 
     ResId aResId;
 
-    StringList_Impl( const ResId& rErrIdP,  USHORT nId)
+    StringList_Impl( const ResId& rErrIdP,  sal_uInt16 nId)
         : Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr()){}
     ~StringList_Impl() { FreeResource(); }
 
     String GetString(){ return String( aResId ); }
-    operator BOOL(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
+    operator sal_Bool(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
 
 };
 
 #define SFX_DEL_PTRARR(pArr)                                    \
             {                                                   \
-                for ( USHORT n = (pArr)->Count(); n--; )        \
+                for ( sal_uInt16 n = (pArr)->Count(); n--; )        \
                     delete (pArr)->GetObject(n);                \
                 DELETEX(pArr);                                  \
             }
 
 class SfxBoolResetter
 {
-    BOOL&               _rVar;
-    BOOL                _bOld;
+    sal_Bool&               _rVar;
+    sal_Bool                _bOld;
 
 public:
-                        SfxBoolResetter( BOOL &rVar )
+                        SfxBoolResetter( sal_Bool &rVar )
                         :   _rVar( rVar ),
                             _bOld( rVar )
                         {}
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/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 5105d27dd536..4c4ad9cf9390 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -46,21 +46,21 @@ private:
     SfxChildAlignment   eAlign;
     SfxWorkWindow*      pWorkWin;
     SfxDockArr_Impl*    pDockArr;
-    BOOL                bLocked;
-    BOOL                bPinned;
+    sal_Bool                bLocked;
+    sal_Bool                bPinned;
     SfxEmptySplitWin_Impl*  pEmptyWin;
     SfxDockingWindow*   pActive;
 
     void                InsertWindow_Impl( SfxDock_Impl* pDockWin,
                             const Size& rSize,
-                            USHORT nLine,
-                            USHORT nPos,
-                            BOOL bNewLine=FALSE );
+                            sal_uInt16 nLine,
+                            sal_uInt16 nPos,
+                            sal_Bool bNewLine=sal_False );
 
     DECL_LINK(          TimerHdl, Timer* );
-    BOOL                CursorIsOverRect( BOOL bForceAdding = FALSE ) const;
-    void                SetPinned_Impl( BOOL );
-    void                SetFadeIn_Impl( BOOL );
+    sal_Bool                CursorIsOverRect( sal_Bool bForceAdding = sal_False ) const;
+    void                SetPinned_Impl( sal_Bool );
+    void                SetFadeIn_Impl( sal_Bool );
     void                SaveConfig_Impl();
     void                FadeOut_Impl();
 
@@ -74,57 +74,57 @@ protected:
 
 public:
                         SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
-                            SfxWorkWindow *pW, BOOL bWithButtons,
+                            SfxWorkWindow *pW, sal_Bool bWithButtons,
                             WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK );
 
                         ~SfxSplitWindow();
 
-    void                ReleaseWindow_Impl(SfxDockingWindow *pWin, BOOL bSaveConfig=TRUE);
+    void                ReleaseWindow_Impl(SfxDockingWindow *pWin, sal_Bool bSaveConfig=sal_True);
 
     void                InsertWindow( SfxDockingWindow* pDockWin,
                             const Size& rSize);
 
     void                InsertWindow( SfxDockingWindow* pDockWin,
                             const Size& rSize,
-                            USHORT nLine,
-                            USHORT nPos,
-                            BOOL bNewLine=FALSE );
+                            sal_uInt16 nLine,
+                            sal_uInt16 nPos,
+                            sal_Bool bNewLine=sal_False );
 
     void                MoveWindow( SfxDockingWindow* pDockWin,
                             const Size& rSize,
-                            USHORT nLine,
-                            USHORT nPos,
-                            BOOL bNewLine=FALSE );
+                            sal_uInt16 nLine,
+                            sal_uInt16 nPos,
+                            sal_Bool bNewLine=sal_False );
 
-    void                RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide=TRUE);
+    void                RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide=sal_True);
 
-    void                Lock( BOOL bLock=TRUE )
+    void                Lock( sal_Bool bLock=sal_True )
                         {
                             bLocked = bLock;
                             SetUpdateMode( !bLock );
                         }
         using Window::IsLocked;
-    BOOL                IsLocked() const { return bLocked; }
-    BOOL                GetWindowPos( const SfxDockingWindow* pWindow,
-                                      USHORT& rLine, USHORT& rPos ) const;
-    BOOL                GetWindowPos( const Point& rTestPos,
-                                      USHORT& rLine, USHORT& rPos ) const;
-    USHORT              GetLineCount() const;
-    long                GetLineSize( USHORT ) const;
-    USHORT              GetWindowCount(USHORT nLine) const;
-    USHORT              GetWindowCount() const;
-
-    BOOL                IsPinned() const { return bPinned; }
-    BOOL                IsFadeIn() const;
-    BOOL                IsAutoHide( BOOL bSelf = FALSE ) const;
+    sal_Bool                IsLocked() const { return bLocked; }
+    sal_Bool                GetWindowPos( const SfxDockingWindow* pWindow,
+                                      sal_uInt16& rLine, sal_uInt16& rPos ) const;
+    sal_Bool                GetWindowPos( const Point& rTestPos,
+                                      sal_uInt16& rLine, sal_uInt16& rPos ) const;
+    sal_uInt16              GetLineCount() const;
+    long                GetLineSize( sal_uInt16 ) const;
+    sal_uInt16              GetWindowCount(sal_uInt16 nLine) const;
+    sal_uInt16              GetWindowCount() const;
+
+    sal_Bool                IsPinned() const { return bPinned; }
+    sal_Bool                IsFadeIn() const;
+    sal_Bool                IsAutoHide( sal_Bool bSelf = sal_False ) const;
     SplitWindow*        GetSplitWindow();
 
     virtual void        AutoHide();
     virtual void        FadeOut();
     virtual void        FadeIn();
     void                Show_Impl();
-    void                Pin_Impl( BOOL bPinned );
-    BOOL                ActivateNextChild_Impl( BOOL bForward = TRUE );
+    void                Pin_Impl( sal_Bool bPinned );
+    sal_Bool                ActivateNextChild_Impl( sal_Bool bForward = sal_True );
     void                SetActiveWindow_Impl( SfxDockingWindow* pWin );
 };
 
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 03b0d72dac61..19e1c3e12587 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -95,7 +95,7 @@ friend class BindDispatch_Impl;
 
 private:
                             SfxStateCache( const SfxStateCache& rOrig ); // n.i.
-    void                    SetState_Impl( SfxItemState, const SfxPoolItem*, BOOL bMaybeDirty=FALSE );
+    void                    SetState_Impl( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False );
 
 public:
                             SfxStateCache( sal_uInt16 nFuncId );
@@ -113,11 +113,11 @@ public:
     SfxPoolItem*            GetItem() const { return pLastItem; }
     void                    ClearCache();
 
-    void                    SetState( SfxItemState, const SfxPoolItem*, BOOL bMaybeDirty=FALSE );
-    void                    SetCachedState(BOOL bAlways = FALSE);
+    void                    SetState( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False );
+    void                    SetCachedState(sal_Bool bAlways = sal_False);
     void                    DeleteFloatingWindows();
     void                    Invalidate( sal_Bool bWithSlot );
-    void                    SetVisibleState( BOOL bShow=TRUE );
+    void                    SetVisibleState( sal_Bool bShow=sal_True );
 
     SfxControllerItem*      ChangeItemLink( SfxControllerItem* pNewBinding );
     SfxControllerItem*      GetItemLink() const;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 116f56163681..64c9b539d2be 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -75,7 +75,7 @@ private:
 
 protected:
     SfxCommonTemplateDialog_Impl* pDialog;
-    USHORT                        nModifier;
+    sal_uInt16                        nModifier;
 
 public:
     DropListBox_Impl( Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) :
@@ -88,7 +88,7 @@ public:
     using SvLBox::ExecuteDrop;
     virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
 
-    USHORT           GetModifier() const { return nModifier; }
+    sal_uInt16           GetModifier() const { return nModifier; }
 
     virtual long     Notify( NotifyEvent& rNEvt );
 };
@@ -166,11 +166,11 @@ protected:
     ListBox                     aFilterLb;
     Size                        aSize;
 
-    USHORT                      nActFamily; // Id in der ToolBox = Position - 1
-    USHORT                      nActFilter; // FilterIdx
-    USHORT                      nAppFilter; // Filter, den die Applikation gesetzt hat (fuer automatisch)
+    sal_uInt16                      nActFamily; // Id in der ToolBox = Position - 1
+    sal_uInt16                      nActFilter; // FilterIdx
+    sal_uInt16                      nAppFilter; // Filter, den die Applikation gesetzt hat (fuer automatisch)
 
-    BOOL                        bDontUpdate             :1,
+    sal_Bool                        bDontUpdate             :1,
                                 bIsWater                :1,
                                 bEnabled                :1,
                                 bUpdate                 :1,
@@ -192,14 +192,14 @@ protected:
     DECL_LINK( TimeOut, Timer * );
 
 
-    virtual void        EnableItem( USHORT /*nMesId*/, BOOL /*bCheck*/ = TRUE ) {}
-    virtual void        CheckItem( USHORT /*nMesId*/, BOOL /*bCheck*/ = TRUE ) {}
-    virtual BOOL        IsCheckedItem( USHORT /*nMesId*/ ) { return TRUE; }
+    virtual void        EnableItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {}
+    virtual void        CheckItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {}
+    virtual sal_Bool        IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return sal_True; }
     virtual void        LoadedFamilies() {}
     virtual void        Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); }
     virtual void        InvalidateBindings();
-    virtual void        InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten ) = 0;
-    virtual void        EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE ) = 0;
+    virtual void        InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) = 0;
+    virtual void        EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ) = 0;
     virtual void        ClearFamilyList() = 0;
     virtual void        ReplaceUpdateButtonByMenu();
 
@@ -207,37 +207,37 @@ protected:
     void                EditHdl( void* );
     void                DeleteHdl( void* );
 
-    BOOL                Execute_Impl( USHORT nId, const String& rStr, const String& rRefStr,
-                                      USHORT nFamily, USHORT nMask = 0,
-                                      USHORT* pIdx = NULL, const USHORT* pModifier = NULL );
+    sal_Bool                Execute_Impl( sal_uInt16 nId, const String& rStr, const String& rRefStr,
+                                      sal_uInt16 nFamily, sal_uInt16 nMask = 0,
+                                      sal_uInt16* pIdx = NULL, const sal_uInt16* pModifier = NULL );
 
-    void                        UpdateStyles_Impl(USHORT nFlags);
+    void                        UpdateStyles_Impl(sal_uInt16 nFlags);
     const SfxStyleFamilyItem*   GetFamilyItem_Impl() const;
-    BOOL                        IsInitialized() { return nActFamily != 0xffff; }
+    sal_Bool                        IsInitialized() { return nActFamily != 0xffff; }
     void                        ResetFocus();
     void                        EnableDelete();
     void                        Initialize();
 
-    void                FilterSelect( USHORT nFilterIdx, BOOL bForce = FALSE );
-    void                SetFamilyState( USHORT nSlotId, const SfxTemplateItem* );
+    void                FilterSelect( sal_uInt16 nFilterIdx, sal_Bool bForce = sal_False );
+    void                SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* );
     void                SetWaterCanState( const SfxBoolItem* pItem );
 
     void                SelectStyle( const String& rStyle );
-    BOOL                HasSelectedStyle() const;
+    sal_Bool                HasSelectedStyle() const;
     void                FillTreeBox();
     void                Update_Impl();
     void                UpdateFamily_Impl();
 
     // In welchem FamilyState muss ich nachsehen, um die Info der i-ten
     // Family in der pStyleFamilies zu bekommen.
-    USHORT              StyleNrToInfoOffset( USHORT i );
-    USHORT              InfoOffsetToStyleNr( USHORT i );
+    sal_uInt16              StyleNrToInfoOffset( sal_uInt16 i );
+    sal_uInt16              InfoOffsetToStyleNr( sal_uInt16 i );
 
     void                Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    void                FamilySelect( USHORT nId );
-    void                SetFamily( USHORT nId );
-    void                ActionSelect( USHORT nId );
+    void                FamilySelect( sal_uInt16 nId );
+    void                SetFamily( sal_uInt16 nId );
+    void                ActionSelect( sal_uInt16 nId );
 
     sal_Int32           LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh );
     void                SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, sal_Int32 i_nFilter );
@@ -251,31 +251,31 @@ public:
 
     DECL_LINK( MenuSelectHdl, Menu * );
 
-    virtual void        EnableEdit( BOOL b = TRUE ) { bCanEdit = b; }
-    virtual void        EnableDel( BOOL b = TRUE )  { bCanDel = b; }
-    virtual void        EnableNew( BOOL b = TRUE )  { bCanNew = b; }
+    virtual void        EnableEdit( sal_Bool b = sal_True ) { bCanEdit = b; }
+    virtual void        EnableDel( sal_Bool b = sal_True )  { bCanDel = b; }
+    virtual void        EnableNew( sal_Bool b = sal_True )  { bCanNew = b; }
 
     ISfxTemplateCommon* GetISfxTemplateCommon() { return &aISfxTemplateCommon; }
     Window*             GetWindow() { return pWindow; }
 
-    void                EnableTreeDrag( BOOL b = TRUE );
+    void                EnableTreeDrag( sal_Bool b = sal_True );
     void                ExecuteContextMenu_Impl( const Point& rPos, Window* pWin );
-    void                EnableExample_Impl( USHORT nId, BOOL bEnable );
+    void                EnableExample_Impl( sal_uInt16 nId, sal_Bool bEnable );
     SfxStyleFamily      GetActualFamily() const;
     String              GetSelectedEntry() const;
     SfxObjectShell*     GetObjectShell() const { return pCurObjShell; }
 
     virtual void        PrepareDeleteAction();  // disable buttons, change button text, etc. when del is going to happen
 
-    inline BOOL         CanEdit( void ) const   { return bCanEdit; }
-    inline BOOL         CanDel( void ) const    { return bCanDel; }
-    inline BOOL         CanNew( void ) const    { return bCanNew; }
+    inline sal_Bool         CanEdit( void ) const   { return bCanEdit; }
+    inline sal_Bool         CanDel( void ) const    { return bCanDel; }
+    inline sal_Bool         CanNew( void ) const    { return bCanNew; }
 
     // normaly for derivates from SvTreeListBoxes, but in this case the dialog handles context menus
     virtual PopupMenu*  CreateContextMenu( void );
 
     // Rechnet von den SFX_STYLE_FAMILY Ids auf 1-5 um
-    static USHORT       SfxFamilyIdToNId( SfxStyleFamily nFamily );
+    static sal_uInt16       SfxFamilyIdToNId( SfxStyleFamily nFamily );
 
     void                SetAutomaticFilter();
 };
@@ -303,7 +303,7 @@ private:
     friend class DropToolBox_Impl;
 
     SfxTemplateDialog*  m_pFloat;
-    BOOL                m_bZoomIn;
+    sal_Bool                m_bZoomIn;
     DropToolBox_Impl    m_aActionTbL;
     ToolBox             m_aActionTbR;
 
@@ -314,13 +314,13 @@ private:
 
 protected:
     virtual void    Command( const CommandEvent& rMEvt );
-    virtual void    EnableEdit( BOOL = TRUE );
-    virtual void    EnableItem( USHORT nMesId, BOOL bCheck = TRUE );
-    virtual void    CheckItem( USHORT nMesId, BOOL bCheck = TRUE );
-    virtual BOOL    IsCheckedItem( USHORT nMesId );
+    virtual void    EnableEdit( sal_Bool = sal_True );
+    virtual void    EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+    virtual void    CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+    virtual sal_Bool    IsCheckedItem( sal_uInt16 nMesId );
     virtual void    LoadedFamilies();
-    virtual void    InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten );
-    virtual void    EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE );
+    virtual void    InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten );
+    virtual void    EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True );
     virtual void    ClearFamilyList();
     virtual void    ReplaceUpdateButtonByMenu();
 
@@ -360,15 +360,15 @@ private:
     SfxModalDefParentHelper aHelper;
 
 protected:
-    virtual void    EnableItem( USHORT nMesId, BOOL bCheck = TRUE );
-    virtual void    CheckItem( USHORT nMesId, BOOL bCheck = TRUE );
-    virtual BOOL    IsCheckedItem( USHORT nMesId );
-    virtual void    InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten );
-    virtual void    EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE );
+    virtual void    EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+    virtual void    CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+    virtual sal_Bool    IsCheckedItem( sal_uInt16 nMesId );
+    virtual void    InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten );
+    virtual void    EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True );
     virtual void    ClearFamilyList();
-    virtual void    EnableEdit( BOOL = TRUE );
-    virtual void    EnableDel( BOOL = TRUE );
-    virtual void    EnableNew( BOOL = TRUE );
+    virtual void    EnableEdit( sal_Bool = sal_True );
+    virtual void    EnableDel( sal_Bool = sal_True );
+    virtual void    EnableNew( sal_Bool = sal_True );
 
         using SfxCommonTemplateDialog_Impl::NewHdl;
     DECL_LINK( FamListSelect, ListBox * );
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();
 };
 
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 73b686d91252..0203d7744e9e 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -103,7 +103,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog
 
 public:
                                 SfxViewVersionDialog_Impl( Window *pParent,
-                                    SfxVersionInfo& rInfo, BOOL bEdit );
+                                    SfxVersionInfo& rInfo, sal_Bool bEdit );
  };
 
 #endif
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 4b000133d11c..c54a627e2a78 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -54,21 +54,21 @@ private:
     PopupMenu*      pPickMenu;
     PopupMenu*      pAddonsMenu;
     Timer*          pAutoDeactivate; // Hack fuer QAP-Bug
-    USHORT          nVisibleItems;
-    USHORT          nId;
-    USHORT          nCount;
-    USHORT          nLocks;
-    BOOL            bResCtor : 1; // SV Menu created from resource
-    BOOL            bOLE : 1;     // InPlaceMenu
-    BOOL            bHelpInitialized : 1;
-    BOOL            bIsActive : 1;
-    BOOL            bControllersUnBound : 1;
-    BOOL            bWasHighContrast : 1;
-    BOOL            bIsAddonPopupMenu : 1;
+    sal_uInt16          nVisibleItems;
+    sal_uInt16          nId;
+    sal_uInt16          nCount;
+    sal_uInt16          nLocks;
+    sal_Bool            bResCtor : 1; // SV Menu created from resource
+    sal_Bool            bOLE : 1;     // InPlaceMenu
+    sal_Bool            bHelpInitialized : 1;
+    sal_Bool            bIsActive : 1;
+    sal_Bool            bControllersUnBound : 1;
+    sal_Bool            bWasHighContrast : 1;
+    sal_Bool            bIsAddonPopupMenu : 1;
 
 private:
     void            Construct_Impl();
-    FASTBOOL        Bind_Impl( Menu *pMenu );
+    bool        Bind_Impl( Menu *pMenu );
     inline SfxMenuCtrlArr_Impl& GetAppCtrl_Impl()
     {
         return pAppCtrl? *pAppCtrl: *(pAppCtrl = new SfxMenuCtrlArr_Impl) ;
@@ -77,8 +77,8 @@ private:
     void            BindControllers();
 
 protected:
-    SfxVirtualMenu( USHORT nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, BOOL bWithHelp,
-                        SfxBindings &rBind, BOOL bOLEServer=FALSE, BOOL bRes=FALSE, BOOL bIsAddonMenu=FALSE );
+    SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, sal_Bool bWithHelp,
+                        SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False );
 
     void            CreateFromSVMenu();
     DECL_LINK( Highlight, Menu * );
@@ -93,22 +93,22 @@ protected:
 
 public:
                     ~SfxVirtualMenu();
-                    SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
-                        SfxBindings &rBind, BOOL bOLEServer=FALSE, BOOL bRes=FALSE, BOOL bIsAddonMenu=FALSE );
-    void            CheckItem( USHORT nItemId, BOOL bCheck );
-    void            EnableItem( USHORT nItemId, BOOL bEnable );
-    void            SetItemText( USHORT nItemId, const String& rText );
+                    SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
+                        SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False );
+    void            CheckItem( sal_uInt16 nItemId, sal_Bool bCheck );
+    void            EnableItem( sal_uInt16 nItemId, sal_Bool bEnable );
+    void            SetItemText( sal_uInt16 nItemId, const String& rText );
 
-    USHORT          GetItemPos( USHORT nItemId ) const;
+    sal_uInt16          GetItemPos( sal_uInt16 nItemId ) const;
 
-    USHORT          GetItemCount() const;
+    sal_uInt16          GetItemCount() const;
     Menu*           GetSVMenu() const;
-    SfxMenuControl& operator[]( USHORT nPos ) const;
+    SfxMenuControl& operator[]( sal_uInt16 nPos ) const;
 
-    USHORT          GetItemId( USHORT nPos ) const;
-    SfxVirtualMenu* GetPopupMenu( USHORT nId ) const;
-    String          GetItemText( USHORT nId ) const;
-    String          GetItemHelpText( USHORT nId ) const;
+    sal_uInt16          GetItemId( sal_uInt16 nPos ) const;
+    SfxVirtualMenu* GetPopupMenu( sal_uInt16 nId ) const;
+    String          GetItemText( sal_uInt16 nId ) const;
+    String          GetItemHelpText( sal_uInt16 nId ) const;
 
     //void            InvalidateKeyCodes();
 
@@ -116,15 +116,15 @@ public:
     void            SetParentMenu( SfxVirtualMenu* pNewParent )
                     { pParent = pNewParent; }
 
-    void            SetPopupMenu( USHORT nId, PopupMenu *pMenu );
-    BOOL            IsFromResource() const
+    void            SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu );
+    sal_Bool            IsFromResource() const
                     { return bResCtor; }
-    void            InitPopup(USHORT nPos, BOOL bOLE = TRUE);
+    void            InitPopup(sal_uInt16 nPos, sal_Bool bOLE = sal_True);
     void            InitializeHelp();
     void            SetResMgr(ResMgr* pMgr)  {pResMgr = pMgr; }
     ResMgr*         GetResMgr() { return pResMgr; }
     void            SetHelpIds( ResMgr* );
-    BOOL            IsHiContrastMode() const;
+    sal_Bool            IsHiContrastMode() const;
     void            UpdateImages();
 
     DECL_LINK( Select, Menu * );
@@ -134,7 +134,7 @@ public:
 
 // return the number of virtual items in this menu
 
-inline USHORT SfxVirtualMenu::GetItemCount() const
+inline sal_uInt16 SfxVirtualMenu::GetItemCount() const
 {
     return nCount;
 }
@@ -142,7 +142,7 @@ inline USHORT SfxVirtualMenu::GetItemCount() const
 
 //
 
-inline SfxMenuControl& SfxVirtualMenu::operator[]( USHORT nPos ) const
+inline SfxMenuControl& SfxVirtualMenu::operator[]( sal_uInt16 nPos ) const
 {
     return *(pItems+nPos);
 }
@@ -150,7 +150,7 @@ inline SfxMenuControl& SfxVirtualMenu::operator[]( USHORT nPos ) const
 
 // returns the item id at position nPos in the menu (or 0 if sep.)
 
-inline USHORT SfxVirtualMenu::GetItemId( USHORT nPos ) const
+inline sal_uInt16 SfxVirtualMenu::GetItemId( sal_uInt16 nPos ) const
 {
     return pItems ? pItems[nPos].GetId() : 0;
 }
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 0e263a58b90e..8c06e1233297 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -61,10 +61,10 @@ class SfxWorkWindow;
 
 struct SfxObjectBar_Impl
 {
-    USHORT        nId;   // Resource - und ConfigId der Toolbox
-    USHORT        nMode; // spezielle Sichtbarkeitsflags
-    USHORT        nPos;
-    USHORT        nIndex;
+    sal_uInt16        nId;   // Resource - und ConfigId der Toolbox
+    sal_uInt16        nMode; // spezielle Sichtbarkeitsflags
+    sal_uInt16        nPos;
+    sal_uInt16        nIndex;
     sal_Bool      bDestroy;
     String        aName;
     SfxInterface* pIFace;
@@ -81,14 +81,14 @@ struct SfxObjectBar_Impl
 // Dieser struct h"alt alle relevanten Informationen "uber die Statuszeile bereit.
 struct SfxStatBar_Impl
 {
-    USHORT                  nId;
-    BOOL                    bOn;
-    BOOL                    bTemp;
+    sal_uInt16                  nId;
+    sal_Bool                    bOn;
+    sal_Bool                    bTemp;
 
     SfxStatBar_Impl() :
         nId(0),
-        bOn(TRUE),
-        bTemp(FALSE)
+        bOn(sal_True),
+        bTemp(sal_False)
     {}
 };
 
@@ -106,15 +106,15 @@ struct SfxChild_Impl
     Window*                         pWin;
     Size                            aSize;
     SfxChildAlignment               eAlign;
-    USHORT                          nVisible;
-    BOOL                            bResize;
-    BOOL                            bCanGetFocus;
-    BOOL                            bSetFocus;
+    sal_uInt16                          nVisible;
+    sal_Bool                            bResize;
+    sal_Bool                            bCanGetFocus;
+    sal_Bool                            bSetFocus;
 
     SfxChild_Impl( Window& rChild, const Size& rSize,
-                   SfxChildAlignment eAlignment, BOOL bIsVisible ):
-        pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(FALSE),
-        bCanGetFocus( FALSE ), bSetFocus( FALSE )
+                   SfxChildAlignment eAlignment, sal_Bool bIsVisible ):
+        pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(sal_False),
+        bCanGetFocus( sal_False ), bSetFocus( sal_False )
     {
         nVisible = bIsVisible ? CHILD_VISIBLE : CHILD_NOT_VISIBLE;
     }
@@ -126,34 +126,34 @@ class SfxChildWinController_Impl : public SfxControllerItem
     SfxWorkWindow*  pWorkwin;
 
     public:
-                    SfxChildWinController_Impl( USHORT nId, SfxWorkWindow *pWin );
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+                    SfxChildWinController_Impl( sal_uInt16 nId, SfxWorkWindow *pWin );
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                             const SfxPoolItem* pState );
 };
 
 struct SfxChildWin_Impl
 {
-    USHORT                          nSaveId;        // die ChildWindow-Id
-    USHORT                          nInterfaceId;   // der aktuelle Context
-    USHORT                          nId;            // aktuelle Id
+    sal_uInt16                          nSaveId;        // die ChildWindow-Id
+    sal_uInt16                          nInterfaceId;   // der aktuelle Context
+    sal_uInt16                          nId;            // aktuelle Id
     SfxChildWindow*                 pWin;
-    BOOL                            bCreate;
+    sal_Bool                            bCreate;
     SfxChildWinInfo                 aInfo;
     SfxChild_Impl*                  pCli;           // != 0 bei direkten Children
-    USHORT                          nVisibility;
-    BOOL                            bEnable;
-    BOOL                            bDisabled;
+    sal_uInt16                          nVisibility;
+    sal_Bool                            bEnable;
+    sal_Bool                            bDisabled;
 
     SfxChildWin_Impl( sal_uInt32 nID ) :
-        nSaveId((USHORT) (nID & 0xFFFF) ),
-        nInterfaceId((USHORT) (nID >> 16)),
+        nSaveId((sal_uInt16) (nID & 0xFFFF) ),
+        nInterfaceId((sal_uInt16) (nID >> 16)),
         nId(nSaveId),
         pWin(0),
-        bCreate(FALSE),
+        bCreate(sal_False),
         pCli(0),
-        nVisibility( FALSE ),
-        bEnable( TRUE ),
-        bDisabled( FALSE )
+        nVisibility( sal_False ),
+        bEnable( sal_True ),
+        bDisabled( sal_False )
     {}
 };
 
@@ -180,9 +180,9 @@ DECL_PTRARRAY( SfxChildWindows_Impl, SfxChildWin_Impl*, 2, 2 )
 struct SfxObjectBarList_Impl
 {
     std::deque<SfxObjectBar_Impl>   aArr;
-    USHORT                  nAct;
+    sal_uInt16                  nAct;
 
-    SfxObjectBar_Impl       operator[] ( USHORT n )
+    SfxObjectBar_Impl       operator[] ( sal_uInt16 n )
                             { return aArr[n]; }
     SfxObjectBar_Impl       Actual()
                             { return aArr[nAct]; }
@@ -258,15 +258,15 @@ protected:
     Window*                 pWorkWin;
     SfxShell*               pConfigShell;
     Window*                 pActiveChild;
-    USHORT                  nUpdateMode;
-    USHORT                  nChilds;
-    USHORT                  nOrigMode;
-    BOOL                    bSorted : 1;
-    BOOL                    bDockingAllowed : 1;
-    BOOL                    bInternalDockingAllowed : 1;
-    BOOL                    bAllChildsVisible : 1;
-    BOOL                    bIsFullScreen : 1;
-    BOOL                    bShowStatusBar : 1;
+    sal_uInt16                  nUpdateMode;
+    sal_uInt16                  nChilds;
+    sal_uInt16                  nOrigMode;
+    sal_Bool                    bSorted : 1;
+    sal_Bool                    bDockingAllowed : 1;
+    sal_Bool                    bInternalDockingAllowed : 1;
+    sal_Bool                    bAllChildsVisible : 1;
+    sal_Bool                    bIsFullScreen : 1;
+    sal_Bool                    bShowStatusBar : 1;
     sal_Int32               m_nLock;
     rtl::OUString           m_aStatusBarResName;
     rtl::OUString           m_aLayoutManagerPropName;
@@ -275,13 +275,13 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener;
 
 protected:
-    void                    CreateChildWin_Impl(SfxChildWin_Impl*,BOOL);
+    void                    CreateChildWin_Impl(SfxChildWin_Impl*,sal_Bool);
     void                    RemoveChildWin_Impl(SfxChildWin_Impl*);
     void                    Sort_Impl();
     void                    AlignChild_Impl( Window& rWindow, const Size& rNewSize,
                                      SfxChildAlignment eAlign );
     SfxChild_Impl*          FindChild_Impl( const Window& rWindow ) const;
-    virtual BOOL            RequestTopToolSpacePixel_Impl( SvBorder aBorder );
+    virtual sal_Bool            RequestTopToolSpacePixel_Impl( SvBorder aBorder );
     virtual Rectangle       GetTopRect_Impl();
     SvBorder                Arrange_Impl();
     virtual void            SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&);
@@ -295,14 +295,14 @@ public:
                             { return *pBindings; }
     Window*                 GetWindow() const
                             { return pWorkWin; }
-    Rectangle               GetFreeArea( BOOL bAutoHide ) const;
-    void                    SetDockingAllowed(BOOL bSet)
+    Rectangle               GetFreeArea( sal_Bool bAutoHide ) const;
+    void                    SetDockingAllowed(sal_Bool bSet)
                             { bDockingAllowed = bSet; }
-    void                    SetInternalDockingAllowed(BOOL bSet)
+    void                    SetInternalDockingAllowed(sal_Bool bSet)
                             { bInternalDockingAllowed = bSet; }
-    BOOL                    IsDockingAllowed() const
+    sal_Bool                    IsDockingAllowed() const
                             { return bDockingAllowed; }
-    BOOL                    IsInternalDockingAllowed() const
+    sal_Bool                    IsInternalDockingAllowed() const
                             { return bInternalDockingAllowed; }
     SfxWorkWindow*          GetParent_Impl() const
                             { return pParent; }
@@ -311,64 +311,64 @@ public:
     // Methoden f"ur alle Child-Fenster
     void                    DataChanged_Impl( const DataChangedEvent& rDCEvt );
     void                    ReleaseChild_Impl( Window& rWindow );
-    SfxChild_Impl*          RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, BOOL bCanGetFocus=FALSE );
+    SfxChild_Impl*          RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False );
     void                    ShowChilds_Impl();
     void                    HideChilds_Impl();
     void                    Close_Impl();
-    BOOL                    PrepareClose_Impl();
-    virtual void            ArrangeChilds_Impl( BOOL bForce = TRUE );
+    sal_Bool                    PrepareClose_Impl();
+    virtual void            ArrangeChilds_Impl( sal_Bool bForce = sal_True );
     void                    DeleteControllers_Impl();
     void                    SaveStatus_Impl();
-    void                    HidePopups_Impl(BOOL bHide, BOOL bParent=FALSE, USHORT nId=0);
+    void                    HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0);
     void                    ConfigChild_Impl(SfxChildIdentifier,
-                                             SfxDockingConfig, USHORT);
-    void                    MakeChildsVisible_Impl( BOOL bVis );
+                                             SfxDockingConfig, sal_uInt16);
+    void                    MakeChildsVisible_Impl( sal_Bool bVis );
     void                    ArrangeAutoHideWindows( SfxSplitWindow *pSplit );
-    BOOL                    IsAutoHideMode( const SfxSplitWindow *pSplit );
+    sal_Bool                    IsAutoHideMode( const SfxSplitWindow *pSplit );
     void                    EndAutoShow_Impl( Point aPos );
-    void                    SetFullScreen_Impl( BOOL bSet ) { bIsFullScreen = bSet; }
-    BOOL                    IsFullScreen_Impl() const { return bIsFullScreen; }
+    void                    SetFullScreen_Impl( sal_Bool bSet ) { bIsFullScreen = bSet; }
+    sal_Bool                    IsFullScreen_Impl() const { return bIsFullScreen; }
 
     // Methoden f"ur Objectbars
     virtual void            UpdateObjectBars_Impl();
     void                    ResetObjectBars_Impl();
-    void                    SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
+    void                    SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
                                     SfxInterface *pIFace, const String* pName=0 );
-    Window*                 GetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId );
-    FASTBOOL                KnowsObjectBar_Impl( USHORT nPos ) const;
-    BOOL                    IsVisible_Impl();
-    void                    MakeVisible_Impl( BOOL );
-    void                    SetObjectBarVisibility_Impl( USHORT nVis );
-    BOOL                    IsContainer_Impl() const;
-    void                    Lock_Impl( BOOL );
-    void                    NextObjectBar_Impl( USHORT nPos );
-    USHORT                  HasNextObjectBar_Impl( USHORT nPos, String* pStr=0 );
-    void                    SetObjectBarCustomizeMode_Impl( BOOL );
+    Window*                 GetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId );
+    bool                    KnowsObjectBar_Impl( sal_uInt16 nPos ) const;
+    sal_Bool                    IsVisible_Impl();
+    void                    MakeVisible_Impl( sal_Bool );
+    void                    SetObjectBarVisibility_Impl( sal_uInt16 nVis );
+    sal_Bool                    IsContainer_Impl() const;
+    void                    Lock_Impl( sal_Bool );
+    void                    NextObjectBar_Impl( sal_uInt16 nPos );
+    sal_uInt16                  HasNextObjectBar_Impl( sal_uInt16 nPos, String* pStr=0 );
+    void                    SetObjectBarCustomizeMode_Impl( sal_Bool );
 
     // Methoden f"ur ChildWindows
     void                    UpdateChildWindows_Impl();
     void                    ResetChildWindows_Impl();
-    void                    SetChildWindowVisible_Impl( sal_uInt32, BOOL, USHORT );
-    void                    ToggleChildWindow_Impl(USHORT,BOOL);
-    BOOL                    HasChildWindow_Impl(USHORT);
-    BOOL                    KnowsChildWindow_Impl(USHORT);
-    void                    ShowChildWindow_Impl(USHORT, BOOL bVisible, BOOL bSetFocus);
-    void                    SetChildWindow_Impl(USHORT, BOOL bOn, BOOL bSetFocus);
-    SfxChildWindow*         GetChildWindow_Impl(USHORT);
+    void                    SetChildWindowVisible_Impl( sal_uInt32, sal_Bool, sal_uInt16 );
+    void                    ToggleChildWindow_Impl(sal_uInt16,sal_Bool);
+    sal_Bool                    HasChildWindow_Impl(sal_uInt16);
+    sal_Bool                    KnowsChildWindow_Impl(sal_uInt16);
+    void                    ShowChildWindow_Impl(sal_uInt16, sal_Bool bVisible, sal_Bool bSetFocus);
+    void                    SetChildWindow_Impl(sal_uInt16, sal_Bool bOn, sal_Bool bSetFocus);
+    SfxChildWindow*         GetChildWindow_Impl(sal_uInt16);
     virtual void            InitializeChild_Impl(SfxChildWin_Impl*);
     SfxSplitWindow*         GetSplitWindow_Impl(SfxChildAlignment);
 
-    BOOL                    IsVisible_Impl( USHORT nMode ) const;
-    void                    DisableChildWindow_Impl( USHORT nId, BOOL bDisable );
-    BOOL                    IsFloating( USHORT nId );
+    sal_Bool                    IsVisible_Impl( sal_uInt16 nMode ) const;
+    void                    DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable );
+    sal_Bool                    IsFloating( sal_uInt16 nId );
     void                    ChangeWindow_Impl( Window *pNew );
     void                    SetActiveChild_Impl( Window *pChild );
     Window*                 GetActiveChild_Impl();
-    virtual BOOL            ActivateNextChild_Impl( BOOL bForward = TRUE );
+    virtual sal_Bool            ActivateNextChild_Impl( sal_Bool bForward = sal_True );
     bool                    AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const;
 
     // Methoden f"ur StatusBar
-    void                    SetTempStatusBar_Impl( BOOL bSet );
+    void                    SetTempStatusBar_Impl( sal_Bool bSet );
     void                    ResetStatusBar_Impl();
     void                    SetStatusBar_Impl(sal_uInt32 nResId, SfxShell *pShell, SfxBindings& );
     void                    UpdateStatusBar_Impl();
@@ -382,7 +382,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow
     SfxFrame*           pFrame;
 public:
                         SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster );
-    virtual void        ArrangeChilds_Impl( BOOL bForce = TRUE );
+    virtual void        ArrangeChilds_Impl( sal_Bool bForce = sal_True );
     virtual void        UpdateObjectBars_Impl();
     virtual Rectangle   GetTopRect_Impl();
 };
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 4ac85a7c98fe..e420f5a04b5b 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -82,7 +82,7 @@ using namespace ::com::sun::star::task;
 
 SFX_IMPL_TOOLBOX_CONTROL(SfxURLToolBoxControl_Impl,SfxStringItem)
 
-SfxURLToolBoxControl_Impl::SfxURLToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox )
+SfxURLToolBoxControl_Impl::SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox )
     : SfxToolBoxControl( nSlotId, nId, rBox ),
     pAccExec( 0 )
 {
@@ -101,7 +101,7 @@ SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const
 
 //***************************************************************************
 
-void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, BOOL /*bNew*/ ) const
+void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/ ) const
 {
     String aName;
     String aFilter;
@@ -190,7 +190,7 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, SelectHdl, void*, EMPTYARG )
     String aName( pURLBox->GetURL() );
 
     if ( !pURLBox->IsTravelSelect() && aName.Len() )
-        OpenURL( aName, FALSE );
+        OpenURL( aName, sal_False );
 
     return 1L;
 }
@@ -240,7 +240,7 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEve
 
 void SfxURLToolBoxControl_Impl::StateChanged
 (
-    USHORT              nSID,
+    sal_uInt16              nSID,
     SfxItemState        eState,
     const SfxPoolItem*  pState
 )
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 3d2f2db47def..c93fa116172b 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star::util;
 
 class SfxEnumMenu: public PopupMenu
 {
-    USHORT          nSlot;
+    sal_uInt16          nSlot;
     SfxEnumItem    *pItem;
     SfxBindings*    pBindings;
 
@@ -93,20 +93,20 @@ protected:
     virtual void    Select();
 
 public:
-                    SfxEnumMenu( USHORT nSlot, SfxBindings* pBind, const SfxEnumItem &rItem );
+                    SfxEnumMenu( sal_uInt16 nSlot, SfxBindings* pBind, const SfxEnumItem &rItem );
                     ~SfxEnumMenu();
 };
 
 //=========================================================================
 
-SfxEnumMenu::SfxEnumMenu( USHORT nSlotId, SfxBindings* pBind, const SfxEnumItem &rItem ):
+SfxEnumMenu::SfxEnumMenu( sal_uInt16 nSlotId, SfxBindings* pBind, const SfxEnumItem &rItem ):
     nSlot( nSlotId ),
     pItem( (SfxEnumItem*) rItem.Clone() ),
     pBindings( pBind )
 {
-    for ( USHORT nVal = 0; nVal < pItem->GetValueCount(); ++nVal )
+    for ( sal_uInt16 nVal = 0; nVal < pItem->GetValueCount(); ++nVal )
         InsertItem( nVal+1, pItem->GetValueTextByPos(nVal) );
-    CheckItem( pItem->GetValue() + 1, TRUE );
+    CheckItem( pItem->GetValue() + 1, sal_True );
 }
 
 //-------------------------------------------------------------------------
@@ -142,7 +142,7 @@ void SfxMenuControl::SetOwnMenu( SfxVirtualMenu* pMenu )
 
 void SfxMenuControl::Bind(
     SfxVirtualMenu* pOwn,
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     const String& rTitle,
     const String &rHelpText,
     SfxBindings &rBindings )
@@ -168,7 +168,7 @@ void SfxMenuControl::Bind(
 
 void SfxMenuControl::Bind(
     SfxVirtualMenu* pOwn,
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     SfxVirtualMenu& rMenu,
     const String& rTitle,
     const String &rHelpText,
@@ -187,7 +187,7 @@ void SfxMenuControl::Bind(
 
 // ctor for explicit registration
 
-SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
+SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings )
 :   pOwnMenu(0),
     pSubMenu(0),
     b_ShowStrings(bShowStrings)
@@ -202,18 +202,18 @@ SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
 SfxMenuControl::SfxMenuControl():
     pOwnMenu(0),
     pSubMenu(0),
-    b_ShowStrings(FALSE)
+    b_ShowStrings(sal_False)
 {
     DBG_MEMTEST();
 }
 
 //--------------------------------------------------------------------
 
-SfxMenuControl::SfxMenuControl(USHORT nSlotId, SfxBindings& rBindings):
+SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings):
     SfxControllerItem(nSlotId, rBindings),
     pOwnMenu(0),
     pSubMenu(0),
-    b_ShowStrings(FALSE)
+    b_ShowStrings(sal_False)
 {
     DBG_MEMTEST();
 
@@ -245,7 +245,7 @@ void SfxMenuControl::RemovePopup()
 
 void SfxMenuControl::StateChanged
 (
-    USHORT              nSID,
+    sal_uInt16              nSID,
     SfxItemState        eState,
     const SfxPoolItem*  pState
 )
@@ -255,14 +255,14 @@ void SfxMenuControl::StateChanged
     DBG_ASSERT( nSID == GetId(), "strange SID" );
     DBG_ASSERT( pOwnMenu != 0, "setting state to dangling SfxMenuControl" );
 
-    FASTBOOL bIsObjMenu =
+    bool bIsObjMenu =
                 GetId() >= SID_OBJECTMENU0 && GetId() < SID_OBJECTMENU_LAST;
 
     // enabled/disabled-Flag pauschal korrigieren
 
 #ifdef UNIX
     if (nSID == SID_PASTE)
-        pOwnMenu->EnableItem( GetId(), TRUE );
+        pOwnMenu->EnableItem( GetId(), sal_True );
     else
 #endif
     pOwnMenu->EnableItem( GetId(), bIsObjMenu
@@ -273,7 +273,7 @@ void SfxMenuControl::StateChanged
     {
         // checken nur bei nicht-Object-Menus
         if ( !bIsObjMenu )
-            pOwnMenu->CheckItem( GetId(), FALSE );
+            pOwnMenu->CheckItem( GetId(), sal_False );
 
         // SetItemText flackert in MenuBar insbes. unter OS/2 (Bug #20658)
         if ( // !bIsObjMenu && nicht wegen "Format/Datenbank"
@@ -340,14 +340,14 @@ void SfxMenuControl::StateChanged
 
 //--------------------------------------------------------------------
 
-SfxMenuControl* SfxMenuControl::CreateImpl( USHORT /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ )
+SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ )
 {
-    return new SfxMenuControl( TRUE );
+    return new SfxMenuControl( sal_True );
 }
 
 //--------------------------------------------------------------------
 
-void SfxMenuControl::RegisterControl( USHORT nSlotId, SfxModule *pMod )
+void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
 {
     RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
                 SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
@@ -359,7 +359,7 @@ void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pF
     SFX_APP()->RegisterMenuControl_Impl( pMod, pFact );
 }
 
-SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindings &rBindings )
+SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
 {
     TypeId aSlotType = SFX_SLOTPOOL().GetSlotType(nId);
     if ( aSlotType )
@@ -373,7 +373,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
             if ( pFactories )
             {
                 SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
-                for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+                for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
                     if ( rFactories[nFactory]->nTypeId == aSlotType &&
                          ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                            ( rFactories[nFactory]->nSlotId == nId) ) )
@@ -383,7 +383,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
 
         SfxMenuCtrlFactArr_Impl &rFactories = pApp->GetMenuCtrlFactories_Impl();
 
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
             if ( rFactories[nFactory]->nTypeId == aSlotType &&
                  ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                    ( rFactories[nFactory]->nSlotId == nId) ) )
@@ -392,7 +392,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
     return 0;
 }
 
-BOOL SfxMenuControl::IsSpecialControl( USHORT nId, SfxModule* pMod  )
+sal_Bool SfxMenuControl::IsSpecialControl( sal_uInt16 nId, SfxModule* pMod  )
 {
     TypeId aSlotType = SFX_SLOTPOOL().GetSlotType( nId );
     if ( aSlotType )
@@ -403,21 +403,21 @@ BOOL SfxMenuControl::IsSpecialControl( USHORT nId, SfxModule* pMod  )
             if ( pFactories )
             {
                 SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
-                for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+                for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
                     if ( rFactories[nFactory]->nTypeId == aSlotType &&
                          ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                            ( rFactories[nFactory]->nSlotId == nId) ) )
-                        return TRUE;
+                        return sal_True;
             }
         }
 
         SfxMenuCtrlFactArr_Impl &rFactories = SFX_APP()->GetMenuCtrlFactories_Impl();
 
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
             if ( rFactories[nFactory]->nTypeId == aSlotType &&
                  ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                    ( rFactories[nFactory]->nSlotId == nId) ) )
-                return TRUE;
+                return sal_True;
     }
     return 0;
 }
@@ -437,7 +437,7 @@ long Select_Impl( void* pHdl, void* pVoid );
 SFX_IMPL_MENU_CONTROL( SfxAppMenuControl_Impl, SfxStringItem );
 
 SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
-    USHORT nPos, Menu& rMenu, SfxBindings& rBindings )
+    sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
     : SfxMenuControl( nPos, rBindings ), pMenu(0)
 {
     String aText = rMenu.GetItemText( nPos );
@@ -470,9 +470,9 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
     if ( pActMenu )
     {
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
-        BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
-        BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
+        sal_uIntPtr nSymbolsStyle = rSettings.GetSymbolsStyle();
+        sal_Bool bIsHiContrastMode = rSettings.GetHighContrastMode();
+        sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
             ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
@@ -482,10 +482,10 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
             m_bWasHiContrastMode    = bIsHiContrastMode;
             m_bShowMenuImages       = bShowMenuImages;
 
-            USHORT nCount = pActMenu->GetItemCount();
-            for ( USHORT nSVPos = 0; nSVPos < nCount; nSVPos++ )
+            sal_uInt16 nCount = pActMenu->GetItemCount();
+            for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ )
             {
-                USHORT nItemId = pActMenu->GetItemId( nSVPos );
+                sal_uInt16 nItemId = pActMenu->GetItemId( nSVPos );
                 if ( pActMenu->GetItemType( nSVPos ) != MENUITEM_SEPARATOR )
                 {
                     if ( bShowMenuImages )
@@ -501,7 +501,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
                         if ( aImageId.getLength() > 0 )
                         {
                             Reference< ::com::sun::star::frame::XFrame > xFrame;
-                            Image aImage = GetImage( xFrame, aImageId, FALSE, bIsHiContrastMode );
+                            Image aImage = GetImage( xFrame, aImageId, sal_False, bIsHiContrastMode );
                             if ( !!aImage )
                             {
                                 bImageSet = sal_True;
@@ -513,7 +513,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
                         if ( !bImageSet && aCmd.Len() )
                         {
                             Image aImage = SvFileInformationManager::GetImage(
-                                INetURLObject(aCmd), FALSE, bIsHiContrastMode );
+                                INetURLObject(aCmd), sal_False, bIsHiContrastMode );
                             if ( !!aImage )
                                 pActMenu->SetItemImage( nItemId, aImage );
                         }
@@ -524,26 +524,26 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
-        USHORT nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt )
+        sal_uInt16 nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt )
 {
     return new SfxUnoMenuControl( rCmd, nId, rMenu, rBindings, pVirt );
 }
 
 SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
-        USHORT nId, Menu& rMenu, const String& sItemText, const String& sHelpText,
+        sal_uInt16 nId, Menu& rMenu, const String& sItemText, const String& sHelpText,
         SfxBindings& rBindings, SfxVirtualMenu* pVirt)
 {
     return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, sHelpText, rBindings, pVirt);
 }
 
-SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, USHORT nSlotId,
+SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, sal_uInt16 nSlotId,
     Menu& rMenu, SfxBindings& rBindings, SfxVirtualMenu* pVirt )
     : SfxMenuControl( nSlotId, rBindings )
 {
@@ -556,7 +556,7 @@ SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, USHORT nSlotId,
 }
 
 SfxUnoMenuControl::SfxUnoMenuControl(
-    const String& rCmd, USHORT nSlotId, Menu& /*rMenu*/,
+    const String& rCmd, sal_uInt16 nSlotId, Menu& /*rMenu*/,
     const String& rItemText, const String& rHelpText,
     SfxBindings& rBindings, SfxVirtualMenu* pVirt)
     : SfxMenuControl( nSlotId, rBindings )
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index f1eadf744863..ed3bd40fb558 100755
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -86,8 +86,8 @@
 #include "thessubmenu.hxx"
 
 
-static const USHORT nCompatVersion = 4;
-static const USHORT nVersion = 5;
+static const sal_uInt16 nCompatVersion = 4;
+static const sal_uInt16 nVersion = 5;
 
 // static member initialization
 PopupMenu * SfxPopupMenuManager::pStaticThesSubMenu = NULL;
@@ -118,7 +118,7 @@ SfxMenuManager::SfxMenuManager( const ResId& rResId, SfxBindings &rBindings )
     pResMgr(rResId.GetResMgr()),
     nType( rResId.GetId() )
 {
-    bAddClipboardFuncs = FALSE;
+    bAddClipboardFuncs = sal_False;
     DBG_MEMTEST();
 }
 
@@ -153,8 +153,8 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
     {
         SfxObjectShell* pDoc = pView->GetObjectShell();
         pMenu->InsertSeparator();
-        USHORT nr=0;
-        for ( USHORT n = 0; n < aVerbs.getLength(); ++n )
+        sal_uInt16 nr=0;
+        for ( sal_uInt16 n = 0; n < aVerbs.getLength(); ++n )
         {
             // check for ReadOnly verbs
             if ( pDoc->IsReadOnly() && !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_NEVERDIRTIES) )
@@ -165,7 +165,7 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
                 continue;
 
             // neue Id vergeben
-            USHORT nId = SID_VERB_START + nr++;
+            sal_uInt16 nId = SID_VERB_START + nr++;
             DBG_ASSERT(nId <= SID_VERB_END, "Zuviele Verben!");
             if ( nId > SID_VERB_END )
                 break;
@@ -238,10 +238,10 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
             if (sThesImplName.Len() > 0 && aSynonymsImageUrl.getLength() > 0)
                 aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) );
 
-            for (USHORT i = 0; (size_t)i < nNumSynonyms; ++i)
+            for (sal_uInt16 i = 0; (size_t)i < nNumSynonyms; ++i)
             {
                 //! item ids should start with values > 0, since 0 has special meaning
-                const USHORT nId = i + 1;
+                const sal_uInt16 nId = i + 1;
 
                 String aItemText( linguistic::GetThesaurusReplaceText( aSynonyms[i] ) );
                 pThesSubMenu->InsertItem( nId, aItemText );
@@ -296,10 +296,10 @@ void SfxMenuManager::UseDefault()
 
         if ( bAddClipboardFuncs )
         {
-            USHORT n, nCount = pSVMenu->GetItemCount();
+            sal_uInt16 n, nCount = pSVMenu->GetItemCount();
             for ( n=0; n<nCount; n++ )
             {
-                USHORT nId = pSVMenu->GetItemId( n );
+                sal_uInt16 nId = pSVMenu->GetItemId( n );
                 if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
                     break;
             }
@@ -311,13 +311,13 @@ void SfxMenuManager::UseDefault()
                 pSVMenu->InsertSeparator();
                 for ( n=0; n<nCount; n++ )
                 {
-                    USHORT nId = aPop.GetItemId( n );
+                    sal_uInt16 nId = aPop.GetItemId( n );
                     pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
                 }
             }
         }
 
-        pVMenu = new SfxVirtualMenu( pSVMenu, FALSE, *pBindings, TRUE, TRUE );
+        pVMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
     }
 
     Construct(*pVMenu);
@@ -335,7 +335,7 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
 {
     DBG_MEMTEST();
 
-    USHORT nId = (USHORT) pSelMenu->GetCurItemId();
+    sal_uInt16 nId = (sal_uInt16) pSelMenu->GetCurItemId();
     String aCommand = pSelMenu->GetItemCommand( nId );
     if ( !aCommand.Len() && pBindings )
     {
@@ -358,12 +358,12 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
         // special menu function
         pBindings->GetDispatcher_Impl()->Execute( nId );
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
-void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
+void SfxMenuManager::Construct_Impl( Menu* pSVMenu, sal_Bool bWithHelp )
 {
     SfxVirtualMenu *pOldVirtMenu=0;
     if ( pMenu )
@@ -374,7 +374,7 @@ void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
     }
 
     TryToHideDisabledEntries_Impl( pSVMenu );
-    SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, TRUE );
+    SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, sal_True );
     Construct(*pVMenu);
 
     if ( pOldVirtMenu )
@@ -408,10 +408,10 @@ void SfxPopupMenuManager::RemoveDisabledEntries()
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
 {
     DBG_MEMTEST();
-    USHORT nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
+    sal_uInt16 nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
     delete pStaticThesSubMenu;  pStaticThesSubMenu = NULL;
     return nVal;
 }
@@ -427,13 +427,13 @@ IMPL_LINK_INLINE_END( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 )
 {
     DBG_MEMTEST();
 
     PopupMenu* pPopMenu = ( (PopupMenu*)GetMenu()->GetSVMenu() );
     pPopMenu->SetSelectHdl( LINK( this, SfxPopupMenuManager, SelectHdl ) );
-    USHORT nId = pPopMenu->Execute( pWindow, rPoint );
+    sal_uInt16 nId = pPopMenu->Execute( pWindow, rPoint );
     pPopMenu->SetSelectHdl( Link() );
 
     if ( nId )
@@ -444,7 +444,7 @@ USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_li
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... )
 {
     DBG_MEMTEST();
 
@@ -469,21 +469,21 @@ void SfxPopupMenuManager::StartInsert()
 void SfxPopupMenuManager::EndInsert()
 {
     pBindings->ENTERREGISTRATIONS();
-    pMenu = new SfxVirtualMenu( pSVMenu, FALSE, *pBindings, TRUE, TRUE );
+    pMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
     Construct( *pMenu );
     pBindings->LEAVEREGISTRATIONS();
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::InsertSeparator( USHORT nPos )
+void SfxPopupMenuManager::InsertSeparator( sal_uInt16 nPos )
 {
     pSVMenu->InsertSeparator( nPos );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, USHORT nPos )
+void SfxPopupMenuManager::InsertItem( sal_uInt16 nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, sal_uInt16 nPos )
 {
     pSVMenu->InsertItem( nId, rName, nBits,nPos );
     pSVMenu->SetHelpId( nId, rHelpId );
@@ -491,21 +491,21 @@ void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemB
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::RemoveItem( USHORT nId )
+void SfxPopupMenuManager::RemoveItem( sal_uInt16 nId )
 {
     pSVMenu->RemoveItem( nId );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::CheckItem( USHORT nId, BOOL bCheck )
+void SfxPopupMenuManager::CheckItem( sal_uInt16 nId, sal_Bool bCheck )
 {
     pSVMenu->CheckItem( nId, bCheck );
 }
 
 void SfxPopupMenuManager::AddClipboardFunctions()
 {
-    bAddClipboardFuncs = TRUE;
+    bAddClipboardFuncs = sal_True;
 }
 
 SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
@@ -515,8 +515,8 @@ SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
     pResMgr(NULL),
     nType(0)
 {
-    bAddClipboardFuncs = FALSE;
-    SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, FALSE, rBindings, TRUE, TRUE );
+    bAddClipboardFuncs = sal_False;
+    SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, sal_False, rBindings, sal_True, sal_True );
     Construct(*pVMenu);
 }
 
@@ -529,10 +529,10 @@ SfxPopupMenuManager::SfxPopupMenuManager( PopupMenu* pMenuArg, SfxBindings& rBin
 SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow )
 {
     PopupMenu *pSVMenu = new PopupMenu( rResId );
-    USHORT n, nCount = pSVMenu->GetItemCount();
+    sal_uInt16 n, nCount = pSVMenu->GetItemCount();
     for ( n=0; n<nCount; n++ )
     {
-        USHORT nId = pSVMenu->GetItemId( n );
+        sal_uInt16 nId = pSVMenu->GetItemId( n );
         if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
             break;
     }
@@ -548,7 +548,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
         pSVMenu->InsertSeparator();
         for ( n=0; n<nCount; n++ )
         {
-            USHORT nId = aPop.GetItemId( n );
+            sal_uInt16 nId = aPop.GetItemId( n );
             pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
             pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
         }
@@ -581,10 +581,10 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
 void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, Window* pWindow )
 {
     PopupMenu *pSVMenu = new PopupMenu( rResId );
-    USHORT n, nCount = pSVMenu->GetItemCount();
+    sal_uInt16 n, nCount = pSVMenu->GetItemCount();
     for ( n=0; n<nCount; n++ )
     {
-        USHORT nId = pSVMenu->GetItemId( n );
+        sal_uInt16 nId = pSVMenu->GetItemId( n );
         if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
             break;
     }
@@ -598,7 +598,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
         pSVMenu->InsertSeparator();
         for ( n=0; n<nCount; n++ )
         {
-            USHORT nId = aPop.GetItemId( n );
+            sal_uInt16 nId = aPop.GetItemId( n );
             pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
             pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
         }
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx
index e9d609151504..639669ab90c3 100644
--- a/sfx2/source/menu/objmnctl.cxx
+++ b/sfx2/source/menu/objmnctl.cxx
@@ -59,7 +59,7 @@ using namespace com::sun::star;
     in seinen Parent ein.
  */
 
-SfxObjectVerbsControl::SfxObjectVerbsControl(USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings)
+SfxObjectVerbsControl::SfxObjectVerbsControl(sal_uInt16 nSlotId, Menu &rMenu, SfxBindings &rBindings)
     : SfxMenuControl( nSlotId, rBindings )
     , pMenu(new PopupMenu)
     , rParent(rMenu)
@@ -85,8 +85,8 @@ void SfxObjectVerbsControl::FillMenu()
         const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs =  pView->GetVerbs();
         if ( aVerbs.getLength() )
         {
-            USHORT nSlotId = SID_VERB_START;
-            for (USHORT n=0; n<aVerbs.getLength(); n++)
+            sal_uInt16 nSlotId = SID_VERB_START;
+            for (sal_uInt16 n=0; n<aVerbs.getLength(); n++)
             {
                 // check for ReadOnly verbs
                 if ( pDoc->IsReadOnly() && !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_NEVERDIRTIES) )
@@ -105,7 +105,7 @@ void SfxObjectVerbsControl::FillMenu()
         }
     }
 
-    rParent.EnableItem( GetId(), (BOOL)pMenu->GetItemCount() );
+    rParent.EnableItem( GetId(), (sal_Bool)pMenu->GetItemCount() );
 }
 
 //--------------------------------------------------------------------
@@ -119,7 +119,7 @@ void SfxObjectVerbsControl::FillMenu()
  */
 
 void SfxObjectVerbsControl::StateChanged(
-    USHORT /*nSID*/,
+    sal_uInt16 /*nSID*/,
     SfxItemState eState,
     const SfxPoolItem* /*pState*/ )
 {
@@ -137,7 +137,7 @@ void SfxObjectVerbsControl::StateChanged(
 
 IMPL_LINK_INLINE_START( SfxObjectVerbsControl, MenuSelect, Menu *, pSelMenu )
 {
-    const USHORT nSlotId = pSelMenu->GetCurItemId();
+    const sal_uInt16 nSlotId = pSelMenu->GetCurItemId();
     if( nSlotId )
         GetBindings().Execute(nSlotId);
     return 1;
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index d82c0a6dbdf3..501d3e35f326 100755
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -66,7 +66,7 @@ SFX_IMPL_MENU_CONTROL(SfxThesSubMenuControl, SfxStringItem);
     Ctor; setzt Select-Handler am Menu und traegt Menu
     in seinen Parent ein.
  */
-SfxThesSubMenuControl::SfxThesSubMenuControl( USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings )
+SfxThesSubMenuControl::SfxThesSubMenuControl( sal_uInt16 nSlotId, Menu &rMenu, SfxBindings &rBindings )
     : SfxMenuControl( nSlotId, rBindings ),
     pMenu(new PopupMenu),
     rParent(rMenu)
@@ -74,7 +74,7 @@ SfxThesSubMenuControl::SfxThesSubMenuControl( USHORT nSlotId, Menu &rMenu, SfxBi
     rMenu.SetPopupMenu(nSlotId, pMenu);
     pMenu->SetSelectHdl(LINK(this, SfxThesSubMenuControl, MenuSelect));
     pMenu->Clear();
-    rParent.EnableItem( GetId(), FALSE );
+    rParent.EnableItem( GetId(), sal_False );
 }
 
 
@@ -90,7 +90,7 @@ SfxThesSubMenuControl::~SfxThesSubMenuControl()
     Menueeintrag im Parentmenu disabled, andernfalls wird er enabled.
  */
 void SfxThesSubMenuControl::StateChanged(
-    USHORT /*nSID*/,
+    sal_uInt16 /*nSID*/,
     SfxItemState eState,
     const SfxPoolItem* /*pState*/ )
 {
@@ -104,7 +104,7 @@ void SfxThesSubMenuControl::StateChanged(
  */
 IMPL_LINK_INLINE_START( SfxThesSubMenuControl, MenuSelect, Menu *, pSelMenu )
 {
-    const USHORT nSlotId = pSelMenu->GetCurItemId();
+    const sal_uInt16 nSlotId = pSelMenu->GetCurItemId();
     if( nSlotId )
         GetBindings().Execute(nSlotId);
     return 1;
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index 0b86a534de52..394c22b6e497 100755..100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -52,11 +52,11 @@ class SfxThesSubMenuControl : public SfxMenuControl
     Menu&               rParent;
 
 private:
-    virtual void    StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
     DECL_LINK( MenuSelect, Menu * );
 
 public:
-    SfxThesSubMenuControl(USHORT, Menu&, SfxBindings&);
+    SfxThesSubMenuControl(sal_uInt16, Menu&, SfxBindings&);
     ~SfxThesSubMenuControl();
 
     virtual PopupMenu*  GetPopup() const;
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index b60681e95afa..76be183057c0 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -83,21 +83,21 @@ class SfxMenuImageControl_Impl : public SfxControllerItem
 {
     SfxVirtualMenu*     pMenu;
     long                lRotation;
-    BOOL                bIsMirrored;
+    sal_Bool                bIsMirrored;
 
 protected:
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 public:
-                        SfxMenuImageControl_Impl( USHORT nSlotId, SfxBindings& rBindings, SfxVirtualMenu* pVMenu )
+                        SfxMenuImageControl_Impl( sal_uInt16 nSlotId, SfxBindings& rBindings, SfxVirtualMenu* pVMenu )
                             : SfxControllerItem( nSlotId, rBindings )
                             , pMenu( pVMenu )
                             , lRotation( 0 )
-                            , bIsMirrored( FALSE )
+                            , bIsMirrored( sal_False )
                         {}
     void                Update();
 };
 
-void SfxMenuImageControl_Impl::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
+void SfxMenuImageControl_Impl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
 {
     const SfxImageItem* pItem = PTR_CAST( SfxImageItem, pState );
     if ( pItem )
@@ -114,13 +114,13 @@ void SfxMenuImageControl_Impl::Update()
     SfxModule* pModule = pViewFrame->GetObjectShell()->GetModule();
     SfxSlotPool* pPool = pModule->GetSlotPool();
     Menu* pSVMenu = pMenu->GetSVMenu();
-    for (USHORT nPos = 0; nPos<pSVMenu->GetItemCount(); nPos++)
+    for (sal_uInt16 nPos = 0; nPos<pSVMenu->GetItemCount(); nPos++)
     {
-        USHORT nslotId = pSVMenu->GetItemId( nPos );
+        sal_uInt16 nslotId = pSVMenu->GetItemId( nPos );
         const SfxSlot* pSlot = pPool->GetSlot( nslotId );
         if ( pSlot && pSlot->IsMode( SFX_SLOT_IMAGEROTATION ) )
         {
-            pSVMenu->SetItemImageMirrorMode( nslotId, FALSE );
+            pSVMenu->SetItemImageMirrorMode( nslotId, sal_False );
             pSVMenu->SetItemImageAngle( nslotId, lRotation );
         }
 
@@ -134,8 +134,8 @@ void SfxMenuImageControl_Impl::Update()
 static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
                                  const rtl::OUString& aImageId,
                                  const rtl::OUString& aURL,
-                                 BOOL bBigImage,
-                                 BOOL bHiContrast )
+                                 sal_Bool bBigImage,
+                                 sal_Bool bHiContrast )
 {
     Image aImage;
 
@@ -160,7 +160,7 @@ static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFr
     darauf, ob die Applikation OLE-Server ist oder nicht.
 */
 
-BOOL IsItemHidden_Impl( USHORT nItemId, int bOleServer, int bMac )
+sal_Bool IsItemHidden_Impl( sal_uInt16 nItemId, int bOleServer, int bMac )
 {
     return ( bMac &&
              ( nItemId == SID_MINIMIZED ) ) ||
@@ -191,9 +191,9 @@ void SfxVirtualMenu::Construct_Impl()
 
 //--------------------------------------------------------------------
 
-SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
-                SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp,
-                SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
+SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId,
+                SfxVirtualMenu* pOwnParent, Menu& rMenu, sal_Bool bWithHelp,
+                SfxBindings &rBindings, sal_Bool bOLEServer, sal_Bool bRes, sal_Bool bIsAddonMenu ):
     pItems(0),
        pImageControl(0),
     pBindings(&rBindings),
@@ -201,7 +201,7 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
     pAutoDeactivate(0),
     nLocks(0),
     bHelpInitialized( bWithHelp ),
-    bWasHighContrast( FALSE ),
+    bWasHighContrast( sal_False ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
     DBG_MEMTEST();
@@ -217,19 +217,19 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
     pWindowMenu = NULL;
     pPickMenu = NULL;
     pAddonsMenu = NULL;
-    bIsActive = FALSE;
-    bControllersUnBound = FALSE;
+    bIsActive = sal_False;
+    bControllersUnBound = sal_False;
     CreateFromSVMenu();
     Construct_Impl();
-    bHelpInitialized = FALSE;
+    bHelpInitialized = sal_False;
 }
 
 //--------------------------------------------------------------------
 
 // creates a virtual menu from a StarView MenuBar or PopupMenu
 
-SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
-                    SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
+SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
+                    SfxBindings &rBindings, sal_Bool bOLEServer, sal_Bool bRes, sal_Bool bIsAddonMenu ):
     pItems(0),
        pImageControl(0),
     pBindings(&rBindings),
@@ -237,7 +237,7 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
     pAutoDeactivate(0),
     nLocks(0),
     bHelpInitialized( bWithHelp ),
-    bWasHighContrast( FALSE ),
+    bWasHighContrast( sal_False ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
     DBG_MEMTEST();
@@ -254,11 +254,11 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
     pWindowMenu = NULL;
     pPickMenu = NULL;
     pAddonsMenu = NULL;
-    bIsActive = FALSE;
-    bControllersUnBound = FALSE;
+    bIsActive = sal_False;
+    bControllersUnBound = sal_False;
     CreateFromSVMenu();
     Construct_Impl();
-    bHelpInitialized = FALSE;
+    bHelpInitialized = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -279,7 +279,7 @@ SfxVirtualMenu::~SfxVirtualMenu()
 
     if ( bIsActive )
     {
-        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = FALSE;
+        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False;
     }
 
     // QAP-Hack
@@ -324,7 +324,7 @@ SfxVirtualMenu::~SfxVirtualMenu()
 }
 //--------------------------------------------------------------------
 
-BOOL SfxVirtualMenu::IsHiContrastMode() const
+sal_Bool SfxVirtualMenu::IsHiContrastMode() const
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     return rSettings.GetHighContrastMode();
@@ -345,7 +345,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
     if ( pSVMenu->IsMenuBar() )
     {
-        USHORT nPos = pSVMenu->GetItemPos( SID_MDIWINDOWLIST );
+        sal_uInt16 nPos = pSVMenu->GetItemPos( SID_MDIWINDOWLIST );
         if ( nPos != MENU_ITEM_NOTFOUND && xFrame.is() )
         {
             // Retrieve addon popup menus and add them to our menu bar
@@ -386,8 +386,8 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
     // remember some values
     SFX_APP();
-    const int bOleServer = FALSE;
-    const int bMac = FALSE;
+    const int bOleServer = sal_False;
+    const int bMac = sal_False;
     SvtMenuOptions aOptions;
     aOptions.AddListenerLink( LINK( this, SfxVirtualMenu, SettingsChanged ) );
 
@@ -398,10 +398,10 @@ void SfxVirtualMenu::CreateFromSVMenu()
     // Update high contrast state
     bWasHighContrast = IsHiContrastMode();
 
-    USHORT nSVPos = 0;
-    for ( USHORT nPos=0; nPos<nCount; ++nPos, ++nSVPos )
+    sal_uInt16 nSVPos = 0;
+    for ( sal_uInt16 nPos=0; nPos<nCount; ++nPos, ++nSVPos )
     {
-        USHORT nSlotId = pSVMenu->GetItemId(nSVPos);
+        sal_uInt16 nSlotId = pSVMenu->GetItemId(nSVPos);
         PopupMenu* pPopup = pSVMenu->GetPopupMenu(nSlotId);
         if( pPopup && nSlotId >= SID_OBJECTMENU0 && nSlotId <= SID_OBJECTMENU_LAST )
         {
@@ -438,7 +438,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    Image aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+                    Image aImage = GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast );
                     pSVMenu->SetItemImage( nSlotId, aImage );
                 }
             }
@@ -517,13 +517,13 @@ void SfxVirtualMenu::CreateFromSVMenu()
                             if ( pMenuAttributes )
                                 aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                            aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bWasHighContrast );
+                            aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, sal_False, bWasHighContrast );
                         }
                         else
                         {
                             rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                             aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                            aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+                            aImage = GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast );
                         }
 
                         if ( !!aImage )
@@ -565,27 +565,27 @@ IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu )
     if ( pMenu == pSVMenu )
     {
         // AutoDeactivate ist jetzt nicht mehr n"otig
-        //USHORT nSlotId = pMenu->GetCurItemId();
+        //sal_uInt16 nSlotId = pMenu->GetCurItemId();
         if ( pAutoDeactivate )
             pAutoDeactivate->Stop();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
 {
-    USHORT nItemCount = pSVMenu->GetItemCount();
+    sal_uInt16 nItemCount = pSVMenu->GetItemCount();
     SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
-    BOOL bIsHiContrastMode = IsHiContrastMode();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIsHiContrastMode = IsHiContrastMode();
     Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
     if ( !bIsAddonPopupMenu )
     {
-        for ( USHORT nSVPos=0; nSVPos<nItemCount; ++nSVPos )
+        for ( sal_uInt16 nSVPos=0; nSVPos<nItemCount; ++nSVPos )
         {
-            USHORT          nSlotId = pSVMenu->GetItemId( nSVPos );
+            sal_uInt16          nSlotId = pSVMenu->GetItemId( nSVPos );
             MenuItemType    nType   = pSVMenu->GetItemType( nSVPos );
             if ( nType == MENUITEM_STRING && bIcons )
             {
@@ -601,13 +601,13 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
                     if ( pMenuAttributes )
                         aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, sal_False, bIsHiContrastMode ));
                 }
                 else
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast ));
                 }
             }
             else if( nType == MENUITEM_STRINGIMAGE && !bIcons )
@@ -644,18 +644,18 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
 
 void SfxVirtualMenu::UpdateImages()
 {
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
 
     if ( bIcons )
     {
-        BOOL            bIsHiContrastMode   = IsHiContrastMode();
-        USHORT          nItemCount          = pSVMenu->GetItemCount();
+        sal_Bool            bIsHiContrastMode   = IsHiContrastMode();
+        sal_uInt16          nItemCount          = pSVMenu->GetItemCount();
         SfxViewFrame *  pViewFrame          = pBindings->GetDispatcher()->GetFrame();
         Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
-        for ( USHORT nSVPos=0; nSVPos < nItemCount; ++nSVPos )
+        for ( sal_uInt16 nSVPos=0; nSVPos < nItemCount; ++nSVPos )
         {
-            USHORT nSlotId = pSVMenu->GetItemId( nSVPos );
+            sal_uInt16 nSlotId = pSVMenu->GetItemId( nSVPos );
             if ( pSVMenu->GetItemType( nSVPos ) == MENUITEM_STRINGIMAGE )
             {
                 if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
@@ -670,13 +670,13 @@ void SfxVirtualMenu::UpdateImages()
                     if ( pMenuAttributes )
                         aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, sal_False, bIsHiContrastMode ));
                 }
                 else
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast ));
                 }
             }
         }
@@ -695,16 +695,16 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
 
     framework::AddonsOptions    aAddonOptions;
 
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
     if ( bIcons )
     {
-        BOOL            bIsHiContrastMode   = IsHiContrastMode();
-        USHORT          nItemCount          = pMenu->GetItemCount();
+        sal_Bool            bIsHiContrastMode   = IsHiContrastMode();
+        sal_uInt16          nItemCount          = pMenu->GetItemCount();
         Reference<com::sun::star::frame::XFrame> aXFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() );
 
-        for ( USHORT nPos=0; nPos < nItemCount; ++nPos )
+        for ( sal_uInt16 nPos=0; nPos < nItemCount; ++nPos )
         {
-            USHORT nSlotId = pMenu->GetItemId( nPos );
+            sal_uInt16 nSlotId = pMenu->GetItemId( nPos );
             PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId );
             if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
             {
@@ -716,7 +716,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
                 if ( pMenuAttributes )
                     aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE, bIsHiContrastMode ));
+                pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), sal_False, bIsHiContrastMode ));
             }
 
             if ( pPopup )
@@ -735,10 +735,10 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
     if ( !pMenu )
         return;
 
-    USHORT nItemCount = pMenu->GetItemCount();
-    for ( USHORT nPos=0; nPos < nItemCount; ++nPos )
+    sal_uInt16 nItemCount = pMenu->GetItemCount();
+    for ( sal_uInt16 nPos=0; nPos < nItemCount; ++nPos )
     {
-        USHORT nSlotId = pMenu->GetItemId( nPos );
+        sal_uInt16 nSlotId = pMenu->GetItemId( nPos );
         PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId );
         if ( pMenu->GetItemType( nPos ) == MENUITEM_STRINGIMAGE )
             pMenu->SetItemImage( nSlotId, Image() );
@@ -749,18 +749,18 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
 
 //--------------------------------------------------------------------
 
-FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
+bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 {
-    // Selber suchen, da SV mit 'USHORT nSID = pSVMenu->GetCurItemId();' immer
+    // Selber suchen, da SV mit 'sal_uInt16 nSID = pSVMenu->GetCurItemId();' immer
     // 0 liefert. Das ist so, weil die Event-Weiterleitung lt. TH nichts mit
     // CurItem des Parent-Menus zu tun hat.
     sal_uInt32 nAddonsPopupPrefixLen = ADDONSPOPUPMENU_URL_PREFIX.getLength();
 
-    for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
     {
         // angesprochenes Sub-Menu gefunden?
-        FASTBOOL bFound = FALSE;
-        USHORT nSID = pSVMenu->GetItemId(nPos);
+        bool bFound = false;
+        sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
         SfxMenuControl &rCtrl = pItems[nPos];
         bFound = pSVMenu->GetPopupMenu(nSID) == pMenu;
         SfxVirtualMenu *pSubMenu = rCtrl.GetPopupMenu();
@@ -770,7 +770,7 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
             // Nur ein gebundener Menu-Controller hat schon seine Id!
             if ( !rCtrl.GetId() )
             {
-                bIsAddonPopupMenu = FALSE;
+                bIsAddonPopupMenu = sal_False;
                 DBG_ASSERT( !pSubMenu, "Popup schon vorhanden!");
 
                 // Check if the popup is an Add-On popup menu
@@ -780,12 +780,12 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
                      ( nSID == SID_ADDONHELP ) ||
                      (( (sal_uInt32)aCommand.getLength() > nAddonsPopupPrefixLen ) &&
                       ( aCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 )) )
-                    bIsAddonPopupMenu = TRUE;
+                    bIsAddonPopupMenu = sal_True;
 
                 // VirtualMenu f"ur Sub-Menu erzeugen
-                BOOL bRes = bResCtor;
+                sal_Bool bRes = bResCtor;
                 pSubMenu = new SfxVirtualMenu( nSID, this,
-                        *pMenu, FALSE, *pBindings, bOLE, bRes, bIsAddonPopupMenu );
+                        *pMenu, sal_False, *pBindings, bOLE, bRes, bIsAddonPopupMenu );
 
                 DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
 
@@ -805,18 +805,18 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 
         // gefunden, dann abbrechen
         if ( bFound )
-            return TRUE;
+            return true;
     }
 
     // nicht in diesem Untermenu gefunden
-    return FALSE;
+    return false;
 }
 
 void SfxVirtualMenu::BindControllers()
 {
     pBindings->ENTERREGISTRATIONS();
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < nCount; ++nPos )
     {
         SfxMenuControl& rCtrl = pItems[nPos];
@@ -828,20 +828,20 @@ void SfxVirtualMenu::BindControllers()
     for ( nPos=0; nPos<rCtrlArr.Count(); nPos++ )
     {
         SfxMenuControl* pCtrl = rCtrlArr[nPos];
-        USHORT nSlotId = pCtrl->GetId();
+        sal_uInt16 nSlotId = pCtrl->GetId();
         if ( !pSVMenu->GetItemCommand(nSlotId).Len() )
             pCtrl->ReBind();
     }
 
     pBindings->LEAVEREGISTRATIONS();
-    bControllersUnBound = FALSE;
+    bControllersUnBound = sal_False;
 }
 
 void SfxVirtualMenu::UnbindControllers()
 {
     pBindings->ENTERREGISTRATIONS();
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < nCount; ++nPos )
     {
         SfxMenuControl &rCtrl = pItems[nPos];
@@ -859,7 +859,7 @@ void SfxVirtualMenu::UnbindControllers()
     }
 
     pBindings->LEAVEREGISTRATIONS();
-    bControllersUnBound = TRUE;
+    bControllersUnBound = sal_True;
 }
 
 
@@ -883,7 +883,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
     // Create menu item at the end of the tools popup menu for the addons popup menu
     if ( pAddonMenu && pAddonMenu->GetItemCount() > 0 )
     {
-        USHORT nItemCount = pMenu->GetItemCount();
+        sal_uInt16 nItemCount = pMenu->GetItemCount();
         String aAddonsTitle( SfxResId( STR_MENU_ADDONS ));
         if ( nItemCount > 0 && pMenu->GetItemType( nItemCount-1 ) != MENUITEM_SEPARATOR )
             pMenu->InsertSeparator();
@@ -894,7 +894,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
         {
                rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
-         pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+         pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast ));
         }
     }
     else
@@ -932,7 +932,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
     {
         // doppelt-Activate verhindern
         if ( bIsActive )
-            return TRUE;
+            return sal_True;
 
         // ggf. Pick-Menu erzeugen
         if ( pParent && pSVMenu == pParent->pPickMenu )
@@ -949,8 +949,8 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
             Reference< XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
                                             DEFINE_CONST_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
 
-            USHORT  nActiveItemId = 0;
-            USHORT  nItemId = START_ITEMID_WINDOWLIST;
+            sal_uInt16  nActiveItemId = 0;
+            sal_uInt16  nItemId = START_ITEMID_WINDOWLIST;
 
             if ( xDesktop.is() )
             {
@@ -1019,9 +1019,9 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 
         //InvalidateKeyCodes();
         pBindings->GetDispatcher_Impl()->Flush();
-        for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+        for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         {
-            USHORT nSlotId = (pItems+nPos)->GetId();
+            sal_uInt16 nSlotId = (pItems+nPos)->GetId();
             if ( nSlotId && nSlotId > END_ITEMID_WINDOWLIST )
                 pBindings->Update(nSlotId);
         }
@@ -1036,7 +1036,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         }
 
         // bis zum Deactivate die Statusupdates unterdr"ucken
-        pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = TRUE;
+        pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = sal_True;
 
         if ( pAutoDeactivate ) // QAP-Hack
             pAutoDeactivate->Start();
@@ -1052,7 +1052,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         }
 
         // erledigt
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -1081,9 +1081,9 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
         // das Menue deaktiviert ( = zugeklappt ) wird
         if ( pParent )
             UnbindControllers();
-        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = FALSE;
+        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 //--------------------------------------------------------------------
 
@@ -1091,20 +1091,20 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
 
 IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
 {
-    USHORT nSlotId = (USHORT) pMenu->GetCurItemId();
+    sal_uInt16 nSlotId = (sal_uInt16) pMenu->GetCurItemId();
     DBG_OUTF( ("SfxVirtualMenu %lx selected %u from %lx", this, nSlotId, pMenu) );
 /*
     if ( pSVMenu->GetItemCommand( nSlotId ).Len() )
     {
         SfxMenuCtrlArr_Impl& rCtrlArr = GetAppCtrl_Impl();
-        for ( USHORT nPos=0; nPos<rCtrlArr.Count(); nPos++ )
+        for ( sal_uInt16 nPos=0; nPos<rCtrlArr.Count(); nPos++ )
         {
             SfxMenuControl* pCtrl = rCtrlArr[nPos];
             if ( pCtrl->GetId() == nSlotId )
             {
                 SfxUnoMenuControl *pUnoCtrl = (SfxUnoMenuControl*) pCtrl;
                 pUnoCtrl->Select();
-                return TRUE;
+                return sal_True;
             }
         }
     }
@@ -1116,7 +1116,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
                                         DEFINE_CONST_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
         if ( xDesktop.is() )
         {
-            USHORT nTaskId = START_ITEMID_WINDOWLIST;
+            sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
             Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
             sal_Int32 nFrameCount = xList->getCount();
             for ( sal_Int32 i=0; i<nFrameCount; ++i )
@@ -1135,7 +1135,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
     else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <= END_ITEMID_PICKLIST )
     {
@@ -1148,7 +1148,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
     else
         pBindings->Execute( nSlotId );
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -1167,12 +1167,12 @@ Menu* SfxVirtualMenu::GetSVMenu() const
 
 // return the position of the specified item
 
-USHORT SfxVirtualMenu::GetItemPos( USHORT nItemId ) const
+sal_uInt16 SfxVirtualMenu::GetItemPos( sal_uInt16 nItemId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         if ( (pItems+nPos)->GetId() == nItemId )
             return nPos;
     return MENU_ITEM_NOTFOUND;
@@ -1182,12 +1182,12 @@ USHORT SfxVirtualMenu::GetItemPos( USHORT nItemId ) const
 
 // returns the popup-menu assigned to the item or 0 if none
 
-SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( USHORT nItemId ) const
+SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( sal_uInt16 nItemId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nPos = GetItemPos(nItemId);
+    sal_uInt16 nPos = GetItemPos(nItemId);
     if ( nPos != MENU_ITEM_NOTFOUND )
         return (pItems+nPos)->GetPopupMenu();
     return 0;
@@ -1196,12 +1196,12 @@ SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( USHORT nItemId ) const
 
 // returns the text of the item as currently shown in the menu
 
-String SfxVirtualMenu::GetItemText( USHORT nSlotId ) const
+String SfxVirtualMenu::GetItemText( sal_uInt16 nSlotId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nPos = GetItemPos(nSlotId);
+    sal_uInt16 nPos = GetItemPos(nSlotId);
     if ( nPos != MENU_ITEM_NOTFOUND )
         return (pItems+nPos)->GetTitle();
     return String();
@@ -1210,12 +1210,12 @@ String SfxVirtualMenu::GetItemText( USHORT nSlotId ) const
 
 // returns the text of the item as currently shown in the menu
 
-String SfxVirtualMenu::GetItemHelpText( USHORT nSlotId ) const
+String SfxVirtualMenu::GetItemHelpText( sal_uInt16 nSlotId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nPos = GetItemPos(nSlotId);
+    sal_uInt16 nPos = GetItemPos(nSlotId);
     if ( nPos != MENU_ITEM_NOTFOUND )
         return (pItems+nPos)->GetHelpText();
     return String();
@@ -1225,7 +1225,7 @@ String SfxVirtualMenu::GetItemHelpText( USHORT nSlotId ) const
 
 // set the checkmark of the specified item
 
-void SfxVirtualMenu::CheckItem( USHORT nItemId, BOOL bCheck )
+void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1238,7 +1238,7 @@ void SfxVirtualMenu::CheckItem( USHORT nItemId, BOOL bCheck )
 
 // set the enabled-state of the specified item
 
-void SfxVirtualMenu::EnableItem( USHORT nItemId, BOOL bEnable )
+void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1252,7 +1252,7 @@ void SfxVirtualMenu::EnableItem( USHORT nItemId, BOOL bEnable )
 
 // set the text of the specified item
 
-void SfxVirtualMenu::SetItemText( USHORT nItemId, const String& rText )
+void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const String& rText )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1266,14 +1266,14 @@ void SfxVirtualMenu::SetItemText( USHORT nItemId, const String& rText )
 
 //
 
-void SfxVirtualMenu::SetPopupMenu( USHORT nItemId, PopupMenu *pMenu )
+void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
         GetSVMenu()->SetPopupMenu( nItemId, pMenu );
-    for ( USHORT n = 0; n < nCount; ++n )
+    for ( sal_uInt16 n = 0; n < nCount; ++n )
     {
         SfxVirtualMenu *pSubMenu = (pItems+n)->GetPopupMenu();
         if ( pSubMenu )
@@ -1285,12 +1285,12 @@ void SfxVirtualMenu::SetPopupMenu( USHORT nItemId, PopupMenu *pMenu )
 
 // Erzwingt die Initialisierung, die sonst nur im Activate kommt
 
-void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
+void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, sal_Bool /*bOLE*/ )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nSID = pSVMenu->GetItemId(nPos);
+    sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
     PopupMenu *pMenu = pSVMenu->GetPopupMenu( nSID );
 
     DBG_ASSERT( pMenu, "Hier gibt es kein Popup!");
@@ -1299,9 +1299,9 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
     if ( !rCtrl.GetId() )
     {
         // VirtualMenu f"ur Sub-Menu erzeugen
-        BOOL bRes = bResCtor;
+        sal_Bool bRes = bResCtor;
         SfxVirtualMenu *pSubMenu =
-            new SfxVirtualMenu(nSID, this, *pMenu, FALSE, *pBindings, bOLE, bRes);
+            new SfxVirtualMenu(nSID, this, *pMenu, sal_False, *pBindings, bOLE, bRes);
 
         DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
 
@@ -1313,16 +1313,16 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
 
 void SfxVirtualMenu::InitializeHelp()
 {
-    for ( USHORT nPos = 0; nPos<pSVMenu->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos<pSVMenu->GetItemCount(); ++nPos )
     {
-        USHORT nSlotId = pSVMenu->GetItemId(nPos);
+        sal_uInt16 nSlotId = pSVMenu->GetItemId(nPos);
         // TODO/CLEANUP: this code does nothing!
 //        if ( !bHelpInitialized )
 //            pSVMenu->SetHelpText( nId, rSlotPool.GetSlotHelpText_Impl( nId ) );
         SfxMenuControl &rCtrl = pItems[nPos];
         if ( nSlotId && !rCtrl.GetId() )
         {
-            InitPopup( nPos, TRUE );
+            InitPopup( nPos, sal_True );
         }
 
         SfxVirtualMenu *pSubMenu = rCtrl.GetPopupMenu();
@@ -1330,10 +1330,10 @@ void SfxVirtualMenu::InitializeHelp()
             pSubMenu->InitializeHelp();
     }
 
-    bHelpInitialized = TRUE;
+    bHelpInitialized = sal_True;
 }
 
-typedef ULONG (__LOADONCALLAPI *HelpIdFunc) ( const String& );
+typedef sal_uIntPtr (__LOADONCALLAPI *HelpIdFunc) ( const String& );
 
 void SfxVirtualMenu::SetHelpIds( ResMgr *pRes )
 {
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 9ffc2200cfe8..fd1327e423ca 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -97,7 +97,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY &
             // create Configuration at first, creation might call this method also and that would overwrite everything
             // we might have stored before!
             if ( mpObjShell && !mpObjShell->IsLoading() )
-                mpObjShell->SetModified( TRUE );
+                mpObjShell->SetModified( sal_True );
 
             ::comphelper::NamedValueCollection aNormalizedDescriptor;
             NormalizeMacro( aEventDescriptor, aNormalizedDescriptor, mpObjShell );
@@ -375,7 +375,7 @@ SfxEvents_Impl::~SfxEvents_Impl()
 }
 
 //--------------------------------------------------------------------------------------------------------
-SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* pObjShell, BOOL bNormalizeMacro )
+SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* pObjShell, sal_Bool bNormalizeMacro )
 {
     SvxMacro* pMacro = NULL;
     SEQUENCE < PROPERTYVALUE > aProperties;
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 68d855cbf6c6..387a6d09f89a 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -66,9 +66,9 @@ using namespace ::com::sun::star;
 
 //--------------------------------------------------------------------
 
-USHORT SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons )
+sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons )
 {
-    USHORT nVCLMouseButtons( 0 );
+    sal_uInt16 nVCLMouseButtons( 0 );
 
     if ( nAwtMouseButtons & awt::MouseButton::LEFT )
         nVCLMouseButtons |= MOUSE_LEFT;
@@ -130,7 +130,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     const SfxSlot* pSlot = pSlotPool->GetUnoSlot( aTargetURL.Path );
     if ( pSlot )
     {
-        USHORT nSlotId = pSlot->GetSlotId();
+        sal_uInt16 nSlotId = pSlot->GetSlotId();
         if ( nSlotId > 0 )
         {
             rtl::OString aCmd(".uno:");
@@ -147,12 +147,12 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
 
 SfxStatusBarControl::SfxStatusBarControl
 (
-    USHORT      nSlotID,            /* Slot-Id, mit der diese Instanz
+    sal_uInt16      nSlotID,            /* Slot-Id, mit der diese Instanz
                                        verbunden wird. Wurde bei der
                                        Registrierung eine Slot-Id != 0
                                        angegeben, ist dies immer die dort
                                        angegebene. */
-    USHORT      nCtrlID,            /* ID of this controller in the status bar */
+    sal_uInt16      nCtrlID,            /* ID of this controller in the status bar */
 
     StatusBar&  rBar                /* Referenz auf die StatusBar, f"ur die
                                        dieses Control erzeugt wurde. */
@@ -251,7 +251,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
         }
     }
 
-    USHORT nSlotID = 0;
+    sal_uInt16 nSlotID = 0;
     SfxSlotPool& rPool = SfxSlotPool::GetSlotPool( pViewFrame );
     const SfxSlot* pSlot = rPool.GetUnoSlot( rEvent.FeatureURL.Path );
     if ( pSlot )
@@ -337,7 +337,7 @@ throw ( uno::RuntimeException )
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
 
     ::MouseEvent aMouseEvent( aPos,
-                              (USHORT)rMouseEvent.ClickCount,
+                              (sal_uInt16)rMouseEvent.ClickCount,
                               0,
                               convertAwtToVCLMouseButtons( rMouseEvent.Buttons ),
                               0 );
@@ -355,7 +355,7 @@ throw (uno::RuntimeException)
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
 
     ::MouseEvent aMouseEvent( aPos,
-                              (USHORT)rMouseEvent.ClickCount,
+                              (sal_uInt16)rMouseEvent.ClickCount,
                               0,
                               convertAwtToVCLMouseButtons( rMouseEvent.Buttons ),
                               0 );
@@ -372,7 +372,7 @@ throw ( uno::RuntimeException )
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
 
     ::MouseEvent aMouseEvent( aPos,
-                              (USHORT)rMouseEvent.ClickCount,
+                              (sal_uInt16)rMouseEvent.ClickCount,
                               0,
                               convertAwtToVCLMouseButtons( rMouseEvent.Buttons ),
                               0 );
@@ -390,7 +390,7 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
     ::Point aPos( rPos.X, rPos.Y );
-    CommandEvent aCmdEvent( aPos, (USHORT)nCommand, TRUE, NULL );
+    CommandEvent aCmdEvent( aPos, (sal_uInt16)nCommand, sal_True, NULL );
 
     Command( aCmdEvent );
 }
@@ -410,7 +410,7 @@ throw ( ::uno::RuntimeException )
     if ( pOutDev )
     {
         ::Rectangle aRect = VCLRectangle( rOutputRectangle );
-        UserDrawEvent aUserDrawEvent( pOutDev, aRect, (USHORT)nItemId, (USHORT)nStyle );
+        UserDrawEvent aUserDrawEvent( pOutDev, aRect, (sal_uInt16)nItemId, (sal_uInt16)nStyle );
         Paint( aUserDrawEvent );
     }
 }
@@ -439,7 +439,7 @@ throw ( uno::RuntimeException )
 
 void SfxStatusBarControl::StateChanged
 (
-    USHORT              nSID,
+    sal_uInt16              nSID,
     SfxItemState        eState,
     const SfxPoolItem*  pState  /* Zeiger auf ein SfxPoolItem, welches nur
                                    innerhalb dieses Methodenaufrufs g"ultig
@@ -474,7 +474,7 @@ void SfxStatusBarControl::StateChanged
 
 //--------------------------------------------------------------------
 
-BOOL SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
+sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
 
 /*  [Beschreibung]
 
@@ -488,7 +488,7 @@ BOOL SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
 
     [Rueckgabewert]
 
-    BOOL                TRUE
+    sal_Bool                TRUE
                         das Event wurde bearbeitet und soll nicht an
                         die StatusBar weitergeleitet werden
 
@@ -498,12 +498,12 @@ BOOL SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxStatusBarControl::MouseMove( const MouseEvent & )
+sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & )
 
 /*  [Beschreibung]
 
@@ -517,7 +517,7 @@ BOOL SfxStatusBarControl::MouseMove( const MouseEvent & )
 
     [Rueckgabewert]
 
-    BOOL                TRUE
+    sal_Bool                TRUE
                         das Event wurde bearbeitet und soll nicht an
                         die StatusBar weitergeleitet werden
 
@@ -527,12 +527,12 @@ BOOL SfxStatusBarControl::MouseMove( const MouseEvent & )
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
+sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
 
 /*  [Beschreibung]
 
@@ -546,7 +546,7 @@ BOOL SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
 
     [Rueckgabewert]
 
-    BOOL                TRUE
+    sal_Bool                TRUE
                         das Event wurde bearbeitet und soll nicht an
                         die StatusBar weitergeleitet werden
 
@@ -556,7 +556,7 @@ BOOL SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -641,8 +641,8 @@ void SfxStatusBarControl::ReleaseMouse()
 
 SfxStatusBarControl* SfxStatusBarControl::CreateControl
 (
-    USHORT     nSlotID,
-    USHORT     nStbId,
+    sal_uInt16     nSlotID,
+    sal_uInt16     nStbId,
     StatusBar* pBar,
     SfxModule* pMod
 )
@@ -665,7 +665,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
             if ( pFactories )
             {
                 SfxStbCtrlFactArr_Impl &rFactories = *pFactories;
-                for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+                for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
                 if ( rFactories[nFactory]->nTypeId == aSlotType &&
                      ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                      ( rFactories[nFactory]->nSlotId == nSlotID) ) )
@@ -674,7 +674,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
         }
 
         SfxStbCtrlFactArr_Impl &rFactories = pApp->GetStbCtrlFactories_Impl();
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
         if ( rFactories[nFactory]->nTypeId == aSlotType &&
              ( ( rFactories[nFactory]->nSlotId == 0 ) ||
              ( rFactories[nFactory]->nSlotId == nSlotID) ) )
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 231baa76fc76..3afea8890535 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -58,7 +58,7 @@ const sal_uInt32 IMAGELIST_COUNT = 4; // small, small-hi, large, large-hi
 struct ToolBoxInf_Impl
 {
     ToolBox* pToolBox;
-    USHORT   nFlags;
+    sal_uInt16   nFlags;
 };
 
 class SfxImageManager_Impl
@@ -70,8 +70,8 @@ public:
     ImageList*                      m_pImageList[IMAGELIST_COUNT];
     SfxModule*                      m_pModule;
 
-    ImageList*              GetImageList( BOOL bBig, BOOL bHiContrast );
-    Image                   GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast );
+    ImageList*              GetImageList( sal_Bool bBig, sal_Bool bHiContrast );
+    Image                   GetImage( sal_uInt16 nId, sal_Bool bBig, sal_Bool bHiContrast );
     void                    SetSymbolsSize_Impl( sal_Int16 );
 
     DECL_LINK( OptionsChanged_Impl, void* );
@@ -122,7 +122,7 @@ static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
 }
 
 // Global image list
-static ImageList* GetImageList( BOOL bBig, BOOL bHiContrast )
+static ImageList* GetImageList( sal_Bool bBig, sal_Bool bHiContrast )
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
@@ -185,7 +185,7 @@ SfxImageManager_Impl::~SfxImageManager_Impl()
 
 //-------------------------------------------------------------------------
 
-ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
+ImageList* SfxImageManager_Impl::GetImageList( sal_Bool bBig, sal_Bool bHiContrast )
 {
     sal_Int32 nIndex = impl_convertBools( bBig, bHiContrast );
     if ( !m_pImageList[nIndex] )
@@ -201,7 +201,7 @@ ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast )
+Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, sal_Bool bBig, sal_Bool bHiContrast )
 {
     ImageList* pImageList = GetImageList( bBig, bHiContrast );
     if ( pImageList )
@@ -218,7 +218,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
     if ( nNewSymbolsSize != m_nSymbolsSize )
     {
         m_nSymbolsSize = nNewSymbolsSize;
-        BOOL bLarge( m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
+        sal_Bool bLarge( m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
 
         for ( sal_uInt32 n=0; n < m_aToolBoxes.size(); n++ )
         {
@@ -226,11 +226,11 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
             if ( pInf->nFlags & SFX_TOOLBOX_CHANGESYMBOLSET )
             {
                 ToolBox *pBox       = pInf->pToolBox;
-                BOOL    bHiContrast = pBox->GetSettings().GetStyleSettings().GetHighContrastMode();
-                USHORT  nCount      = pBox->GetItemCount();
-                for ( USHORT nPos=0; nPos<nCount; nPos++ )
+                sal_Bool    bHiContrast = pBox->GetSettings().GetStyleSettings().GetHighContrastMode();
+                sal_uInt16  nCount      = pBox->GetItemCount();
+                for ( sal_uInt16 nPos=0; nPos<nCount; nPos++ )
                 {
-                    USHORT nId = pBox->GetItemId( nPos );
+                    sal_uInt16 nId = pBox->GetItemId( nPos );
                     if ( pBox->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
                     {
                         pBox->SetItemImage( nId, GetImage( nId, bLarge, bHiContrast ) );
@@ -312,7 +312,7 @@ SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule )
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
+Image SfxImageManager::GetImage( sal_uInt16 nId, sal_Bool bBig, sal_Bool bHiContrast ) const
 {
     ImageList* pImageList = pImp->GetImageList( bBig, bHiContrast );
     if ( pImageList && pImageList->HasImageAtPos( nId ) )
@@ -322,15 +322,15 @@ Image SfxImageManager::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::GetImage( USHORT nId, BOOL bHiContrast ) const
+Image SfxImageManager::GetImage( sal_uInt16 nId, sal_Bool bHiContrast ) const
 {
-    BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
+    sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
     return GetImage( nId, bLarge, bHiContrast );
 }
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
+Image SfxImageManager::SeekImage( sal_uInt16 nId, sal_Bool bBig, sal_Bool bHiContrast ) const
 {
     sal_Bool bGlobal = ( pImp->m_pModule == 0 );
     ImageList* pImageList = pImp->GetImageList( bBig, bHiContrast );
@@ -347,15 +347,15 @@ Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) cons
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bHiContrast ) const
+Image SfxImageManager::SeekImage( sal_uInt16 nId, sal_Bool bHiContrast ) const
 {
-    BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
+    sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
     return SeekImage( nId, bLarge, bHiContrast );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::RegisterToolBox( ToolBox *pBox, USHORT nFlags )
+void SfxImageManager::RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags )
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
@@ -384,21 +384,21 @@ void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge )
+void SfxImageManager::SetImages( ToolBox& rToolBox, sal_Bool bHiContrast, sal_Bool bLarge )
 {
     SetImagesForceSize( rToolBox, bLarge, bHiContrast );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge )
+void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, sal_Bool bHiContrast, sal_Bool bLarge )
 {
     ImageList* pImageList = pImp->GetImageList( bLarge, bHiContrast );
 
-    USHORT nCount = rToolBox.GetItemCount();
-    for (USHORT n=0; n<nCount; n++)
+    sal_uInt16 nCount = rToolBox.GetItemCount();
+    for (sal_uInt16 n=0; n<nCount; n++)
     {
-        USHORT nId = rToolBox.GetItemId(n);
+        sal_uInt16 nId = rToolBox.GetItemId(n);
         switch ( rToolBox.GetItemType(n) )
         {
             case TOOLBOXITEM_BUTTON:
@@ -420,7 +420,7 @@ void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, B
 
 void SfxImageManager::SetImages( ToolBox& rToolBox )
 {
-    BOOL bLarge = ( pImp->m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
-    BOOL bHiContrast = rToolBox.GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool bLarge = ( pImp->m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
+    sal_Bool bHiContrast = rToolBox.GetSettings().GetStyleSettings().GetHighContrastMode();
     SetImagesForceSize( rToolBox, bHiContrast, bLarge );
 }
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 6bf2dc26edd6..730926351a05 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -124,7 +124,7 @@ using namespace ::com::sun::star::ui;
 
 //====================================================================
 
-SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, TRUE);
+SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, sal_True);
 SFX_IMPL_TOOLBOX_CONTROL(SfxAppToolBoxControl_Impl, SfxStringItem);
 
 static Window* GetTopMostParentSystemWindow( Window* pWindow )
@@ -195,7 +195,7 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
     const SfxSlot* pSlot = pSlotPool->GetUnoSlot( aTargetURL.Path );
     if ( pSlot )
     {
-        USHORT nSlotId = pSlot->GetSlotId();
+        sal_uInt16 nSlotId = pSlot->GetSlotId();
         if ( nSlotId > 0 )
             return SfxToolBoxControl::CreateControl( nSlotId, nID, pToolbox, pModule );
     }
@@ -206,11 +206,11 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
 struct SfxToolBoxControl_Impl
 {
     ToolBox*                pBox;
-    BOOL                    bShowString;
-    USHORT                  nSelectModifier;
+    sal_Bool                    bShowString;
+    sal_uInt16                  nSelectModifier;
     SfxTbxCtrlFactory*      pFact;
-    USHORT                  nTbxId;
-    USHORT                  nSlotId;
+    sal_uInt16                  nTbxId;
+    sal_uInt16                  nSlotId;
     SfxPopupWindow*         mpFloatingWindow;
     SfxPopupWindow*         mpPopupWindow;
     Reference< XUIElement > mxUIElement;
@@ -240,10 +240,10 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent
 //--------------------------------------------------------------------
 
 SfxToolBoxControl::SfxToolBoxControl(
-    USHORT          nSlotID,
-    USHORT          nID,
+    sal_uInt16          nSlotID,
+    sal_uInt16          nID,
     ToolBox&        rBox,
-    BOOL            bShowStringItems     )
+    sal_Bool            bShowStringItems     )
 :   svt::ToolboxController()
 {
     pImpl = new SfxToolBoxControl_Impl;
@@ -327,7 +327,7 @@ void SfxToolBoxControl::RegisterToolBoxControl( SfxModule* pMod, SfxTbxCtrlFacto
     SFX_APP()->RegisterToolBoxControl_Impl( pMod, pFact );
 }
 
-SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbxId, ToolBox *pBox, SfxModule* pMod  )
+SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uInt16 nTbxId, ToolBox *pBox, SfxModule* pMod  )
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
@@ -348,8 +348,8 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbx
             if ( pFactories )
             {
                 SfxTbxCtrlFactArr_Impl &rFactories = *pFactories;
-                USHORT nFactory;
-                const USHORT nCount = rFactories.Count();
+                sal_uInt16 nFactory;
+                const sal_uInt16 nCount = rFactories.Count();
 
                 // search for a factory with the given slot id
                 for( nFactory = 0; nFactory < nCount; ++nFactory )
@@ -375,8 +375,8 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbx
         }
 
         SfxTbxCtrlFactArr_Impl &rFactories = pApp->GetTbxCtrlFactories_Impl();
-        USHORT nFactory;
-        const USHORT nCount = rFactories.Count();
+        sal_uInt16 nFactory;
+        const sal_uInt16 nCount = rFactories.Count();
 
         for( nFactory = 0; nFactory < nCount; ++nFactory )
             if( (rFactories[nFactory]->nTypeId == aSlotType) && (rFactories[nFactory]->nSlotId == nSlotId) )
@@ -561,7 +561,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
         }
     }
 
-    USHORT nSlotId = 0;
+    sal_uInt16 nSlotId = 0;
     SfxSlotPool& rPool = SfxSlotPool::GetSlotPool( pViewFrame );
     const SfxSlot* pSlot = rPool.GetUnoSlot( rEvent.FeatureURL.Path );
     if ( pSlot )
@@ -669,7 +669,7 @@ void SAL_CALL SfxToolBoxControl::updateImage() throw (::com::sun::star::uno::Run
 void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException)
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
-    Select( (USHORT)KeyModifier );
+    Select( (sal_uInt16)KeyModifier );
 }
 void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException)
 {
@@ -826,7 +826,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub
     {
         static WeakReference< XUIElementFactory > xWeakUIElementFactory;
 
-        USHORT nItemId = pImpl->pBox->GetDownItemId();
+        sal_uInt16 nItemId = pImpl->pBox->GetDownItemId();
 
         if ( !nItemId )
             return;
@@ -961,7 +961,7 @@ IMPL_LINK( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow )
 
 void SfxToolBoxControl::StateChanged
 (
-    USHORT              nId,
+    sal_uInt16              nId,
     SfxItemState        eState,
     const SfxPoolItem*  pState
 )
@@ -975,7 +975,7 @@ void SfxToolBoxControl::StateChanged
     // enabled/disabled-Flag pauschal korrigieren
     pImpl->pBox->EnableItem( GetId(), eState != SFX_ITEM_DISABLED );
 
-    USHORT nItemBits = pImpl->pBox->GetItemBits( GetId() );
+    sal_uInt16 nItemBits = pImpl->pBox->GetItemBits( GetId() );
     nItemBits &= ~TIB_CHECKABLE;
     TriState eTri = STATE_NOCHECK;
     switch ( eState )
@@ -1015,15 +1015,15 @@ void SfxToolBoxControl::StateChanged
 
 //--------------------------------------------------------------------
 
-void SfxToolBoxControl::Select( USHORT nModifier )
+void SfxToolBoxControl::Select( sal_uInt16 nModifier )
 {
     pImpl->nSelectModifier = nModifier;
-    Select( BOOL((nModifier & KEY_MOD1)!=0) );
+    Select( sal_Bool((nModifier & KEY_MOD1)!=0) );
 }
 
 //--------------------------------------------------------------------
 
-void SfxToolBoxControl::Select( BOOL /*bMod1*/ )
+void SfxToolBoxControl::Select( sal_Bool /*bMod1*/ )
 {
     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# #i102805#
     {
@@ -1134,7 +1134,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
         }
     }
 
-    USHORT nSlotId = 0;
+    sal_uInt16 nSlotId = 0;
     SfxSlotPool& rPool = SfxSlotPool::GetSlotPool( pViewFrame );
     const SfxSlot* pSlot = rPool.GetUnoSlot( rEvent.FeatureURL.Path );
     if ( pSlot )
@@ -1222,12 +1222,12 @@ throw ( ::com::sun::star::uno::RuntimeException )
 //--------------------------------------------------------------------
 
 SfxPopupWindow::SfxPopupWindow(
-    USHORT nId,
+    sal_uInt16 nId,
     const Reference< XFrame >& rFrame,
     WinBits nBits ) :
     FloatingWindow( SFX_APP()->GetTopWindow(), nBits )
-    , m_bFloating(FALSE)
-    , m_bCascading( FALSE )
+    , m_bFloating(sal_False)
+    , m_bCascading( sal_False )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1242,12 +1242,12 @@ SfxPopupWindow::SfxPopupWindow(
 //--------------------------------------------------------------------
 
 SfxPopupWindow::SfxPopupWindow(
-    USHORT nId,
+    sal_uInt16 nId,
     const Reference< XFrame >& rFrame,
     const ResId &rId ) :
     FloatingWindow( SFX_APP()->GetTopWindow(), rId )
-    , m_bFloating(FALSE)
-    , m_bCascading( FALSE )
+    , m_bFloating(sal_False)
+    , m_bCascading( sal_False )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1262,13 +1262,13 @@ SfxPopupWindow::SfxPopupWindow(
 //--------------------------------------------------------------------
 
 SfxPopupWindow::SfxPopupWindow(
-    USHORT nId,
+    sal_uInt16 nId,
     const Reference< XFrame >& rFrame,
     Window* pParentWindow,
     WinBits nBits ) :
     FloatingWindow( pParentWindow, nBits )
-    , m_bFloating(FALSE)
-    , m_bCascading( FALSE )
+    , m_bFloating(sal_False)
+    , m_bCascading( sal_False )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1283,13 +1283,13 @@ SfxPopupWindow::SfxPopupWindow(
 //--------------------------------------------------------------------
 
 SfxPopupWindow::SfxPopupWindow(
-    USHORT nId,
+    sal_uInt16 nId,
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     Window* pParentWindow,
     const ResId &rId ) :
     FloatingWindow( pParentWindow, rId )
-    , m_bFloating(FALSE)
-    , m_bCascading( FALSE )
+    , m_bFloating(sal_False)
+    , m_bCascading( sal_False )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1380,13 +1380,13 @@ void SfxPopupWindow::UpdateStatus( const rtl::OUString& rCommandURL )
 
 //--------------------------------------------------------------------
 
-BOOL SfxPopupWindow::Close()
+sal_Bool SfxPopupWindow::Close()
 {
-    m_bFloating = FALSE;
+    m_bFloating = sal_False;
     FloatingWindow::Close();
 
     Delete(0);
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -1400,7 +1400,7 @@ void SfxPopupWindow::PopupModeEnd()
     {
         // wurde abgerissen
         DeleteFloatingWindow();
-        m_bFloating = TRUE;
+        m_bFloating = sal_True;
     }
     else
         Close();
@@ -1421,14 +1421,14 @@ void SfxPopupWindow::DeleteFloatingWindow()
 
 void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
 {
-    if ( m_bCascading == FALSE )
+    if ( m_bCascading == sal_False )
         FloatingWindow::MouseMove( rMEvt );
     else
     {
         // MouseMove-Event an die Children forwarden
         ::Point       aPos = rMEvt.GetPosPixel();
         ::Point       aScrPos = OutputToScreenPixel( aPos );
-        USHORT i = 0;
+        sal_uInt16 i = 0;
         Window* pWindow = GetChild( i );
         while ( pWindow )
         {
@@ -1447,12 +1447,12 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
 
 void SfxPopupWindow::StartCascading()
 {
-    m_bCascading= TRUE;
+    m_bCascading= sal_True;
 }
 
 void SfxPopupWindow::EndCascading()
 {
-    m_bCascading = FALSE;
+    m_bCascading = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -1476,7 +1476,7 @@ SfxPopupWindow* SfxPopupWindow::Clone() const
 //--------------------------------------------------------------------
 
 void SfxPopupWindow::StateChanged(
-    USHORT /*nSID*/,
+    sal_uInt16 /*nSID*/,
     SfxItemState eState,
     const SfxPoolItem* /*pState*/ )
 /*  [Bescheibung]
@@ -1498,7 +1498,7 @@ void SfxPopupWindow::StateChanged(
     }
     else if ( m_bFloating )
     {
-        Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+        Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
     }
 }
 
@@ -1514,9 +1514,9 @@ IMPL_LINK( SfxPopupWindow, Delete, void *, EMPTYARG )
 
 //--------------------------------------------------------------------
 
-SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox )
+SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox )
     : SfxToolBoxControl( nSlotId, nId, rBox )
-    , bBigImages( FALSE )
+    , bBigImages( sal_False )
     , pMenu( 0 )
 {
     rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW );
@@ -1541,8 +1541,8 @@ SfxAppToolBoxControl_Impl::~SfxAppToolBoxControl_Impl()
     it return the existing state of the given URL in the popupmenu of this toolbox control.
 
     If the given URL can be located as an action command of one menu item of the
-    popup menu of this control, we return TRUE. Otherwhise we return FALSE.
-    Further we return a fallback URL, in case we have to return FALSE. Because
+    popup menu of this control, we return sal_True. Otherwhise we return sal_False.
+    Further we return a fallback URL, in case we have to return sal_False. Because
     the outside code must select a valid item of the popup menu everytime ...
     and we define it here. By the way this m ethod was written to handle
     error situations gracefully. E.g. it can be called during creation time
@@ -1563,34 +1563,34 @@ SfxAppToolBoxControl_Impl::~SfxAppToolBoxControl_Impl()
     @param  pImage
                 contains the image of the menu for the URL.
 
-    @return TRUE - if URL could be located as an item of the popup menu.
-            FALSE - otherwhise.
+    @return sal_True - if URL could be located as an item of the popup menu.
+            sal_False - otherwhise.
 */
-BOOL Impl_ExistURLInMenu( const PopupMenu *pMenu     ,
+sal_Bool Impl_ExistURLInMenu( const PopupMenu *pMenu     ,
                                 String    &sURL      ,
                                 String    *pFallback ,
                                 Image     *pImage    )
 {
-    BOOL bValidFallback = FALSE;
+    sal_Bool bValidFallback = sal_False;
     if (pMenu && sURL.Len())
     {
-        USHORT c = pMenu->GetItemCount();
-        for (USHORT p=0; p<c; ++p)
+        sal_uInt16 c = pMenu->GetItemCount();
+        for (sal_uInt16 p=0; p<c; ++p)
         {
-            USHORT nId = pMenu->GetItemId(p);
+            sal_uInt16 nId = pMenu->GetItemId(p);
             String aCmd( pMenu->GetItemCommand(nId) );
 
             if (!bValidFallback && aCmd.Len())
             {
                 *pFallback = aCmd;
-                bValidFallback = TRUE;
+                bValidFallback = sal_True;
             }
 
             if (aCmd.Search(sURL)==0)//match even if the menu command is more detailed (maybe an additional query) #i28667#
             {
                 sURL = aCmd;
                 *pImage = pMenu->GetItemImage( nId );
-                return TRUE;
+                return sal_True;
             }
         }
     }
@@ -1601,7 +1601,7 @@ BOOL Impl_ExistURLInMenu( const PopupMenu *pMenu     ,
         *pFallback += String(SvtModuleOptions().GetDefaultModuleName());
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 long Select_Impl( void* pHdl, void* pVoid );
@@ -1624,15 +1624,15 @@ SfxPopupWindow* SfxAppToolBoxControl_Impl::CreatePopupWindow()
     {
         pMenu->SetSelectHdl( Link( NULL, Select_Impl ) );
         pMenu->SetActivateHdl( LINK( this, SfxAppToolBoxControl_Impl, Activate ));
-        rBox.SetItemDown( GetId(), TRUE );
-        USHORT nSelected = pMenu->Execute( &rBox, aRect, POPUPMENU_EXECUTE_DOWN );
+        rBox.SetItemDown( GetId(), sal_True );
+        sal_uInt16 nSelected = pMenu->Execute( &rBox, aRect, POPUPMENU_EXECUTE_DOWN );
         if ( nSelected )
         {
             aLastURL = pMenu->GetItemCommand( nSelected );
             SetImage( pMenu->GetItemCommand( nSelected ) );
         }
 
-        rBox.SetItemDown( GetId(), FALSE );
+        rBox.SetItemDown( GetId(), sal_False );
     }
 
     return 0;
@@ -1645,12 +1645,12 @@ void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )
     String aURL = rURL;
     String sFallback;
     Image aMenuImage;
-    BOOL bValid = Impl_ExistURLInMenu(pMenu,aURL,&sFallback,&aMenuImage);
+    sal_Bool bValid = Impl_ExistURLInMenu(pMenu,aURL,&sFallback,&aMenuImage);
     if (!bValid)
         aURL = sFallback;
 
-    BOOL bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
-    BOOL bHC = GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
+    sal_Bool bHC = GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode();
     Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig, bHC );
     if ( !aImage )
         aImage = !!aMenuImage ? aMenuImage :
@@ -1669,7 +1669,7 @@ void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )
 
 void SfxAppToolBoxControl_Impl::StateChanged
 (
-    USHORT              nSlotId,
+    sal_uInt16              nSlotId,
     SfxItemState        eState,
     const SfxPoolItem*  pState
 )
@@ -1699,7 +1699,7 @@ void SfxAppToolBoxControl_Impl::StateChanged
 
 //--------------------------------------------------------------------
 
-void SfxAppToolBoxControl_Impl::Select( BOOL bMod1 )
+void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 )
 {
     if( aLastURL.Len() )
     {
@@ -1792,7 +1792,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
         Application::PostUserEvent( STATIC_LINK( 0, SfxAppToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
@@ -1800,9 +1800,9 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
     if ( pActMenu )
     {
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        ULONG nSymbolsStyle     = rSettings.GetSymbolsStyle();
-        BOOL bIsHiContrastMode  = rSettings.GetHighContrastMode();
-        BOOL bShowMenuImages    = rSettings.GetUseImagesInMenus();
+        sal_uIntPtr nSymbolsStyle     = rSettings.GetSymbolsStyle();
+        sal_Bool bIsHiContrastMode  = rSettings.GetHighContrastMode();
+        sal_Bool bShowMenuImages    = rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
             ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
@@ -1812,10 +1812,10 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
             m_bWasHiContrastMode = bIsHiContrastMode;
             m_bShowMenuImages    = bShowMenuImages;
 
-            USHORT nCount = pActMenu->GetItemCount();
-            for ( USHORT nSVPos = 0; nSVPos < nCount; nSVPos++ )
+            sal_uInt16 nCount = pActMenu->GetItemCount();
+            for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ )
             {
-                USHORT nId = pActMenu->GetItemId( nSVPos );
+                sal_uInt16 nId = pActMenu->GetItemId( nSVPos );
                 if ( pActMenu->GetItemType( nSVPos ) != MENUITEM_SEPARATOR )
                 {
                     if ( bShowMenuImages )
@@ -1831,7 +1831,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
                         if ( aImageId.getLength() > 0 )
                         {
                             Reference< ::com::sun::star::frame::XFrame > xFrame;
-                            Image aImage = GetImage( xFrame, aImageId, FALSE, bIsHiContrastMode );
+                            Image aImage = GetImage( xFrame, aImageId, sal_False, bIsHiContrastMode );
                             if ( !!aImage )
                             {
                                 bImageSet = sal_True;
@@ -1843,7 +1843,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
                         if ( !bImageSet && aCmd.Len() )
                         {
                             Image aImage = SvFileInformationManager::GetImage(
-                                INetURLObject(aCmd), FALSE, bIsHiContrastMode );
+                                INetURLObject(aCmd), sal_False, bIsHiContrastMode );
                             if ( !!aImage )
                                 pActMenu->SetItemImage( nId, aImage );
                         }
@@ -1854,10 +1854,10 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 49deab951843..1b9260474938 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -145,14 +145,14 @@ SfxFrame::~SfxFrame()
 sal_Bool SfxFrame::DoClose()
 {
     // Eigentlich wird noch ein PrepareClose gebraucht !!!
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if ( !pImp->bClosing )
     {
         pImp->bClosing = sal_True;
         CancelTransfers();
 
         // now close frame; it will be deleted if this call is successful, so don't use any members after that!
-        bRet = TRUE;
+        bRet = sal_True;
         try
         {
             Reference< XCloseable > xCloseable  ( pImp->xFrame, UNO_QUERY );
@@ -170,7 +170,7 @@ sal_Bool SfxFrame::DoClose()
         catch( ::com::sun::star::util::CloseVetoException& )
         {
             pImp->bClosing = sal_False;
-            bRet = FALSE;
+            bRet = sal_False;
         }
         catch( ::com::sun::star::lang::DisposedException& )
         {
@@ -247,7 +247,7 @@ sal_uInt16 SfxFrame::PrepareClose_Impl( sal_Bool bUI, sal_Bool bForBrowsing )
         if ( nRet == RET_OK )
         {
             // if this frame has child frames, ask them too
-            for( USHORT nPos = GetChildFrameCount(); nRet == RET_OK && nPos--; )
+            for( sal_uInt16 nPos = GetChildFrameCount(); nRet == RET_OK && nPos--; )
                 nRet = pChildArr->GetObject( nPos )->PrepareClose_Impl( bUI, bForBrowsing );
         }
 
@@ -296,7 +296,7 @@ sal_Bool SfxFrame::IsClosing_Impl() const
 
 void SfxFrame::SetIsClosing_Impl()
 {
-    pImp->bClosing = TRUE;
+    pImp->bClosing = sal_True;
 }
 
 sal_uInt16 SfxFrame::GetChildFrameCount() const
@@ -592,18 +592,18 @@ SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const
     return pNew;
 }
 
-sal_Bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+sal_Bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
 {
     if ( wFrame )
     {
         rVal <<= wFrame->GetFrameInterface();
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-sal_Bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+sal_Bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
 {
     Reference < XFrame > xFrame;
     if ( (rVal >>= xFrame) && xFrame.is() )
@@ -614,15 +614,15 @@ sal_Bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
             if ( pFr->GetFrameInterface() == xFrame )
             {
                 wFrame = pFrame = pFr;
-                return TRUE;
+                return sal_True;
             }
 
             pFr = SfxFrame::GetNext( *pFr );
         }
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -643,13 +643,13 @@ SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const
     return new SfxUsrAnyItem( Which(), aValue );
 }
 
-sal_Bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal = aValue;
     return sal_True;
 }
 
-sal_Bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     aValue = rVal;
     return sal_True;
@@ -677,13 +677,13 @@ SfxPoolItem* SfxUnoFrameItem::Clone( SfxItemPool* ) const
     return new SfxUnoFrameItem( Which(), m_xFrame );
 }
 
-sal_Bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= m_xFrame;
     return sal_True;
 }
 
-sal_Bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     return ( rVal >>= m_xFrame );
 }
@@ -978,7 +978,7 @@ SfxFrame* SfxFrame::GetFirst()
 
 SfxFrame* SfxFrame::GetNext( SfxFrame& rFrame )
 {
-    USHORT nPos = pFramesArr_Impl->GetPos( &rFrame );
+    sal_uInt16 nPos = pFramesArr_Impl->GetPos( &rFrame );
     if ( nPos+1 < pFramesArr_Impl->Count() )
         return pFramesArr_Impl->GetObject(nPos+1);
     else
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index ef963b36d7bb..ea6ab3abfb74 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -122,7 +122,7 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt )
         if ( pView->GetViewShell() && !pView->GetViewShell()->GetUIActiveIPClient_Impl() && !pFrame->IsInPlace() )
         {
             DBG_TRACE("SfxFrame: GotFocus");
-            pView->MakeActive_Impl( FALSE );
+            pView->MakeActive_Impl( sal_False );
         }
 
         // TODO/LATER: do we still need this code?
@@ -145,7 +145,7 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt )
     else if( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         if ( pView->GetViewShell()->KeyInput( *rNEvt.GetKeyEvent() ) )
-            return TRUE;
+            return sal_True;
     }
     else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTDISABLE*/ )
     {
@@ -164,7 +164,7 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt )
 
 long SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( nType == EVENT_KEYINPUT || nType == EVENT_KEYUP )
     {
         SfxViewFrame* pView = pFrame->GetCurrentViewFrame();
@@ -199,7 +199,7 @@ long SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 void SfxFrameWindow_Impl::GetFocus()
 {
     if ( pFrame && !pFrame->IsClosing_Impl() && pFrame->GetCurrentViewFrame() && pFrame->GetFrameInterface().is() )
-        pFrame->GetCurrentViewFrame()->MakeActive_Impl( TRUE );
+        pFrame->GetCurrentViewFrame()->MakeActive_Impl( sal_True );
 }
 
 void SfxFrameWindow_Impl::Resize()
@@ -212,7 +212,7 @@ void SfxFrameWindow_Impl::StateChanged( StateChangedType nStateChange )
 {
     if ( nStateChange == STATE_CHANGE_INITSHOW )
     {
-        pFrame->pImp->bHidden = FALSE;
+        pFrame->pImp->bHidden = sal_False;
         if ( pFrame->IsInPlace() )
             // TODO/MBA: workaround for bug in LayoutManager: the final resize does not get through because the
             // LayoutManager works asynchronously and between resize and time execution the DockingAcceptor was exchanged so that
@@ -250,7 +250,7 @@ Reference < XFrame > SfxFrame::CreateBlankFrame()
     return xFrame;
 }
 
-SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewId, bool bHidden )
+SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden )
 {
     SfxFrame* pFrame = NULL;
     try
@@ -341,7 +341,7 @@ SfxFrame::SfxFrame( Window& i_rContainerWindow, bool i_bHidden )
     pWindow->Show();
 }
 
-void SfxFrame::SetPresentationMode( BOOL bSet )
+void SfxFrame::SetPresentationMode( sal_Bool bSet )
 {
     if ( GetCurrentViewFrame() )
         GetCurrentViewFrame()->GetWindow().SetBorderStyle( bSet ? WINDOW_BORDER_NOBORDER : WINDOW_BORDER_NORMAL );
@@ -362,7 +362,7 @@ void SfxFrame::SetPresentationMode( BOOL bSet )
     if ( GetWorkWindow_Impl() )
         GetWorkWindow_Impl()->SetDockingAllowed( !bSet );
     if ( GetCurrentViewFrame() )
-        GetCurrentViewFrame()->GetDispatcher()->Update_Impl( TRUE );
+        GetCurrentViewFrame()->GetDispatcher()->Update_Impl( sal_True );
 }
 
 SystemWindow* SfxFrame::GetSystemWindow() const
@@ -389,14 +389,14 @@ sal_Bool SfxFrame::Close()
     return sal_True;
 }
 
-void SfxFrame::LockResize_Impl( BOOL bLock )
+void SfxFrame::LockResize_Impl( sal_Bool bLock )
 {
     pImp->bLockResize = bLock;
 }
 
 IMPL_LINK( SfxFrameWindow_Impl, CloserHdl, void*, EMPTYARG )
 {
-    if ( pFrame && !pFrame->PrepareClose_Impl( TRUE ) )
+    if ( pFrame && !pFrame->PrepareClose_Impl( sal_True ) )
         return 0L;
 
     if ( pFrame )
@@ -404,7 +404,7 @@ IMPL_LINK( SfxFrameWindow_Impl, CloserHdl, void*, EMPTYARG )
     return 0L;
 }
 
-void SfxFrame::SetMenuBarOn_Impl( BOOL bOn )
+void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
 {
     pImp->bMenuBarOn = bOn;
 
@@ -428,7 +428,7 @@ void SfxFrame::SetMenuBarOn_Impl( BOOL bOn )
     }
 }
 
-BOOL SfxFrame::IsMenuBarOn_Impl() const
+sal_Bool SfxFrame::IsMenuBarOn_Impl() const
 {
     return pImp->bMenuBarOn;
 }
@@ -472,7 +472,7 @@ void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc )
     // plugin mode
     sal_Int16 nPluginMode = aDocumentArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
     if ( nPluginMode && ( nPluginMode != 2 ) )
-        SetInPlace_Impl( TRUE );
+        SetInPlace_Impl( sal_True );
 }
 
 bool SfxFrame::IsMarkedHidden_Impl() const
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 4dbb8a3c640e..958f37f12916 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -252,13 +252,13 @@ namespace
 }
 
 // --------------------------------------------------------------------------------------------------------------------
-sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const USHORT _nSlotID, const Reference< XFrame >& i_rxFrame,
+sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const Reference< XFrame >& i_rxFrame,
                                                               const bool i_bHidden )
 {
     SfxRequest aRequest( _nSlotID, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() );
     aRequest.AppendItem( SfxUnoFrameItem( SID_FILLFRAME, i_rxFrame ) );
     if ( i_bHidden )
-        aRequest.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) );
+        aRequest.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) );
     return lcl_getDispatchResult( SFX_APP()->ExecuteSlot( aRequest ) );
 }
 
@@ -314,7 +314,7 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti
 // --------------------------------------------------------------------------------------------------------------------
 SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XModel2 >& i_rxDocument ) const
 {
-    for ( SfxObjectShell* pDoc = SfxObjectShell::GetFirst( NULL, FALSE ); pDoc; pDoc = SfxObjectShell::GetNext( *pDoc, NULL, FALSE ) )
+    for ( SfxObjectShell* pDoc = SfxObjectShell::GetFirst( NULL, sal_False ); pDoc; pDoc = SfxObjectShell::GetNext( *pDoc, NULL, sal_False ) )
     {
         if ( i_rxDocument == pDoc->GetModel() )
         {
@@ -372,7 +372,7 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal
 }
 
 // --------------------------------------------------------------------------------------------------------------------
-USHORT SfxFrameLoader_Impl::impl_findSlotParam( const ::rtl::OUString& i_rFactoryURL ) const
+sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const ::rtl::OUString& i_rFactoryURL ) const
 {
     ::rtl::OUString sSlotParam;
     const sal_Int32 nParamPos = i_rFactoryURL.indexOf( '?' );
@@ -385,7 +385,7 @@ USHORT SfxFrameLoader_Impl::impl_findSlotParam( const ::rtl::OUString& i_rFactor
     }
 
     if ( sSlotParam.getLength() )
-        return USHORT( sSlotParam.toInt32() );
+        return sal_uInt16( sSlotParam.toInt32() );
 
     return 0;
 }
@@ -552,7 +552,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
     {
         const ::rtl::OUString sFactory = sURL.copy( sizeof( "private:factory/" ) -1 );
         // special handling for some weird factory URLs a la private:factory/swriter?slot=21053
-        const USHORT nSlotParam = impl_findSlotParam( sFactory );
+        const sal_uInt16 nSlotParam = impl_findSlotParam( sFactory );
         if ( nSlotParam != 0 )
         {
             return impl_createNewDocWithSlotParam( nSlotParam, _rTargetFrame, aDescriptor.getOrDefault( "Hidden", false ) );
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index abe4cb6852d9..8fea153aed52 100644
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -78,13 +78,13 @@ struct SfxViewFrame_Impl
 
 class SfxFrameViewWindow_Impl : public Window
 {
-    BOOL            bActive;
+    sal_Bool            bActive;
     SfxViewFrame*   pFrame;
 
 public:
                         SfxFrameViewWindow_Impl( SfxViewFrame* p, Window& rParent, WinBits nBits=0 ) :
                             Window( &rParent, nBits | WB_BORDER | WB_CLIPCHILDREN ),
-                            bActive( FALSE ),
+                            bActive( sal_False ),
                             pFrame( p )
                         {
                             p->GetFrame().GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 997cb584f83d..30f2d568a3a8 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -399,7 +399,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingUI()
         throw uno::RuntimeException();
 
     m_pClient->GetViewShell()->ResetAllClients_Impl(m_pClient);
-    m_bUIActive = TRUE;
+    m_bUIActive = sal_True;
     m_pClient->GetViewShell()->UIActivating( m_pClient );
 }
 
@@ -423,7 +423,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI()
         throw uno::RuntimeException();
 
     m_pClient->GetViewShell()->UIDeactivated( m_pClient );
-    m_bUIActive = FALSE;
+    m_bUIActive = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -771,7 +771,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
 }
 
 //--------------------------------------------------------------------
-BOOL SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
+sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
 {
     if( rArea != m_pImp->m_aObjArea )
     {
@@ -779,10 +779,10 @@ BOOL SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
         m_pImp->SizeHasChanged();
 
         Invalidate();
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -992,7 +992,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
             {
 
                 if ( m_pViewSh )
-                    m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(TRUE);
+                    m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(sal_True);
                 try
                 {
                     m_pImp->m_xObject->setClientSite( m_pImp->m_xClient );
@@ -1042,7 +1042,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
                 if ( m_pViewSh )
                 {
                     SfxViewFrame* pFrame = m_pViewSh->GetViewFrame();
-                    pFrame->GetTopFrame().LockResize_Impl(FALSE);
+                    pFrame->GetTopFrame().LockResize_Impl(sal_False);
                     pFrame->GetTopFrame().Resize();
                 }
             }
@@ -1094,8 +1094,8 @@ void SfxInPlaceClient::DeactivateObject()
     {
         try
         {
-            m_pImp->m_bUIActive = FALSE;
-            BOOL bHasFocus = FALSE;
+            m_pImp->m_bUIActive = sal_False;
+            sal_Bool bHasFocus = sal_False;
             uno::Reference< frame::XModel > xModel( m_pImp->m_xObject->getComponent(), uno::UNO_QUERY );
             if ( xModel.is() )
             {
@@ -1103,12 +1103,12 @@ void SfxInPlaceClient::DeactivateObject()
                 if ( xController.is() )
                 {
                     Window* pWindow = VCLUnoHelper::GetWindow( xController->getFrame()->getContainerWindow() );
-                    bHasFocus = pWindow->HasChildPathFocus( TRUE );
+                    bHasFocus = pWindow->HasChildPathFocus( sal_True );
                 }
             }
 
             if ( m_pViewSh )
-                m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(TRUE);
+                m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(sal_True);
 
             if ( m_pImp->m_xObject->getStatus( m_pImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
             {
@@ -1130,7 +1130,7 @@ void SfxInPlaceClient::DeactivateObject()
             {
                 SfxViewFrame* pFrame = m_pViewSh->GetViewFrame();
                 SfxViewFrame::SetViewFrame( pFrame );
-                pFrame->GetTopFrame().LockResize_Impl(FALSE);
+                pFrame->GetTopFrame().LockResize_Impl(sal_False);
                 pFrame->GetTopFrame().Resize();
             }
         }
@@ -1145,7 +1145,7 @@ void SfxInPlaceClient::ResetObject()
     {
         try
         {
-            m_pImp->m_bUIActive = FALSE;
+            m_pImp->m_bUIActive = sal_False;
             if ( m_pImp->m_xObject->getStatus( m_pImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
                 m_pImp->m_xObject->changeState( embed::EmbedStates::INPLACE_ACTIVE );
             else
@@ -1163,7 +1163,7 @@ void SfxInPlaceClient::ResetObject()
     }
 }
 
-BOOL SfxInPlaceClient::IsUIActive()
+sal_Bool SfxInPlaceClient::IsUIActive()
 {
     return m_pImp->m_bUIActive;
 }
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index 6c92cd448adf..21bc74affd70 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -78,12 +78,12 @@ struct _FileListEntry
 //REMOVE        SvStorageRef aStor;         // Referenz auf Storage, wenn wir diesen geoeffnet haben
     //uno::Reference< embed::XStorage > xStorage;
 
-    BOOL bFile;                 // als Datei auf Platte
+    sal_Bool bFile;                 // als Datei auf Platte
                                 // (!= unbenannt1, nicht als Dok. geladen;
                                 // diese werden nicht gespeichert!)
-    BOOL bOwner;                // selbst erzeugt
-    BOOL bNoName;
-    BOOL bOwnFormat;
+    sal_Bool bOwner;                // selbst erzeugt
+    sal_Bool bNoName;
+    sal_Bool bOwnFormat;
 
     _FileListEntry( const String& rFileName,
                     const CollatorWrapper* pColl, const String* pTitle = NULL );
@@ -91,7 +91,7 @@ struct _FileListEntry
 
     int operator==( const _FileListEntry &rCmp) const;
     int operator< ( const _FileListEntry &rCmp) const;
-    BOOL DeleteObjectShell();
+    sal_Bool DeleteObjectShell();
 };
 
 //-------------------------------------------------------------------------
@@ -117,10 +117,10 @@ _FileListEntry::_FileListEntry( const String& rFileName,
 
     aFileName   ( rFileName ),
     pCollator   ( pColl ),
-    bFile       ( FALSE ),
-    bOwner      ( FALSE ),
-    bNoName     ( TRUE ),
-    bOwnFormat  ( TRUE )
+    bFile       ( sal_False ),
+    bOwner      ( sal_False ),
+    bNoName     ( sal_True ),
+    bOwnFormat  ( sal_True )
 {
     if ( pTitle )
         aBaseName = *pTitle;
@@ -145,20 +145,20 @@ SV_IMPL_OP_PTRARR_SORT(_SfxObjectList, _FileListEntry*)
 
 //=========================================================================
 
-BOOL _FileListEntry::DeleteObjectShell()
+sal_Bool _FileListEntry::DeleteObjectShell()
 
 /*  [Beschreibung]
 
     Freigabe der DokumentShell
 
-    [Returnwert]            TRUE: alles Ok
-                            FALSE: es ist ein Fehler aufgetreten (das
+    [Returnwert]            sal_True: alles Ok
+                            sal_False: es ist ein Fehler aufgetreten (das
                             Dokument konnte nicht gesichert werden)
 
 */
 
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
     //Falls wir die Shell angelegt haben und sie veraendert wurde
     if(bOwner && aDocShell.Is() && aDocShell->IsModified())
     {
@@ -166,7 +166,7 @@ BOOL _FileListEntry::DeleteObjectShell()
         if( bOwnFormat )
         {
             if(!aDocShell->Save() )
-                bRet = FALSE;
+                bRet = sal_False;
             else
             {
                 try {
@@ -218,14 +218,14 @@ SfxObjectList::~SfxObjectList()
 
 //-------------------------------------------------------------------------
 
-const String &SfxObjectList::GetBaseName(USHORT i) const
+const String &SfxObjectList::GetBaseName(sal_uInt16 i) const
 {
     return (*this)[i]->aBaseName;
 }
 
 //-------------------------------------------------------------------------
 
-const String& SfxObjectList::GetFileName( USHORT i ) const
+const String& SfxObjectList::GetFileName( sal_uInt16 i ) const
 {
     return (*this)[i]->aFileName;
 }
@@ -281,7 +281,7 @@ SfxOrganizeMgr::~SfxOrganizeMgr()
 
 //-------------------------------------------------------------------------
 
-SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
+SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( sal_uInt16 nIdx )
 
 /*  [Beschreibung]
 
@@ -298,17 +298,17 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
     {
 //(mba)/task        SfxWaitCursor aWaitCursor;
         INetURLObject aFileObj( pEntry->aFileName );
-        BOOL bDum = FALSE;
+        sal_Bool bDum = sal_False;
         SfxApplication* pSfxApp = SFX_APP();
         String aFilePath = aFileObj.GetMainURL( INetURLObject::NO_DECODE );
-        pEntry->aDocShell = pSfxApp->DocAlreadyLoaded( aFilePath, FALSE, bDum );
+        pEntry->aDocShell = pSfxApp->DocAlreadyLoaded( aFilePath, sal_False, bDum );
         if ( !pEntry->aDocShell.Is() )
         {
-            pEntry->bOwner = TRUE;
+            pEntry->bOwner = sal_True;
             SfxMedium* pMed = new SfxMedium(
-                aFilePath, ( STREAM_READ | STREAM_SHARE_DENYWRITE ), FALSE, 0 );
+                aFilePath, ( STREAM_READ | STREAM_SHARE_DENYWRITE ), sal_False, 0 );
             const SfxFilter* pFilter = NULL;
-            pMed->UseInteractionHandler(TRUE);
+            pMed->UseInteractionHandler(sal_True);
             if (
                 pSfxApp->GetFilterMatcher().GuessFilter(*pMed, &pFilter, SFX_FILTER_TEMPLATE, 0) ||
                 (pFilter && !pFilter->IsOwnFormat()) ||
@@ -316,7 +316,7 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
                )
             {
                 pSfxApp->LoadTemplate( pEntry->aDocShell, aFilePath );
-                pEntry->bOwnFormat = FALSE;
+                pEntry->bOwnFormat = sal_False;
                 delete pMed;
                 if ( pEntry->aDocShell.Is() )
                     return (SfxObjectShellRef)(SfxObjectShell*)(pEntry->aDocShell);
@@ -325,7 +325,7 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
             {
                 if ( pFilter )
                 {
-                    pEntry->bOwnFormat = TRUE;
+                    pEntry->bOwnFormat = sal_True;
                     pEntry->aDocShell = SfxObjectShell::CreateObject( pFilter->GetServiceName(), SFX_CREATE_MODE_ORGANIZER );
                     if ( pEntry->aDocShell.Is() )
                     {
@@ -343,14 +343,14 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::DeleteObjectShell(USHORT nIdx)
+sal_Bool SfxOrganizeMgr::DeleteObjectShell(sal_uInt16 nIdx)
 
 /*  [Beschreibung]
 
     Freigabe der DokumentShell an der Position nIdx
 
-    [Returnwert]            TRUE: alles Ok
-                            FALSE: es ist ein Fehler aufgetreten (das
+    [Returnwert]            sal_True: alles Ok
+                            sal_False: es ist ein Fehler aufgetreten (das
                             Dokument konnte nicht gesichert werden)
 
 */
@@ -360,8 +360,8 @@ BOOL SfxOrganizeMgr::DeleteObjectShell(USHORT nIdx)
 
 //-------------------------------------------------------------------------
 
-SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell(USHORT nRegion,
-                                                        USHORT nIdx)
+SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell(sal_uInt16 nRegion,
+                                                        sal_uInt16 nIdx)
 /*  [Beschreibung]
 
     Zugriff auf die DokumentShell an der Position nIdx im Bereich
@@ -377,15 +377,15 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell(USHORT nRegion,
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::DeleteObjectShell(USHORT nRegion, USHORT nIdx)
+sal_Bool SfxOrganizeMgr::DeleteObjectShell(sal_uInt16 nRegion, sal_uInt16 nIdx)
 
 /*  [Beschreibung]
 
     Freigabe der DokumentShell an der Position nIdx im Bereich
     nRegion (Dokumentvorlage)
 
-    [Returnwert]            TRUE: alles Ok
-                            FALSE: es ist ein Fehler aufgetreten (das
+    [Returnwert]            sal_True: alles Ok
+                            sal_False: es ist ein Fehler aufgetreten (das
                             Dokument konnte nicht gesichert werden)
 
 */
@@ -396,10 +396,10 @@ BOOL SfxOrganizeMgr::DeleteObjectShell(USHORT nRegion, USHORT nIdx)
 
 //-------------------------------------------------------------------------
 
-BOOL    SfxOrganizeMgr::Copy(USHORT nTargetRegion,
-                            USHORT nTargetIdx,
-                            USHORT nSourceRegion,
-                            USHORT nSourceIdx)
+sal_Bool    SfxOrganizeMgr::Copy(sal_uInt16 nTargetRegion,
+                            sal_uInt16 nTargetIdx,
+                            sal_uInt16 nSourceRegion,
+                            sal_uInt16 nSourceIdx)
 
 /*  [Beschreibung]
 
@@ -407,10 +407,10 @@ BOOL    SfxOrganizeMgr::Copy(USHORT nTargetRegion,
 
     [Parameter]
 
-    USHORT nTargetRegion            Index des Zielbereiches
-    USHORT nTargetIdx               Index Zielposition
-    USHORT nSourceRegion            Index des Quellbereiches
-    USHORT nSourceIdx               Index der zu kopierenden / z uverschiebenden
+    sal_uInt16 nTargetRegion            Index des Zielbereiches
+    sal_uInt16 nTargetIdx               Index Zielposition
+    sal_uInt16 nSourceRegion            Index des Quellbereiches
+    sal_uInt16 nSourceIdx               Index der zu kopierenden / z uverschiebenden
                                     Dokumentvorlage
 
     [R"uckgabewert]                 Erfolg (TRUE) oder Mi"serfolg (FALSE)
@@ -418,17 +418,17 @@ BOOL    SfxOrganizeMgr::Copy(USHORT nTargetRegion,
 
     [Querverweise]
 
-    <SfxDocumentTemplates::Copy(USHORT nTargetRegion,
-                                USHORT nTargetIdx,
-                                USHORT nSourceRegion,
-                                USHORT nSourceIdx)>
+    <SfxDocumentTemplates::Copy(sal_uInt16 nTargetRegion,
+                                sal_uInt16 nTargetIdx,
+                                sal_uInt16 nSourceRegion,
+                                sal_uInt16 nSourceIdx)>
 
 */
 
 {
     if(nSourceIdx == USHRT_MAX) // keine Verzeichnisse kopieren
-        return FALSE ;
-    const BOOL bOk = pTemplates->Copy(nTargetRegion, nTargetIdx,
+        return sal_False ;
+    const sal_Bool bOk = pTemplates->Copy(nTargetRegion, nTargetIdx,
                                         nSourceRegion, nSourceIdx);
     if(bOk)
         bModified = 1;
@@ -437,10 +437,10 @@ BOOL    SfxOrganizeMgr::Copy(USHORT nTargetRegion,
 
 //-------------------------------------------------------------------------
 
-BOOL    SfxOrganizeMgr::Move(USHORT nTargetRegion,
-                            USHORT nTargetIdx,
-                            USHORT nSourceRegion,
-                            USHORT nSourceIdx)
+sal_Bool    SfxOrganizeMgr::Move(sal_uInt16 nTargetRegion,
+                            sal_uInt16 nTargetIdx,
+                            sal_uInt16 nSourceRegion,
+                            sal_uInt16 nSourceIdx)
 
 /*  [Beschreibung]
 
@@ -448,10 +448,10 @@ BOOL    SfxOrganizeMgr::Move(USHORT nTargetRegion,
 
     [Parameter]
 
-    USHORT nTargetRegion            Index des Zielbereiches
-    USHORT nTargetIdx               Index Zielposition
-    USHORT nSourceRegion            Index des Quellbereiches
-    USHORT nSourceIdx               Index der zu kopierenden / z uverschiebenden
+    sal_uInt16 nTargetRegion            Index des Zielbereiches
+    sal_uInt16 nTargetIdx               Index Zielposition
+    sal_uInt16 nSourceRegion            Index des Quellbereiches
+    sal_uInt16 nSourceIdx               Index der zu kopierenden / z uverschiebenden
                                     Dokumentvorlage
 
     [R"uckgabewert]                 Erfolg (TRUE) oder Mi"serfolg (FALSE)
@@ -459,17 +459,17 @@ BOOL    SfxOrganizeMgr::Move(USHORT nTargetRegion,
 
     [Querverweise]
 
-    <SfxDocumentTemplates::Move(USHORT nTargetRegion,
-                                USHORT nTargetIdx,
-                                USHORT nSourceRegion,
-                                USHORT nSourceIdx)>
+    <SfxDocumentTemplates::Move(sal_uInt16 nTargetRegion,
+                                sal_uInt16 nTargetIdx,
+                                sal_uInt16 nSourceRegion,
+                                sal_uInt16 nSourceIdx)>
 
 */
 
 {
     if(nSourceIdx == USHRT_MAX) // keine Verzeichnisse verschieben
-        return FALSE ;
-    const BOOL bOk = pTemplates->Move(nTargetRegion, nTargetIdx,
+        return sal_False ;
+    const sal_Bool bOk = pTemplates->Move(nTargetRegion, nTargetIdx,
                                         nSourceRegion, nSourceIdx);
     if(bOk)
         bModified = 1;
@@ -478,8 +478,8 @@ BOOL    SfxOrganizeMgr::Move(USHORT nTargetRegion,
 
 //-------------------------------------------------------------------------
 
-BOOL    SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
-                                USHORT nRegion, USHORT nIdx)
+sal_Bool    SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
+                                sal_uInt16 nRegion, sal_uInt16 nIdx)
 
 /*  [Beschreibung]
 
@@ -492,20 +492,20 @@ BOOL    SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
                                     durch das Keyboard angetriggert wird,
                                     mu"s das Model der ListBox anschlie"send
                                     aktualisiert werden.
-    USHORT nRegion                  Index des Bereiches
-    USHORT nIdx                     Index der Dokumentvorlage
+    sal_uInt16 nRegion                  Index des Bereiches
+    sal_uInt16 nIdx                     Index der Dokumentvorlage
 
     [R"uckgabewert]                 Erfolg (TRUE) oder Mi"serfolg (FALSE)
 
 
     [Querverweise]
 
-    <SfxDocumentTemplates::Delete(USHORT nRegion, USHORT nIdx)>
+    <SfxDocumentTemplates::Delete(sal_uInt16 nRegion, sal_uInt16 nIdx)>
 
 */
 
 {
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
 
     if ( USHRT_MAX == nIdx )
     {
@@ -514,11 +514,11 @@ BOOL    SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
         SvLBoxEntry *pGroupToDelete = pCaller->SvLBox::GetEntry(nRegion);
         if ( pGroupToDelete )
         {
-            USHORT nItemNum = (USHORT)( pCaller->GetModel()->GetChildCount( pGroupToDelete ) );
-            USHORT nToDeleteNum = 0;
+            sal_uInt16 nItemNum = (sal_uInt16)( pCaller->GetModel()->GetChildCount( pGroupToDelete ) );
+            sal_uInt16 nToDeleteNum = 0;
             SvLBoxEntry **pEntriesToDelete = new SvLBoxEntry*[nItemNum];
 
-            USHORT nInd = 0;
+            sal_uInt16 nInd = 0;
             for ( nInd = 0; nInd < nItemNum; nInd++ )
                 pEntriesToDelete[nInd] = NULL;
 
@@ -563,7 +563,7 @@ BOOL    SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
 
 //-------------------------------------------------------------------------
 
-BOOL    SfxOrganizeMgr::InsertDir
+sal_Bool    SfxOrganizeMgr::InsertDir
 (
     SfxOrganizeListBox_Impl*    pCaller,/*  rufende ListBox; da dieses Event
                                             durch das Men"u oder durch das
@@ -571,7 +571,7 @@ BOOL    SfxOrganizeMgr::InsertDir
                                             mu\s das Model der ListBox
                                             anschlie\send aktualisiert werden */
     const String&               rText,  //  logischer Name des Bereiches
-    USHORT                      nRegion //  Index des Bereiches
+    sal_uInt16                      nRegion //  Index des Bereiches
 )
 
 /*  [Beschreibung]
@@ -581,23 +581,23 @@ BOOL    SfxOrganizeMgr::InsertDir
 
     [R"uckgabewert]
 
-    Erfolg (TRUE) oder Mi\serfolg (FALSE)
+    Erfolg (sal_True) oder Mi\serfolg (sal_False)
 
 
     [Querverweise]
 
-    <SfxDocumentTemplates::InsertDir(const String &, USHORT nRegion)>
+    <SfxDocumentTemplates::InsertDir(const String &, sal_uInt16 nRegion)>
 */
 
 {
-    const BOOL bOk = pTemplates->InsertDir(rText, nRegion);
+    const sal_Bool bOk = pTemplates->InsertDir(rText, nRegion);
     if(bOk)
     {
         bModified = 1;
         SvLBoxEntry *pEntry = pCaller->InsertEntry(rText,
                                                    pCaller->GetOpenedBmp(0),
                                                    pCaller->GetClosedBmp(0),
-                                                   0, TRUE, nRegion);
+                                                   0, sal_True, nRegion);
         pCaller->Update();
         pCaller->EditEntry(pEntry);
     }
@@ -606,8 +606,8 @@ BOOL    SfxOrganizeMgr::InsertDir
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::SetName(const String &rName,
-                             USHORT nRegion, USHORT nIdx)
+sal_Bool SfxOrganizeMgr::SetName(const String &rName,
+                             sal_uInt16 nRegion, sal_uInt16 nIdx)
 
 /*  [Beschreibung]
 
@@ -616,20 +616,20 @@ BOOL SfxOrganizeMgr::SetName(const String &rName,
     [Parameter]
 
     const String &rName             der neue Name
-    USHORT nRegion                  Index des Bereiches
-    USHORT nIdx                     Index der Dokumentvorlage
+    sal_uInt16 nRegion                  Index des Bereiches
+    sal_uInt16 nIdx                     Index der Dokumentvorlage
 
     [R"uckgabewert]                 Erfolg (TRUE) oder Mi"serfolg (FALSE)
 
 
     [Querverweise]
 
-    <SfxDocumentTemplates::SetName(const String &, USHORT nRegion, USHORT nIdx)>
+    <SfxDocumentTemplates::SetName(const String &, sal_uInt16 nRegion, sal_uInt16 nIdx)>
 
 */
 
 {
-    const BOOL bOk = pTemplates->SetName(rName, nRegion, nIdx);
+    const sal_Bool bOk = pTemplates->SetName(rName, nRegion, nIdx);
     if(bOk)
         bModified = 1;
     return bOk;
@@ -637,7 +637,7 @@ BOOL SfxOrganizeMgr::SetName(const String &rName,
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) const
+sal_Bool SfxOrganizeMgr::CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const String &rName) const
 
 /*  [Beschreibung]
 
@@ -645,8 +645,8 @@ BOOL SfxOrganizeMgr::CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) co
 
     [Parameter]
 
-    USHORT nRegion                  Index des Bereiches
-    USHORT nIdx                     Index der Dokumentvorlage
+    sal_uInt16 nRegion                  Index des Bereiches
+    sal_uInt16 nIdx                     Index der Dokumentvorlage
     const String &rName             Dateiname
 
     [R"uckgabewert]                 Erfolg (TRUE) oder Mi"serfolg (FALSE)
@@ -654,7 +654,7 @@ BOOL SfxOrganizeMgr::CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) co
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyTo( USHORT nRegion, USHORT nIdx, const String &)>
+    <SfxDocumentTemplates::CopyTo( sal_uInt16 nRegion, sal_uInt16 nIdx, const String &)>
 
 */
 
@@ -664,8 +664,8 @@ BOOL SfxOrganizeMgr::CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) co
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
-                              USHORT nRegion, USHORT nIdx, String &rName)
+sal_Bool SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
+                              sal_uInt16 nRegion, sal_uInt16 nIdx, String &rName)
 
 /*  [Beschreibung]
 
@@ -677,8 +677,8 @@ BOOL SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
                                     Event durch das Men"u angetriggert wird,
                                     mu"s das Model der ListBox anschlie"send
                                     aktualisiert werden.
-    USHORT nRegion                  Index des Bereiches
-    USHORT nIdx                     Index der Dokumentvorlage
+    sal_uInt16 nRegion                  Index des Bereiches
+    sal_uInt16 nIdx                     Index der Dokumentvorlage
     String &rName                   Dateiname
 
     [R"uckgabewert]                 Erfolg (TRUE) oder Mi"serfolg (FALSE)
@@ -686,7 +686,7 @@ BOOL SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyFrom( USHORT nRegion, USHORT nIdx, const String &)>
+    <SfxDocumentTemplates::CopyFrom( sal_uInt16 nRegion, sal_uInt16 nIdx, const String &)>
 
 */
 
@@ -705,20 +705,20 @@ BOOL SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
                               pCaller->GetOpenedBmp(1),
                               pCaller->GetClosedBmp(1),
                               pParent,
-                              TRUE,
+                              sal_True,
                               nIdx);
         pCaller->Update();
         // pCaller->EditEntry( pEntry );
         pCaller->Expand( pParent );
-        bModified = TRUE;
-        return TRUE;
+        bModified = sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName )
+sal_Bool SfxOrganizeMgr::InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName )
 
 /*  [Beschreibung]
 
@@ -741,18 +741,18 @@ BOOL SfxOrganizeMgr::InsertFile( SfxOrganizeListBox_Impl* pCaller, const String&
     _FileListEntry* pEntry = new _FileListEntry( rFileName, pCollator );
     if ( pImpl->pDocList->C40_PTR_INSERT( _FileListEntry, pEntry ) )
     {
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         pImpl->pDocList->Seek_Entry( pEntry, &nPos );
         pCaller->InsertEntry( pEntry->aBaseName, pCaller->GetOpenedBmp(1),
-                              pCaller->GetClosedBmp(1), 0, TRUE, nPos );
-        return TRUE;
+                              pCaller->GetClosedBmp(1), 0, sal_True, nPos );
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::Rescan()
+sal_Bool SfxOrganizeMgr::Rescan()
 
 /*  [Beschreibung]
 
@@ -760,7 +760,7 @@ BOOL SfxOrganizeMgr::Rescan()
 
     [R"uckgabewert]
 
-    TRUE                    es bestanden Unterschiede
+    sal_True                    es bestanden Unterschiede
     FALSE                   keine "Anderung
 
     [Querverweise]
@@ -771,10 +771,10 @@ BOOL SfxOrganizeMgr::Rescan()
 {
     if(pTemplates->Rescan())
     {
-        bModified = TRUE;
-        return TRUE;
+        bModified = sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -792,14 +792,14 @@ void SfxOrganizeMgr::SaveAll(Window *pParent)
 */
 
 {
-    USHORT nRangeCount = pTemplates->GetRegionCount();
-    USHORT i;
+    sal_uInt16 nRangeCount = pTemplates->GetRegionCount();
+    sal_uInt16 i;
     for(i = 0; i < nRangeCount; ++i)
     {
         if( pTemplates->IsRegionLoaded( i ))
         {
-            const USHORT nCount = pTemplates->GetCount(i);
-            for(USHORT j = 0; j < nCount; ++j)
+            const sal_uInt16 nCount = pTemplates->GetCount(i);
+            for(sal_uInt16 j = 0; j < nCount; ++j)
             {
                 if(!pTemplates->DeleteObjectShell(i, j))
                 {
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 64bebccd60fd..470b96106184 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -50,16 +50,16 @@
 
 struct SfxPrinter_Impl
 {
-    BOOL                mbAll;
-    BOOL                mbSelection;
-    BOOL                mbFromTo;
-    BOOL                mbRange;
+    sal_Bool            mbAll;
+    sal_Bool            mbSelection;
+    sal_Bool            mbFromTo;
+    sal_Bool            mbRange;
 
     SfxPrinter_Impl() :
-        mbAll       ( TRUE ),
-        mbSelection ( TRUE ),
-        mbFromTo    ( TRUE ),
-        mbRange     ( TRUE ) {}
+        mbAll       ( sal_True ),
+        mbSelection ( sal_True ),
+        mbFromTo    ( sal_True ),
+        mbRange     ( sal_True ) {}
     ~SfxPrinter_Impl() {}
 };
 
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 8fd223279372..b3a7bea50946 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -424,7 +424,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const EV
     SfxViewShell* pShell = m_pController->GetViewShell_Impl();
     if  ( m_pController !=  NULL &&  pShell )
     {
-        BOOL bCanClose = (BOOL) pShell->PrepareClose( FALSE );
+        sal_Bool bCanClose = (sal_Bool) pShell->PrepareClose( sal_False );
         if ( !bCanClose )
         {
             if ( bDeliverOwnership && ( !pShell->GetWindow() || !pShell->GetWindow()->IsReallyVisible() ) )
@@ -514,7 +514,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const FRAMEACT
         if ( aEvent.Action == ::com::sun::star::frame::FrameAction_FRAME_UI_ACTIVATED )
         {
             if ( !m_pController->GetViewShell_Impl()->GetUIActiveIPClient_Impl() )
-                m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( FALSE );
+                m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( sal_False );
         }
         else if ( aEvent.Action == ::com::sun::star::frame::FrameAction_CONTEXT_CHANGED )
         {
@@ -698,7 +698,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( ::com::
         for ( const SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); !bOther && pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ) )
             bOther = (pFrame != pActFrame);
 
-        BOOL bRet = bOther || pDocShell->PrepareClose();
+        sal_Bool bRet = bOther || pDocShell->PrepareClose();
         if ( bRet )
         {
             ConnectSfxFrame_Impl( E_DISCONNECT );
@@ -795,7 +795,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(   const   UNOU
             {
                 SfxViewFrame *pFrame = m_pData->m_pViewShell->GetViewFrame();
                 if ( eSearchFlags & ( ::com::sun::star::frame::FrameSearchFlag::CREATE ))
-                    pFrame->SetChildWindow( SID_BROWSER, TRUE );
+                    pFrame->SetChildWindow( SID_BROWSER, sal_True );
                 SfxChildWindow* pChildWin = pFrame->GetChildWindow( SID_BROWSER );
                 REFERENCE < XFRAME > xFrame;
                 if ( pChildWin )
@@ -866,7 +866,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(   const   UNOU
             }
             else if ( aURL.Protocol.compareToAscii( "slot:" ) == COMPARE_EQUAL )
             {
-                USHORT nId = (USHORT) aURL.Path.toInt32();
+                sal_uInt16 nId = (sal_uInt16) aURL.Path.toInt32();
 
                 pAct = m_pData->m_pViewShell->GetViewFrame() ;
                 if (nId >= SID_VERB_START && nId <= SID_VERB_END)
@@ -1206,10 +1206,10 @@ throw (::com::sun::star::uno::RuntimeException)
     SfxSlotPool*  pPool = &SfxSlotPool::GetSlotPool( pViewFrame );
 
     SfxSlotPool* pSlotPool = pPool ? pPool : &SFX_SLOTPOOL();
-    const ULONG nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
+    const sal_uIntPtr nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
 
     // Gruppe anw"ahlen ( Gruppe 0 ist intern )
-    for ( USHORT i=0; i<pSlotPool->GetGroupCount(); i++ )
+    for ( sal_uInt16 i=0; i<pSlotPool->GetGroupCount(); i++ )
     {
         String aName = pSlotPool->SeekGroup( i );
         const SfxSlot* pSfxSlot = pSlotPool->FirstSlot();
@@ -1238,14 +1238,14 @@ throw (::com::sun::star::uno::RuntimeException)
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
     if ( m_pData->m_pViewShell )
     {
-        const ULONG nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
+        const sal_uIntPtr nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
 
         SfxViewFrame* pViewFrame( m_pData->m_pViewShell->GetFrame() );
         SfxSlotPool*  pPool( &SfxSlotPool::GetSlotPool( pViewFrame ));
         rtl::OUString aCmdPrefix( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
 
         SfxSlotPool* pSlotPool = pPool ? pPool : &SFX_SLOTPOOL();
-        for ( USHORT i=0; i<pSlotPool->GetGroupCount(); i++ )
+        for ( sal_uInt16 i=0; i<pSlotPool->GetGroupCount(); i++ )
         {
             String aName = pSlotPool->SeekGroup( i );
             const SfxSlot* pSfxSlot = pSlotPool->FirstSlot();
@@ -1278,17 +1278,17 @@ throw (::com::sun::star::uno::RuntimeException)
     return aSeq;
 }
 
-BOOL SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
+sal_Bool SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
 {
     return m_pData->m_aUserInputInterception.handleNotifyEvent( rEvent );
 }
 
-BOOL SfxBaseController::HasKeyListeners_Impl()
+sal_Bool SfxBaseController::HasKeyListeners_Impl()
 {
     return m_pData->m_aUserInputInterception.hasKeyHandlers();
 }
 
-BOOL SfxBaseController::HasMouseClickListeners_Impl()
+sal_Bool SfxBaseController::HasMouseClickListeners_Impl()
 {
     return m_pData->m_aUserInputInterception.hasMouseClickListeners();
 }
@@ -1367,15 +1367,15 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
             if ( !rFrame.IsMarkedHidden_Impl() )
             {
                 if ( rDoc.IsHelpDocument() || ( nPluginMode == 2 ) )
-                    pViewFrame->GetDispatcher()->HideUI( TRUE );
+                    pViewFrame->GetDispatcher()->HideUI( sal_True );
                 else
-                    pViewFrame->GetDispatcher()->HideUI( FALSE );
+                    pViewFrame->GetDispatcher()->HideUI( sal_False );
 
                 if ( rFrame.IsInPlace() )
                     pViewFrame->LockAdjustPosSizePixel();
 
                 if ( nPluginMode == 3 )
-                    rFrame.GetWorkWindow_Impl()->SetInternalDockingAllowed( FALSE );
+                    rFrame.GetWorkWindow_Impl()->SetInternalDockingAllowed( sal_False );
 
                 if ( !rFrame.IsInPlace() )
                     pViewFrame->GetDispatcher()->Update_Impl();
@@ -1390,7 +1390,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
                     // force resize for OLE server to fix layout problems of writer and math
                     // see i53651
                     if ( nPluginMode == 3 )
-                        pViewFrame->Resize( TRUE );
+                        pViewFrame->Resize( sal_True );
                 }
             }
             else
@@ -1403,7 +1403,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
             pViewFrame->UpdateTitle();
 
             if ( !rFrame.IsInPlace() )
-                pViewFrame->Resize( TRUE );
+                pViewFrame->Resize( sal_True );
 
             // if there's a JumpMark given, then, well, jump to it
             ::comphelper::NamedValueCollection aViewArgs( getCreationArguments() );
@@ -1466,7 +1466,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
                         Sequence< PropertyValue > aViewData;
                         OSL_VERIFY( xViewData->getByIndex( nViewDataIndex ) >>= aViewData );
                         if ( aViewData.getLength() > 0 )
-                            m_pData->m_pViewShell->ReadUserDataSequence( aViewData, TRUE );
+                            m_pData->m_pViewShell->ReadUserDataSequence( aViewData, sal_True );
                     }
                 }
                 catch( const Exception& )
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index ad910a944e0f..97c9e7926e39 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -184,7 +184,7 @@ namespace sfx2
     {
         Reference < XInterface > xHoldAlive( m_pData->m_rControllerImpl );
 
-        USHORT nType = _rEvent.GetType();
+        sal_uInt16 nType = _rEvent.GetType();
         bool bHandled = false;
 
         switch ( nType )
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index 3eed678420dd..1b48d716ff79 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -71,7 +71,7 @@ String SfxViewFactory::GetAPIViewName() const
 // CTOR / DTOR -----------------------------------------------------------
 
 SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI,
-                                USHORT nOrdinal, const sal_Char* asciiViewName ):
+                                sal_uInt16 nOrdinal, const sal_Char* asciiViewName ):
     fnCreate(fnC),
     fnInit(fnI),
     nOrd(nOrdinal),
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 4dcd4bb4709e..eb8fb8cf6125 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -606,7 +606,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 bForEdit = !bForEdit;
 
             // ggf. beim User nachfragen
-            sal_Bool bDo = ( GetViewShell()->PrepareClose() != FALSE );
+            sal_Bool bDo = ( GetViewShell()->PrepareClose() != sal_False );
             SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False);
             if ( bDo && GetFrame().DocIsModified_Impl() &&
                  !rReq.IsAPI() && ( !pSilentItem || !pSilentItem->GetValue() ) )
@@ -633,7 +633,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 // collect the views of the document
                 // TODO: when UNO ViewFactories are available for SFX-based documents, the below code should
                 // be UNOized, too
-                typedef ::std::pair< Reference< XFrame >, USHORT >  ViewDescriptor;
+                typedef ::std::pair< Reference< XFrame >, sal_uInt16 >  ViewDescriptor;
                 ::std::list< ViewDescriptor > aViewFrames;
                 SfxViewFrame *pView = GetFirst( xOldObj );
                 while ( pView )
@@ -710,9 +710,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 if ( pSilentItem && pSilentItem->GetValue() )
                     pNewSet->Put( SfxBoolItem( SID_SILENT, sal_True ) );
 
-                SFX_ITEMSET_ARG(pNewSet, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE);
-                SFX_ITEMSET_ARG(pNewSet, pMacroExecItem  , SfxUInt16Item, SID_MACROEXECMODE     , FALSE);
-                SFX_ITEMSET_ARG(pNewSet, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE     , FALSE);
+                SFX_ITEMSET_ARG(pNewSet, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False);
+                SFX_ITEMSET_ARG(pNewSet, pMacroExecItem  , SfxUInt16Item, SID_MACROEXECMODE     , sal_False);
+                SFX_ITEMSET_ARG(pNewSet, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE     , sal_False);
 
                 if (!pInteractionItem)
                 {
@@ -1861,7 +1861,7 @@ void SfxViewFrame::Enable( sal_Bool bEnable )
             if ( !bEnable )
                 pImp->bWindowWasEnabled = pWindow->IsInputEnabled();
             if ( !bEnable || pImp->bWindowWasEnabled )
-                pWindow->EnableInput( bEnable, TRUE );
+                pWindow->EnableInput( bEnable, sal_True );
         }
 
         // cursor and focus
@@ -1927,11 +1927,11 @@ void SfxViewFrame::Show()
             pCurrent != this &&
             ( !pCurrent || pCurrent->GetParentViewFrame_Impl() != this ) &&
             !GetActiveChildFrame_Impl() )
-        MakeActive_Impl( FALSE );*/
+        MakeActive_Impl( sal_False );*/
     if ( xObjSh.Is() && xObjSh->Get_Impl()->bHiddenLockedByAPI )
     {
-        xObjSh->Get_Impl()->bHiddenLockedByAPI = FALSE;
-        xObjSh->OwnerLock(FALSE);
+        xObjSh->Get_Impl()->bHiddenLockedByAPI = sal_False;
+        xObjSh->OwnerLock(sal_False);
     }
 }
 
@@ -1960,7 +1960,7 @@ void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock )
 }
 
 //--------------------------------------------------------------------
-void SfxViewFrame::MakeActive_Impl( BOOL bGrabFocus )
+void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus )
 {
     if ( GetViewShell() && !GetFrame().IsClosing_Impl() )
     {
@@ -1968,10 +1968,10 @@ void SfxViewFrame::MakeActive_Impl( BOOL bGrabFocus )
         {
             if ( GetViewShell() )
             {
-                BOOL bPreview = FALSE;
+                sal_Bool bPreview = sal_False;
                 if ( GetObjectShell()->IsPreview() )
                 {
-                    bPreview = TRUE;
+                    bPreview = sal_True;
                 }
                 else
                 {
@@ -2004,7 +2004,7 @@ void SfxViewFrame::MakeActive_Impl( BOOL bGrabFocus )
                 {
                     GetBindings().SetDispatcher( GetDispatcher() );
                     GetBindings().SetActiveFrame( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > () );
-                    GetDispatcher()->Update_Impl( FALSE );
+                    GetDispatcher()->Update_Impl( sal_False );
                 }
             }
         }
@@ -2072,7 +2072,7 @@ SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const
 
 //--------------------------------------------------------------------
 SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame,
-                                                   const USHORT i_nViewId, const bool i_bHidden )
+                                                   const sal_uInt16 i_nViewId, const bool i_bHidden )
 {
     Reference< XFrame > xFrame( i_rFrame );
     bool bOwnFrame = false;
@@ -2145,7 +2145,7 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell
 
 //--------------------------------------------------------------------
 SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame,
-                                           const Sequence< PropertyValue >& i_rLoadArgs, const USHORT i_nViewId,
+                                           const Sequence< PropertyValue >& i_rLoadArgs, const sal_uInt16 i_nViewId,
                                            const bool i_bHidden )
 {
     Reference< XModel > xDocument( i_rDoc.GetModel(), UNO_SET_THROW );
@@ -2175,37 +2175,37 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
 
 //--------------------------------------------------------------------
 
-SfxViewFrame* SfxViewFrame::LoadHiddenDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, true );
 }
 
 //--------------------------------------------------------------------
 
-SfxViewFrame* SfxViewFrame::LoadDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, false );
 }
 
 //--------------------------------------------------------------------
 
-SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rTargetFrame, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rTargetFrame, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_rTargetFrame, i_nViewId, false );
 }
 
 //--------------------------------------------------------------------
 
-SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_pFrameItem && i_pFrameItem->GetFrame() ? i_pFrameItem->GetFrame()->GetFrameInterface() : NULL, i_nViewId, false );
 }
 
 //--------------------------------------------------------------------
-SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId )
 {
-    SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE );
-    SFX_REQUEST_ARG( i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN, FALSE );
+    SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False );
+    SFX_REQUEST_ARG( i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False );
 
     return LoadViewIntoFrame_Impl_NoThrow(
         i_rDoc,
@@ -2237,9 +2237,9 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c
     }
 
     SfxViewFrame* pViewFrame = NULL;
-    for (   pViewFrame = SfxViewFrame::GetFirst( pDoc, FALSE );
+    for (   pViewFrame = SfxViewFrame::GetFirst( pDoc, sal_False );
             pViewFrame;
-            pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDoc, FALSE )
+            pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDoc, sal_False )
         )
     {
         if ( pViewFrame->GetViewShell()->GetController() == i_rController )
@@ -2251,7 +2251,7 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c
 
 //--------------------------------------------------------------------
 
-void SfxViewFrame::SaveCurrentViewData_Impl( const USHORT i_nNewViewId )
+void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId )
 {
     SfxViewShell* pCurrentShell = GetViewShell();
     ENSURE_OR_RETURN_VOID( pCurrentShell != NULL, "SfxViewFrame::SaveCurrentViewData_Impl: no current view shell -> no current view data!" );
@@ -2365,7 +2365,7 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl
         if ( pOldSh )
         {
             // ask wether it can be closed
-            if ( !pOldSh->PrepareClose( TRUE ) )
+            if ( !pOldSh->PrepareClose( sal_True ) )
                 return sal_False;
 
             // remove sub shells from Dispatcher before switching to new ViewShell
@@ -2377,7 +2377,7 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl
 
         // ID of the new view
         SfxObjectFactory& rDocFact = GetObjectShell()->GetFactory();
-        const USHORT nViewId = ( bIsIndex || !nViewIdOrNo ) ? rDocFact.GetViewFactory( nViewIdOrNo ).GetOrdinal() : nViewIdOrNo;
+        const sal_uInt16 nViewId = ( bIsIndex || !nViewIdOrNo ) ? rDocFact.GetViewFactory( nViewIdOrNo ).GetOrdinal() : nViewIdOrNo;
 
         // save the view data of the old view, so it can be restored later on (when needed)
         SaveCurrentViewData_Impl( nViewId );
@@ -2413,7 +2413,7 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl
 }
 
 //-------------------------------------------------------------------------
-void SfxViewFrame::SetCurViewId_Impl( const USHORT i_nID )
+void SfxViewFrame::SetCurViewId_Impl( const sal_uInt16 i_nID )
 {
     pImp->nCurViewId = i_nID;
 }
@@ -2461,7 +2461,7 @@ void SfxViewFrame::ExecView_Impl
                 )
             {
                 const sal_uInt16 nViewId = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
-                BOOL bSuccess = SwitchToViewShell_Impl( nViewId );
+                sal_Bool bSuccess = SwitchToViewShell_Impl( nViewId );
                 rReq.SetReturnValue( SfxBoolItem( 0, bSuccess ) );
             }
             break;
@@ -2474,7 +2474,7 @@ void SfxViewFrame::ExecView_Impl
         case SID_VIEWSHELL4:
         {
             const sal_uInt16 nViewNo = rReq.GetSlot() - SID_VIEWSHELL0;
-            BOOL bSuccess = SwitchToViewShell_Impl( nViewNo, sal_True );
+            sal_Bool bSuccess = SwitchToViewShell_Impl( nViewNo, sal_True );
             rReq.SetReturnValue( SfxBoolItem( 0, bSuccess ) );
             break;
         }
@@ -2497,7 +2497,7 @@ void SfxViewFrame::ExecView_Impl
 
             // the view ID (optional arg. TODO: this is currently not supported in the slot definition ...)
             SFX_REQUEST_ARG( rReq, pViewIdItem, SfxUInt16Item, SID_VIEW_ID, sal_False );
-            const USHORT nViewId = pViewIdItem ? pViewIdItem->GetValue() : GetCurViewId();
+            const sal_uInt16 nViewId = pViewIdItem ? pViewIdItem->GetValue() : GetCurViewId();
 
             Reference < XFrame > xFrame;
             // the frame (optional arg. TODO: this is currently not supported in the slot definition ...)
@@ -2743,12 +2743,12 @@ void SfxViewFrame::SetModalMode( sal_Bool bModal )
     }
 }
 
-BOOL SfxViewFrame::IsInModalMode() const
+sal_Bool SfxViewFrame::IsInModalMode() const
 {
     return pImp->bModal || GetFrame().GetWindow().IsInModalMode();
 }
 
-void SfxViewFrame::Resize( BOOL bForce )
+void SfxViewFrame::Resize( sal_Bool bForce )
 {
     Size aSize = GetWindow().GetOutputSizePixel();
     if ( bForce || aSize != pImp->aSize )
@@ -2772,7 +2772,7 @@ void SfxViewFrame::Resize( BOOL bForce )
 
 #define LINE_SEP 0x0A
 
-void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BOOL bEraseTrailingEmptyLines )
+void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines )
 {
     sal_Int32 nStartPos = 0;
     sal_Int32 nEndPos = 0;
@@ -2839,7 +2839,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
 
     SfxApplication* pSfxApp = SFX_APP();
     SfxRequest aReq( SID_BASICCHOOSER, SFX_CALLMODE_SYNCHRON, pSfxApp->GetPool() );
-    aReq.AppendItem( SfxBoolItem(SID_RECORDMACRO,TRUE) );
+    aReq.AppendItem( SfxBoolItem(SID_RECORDMACRO,sal_True) );
     const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot( aReq );
     String aScriptURL;
     if ( pRet )
@@ -2898,11 +2898,11 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
                 {
                     SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Find( aMacroName, SbxCLASS_METHOD );
                     aOUSource = pModule->GetSource32();
-                    USHORT nStart, nEnd;
+                    sal_uInt16 nStart, nEnd;
                     pMethod->GetLineRange( nStart, nEnd );
-                    ULONG nlStart = nStart;
-                    ULONG nlEnd = nEnd;
-                    CutLines( aOUSource, nlStart-1, nlEnd-nlStart+1, TRUE );
+                    sal_uIntPtr nlStart = nStart;
+                    sal_uIntPtr nlEnd = nEnd;
+                    CutLines( aOUSource, nlStart-1, nlEnd-nlStart+1, sal_True );
                 }
             }
         }
@@ -2950,7 +2950,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
         ::rtl::OUString sCode;
         ::rtl::OUStringBuffer sRoutine(10000);
         ::rtl::OUString sMacroName( aMacroName );
-        BOOL bReplace = FALSE;
+        sal_Bool bReplace = sal_False;
 
         // get module
         ::rtl::OUString sModule( aModuleName );
@@ -2967,7 +2967,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
                 sRoutine.append( sCode );
             }
 
-            bReplace = TRUE;
+            bReplace = sal_True;
         }
 
         // append new method
@@ -3018,7 +3018,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
 void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
-    FASTBOOL bDone = FALSE;
     switch ( rReq.GetSlot() )
     {
         case SID_STOP_RECORDING :
@@ -3038,7 +3037,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
             if (xSupplier.is())
                 xRecorder = xSupplier->getDispatchRecorder();
 
-            BOOL bIsRecording = xRecorder.is();
+            sal_Bool bIsRecording = xRecorder.is();
             SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_RECORDMACRO, sal_False);
             if ( pItem && pItem->GetValue() == bIsRecording )
                 return;
@@ -3058,7 +3057,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                 xRecorder = NULL;
                 GetBindings().SetRecorder_Impl( xRecorder );
 
-                SetChildWindow( SID_RECORDING_FLOATWINDOW, FALSE );
+                SetChildWindow( SID_RECORDING_FLOATWINDOW, sal_False );
                 if ( rReq.GetSlot() != SID_RECORDMACRO )
                     GetBindings().Invalidate( SID_RECORDMACRO );
             }
@@ -3082,7 +3081,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                 aProp <<= xSupplier;
                 xSet->setPropertyValue(sProperty,aProp);
                 GetBindings().SetRecorder_Impl( xRecorder );
-                SetChildWindow( SID_RECORDING_FLOATWINDOW, TRUE );
+                SetChildWindow( SID_RECORDING_FLOATWINDOW, sal_True );
             }
 
             rReq.Done();
@@ -3113,8 +3112,8 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
             {
                 rtl::OUString aStatusbarResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
                 // Parameter auswerten
-                SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), FALSE);
-                BOOL bShow( TRUE );
+                SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), sal_False);
+                sal_Bool bShow( sal_True );
                 if ( !pShowItem )
                     bShow = xLayoutManager->isElementVisible( aStatusbarResString );
                 else
@@ -3138,7 +3137,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         case SID_WIN_FULLSCREEN:
         {
-            SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), FALSE);
+            SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), sal_False);
             SfxViewFrame *pTop = GetTopViewFrame();
             if ( pTop )
             {
@@ -3163,7 +3162,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                         }
                     }
 
-                    BOOL bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode();
+                    sal_Bool bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode();
                     if ( bNewFullScreenMode != pWork->IsFullScreenMode() )
                     {
                         Reference< ::com::sun::star::beans::XPropertySet > xLMPropSet( xLayoutManager, UNO_QUERY );
@@ -3193,24 +3192,21 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
             else
                 rReq.Ignore();
 
-            GetDispatcher()->Update_Impl( TRUE );
+            GetDispatcher()->Update_Impl( sal_True );
             break;
         }
     }
-
-    if ( bDone )
-        rReq.Done();
 }
 
 void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
 {
     DBG_MEMTEST();
 
-    const USHORT *pRanges = rSet.GetRanges();
+    const sal_uInt16 *pRanges = rSet.GetRanges();
     DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
     while ( *pRanges )
     {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
+        for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
         {
             switch(nWhich)
             {
@@ -3278,11 +3274,11 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) );
 
                     if ( !( aProp >>= xLayoutManager ))
-                        rSet.Put( SfxBoolItem( nWhich, FALSE ));
+                        rSet.Put( SfxBoolItem( nWhich, sal_False ));
                     else
                     {
                         rtl::OUString aStatusbarResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
-                        BOOL bShow = xLayoutManager->isElementVisible( aStatusbarResString );
+                        sal_Bool bShow = xLayoutManager->isElementVisible( aStatusbarResString );
                         rSet.Put( SfxBoolItem( nWhich, bShow ));
                     }
                     break;
@@ -3335,17 +3331,17 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
 
 {
     // Parameter auswerten
-    USHORT nSID = rReq.GetSlot();
+    sal_uInt16 nSID = rReq.GetSlot();
 
-    SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, FALSE);
+    SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, sal_False);
     if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER )
     {
         if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE))
             return;
         Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface();
         Reference < XFrame > xBeamer( xFrame->findFrame( DEFINE_CONST_UNICODE("_beamer"), FrameSearchFlag::CHILDREN ) );
-        BOOL bShow = FALSE;
-        BOOL bHasChild = xBeamer.is();
+        sal_Bool bShow = sal_False;
+        sal_Bool bHasChild = xBeamer.is();
         bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
         if ( pShowItem )
         {
@@ -3357,7 +3353,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
 
         if ( !bShow )
         {
-            SetChildWindow( SID_BROWSER, FALSE );
+            SetChildWindow( SID_BROWSER, sal_False );
         }
         else
         {
@@ -3384,8 +3380,8 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
         return;
     }
 
-    BOOL bShow = FALSE;
-    BOOL bHasChild = HasChildWindow(nSID);
+    sal_Bool bShow = sal_False;
+    sal_Bool bHasChild = HasChildWindow(nSID);
     bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
 
     // ausf"uhren
@@ -3393,7 +3389,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
         ToggleChildWindow( nSID );
 
     GetBindings().Invalidate( nSID );
-    GetDispatcher()->Update_Impl( TRUE );
+    GetDispatcher()->Update_Impl( sal_True );
 
     // ggf. recorden
     if ( nSID == SID_HYPERLINK_DIALOG || nSID == SID_SEARCH_DLG )
@@ -3421,7 +3417,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
 
 {
     SfxWhichIter aIter( rState );
-    for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
+    for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
     {
         if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER )
         {
@@ -3474,7 +3470,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
 }
 
 //--------------------------------------------------------------------
-SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( USHORT /*nId*/ )
+SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ )
 {
     SfxWorkWindow* pWork = 0;
     pWork = GetFrame().GetWorkWindow_Impl();
@@ -3482,12 +3478,12 @@ SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( USHORT /*nId*/ )
 }
 
 /*
-void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn)
+void SfxViewFrame::SetChildWindow(sal_uInt16 nId, sal_Bool bOn)
 {
-    SetChildWindow( nId, bOn, TRUE );
+    SetChildWindow( nId, bOn, sal_True );
 }*/
 
-void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn, BOOL bSetFocus )
+void SfxViewFrame::SetChildWindow(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
     if ( pWork )
@@ -3496,44 +3492,44 @@ void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn, BOOL bSetFocus )
 
 //--------------------------------------------------------------------
 
-void SfxViewFrame::ToggleChildWindow(USHORT nId)
+void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId)
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
     if ( pWork )
-        pWork->ToggleChildWindow_Impl( nId, TRUE );
+        pWork->ToggleChildWindow_Impl( nId, sal_True );
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewFrame::HasChildWindow( USHORT nId )
+sal_Bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
-    return pWork ? pWork->HasChildWindow_Impl(nId) : FALSE;
+    return pWork ? pWork->HasChildWindow_Impl(nId) : sal_False;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewFrame::KnowsChildWindow( USHORT nId )
+sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
-    return pWork ? pWork->KnowsChildWindow_Impl(nId) : FALSE;
+    return pWork ? pWork->KnowsChildWindow_Impl(nId) : sal_False;
 }
 
 //--------------------------------------------------------------------
 
-void SfxViewFrame::ShowChildWindow( USHORT nId, BOOL bVisible )
+void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
     if ( pWork )
     {
         GetDispatcher()->Update_Impl(sal_True);
-        pWork->ShowChildWindow_Impl(nId, bVisible, TRUE );
+        pWork->ShowChildWindow_Impl(nId, bVisible, sal_True );
     }
 }
 
 //--------------------------------------------------------------------
 
-SfxChildWindow* SfxViewFrame::GetChildWindow(USHORT nId)
+SfxChildWindow* SfxViewFrame::GetChildWindow(sal_uInt16 nId)
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
     return pWork ? pWork->GetChildWindow_Impl(nId) : NULL;
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 05ce981a51b6..6352adfb53e4 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -278,10 +278,10 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
     {
         case SID_SHOWPOPUPS :
         {
-            SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, FALSE);
-            BOOL bShow = pShowItem ? pShowItem->GetValue() : TRUE;
-            SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, FALSE);
-            USHORT nId = pIdItem ? pIdItem->GetValue() : 0;
+            SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, sal_False);
+            sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
+            SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, sal_False);
+            sal_uInt16 nId = pIdItem ? pIdItem->GetValue() : 0;
 
             // ausfuehren
             SfxWorkWindow *pWorkWin = GetFrame().GetWorkWindow_Impl();
@@ -289,7 +289,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
             {
                 // Zuerst die Floats auch anzeigbar machen
                 pWorkWin->MakeChildsVisible_Impl( bShow );
-                GetDispatcher()->Update_Impl( TRUE );
+                GetDispatcher()->Update_Impl( sal_True );
 
                 // Dann anzeigen
                 GetBindings().HidePopups( !bShow );
@@ -304,7 +304,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
                     pBind = pBind->GetSubBindings_Impl();
                 }
 
-                pWorkWin->HidePopups_Impl( !bShow, TRUE, nId );
+                pWorkWin->HidePopups_Impl( !bShow, sal_True, nId );
                 pWorkWin->MakeChildsVisible_Impl( bShow );
             }
 
@@ -315,14 +315,14 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
 
         case SID_ACTIVATE:
         {
-            MakeActive_Impl( TRUE );
+            MakeActive_Impl( sal_True );
             rReq.SetReturnValue( SfxObjectItem( 0, this ) );
             break;
         }
 
         case SID_NEWDOCDIRECT :
         {
-            SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, FALSE);
+            SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False);
             String aFactName;
             if ( pFactoryItem )
                 aFactName = pFactoryItem->GetValue();
@@ -366,11 +366,11 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
 
                 // Doc braucht nur gefragt zu werden, wenn keine weitere View
                 sal_Bool bClosed = sal_False;
-                sal_Bool bUI = TRUE;
+                sal_Bool bUI = sal_True;
                 if ( ( bOther || pDocSh->PrepareClose( bUI ) ) )
                 {
                     if ( !bOther )
-                        pDocSh->SetModified( FALSE );
+                        pDocSh->SetModified( sal_False );
                     rReq.Done(); // unbedingt vor Close() rufen!
                     bClosed = sal_False;
                     try
@@ -440,7 +440,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet )
                 {
                     uno::Any aAny;
                     aAny <<= GetViewShell()->GetVerbs();
-                    rSet.Put( SfxUnoAnyItem( USHORT( SID_OBJECT ), aAny ) );
+                    rSet.Put( SfxUnoAnyItem( sal_uInt16( SID_OBJECT ), aAny ) );
                 }
                 else
                     rSet.DisableItem( SID_OBJECT );
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 0826e78870bb..83c916d3071e 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -61,7 +61,7 @@ struct SfxViewShell_Impl
     SvBorder                    aBorder;
     Size                        aOptimalSize;
     Size                        aMargin;
-    USHORT                      m_nPrinterLocks;
+    sal_uInt16                      m_nPrinterLocks;
     bool                        m_bCanPrint;
     bool                        m_bHasPrintOptions;
     bool                        m_bPlugInsActive;
@@ -71,14 +71,14 @@ struct SfxViewShell_Impl
     bool                        m_bGotOwnership;
     bool                        m_bGotFrameOwnership;
     SfxScrollingMode            m_eScroll;
-    USHORT                      m_nFamily;
+    sal_uInt16                      m_nFamily;
     ::rtl::Reference<SfxBaseController> m_pController;
     ::std::auto_ptr< ::svt::AcceleratorExecute >    m_pAccExec;
     com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aPrintOpts;
     ::rtl::Reference< SfxClipboardChangeListener > xClipboardListener;
     ::boost::shared_ptr< vcl::PrinterController > m_pPrinterController;
 
-    SfxViewShell_Impl(USHORT const nFlags);
+    SfxViewShell_Impl(sal_uInt16 const nFlags);
 };
 
 #endif
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 24ed85556466..515149c5a2d3 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -426,16 +426,16 @@ IMPL_LINK( SfxDialogExecutor_Impl, Execute, void *, EMPTYARG )
 
 //-------------------------------------------------------------------------
 
-BOOL UseStandardPrinter_Impl( Window* /*pParent*/, SfxPrinter* pDocPrinter )
+sal_Bool UseStandardPrinter_Impl( Window* /*pParent*/, SfxPrinter* pDocPrinter )
 {
     // Optionen abfragen, ob gewarnt werden soll (Doc uebersteuert App)
-    BOOL bWarn = FALSE;
+    sal_Bool bWarn = sal_False;
     const SfxItemSet *pDocOptions = &pDocPrinter->GetOptions();
     if ( pDocOptions )
     {
-        USHORT nWhich = pDocOptions->GetPool()->GetWhich(SID_PRINTER_NOTFOUND_WARN);
+        sal_uInt16 nWhich = pDocOptions->GetPool()->GetWhich(SID_PRINTER_NOTFOUND_WARN);
         const SfxBoolItem* pBoolItem = NULL;
-        pDocPrinter->GetOptions().GetItemState( nWhich, FALSE, (const SfxPoolItem**) &pBoolItem );
+        pDocPrinter->GetOptions().GetItemState( nWhich, sal_False, (const SfxPoolItem**) &pBoolItem );
         if ( pBoolItem )
             bWarn = pBoolItem->GetValue();
     }
@@ -450,7 +450,7 @@ BOOL UseStandardPrinter_Impl( Window* /*pParent*/, SfxPrinter* pDocPrinter )
     }
 */
     // nicht gewarnt => einfach so den StandardDrucker nehmen
-    return TRUE;
+    return sal_True;
 }
 //-------------------------------------------------------------------------
 
@@ -465,15 +465,15 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
     SfxPrinter *pDocPrinter = GetPrinter();
 
     // Printer-Options auswerten
-    FASTBOOL bOriToDoc = FALSE;
-    FASTBOOL bSizeToDoc = FALSE;
+    bool bOriToDoc = false;
+    bool bSizeToDoc = false;
     if ( &pDocPrinter->GetOptions() )
     {
-        USHORT nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC);
+        sal_uInt16 nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC);
         const SfxFlagItem *pFlagItem = 0;
-        pDocPrinter->GetOptions().GetItemState( nWhich, FALSE, (const SfxPoolItem**) &pFlagItem );
-        bOriToDoc = pFlagItem ? (pFlagItem->GetValue() & SFX_PRINTER_CHG_ORIENTATION) : FALSE;
-        bSizeToDoc = pFlagItem ? (pFlagItem->GetValue() & SFX_PRINTER_CHG_SIZE) : FALSE;
+        pDocPrinter->GetOptions().GetItemState( nWhich, sal_False, (const SfxPoolItem**) &pFlagItem );
+        bOriToDoc = pFlagItem ? (pFlagItem->GetValue() & SFX_PRINTER_CHG_ORIENTATION) : sal_False;
+        bSizeToDoc = pFlagItem ? (pFlagItem->GetValue() & SFX_PRINTER_CHG_SIZE) : sal_False;
     }
 
     // vorheriges Format und Size feststellen
@@ -485,8 +485,8 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
     Size aNewPgSz = pNewPrinter->GetPaperSizePixel();
 
     // "Anderungen am Seitenformat feststellen
-    BOOL bOriChg = (eOldOri != eNewOri) && bOriToDoc;
-    BOOL bPgSzChg = ( aOldPgSz.Height() !=
+    sal_Bool bOriChg = (eOldOri != eNewOri) && bOriToDoc;
+    sal_Bool bPgSzChg = ( aOldPgSz.Height() !=
             ( bOriChg ? aNewPgSz.Width() : aNewPgSz.Height() ) ||
             aOldPgSz.Width() !=
             ( bOriChg ? aNewPgSz.Height() : aNewPgSz.Width() ) ) &&
@@ -494,7 +494,7 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
 
     // Message und Flags f"ur Seitenformat-"Anderung zusammenstellen
     String aMsg;
-    USHORT nNewOpt=0;
+    sal_uInt16 nNewOpt=0;
     if( bOriChg && bPgSzChg )
     {
         aMsg = String(SfxResId(STR_PRINT_NEWORISIZE));
@@ -512,7 +512,7 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
     }
 
     // in dieser Variable sammeln, was sich so ge"aendert hat
-    USHORT nChangedFlags = 0;
+    sal_uInt16 nChangedFlags = 0;
 
     // ggf. Nachfrage, ob Seitenformat vom Drucker "ubernommen werden soll
     if ( ( bOriChg  || bPgSzChg ) &&
@@ -603,7 +603,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
                         makeAny( rtl::OUString( pObjShell->GetTitle(0) ) ) );
 
     // FIXME: job setup
-    SfxPrinter* pDocPrt = GetPrinter(FALSE);
+    SfxPrinter* pDocPrt = GetPrinter(sal_False);
     JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup();
     if( bIsDirect )
         aJobSetup.SetValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ),
@@ -620,16 +620,16 @@ Printer* SfxViewShell::GetActivePrinter() const
 
 void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 {
-    // USHORT                  nCopies=1;
-    USHORT                  nDialogRet = RET_CANCEL;
-    // BOOL                    bCollate=FALSE;
+    // sal_uInt16                  nCopies=1;
+    sal_uInt16                  nDialogRet = RET_CANCEL;
+    // sal_Bool                    bCollate=sal_False;
     SfxPrinter*             pPrinter = 0;
     SfxDialogExecutor_Impl* pExecutor = 0;
     bool                    bSilent = false;
-    BOOL bIsAPI = rReq.GetArgs() && rReq.GetArgs()->Count();
+    sal_Bool bIsAPI = rReq.GetArgs() && rReq.GetArgs()->Count();
     if ( bIsAPI )
     {
-        SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE);
+        SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False);
         bSilent = pSilentItem && pSilentItem->GetValue();
     }
 
@@ -642,7 +642,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
     const SfxFilter* pFilter = pMedium ? pMedium->GetFilter() : NULL;
     sal_Bool bPrintOnHelp = ( pFilter && pFilter->GetFilterName() == aHelpFilterName );
 
-    const USHORT nId = rReq.GetSlot();
+    const sal_uInt16 nId = rReq.GetSlot();
     switch( nId )
     {
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -654,7 +654,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
             // derived class may decide to abort this
             if( !pDoc->QuerySlotExecutable( nId ) )
             {
-                rReq.SetReturnValue( SfxBoolItem( 0, FALSE ) );
+                rReq.SetReturnValue( SfxBoolItem( 0, sal_False ) );
                 return;
             }
 
@@ -662,10 +662,10 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
             if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
                 break;
 
-            SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE);
+            SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False);
             sal_Bool bSelection = pSelectItem && pSelectItem->GetValue();
             if( pSelectItem && rReq.GetArgs()->Count() == 1 )
-                bIsAPI = FALSE;
+                bIsAPI = sal_False;
 
             uno::Sequence < beans::PropertyValue > aProps;
             if ( bIsAPI )
@@ -720,10 +720,10 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
         case SID_PRINTER_NAME : // only for recorded macros
         {
             // get printer and printer settings from the document
-            SfxPrinter *pDocPrinter = GetPrinter(TRUE);
+            SfxPrinter *pDocPrinter = GetPrinter(sal_True);
 
             // look for printer in parameters
-            SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, FALSE );
+            SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, sal_False );
             if ( pPrinterItem )
             {
                 // use PrinterName parameter to create a printer
@@ -752,7 +752,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 // no valid printer either in ItemSet or at the document
                 if ( bSilent )
                 {
-                    rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+                    rReq.SetReturnValue(SfxBoolItem(0,sal_False));
                     break;
                 }
                 else
@@ -762,7 +762,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
             if ( !pPrinter->IsOriginal() && rReq.GetArgs() && !UseStandardPrinter_Impl( NULL, pPrinter ) )
             {
                 // printer is not available, but standard printer should not be used
-                rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+                rReq.SetReturnValue(SfxBoolItem(0,sal_False));
                 break;
             }
 
@@ -772,7 +772,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 // if printer is busy, abort printing
                 if ( !bSilent )
                     InfoBox( NULL, String( SfxResId( STR_ERROR_PRINTER_BUSY ) ) ).Execute();
-                rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+                rReq.SetReturnValue(SfxBoolItem(0,sal_False));
                 break;
             }
 
@@ -839,7 +839,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                     DELETEZ( pDlgPrinter );
                     rReq.Ignore();
                     if ( SID_PRINTDOC == nId )
-                        rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+                        rReq.SetReturnValue(SfxBoolItem(0,sal_False));
                 }
             }
         }
@@ -855,16 +855,16 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::IsPrinterLocked() const
+sal_Bool SfxViewShell::IsPrinterLocked() const
 {
     return pImp->m_nPrinterLocks > 0;
 }
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::LockPrinter( BOOL bLock)
+void SfxViewShell::LockPrinter( sal_Bool bLock)
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     if ( bLock )
     {
         bChanged = 1 == ++pImp->m_nPrinterLocks;
@@ -884,14 +884,14 @@ void SfxViewShell::LockPrinter( BOOL bLock)
 
 //--------------------------------------------------------------------
 
-SfxPrinter* SfxViewShell::GetPrinter( BOOL /*bCreate*/ )
+SfxPrinter* SfxViewShell::GetPrinter( sal_Bool /*bCreate*/ )
 {
     return 0;
 }
 
 //--------------------------------------------------------------------
 
-USHORT SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, USHORT /*nDiffFlags*/, bool )
+sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, sal_uInt16 /*nDiffFlags*/, bool )
 {
     return 0;
 }
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index ca3452e24168..88b185482abb 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -300,7 +300,7 @@ static ::rtl::OUString RetrieveLabelFromCommand(
 }
 
 //=========================================================================
-SfxViewShell_Impl::SfxViewShell_Impl(USHORT const nFlags)
+SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags)
 : aInterceptorContainer( aMutex )
 ,   m_bControllerSet(false)
 ,   m_nPrinterLocks(0)
@@ -439,12 +439,12 @@ enum ETypeFamily
 
 void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 {
-        const USHORT nId = rReq.GetSlot();
+        const sal_uInt16 nId = rReq.GetSlot();
         switch( nId )
         {
                 case SID_STYLE_FAMILY :
                 {
-                        SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, FALSE);
+                        SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, sal_False);
                         if (pItem)
             {
                 pImp->m_nFamily = pItem->GetValue();
@@ -495,10 +495,10 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                             ToolBox* pTextToolbox = dynamic_cast< ToolBox* >( pWin );
                             if( pTextToolbox )
                             {
-                                USHORT nItemCount = pTextToolbox->GetItemCount();
-                                for( USHORT nItem = 0; nItem < nItemCount; ++nItem )
+                                sal_uInt16 nItemCount = pTextToolbox->GetItemCount();
+                                for( sal_uInt16 nItem = 0; nItem < nItemCount; ++nItem )
                                 {
-                                    USHORT nItemId = pTextToolbox->GetItemId( nItem );
+                                    sal_uInt16 nItemId = pTextToolbox->GetItemId( nItem );
                                     const XubString& rCommand = pTextToolbox->GetItemCommand( nItemId );
                                     if( rCommand.EqualsAscii( ".uno:StyleApply" ) )
                                     {
@@ -534,18 +534,18 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 
                         if ( SvtInternalOptions().MailUIEnabled() )
             {
-                GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, TRUE );
+                GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, sal_True );
             }
             else
             {
                                 SfxMailModel  aModel;
                 rtl::OUString aDocType;
 
-                                SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, FALSE );
+                                SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, sal_False );
                                 if ( pMailSubject )
                                         aModel.SetSubject( pMailSubject->GetValue() );
 
-                                SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, FALSE );
+                                SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, sal_False );
                                 if ( pMailRecipient )
                                 {
                                         String aRecipient( pMailRecipient->GetValue() );
@@ -555,7 +555,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                                                 aRecipient = aRecipient.Erase( 0, aMailToStr.Len() );
                                         aModel.AddAddress( aRecipient, SfxMailModel::ROLE_TO );
                                 }
-                SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME, FALSE );
+                SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME, sal_False );
                 if ( pMailDocType )
                     aDocType = pMailDocType->GetValue();
 
@@ -610,7 +610,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
             css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance( aModuleManager ), css::uno::UNO_QUERY_THROW );
             if ( !xModuleManager.is() )
             {
-                rReq.Done(FALSE);
+                rReq.Done(sal_False);
                 return;
             }
 
@@ -668,7 +668,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 // No type and no location => error
                 if (( aFilterName.getLength() == 0 ) || ( aTypeName.getLength() == 0 ))
                 {
-                    rReq.Done(FALSE);
+                    rReq.Done(sal_False);
                     return;
                 }
 
@@ -709,7 +709,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 }
                 catch ( com::sun::star::io::IOException& )
                 {
-                    rReq.Done(FALSE);
+                    rReq.Done(sal_False);
                     return;
                 }
 
@@ -717,7 +717,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                     ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )),
                     css::uno::UNO_QUERY );
 
-                        BOOL bRet( TRUE );
+                        sal_Bool bRet( sal_True );
                 if ( xSystemShellExecute.is() )
                 {
                     try
@@ -730,7 +730,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                                             vos::OGuard aGuard( Application::GetSolarMutex() );
                         Window *pParent = SFX_APP()->GetTopWindow();
                                             ErrorBox( pParent, SfxResId( MSG_ERROR_NO_WEBBROWSER_FOUND )).Execute();
-                        bRet = FALSE;
+                        bRet = sal_False;
                     }
                 }
 
@@ -739,7 +739,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
             }
             else
             {
-                rReq.Done(FALSE);
+                rReq.Done(sal_False);
                 return;
             }
         }
@@ -747,7 +747,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
                 case SID_PLUGINS_ACTIVE:
                 {
-                        SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, FALSE);
+                        SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, sal_False);
             bool const bActive = (pShowItem)
                 ? pShowItem->GetValue()
                 : !pImp->m_bPlugInsActive;
@@ -757,7 +757,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 
                         // Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
                         // benutzen, der demn"achst weg ist
-                        rReq.Done(TRUE);
+                        rReq.Done(sal_True);
 
                         // ausfuehren
             if (!pShowItem || (bActive != pImp->m_bPlugInsActive))
@@ -785,10 +785,10 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                             VisAreaChanged(aVisArea);
 
                                                         // the plugins might need change in their state
-                                                        SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(FALSE);
+                                                        SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(sal_False);
                                                         if ( pClients )
                                                         {
-                                                                for (USHORT n=0; n < pClients->Count(); n++)
+                                                                for (sal_uInt16 n=0; n < pClients->Count(); n++)
                                                                 {
                                                                         SfxInPlaceClient* pIPClient = pClients->GetObject(n);
                                                                         if ( pIPClient )
@@ -817,7 +817,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
         DBG_CHKTHIS(SfxViewShell, 0);
 
         SfxWhichIter aIter( rSet );
-        for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
+        for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
         {
                 switch ( nSID )
                 {
@@ -838,7 +838,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
                                 bEnabled = bEnabled  && !Application::GetSettings().GetMiscSettings().GetDisablePrinting();
                 if ( bEnabled )
                 {
-                    SfxPrinter *pPrinter = GetPrinter(FALSE);
+                    SfxPrinter *pPrinter = GetPrinter(sal_False);
 
                     if ( SID_PRINTDOCDIRECT == nSID )
                     {
@@ -879,7 +879,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
                         case SID_MAIL_SENDDOC:
             case SID_MAIL_SENDDOCASFORMAT:
                         {
-                BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );
+                sal_Bool bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );
                                 if ( !bEnable )
                                         rSet.DisableItem( nSID );
                                 break;
@@ -903,7 +903,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
                         // SelectionTextExt
                         case SID_SELECTION_TEXT_EXT:
                         {
-                                rSet.Put( SfxStringItem( SID_SELECTION_TEXT_EXT, GetSelectionText(TRUE) ) );
+                                rSet.Put( SfxStringItem( SID_SELECTION_TEXT_EXT, GetSelectionText(sal_True) ) );
                                 break;
                         }
 */
@@ -975,8 +975,8 @@ void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ )
     if ( xParentFrame.is() )
         xParentFrame->setActiveFrame( xOwnFrame );
 
-    pFrame->GetBindings().HidePopups(TRUE);
-    pFrame->GetDispatcher()->Update_Impl( TRUE );
+    pFrame->GetBindings().HidePopups(sal_True);
+    pFrame->GetDispatcher()->Update_Impl( sal_True );
 }
 
 //--------------------------------------------------------------------
@@ -985,8 +985,8 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ )
 {
     if ( !pFrame->GetFrame().IsClosing_Impl() ||
         SfxViewFrame::Current() != pFrame )
-            pFrame->GetDispatcher()->Update_Impl( TRUE );
-    pFrame->GetBindings().HidePopups(FALSE);
+            pFrame->GetDispatcher()->Update_Impl( sal_True );
+    pFrame->GetBindings().HidePopups(sal_False);
 
     // uno::Reference < frame::XFrame > xOwnFrame( pFrame->GetFrame().GetFrameInterface() );
     // uno::Reference < frame::XFramesSupplier > xParentFrame( xOwnFrame->getCreator(), uno::UNO_QUERY );
@@ -1002,13 +1002,13 @@ SfxInPlaceClient* SfxViewShell::FindIPClient
     Window*             pObjParentWin
 )   const
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
         if ( !pClients )
                 return 0;
 
         if( !pObjParentWin )
                 pObjParentWin = GetWindow();
-        for (USHORT n=0; n < pClients->Count(); n++)
+        for (sal_uInt16 n=0; n < pClients->Count(); n++)
         {
                 SfxInPlaceClient *pIPClient = (SfxInPlaceClient*) pClients->GetObject(n);
         if ( pIPClient->GetObject() == xObj && pIPClient->GetEditWin() == pObjParentWin )
@@ -1030,11 +1030,11 @@ SfxInPlaceClient* SfxViewShell::GetIPClient() const
 SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const
 {
     // this method is needed as long as SFX still manages the border space for ChildWindows (see SfxFrame::Resize)
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
         if ( !pClients )
                 return 0;
 
-        for (USHORT n=0; n < pClients->Count(); n++)
+        for (sal_uInt16 n=0; n < pClients->Count(); n++)
         {
         SfxInPlaceClient* pIPClient = pClients->GetObject(n);
         if ( pIPClient->IsUIActive() )
@@ -1046,11 +1046,11 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const
 
 SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
         if ( !pClients )
                 return 0;
 
-        for (USHORT n=0; n < pClients->Count(); n++)
+        for (sal_uInt16 n=0; n < pClients->Count(); n++)
         {
         SfxInPlaceClient* pIPClient = pClients->GetObject(n);
         if ( pIPClient->IsObjectUIActive() )
@@ -1062,7 +1062,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::Activate( BOOL bMDI )
+void SfxViewShell::Activate( sal_Bool bMDI )
 {
         DBG_CHKTHIS(SfxViewShell, 0);
         if ( bMDI )
@@ -1077,7 +1077,7 @@ void SfxViewShell::Activate( BOOL bMDI )
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::Deactivate(BOOL /*bMDI*/)
+void SfxViewShell::Deactivate(sal_Bool /*bMDI*/)
 {
         DBG_CHKTHIS(SfxViewShell, 0);
 }
@@ -1294,13 +1294,13 @@ void SfxViewShell::SetWindow
     DiscardClients_Impl();
 
     // View-Port austauschen
-    BOOL bHadFocus = pWindow ? pWindow->HasChildPathFocus( TRUE ) : FALSE;
+    sal_Bool bHadFocus = pWindow ? pWindow->HasChildPathFocus( sal_True ) : sal_False;
     pWindow = pViewPort;
 
     if( pWindow )
     {
         // Disable automatic GUI mirroring (right-to-left) for document windows
-        pWindow->EnableRTL( FALSE );
+        pWindow->EnableRTL( sal_False );
     }
 
     if ( bHadFocus && pWindow )
@@ -1323,7 +1323,7 @@ Size SfxViewShell::GetOptimalSizePixel() const
 SfxViewShell::SfxViewShell
 (
     SfxViewFrame*   pViewFrame,     /*  <SfxViewFrame>, in dem diese View dargestellt wird */
-    USHORT          nFlags          /*  siehe <SfxViewShell-Flags> */
+    sal_uInt16          nFlags          /*  siehe <SfxViewShell-Flags> */
 )
 
 :   SfxShell(this)
@@ -1384,10 +1384,10 @@ SfxViewShell::~SfxViewShell()
 
 //--------------------------------------------------------------------
 
-USHORT SfxViewShell::PrepareClose
+sal_uInt16 SfxViewShell::PrepareClose
 (
-    BOOL bUI,     // TRUE: Dialoge etc. erlaubt, FALSE: silent-mode
-    BOOL /*bForBrowsing*/
+    sal_Bool bUI,     // sal_True: Dialoge etc. erlaubt, sal_False: silent-mode
+    sal_Bool /*bForBrowsing*/
 )
 {
     SfxPrinter *pPrinter = GetPrinter();
@@ -1399,16 +1399,16 @@ USHORT SfxViewShell::PrepareClose
             aInfoBox.Execute();
         }
 
-        return FALSE;
+        return sal_False;
     }
 
     if( GetViewFrame()->IsInModalMode() )
-        return FALSE;
+        return sal_False;
 
     if( bUI && GetViewFrame()->GetDispatcher()->IsLocked() )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -1426,9 +1426,9 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController )
     if ( !i_rController.is() )
         return NULL;
 
-    for (   SfxViewShell* pViewShell = SfxViewShell::GetFirst( NULL, FALSE );
+    for (   SfxViewShell* pViewShell = SfxViewShell::GetFirst( NULL, sal_False );
             pViewShell;
-            pViewShell = SfxViewShell::GetNext( *pViewShell, NULL, FALSE )
+            pViewShell = SfxViewShell::GetNext( *pViewShell, NULL, sal_False )
         )
     {
         if ( pViewShell->GetController() == i_rController )
@@ -1457,7 +1457,7 @@ SdrView* SfxViewShell::GetDrawView() const
 
 String SfxViewShell::GetSelectionText
 (
-    BOOL /*bCompleteWords*/         /*      FALSE (default)
+    sal_Bool /*bCompleteWords*/         /*      sal_False (default)
                                                                 Nur der tats"achlich selektierte Text wird
                                                                 zur"uckgegeben.
 
@@ -1486,17 +1486,17 @@ String SfxViewShell::GetSelectionText
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::HasSelection( BOOL ) const
+sal_Bool SfxViewShell::HasSelection( sal_Bool ) const
 
 /*  [Beschreibung]
 
         Mit dieser virtuellen Methode kann z.B. ein Dialog abfragen, ob in der
-        aktuellen View etwas selektiert ist. Wenn der Parameter <BOOL> TRUE ist,
+        aktuellen View etwas selektiert ist. Wenn der Parameter <sal_Bool> sal_True ist,
         wird abgefragt, ob Text selektiert ist.
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -1549,10 +1549,10 @@ void SfxViewShell::RemoveSubShell( SfxShell* pShell )
     SfxDispatcher *pDisp = pFrame->GetDispatcher();
     if ( !pShell )
     {
-        USHORT nCount = pImp->aArr.Count();
+        sal_uInt16 nCount = pImp->aArr.Count();
         if ( pDisp->IsActive(*this) )
         {
-            for ( USHORT n=nCount; n>0; n-- )
+            for ( sal_uInt16 n=nCount; n>0; n-- )
                 pDisp->Pop( *pImp->aArr[n-1] );
             pDisp->Flush();
         }
@@ -1561,7 +1561,7 @@ void SfxViewShell::RemoveSubShell( SfxShell* pShell )
     }
     else
     {
-        USHORT nPos = pImp->aArr.GetPos( pShell );
+        sal_uInt16 nPos = pImp->aArr.GetPos( pShell );
         if ( nPos != 0xFFFF )
         {
             pImp->aArr.Remove( nPos );
@@ -1574,21 +1574,21 @@ void SfxViewShell::RemoveSubShell( SfxShell* pShell )
     }
 }
 
-SfxShell* SfxViewShell::GetSubShell( USHORT nNo )
+SfxShell* SfxViewShell::GetSubShell( sal_uInt16 nNo )
 {
-    USHORT nCount = pImp->aArr.Count();
+    sal_uInt16 nCount = pImp->aArr.Count();
     if ( nNo<nCount )
         return pImp->aArr[nCount-nNo-1];
     return NULL;
 }
 
-void SfxViewShell::PushSubShells_Impl( BOOL bPush )
+void SfxViewShell::PushSubShells_Impl( sal_Bool bPush )
 {
-    USHORT nCount = pImp->aArr.Count();
+    sal_uInt16 nCount = pImp->aArr.Count();
     SfxDispatcher *pDisp = pFrame->GetDispatcher();
     if ( bPush )
     {
-        for ( USHORT n=0; n<nCount; n++ )
+        for ( sal_uInt16 n=0; n<nCount; n++ )
             pDisp->Push( *pImp->aArr[n] );
     }
     else if ( nCount )
@@ -1603,13 +1603,13 @@ void SfxViewShell::PushSubShells_Impl( BOOL bPush )
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::WriteUserData( String&, BOOL )
+void SfxViewShell::WriteUserData( String&, sal_Bool )
 {
 }
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::ReadUserData(const String&, BOOL )
+void SfxViewShell::ReadUserData(const String&, sal_Bool )
 {
 }
 
@@ -1628,13 +1628,13 @@ void SfxViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::c
 SfxViewShell* SfxViewShell::GetFirst
 (
     const TypeId* pType,
-    BOOL          bOnlyVisible
+    sal_Bool          bOnlyVisible
 )
 {
     // search for a SfxViewShell of the specified type
     SfxViewShellArr_Impl &rShells = SFX_APP()->GetViewShells_Impl();
     SfxViewFrameArr_Impl &rFrames = SFX_APP()->GetViewFrames_Impl();
-    for ( USHORT nPos = 0; nPos < rShells.Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < rShells.Count(); ++nPos )
     {
         SfxViewShell *pShell = rShells.GetObject(nPos);
         if ( pShell )
@@ -1666,12 +1666,12 @@ SfxViewShell* SfxViewShell::GetNext
 (
     const SfxViewShell& rPrev,
     const TypeId*       pType,
-    BOOL                bOnlyVisible
+    sal_Bool                bOnlyVisible
 )
 {
     SfxViewShellArr_Impl &rShells = SFX_APP()->GetViewShells_Impl();
     SfxViewFrameArr_Impl &rFrames = SFX_APP()->GetViewFrames_Impl();
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < rShells.Count(); ++nPos )
         if ( rShells.GetObject(nPos) == &rPrev )
             break;
@@ -1743,7 +1743,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC,
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::ExecKey_Impl(const KeyEvent& aKey)
+sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey)
 {
     if (!pImp->m_pAccExec.get())
     {
@@ -1769,7 +1769,7 @@ FASTBOOL SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
 
         [R"uckgabewert]
 
-        FASTBOOL                TRUE
+        FASTBOOL                sal_True
                                                         die Taste ist konfiguriert, der betreffende
                                                         Handler wurde gerufen
 
@@ -1785,7 +1785,7 @@ FASTBOOL SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
     return ExecKey_Impl(rKeyEvent);
 }
 
-FASTBOOL SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent )
+bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent )
 {
     return ExecKey_Impl(rKeyEvent);
 }
@@ -1828,11 +1828,11 @@ void SfxViewShell::GotFocus() const
 void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP )
 {
 
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
     if ( !pClients )
         return;
 
-    for ( USHORT n=0; n < pClients->Count(); n++ )
+    for ( sal_uInt16 n=0; n < pClients->Count(); n++ )
     {
         SfxInPlaceClient* pIPClient = pClients->GetObject(n);
         if( pIPClient != pIP )
@@ -1844,11 +1844,11 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP )
 
 void SfxViewShell::DisconnectAllClients()
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
     if ( !pClients )
         return;
 
-    for ( USHORT n=0; n<pClients->Count(); )
+    for ( sal_uInt16 n=0; n<pClients->Count(); )
         // clients will remove themselves from the list
         delete pClients->GetObject(n);
 }
@@ -1871,11 +1871,11 @@ void SfxViewShell::AdjustVisArea(const Rectangle& rRect)
 
 void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/)
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
     if ( !pClients )
         return;
 
-    for (USHORT n=0; n < pClients->Count(); n++)
+    for (sal_uInt16 n=0; n < pClients->Count(); n++)
     {
         SfxInPlaceClient* pIPClient = pClients->GetObject(n);
         if ( pIPClient->IsObjectInPlaceActive() )
@@ -1924,7 +1924,7 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::PlugInsActive() const
+sal_Bool SfxViewShell::PlugInsActive() const
 {
     return pImp->m_bPlugInsActive;
 }
@@ -1940,11 +1940,11 @@ void SfxViewShell::DiscardClients_Impl()
 */
 
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
     if ( !pClients )
         return;
 
-    for (USHORT n=0; n < pClients->Count(); )
+    for (sal_uInt16 n=0; n < pClients->Count(); )
         delete pClients->GetObject(n);
 }
 
@@ -2024,7 +2024,7 @@ void SfxViewShell::MarginChanged()
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::IsShowView_Impl() const
+sal_Bool SfxViewShell::IsShowView_Impl() const
 {
     return pImp->m_bIsShowView;
 }
@@ -2049,7 +2049,7 @@ void SfxViewShell::JumpToMark( const String& rMark )
 
 //------------------------------------------------------------------------
 
-SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( BOOL bCreate ) const
+SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( sal_Bool bCreate ) const
 {
     if ( !pIPClientList && bCreate )
         ( (SfxViewShell*) this )->pIPClientList = new SfxInPlaceClientList;
@@ -2096,10 +2096,10 @@ void SfxViewShell::RemoveContextMenuInterceptor_Impl( const REFERENCE< XCONTEXTM
 void Change( Menu* pMenu, SfxViewShell* pView )
 {
     SfxDispatcher *pDisp = pView->GetViewFrame()->GetDispatcher();
-    USHORT nCount = pMenu->GetItemCount();
-    for ( USHORT nPos=0; nPos<nCount; ++nPos )
+    sal_uInt16 nCount = pMenu->GetItemCount();
+    for ( sal_uInt16 nPos=0; nPos<nCount; ++nPos )
     {
-        USHORT nId = pMenu->GetItemId(nPos);
+        sal_uInt16 nId = pMenu->GetItemId(nPos);
         String aCmd = pMenu->GetItemCommand(nId);
         PopupMenu* pPopup = pMenu->GetPopupMenu(nId);
         if ( pPopup )
@@ -2110,7 +2110,7 @@ void Change( Menu* pMenu, SfxViewShell* pView )
         {
             if ( aCmd.CompareToAscii(".uno:", 5) == 0 )
             {
-                for (USHORT nIdx=0;;)
+                for (sal_uInt16 nIdx=0;;)
                 {
                     SfxShell *pShell=pDisp->GetShell(nIdx++);
                     if (pShell == NULL)
@@ -2131,10 +2131,10 @@ void Change( Menu* pMenu, SfxViewShell* pView )
 }
 
 
-BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent )
+sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent )
 {
     rpOut = NULL;
-    BOOL bModified = FALSE;
+    sal_Bool bModified = sal_False;
 
     // create container from menu
         // #110897#
@@ -2157,14 +2157,14 @@ BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString&
             {
                 case ui::ContextMenuInterceptorAction_CANCELLED :
                     // interceptor does not want execution
-                    return FALSE;
+                    return sal_False;
                 case ui::ContextMenuInterceptorAction_EXECUTE_MODIFIED :
                     // interceptor wants his modified menu to be executed
-                    bModified = TRUE;
+                    bModified = sal_True;
                     break;
                 case ui::ContextMenuInterceptorAction_CONTINUE_MODIFIED :
                     // interceptor has modified menu, but allows for calling other interceptors
-                    bModified = TRUE;
+                    bModified = sal_True;
                     continue;
                 case ui::ContextMenuInterceptorAction_IGNORED :
                     // interceptor is indifferent
@@ -2191,7 +2191,7 @@ BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString&
         Change( rpOut, this );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void SfxViewShell::TakeOwnerShip_Impl()
@@ -2210,7 +2210,7 @@ void SfxViewShell::TakeFrameOwnerShip_Impl()
 
 void SfxViewShell::CheckOwnerShip_Impl()
 {
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     if (pImp->m_bGotOwnership)
     {
         uno::Reference < util::XCloseable > xModel(
@@ -2221,7 +2221,7 @@ void SfxViewShell::CheckOwnerShip_Impl()
             {
                 // this call will destroy this object in case of success!
                 xModel->close( sal_True );
-                bSuccess = TRUE;
+                bSuccess = sal_True;
             }
             catch ( util::CloseVetoException& )
             {
@@ -2254,16 +2254,16 @@ long SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent )
     return 0;
 }
 
-BOOL SfxViewShell::HasKeyListeners_Impl()
+sal_Bool SfxViewShell::HasKeyListeners_Impl()
 {
     return (pImp->m_pController.is())
-        ? pImp->m_pController->HasKeyListeners_Impl() : FALSE;
+        ? pImp->m_pController->HasKeyListeners_Impl() : sal_False;
 }
 
-BOOL SfxViewShell::HasMouseClickListeners_Impl()
+sal_Bool SfxViewShell::HasMouseClickListeners_Impl()
 {
     return (pImp->m_pController.is())
-        ? pImp->m_pController->HasMouseClickListeners_Impl() : FALSE;
+        ? pImp->m_pController->HasMouseClickListeners_Impl() : sal_False;
 }
 
 void SfxViewShell::SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts )
@@ -2272,7 +2272,7 @@ void SfxViewShell::SetAdditionalPrintOptions( const com::sun::star::uno::Sequenc
 //      GetObjectShell()->Broadcast( SfxPrintingHint( -3, NULL, NULL, rOpts ) );
 }
 
-BOOL SfxViewShell::Escape()
+sal_Bool SfxViewShell::Escape()
 {
     return GetViewFrame()->GetBindings().Execute( SID_TERMINATE_INPLACEACTIVATION );
 }
@@ -2299,7 +2299,7 @@ uno::Reference< datatransfer::clipboard::XClipboardNotifier > SfxViewShell::GetC
     return xClipboardNotifier;
 }
 
-void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, BOOL bAdd )
+void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, sal_Bool bAdd )
 {
     try
     {
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 635a78a29f70..a8560dbbb366 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -87,7 +87,7 @@ public:
         SdrDragView &rView,
         const SdrMarkList& rMark,
         E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
-        BOOL bFull = FALSE);
+        sal_Bool bFull = sal_False);
 
     virtual void TakeSdrDragComment(String& rStr) const;
     virtual bool BeginSdrDrag();
@@ -118,7 +118,7 @@ public:
         SdrDragView &rView,
         const SdrMarkList& rMark,
         E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
-        BOOL bFull = FALSE);
+        sal_Bool bFull = sal_False);
 
     virtual void MoveSdrDrag(const Point& rPnt);
     virtual Pointer GetSdrDragPointer() const;
@@ -143,7 +143,7 @@ public:
         const SdrMarkList& rMark,
         SdrHdlKind eDrgHdl = HDL_MOVE,
         E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
-        BOOL bFull = FALSE);
+        sal_Bool bFull = sal_False);
 
     virtual void MoveSdrDrag(const Point& rPnt);
     virtual Pointer GetSdrDragPointer() const;
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index d1038641c841..8e5ca04c6173 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -117,18 +117,18 @@ private:
     FixedLine           maSeparator;
     FixedText           maInfoBar;
     Point               maDragStartPos;
-    ULONG               mnCurActionPos;
+    sal_uIntPtr             mnCurActionPos;
     GalleryBrowserMode  meMode;
     GalleryBrowserMode  meLastMode;
-    BOOL                mbCurActionIsLinkage;
+    sal_Bool                mbCurActionIsLinkage;
 
     void                InitSettings();
 
-    void                ImplUpdateViews( USHORT nSelectionId );
+    void                ImplUpdateViews( sal_uInt16 nSelectionId );
     void                ImplUpdateInfoBar();
-    ULONG               ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos );
-    void                ImplSelectItemId( ULONG nItemId );
-    void                ImplExecute( USHORT nId );
+    sal_uIntPtr               ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos );
+    void                ImplSelectItemId( sal_uIntPtr nItemId );
+    void                ImplExecute( sal_uInt16 nId );
 
     // Control
     virtual void        Resize();
@@ -148,7 +148,7 @@ private:
 
 public:
 
-    static String       GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags );
+    static String       GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags );
 
 public:
 
@@ -167,15 +167,15 @@ public:
     INetURLObject       GetURL() const;
     String              GetFilterName() const;
     Graphic             GetGraphic() const;
-    BOOL                GetVCDrawModel( FmFormModel& rModel ) const;
-    BOOL                IsLinkage() const;
+    sal_Bool                GetVCDrawModel( FmFormModel& rModel ) const;
+    sal_Bool                IsLinkage() const;
 
     sal_Int8            AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt );
     sal_Int8            ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt );
     void                StartDrag( Window* pWindow, const Point* pDragPoint = NULL );
     void                TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL );
     void                ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL );
-    BOOL                KeyInput( const KeyEvent& rEvt, Window* pWindow );
+    sal_Bool                KeyInput( const KeyEvent& rEvt, Window* pWindow );
 };
 
 #endif
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 6996cc18692e..2f558c8679ce 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -83,13 +83,13 @@ protected:
     INetURLObject           aURL;
     String                  aUserName;
     String                  aTitle;
-    BOOL                    bIsValid;
-    BOOL                    bIsThumbBmp;
+    sal_Bool                    bIsValid;
+    sal_Bool                    bIsThumbBmp;
 
     virtual void            WriteData( SvStream& rOut, const String& rDestDir ) const;
-    virtual void            ReadData( SvStream& rIn, UINT16& rReadVersion );
+    virtual void            ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
-    BOOL                    CreateThumb( const Graphic& rGraphic );
+    sal_Bool                    CreateThumb( const Graphic& rGraphic );
 
 public:
 
@@ -97,13 +97,13 @@ public:
     virtual                 ~SgaObject() {};
 
     virtual SgaObjKind      GetObjKind() const = 0;
-    virtual UINT16          GetVersion() const = 0;
+    virtual sal_uInt16          GetVersion() const = 0;
 
     virtual Bitmap          GetThumbBmp() const { return aThumbBmp; }
     const GDIMetaFile&      GetThumbMtf() const { return aThumbMtf; }
     const INetURLObject&    GetURL() const { return aURL; }
-    BOOL                    IsValid() const { return bIsValid; }
-    BOOL                    IsThumbBitmap() const { return bIsThumbBmp; }
+    sal_Bool                    IsValid() const { return bIsValid; }
+    sal_Bool                    IsThumbBitmap() const { return bIsThumbBmp; }
 
     const String            GetTitle() const;
     void                    SetTitle( const String& rTitle );
@@ -123,9 +123,9 @@ private:
     GalSoundType        eSoundType;
 
     virtual void        WriteData( SvStream& rOut, const String& rDestDir ) const;
-    virtual void        ReadData( SvStream& rIn, UINT16& rReadVersion );
+    virtual void        ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
-    virtual UINT16      GetVersion() const { return 6; }
+    virtual sal_uInt16      GetVersion() const { return 6; }
 
 public:
 
@@ -150,12 +150,12 @@ class SgaObjectSvDraw : public SgaObject
 
 private:
 
-    BOOL                CreateThumb( const FmFormModel& rModel );
+    sal_Bool                CreateThumb( const FmFormModel& rModel );
 
     virtual void        WriteData( SvStream& rOut, const String& rDestDir ) const;
-    virtual void        ReadData( SvStream& rIn, UINT16& rReadVersion );
+    virtual void        ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
-    virtual UINT16      GetVersion() const { return 5; }
+    virtual sal_uInt16      GetVersion() const { return 5; }
 
 public:
 
@@ -168,7 +168,7 @@ public:
 
 public:
 
-    static BOOL         DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
+    static sal_Bool         DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
 };
 
 // ----------------
@@ -182,9 +182,9 @@ private:
     void                Init( const Graphic& rGraphic, const INetURLObject& rURL );
 
     virtual void        WriteData( SvStream& rOut, const String& rDestDir ) const;
-    virtual void        ReadData( SvStream& rIn, UINT16& rReadVersion );
+    virtual void        ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
-    virtual UINT16      GetVersion() const { return 5; }
+    virtual sal_uInt16      GetVersion() const { return 5; }
 
 public:
 
diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index 16de32f733dc..c0d49c6d0895 100644
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -140,10 +140,10 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC
     virtual String      getValue() const;
     virtual String      getType() const;
 
-    virtual BOOL        getChecked() const;
-    virtual void        setChecked( BOOL bCheck );
-    virtual BOOL        getDefaultChecked() const;
-    virtual void        setDefaultChecked( BOOL bCheck );
+    virtual sal_Bool        getChecked() const;
+    virtual void        setChecked( sal_Bool bCheck );
+    virtual sal_Bool        getDefaultChecked() const;
+    virtual void        setDefaultChecked( sal_Bool bCheck );
     // getValue() wird in der Basisklasse definiert
     virtual void        setValue( const String & aStrg );
 
@@ -170,8 +170,8 @@ class ImpSjJScriptRadioArray: public SjJSbxArrayObject
 {
     VCRadioManager* pMgr;
 public:
-    INT32 ImpSjJScriptRadioArray::getLength() const;
-    SjJSbxObject* ImpSjJScriptRadioArray::getElement( INT32 nIndex ) const;
+    sal_Int32 ImpSjJScriptRadioArray::getLength() const;
+    SjJSbxObject* ImpSjJScriptRadioArray::getElement( sal_Int32 nIndex ) const;
     SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const;
 
     // Konstruktor
@@ -192,15 +192,15 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl
     virtual String      getType() const;
 
     // Properties von SjJScriptCheckboxObject
-    virtual BOOL        getChecked() const;
-    virtual void        setChecked( BOOL bCheck );
-    virtual BOOL        getDefaultChecked() const;
-    virtual void        setDefaultChecked( BOOL bCheck );
+    virtual sal_Bool        getChecked() const;
+    virtual void        setChecked( sal_Bool bCheck );
+    virtual sal_Bool        getDefaultChecked() const;
+    virtual void        setDefaultChecked( sal_Bool bCheck );
     // getValue() wird in der Basisklasse definiert
     virtual void        setValue( const String & aStrg );
 
     // yyy Raus zum inkompatiblen
-    //virtual INT32     getLength();
+    //virtual sal_Int32     getLength();
 
     // Methoden des Objektes
     virtual void        click();
@@ -230,9 +230,9 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
     virtual String      getValue() const;
     virtual String      getType() const;
 
-    virtual INT32       getLength();
-    virtual INT32       getSelectedIndex() const;
-    virtual void        setSelectedIndex( INT32 nNo );
+    virtual sal_Int32       getLength();
+    virtual sal_Int32       getSelectedIndex() const;
+    virtual void        setSelectedIndex( sal_Int32 nNo );
 
     // liefert eine Array von Option-Objekten
     //yyy Raus zum inkompatiblen
@@ -262,9 +262,9 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
             void        onFocus();
 
     // SjJSbxArrayObject-Methoden
-    virtual INT32           getLength() const;
+    virtual sal_Int32           getLength() const;
     // Zugriff "uber den Index
-    virtual SjJSbxObject *  getElement( INT32 nIndex ) const;
+    virtual SjJSbxObject *  getElement( sal_Int32 nIndex ) const;
     // Zugriff "uber den Namen
     // native Java-Methoden k"onnen (noch) nicht "uberladen werden
     //virtual SjJSbxObject *    getElement_String( const String & aName ) const;
@@ -273,19 +273,19 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
     ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p );
 
     // zum Setzen von Eintr"agen am Objket (zum Aufruf von Java aus) 15.1.1997
-    virtual void        setOption( INT32 nIndex, const String & aOptionText,
+    virtual void        setOption( sal_Int32 nIndex, const String & aOptionText,
                                    const String & aOptionValue,
-                                   BOOL bDefaultSelected, BOOL bSelected );
+                                   sal_Bool bDefaultSelected, sal_Bool bSelected );
 
     // Schnittstelle fuer die Properties der Option-Objekte
-    virtual BOOL        getOptionDefaultSelected( INT32 nIndex ) const;
-    virtual void        setOptionDefaultSelected( BOOL bSelected, INT32 nIndex );
-    virtual BOOL        getOptionSelected( INT32 nIndex ) const;
-    virtual void        setOptionSelected( BOOL bSelected, INT32 nIndex );
-    virtual String      getOptionText( INT32 nIndex ) const;
-    virtual void        setOptionText( const String & sText, INT32 nIndex );
-    virtual void        setOptionValue( const String & sText, INT32 nIndex );
-    virtual String      getOptionValue( INT32 nIndex ) const;
+    virtual sal_Bool        getOptionDefaultSelected( sal_Int32 nIndex ) const;
+    virtual void        setOptionDefaultSelected( sal_Bool bSelected, sal_Int32 nIndex );
+    virtual sal_Bool        getOptionSelected( sal_Int32 nIndex ) const;
+    virtual void        setOptionSelected( sal_Bool bSelected, sal_Int32 nIndex );
+    virtual String      getOptionText( sal_Int32 nIndex ) const;
+    virtual void        setOptionText( const String & sText, sal_Int32 nIndex );
+    virtual void        setOptionValue( const String & sText, sal_Int32 nIndex );
+    virtual String      getOptionValue( sal_Int32 nIndex ) const;
 };
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -294,21 +294,21 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
 
 class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase
 {
-    USHORT              nListBoxIndex;
+    sal_uInt16              nListBoxIndex;
   public:
     // Methoden von Java --> C++ (f"ur Properties)
     //--------------------------------------------
-    virtual BOOL        getdefaultSelected() const;
-    virtual void        setdefaultSelected( BOOL bSelected );
-    virtual INT32       getIndex() const;
-    virtual BOOL        getSelected() const;
-    virtual void        setSelected( BOOL bSelected );
+    virtual sal_Bool        getdefaultSelected() const;
+    virtual void        setdefaultSelected( sal_Bool bSelected );
+    virtual sal_Int32       getIndex() const;
+    virtual sal_Bool        getSelected() const;
+    virtual void        setSelected( sal_Bool bSelected );
 
 
     //yyy Zum Vollupdate raus:
     /*
-    virtual INT32       getSelectedIndex() const;
-    virtual void        setSelectedIndex( INT32 nNo );
+    virtual sal_Int32       getSelectedIndex() const;
+    virtual void        setSelectedIndex( sal_Int32 nNo );
     */
 
 
@@ -331,7 +331,7 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptContr
     // keine !
 
     // Konstruktor
-    ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, USHORT _nListBoxIndex );
+    ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, sal_uInt16 _nListBoxIndex );
 };
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -343,9 +343,9 @@ class SjJSbxFormsArray: public SfxJSArray
 
   public:
     // SjJSbxArrayObject-Methoden
-    virtual INT32           getLength() const;
+    virtual sal_Int32           getLength() const;
     // Zugriff "uber den Index
-    virtual SjJSbxObject *  getElement( INT32 nIndex ) const;
+    virtual SjJSbxObject *  getElement( sal_Int32 nIndex ) const;
     // Zugriff "uber den Namen
     // native Java-Methoden k"onnen (noch) nicht "uberladen werden
     virtual SjJSbxObject *  getElement_String( const String & aName ) const;
@@ -593,8 +593,8 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
     virtual void        setTarget( const String & sValue );
 
     // SjJSbxArrayObject-Methoden
-    INT32               getLength() const;
-    SjJSbxObject*       getElement( INT32 nIndex ) const;
+    sal_Int32               getLength() const;
+    SjJSbxObject*       getElement( sal_Int32 nIndex ) const;
     SjJSbxObject*       getElement_String( const String & aName ) const;
 
     // liefert ein Array-Objekt mit Elementen vom Typ JScriptAbstractControlsObject
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index be3a9ba22cef..0d20b950a49c 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -47,9 +47,9 @@ friend class ImpItemEdit;
     Link aSetDirtyHdl;
     ImpItemListRow* pAktChangeEntry;
     long   nLastWhichOfs;
-    USHORT nLastWhich;
-    USHORT nLastWhichOben;
-    USHORT nLastWhichUnten;
+    sal_uInt16 nLastWhich;
+    sal_uInt16 nLastWhichOben;
+    sal_uInt16 nLastWhichUnten;
     FASTBOOL bWhichesButNames;
     FASTBOOL bDontHideIneffectiveItems;
     FASTBOOL bDontSortItems;
@@ -58,15 +58,15 @@ friend class ImpItemEdit;
 private:
 #if _SOLAR__PRIVATE
     void ImpCtor();
-    void ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum);
-    ImpItemListRow* ImpGetEntry(ULONG nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); }
+    void ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum);
+    ImpItemListRow* ImpGetEntry(sal_uIntPtr nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); }
     void ImpSaveWhich();
     void ImpRestoreWhich();
 #endif // __PRIVATE
 protected:
     virtual long GetRowCount() const;
-    virtual BOOL SeekRow(long nRow);
-    virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const;
+    virtual sal_Bool SeekRow(long nRow);
+    virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const;
     virtual void DoubleClick(const BrowserMouseEvent&);
     virtual void KeyInput(const KeyEvent& rEvt);
     virtual void Select();
@@ -78,9 +78,9 @@ public:
     virtual ~_SdrItemBrowserControl();
     void Clear();
     void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL);
-    ULONG GetCurrentPos() const;
-    USHORT GetCurrentWhich() const;
-    virtual FASTBOOL BegChangeEntry(ULONG nPos);
+    sal_uIntPtr GetCurrentPos() const;
+    sal_uInt16 GetCurrentWhich() const;
+    virtual FASTBOOL BegChangeEntry(sal_uIntPtr nPos);
     virtual FASTBOOL EndChangeEntry();
     virtual void     BrkChangeEntry();
 
@@ -92,7 +92,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual String  GetCellText(long _nRow, USHORT _nColId) const;
+    virtual String  GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
     const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
     XubString GetNewEntryValue() const                 { return pEditControl->GetText(); }
diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx
index 9498f03d6978..87c6d69ebaaf 100644
--- a/svx/inc/svx/SmartTagCtl.hxx
+++ b/svx/inc/svx/SmartTagCtl.hxx
@@ -72,11 +72,11 @@ private:
 
     void            FillMenu();
     DECL_LINK( MenuSelect, PopupMenu * );
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 
 public:
-    SvxSmartTagsControl( USHORT nId, Menu&, SfxBindings& );
+    SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& );
     ~SvxSmartTagsControl();
 
     virtual PopupMenu*  GetPopup() const;
diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
index ed69a25787dd..666160b3a745 100644
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/svx/inc/svx/SmartTagItem.hxx
@@ -63,7 +63,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxSmartTagItem( const USHORT nId,
+    SvxSmartTagItem( const sal_uInt16 nId,
                      const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
                      const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence,
                      const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
@@ -76,10 +76,10 @@ public:
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const; // leer
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const; // leer
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const; // leer
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const; // leer
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer
 
     const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; }
     const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; }
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx
index 3702b643e17e..016def2576dc 100644
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/svx/inc/svx/SpellDialogChildWindow.hxx
@@ -58,7 +58,7 @@ class SVX_DLLPUBLIC SpellDialogChildWindow
 public:
     SpellDialogChildWindow (
         Window*pParent,
-        USHORT nId,
+        sal_uInt16 nId,
         SfxBindings* pBindings,
         SfxChildWinInfo* pInfo);
     virtual ~SpellDialogChildWindow ();
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
index d12e646da9b2..6d4f92571dc0 100644
--- a/svx/inc/svx/algitem.hxx
+++ b/svx/inc/svx/algitem.hxx
@@ -46,24 +46,24 @@ class SVX_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem
 public:
     TYPEINFO();
 
-    SvxHorJustifyItem( const USHORT nId );
+    SvxHorJustifyItem( const sal_uInt16 nId );
 
     SvxHorJustifyItem(
         const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/,
-        const USHORT nId );
+        const sal_uInt16 nId );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual USHORT          GetValueCount() const;
-    virtual String          GetValueText( USHORT nVal ) const;
+    virtual sal_uInt16          GetValueCount() const;
+    virtual String          GetValueText( sal_uInt16 nVal ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVer ) const;
 
     inline  SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify)
             {
@@ -81,24 +81,24 @@ class SVX_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem
 public:
     TYPEINFO();
 
-    SvxVerJustifyItem( const USHORT nId  );
+    SvxVerJustifyItem( const sal_uInt16 nId  );
 
     SvxVerJustifyItem(
         const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/,
-        const USHORT nId  );
+        const sal_uInt16 nId  );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual USHORT          GetValueCount() const;
-    virtual String          GetValueText( USHORT nVal ) const;
+    virtual sal_uInt16          GetValueCount() const;
+    virtual String          GetValueText( sal_uInt16 nVal ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVer ) const;
 
     inline  SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify)
             {
@@ -117,24 +117,24 @@ public:
 
     SvxOrientationItem(
         const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/,
-        const USHORT nId );
+        const sal_uInt16 nId );
 
     SvxOrientationItem(
-        INT32 nRotation, BOOL bStacked,
-        const USHORT nId );
+        sal_Int32 nRotation, sal_Bool bStacked,
+        const sal_uInt16 nId );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual USHORT          GetValueCount() const;
-    virtual String          GetValueText( USHORT nVal ) const;
+    virtual sal_uInt16          GetValueCount() const;
+    virtual String          GetValueText( sal_uInt16 nVal ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVer ) const;
 
     inline  SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation)
             {
@@ -142,28 +142,28 @@ public:
                 return *this;
             }
 
-    /** Returns TRUE, if the item represents STACKED state. */
-    BOOL                    IsStacked() const;
+    /** Returns sal_True, if the item represents STACKED state. */
+    sal_Bool                    IsStacked() const;
     /** Returns the rotation this item represents (returns nStdAngle for STANDARD and STACKED state). */
-    INT32                   GetRotation( INT32 nStdAngle = 0 ) const;
+    sal_Int32                   GetRotation( sal_Int32 nStdAngle = 0 ) const;
     /** Fills this item according to passed item values. */
-    void                    SetFromRotation( INT32 nRotation, BOOL bStacked );
+    void                    SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked );
 };
 
 //------------------------------------------------------------------------
 
 class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem
 {
-    INT16       nLeftMargin;
-    INT16       nTopMargin;
-    INT16       nRightMargin;
-    INT16       nBottomMargin;
+    sal_Int16       nLeftMargin;
+    sal_Int16       nTopMargin;
+    sal_Int16       nRightMargin;
+    sal_Int16       nBottomMargin;
 public:
     TYPEINFO();
-    SvxMarginItem( const USHORT nId  );
-    SvxMarginItem( INT16 nLeft, INT16 nTop /*= 0*/,
-                   INT16 nRight /*= 0*/, INT16 nBottom /*= 0*/,
-                   const USHORT nId  );
+    SvxMarginItem( const sal_uInt16 nId  );
+    SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/,
+                   sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/,
+                   const sal_uInt16 nId  );
     SvxMarginItem( const SvxMarginItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -173,20 +173,20 @@ public:
 
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create( SvStream& rStream, USHORT nVer ) const;
-    virtual SvStream&        Store( SvStream&, USHORT nItemVersion ) const;
-
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
-            INT16           GetLeftMargin() const {return nLeftMargin; }
-            BOOL            SetLeftMargin(INT16 nLeft);
-            INT16           GetTopMargin() const {return nTopMargin; }
-            BOOL            SetTopMargin(INT16 nTop);
-            INT16           GetRightMargin() const {return nRightMargin; }
-            BOOL            SetRightMargin(INT16 nRight);
-            INT16           GetBottomMargin() const {return nBottomMargin; }
-            BOOL            SetBottomMargin(INT16 nBottom);
+    virtual SfxPoolItem*     Create( SvStream& rStream, sal_uInt16 nVer ) const;
+    virtual SvStream&        Store( SvStream&, sal_uInt16 nItemVersion ) const;
+
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+            sal_Int16           GetLeftMargin() const {return nLeftMargin; }
+            sal_Bool            SetLeftMargin(sal_Int16 nLeft);
+            sal_Int16           GetTopMargin() const {return nTopMargin; }
+            sal_Bool            SetTopMargin(sal_Int16 nTop);
+            sal_Int16           GetRightMargin() const {return nRightMargin; }
+            sal_Bool            SetRightMargin(sal_Int16 nRight);
+            sal_Int16           GetBottomMargin() const {return nBottomMargin; }
+            sal_Bool            SetBottomMargin(sal_Int16 nBottom);
 
     inline  SvxMarginItem& operator=(const SvxMarginItem& rMargin)
             {
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 1387b17267c2..39ae551db3dd 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -50,11 +50,11 @@ private:
     SvxBmpMask  &rBmpMask;
 
 protected:
-    virtual void StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                const SfxPoolItem* pState );
 
 public:
-    SvxBmpMaskSelectItem( USHORT nId, SvxBmpMask& rMask,
+    SvxBmpMaskSelectItem( sal_uInt16 nId, SvxBmpMask& rMask,
                           SfxBindings& rBindings );
 };
 
@@ -68,7 +68,7 @@ class SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow
 {
  public:
                             SvxBmpMaskChildWindow( Window*,
-                                                   USHORT, SfxBindings*,
+                                                   sal_uInt16, SfxBindings*,
                                                    SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW(SvxBmpMaskChildWindow);
@@ -129,12 +129,12 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
     Image               maImgPipette;
     Image               maImgPipetteH;
 
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
 
 #ifdef BMPMASK_PRIVATE
 
-    USHORT              InitColorArrays( Color* pSrcCols, Color* pDstCols,
-                                         ULONG* pTols );
+    sal_uInt16              InitColorArrays( Color* pSrcCols, Color* pDstCols,
+                                         sal_uIntPtr* pTols );
 
     Bitmap              ImpMask( const Bitmap& rBitmap );
     BitmapEx            ImpMask( const BitmapEx& rBitmapEx );
@@ -163,14 +163,14 @@ public:
     void                SetColor( const Color& rColor );
     void                PipetteClicked();
 
-    BOOL                NeedsColorTable() const;
+    sal_Bool                NeedsColorTable() const;
     void                SetColorTable( const XColorTable* pColorTable );
 
-    void                SetExecState( BOOL bEnable );
+    void                SetExecState( sal_Bool bEnable );
 
     Graphic             Mask( const Graphic& rGraphic );
 
-    BOOL                IsEyedropping() const;
+    sal_Bool                IsEyedropping() const;
 
     void                onSelect( MaskSet* pSet );
 
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index 89c76c797622..73cd1824933f 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
@@ -86,7 +86,7 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
     // Um den Blickpunkt drehen, Position wird dabei veraendert
     void RotateAroundLookAt(double fHAngle, double fVAngle);
 
-    void SetAutoAdjustProjection(FASTBOOL bAdjust = TRUE)
+    void SetAutoAdjustProjection(FASTBOOL bAdjust = sal_True)
         { bAutoAdjustProjection = bAdjust; }
     FASTBOOL IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
 };
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 5111462f6fc3..88662b3b4cdd 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -58,7 +58,7 @@ public:
 
     void            SetFont( const Font& rFont );
 
-    void            SelectCharacter( sal_uInt32 cNew, BOOL bFocus = FALSE );
+    void            SelectCharacter( sal_uInt32 cNew, sal_Bool bFocus = sal_False );
     sal_UCS4        GetSelectCharacter() const;
 
     Link            GetDoubleClickHdl() const { return aDoubleClkHdl; }
@@ -76,12 +76,12 @@ public:
     int                         FirstInView( void) const;
     int                         LastInView( void) const;
     int                         PixelToMapIndex( const Point&) const;
-    void                        SelectIndex( int index, BOOL bFocus = FALSE );
+    void                        SelectIndex( int index, sal_Bool bFocus = sal_False );
     void                        DeSelect();
-    inline sal_Bool             IsSelected(USHORT _nPos) const { return _nPos == nSelectedIndex; }
-    inline USHORT               GetSelectIndexId() const { return sal::static_int_cast<USHORT>(nSelectedIndex); }
-    USHORT                      GetRowPos(USHORT _nPos) const;
-    USHORT                      GetColumnPos(USHORT _nPos) const;
+    inline sal_Bool             IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; }
+    inline sal_uInt16               GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); }
+    sal_uInt16                      GetRowPos(sal_uInt16 _nPos) const;
+    sal_uInt16                      GetColumnPos(sal_uInt16 _nPos) const;
 
     void                        ImplFireAccessibleEvent( short nEventId,
                                                          const ::com::sun::star::uno::Any& rOldValue,
@@ -119,7 +119,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccessible;
     long            nX;
     long            nY;
-    BOOL            bDrag;
+    sal_Bool            bDrag;
 
     sal_Int32       nSelectedIndex;
 
@@ -130,7 +130,7 @@ private:
 
 private:
     void            DrawChars_Impl( int n1, int n2);
-    void            InitSettings( BOOL bForeground, BOOL bBackground);
+    void            InitSettings( sal_Bool bForeground, sal_Bool bBackground);
     // abstraction layers are: Unicode<->MapIndex<->Pixel
     Point           MapIndexToPixel( int) const;
     DECL_LINK( VscrollHdl, ScrollBar* );
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index b72b134e48d8..073284d02617 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -54,8 +54,8 @@ private:
     using SvTreeListBox::InsertEntry;
     // Avoid ambiguity with new InsertEntry:
     virtual SvLBoxEntry*    InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
-                                         BOOL bChildsOnDemand,
-                                         ULONG nPos, void* pUserData,
+                                         sal_Bool bChildsOnDemand,
+                                         sal_uIntPtr nPos, void* pUserData,
                                          SvLBoxButtonKind eButtonKind );
 
 public:
@@ -67,23 +67,23 @@ public:
     ~SvxCheckListBox();
 
     void            InsertEntry         ( const String& rStr,
-                                          USHORT nPos = LISTBOX_APPEND,
+                                          sal_uInt16 nPos = LISTBOX_APPEND,
                                           void* pUserData = NULL,
                                           SvLBoxButtonKind eButtonKind =
                                               SvLBoxButtonKind_enabledCheckbox );
-    void            RemoveEntry         ( USHORT nPos );
+    void            RemoveEntry         ( sal_uInt16 nPos );
 
-    void            SelectEntryPos      ( USHORT nPos, BOOL bSelect = TRUE );
-    USHORT          GetSelectEntryPos   () const;
+    void            SelectEntryPos      ( sal_uInt16 nPos, sal_Bool bSelect = sal_True );
+    sal_uInt16          GetSelectEntryPos   () const;
 
-    String          GetText             ( USHORT nPos ) const;
-    USHORT          GetCheckedEntryCount() const;
-    void            CheckEntryPos       ( USHORT nPos, BOOL bCheck = TRUE );
-    BOOL            IsChecked           ( USHORT nPos ) const;
+    String          GetText             ( sal_uInt16 nPos ) const;
+    sal_uInt16          GetCheckedEntryCount() const;
+    void            CheckEntryPos       ( sal_uInt16 nPos, sal_Bool bCheck = sal_True );
+    sal_Bool            IsChecked           ( sal_uInt16 nPos ) const;
     void            ToggleCheckButton   ( SvLBoxEntry* pEntry );
 
-    void*           SetEntryData        ( USHORT nPos, void* pNewData );
-    void*           GetEntryData        ( USHORT nPos ) const;
+    void*           SetEntryData        ( sal_uInt16 nPos, void* pNewData );
+    void*           GetEntryData        ( sal_uInt16 nPos ) const;
 
     virtual void    MouseButtonDown     ( const MouseEvent& rMEvt );
     virtual void    KeyInput            ( const KeyEvent& rKEvt );
diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index 1cb9c2068f01..bc68bf1df705 100644
--- a/svx/inc/svx/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
@@ -192,13 +192,13 @@ class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/,
-                      USHORT nId );
-    SvxChartStyleItem(SvStream& rIn, USHORT nId );
+                      sal_uInt16 nId );
+    SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHSTYLE_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHSTYLE_COUNT; }
     SvxChartStyle GetValue() const
         { return (SvxChartStyle)SfxEnumItem::GetValue(); }
 };
@@ -210,16 +210,16 @@ class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/,
-                        USHORT nId );
-    SvxChartRegressItem(SvStream& rIn, USHORT nId );
+                        sal_uInt16 nId );
+    SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHREGRESS_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHREGRESS_COUNT; }
     SvxChartRegress GetValue() const
         { return (SvxChartRegress)SfxEnumItem::GetValue(); }
-    USHORT GetVersion (USHORT nFileFormatVersion) const;
+    sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
 };
 
 //------------------------------------------------------------------
@@ -229,14 +229,14 @@ class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartDataDescrItem(SvxChartDataDescr eDataDescr /*= CHDESCR_NONE*/,
-                          USHORT nId );
+                          sal_uInt16 nId );
     SvxChartDataDescrItem(SvStream& rIn,
-                          USHORT nId );
+                          sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHDESCR_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHDESCR_COUNT; }
     SvxChartDataDescr GetValue() const
         { return (SvxChartDataDescr)SfxEnumItem::GetValue(); }
 };
@@ -248,14 +248,14 @@ class SVX_DLLPUBLIC SvxChartLegendPosItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartLegendPosItem(SvxChartLegendPos eLegendPos /*= CHLEGEND_NONE*/,
-                          USHORT nId );
+                          sal_uInt16 nId );
     SvxChartLegendPosItem(SvStream& rIn,
-                          USHORT nId );
+                          sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHLEGEND_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHLEGEND_COUNT; }
     SvxChartLegendPos GetValue() const
         { return (SvxChartLegendPos)SfxEnumItem::GetValue(); }
 };
@@ -267,17 +267,17 @@ class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/,
-                          USHORT nId );
+                          sal_uInt16 nId );
     SvxChartTextOrderItem(SvStream& rIn,
-                          USHORT nId );
+                          sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    USHORT GetValueCount() const { return CHTXTORDER_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; }
     SvxChartTextOrder GetValue() const
         { return (SvxChartTextOrder)SfxEnumItem::GetValue(); }
 };
@@ -289,14 +289,14 @@ class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartTextOrientItem(SvxChartTextOrient /*eOrient = CHTXTORIENT_STANDARD*/,
-                           USHORT nId );
+                           sal_uInt16 nId );
     SvxChartTextOrientItem(SvStream& rIn,
-                           USHORT nId );
+                           sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHTXTORDER_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; }
     SvxChartTextOrient GetValue() const
         { return (SvxChartTextOrient)SfxEnumItem::GetValue(); }
 };
@@ -308,18 +308,18 @@ class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/,
-                           USHORT nId );
+                           sal_uInt16 nId );
     SvxChartKindErrorItem(SvStream& rIn,
-                           USHORT nId );
+                           sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHERROR_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHERROR_COUNT; }
     SvxChartKindError GetValue() const
         { return (SvxChartKindError)SfxEnumItem::GetValue(); }
 
-    USHORT GetVersion (USHORT nFileFormatVersion) const;
+    sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
 };
 
 //------------------------------------------------------------------
@@ -329,18 +329,18 @@ class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/,
-                           USHORT nId );
+                           sal_uInt16 nId );
     SvxChartIndicateItem(SvStream& rIn,
-                           USHORT nId );
+                           sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHINDICATE_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHINDICATE_COUNT; }
     SvxChartIndicate GetValue() const
         { return (SvxChartIndicate)SfxEnumItem::GetValue(); }
 
-    USHORT GetVersion (USHORT nFileFormatVersion) const;
+    sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
 };
 
 //------------------------------------------------------------------
@@ -351,13 +351,13 @@ class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem
 
 public:
     TYPEINFO();
-    SvxDoubleItem(double fValue /*= 0.0*/, USHORT nId );
-    SvxDoubleItem(SvStream& rIn, USHORT nId );
+    SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId );
+    SvxDoubleItem(SvStream& rIn, sal_uInt16 nId );
     SvxDoubleItem(const SvxDoubleItem& rItem);
 
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
 
 
@@ -369,8 +369,8 @@ public:
 
     virtual int              operator == (const SfxPoolItem&) const;
     virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVersion) const;
-    virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const;
+    virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
     virtual double GetMin() const;
     virtual double GetMax() const;
diff --git a/svx/inc/svx/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx
index 22480ab1e728..bcfafe6c93f7 100644
--- a/svx/inc/svx/clipboardctl.hxx
+++ b/svx/inc/svx/clipboardctl.hxx
@@ -43,20 +43,20 @@ class SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl
 {
     SfxPoolItem*            pClipboardFmtItem;
     PopupMenu*              pPopup;
-    USHORT                  nItemId;
-    BOOL                    bDisabled;
+    sal_uInt16                  nItemId;
+    sal_Bool                    bDisabled;
 
     void                    DelPopup();
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxClipBoardControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxClipBoardControl();
 
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
-    virtual void                StateChanged( USHORT nSID,
+    virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
diff --git a/svx/inc/svx/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx
index 74687d56d38b..79a430892e89 100644
--- a/svx/inc/svx/clipfmtitem.hxx
+++ b/svx/inc/svx/clipfmtitem.hxx
@@ -46,20 +46,20 @@ protected:
 
 public:
     TYPEINFO();
-    SvxClipboardFmtItem( USHORT nId = 0 );
+    SvxClipboardFmtItem( sal_uInt16 nId = 0 );
     SvxClipboardFmtItem( const SvxClipboardFmtItem& );
     virtual ~SvxClipboardFmtItem();
 
-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const;
+    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-    void AddClipbrdFormat( ULONG nId, USHORT nPos = USHRT_MAX );
-    void AddClipbrdFormat( ULONG nId, const String& rName,
-                            USHORT nPos = USHRT_MAX );
-    USHORT Count() const;
+    void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX );
+    void AddClipbrdFormat( sal_uIntPtr nId, const String& rName,
+                            sal_uInt16 nPos = USHRT_MAX );
+    sal_uInt16 Count() const;
 
-    ULONG GetClipbrdFormatId( USHORT nPos ) const;
-    const String& GetClipbrdFormatName( USHORT nPos ) const;
+    sal_uIntPtr GetClipbrdFormatId( sal_uInt16 nPos ) const;
+    const String& GetClipbrdFormatName( sal_uInt16 nPos ) const;
 };
 
 
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index e6908d98c152..c13d01c8a768 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -49,7 +49,7 @@ class SvxColorValueSet : public ValueSet, public DragSourceHelper
 
 private:
 
-    BOOL            bLeft;
+    sal_Bool            bLeft;
     Point           aDragPosPixel;
 
 protected:
@@ -70,7 +70,7 @@ public:
                     SvxColorValueSet( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER );
                     SvxColorValueSet( Window* pParent, const ResId& rResId );
 
-    BOOL            IsLeftButton() const { return bLeft; }
+    sal_Bool            IsLeftButton() const { return bLeft; }
 };
 
 /*************************************************************************
@@ -82,7 +82,7 @@ public:
 class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow
 {
  public:
-    SvxColorChildWindow( Window*, USHORT, SfxBindings*,
+    SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*,
                          SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW(SvxColorChildWindow);
@@ -101,10 +101,10 @@ class SvxColorDockingWindow : public SfxDockingWindow, public SfxListener
 private:
     XColorTable*        pColorTable;
     SvxColorValueSet    aColorSet;
-    USHORT              nLeftSlot;
-    USHORT              nRightSlot;
-    USHORT              nCols;
-    USHORT              nLines;
+    sal_uInt16              nLeftSlot;
+    sal_uInt16              nRightSlot;
+    sal_uInt16              nCols;
+    sal_uInt16              nLines;
     long                nCount;
     Size                aColorSize;
     Size                aItemSize;
@@ -122,7 +122,7 @@ private:
 //#endif
 
 protected:
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
     virtual void    Resize();
     virtual void    Resizing( Size& rSize );
 
@@ -135,7 +135,7 @@ public:
 
     virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    void            SetSlotIDs( USHORT nLeft, USHORT nRight )
+    void            SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight )
                         { nLeftSlot = nLeft; nRightSlot = nRight; }
 
     virtual long    Notify( NotifyEvent& rNEvt );
diff --git a/svx/inc/svx/connctrl.hxx b/svx/inc/svx/connctrl.hxx
index 468fffcc43b7..daab7e093ef1 100644
--- a/svx/inc/svx/connctrl.hxx
+++ b/svx/inc/svx/connctrl.hxx
@@ -64,7 +64,7 @@ public:
     virtual void MouseButtonDown( const MouseEvent& rMEvt );
 
     void         SetAttributes( const SfxItemSet& rInAttrs );
-    USHORT       GetLineDeltaAnz();
+    sal_uInt16       GetLineDeltaAnz();
 
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 034ec5485536..c0e78425dcdd 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -45,11 +45,11 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
 {
  public:
 
-    SvxContourDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW( SvxContourDlgChildWindow );
 
-    static void UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked,
+    static void UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                                   const PolyPolygon* pPolyPoly = NULL,
                                   void* pEditingObj = NULL );
 };
@@ -71,11 +71,11 @@ class SvxContourDlgItem : public SfxControllerItem
 
 protected:
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
 public:
 
-                        SvxContourDlgItem( USHORT nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings );
+                        SvxContourDlgItem( sal_uInt16 nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings );
 };
 
 /*************************************************************************
@@ -104,12 +104,12 @@ public:
                                        Window* pParent, const ResId& rResId );
                         ~SvxContourDlg();
 
-    void                SetExecState( BOOL bEnable );
+    void                SetExecState( sal_Bool bEnable );
 
     void                SetGraphic( const Graphic& rGraphic );
-    void                SetGraphicLinked( BOOL bLinked );
+    void                SetGraphicLinked( sal_Bool bLinked );
     const Graphic&      GetGraphic() const;
-    BOOL                IsGraphicChanged() const;
+    sal_Bool                IsGraphicChanged() const;
 
     void                SetPolyPolygon( const PolyPolygon& rPolyPoly );
     PolyPolygon         GetPolyPolygon();
@@ -117,12 +117,12 @@ public:
     void                SetEditingObject( void* pObj );
     const void*         GetEditingObject() const;
 
-    void                Update( const Graphic& rGraphic, BOOL bGraphicLinked,
+    void                Update( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                                 const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL );
 
     static PolyPolygon  CreateAutoContour(  const Graphic& rGraphic,
                                             const Rectangle* pRect = NULL,
-                                            const ULONG nFlags = 0L );
+                                            const sal_uIntPtr nFlags = 0L );
     static void         ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic,
                                       const MapUnit eUnit, const Size& rDisplaySize );
 };
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index abedd54f0c00..1189a7a8a7be 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -64,7 +64,7 @@ class SVX_DLLPUBLIC RedlinData
 public:
                     RedlinData();
     virtual         ~RedlinData();
-    BOOL            bDisabled;
+    sal_Bool            bDisabled;
     DateTime        aDateTime;
     void*           pData;
 };
@@ -84,12 +84,12 @@ private:
     Color           aPrivColor;
 
 public:
-                    SvLBoxColorString( SvLBoxEntry*,USHORT nFlags,const XubString& rStr,
+                    SvLBoxColorString( SvLBoxEntry*,sal_uInt16 nFlags,const XubString& rStr,
                                     const Color& rCol);
                     SvLBoxColorString();
                     ~SvLBoxColorString();
 
-    void            Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
+    void            Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
     SvLBoxItem*     Create() const;
 };
 
@@ -99,12 +99,12 @@ class SVX_DLLPUBLIC SvxRedlinTable : public SvxSimpleTable
 
 private:
 
-    BOOL            bIsCalc;
-    USHORT          nDatePos;
-    BOOL            bAuthor;
-    BOOL            bDate;
-    BOOL            bComment;
-    USHORT          nDaTiMode;
+    sal_Bool            bIsCalc;
+    sal_uInt16          nDatePos;
+    sal_Bool            bAuthor;
+    sal_Bool            bDate;
+    sal_Bool            bComment;
+    sal_uInt16          nDaTiMode;
     DateTime        aDaTiFirst;
     DateTime        aDaTiLast;
     DateTime        aDaTiFilterFirst;
@@ -129,35 +129,35 @@ public:
                     ~SvxRedlinTable();
 
     // For FilterPage only {
-    void            SetFilterDate(BOOL bFlag=TRUE);
-    void            SetDateTimeMode(USHORT nMode);
+    void            SetFilterDate(sal_Bool bFlag=sal_True);
+    void            SetDateTimeMode(sal_uInt16 nMode);
     void            SetFirstDate(const Date&);
     void            SetLastDate(const Date&);
     void            SetFirstTime(const Time&);
     void            SetLastTime(const Time&);
-    void            SetFilterAuthor(BOOL bFlag=TRUE);
+    void            SetFilterAuthor(sal_Bool bFlag=sal_True);
     void            SetAuthor(const String &);
-    void            SetFilterComment(BOOL bFlag=TRUE);
+    void            SetFilterComment(sal_Bool bFlag=sal_True);
     void            SetCommentParams( const utl::SearchParam* pSearchPara );
 
     void            UpdateFilterTest();
     // } For FilterPage only
 
-    void            SetCalcView(BOOL bFlag=TRUE);
-    BOOL            IsValidCalcEntry(const String& ,RedlinData *pUserData);
-    BOOL            IsValidWriterEntry(const String& ,RedlinData *pUserData);
+    void            SetCalcView(sal_Bool bFlag=sal_True);
+    sal_Bool            IsValidCalcEntry(const String& ,RedlinData *pUserData);
+    sal_Bool            IsValidWriterEntry(const String& ,RedlinData *pUserData);
 
     // keine NULL-Ptr. ueberpruefung {
-    BOOL            IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
-    BOOL            IsValidEntry(const String* pAuthor,const DateTime *pDateTime);
-    BOOL            IsValidComment(const String* pComment);
+    sal_Bool            IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
+    sal_Bool            IsValidEntry(const String* pAuthor,const DateTime *pDateTime);
+    sal_Bool            IsValidComment(const String* pComment);
     // }
 
     SvLBoxEntry*    InsertEntry(const String& ,RedlinData *pUserData,
-                                SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND);
+                                SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND);
 
     SvLBoxEntry*    InsertEntry(const String& ,RedlinData *pUserData,const Color&,
-                                SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND);
+                                SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND);
 
 
     virtual SvLBoxEntry* CreateEntry() const;
@@ -204,7 +204,7 @@ private:
     String          aActionStr;
     String          aRangeStr;
     String          aStrMyName;
-    BOOL            bModified;
+    sal_Bool            bModified;
 
     DECL_LINK( SelDateHdl, ListBox* );
     DECL_LINK( RowEnableHdl, CheckBox* );
@@ -216,9 +216,9 @@ private:
 
 protected:
 
-    void            ShowDateFields(USHORT nKind);
-    void            EnableDateLine1(BOOL bFlag);
-    void            EnableDateLine2(BOOL bFlag);
+    void            ShowDateFields(sal_uInt16 nKind);
+    void            EnableDateLine1(sal_Bool bFlag);
+    void            EnableDateLine2(sal_Bool bFlag);
 
 public:
                     SvxTPFilter( Window * pParent);
@@ -237,15 +237,15 @@ public:
     Time            GetLastTime() const;
     void            SetLastTime(const Time &aTime);
 
-    void            SetDateMode(USHORT nMode);
-    USHORT          GetDateMode();
+    void            SetDateMode(sal_uInt16 nMode);
+    sal_uInt16          GetDateMode();
 
     void            ClearAuthors();
-    void            InsertAuthor( const String& rString, USHORT nPos = LISTBOX_APPEND );
-    USHORT          GetSelectedAuthorPos();
+    void            InsertAuthor( const String& rString, sal_uInt16 nPos = LISTBOX_APPEND );
+    sal_uInt16          GetSelectedAuthorPos();
     String          GetSelectedAuthor()const;
-    void            SelectedAuthorPos(USHORT nPos);
-    USHORT          SelectAuthor(const String& aString);
+    void            SelectedAuthorPos(sal_uInt16 nPos);
+    sal_uInt16          SelectAuthor(const String& aString);
     void            SetComment(const String &rComment);
     String          GetComment()const;
 
@@ -253,27 +253,27 @@ public:
     // Methoden fuer Calc {
     void            SetRange(const String& rString);
     String          GetRange() const;
-    void            HideRange(BOOL bHide=TRUE);
-    void            DisableRange(BOOL bFlag=TRUE);
+    void            HideRange(sal_Bool bHide=sal_True);
+    void            DisableRange(sal_Bool bFlag=sal_True);
     void            SetFocusToRange();
     // } Methoden fuer Calc
 
-    void            HideClocks(BOOL bHide=TRUE);
-    void            DisableRef(BOOL bFlag);
+    void            HideClocks(sal_Bool bHide=sal_True);
+    void            DisableRef(sal_Bool bFlag);
 
-    BOOL            IsDate();
-    BOOL            IsAuthor();
-    BOOL            IsRange();
-    BOOL            IsAction();
-    BOOL            IsComment();
+    sal_Bool            IsDate();
+    sal_Bool            IsAuthor();
+    sal_Bool            IsRange();
+    sal_Bool            IsAction();
+    sal_Bool            IsComment();
 
-    void            ShowAction(BOOL bShow=TRUE);
+    void            ShowAction(sal_Bool bShow=sal_True);
 
-    void            CheckDate(BOOL bFlag=TRUE);
-    void            CheckAuthor(BOOL bFlag=TRUE);
-    void            CheckRange(BOOL bFlag=TRUE);
-    void            CheckAction(BOOL bFlag=TRUE);
-    void            CheckComment(BOOL bFlag=TRUE);
+    void            CheckDate(sal_Bool bFlag=sal_True);
+    void            CheckAuthor(sal_Bool bFlag=sal_True);
+    void            CheckRange(sal_Bool bFlag=sal_True);
+    void            CheckAction(sal_Bool bFlag=sal_True);
+    void            CheckComment(sal_Bool bFlag=sal_True);
 
     ListBox*        GetLbAction();
 
@@ -352,21 +352,21 @@ public:
     void            InsertCalcHeader();
     SvxRedlinTable* GetTableControl();
 
-    void            EnableAccept(BOOL nFlag=TRUE);
-    void            EnableAcceptAll(BOOL nFlag=TRUE);
-    void            EnableReject(BOOL nFlag=TRUE);
-    void            EnableRejectAll(BOOL nFlag=TRUE);
-    void            EnableUndo(BOOL nFlag=TRUE);
+    void            EnableAccept(sal_Bool nFlag=sal_True);
+    void            EnableAcceptAll(sal_Bool nFlag=sal_True);
+    void            EnableReject(sal_Bool nFlag=sal_True);
+    void            EnableRejectAll(sal_Bool nFlag=sal_True);
+    void            EnableUndo(sal_Bool nFlag=sal_True);
 
-    void            DisableAccept()     {EnableAccept(FALSE);}
-    void            DisableAcceptAll()  {EnableAcceptAll(FALSE);}
-    void            DisableReject()     {EnableReject(FALSE);}
-    void            DisableRejectAll()  {EnableRejectAll(FALSE);}
-    void            DisableUndo()       {EnableUndo(FALSE);}
+    void            DisableAccept()     {EnableAccept(sal_False);}
+    void            DisableAcceptAll()  {EnableAcceptAll(sal_False);}
+    void            DisableReject()     {EnableReject(sal_False);}
+    void            DisableRejectAll()  {EnableRejectAll(sal_False);}
+    void            DisableUndo()       {EnableUndo(sal_False);}
 
-    void            ShowUndo(BOOL nFlag=TRUE);
-    void            HideUndo()          {ShowUndo(FALSE);}
-    BOOL            IsUndoVisible();
+    void            ShowUndo(sal_Bool nFlag=sal_True);
+    void            HideUndo()          {ShowUndo(sal_False);}
+    sal_Bool            IsUndoVisible();
 
     Size            GetMinSizePixel();
 
@@ -415,8 +415,8 @@ public:
     void            ShowFilterPage();
     void            ShowViewPage();
 
-    BOOL            IsFilterPageVisible();
-    BOOL            IsViewPageVisible();
+    sal_Bool            IsFilterPageVisible();
+    sal_Bool            IsViewPageVisible();
 
     SvxTPFilter*    GetFilterPage();
     SvxTPView*      GetViewPage();
diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx
index 00da40a852e9..a69a06ab721c 100644
--- a/svx/inc/svx/cube3d.hxx
+++ b/svx/inc/svx/cube3d.hxx
@@ -55,7 +55,7 @@ private:
     // Parameter
     basegfx::B3DPoint                   aCubePos;
     basegfx::B3DVector                  aCubeSize;
-    UINT16                              nSideFlags;
+    sal_uInt16                              nSideFlags;
 
     // BOOLeans
     unsigned                            bPosIsCenter : 1;
@@ -69,8 +69,8 @@ public:
     E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize);
     E3dCubeObj();
 
-    virtual UINT16 GetObjIdentifier() const;
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void operator=(const SdrObject&);
 
@@ -81,11 +81,11 @@ public:
     void SetCubeSize(const basegfx::B3DVector& rNew);
     const basegfx::B3DVector& GetCubeSize() { return aCubeSize; }
 
-    void SetPosIsCenter(BOOL bNew);
-    BOOL GetPosIsCenter() { return (BOOL)bPosIsCenter; }
+    void SetPosIsCenter(sal_Bool bNew);
+    sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; }
 
-    void SetSideFlags(UINT16 nNew);
-    UINT16 GetSideFlags() { return nSideFlags; }
+    void SetSideFlags(sal_uInt16 nNew);
+    sal_uInt16 GetSideFlags() { return nSideFlags; }
 
     // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
     virtual void TakeObjNameSingul(String& rName) const;
diff --git a/svx/inc/svx/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx
index 123e5af7d5a8..d168ed5b036b 100644
--- a/svx/inc/svx/databaseregistrationui.hxx
+++ b/svx/inc/svx/databaseregistrationui.hxx
@@ -44,7 +44,7 @@ namespace svx
 
     /** opens a dialog which allows the user to administrate the database registrations
     */
-    USHORT  SVX_DLLPUBLIC  administrateDatabaseRegistration( Window* _parentWindow );
+    sal_uInt16  SVX_DLLPUBLIC  administrateDatabaseRegistration( Window* _parentWindow );
 
 //........................................................................
 }   // namespace svx
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index 0894540d1972..7df0dd5c38cb 100755
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -57,7 +57,7 @@ namespace svxform
         static ::connectivity::simple::createDataAccessToolsFactoryFunction
                                 s_pFactoryCreationFunc;
         //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
-        mutable BOOL            m_bCreateAlready;
+        mutable sal_Bool            m_bCreateAlready;
 
     private:
         mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx
index cfd05a652fe0..c09cbafd8e1f 100644
--- a/svx/inc/svx/deflt3d.hxx
+++ b/svx/inc/svx/deflt3d.hxx
@@ -44,14 +44,14 @@ class SVX_DLLPUBLIC E3dDefaultAttributes
 private:
     // Compound-Objekt
     Color               aDefaultAmbientColor;
-    BOOL                bDefaultCreateNormals;
-    BOOL                bDefaultCreateTexture;
+    sal_Bool                bDefaultCreateNormals;
+    sal_Bool                bDefaultCreateTexture;
 
     // Cube-Objekt
     basegfx::B3DPoint   aDefaultCubePos;
     basegfx::B3DVector  aDefaultCubeSize;
-    UINT16              nDefaultCubeSideFlags;
-    BOOL                bDefaultCubePosIsCenter;
+    sal_uInt16              nDefaultCubeSideFlags;
+    sal_Bool                bDefaultCubePosIsCenter;
 
     // Sphere-Objekt
     basegfx::B3DPoint   aDefaultSphereCenter;
@@ -59,18 +59,18 @@ private:
 
     // Lathe-Objekt
     long                nDefaultLatheEndAngle;
-    BOOL                bDefaultLatheSmoothed;
-    BOOL                bDefaultLatheSmoothFrontBack;
-    BOOL                bDefaultLatheCharacterMode;
-    BOOL                bDefaultLatheCloseFront;
-    BOOL                bDefaultLatheCloseBack;
+    sal_Bool                bDefaultLatheSmoothed;
+    sal_Bool                bDefaultLatheSmoothFrontBack;
+    sal_Bool                bDefaultLatheCharacterMode;
+    sal_Bool                bDefaultLatheCloseFront;
+    sal_Bool                bDefaultLatheCloseBack;
 
     // Extrude-Objekt
-    BOOL                bDefaultExtrudeSmoothed;
-    BOOL                bDefaultExtrudeSmoothFrontBack;
-    BOOL                bDefaultExtrudeCharacterMode;
-    BOOL                bDefaultExtrudeCloseFront;
-    BOOL                bDefaultExtrudeCloseBack;
+    sal_Bool                bDefaultExtrudeSmoothed;
+    sal_Bool                bDefaultExtrudeSmoothFrontBack;
+    sal_Bool                bDefaultExtrudeCharacterMode;
+    sal_Bool                bDefaultExtrudeCloseFront;
+    sal_Bool                bDefaultExtrudeCloseBack;
 
 public:
     // Konstruktor
@@ -84,20 +84,20 @@ public:
     const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
     void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; }
 
-    BOOL GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
-    void SetDefaultCreateNormals(const BOOL bNew) { bDefaultCreateNormals = bNew; }
-    BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
-    void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; }
+    sal_Bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
+    void SetDefaultCreateNormals(const sal_Bool bNew) { bDefaultCreateNormals = bNew; }
+    sal_Bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
+    void SetDefaultCreateTexture(const sal_Bool bNew) { bDefaultCreateTexture = bNew; }
 
     // Cube-Objekt
     const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
     void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; }
     const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
     void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; }
-    UINT16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
-    void SetDefaultCubeSideFlags(const UINT16 nNew) { nDefaultCubeSideFlags = nNew; }
-    BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
-    void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; }
+    sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
+    void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; }
+    sal_Bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
+    void SetDefaultCubePosIsCenter(const sal_Bool bNew) { bDefaultCubePosIsCenter = bNew; }
 
     // Sphere-Objekt
     const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; }
@@ -108,28 +108,28 @@ public:
     // Lathe-Objekt
     long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
     void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
-    BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
-    void SetDefaultLatheSmoothed(const BOOL bNew) { bDefaultLatheSmoothed = bNew; }
-    BOOL GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
-    void SetDefaultLatheSmoothFrontBack(const BOOL bNew) { bDefaultLatheSmoothFrontBack = bNew; }
-    BOOL GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
-    void SetDefaultLatheCharacterMode(const BOOL bNew) { bDefaultLatheCharacterMode = bNew; }
-    BOOL GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
-    void SetDefaultLatheCloseFront(const BOOL bNew) { bDefaultLatheCloseFront = bNew; }
-    BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
-    void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; }
+    sal_Bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
+    void SetDefaultLatheSmoothed(const sal_Bool bNew) { bDefaultLatheSmoothed = bNew; }
+    sal_Bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
+    void SetDefaultLatheSmoothFrontBack(const sal_Bool bNew) { bDefaultLatheSmoothFrontBack = bNew; }
+    sal_Bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
+    void SetDefaultLatheCharacterMode(const sal_Bool bNew) { bDefaultLatheCharacterMode = bNew; }
+    sal_Bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
+    void SetDefaultLatheCloseFront(const sal_Bool bNew) { bDefaultLatheCloseFront = bNew; }
+    sal_Bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
+    void SetDefaultLatheCloseBack(const sal_Bool bNew) { bDefaultLatheCloseBack = bNew; }
 
     // Extrude-Objekt
-    BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
-    void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; }
-    BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
-    void SetDefaultExtrudeSmoothFrontBack(const BOOL bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
-    BOOL GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
-    void SetDefaultExtrudeCharacterMode(const BOOL bNew) { bDefaultExtrudeCharacterMode = bNew; }
-    BOOL GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
-    void SetDefaultExtrudeCloseFront(const BOOL bNew) { bDefaultExtrudeCloseFront = bNew; }
-    BOOL GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
-    void SetDefaultExtrudeCloseBack(const BOOL bNew) { bDefaultExtrudeCloseBack = bNew; }
+    sal_Bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
+    void SetDefaultExtrudeSmoothed(const sal_Bool bNew) { bDefaultExtrudeSmoothed = bNew; }
+    sal_Bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
+    void SetDefaultExtrudeSmoothFrontBack(const sal_Bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
+    sal_Bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
+    void SetDefaultExtrudeCharacterMode(const sal_Bool bNew) { bDefaultExtrudeCharacterMode = bNew; }
+    sal_Bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
+    void SetDefaultExtrudeCloseFront(const sal_Bool bNew) { bDefaultExtrudeCloseFront = bNew; }
+    sal_Bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
+    void SetDefaultExtrudeCloseBack(const sal_Bool bNew) { bDefaultExtrudeCloseBack = bNew; }
 };
 
 #endif          // _E3D_DEFLT3D_HXX
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index 28b1bf1b9b6f..a6c2ce21829e 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -82,7 +82,7 @@ public:
 |*  eines Objekts
 |*
 \************************************************************************/
-typedef UINT16 CTL_STATE;
+typedef sal_uInt16 CTL_STATE;
 #define CS_NOHORZ   1       // no horizontal input information is used
 #define CS_NOVERT   2       // no vertikal input information is used
 
@@ -91,15 +91,15 @@ class SvxRectCtlAccessibleContext;
 class SVX_DLLPUBLIC SvxRectCtl : public Control
 {
 private:
-    SVX_DLLPRIVATE void             InitSettings( BOOL bForeground, BOOL bBackground );
+    SVX_DLLPRIVATE void             InitSettings( sal_Bool bForeground, sal_Bool bBackground );
     SVX_DLLPRIVATE void             InitRectBitmap( void );
     SVX_DLLPRIVATE Bitmap&          GetRectBitmap( void );
     SVX_DLLPRIVATE void             Resize_Impl();
 
 protected:
     SvxRectCtlAccessibleContext*    pAccContext;
-    USHORT                          nBorderWidth;
-    USHORT                          nRadius;
+    sal_uInt16                          nBorderWidth;
+    sal_uInt16                          nRadius;
     Size                            aSize;
     Point                           aPtLT, aPtMT, aPtRT;
     Point                           aPtLM, aPtMM, aPtRM;
@@ -124,7 +124,7 @@ protected:
     Point               GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const;
 public:
     SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM,
-                USHORT nBorder = 200, USHORT nCircle = 80, CTL_STYLE eStyle = CS_RECT );
+                sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
     virtual ~SvxRectCtl();
 
     virtual void        Paint( const Rectangle& rRect );
@@ -140,7 +140,7 @@ public:
 
     void                SetState( CTL_STATE nState );
 
-    UINT8               GetNumOfChilds( void ) const;   // returns number of usable radio buttons
+    sal_uInt8               GetNumOfChilds( void ) const;   // returns number of usable radio buttons
 
     Rectangle           CalculateFocusRectangle( void ) const;
     Rectangle           CalculateFocusRectangle( RECT_POINT eRectPoint ) const;
@@ -168,7 +168,7 @@ private:
 protected:
     Font    aFont;
     Size    aFontSize;
-    BOOL    bPositive;
+    sal_Bool    bPositive;
 
 public:
             SvxAngleCtl( Window* pParent, const ResId& rResId );
@@ -189,9 +189,9 @@ class SVX_DLLPUBLIC SvxBitmapCtl
 {
 protected:
     Size            aSize;
-    USHORT          nLines;
+    sal_uInt16          nLines;
     Color           aPixelColor, aBackgroundColor;
-    const USHORT*   pBmpArray;
+    const sal_uInt16*   pBmpArray;
 
 public:
             SvxBitmapCtl( Window* pParent, const Size& rSize );
@@ -199,8 +199,8 @@ public:
 
     XOBitmap    GetXBitmap();
 
-    void    SetBmpArray( const USHORT* pPixel ) { pBmpArray = pPixel; }
-    void    SetLines( USHORT nLns ) { nLines = nLns; }
+    void    SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; }
+    void    SetLines( sal_uInt16 nLns ) { nLines = nLns; }
     void    SetPixelColor( Color aColor ) { aPixelColor = aColor; }
     void    SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; }
 };
@@ -216,19 +216,19 @@ private:
     using OutputDevice::SetLineColor;
 
 protected:
-    USHORT      nLines, nSquares;
+    sal_uInt16      nLines, nSquares;
     Color       aPixelColor;
     Color       aBackgroundColor;
     Color       aLineColor;
     Size        aRectSize;
-    USHORT*     pPixel;
-    BOOL        bPaintable;
+    sal_uInt16*     pPixel;
+    sal_Bool        bPaintable;
 
-    void    ChangePixel( USHORT nPixel );
+    void    ChangePixel( sal_uInt16 nPixel );
 
 public:
             SvxPixelCtl( Window* pParent, const ResId& rResId,
-                        USHORT nNumber = 8 );
+                        sal_uInt16 nNumber = 8 );
             ~SvxPixelCtl();
 
     virtual void Paint( const Rectangle& rRect );
@@ -240,14 +240,14 @@ public:
     void    SetBackgroundColor( const Color& rCol ) { aBackgroundColor = rCol; }
     void    SetLineColor( const Color& rCol ) { aLineColor = rCol; }
 
-    USHORT  GetLineCount() const { return nLines; }
+    sal_uInt16  GetLineCount() const { return nLines; }
     Color   GetPixelColor() const { return aPixelColor; }
     Color   GetBackgroundColor() const { return aBackgroundColor; }
 
-    USHORT  GetBitmapPixel( const USHORT nPixelNumber );
-    USHORT* GetBitmapPixelPtr() { return pPixel; }
+    sal_uInt16  GetBitmapPixel( const sal_uInt16 nPixelNumber );
+    sal_uInt16* GetBitmapPixelPtr() { return pPixel; }
 
-    void    SetPaintable( BOOL bTmp ) { bPaintable = bTmp; }
+    void    SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; }
     void    Reset();
 };
 
@@ -266,7 +266,7 @@ public:
     virtual void Fill( const XColorTable* pTab );
 
     void Append( XColorEntry* pEntry, Bitmap* pBmp = NULL );
-    void Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
 };
 
 /*************************************************************************
@@ -278,20 +278,20 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox
 {
 
 public:
-         HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
-         HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE );
+         HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
+         HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True );
 
     virtual void Fill( const XHatchList* pList );
     virtual void UserDraw( const UserDrawEvent& rUDEvt );
 
     void    Append( XHatchEntry* pEntry, Bitmap* pBmp = NULL );
-    void    Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void    Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
     void    SelectEntryByList( const XHatchList* pList, const String& rStr,
-                        const XHatch& rXHatch, USHORT nDist = 0 );
+                        const XHatch& rXHatch, sal_uInt16 nDist = 0 );
 
 private:
     XHatchList*     mpList;
-    BOOL            mbUserDraw;
+    sal_Bool            mbUserDraw;
 };
 
 /*************************************************************************
@@ -302,20 +302,20 @@ private:
 class SVX_DLLPUBLIC GradientLB : public ListBox
 {
 public:
-    GradientLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
-    GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE );
+    GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
+    GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True );
 
     virtual void Fill( const XGradientList* pList );
     virtual void UserDraw( const UserDrawEvent& rUDEvt );
 
     void    Append( XGradientEntry* pEntry, Bitmap* pBmp = NULL );
-    void    Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void    Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
     void    SelectEntryByList( const XGradientList* pList, const String& rStr,
-                        const XGradient& rXGradient, USHORT nDist = 0 );
+                        const XGradient& rXGradient, sal_uInt16 nDist = 0 );
 
 private:
     XGradientList* mpList;
-    BOOL            mbUserDraw;
+    sal_Bool            mbUserDraw;
 };
 
 /*************************************************************************
@@ -326,13 +326,13 @@ private:
 class SVX_DLLPUBLIC BitmapLB : public ListBox
 {
 public:
-         BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
+         BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
 
     virtual void Fill( const XBitmapList* pList );
     virtual void UserDraw( const UserDrawEvent& rUDEvt );
 
     void    Append( XBitmapEntry* pEntry, Bitmap* pBmp = NULL );
-    void    Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void    Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
     void    SelectEntryByList( const XBitmapList* pList, const String& rStr,
                         const Bitmap& rBmp);
 
@@ -341,7 +341,7 @@ private:
     Bitmap          aBitmap;
 
     XBitmapList*    mpList;
-    BOOL            mbUserDraw;
+    sal_Bool            mbUserDraw;
 
     SVX_DLLPRIVATE void SetVirtualDevice();
 };
@@ -402,9 +402,9 @@ public:
     virtual void Fill( const XDashList* pList );
 
     void Append( XDashEntry* pEntry, Bitmap* pBmp = NULL );
-    void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
     void SelectEntryByList( const XDashList* pList, const String& rStr,
-                            const XDash& rDash, USHORT nDist = 0 );
+                            const XDash& rDash, sal_uInt16 nDist = 0 );
     void FillStyles();
 };
 
@@ -420,12 +420,12 @@ public:
          LineEndLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {}
          LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {}
 
-    virtual void Fill( const XLineEndList* pList, BOOL bStart = TRUE );
+    virtual void Fill( const XLineEndList* pList, sal_Bool bStart = sal_True );
 
     void    Append( XLineEndEntry* pEntry, Bitmap* pBmp = NULL,
-                    BOOL bStart = TRUE );
-    void    Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL,
-                    BOOL bStart = TRUE );
+                    sal_Bool bStart = sal_True );
+    void    Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL,
+                    sal_Bool bStart = sal_True );
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -485,7 +485,7 @@ public:
 
     void SetLineAttributes(const SfxItemSet& rItemSet);
 
-    void ShowSymbol( BOOL b ) { mbWithSymbol = b; };
+    void ShowSymbol( sal_Bool b ) { mbWithSymbol = b; };
     void SetSymbol( Graphic* p, const Size& s );
     void ResizeSymbol( const Size& s );
 
diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index 9bfdb5cfd87a..1f8536068c76 100644
--- a/svx/inc/svx/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
@@ -48,7 +48,7 @@ public:
                             TYPEINFO();
                             SvxColorTableItem();
                             SvxColorTableItem( XColorTable* pTable,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxColorTableItem( const SvxColorTableItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -58,8 +58,8 @@ public:
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XColorTable*            GetColorTable() const { return pColorTable; }
     void                    SetColorTable( XColorTable* pTable ) {
@@ -82,7 +82,7 @@ public:
                             TYPEINFO();
                             SvxGradientListItem();
                             SvxGradientListItem( XGradientList* pList,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxGradientListItem( const SvxGradientListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -92,8 +92,8 @@ public:
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XGradientList*          GetGradientList() const { return pGradientList; }
     void                    SetGradientList( XGradientList* pList ) {
@@ -117,7 +117,7 @@ public:
                             TYPEINFO();
                             SvxHatchListItem();
                             SvxHatchListItem( XHatchList* pList,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxHatchListItem( const SvxHatchListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -127,8 +127,8 @@ public:
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XHatchList*             GetHatchList() const { return pHatchList; }
     void                    SetHatchList( XHatchList* pList ) {
@@ -152,7 +152,7 @@ public:
                             TYPEINFO();
                             SvxBitmapListItem();
                             SvxBitmapListItem( XBitmapList* pBL,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxBitmapListItem( const SvxBitmapListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -162,8 +162,8 @@ public:
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XBitmapList*            GetBitmapList() const { return pBitmapList; }
     void                    SetBitmapList( XBitmapList* pList ) {
@@ -187,7 +187,7 @@ public:
                             TYPEINFO();
                             SvxDashListItem();
                             SvxDashListItem( XDashList* pList,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxDashListItem( const SvxDashListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -197,8 +197,8 @@ public:
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XDashList*              GetDashList() const { return pDashList; }
     void                    SetDashList( XDashList* pList );
@@ -221,7 +221,7 @@ public:
                             TYPEINFO();
                             SvxLineEndListItem();
                             SvxLineEndListItem( XLineEndList* pList,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxLineEndListItem( const SvxLineEndListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -231,8 +231,8 @@ public:
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XLineEndList*           GetLineEndList() const { return pLineEndList; }
     void                    SetLineEndList( XLineEndList* pList ) {
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index b8aea314372b..aef5de313ed9 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -44,18 +44,18 @@ class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
 public:
                             TYPEINFO();
                             SvxB3DVectorItem();
-                            SvxB3DVectorItem( USHORT nWhich, const basegfx::B3DVector& rVal );
-                            SvxB3DVectorItem( USHORT nWhich, SvStream & );
+                            SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal );
+                            SvxB3DVectorItem( sal_uInt16 nWhich, SvStream & );
                             SvxB3DVectorItem( const SvxB3DVectorItem& );
                             ~SvxB3DVectorItem();
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT nVersion) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nVersion) const;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     const basegfx::B3DVector&           GetValue() const { return aVal; }
             void            SetValue( const basegfx::B3DVector& rNewVal ) {
@@ -63,7 +63,7 @@ public:
                                  aVal = rNewVal;
                              }
 
-    virtual USHORT GetVersion (USHORT nFileFormatVersion) const;
+    virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
 };
 
 #endif
diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx
index f5081eeccfa0..4c087ff4f88e 100644
--- a/svx/inc/svx/e3dundo.hxx
+++ b/svx/inc/svx/e3dundo.hxx
@@ -57,7 +57,7 @@ class E3dUndoAction : public SdrUndoAction
 
         virtual ~E3dUndoAction ();
 
-        virtual BOOL CanRepeat(SfxRepeatTarget&) const;
+        virtual sal_Bool CanRepeat(SfxRepeatTarget&) const;
 };
 
 /************************************************************************\
@@ -100,7 +100,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
 
     SdrObject*  pObject;
     E3dView*    pView;
-    BOOL        bUseSubObjects;
+    sal_Bool        bUseSubObjects;
 
     const SfxItemSet aNewSet;
     const SfxItemSet aOldSet;
@@ -111,11 +111,11 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
             E3dObject* pInObject,
             const SfxItemSet& rNewSet,
             const SfxItemSet& rOldSet,
-            BOOL bUseSubObj);
+            sal_Bool bUseSubObj);
 
         virtual ~E3dAttributesUndoAction();
 
-        virtual BOOL CanRepeat(SfxRepeatTarget& rView) const;
+        virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
         virtual void Undo();
         virtual void Redo();
         virtual void Repeat();
diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx
index f429742be448..0d4372fba6a3 100644
--- a/svx/inc/svx/extrud3d.hxx
+++ b/svx/inc/svx/extrud3d.hxx
@@ -89,7 +89,7 @@ public:
     sal_Bool GetCloseBack() const
         { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); }
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 
     virtual void operator=(const SdrObject&);
 
@@ -102,7 +102,7 @@ public:
     const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; }
 
     // Aufbrechen
-    virtual BOOL IsBreakObjPossible();
+    virtual sal_Bool IsBreakObjPossible();
     virtual SdrAttrObj* GetBreakObj();
 };
 
diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx
index ff4a53e65a41..a592d8646a6f 100644
--- a/svx/inc/svx/extrusioncolorcontrol.hxx
+++ b/svx/inc/svx/extrusioncolorcontrol.hxx
@@ -41,10 +41,10 @@ private:
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    ExtrusionColorControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~ExtrusionColorControl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx
index 853280d16f28..ebc85d1fc6c5 100644
--- a/svx/inc/svx/f3dchild.hxx
+++ b/svx/inc/svx/f3dchild.hxx
@@ -42,7 +42,7 @@
 class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow
 {
  public:
-    Svx3DChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    Svx3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW(Svx3DChildWindow);
 };
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index 51ee743ca093..ebca73fc7a06 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -61,17 +61,17 @@ private:
     SvxFillTypeBox*     pFillTypeLB;
     SvxFillAttrBox*     pFillAttrLB;
 
-    BOOL                bUpdate;
-    BOOL                bIgnoreStatusUpdate;
-    USHORT              eLastXFS;
+    sal_Bool                bUpdate;
+    sal_Bool                bIgnoreStatusUpdate;
+    sal_uInt16              eLastXFS;
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFillToolBoxControl();
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     void                Update( const SfxPoolItem* pState );
     virtual Window*     CreateItemWindow( Window *pParent );
diff --git a/svx/inc/svx/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx
index 43fd292ddb36..9a6ca6f838e6 100644
--- a/svx/inc/svx/flagsdef.hxx
+++ b/svx/inc/svx/flagsdef.hxx
@@ -45,13 +45,13 @@
 #define SVX_HIDESHADOWCTL   0x01
 
 //CHINA001 copy from chardlg.hxx
-#define DISABLE_CASEMAP             ((USHORT)0x0001)
-#define DISABLE_WORDLINE            ((USHORT)0x0002)
-#define DISABLE_BLINK               ((USHORT)0x0004)
-#define DISABLE_UNDERLINE_COLOR     ((USHORT)0x0008)
+#define DISABLE_CASEMAP             ((sal_uInt16)0x0001)
+#define DISABLE_WORDLINE            ((sal_uInt16)0x0002)
+#define DISABLE_BLINK               ((sal_uInt16)0x0004)
+#define DISABLE_UNDERLINE_COLOR     ((sal_uInt16)0x0008)
 
-#define DISABLE_LANGUAGE            ((USHORT)0x0010)
-#define DISABLE_HIDE_LANGUAGE       ((USHORT)0x0020)
+#define DISABLE_LANGUAGE            ((sal_uInt16)0x0010)
+#define DISABLE_HIDE_LANGUAGE       ((sal_uInt16)0x0020)
 
 //CHINA001 flags for SvxCharBasePage's child class
 #define SVX_PREVIEW_CHARACTER   0x01
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 4b6fd22b2587..13eb8a697de0 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -201,7 +201,7 @@ private:
 // der Rest ...
     Image               aImgLightOn;
     Image               aImgLightOff;
-    BOOL                bUpdate;
+    sal_Bool                bUpdate;
     ViewType3D          eViewType;
     Size                aSize;
 
@@ -226,7 +226,7 @@ private:
     // ItemSet used to remember set 2d attributes
     SfxItemSet*         mpRemember2DAttributes;
 
-    BOOL                bOnly3DChanged;
+    sal_Bool                bOnly3DChanged;
 
     //------------------------------------
 
@@ -247,8 +247,8 @@ private:
     SVX_DLLPRIVATE void         Construct();
     SVX_DLLPRIVATE void         Reset();
 
-    SVX_DLLPRIVATE BOOL         LBSelectColor( ColorLB* pLb, const Color& rColor );
-    SVX_DLLPRIVATE USHORT           GetLightSource( const PushButton* pBtn = NULL );
+    SVX_DLLPRIVATE sal_Bool         LBSelectColor( ColorLB* pLb, const Color& rColor );
+    SVX_DLLPRIVATE sal_uInt16           GetLightSource( const PushButton* pBtn = NULL );
     SVX_DLLPRIVATE ColorLB*     GetLbByButton( const PushButton* pBtn = NULL );
 
     SVX_DLLPRIVATE bool         GetUILightState( ImageButton& aBtn ) const;
@@ -263,7 +263,7 @@ public:
             ~Svx3DWin();
 
     void    InitColorLB( const SdrModel* pDoc );
-    BOOL    IsUpdateMode() const { return bUpdate; }
+    sal_Bool    IsUpdateMode() const { return bUpdate; }
 
     void    Update( SfxItemSet& rSet );
     void    GetAttr( SfxItemSet& rSet );
@@ -283,11 +283,11 @@ class Svx3DCtrlItem : public SfxControllerItem
     Svx3DWin* p3DWin;
 
  protected:
-    virtual void StateChanged( USHORT nSId, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
                                 const SfxPoolItem* pState );
 
  public:
-    Svx3DCtrlItem( USHORT, Svx3DWin*, SfxBindings* );
+    Svx3DCtrlItem( sal_uInt16, Svx3DWin*, SfxBindings* );
 };
 
 /*************************************************************************
@@ -299,14 +299,14 @@ class Svx3DCtrlItem : public SfxControllerItem
 
 class SvxConvertTo3DItem : public SfxControllerItem
 {
-    BOOL                        bState;
+    sal_Bool                        bState;
 
 protected:
-    virtual void StateChanged(UINT16 nSId, SfxItemState eState, const SfxPoolItem* pState);
+    virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState);
 
 public:
-    SvxConvertTo3DItem(UINT16 nId, SfxBindings* pBindings);
-    BOOL GetState() const { return bState; }
+    SvxConvertTo3DItem(sal_uInt16 nId, SfxBindings* pBindings);
+    sal_Bool GetState() const { return bState; }
 };
 
 #endif      // _SVX_FLOAT3D_HXX
diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx
index 9d8ad2ca9e64..b5308510229a 100644
--- a/svx/inc/svx/fmmodel.hxx
+++ b/svx/inc/svx/fmmodel.hxx
@@ -69,7 +69,7 @@ public:
     virtual SdrPage* AllocPage(FASTBOOL bMasterPage);
     virtual void     InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
     virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
-    virtual void     MovePage(USHORT nPgNum, USHORT nNewPos);
+    virtual void     MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
     virtual void     InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
     virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
 
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 4195f776f3c2..d50187f7b81b 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -61,10 +61,10 @@ public:
     virtual SdrPage* Clone() const;
     using SdrPage::Clone;
 
-    virtual void    InsertObject(SdrObject* pObj, ULONG nPos = CONTAINER_APPEND,
+    virtual void    InsertObject(SdrObject* pObj, sal_uLong nPos = CONTAINER_APPEND,
                                     const SdrInsertReason* pReason=NULL);
 
-    virtual SdrObject* RemoveObject(ULONG nObjNum);
+    virtual SdrObject* RemoveObject(sal_uLong nObjNum);
 
     // Zugriff auf alle Formulare
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const;
diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index 34f0ea62a8bf..52fa30650184 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -97,8 +97,8 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats,
         sal_uInt16 _nControlObjectID,
         const ::rtl::OUString& _rFieldPostfix,
-        UINT32 _nInventor,
-        UINT16 _nLabelObjectID,
+        sal_uInt32 _nInventor,
+        sal_uInt16 _nLabelObjectID,
         SdrPage* _pLabelPage,
         SdrPage* _pControlPage,
         SdrModel* _pModel,
@@ -114,7 +114,7 @@ public:
     using E3dView::Paste;
     virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
 
-    virtual BOOL MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
+    virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
 
     /** grab the focus to the first form control on the view
         @param _bForceSync
@@ -128,7 +128,7 @@ public:
             GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
 
     // SdrView
-    BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
+    sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
 
     /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL"
     FmFormPage* GetCurPage();
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index f28e158df1df..57bcdc0c6705 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -49,13 +49,13 @@ private:
 //#if 0 // _SOLAR__PRIVATE
     SVX_DLLPRIVATE void         FillMenu();
     DECL_LINK( MenuSelect, FontNameMenu * );
-    SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState,
+    SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     SVX_DLLPRIVATE virtual void     Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 //#endif
 
 public:
-    SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& );
+    SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
     ~SvxFontMenuControl();
 
     virtual PopupMenu*  GetPopup() const;
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 2b49e413e7be..4be1173db44c 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SvxFontPrevWindow : public Window
 private:
     FontPrevWin_Impl*   pImpl;
 
-    SVX_DLLPRIVATE void             InitSettings( BOOL bForeground, BOOL bBackground );
+    SVX_DLLPRIVATE void             InitSettings( sal_Bool bForeground, sal_Bool bBackground );
 
 public:
                         SvxFontPrevWindow( Window* pParent, const ResId& rId );
@@ -70,15 +70,15 @@ public:
     void                SetColor( const Color& rColor );
     void                ResetColor();
     void                SetBackColor( const Color& rColor );
-    void                UseResourceText( BOOL bUse = TRUE );
+    void                UseResourceText( sal_Bool bUse = sal_True );
     void                Paint( const Rectangle& );
 
-    BOOL                IsTwoLines() const;
-    void                SetTwoLines(BOOL bSet);
+    sal_Bool                IsTwoLines() const;
+    void                SetTwoLines(sal_Bool bSet);
 
     void                SetBrackets(sal_Unicode cStart, sal_Unicode cEnd);
 
-    void                SetFontWidthScale( UINT16 nScaleInPercent );
+    void                SetFontWidthScale( sal_uInt16 nScaleInPercent );
 
     void                AutoCorrectFontColor( void );
 
diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx
index dfeec808e602..9ae8da4a27d7 100644
--- a/svx/inc/svx/fntszctl.hxx
+++ b/svx/inc/svx/fntszctl.hxx
@@ -51,11 +51,11 @@ private:
 //#endif
 
 protected:
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 
 public:
-    SvxFontSizeMenuControl( USHORT nId, Menu&, SfxBindings& );
+    SvxFontSizeMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
     ~SvxFontSizeMenuControl();
 
     virtual PopupMenu*  GetPopup() const;
diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index 813b01ba390f..8051eded95b6 100644
--- a/svx/inc/svx/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
@@ -96,7 +96,7 @@ public:
     void                        SetNoSelection();
 
     /** Returns the position of the entry currently selected or LIST_APPEND. */
-    ULONG                       GetSelectEntryPos() const;
+    sal_uLong                       GetSelectEntryPos() const;
     /** Returns the text of the selected entry or an empty string. */
     XubString                   GetSelectEntry() const;
 
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 73f0ac5dd712..2e696fdaaee6 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -73,11 +73,11 @@ class SvxFontWorkControllerItem : public SfxControllerItem
     SvxFontWorkDialog  &rFontWorkDlg;
 
 protected:
-    virtual void StateChanged(USHORT nSID, SfxItemState eState,
+    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
                               const SfxPoolItem* pState);
 
 public:
-    SvxFontWorkControllerItem(USHORT nId, SvxFontWorkDialog&, SfxBindings&);
+    SvxFontWorkControllerItem(sal_uInt16 nId, SvxFontWorkDialog&, SfxBindings&);
 };
 
 /*************************************************************************
@@ -89,7 +89,7 @@ public:
 class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
 {
  public:
-    SvxFontWorkChildWindow(Window*, USHORT, SfxBindings*, SfxChildWinInfo*);
+    SvxFontWorkChildWindow(Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*);
     SFX_DECL_CHILDWINDOW(SvxFontWorkChildWindow);
 };
 
@@ -126,11 +126,11 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
 
     SfxBindings&    rBindings;
     Timer           aInputTimer;
-    BOOL            bUserZoomedIn;
+    sal_Bool            bUserZoomedIn;
 
-    USHORT          nLastStyleTbxId;
-    USHORT          nLastAdjustTbxId;
-    USHORT          nLastShadowTbxId;
+    sal_uInt16          nLastStyleTbxId;
+    sal_uInt16          nLastAdjustTbxId;
+    sal_uInt16          nLastShadowTbxId;
     long            nSaveShadowX;
     long            nSaveShadowY;
     long            nSaveShadowAngle;
@@ -164,7 +164,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     void SetShowForm_Impl(const XFormTextHideFormItem*);
     void SetOutline_Impl(const XFormTextOutlineItem*);
     void SetShadow_Impl(const XFormTextShadowItem*,
-                        BOOL bRestoreValues = FALSE);
+                        sal_Bool bRestoreValues = sal_False);
     void SetShadowColor_Impl(const XFormTextShadowColorItem*);
     void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
     void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
@@ -186,7 +186,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     ~SvxFontWorkDialog();
 
     void SetColorTable(const XColorTable* pTable);
-    void SetActive(BOOL bActivate = TRUE);
+    void SetActive(sal_Bool bActivate = sal_True);
 
     void CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
                           const SfxItemSet& rAttr, SdrObject& rOldObj,
diff --git a/svx/inc/svx/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx
index 40ac3cef966a..36502ccecca5 100644
--- a/svx/inc/svx/fontworkgallery.hxx
+++ b/svx/inc/svx/fontworkgallery.hxx
@@ -63,10 +63,10 @@ class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~FontWorkShapeTypeControl();
 
-    virtual void                Select( BOOL bMod1 = FALSE );
+    virtual void                Select( sal_Bool bMod1 = sal_False );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
 };
diff --git a/svx/inc/svx/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx
index b380e051daf8..9f06a58c8b1d 100644
--- a/svx/inc/svx/formatpaintbrushctrl.hxx
+++ b/svx/inc/svx/formatpaintbrushctrl.hxx
@@ -49,14 +49,14 @@ class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    FormatPaintBrushToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~FormatPaintBrushToolBoxControl();
 
     virtual void    DoubleClick();
     virtual void    Click();
-    virtual void    Select( BOOL bMod1 = FALSE );
+    virtual void    Select( sal_Bool bMod1 = sal_False );
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 private:
     DECL_LINK( WaitDoubleClickHdl, void* );
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx
index b342c58809bb..2b2613226b85 100644
--- a/svx/inc/svx/frmsel.hxx
+++ b/svx/inc/svx/frmsel.hxx
@@ -128,7 +128,7 @@ public:
     /** Returns true, if all visible frame borders have equal widths.
         @descr  Ignores hidden and "don't care" frame borders. On success,
         returns the widths in the passed parameters. */
-    bool                GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSec ) const;
+    bool                GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSec ) const;
     /** Returns true, if all visible frame borders have equal color.
         @descr  Ignores hidden and "don't care" frame borders. On success,
         returns the color in the passed parameter. */
@@ -159,7 +159,7 @@ public:
     void                SelectAllVisibleBorders( bool bSelect = true );
 
     /** Sets the passed line widths to all selected frame borders (in twips). */
-    void                SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSec );
+    void                SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSec );
     /** Sets the passed color to all selected frame borders. */
     void                SetColorToSelection( const Color& rColor );
 
diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index f54901db543d..1a19e773baa9 100644
--- a/svx/inc/svx/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
@@ -47,7 +47,7 @@
 class SVX_DLLPUBLIC GalleryChildWindow : public SfxChildWindow
 {
 public:
-                        GalleryChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+                        GalleryChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
                         ~GalleryChildWindow();
 
                         SFX_DECL_CHILDWINDOW( GalleryChildWindow );
@@ -88,7 +88,7 @@ private:
 
     void                    InitSettings();
 
-    virtual BOOL            Close();
+    virtual sal_Bool            Close();
     virtual void            Resize();
     virtual void            GetFocus();
 
@@ -107,10 +107,10 @@ public:
     INetURLObject           GetURL() const;
     String                  GetFilterName() const;
     Graphic                 GetGraphic() const;
-    BOOL                    GetVCDrawModel( FmFormModel& rModel ) const;
-    BOOL                    IsLinkage() const;
+    sal_Bool                    GetVCDrawModel( FmFormModel& rModel ) const;
+    sal_Bool                    IsLinkage() const;
 
-    BOOL                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
+    sal_Bool                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
 };
 
 #endif // _SVX_GALBRWS_HXX_
diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx
index 3acf53dbeddb..53fce03cd6c9 100644
--- a/svx/inc/svx/galctrl.hxx
+++ b/svx/inc/svx/galctrl.hxx
@@ -65,7 +65,7 @@ private:
     Rectangle           aPreviewRect;
     GalleryTheme*       mpTheme;
 
-    SVX_DLLPRIVATE BOOL             ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
+    SVX_DLLPRIVATE sal_Bool             ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
     SVX_DLLPRIVATE void                InitSettings();
 
     // Window
@@ -145,14 +145,14 @@ private:
 
     Link                maSelectHdl;
     GalleryTheme*       mpTheme;
-    ULONG               mnCurRow;
-    BOOL                mbInit;
+    sal_uIntPtr               mnCurRow;
+    sal_Bool                mbInit;
 
     void                InitSettings();
 
     // BrowseBox
-    virtual BOOL        SeekRow( long nRow );
-    virtual void        PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const;
+    virtual sal_Bool        SeekRow( long nRow );
+    virtual void        PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const;
     virtual void        DoubleClick( const BrowserMouseEvent& rEvt );
     virtual void        Select();
     virtual sal_Int8    AcceptDrop( const BrowserAcceptDropEvent& rEvt );
@@ -181,7 +181,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual String  GetCellText(long _nRow, USHORT _nColId) const;
+    virtual String  GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
     // from IAccessibleTableProvider
     virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index 68a5c68539f1..d87d93f8cc22 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -118,57 +118,57 @@ public:
     INetURLObject               GetURL() const;
     String                      GetFilterName() const;
     Graphic                     GetGraphic() const;
-    BOOL                        GetVCDrawModel( FmFormModel& rModel ) const;
-    BOOL                        IsLinkage() const;
+    sal_Bool                        GetVCDrawModel( FmFormModel& rModel ) const;
+    sal_Bool                        IsLinkage() const;
 
-    static BOOL                 FillThemeList( List& rThemeList );
+    static sal_Bool                 FillThemeList( List& rThemeList );
 
                                 // FillObjList is filling rObjList with Strings of the internal Gallery Object URL
-    static BOOL                 FillObjList( const String& rThemeName, List& rObjList );
-    static BOOL                 FillObjList( ULONG nThemeId, List& rObjList );
+    static sal_Bool                 FillObjList( const String& rThemeName, List& rObjList );
+    static sal_Bool                 FillObjList( sal_uIntPtr nThemeId, List& rObjList );
 
                                 // FillObjTitleList is filling the rList with the title for each gallery object
     static sal_Bool             FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList );
 
-    static BOOL                 InsertURL( const String& rThemeName, const String& rURL );
-    static BOOL                 InsertURL( ULONG nThemeId, const String& rURL );
+    static sal_Bool                 InsertURL( const String& rThemeName, const String& rURL );
+    static sal_Bool                 InsertURL( sal_uIntPtr nThemeId, const String& rURL );
 
-    static BOOL                 InsertURL( const String& rThemeName, const String& rURL,
-                                           const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ );
-    static BOOL                 InsertURL( ULONG nThemeId, const String& rURL,
-                                           const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ );
+    static sal_Bool                 InsertURL( const String& rThemeName, const String& rURL,
+                                           const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
+    static sal_Bool                 InsertURL( sal_uIntPtr nThemeId, const String& rURL,
+                                           const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
 
-    static ULONG                GetObjCount( const String& rThemeName );
-    static ULONG                GetObjCount( ULONG nThemeId );
+    static sal_uIntPtr              GetObjCount( const String& rThemeName );
+    static sal_uIntPtr              GetObjCount( sal_uIntPtr nThemeId );
 
-    static BOOL                 GetGraphicObj( const String& rThemeName, ULONG nPos,
+    static sal_Bool                 GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
                                                Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
-                                               BOOL bProgess = FALSE );
-    static BOOL                 GetGraphicObj( ULONG nThemeId, ULONG nPos,
+                                               sal_Bool bProgess = sal_False );
+    static sal_Bool                 GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
                                                Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
-                                               BOOL bProgess = FALSE );
+                                               sal_Bool bProgess = sal_False );
 
-    static BOOL                 InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic );
-    static BOOL                 InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic );
+    static sal_Bool                 InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic );
+    static sal_Bool                 InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic );
 
-    static ULONG                GetSdrObjCount( const String& rThemeName );
-    static ULONG                GetSdrObjCount( ULONG nThemeId );
+    static sal_uIntPtr              GetSdrObjCount( const String& rThemeName );
+    static sal_uIntPtr              GetSdrObjCount( sal_uIntPtr nThemeId );
 
-    static BOOL                 GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
+    static sal_Bool                 GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos,
                                            SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
-    static BOOL                 GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos,
+    static sal_Bool                 GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
                                            SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
 
-    static BOOL                 InsertSdrObj( const String& rThemeName, FmFormModel& rModel );
-    static BOOL                 InsertSdrObj( ULONG nThemeId, FmFormModel& rModel );
+    static sal_Bool                 InsertSdrObj( const String& rThemeName, FmFormModel& rModel );
+    static sal_Bool                 InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel );
 
-    static BOOL                 BeginLocking( const String& rThemeName );
-    static BOOL                 BeginLocking( ULONG nThemeId );
+    static sal_Bool                 BeginLocking( const String& rThemeName );
+    static sal_Bool                 BeginLocking( sal_uIntPtr nThemeId );
 
-    static BOOL                 EndLocking( const String& rThemeName );
-    static BOOL                 EndLocking( ULONG nThemeId );
+    static sal_Bool                 EndLocking( const String& rThemeName );
+    static sal_Bool                 EndLocking( sal_uIntPtr nThemeId );
 
-    static BOOL                 DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
+    static sal_Bool                 DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
 };
 
 #endif // _GALLERY_HXX_
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 7b58456a8889..40888a095536 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -52,12 +52,12 @@ private:
     INetURLObject           aThmURL;
     INetURLObject           aSdgURL;
     INetURLObject           aSdvURL;
-    UINT32                  nFileNumber;
-    UINT32                  nId;
-    BOOL                    bReadOnly;
-    BOOL                    bImported;
-    BOOL                    bModified;
-    BOOL                    bThemeNameFromResource;
+    sal_uInt32                  nFileNumber;
+    sal_uInt32                  nId;
+    sal_Bool                    bReadOnly;
+    sal_Bool                    bImported;
+    sal_Bool                    bModified;
+    sal_Bool                    bThemeNameFromResource;
 
                             GalleryThemeEntry();
     INetURLObject           ImplGetURLIgnoreCase( const INetURLObject& rURL ) const;
@@ -65,31 +65,31 @@ private:
 public:
 
                             GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
-                                               UINT32 nFileNumber, BOOL bReadOnly, BOOL bImported,
-                                               BOOL bNewFile, UINT32 nId, BOOL bThemeNameFromResource );
+                                               sal_uInt32 nFileNumber, sal_Bool bReadOnly, sal_Bool bImported,
+                                               sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource );
                             ~GalleryThemeEntry() {};
 
     const String&           GetThemeName() const { return aName; }
-    UINT32                  GetFileNumber() const { return nFileNumber; }
+    sal_uInt32                  GetFileNumber() const { return nFileNumber; }
 
     const INetURLObject&    GetThmURL() const { return aThmURL; }
     const INetURLObject&    GetSdgURL() const { return aSdgURL; }
     const INetURLObject&    GetSdvURL() const { return aSdvURL; }
 
-    BOOL                    IsImported() const { return bImported; }
-    BOOL                    IsReadOnly() const { return bReadOnly; }
-    BOOL                    IsDefault() const;
+    sal_Bool                    IsImported() const { return bImported; }
+    sal_Bool                    IsReadOnly() const { return bReadOnly; }
+    sal_Bool                    IsDefault() const;
 
-    BOOL                    IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
+    sal_Bool                    IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
 
-    BOOL                    IsModified() const { return bModified; }
-    void                    SetModified( BOOL bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
+    sal_Bool                    IsModified() const { return bModified; }
+    void                    SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
 
     void                    SetName( const String& rNewName );
-    BOOL                    IsNameFromResource() const { return bThemeNameFromResource; }
+    sal_Bool                    IsNameFromResource() const { return bThemeNameFromResource; }
 
-    UINT32                  GetId() const { return nId; }
-    void                    SetId( UINT32 nNewId, BOOL bResetThemeName );
+    sal_uInt32                  GetId() const { return nId; }
+    void                    SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
 };
 
 DECLARE_LIST( GalleryThemeList, GalleryThemeEntry* )
@@ -133,8 +133,8 @@ private:
     INetURLObject               aRelURL;
     INetURLObject               aUserURL;
     rtl_TextEncoding            nReadTextEncoding;
-    ULONG                       nLastFileNumber;
-    BOOL                        bMultiPath;
+    sal_uIntPtr                     nLastFileNumber;
+    sal_Bool                        bMultiPath;
 
     void                        ImplLoad( const String& rMultiPath );
     void                        ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly );
@@ -142,7 +142,7 @@ private:
     void                        ImplWriteImportList();
 
     SVX_DLLPUBLIC GalleryThemeEntry*            ImplGetThemeEntry( const String& rThemeName );
-    GalleryThemeEntry*          ImplGetThemeEntry( ULONG nThemeId );
+    GalleryThemeEntry*          ImplGetThemeEntry( sal_uIntPtr nThemeId );
     GalleryImportThemeEntry*    ImplGetImportThemeEntry( const String& rImportName );
 
     GalleryTheme*               ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry );
@@ -155,17 +155,17 @@ public:
 
     SVX_DLLPUBLIC static Gallery* GetGalleryInstance();
 
-    ULONG                   GetThemeCount() const { return aThemeList.Count(); }
-    const GalleryThemeEntry*    GetThemeInfo( ULONG nPos ) { return aThemeList.GetObject( nPos ); }
+    sal_uIntPtr                 GetThemeCount() const { return aThemeList.Count(); }
+    const GalleryThemeEntry*    GetThemeInfo( sal_uIntPtr nPos ) { return aThemeList.GetObject( nPos ); }
     const GalleryThemeEntry*    GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
 
-    SVX_DLLPUBLIC BOOL          HasTheme( const String& rThemeName );
-    String                      GetThemeName( ULONG nThemeId ) const;
+    SVX_DLLPUBLIC sal_Bool          HasTheme( const String& rThemeName );
+    String                      GetThemeName( sal_uIntPtr nThemeId ) const;
 
-    SVX_DLLPUBLIC BOOL          CreateTheme( const String& rThemeName, UINT32 nNumFrom = 0 );
-    BOOL                        CreateImportTheme( const INetURLObject& rURL, const String& rFileName );
-    BOOL                        RenameTheme( const String& rOldName, const String& rNewName );
-    SVX_DLLPUBLIC BOOL                      RemoveTheme( const String& rThemeName );
+    SVX_DLLPUBLIC sal_Bool          CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 );
+    sal_Bool                        CreateImportTheme( const INetURLObject& rURL, const String& rFileName );
+    sal_Bool                        RenameTheme( const String& rOldName, const String& rNewName );
+    SVX_DLLPUBLIC sal_Bool                      RemoveTheme( const String& rThemeName );
 
     SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String& rThemeName, SfxListener& rListener );
     SVX_DLLPUBLIC void          ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener );
@@ -177,7 +177,7 @@ public:
     const INetURLObject&        GetUserURL() const { return aUserURL; }
     const INetURLObject&        GetRelativeURL() const { return aRelURL; }
 
-    BOOL                        IsMultiPath() const { return bMultiPath; }
+    sal_Bool                        IsMultiPath() const { return bMultiPath; }
 };
 
 #endif // _SVX_GALLERY1_HXX_
diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index dd8b08fc8fad..f807ca6908de 100644
--- a/svx/inc/svx/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -73,7 +73,7 @@ enum SgaObjKind
 // - Defines -
 // -----------
 
-#define IV_IMAPINFO             (UINT32('S')*0x00000001+UINT32('D')*0x00000100+UINT32('U')*0x00010000+UINT32('D')*0x01000000)
+#define IV_IMAPINFO             (sal_uInt32('S')*0x00000001+sal_uInt32('D')*0x00000100+sal_uInt32('U')*0x00010000+sal_uInt32('D')*0x01000000)
 #define ID_IMAPINFO             2
 
 #define USERDATA_HDL()          (LINK(this,SgaUserDataFactory,MakeUserData))
@@ -104,16 +104,16 @@ class ImageMap;
 class Gallery;
 
 SVX_DLLPUBLIC ResMgr*           GetGalleryResMgr();
-USHORT          GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, BOOL bShowProgress = FALSE );
-BOOL            GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
-BOOL            CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
-SVX_DLLPUBLIC String            GetReducedString( const INetURLObject& rURL, ULONG nMaxLen );
+sal_uInt16          GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, sal_Bool bShowProgress = sal_False );
+sal_Bool            GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
+sal_Bool            CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
+SVX_DLLPUBLIC String            GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen );
 String          GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL );
 
-BOOL            FileExists( const INetURLObject& rURL );
-BOOL            CreateDir(  const INetURLObject& rURL );
-BOOL            CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL );
-BOOL            KillFile( const INetURLObject& rURL );
+sal_Bool            FileExists( const INetURLObject& rURL );
+sal_Bool            CreateDir(  const INetURLObject& rURL );
+sal_Bool            CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL );
+sal_Bool            KillFile( const INetURLObject& rURL );
 BitmapEx        GalleryResGetBitmapEx( sal_uInt32 nId );
 
 
@@ -173,7 +173,7 @@ class SVX_DLLPUBLIC GalleryProgress
                                     GalleryProgress( GraphicFilter* pFilter = NULL );
                                     ~GalleryProgress();
 
-    void                            Update( ULONG nVal, ULONG nMaxVal );
+    void                            Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal );
 };
 
 // -----------------------
@@ -201,7 +201,7 @@ private:
 
 protected:
 
-                                    GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy );
+                                    GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy );
                                     ~GalleryTransferable();
 
     void                            InitData( bool bLazy );
@@ -238,25 +238,25 @@ class GalleryHint : public SfxHint
 {
 private:
 
-    ULONG           mnType;
+    sal_uIntPtr         mnType;
     String          maThemeName;
     String          maStringData;
-    ULONG           mnData1;
-    ULONG           mnData2;
+    sal_uIntPtr         mnData1;
+    sal_uIntPtr         mnData2;
 
 public:
 
-                    GalleryHint( ULONG nType, const String& rThemeName, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) :
+                    GalleryHint( sal_uIntPtr nType, const String& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
                         mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ), mnData2( nData2 ) {}
 
-                    GalleryHint( ULONG nType, const String& rThemeName, const String& rStringData, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) :
+                    GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
                         mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {}
 
-    ULONG           GetType() const { return mnType; }
+    sal_uIntPtr         GetType() const { return mnType; }
     const String&   GetThemeName() const { return maThemeName; }
     const String&   GetStringData() const { return maStringData; }
-    ULONG           GetData1() const { return mnData1; }
-    ULONG           GetData2() const { return mnData2; }
+    sal_uIntPtr         GetData1() const { return mnData1; }
+    sal_uIntPtr         GetData2() const { return mnData2; }
 };
 
     #endif
diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx
index aa77bba25d26..566372ddb41b 100644
--- a/svx/inc/svx/galtheme.hxx
+++ b/svx/inc/svx/galtheme.hxx
@@ -56,7 +56,7 @@ struct GalleryObject
     INetURLObject   aURL;
     sal_uInt32      nOffset;
     SgaObjKind      eObjKind;
-    BOOL            bDummy;
+    sal_Bool            bDummy;
 };
 
 DECLARE_LIST( GalleryObjectList, GalleryObject* )
@@ -73,7 +73,7 @@ class ListBox;
 struct GalDragParams
 {
     Region      aDragRegion;
-    ULONG       nDragObjPos;
+    sal_uIntPtr     nDragObjPos;
     String      aThemeName;
     String      aFileName;
     SgaObjKind  eObjKind;
@@ -106,24 +106,24 @@ private:
     SotStorageRef               aSvDrawStorageRef;
     Gallery*                    pParent;
     GalleryThemeEntry*          pThm;
-    ULONG                       mnThemeLockCount;
-    ULONG                       mnBroadcasterLockCount;
-    ULONG                       nDragPos;
-    BOOL                        bDragging;
-    BOOL                        bAbortActualize;
+    sal_uIntPtr                       mnThemeLockCount;
+    sal_uIntPtr                     mnBroadcasterLockCount;
+    sal_uIntPtr                     nDragPos;
+    sal_Bool                        bDragging;
+    sal_Bool                        bAbortActualize;
 
     void                        ImplCreateSvDrawStorage();
     SVX_DLLPUBLIC SgaObject*                    ImplReadSgaObject( GalleryObject* pEntry );
-    BOOL                        ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry );
+    sal_Bool                        ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry );
     void                        ImplRead();
     void                        ImplWrite();
-    const GalleryObject*        ImplGetGalleryObject( ULONG nPos ) const { return aObjectList.GetObject( nPos ); }
+    const GalleryObject*        ImplGetGalleryObject( sal_uIntPtr nPos ) const { return aObjectList.GetObject( nPos ); }
     SVX_DLLPUBLIC const GalleryObject*      ImplGetGalleryObject( const INetURLObject& rURL );
-    ULONG                       ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); }
+    sal_uIntPtr                     ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); }
     INetURLObject               ImplGetURL( const GalleryObject* pObject ) const;
-    INetURLObject               ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN );
-    void                        ImplSetModified( BOOL bModified );
-    void                        ImplBroadcast( ULONG nUpdatePos );
+    INetURLObject               ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN );
+    void                        ImplSetModified( sal_Bool bModified );
+    void                        ImplBroadcast( sal_uIntPtr nUpdatePos );
 
                                 GalleryTheme();
                                 GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry );
@@ -131,16 +131,16 @@ private:
 
 public:
 
-    static GalleryThemeEntry*   CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly );
+    static GalleryThemeEntry*   CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly );
 
-    ULONG                   GetObjectCount() const { return aObjectList.Count(); }
+    sal_uIntPtr                 GetObjectCount() const { return aObjectList.Count(); }
 
-    SVX_DLLPUBLIC SgaObject*                    AcquireObject( ULONG nPos );
+    SVX_DLLPUBLIC SgaObject*                    AcquireObject( sal_uIntPtr nPos );
     SVX_DLLPUBLIC void                      ReleaseObject( SgaObject* pObj );
 
-    SVX_DLLPUBLIC BOOL                      InsertObject( const SgaObject& rObj, ULONG nPos = LIST_APPEND );
-    SVX_DLLPUBLIC BOOL                      RemoveObject( ULONG nPos );
-    BOOL                        ChangeObjectPos( ULONG nOldPos, ULONG nNewPos );
+    SVX_DLLPUBLIC sal_Bool                      InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND );
+    SVX_DLLPUBLIC sal_Bool                      RemoveObject( sal_uIntPtr nPos );
+    sal_Bool                        ChangeObjectPos( sal_uIntPtr nOldPos, sal_uIntPtr nNewPos );
 
     SVX_DLLPUBLIC const String& GetName() const;
     const String&               GetRealName() const;
@@ -154,69 +154,69 @@ public:
     SVX_DLLPUBLIC const INetURLObject&      GetSdgURL() const;
     const INetURLObject&        GetSdvURL() const;
 
-    SVX_DLLPUBLIC UINT32        GetId() const;
-    void                        SetId( UINT32 nNewId, BOOL bResetThemeName );
+    SVX_DLLPUBLIC sal_uInt32        GetId() const;
+    void                        SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
 
-    void                        SetDragging( BOOL bSet ) { bDragging = bSet; }
-    BOOL                        IsDragging() const { return bDragging; }
+    void                        SetDragging( sal_Bool bSet ) { bDragging = bSet; }
+    sal_Bool                        IsDragging() const { return bDragging; }
 
     void                        LockTheme() { ++mnThemeLockCount; }
-    BOOL                        UnlockTheme();
+    sal_Bool                        UnlockTheme();
 
     void                        LockBroadcaster() { mnBroadcasterLockCount++; }
-    SVX_DLLPUBLIC void          UnlockBroadcaster( ULONG nUpdatePos = 0 );
-    BOOL                        IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
+    SVX_DLLPUBLIC void          UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 );
+    sal_Bool                        IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
 
-    void                        SetDragPos( ULONG nPos ) { nDragPos = nPos; }
-    ULONG                       GetDragPos() const { return nDragPos; }
+    void                        SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; }
+    sal_uIntPtr                     GetDragPos() const { return nDragPos; }
 
-    BOOL                        IsThemeNameFromResource() const;
+    sal_Bool                        IsThemeNameFromResource() const;
 
-    SVX_DLLPUBLIC BOOL          IsImported() const;
-    SVX_DLLPUBLIC BOOL          IsReadOnly() const;
-    SVX_DLLPUBLIC BOOL          IsDefault() const;
-    BOOL                        IsModified() const;
+    SVX_DLLPUBLIC sal_Bool          IsImported() const;
+    SVX_DLLPUBLIC sal_Bool          IsReadOnly() const;
+    SVX_DLLPUBLIC sal_Bool          IsDefault() const;
+    sal_Bool                        IsModified() const;
 
     SVX_DLLPUBLIC void                      Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
-    void                        AbortActualize() { bAbortActualize = TRUE; }
+    void                        AbortActualize() { bAbortActualize = sal_True; }
 
     Gallery*                    GetParent() const { return pParent; }
     SotStorageRef               GetSvDrawStorage() const { return aSvDrawStorageRef; }
 
 public:
 
-    SgaObjKind                  GetObjectKind( ULONG nPos ) const
+    SgaObjKind                  GetObjectKind( sal_uIntPtr nPos ) const
                                 {
                                     DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" );
                                     return ImplGetGalleryObject( nPos )->eObjKind;
                                 }
 
 
-    const INetURLObject&        GetObjectURL( ULONG nPos ) const
+    const INetURLObject&        GetObjectURL( sal_uIntPtr nPos ) const
                                 {
                                     DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" );
                                     return ImplGetGalleryObject( nPos )->aURL;
                                 }
 
-    BOOL                        GetThumb( ULONG nPos, Bitmap& rBmp, BOOL bProgress = FALSE );
+    sal_Bool                        GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool bProgress = sal_False );
 
-    SVX_DLLPUBLIC BOOL                      GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress = FALSE );
-    SVX_DLLPUBLIC BOOL                      InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos = LIST_APPEND );
+    SVX_DLLPUBLIC sal_Bool                      GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress = sal_False );
+    SVX_DLLPUBLIC sal_Bool                      InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = LIST_APPEND );
 
-    SVX_DLLPUBLIC BOOL                      GetModel( ULONG nPos, SdrModel& rModel, BOOL bProgress = FALSE );
-    SVX_DLLPUBLIC BOOL                      InsertModel( const FmFormModel& rModel, ULONG nInsertPos = LIST_APPEND );
+    SVX_DLLPUBLIC sal_Bool                      GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool bProgress = sal_False );
+    SVX_DLLPUBLIC sal_Bool                      InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = LIST_APPEND );
 
-    BOOL                        GetModelStream( ULONG nPos, SotStorageStreamRef& rModelStreamRef, BOOL bProgress = FALSE );
-    BOOL                        InsertModelStream( const SotStorageStreamRef& rModelStream, ULONG nInsertPos = LIST_APPEND );
+    sal_Bool                        GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, sal_Bool bProgress = sal_False );
+    sal_Bool                        InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = LIST_APPEND );
 
-    BOOL                        GetURL( ULONG nPos, INetURLObject& rURL, BOOL bProgress = FALSE );
-    SVX_DLLPUBLIC BOOL                      InsertURL( const INetURLObject& rURL, ULONG nInsertPos = LIST_APPEND );
-    BOOL                        InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos = LIST_APPEND );
+    sal_Bool                        GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool bProgress = sal_False );
+    SVX_DLLPUBLIC sal_Bool                      InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = LIST_APPEND );
+    sal_Bool                        InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = LIST_APPEND );
 
-    BOOL                        InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos );
+    sal_Bool                        InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos );
 
-    void                        CopyToClipboard( Window* pWindow, ULONG nPos );
-    void                        StartDrag( Window* pWindow, ULONG nPos );
+    void                        CopyToClipboard( Window* pWindow, sal_uIntPtr nPos );
+    void                        StartDrag( Window* pWindow, sal_uIntPtr nPos );
 
 public:
 
diff --git a/svx/inc/svx/globl3d.hxx b/svx/inc/svx/globl3d.hxx
index 1560f96dc1f5..7445259d9989 100644
--- a/svx/inc/svx/globl3d.hxx
+++ b/svx/inc/svx/globl3d.hxx
@@ -35,19 +35,19 @@
 
 const double PrecisionLimit = 1.0e-14;
 
-const UINT32 E3dInventor = UINT32('E')*0x00000001+
-                           UINT32('3')*0x00000100+
-                           UINT32('D')*0x00010000+
-                           UINT32('1')*0x01000000;
+const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+
+                           sal_uInt32('3')*0x00000100+
+                           sal_uInt32('D')*0x00010000+
+                           sal_uInt32('1')*0x01000000;
 
-const UINT16 E3D_SCENE_ID       = 1;
-const UINT16 E3D_POLYSCENE_ID   = 2;
-const UINT16 E3D_OBJECT_ID      = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject
-const UINT16 E3D_CUBEOBJ_ID     = 4;
-const UINT16 E3D_SPHEREOBJ_ID   = 5;
-const UINT16 E3D_EXTRUDEOBJ_ID  = 6;
-const UINT16 E3D_LATHEOBJ_ID    = 7;
-const UINT16 E3D_COMPOUNDOBJ_ID = 8;
-const UINT16 E3D_POLYGONOBJ_ID  = 9;
+const sal_uInt16 E3D_SCENE_ID       = 1;
+const sal_uInt16 E3D_POLYSCENE_ID   = 2;
+const sal_uInt16 E3D_OBJECT_ID      = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject
+const sal_uInt16 E3D_CUBEOBJ_ID     = 4;
+const sal_uInt16 E3D_SPHEREOBJ_ID   = 5;
+const sal_uInt16 E3D_EXTRUDEOBJ_ID  = 6;
+const sal_uInt16 E3D_LATHEOBJ_ID    = 7;
+const sal_uInt16 E3D_COMPOUNDOBJ_ID = 8;
+const sal_uInt16 E3D_POLYGONOBJ_ID  = 9;
 
 #endif      // _E3D_GLOBL3D_HXX
diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index 0c68f73f48f6..bd63bae43cf4 100644
--- a/svx/inc/svx/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
@@ -41,7 +41,7 @@ class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            TbxImageItem( USHORT nWhich = 0, UINT16 nImage = 0 );
+                            TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 );
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
@@ -57,10 +57,10 @@ public:
 
                                 SFX_DECL_TOOLBOX_CONTROL();
 
-                                SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                                SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
                                 ~SvxGrafFilterToolBoxControl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
 };
@@ -74,10 +74,10 @@ class SvxGrafToolBoxControl : public SfxToolBoxControl
 public:
 
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
                         ~SvxGrafToolBoxControl();
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window*     CreateItemWindow( Window *pParent );
 };
 
@@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // ------------------------------
@@ -100,7 +100,7 @@ class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafGreenToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // -----------------------------
@@ -111,7 +111,7 @@ class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // ----------------------------------
@@ -122,7 +122,7 @@ class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxContro
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // ---------------------------------
@@ -133,7 +133,7 @@ class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // ------------------------------
@@ -144,7 +144,7 @@ class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // -------------------------------------
@@ -155,7 +155,7 @@ class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxCon
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // -----------------------------
@@ -166,10 +166,10 @@ class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
                         ~SvxGrafModeToolBoxControl();
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window*     CreateItemWindow( Window *pParent );
 };
 
diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx
index f71f7fe6c43c..a06cbbab8aa6 100644
--- a/svx/inc/svx/graphctl.hxx
+++ b/svx/inc/svx/graphctl.hxx
@@ -65,10 +65,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
     GraphCtrlUserCall*  pUserCall;
     WinBits             nWinStyle;
     SdrObjKind          eObjKind;
-    USHORT              nPolyEdit;
-    BOOL                bEditMode;
-    BOOL                bSdrMode;
-    BOOL                bAnim;
+    sal_uInt16              nPolyEdit;
+    sal_Bool                bEditMode;
+    sal_Bool                bSdrMode;
+    sal_Bool                bAnim;
 
                         DECL_LINK( UpdateHdl, Timer* );
 
@@ -103,17 +103,17 @@ public:
     void                SetWinStyle( WinBits nWinBits );
     WinBits             GetWinStyle() const { return nWinStyle; }
 
-    void                SetGraphic( const Graphic& rGraphic, BOOL bNewModel = TRUE );
+    void                SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel = sal_True );
     const Graphic&      GetGraphic() const { return aGraphic; }
     const Size&         GetGraphicSize() const { return aGraphSize; }
 
     const Point&        GetMousePos() const { return aMousePos; }
 
-    void                SetEditMode( const BOOL bEditMode );
-    BOOL                IsEditMode() const { return bEditMode; }
+    void                SetEditMode( const sal_Bool bEditMode );
+    sal_Bool                IsEditMode() const { return bEditMode; }
 
-    void                SetPolyEditMode( const USHORT nPolyEdit );
-    USHORT              GetPolyEditMode() const { return nPolyEdit; }
+    void                SetPolyEditMode( const sal_uInt16 nPolyEdit );
+    sal_uInt16              GetPolyEditMode() const { return nPolyEdit; }
 
     void                SetObjKind( const SdrObjKind eObjKind );
     SdrObjKind          GetObjKind() const { return eObjKind; }
@@ -121,7 +121,7 @@ public:
     SdrModel*           GetSdrModel() const { return pModel; }
     SdrView*            GetSdrView() const { return pView; }
     SdrObject*          GetSelectedSdrObject() const;
-    BOOL                IsChanged() const { return bSdrMode ? pModel->IsChanged() : FALSE; }
+    sal_Bool                IsChanged() const { return bSdrMode ? pModel->IsChanged() : sal_False; }
 
     void                SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; }
     const Link&         GetMousePosLink() const { return aMousePosLink; }
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index fd4ccc175135..c382ca01e6eb 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -38,25 +38,25 @@ class SVX_DLLPUBLIC SvxGrfCrop : public SfxPoolItem
 {
     sal_Int32   nLeft, nRight, nTop, nBottom;
 public:
-    SvxGrfCrop( USHORT  );
+    SvxGrfCrop( sal_uInt16  );
     SvxGrfCrop( sal_Int32 nLeft,    sal_Int32 nRight,
                 sal_Int32 nTop,     sal_Int32 nBottom,
-                USHORT  );
+                sal_uInt16  );
     virtual ~SvxGrfCrop();
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int                 operator==( const SfxPoolItem& ) const;
-    virtual SfxPoolItem*        Create(SvStream &, USHORT nVer) const;
-    virtual SvStream&           Store(SvStream &, USHORT nIVer) const;
+    virtual SfxPoolItem*        Create(SvStream &, sal_uInt16 nVer) const;
+    virtual SvStream&           Store(SvStream &, sal_uInt16 nIVer) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
                                     const IntlWrapper* pIntl = 0 ) const;
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal,
+                                        sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal,
+                                        sal_uInt8 nMemberId = 0 );
 
     void SetLeft( sal_Int32 nVal )      { nLeft = nVal; }
     void SetRight( sal_Int32 nVal )     { nRight = nVal; }
diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx
index 88c31fe42d13..584245a78cf2 100644
--- a/svx/inc/svx/grfflt.hxx
+++ b/svx/inc/svx/grfflt.hxx
@@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SvxGraphicFilter
 {
 public:
 
-    static ULONG    ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
+    static sal_uLong    ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
     static void     DisableGraphicFilterSlots( SfxItemSet& rSet );
 };
 
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 445d986b2c5e..4efb5d2c86ad 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -288,7 +288,7 @@ private:
     sal_uInt16          m_nOptionMask;      // the mask of options to be enabled in setDataSource
                                         // (with respect to the data source capabilities)
                                         // defaults to (insert | update | delete)
-    USHORT              m_nLastColId;
+    sal_uInt16              m_nLastColId;
     long                m_nLastRowId;
 
     sal_Bool            m_bDesignMode : 1;      // default = sal_False
@@ -393,7 +393,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual String  GetCellText(long _nRow, USHORT _nColId) const;
+    virtual String  GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
     void RemoveRows(sal_Bool bNewCursor);
 
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index b3c425b85b93..adc4745ace83 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -54,21 +54,21 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage
 
 public:
 
-    virtual BOOL    FillItemSet( SfxItemSet& rOutSet );
+    virtual sal_Bool    FillItemSet( SfxItemSet& rOutSet );
     virtual void    Reset( const SfxItemSet& rSet );
 
     virtual         ~SvxHFPage();
 
-    void            DisableDeleteQueryBox() { bDisableQueryBox = TRUE; }
-    void            EnableBackgroundSelector( BOOL bNew ) { bEnableBackgroundSelector = bNew; }
+    void            DisableDeleteQueryBox() { bDisableQueryBox = sal_True; }
+    void            EnableBackgroundSelector( sal_Bool bNew ) { bEnableBackgroundSelector = bNew; }
     void            EnableDynamicSpacing();
 
 protected:
     virtual void    ActivatePage( const SfxItemSet& rSet );
     virtual int     DeactivatePage( SfxItemSet* pSet = 0 );
 
-    SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rSet,
-               USHORT nSetId );
+    SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rSet,
+               sal_uInt16 nSetId );
 
     CheckBox        aTurnOnBox;
     CheckBox        aCntSharedBox;
@@ -86,10 +86,10 @@ protected:
     SvxPageWindow   aBspWin;
     PushButton      aBackgroundBtn;
 
-    USHORT          nId;
+    sal_uInt16          nId;
     SfxItemSet*     pBBSet;
-    BOOL            bDisableQueryBox;
-    BOOL            bEnableBackgroundSelector;
+    sal_Bool            bDisableQueryBox;
+    sal_Bool            bEnableBackgroundSelector;
     FASTBOOL        bInReset;
 
     void            InitHandler();
@@ -114,7 +114,7 @@ class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
 {
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
 private:
     SvxHeaderPage( Window* pParent, const SfxItemSet& rSet );
@@ -126,7 +126,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
 {
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
 private:
     SVX_DLLPRIVATE SvxFooterPage(   Window* pParent, const SfxItemSet& rSet );
diff --git a/svx/inc/svx/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx
index b9540e8845ca..bdc0e1ff0e05 100644
--- a/svx/inc/svx/hlnkitem.hxx
+++ b/svx/inc/svx/hlnkitem.hxx
@@ -55,18 +55,18 @@ class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem
     String sIntName;
     SvxMacroTableDtor*  pMacroTable;
 
-    USHORT nMacroEvents;
+    sal_uInt16 nMacroEvents;
 
 public:
     TYPEINFO();
 
-    SvxHyperlinkItem( USHORT _nWhich = SID_HYPERLINK_GETLINK ):
+    SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ):
                 SfxPoolItem(_nWhich), pMacroTable(NULL) { eType = HLINK_DEFAULT; nMacroEvents=0; };
     SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem );
-    SvxHyperlinkItem( USHORT nWhich, String& rName, String& rURL,
+    SvxHyperlinkItem( sal_uInt16 nWhich, String& rName, String& rURL,
                                     String& rTarget, String& rIntName,
                                     SvxLinkInsertMode eTyp = HLINK_FIELD,
-                                    USHORT nEvents = 0,
+                                    sal_uInt16 nEvents = 0,
                                     SvxMacroTableDtor *pMacroTbl =NULL );
     virtual ~SvxHyperlinkItem () { delete pMacroTable; }
 
@@ -74,8 +74,8 @@ public:
 
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     const   String& GetName() const { return sName; }
     void    SetName(const String& rName) { sName = rName; }
@@ -92,16 +92,16 @@ public:
     SvxLinkInsertMode GetInsertMode() const { return eType; }
     void    SetInsertMode( SvxLinkInsertMode eNew ) { eType = eNew; }
 
-    void SetMacro( USHORT nEvent, const SvxMacro& rMacro );
+    void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
 
     void SetMacroTable( const SvxMacroTableDtor& rTbl );
     const SvxMacroTableDtor* GetMacroTbl() const    { return pMacroTable; }
 
-    void SetMacroEvents (const USHORT nEvents) { nMacroEvents = nEvents; }
-    USHORT GetMacroEvents() const { return nMacroEvents; }
+    void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; }
+    sal_uInt16 GetMacroEvents() const { return nMacroEvents; }
 
-    virtual SvStream&           Store( SvStream &, USHORT nItemVersion ) const;
-    virtual SfxPoolItem*        Create( SvStream &, USHORT nVer ) const;
+    virtual SvStream&           Store( SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual SfxPoolItem*        Create( SvStream &, sal_uInt16 nVer ) const;
 
 };
 
diff --git a/svx/inc/svx/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx
index fc129763e63f..f35df8dc73a8 100644
--- a/svx/inc/svx/hyperdlg.hxx
+++ b/svx/inc/svx/hyperdlg.hxx
@@ -47,7 +47,7 @@ private:
     AbstractSvxHpLinkDlg*   mpDlg;
 
 public:
-    SvxHlinkDlgWrapper( Window*pParent, USHORT nId,
+    SvxHlinkDlgWrapper( Window*pParent, sal_uInt16 nId,
                         SfxBindings* pBindings, SfxChildWinInfo* pInfo );
 
     SFX_DECL_CHILDWINDOW(SvxHlinkDlgWrapper);
diff --git a/svx/inc/svx/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx
index 0a5af0afae82..bb869f5e5cb5 100644
--- a/svx/inc/svx/hyprlink.hxx
+++ b/svx/inc/svx/hyprlink.hxx
@@ -34,7 +34,7 @@
 class SVX_DLLPUBLIC SvxHyperlinkDlgWrapper : public SfxChildWindow
 {
 public:
-    SvxHyperlinkDlgWrapper( Window*pParent, USHORT nId,
+    SvxHyperlinkDlgWrapper( Window*pParent, sal_uInt16 nId,
                             SfxBindings* pBindings, SfxChildWinInfo* pInfo );
     SFX_DECL_CHILDWINDOW(SvxHyperlinkDlgWrapper);
 };
diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index d1a6961453a5..7e82f0bc36e2 100644
--- a/svx/inc/svx/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
@@ -74,7 +74,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow
 {
  public:
 
-    SvxIMapDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    SvxIMapDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW( SvxIMapDlgChildWindow );
 
@@ -101,13 +101,13 @@ class SvxIMapDlgItem : public SfxControllerItem
 
 protected:
 
-    virtual void StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                const SfxPoolItem* pState );
 
 
 public:
 
-    SvxIMapDlgItem( USHORT nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings );
+    SvxIMapDlgItem( sal_uInt16 nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings );
 };
 
 
@@ -144,7 +144,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
     SvxIMapDlgItem      aIMapItem;
 
     virtual void        Resize();
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
 
 #ifdef _IMAPDLG_PRIVATE
 
@@ -160,7 +160,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
                         DECL_LINK( MiscHdl, void* );
 
     void                DoOpen();
-    BOOL                DoSave();
+    sal_Bool                DoSave();
 
 #endif
 
@@ -171,7 +171,7 @@ public:
                                     Window* pParent, const ResId& rResId );
                         ~SvxIMapDlg();
 
-    void                SetExecState( BOOL bEnable );
+    void                SetExecState( sal_Bool bEnable );
 
     void                SetGraphic( const Graphic& rGraphic );
 
diff --git a/svx/inc/svx/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index e7fa02c70d91..dd5baa6bcc74 100644
--- a/svx/inc/svx/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
@@ -37,20 +37,20 @@
 class SVX_DLLPUBLIC SvxInsertStatusBarControl : public SfxStatusBarControl
 {
 public:
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void    Click();
     virtual void    Paint( const UserDrawEvent& rEvt );
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxInsertStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     ~SvxInsertStatusBarControl();
 
-    static  ULONG   GetDefItemWidth(const StatusBar& rStb);
+    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
 
 private:
-    BOOL    bInsert;
+    sal_Bool    bInsert;
 
 #ifdef _SVX_INSCTRL_CXX
     SVX_DLLPRIVATE void DrawItemText_Impl();
diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
index 6c3a35218df6..205f8f7e7254 100644
--- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
+++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
@@ -54,20 +54,20 @@ class IPolyPolygonEditorController
 {
 public:
     virtual void DeleteMarkedPoints() = 0;
-    virtual BOOL IsDeleteMarkedPointsPossible() const = 0;
+    virtual sal_Bool IsDeleteMarkedPointsPossible() const = 0;
 
     virtual void RipUpAtMarkedPoints() = 0;
     virtual bool IsRipUpAtMarkedPointsPossible() const = 0;
 
-    virtual BOOL IsSetMarkedSegmentsKindPossible() const = 0;
+    virtual sal_Bool IsSetMarkedSegmentsKindPossible() const = 0;
     virtual SdrPathSegmentKind GetMarkedSegmentsKind() const = 0;
     virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind) = 0;
 
-    virtual BOOL IsSetMarkedPointsSmoothPossible() const = 0;
+    virtual sal_Bool IsSetMarkedPointsSmoothPossible() const = 0;
     virtual SdrPathSmoothKind GetMarkedPointsSmooth() const = 0;
     virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) = 0;
 
-    virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen ) = 0;
+    virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ) = 0;
     virtual bool IsOpenCloseMarkedObjectsPossible() const = 0;
     virtual SdrObjClosedKind GetMarkedObjectsClosedState() const = 0;
 };
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index 8f6506b90e66..8f02fdc2ef3e 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -43,10 +43,10 @@ class SfxObjectShell;
 class SvxLineBox : public LineLB
 {
     BmpColorMode    meBmpMode;
-    USHORT          nCurPos;
+    sal_uInt16          nCurPos;
     Timer           aDelayTimer;
     Size            aLogicalSize;
-    BOOL            bRelease;
+    sal_Bool            bRelease;
     SfxObjectShell* mpSh;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
@@ -77,11 +77,11 @@ class SvxColorBox : public ColorLB
 {
     using Window::Update;
 
-    USHORT          nCurPos;
-    USHORT          nId;
+    sal_uInt16          nCurPos;
+    sal_uInt16          nId;
     Timer           aDelayTimer;
     Size            aLogicalSize;
-    BOOL            bRelease;
+    sal_Bool            bRelease;
     ::rtl::OUString maCommand;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
@@ -152,17 +152,17 @@ public:
     SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
     ~SvxFillTypeBox();
 
-    void            Selected() { bSelect = TRUE; }
-    BOOL            IsRelease() { return bRelease;}
+    void            Selected() { bSelect = sal_True; }
+    sal_Bool            IsRelease() { return bRelease;}
 
 protected:
     virtual long    PreNotify( NotifyEvent& rNEvt );
     virtual long    Notify( NotifyEvent& rNEvt );
 
 private:
-    USHORT          nCurPos;
-    BOOL            bSelect;
-    BOOL            bRelease;
+    sal_uInt16          nCurPos;
+    sal_Bool            bSelect;
+    sal_Bool            bRelease;
 
 #ifdef _SVX_ITEMWIN_CXX
     void            ReleaseFocus_Impl();
@@ -177,7 +177,7 @@ public:
     SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
     ~SvxFillAttrBox();
 
-    BOOL            IsRelease() { return bRelease;}
+    sal_Bool            IsRelease() { return bRelease;}
 
 protected:
     virtual long    PreNotify( NotifyEvent& rNEvt );
@@ -185,8 +185,8 @@ protected:
     virtual void    Select();
 
 private:
-    USHORT          nCurPos;
-    BOOL            bRelease;
+    sal_uInt16          nCurPos;
+    sal_Bool            bRelease;
 
 #ifdef _SVX_ITEMWIN_CXX
     void            ReleaseFocus_Impl();
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index 0c4efa6b7231..862a442517e7 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -58,7 +58,7 @@ class SvtLanguageTable;
 
 
 // load language strings from resource
-SVX_DLLPUBLIC String    GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg );
+SVX_DLLPUBLIC String    GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg );
 
 class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
 {
@@ -69,34 +69,34 @@ private:
     Image                   m_aCheckedImage;
     Image                   m_aCheckedImageHC;
     String                  m_aAllString;
-    com::sun::star::uno::Sequence< INT16 >  *m_pSpellUsedLang;
+    com::sun::star::uno::Sequence< sal_Int16 >  *m_pSpellUsedLang;
     SvtLanguageTable*       m_pLangTable;
-    INT16                   m_nLangList;
-    BOOL                    m_bHasLangNone;
-    BOOL                    m_bLangNoneIsLangAll;
-    BOOL                    m_bWithCheckmark;
+    sal_Int16                   m_nLangList;
+    sal_Bool                    m_bHasLangNone;
+    sal_Bool                    m_bLangNoneIsLangAll;
+    sal_Bool                    m_bWithCheckmark;
 
     SVX_DLLPRIVATE void                    Init();
-    SVX_DLLPRIVATE USHORT                  ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked );
-    SVX_DLLPRIVATE USHORT                  ImplInsertLanguage(LanguageType, USHORT, sal_Int16 );
+    SVX_DLLPRIVATE sal_uInt16                  ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked );
+    SVX_DLLPRIVATE sal_uInt16                  ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 );
 
 public:
-    SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck = FALSE);
-    SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck = FALSE);
+    SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck = sal_False);
+    SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False);
     ~SvxLanguageBox();
 
-    void            SetLanguageList( INT16 nLangList,
-                            BOOL bHasLangNone, BOOL bLangNoneIsLangAll = FALSE,
-                            BOOL bCheckSpellAvail = FALSE );
+    void            SetLanguageList( sal_Int16 nLangList,
+                            sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll = sal_False,
+                            sal_Bool bCheckSpellAvail = sal_False );
 
-    USHORT          InsertLanguage( const LanguageType eLangType, USHORT nPos = LISTBOX_APPEND );
-    USHORT          InsertDefaultLanguage( sal_Int16 nType, USHORT nPos = LISTBOX_APPEND );
-    USHORT          InsertLanguage( const LanguageType eLangType,
-                            BOOL bCheckEntry, USHORT nPos = LISTBOX_APPEND );
+    sal_uInt16          InsertLanguage( const LanguageType eLangType, sal_uInt16 nPos = LISTBOX_APPEND );
+    sal_uInt16          InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos = LISTBOX_APPEND );
+    sal_uInt16          InsertLanguage( const LanguageType eLangType,
+                            sal_Bool bCheckEntry, sal_uInt16 nPos = LISTBOX_APPEND );
     void            RemoveLanguage( const LanguageType eLangType );
-    void            SelectLanguage( const LanguageType eLangType, BOOL bSelect = TRUE );
+    void            SelectLanguage( const LanguageType eLangType, sal_Bool bSelect = sal_True );
     LanguageType    GetSelectLanguage() const;
-    BOOL            IsLanguageSelected( const LanguageType eLangType ) const;
+    sal_Bool            IsLanguageSelected( const LanguageType eLangType ) const;
 };
 
 #if ENABLE_LAYOUT
@@ -110,7 +110,7 @@ class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
     DECL_GET_WINDOW (SvxLanguageBox);*/
 
 public:
-    SvxLanguageBox( Context*, const char*, BOOL bCheck = FALSE );
+    SvxLanguageBox( Context*, const char*, sal_Bool bCheck = sal_False );
     ~SvxLanguageBox ();
     void SetLanguageList (sal_Int16 list, bool hasLangNone, bool langNoneIsLangAll=false, bool checkSpellAvailable=false);
 
diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx
index 9ddd90a6bfac..714475038fd0 100644
--- a/svx/inc/svx/lathe3d.hxx
+++ b/svx/inc/svx/lathe3d.hxx
@@ -98,12 +98,12 @@ private:
     sal_Bool GetCloseBack() const
         { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); }
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     void    ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs);
 
     virtual void operator=(const SdrObject&);
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
     virtual void TakeObjNameSingul(String& rName) const;
@@ -114,7 +114,7 @@ private:
     const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; }
 
     // Aufbrechen
-    virtual BOOL IsBreakObjPossible();
+    virtual sal_Bool IsBreakObjPossible();
     virtual SdrAttrObj* GetBreakObj();
 };
 
diff --git a/svx/inc/svx/layctrl.hxx b/svx/inc/svx/layctrl.hxx
index 1bbdc714b7c9..6137c33a0eb2 100644
--- a/svx/inc/svx/layctrl.hxx
+++ b/svx/inc/svx/layctrl.hxx
@@ -44,13 +44,13 @@ public:
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
     virtual SfxPopupWindow*     CreatePopupWindowCascading();
-    virtual void                StateChanged( USHORT nSID,
+    virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxTableToolBoxControl();
 };
 
@@ -66,10 +66,10 @@ public:
 
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxColumnsToolBoxControl();
 
-    virtual void                StateChanged( USHORT nSID,
+    virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 36c82c64f44b..6129a17d9c28 100644
--- a/svx/inc/svx/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
@@ -44,7 +44,7 @@ protected:
     String                  aActionStr;
     SvxPopupWindowListBox * pPopupWin;
 
-    void    Impl_SetInfo( USHORT nCount );
+    void    Impl_SetInfo( sal_uInt16 nCount );
 
     DECL_LINK( PopupModeEndHdl, void * );
     DECL_LINK( SelectHdl, void * );
@@ -52,12 +52,12 @@ protected:
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SvxListBoxControl();
 
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
-    virtual void                StateChanged( USHORT nSID,
+    virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
@@ -72,10 +72,10 @@ class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 
     virtual ~SvxUndoRedoControl();
-    virtual void StateChanged( USHORT nSID,
+    virtual void StateChanged( sal_uInt16 nSID,
                                SfxItemState eState,
                                const SfxPoolItem* pState );
 
diff --git a/svx/inc/svx/linectrl.hxx b/svx/inc/svx/linectrl.hxx
index 43c96f128671..ea553d20aef5 100644
--- a/svx/inc/svx/linectrl.hxx
+++ b/svx/inc/svx/linectrl.hxx
@@ -50,15 +50,15 @@ private:
     XLineStyleItem*     pStyleItem;
     XLineDashItem*      pDashItem;
 
-    BOOL                bUpdate;
+    sal_Bool                bUpdate;
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxLineStyleToolBoxControl();
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     void                Update( const SfxPoolItem* pState );
     virtual Window*     CreateItemWindow( Window *pParent );
@@ -73,10 +73,10 @@ class SVX_DLLPUBLIC SvxLineWidthToolBoxControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxLineWidthToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxLineWidthToolBoxControl();
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     virtual Window*     CreateItemWindow( Window *pParent );
 };
@@ -90,10 +90,10 @@ class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxLineColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxLineColorToolBoxControl();
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     void                Update( const SfxPoolItem* pState );
     virtual Window*     CreateItemWindow( Window *pParent );
@@ -109,11 +109,11 @@ class SvxLineEndWindow : public SfxPopupWindow
 private:
     XLineEndList*   pLineEndList;
     ValueSet        aLineEndSet;
-    USHORT          nCols;
-    USHORT          nLines;
-    ULONG           nLineEndWidth;
+    sal_uInt16          nCols;
+    sal_uInt16          nLines;
+    sal_uIntPtr             nLineEndWidth;
     Size            aBmpSize;
-    BOOL            bPopupMode;
+    sal_Bool            bPopupMode;
     bool            mbInResize;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
@@ -126,7 +126,7 @@ private:
 protected:
     virtual void    Resizing( Size& rSize );
     virtual void    Resize();
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
     virtual void    PopupModeEnd();
 
     /** This function is called when the window gets the focus.  It grabs
@@ -136,10 +136,10 @@ protected:
     virtual void GetFocus (void);
 
 public:
-    SvxLineEndWindow( USHORT nId,
+    SvxLineEndWindow( sal_uInt16 nId,
                       const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                       const String& rWndTitle );
-    SvxLineEndWindow( USHORT nId,
+    SvxLineEndWindow( sal_uInt16 nId,
                       const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                       Window* pParentWindow,
                       const String& rWndTitle );
@@ -147,7 +147,7 @@ public:
 
     void            StartSelection();
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual SfxPopupWindow* Clone() const;
 };
@@ -160,10 +160,10 @@ class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxLineEndToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxLineEndToolBoxControl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
diff --git a/svx/inc/svx/modctrl.hxx b/svx/inc/svx/modctrl.hxx
index fd9e085c826e..8b7702341dbc 100644
--- a/svx/inc/svx/modctrl.hxx
+++ b/svx/inc/svx/modctrl.hxx
@@ -37,18 +37,18 @@
 class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
 {
 public:
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rEvt );
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxModifyControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static  ULONG   GetDefItemWidth(const StatusBar& rStb);
+    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
 
 private:
-    BOOL    bState;
+    sal_Bool    bState;
 
 #ifdef _SVX_MODCTRL_CXX
     SVX_DLLPRIVATE void DrawItemText_Impl();
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 6869a97e424a..92f00114edf4 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -249,7 +249,7 @@
 
 #define DFF_msofbtSelection         0xF119 //                           an FDGSL followed by the SPIDs of the shapes in the selection              X   0
 
-// Werte fuer den ULONG im DFF_PST_TextHeaderAtom
+// Werte fuer den sal_uIntPtr im DFF_PST_TextHeaderAtom
 enum DFF_TextHeader {
     DFFTH_TITLE,
     DFFTH_BODY,
@@ -273,15 +273,15 @@ enum DFF_TextHeader {
 // Transform
 #define DFF_Prop_Rotation                      4  //  Fixed Point 16.16 degrees
 // Protection
-#define DFF_Prop_LockRotation                119  //  BOOL              No rotation
-#define DFF_Prop_LockAspectRatio             120  //  BOOL              Don't allow changes in aspect ratio
-#define DFF_Prop_LockPosition                121  //  BOOL              Don't allow the shape to be moved
-#define DFF_Prop_LockAgainstSelect           122  //  BOOL              Shape may not be selected
-#define DFF_Prop_LockCropping                123  //  BOOL              No cropping this shape
-#define DFF_Prop_LockVertices                124  //  BOOL              Edit Points not allowed
-#define DFF_Prop_LockText                    125  //  BOOL              Do not edit text
-#define DFF_Prop_LockAdjustHandles           126  //  BOOL              Do not adjust
-#define DFF_Prop_LockAgainstGrouping         127  //  BOOL              Do not group this shape
+#define DFF_Prop_LockRotation                119  //  sal_Bool              No rotation
+#define DFF_Prop_LockAspectRatio             120  //  sal_Bool              Don't allow changes in aspect ratio
+#define DFF_Prop_LockPosition                121  //  sal_Bool              Don't allow the shape to be moved
+#define DFF_Prop_LockAgainstSelect           122  //  sal_Bool              Shape may not be selected
+#define DFF_Prop_LockCropping                123  //  sal_Bool              No cropping this shape
+#define DFF_Prop_LockVertices                124  //  sal_Bool              Edit Points not allowed
+#define DFF_Prop_LockText                    125  //  sal_Bool              Do not edit text
+#define DFF_Prop_LockAdjustHandles           126  //  sal_Bool              Do not adjust
+#define DFF_Prop_LockAgainstGrouping         127  //  sal_Bool              Do not group this shape
 // Text
 #define DFF_Prop_lTxid                       128  //  LONG              id for the text, value determined by the host
 #define DFF_Prop_dxTextLeft                  129  //  LONG              margins relative to shape's inscribed text rectangle (in EMUs)
@@ -295,11 +295,11 @@ enum DFF_TextHeader {
 #define DFF_Prop_cdirFont                    137  //  MSO_CDIR           Font rotation
 #define DFF_Prop_hspNext                     138  //  MSO_HSP            ID of the next shape (used by Word for linked textboxes)
 #define DFF_Prop_txdir                       139  //  MSO_TXDIR          Bi-Di Text direction
-#define DFF_Prop_SelectText                  187  //  BOOL              TRUE if single click selects text, FALSE if two clicks
-#define DFF_Prop_AutoTextMargin              188  //  BOOL              use host's margin calculations
-#define DFF_Prop_RotateText                  189  //  BOOL              Rotate text with shape
-#define DFF_Prop_FitShapeToText              190  //  BOOL              Size shape to fit text size
-#define DFF_Prop_FitTextToShape              191  //  BOOL              Size text to fit shape size
+#define DFF_Prop_SelectText                  187  //  sal_Bool              sal_True if single click selects text, sal_False if two clicks
+#define DFF_Prop_AutoTextMargin              188  //  sal_Bool              use host's margin calculations
+#define DFF_Prop_RotateText                  189  //  sal_Bool              Rotate text with shape
+#define DFF_Prop_FitShapeToText              190  //  sal_Bool              Size shape to fit text size
+#define DFF_Prop_FitTextToShape              191  //  sal_Bool              Size text to fit shape size
 // GeoText
 #define DFF_Prop_gtextUNICODE                192  //  WCHAR*            UNICODE text string
 #define DFF_Prop_gtextRTF                    193  //  char*             RTF text string
@@ -307,22 +307,22 @@ enum DFF_TextHeader {
 #define DFF_Prop_gtextSize                   195  //  LONG              default point size
 #define DFF_Prop_gtextSpacing                196  //  LONG              fixed point 16.16
 #define DFF_Prop_gtextFont                   197  //  WCHAR*            font family name
-#define DFF_Prop_gtextFReverseRows           240  //  BOOL  8000        Reverse row order
-#define DFF_Prop_fGtext                      241  //  BOOL  4000        Has text effect
-#define DFF_Prop_gtextFVertical              242  //  BOOL  2000        Rotate characters
-#define DFF_Prop_gtextFKern                  243  //  BOOL  1000        Kern characters
-#define DFF_Prop_gtextFTight                 244  //  BOOL   800        Tightening or tracking
-#define DFF_Prop_gtextFStretch               245  //  BOOL   400        Stretch to fit shape
-#define DFF_Prop_gtextFShrinkFit             246  //  BOOL   200        Char bounding box
-#define DFF_Prop_gtextFBestFit               247  //  BOOL   100        Scale text-on-path
-#define DFF_Prop_gtextFNormalize             248  //  BOOL    80        Stretch char height
-#define DFF_Prop_gtextFDxMeasure             249  //  BOOL    40        Do not measure along path
-#define DFF_Prop_gtextFBold                  250  //  BOOL    20        Bold font
-#define DFF_Prop_gtextFItalic                251  //  BOOL    10        Italic font
-#define DFF_Prop_gtextFUnderline             252  //  BOOL     8        Underline font
-#define DFF_Prop_gtextFShadow                253  //  BOOL     4        Shadow font
-#define DFF_Prop_gtextFSmallcaps             254  //  BOOL     2        Small caps font
-#define DFF_Prop_gtextFStrikethrough         255  //  BOOL     1        Strike through font
+#define DFF_Prop_gtextFReverseRows           240  //  sal_Bool  8000        Reverse row order
+#define DFF_Prop_fGtext                      241  //  sal_Bool  4000        Has text effect
+#define DFF_Prop_gtextFVertical              242  //  sal_Bool  2000        Rotate characters
+#define DFF_Prop_gtextFKern                  243  //  sal_Bool  1000        Kern characters
+#define DFF_Prop_gtextFTight                 244  //  sal_Bool   800        Tightening or tracking
+#define DFF_Prop_gtextFStretch               245  //  sal_Bool   400        Stretch to fit shape
+#define DFF_Prop_gtextFShrinkFit             246  //  sal_Bool   200        Char bounding box
+#define DFF_Prop_gtextFBestFit               247  //  sal_Bool   100        Scale text-on-path
+#define DFF_Prop_gtextFNormalize             248  //  sal_Bool    80        Stretch char height
+#define DFF_Prop_gtextFDxMeasure             249  //  sal_Bool    40        Do not measure along path
+#define DFF_Prop_gtextFBold                  250  //  sal_Bool    20        Bold font
+#define DFF_Prop_gtextFItalic                251  //  sal_Bool    10        Italic font
+#define DFF_Prop_gtextFUnderline             252  //  sal_Bool     8        Underline font
+#define DFF_Prop_gtextFShadow                253  //  sal_Bool     4        Shadow font
+#define DFF_Prop_gtextFSmallcaps             254  //  sal_Bool     2        Small caps font
+#define DFF_Prop_gtextFStrikethrough         255  //  sal_Bool     1        Strike through font
 // Blip
 #define DFF_Prop_cropFromTop                 256  //  LONG              16.16 fraction times total image width or height, as appropriate.
 #define DFF_Prop_cropFromBottom              257  //  LONG
@@ -342,10 +342,10 @@ enum DFF_TextHeader {
 #define DFF_Prop_pibPrint                    271  //  IMsoBlip*         Blip to display when printing
 #define DFF_Prop_pibPrintName                272  //  WCHAR*            Blip file name
 #define DFF_Prop_pibPrintFlags               273  //  MSO_BLIPFLAGS      Blip flags
-#define DFF_Prop_fNoHitTestPicture           316  //  BOOL              Do not hit test the picture
-#define DFF_Prop_pictureGray                 317  //  BOOL              grayscale display
-#define DFF_Prop_pictureBiLevel              318  //  BOOL              bi-level display
-#define DFF_Prop_pictureActive               319  //  BOOL              Server is active (OLE objects only)
+#define DFF_Prop_fNoHitTestPicture           316  //  sal_Bool              Do not hit test the picture
+#define DFF_Prop_pictureGray                 317  //  sal_Bool              grayscale display
+#define DFF_Prop_pictureBiLevel              318  //  sal_Bool              bi-level display
+#define DFF_Prop_pictureActive               319  //  sal_Bool              Server is active (OLE objects only)
 // Geometry
 #define DFF_Prop_geoLeft                     320  //  LONG              Defines the G (geometry) coordinate space.
 #define DFF_Prop_geoTop                      321  //  LONG
@@ -371,12 +371,12 @@ enum DFF_TextHeader {
 #define DFF_Prop_pFormulas                   342  //  LONG
 #define DFF_Prop_textRectangles              343  //  LONG
 #define DFF_Prop_connectorType               344  //  LONG              ->0=none, 1=segments, 2=custom, 3=rect
-#define DFF_Prop_fShadowOK                   378  //  BOOL              Shadow may be set
-#define DFF_Prop_f3DOK                       379  //  BOOL              3D may be set
-#define DFF_Prop_fLineOK                     380  //  BOOL              Line style may be set
-#define DFF_Prop_fGtextOK                    381  //  BOOL              Text effect (FontWork) supported
+#define DFF_Prop_fShadowOK                   378  //  sal_Bool              Shadow may be set
+#define DFF_Prop_f3DOK                       379  //  sal_Bool              3D may be set
+#define DFF_Prop_fLineOK                     380  //  sal_Bool              Line style may be set
+#define DFF_Prop_fGtextOK                    381  //  sal_Bool              Text effect (FontWork) supported
 #define DFF_Prop_fFillShadeShapeOK           382  //  BOOL
-#define DFF_Prop_fFillOK                     383  //  BOOL              OK to fill the shape through the UI or VBA?
+#define DFF_Prop_fFillOK                     383  //  sal_Bool              OK to fill the shape through the UI or VBA?
 // FillStyle
 #define DFF_Prop_fillType                    384  //  MSO_FILLTYPE       Type of fill
 #define DFF_Prop_fillColor                   385  //  MSO_CLR            Foreground color
@@ -407,11 +407,11 @@ enum DFF_TextHeader {
 #define DFF_Prop_fillShapeOriginX            410  //  LONG
 #define DFF_Prop_fillShapeOriginY            411  //  LONG
 #define DFF_Prop_fillShadeType               412  //  MSO_SHADETYPE      Type of shading, if a shaded (gradient) fill.
-#define DFF_Prop_fFilled                     443  //  BOOL              Is shape filled?
-#define DFF_Prop_fHitTestFill                444  //  BOOL              Should we hit test fill?
-#define DFF_Prop_fillShape                   445  //  BOOL              Register pattern on shape
-#define DFF_Prop_fillUseRect                 446  //  BOOL              Use the large rect?
-#define DFF_Prop_fNoFillHitTest              447  //  BOOL              Hit test a shape as though filled
+#define DFF_Prop_fFilled                     443  //  sal_Bool              Is shape filled?
+#define DFF_Prop_fHitTestFill                444  //  sal_Bool              Should we hit test fill?
+#define DFF_Prop_fillShape                   445  //  sal_Bool              Register pattern on shape
+#define DFF_Prop_fillUseRect                 446  //  sal_Bool              Use the large rect?
+#define DFF_Prop_fNoFillHitTest              447  //  sal_Bool              Hit test a shape as though filled
 // LineStyle
 #define DFF_Prop_lineColor                   448  //  MSO_CLR            Color of line
 #define DFF_Prop_lineOpacity                 449  //  LONG              Not implemented
@@ -437,11 +437,11 @@ enum DFF_TextHeader {
 #define DFF_Prop_lineEndArrowLength          469  //  MSO_LINEENDLENGTH  Arrow at end
 #define DFF_Prop_lineJoinStyle               470  //  MSO_LINEJOIN       How to join lines
 #define DFF_Prop_lineEndCapStyle             471  //  MSO_LINECAP        How to end lines
-#define DFF_Prop_fArrowheadsOK               507  //  BOOL              Allow arrowheads if prop. is set
-#define DFF_Prop_fLine                       508  //  BOOL              Any line?
-#define DFF_Prop_fHitTestLine                509  //  BOOL              Should we hit test lines?
-#define DFF_Prop_lineFillShape               510  //  BOOL              Register pattern on shape
-#define DFF_Prop_fNoLineDrawDash             511  //  BOOL              Draw a dashed line if no line
+#define DFF_Prop_fArrowheadsOK               507  //  sal_Bool              Allow arrowheads if prop. is set
+#define DFF_Prop_fLine                       508  //  sal_Bool              Any line?
+#define DFF_Prop_fHitTestLine                509  //  sal_Bool              Should we hit test lines?
+#define DFF_Prop_lineFillShape               510  //  sal_Bool              Register pattern on shape
+#define DFF_Prop_fNoLineDrawDash             511  //  sal_Bool              Draw a dashed line if no line
 // ShadowStyle
 #define DFF_Prop_shadowType                  512  //  MSO_SHADOWTYPE     Type of effect
 #define DFF_Prop_shadowColor                 513  //  MSO_CLR            Foreground color
@@ -461,8 +461,8 @@ enum DFF_TextHeader {
 #define DFF_Prop_shadowWeight                527  //  LONG              scaling factor
 #define DFF_Prop_shadowOriginX               528  //  LONG
 #define DFF_Prop_shadowOriginY               529  //  LONG
-#define DFF_Prop_fShadow                     574  //  BOOL              Any shadow?
-#define DFF_Prop_fshadowObscured             575  //  BOOL              Excel5-style shadow
+#define DFF_Prop_fShadow                     574  //  sal_Bool              Any shadow?
+#define DFF_Prop_fshadowObscured             575  //  sal_Bool              Excel5-style shadow
 // PerspectiveStyle
 #define DFF_Prop_perspectiveType             576  //  MSO_XFORMTYPE      Where transform applies
 #define DFF_Prop_perspectiveOffsetX          577  //  LONG              The LONG values define a transformation matrix, effectively, each value is scaled by the perspectiveWeight parameter.
@@ -476,7 +476,7 @@ enum DFF_TextHeader {
 #define DFF_Prop_perspectiveWeight           585  //  LONG              Scaling factor
 #define DFF_Prop_perspectiveOriginX          586  //  LONG
 #define DFF_Prop_perspectiveOriginY          587  //  LONG
-#define DFF_Prop_fPerspective                639  //  BOOL              On/off
+#define DFF_Prop_fPerspective                639  //  sal_Bool              On/off
 // 3D Object
 #define DFF_Prop_c3DSpecularAmt              640  //  LONG         Fixed-point 16.16
 #define DFF_Prop_c3DDiffuseAmt               641  //  LONG         Fixed-point 16.16
@@ -487,8 +487,8 @@ enum DFF_TextHeader {
 #define DFF_Prop_c3DExtrudePlane             646  //  LONG         Extrusion direction
 #define DFF_Prop_c3DExtrusionColor           647  //  MSO_CLR       Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering.
 #define DFF_Prop_c3DCrMod                    648  //  MSO_CLR       Modification for BW views
-#define DFF_Prop_f3D                         700  //  BOOL         Does this shape have a 3D effect?
-#define DFF_Prop_fc3DMetallic                701  //  BOOL         Use metallic specularity?
+#define DFF_Prop_f3D                         700  //  sal_Bool         Does this shape have a 3D effect?
+#define DFF_Prop_fc3DMetallic                701  //  sal_Bool         Use metallic specularity?
 #define DFF_Prop_fc3DUseExtrusionColor       702  //  BOOL
 #define DFF_Prop_fc3DLightFace               703  //  BOOL
 // 3D Style
@@ -521,20 +521,20 @@ enum DFF_TextHeader {
 #define DFF_Prop_c3DFillIntensity            730  //  LONG            Fixed point intensity
 #define DFF_Prop_fc3DConstrainRotation       763  //  BOOL
 #define DFF_Prop_fc3DRotationCenterAuto      764  //  BOOL
-#define DFF_Prop_fc3DParallel                765  //  BOOL            Parallel projection?
-#define DFF_Prop_fc3DKeyHarsh                766  //  BOOL            Is key lighting harsh?
-#define DFF_Prop_fc3DFillHarsh               767  //  BOOL            Is fill lighting harsh?
+#define DFF_Prop_fc3DParallel                765  //  sal_Bool            Parallel projection?
+#define DFF_Prop_fc3DKeyHarsh                766  //  sal_Bool            Is key lighting harsh?
+#define DFF_Prop_fc3DFillHarsh               767  //  sal_Bool            Is fill lighting harsh?
 // Shape
 #define DFF_Prop_hspMaster                   769  //  MSO_HSP          master shape
 #define DFF_Prop_cxstyle                     771  //  MSO_CXSTYLE      Type of connector
 #define DFF_Prop_bWMode                      772  //  MSO_BWMODE       Settings for modifications to be made when in different forms of black-and-white mode.
 #define DFF_Prop_bWModePureBW                773  //  MSO_BWMODE
 #define DFF_Prop_bWModeBW                    774  //  MSO_BWMODE
-#define DFF_Prop_fOleIcon                    826  //  BOOL            For OLE objects, whether the object is in icon form
-#define DFF_Prop_fPreferRelativeResize       827  //  BOOL            For UI only. Prefer relative resizing.
-#define DFF_Prop_fLockShapeType              828  //  BOOL            Lock the shape type (don't allow Change Shape)
+#define DFF_Prop_fOleIcon                    826  //  sal_Bool            For OLE objects, whether the object is in icon form
+#define DFF_Prop_fPreferRelativeResize       827  //  sal_Bool            For UI only. Prefer relative resizing.
+#define DFF_Prop_fLockShapeType              828  //  sal_Bool            Lock the shape type (don't allow Change Shape)
 #define DFF_Prop_fDeleteAttachedObject       830  //  BOOL
-#define DFF_Prop_fBackground                 831  //  BOOL            If TRUE, this is the background shape.
+#define DFF_Prop_fBackground                 831  //  sal_Bool            If sal_True, this is the background shape.
 
 // Callout
 #define DFF_Prop_spcot                       832  //  MSO_SPCOT        Callout type
@@ -543,13 +543,13 @@ enum DFF_TextHeader {
 #define DFF_Prop_spcod                       835  //  MSO_SPCOD        Callout drop type
 #define DFF_Prop_dxyCalloutDropSpecified     836  //  LONG            if mso_spcodSpecified, the actual drop distance
 #define DFF_Prop_dxyCalloutLengthSpecified   837  //  LONG            if fCalloutLengthSpecified, the actual distance
-#define DFF_Prop_fCallout                    889  //  BOOL            Is the shape a callout?
-#define DFF_Prop_fCalloutAccentBar           890  //  BOOL            does callout have accent bar
-#define DFF_Prop_fCalloutTextBorder          891  //  BOOL            does callout have a text border
+#define DFF_Prop_fCallout                    889  //  sal_Bool            Is the shape a callout?
+#define DFF_Prop_fCalloutAccentBar           890  //  sal_Bool            does callout have accent bar
+#define DFF_Prop_fCalloutTextBorder          891  //  sal_Bool            does callout have a text border
 #define DFF_Prop_fCalloutMinusX              892  //  BOOL
 #define DFF_Prop_fCalloutMinusY              893  //  BOOL
-#define DFF_Prop_fCalloutDropAuto            894  //  BOOL            If true, then we occasionally invert the drop distance
-#define DFF_Prop_fCalloutLengthSpecified     895  //  BOOL            if true, we look at dxyCalloutLengthSpecified
+#define DFF_Prop_fCalloutDropAuto            894  //  sal_Bool            If true, then we occasionally invert the drop distance
+#define DFF_Prop_fCalloutLengthSpecified     895  //  sal_Bool            if true, we look at dxyCalloutLengthSpecified
 
 // GroupShape
 #define DFF_Prop_wzName                      896  //  WCHAR*          Shape Name (present only if explicitly set)
@@ -563,13 +563,13 @@ enum DFF_TextHeader {
 #define DFF_Prop_lidRegroup                  904  //  LONG            Regroup ID
 #define DFF_Prop_tableProperties             927  //  LONG
 #define DFF_Prop_tableRowProperties          928  //  LONG*
-#define DFF_Prop_fEditedWrap                 953  //  BOOL            Has the wrap polygon been edited?
-#define DFF_Prop_fBehindDocument             954  //  BOOL            Word-only (shape is behind text)
-#define DFF_Prop_fOnDblClickNotify           955  //  BOOL            Notify client on a double click
-#define DFF_Prop_fIsButton                   956  //  BOOL            A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros.
-#define DFF_Prop_fOneD                       957  //  BOOL            1D adjustment
-#define DFF_Prop_fHidden                     958  //  BOOL            Do not display
-#define DFF_Prop_fPrint                      959  //  BOOL            Print this shape
+#define DFF_Prop_fEditedWrap                 953  //  sal_Bool            Has the wrap polygon been edited?
+#define DFF_Prop_fBehindDocument             954  //  sal_Bool            Word-only (shape is behind text)
+#define DFF_Prop_fOnDblClickNotify           955  //  sal_Bool            Notify client on a double click
+#define DFF_Prop_fIsButton                   956  //  sal_Bool            A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros.
+#define DFF_Prop_fOneD                       957  //  sal_Bool            1D adjustment
+#define DFF_Prop_fHidden                     958  //  sal_Bool            Do not display
+#define DFF_Prop_fPrint                      959  //  sal_Bool            Print this shape
 // entsprechende BitFlags
 #define DFF_PBit_EditedWrap         0x00000040
 #define DFF_PBit_BehindDocument     0x00000020
@@ -1078,17 +1078,17 @@ enum MSO_LineCap {
 // BStore-Container
 // FBSE - File Blip Store Entry
 typedef struct _MSOF_BSE {
-   BYTE      btWin32;    // Required type on Win32
-   BYTE      btMacOS;    // Required type on Mac
-   BYTE      rgbUid[16]; // Identifier of blip
-   USHORT    tag;        // currently unused
-   ULONG     size;       // Blip size in stream
-   ULONG     cRef;       // Reference count on the blip
-   ULONG /*MSOFO*/ foDelay;    // File offset in the delay stream
-   BYTE      usage;      // How this blip is used (MSOBLIPUSAGE)
-   BYTE      cbName;     // length of the blip name
-   BYTE      unused2;    // for the future
-   BYTE      unused3;    // for the future
+   sal_uInt8      btWin32;    // Required type on Win32
+   sal_uInt8      btMacOS;    // Required type on Mac
+   sal_uInt8      rgbUid[16]; // Identifier of blip
+   sal_uInt16    tag;        // currently unused
+   sal_uIntPtr     size;       // Blip size in stream
+   sal_uIntPtr     cRef;       // Reference count on the blip
+   sal_uIntPtr /*MSOFO*/ foDelay;    // File offset in the delay stream
+   sal_uInt8      usage;      // How this blip is used (MSOBLIPUSAGE)
+   sal_uInt8      cbName;     // length of the blip name
+   sal_uInt8      unused2;    // for the future
+   sal_uInt8      unused3;    // for the future
 } MSO_FBSE;
 
 typedef enum {
@@ -1188,12 +1188,12 @@ typedef enum {
 
 #ifdef Hier_noch_was_aus_der_Doku
 /* The secondary, or data, UID - should always be set. */
-BYTE  m_rgbUid[16];
+sal_uInt8  m_rgbUid[16];
 /* The primary UID - this defaults to 0, in which case the primary ID is
    that of the internal data. NOTE!: The primary UID is only saved to disk
    if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.inst and
    blip_signature is one of the values defined in MSO_BI */
-BYTE  m_rgbUidPrimary[16]; // optional based on the above check
+sal_uInt8  m_rgbUidPrimary[16]; // optional based on the above check
 
 /* Metafile Blip overhead = 34 bytes. m_cb gives the number of
    bytes required to store an uncompressed version of the file, m_cbSave
@@ -1205,18 +1205,18 @@ int           m_cb;           // Cache of the metafile size
 RECT          m_rcBounds;     // Boundary of metafile drawing commands
 POINT         m_ptSize;       // Size of metafile in EMUs
 int           m_cbSave;       // Cache of saved size (size of m_pvBits)
-BYTE          m_fCompression; // MSO_BLIPCOMPRESSION
-BYTE          m_fFilter;      // always mso_filterNone
+sal_uInt8          m_fCompression; // MSO_BLIPCOMPRESSION
+sal_uInt8          m_fFilter;      // always mso_filterNone
 void         *m_pvBits;       // Compressed bits of metafile.
 
 /* The secondary, or data, UID - should always be set. */
-BYTE  m_rgbUid[16];
+sal_uInt8  m_rgbUid[16];
 /* The primary UID - this defaults to 0, in which case the primary ID is
    that of the internal data. NOTE!: The primary UID is only saved to disk
    if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.finst and
    blip_signature is one of the values defined in MSO_BI*/
-BYTE  m_rgbUidPrimary[16];    // optional based on the above check
-BYTE  m_bTag;
+sal_uInt8  m_rgbUidPrimary[16];    // optional based on the above check
+sal_uInt8  m_bTag;
 void  *m_pvBits;              // raster bits of the blip.
 #endif
 
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 493cdb6b10d2..00a423d8b46c 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -123,14 +123,14 @@ public:
                                               const String*      pNumStr = NULL );
 
 
-    void                GetInitSettings( USHORT&       nCatLbPos,
+    void                GetInitSettings( sal_uInt16&       nCatLbPos,
                                         LanguageType& rLangType,
-                                         USHORT&       nFmtLbSelPos,
+                                         sal_uInt16&       nFmtLbSelPos,
                                          SvStrings&    rFmtEntries,
                                          String&       rPrevString,
                                          Color*&       rpPrevColor );
 
-    void                CategoryChanged( USHORT     nCatLbPos,
+    void                CategoryChanged( sal_uInt16     nCatLbPos,
                                         short&     rFmtSelPos,
                                          SvStrings& rFmtEntries );
 
@@ -138,34 +138,34 @@ public:
                                          short&       rFmtSelPos,
                                          SvStrings&   rFmtEntries );
 
-    void                FormatChanged( USHORT  nFmtLbPos,
+    void                FormatChanged( sal_uInt16  nFmtLbPos,
                                        String& rPreviewStr,
                                        Color*& rpFontColor );
 
-    BOOL                AddFormat( String&    rFormat,
+    sal_Bool                AddFormat( String&    rFormat,
                                    xub_StrLen& rErrPos,
-                                   USHORT&    rCatLbSelPos,
+                                   sal_uInt16&    rCatLbSelPos,
                                    short&     rFmtSelPos,
                                    SvStrings& rFmtEntries );
 
-    BOOL                RemoveFormat( const String& rFormat,
-                                      USHORT&       rCatLbSelPos,
+    sal_Bool                RemoveFormat( const String& rFormat,
+                                      sal_uInt16&       rCatLbSelPos,
                                       short&        rFmtSelPos,
                                       SvStrings&    rFmtEntries );
 
     void                MakeFormat( String& rFormat,
-                                    BOOL    bThousand,
-                                    BOOL    bNegRed,
-                                    USHORT  nPrecision,
-                                    USHORT  nLeadingZeroes,
-                                    USHORT  nCurrencyEntryPos);
+                                    sal_Bool    bThousand,
+                                    sal_Bool    bNegRed,
+                                    sal_uInt16  nPrecision,
+                                    sal_uInt16  nLeadingZeroes,
+                                    sal_uInt16  nCurrencyEntryPos);
 
     void                GetOptions( const String& rFormat,
-                                    BOOL&         rThousand,
-                                    BOOL&         rNegRed,
-                                    USHORT&       rPrecision,
-                                    USHORT&       rLeadingZeroes,
-                                    USHORT&       rCatLbPos );
+                                    sal_Bool&         rThousand,
+                                    sal_Bool&         rNegRed,
+                                    sal_uInt16&       rPrecision,
+                                    sal_uInt16&       rLeadingZeroes,
+                                    sal_uInt16&       rCatLbPos );
 
     void                MakePreviewString( const String& rFormatStr,
                                            String&       rPreviewStr,
@@ -176,11 +176,11 @@ public:
                                                 Color*& rpFontColor,
                                                 double  nValue);
 
-    BOOL                IsUserDefined( const String& rFmtString );
-    BOOL                IsTmpCurrencyFormat( const String& rFmtString );
-    BOOL                FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL );
+    sal_Bool                IsUserDefined( const String& rFmtString );
+    sal_Bool                IsTmpCurrencyFormat( const String& rFmtString );
+    sal_Bool                FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL );
 
-    void                ValidateNewEntries( BOOL bValidate = TRUE ) { bUndoAddList = !bValidate; }
+    void                ValidateNewEntries( sal_Bool bValidate = sal_True ) { bUndoAddList = !bValidate; }
     sal_uInt32          GetUpdateDataCount() const;
     void                GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize );
 
@@ -195,25 +195,25 @@ public:
 
     String              GetComment4Entry(short nEntry);
     short               GetCategory4Entry(short nEntry);
-    BOOL                GetUserDefined4Entry(short nEntry);
+    sal_Bool                GetUserDefined4Entry(short nEntry);
     String              GetFormat4Entry(short nEntry);
     void                SetComment4Entry(short nEntry,String aCommentString);
 
-    BOOL                IsBankingSymbol(USHORT nPos);
-    void                SetCurrencySymbol(USHORT nPos);
+    sal_Bool                IsBankingSymbol(sal_uInt16 nPos);
+    void                SetCurrencySymbol(sal_uInt16 nPos);
     sal_uInt32          GetCurrencySymbol();
-    USHORT              FindCurrencyFormat( const String& rFmtString );
-    USHORT              FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,BOOL bTmpBanking);
+    sal_uInt16              FindCurrencyFormat( const String& rFmtString );
+    sal_uInt16              FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,sal_Bool bTmpBanking);
     NfCurrencyEntry*    GetCurCurrencyEntry();
     void                SetCurCurrencyEntry(NfCurrencyEntry*);
     short               GetListPos4Entry(sal_uInt32 nIdx);
     short               GetListPos4Entry( const String& rFmtString );
 
-    void                GetCurrencySymbols( SvStringsDtor& rList, USHORT* pPos );
-    void                GetCurrencySymbols( SvStringsDtor& rList, BOOL bFlag );
+    void                GetCurrencySymbols( SvStringsDtor& rList, sal_uInt16* pPos );
+    void                GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bFlag );
 
-    USHORT              FindCurrencyTableEntry( const String& rFmtString, BOOL &bTestBanking );
-    BOOL                IsInTable(USHORT nPos,BOOL bTmpBanking,const String &rFmtString);
+    sal_uInt16              FindCurrencyTableEntry( const String& rFmtString, sal_Bool &bTestBanking );
+    sal_Bool                IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,const String &rFmtString);
 
     void                GetCurrencyFormats(SvStrings& rList);
 
@@ -225,7 +225,7 @@ private:
     SvxNumberValueType      eValType;
     String                  aValStr;
     double                  nValNum;
-    BOOL                    bUndoAddList;
+    sal_Bool                    bUndoAddList;
     SvULongs                aAddList;
     SvULongs                aDelList;
     SvULongs                aCurEntryList;
@@ -235,13 +235,13 @@ private:
     LanguageType            eCurLanguage;
     SvUShorts               aCurCurrencyList;
     NfCurrencyEntry*        pCurCurrencyEntry;
-    BOOL                    bBankingSymbol;
-    USHORT                  nCurCurrencyEntryPos;
+    sal_Bool                    bBankingSymbol;
+    sal_uInt16                  nCurCurrencyEntryPos;
     SvStrings               aCurrencyFormatList;
 
 #ifdef _SVX_NUMFMTSH_CXX
     SVX_DLLPRIVATE short                    FillEntryList_Impl( SvStrings& rList );
-    SVX_DLLPRIVATE void                 FillEListWithStd_Impl( SvStrings& rList,USHORT aPrivCat, short &Pos);
+    SVX_DLLPRIVATE void                 FillEListWithStd_Impl( SvStrings& rList,sal_uInt16 aPrivCat, short &Pos);
     SVX_DLLPRIVATE short                    FillEListWithFormats_Impl( SvStrings& rList,short nSelPos,
                                                        NfIndexTableOffset eOffsetStart,
                                                        NfIndexTableOffset eOffsetEnd);
@@ -253,12 +253,12 @@ private:
     SVX_DLLPRIVATE short                    FillEListWithUserCurrencys( SvStrings& rList,short nSelPos);
 
     SVX_DLLPRIVATE short                    FillEListWithUsD_Impl( SvStrings& rList, sal_uInt16 nPrivCat, short Pos );
-    SVX_DLLPRIVATE BOOL                 IsRemoved_Impl( sal_uInt32 nKey );
-    SVX_DLLPRIVATE BOOL                 IsAdded_Impl( sal_uInt32 nKey );
+    SVX_DLLPRIVATE sal_Bool                 IsRemoved_Impl( sal_uInt32 nKey );
+    SVX_DLLPRIVATE sal_Bool                 IsAdded_Impl( sal_uInt32 nKey );
     SVX_DLLPRIVATE void                 GetPreviewString_Impl( String& rString,
                                                    Color*& rpColor );
-    SVX_DLLPRIVATE void                 PosToCategory_Impl( USHORT nPos, short& rCategory );
-    SVX_DLLPRIVATE void                 CategoryToPos_Impl( short nCategory, USHORT& rPos );
+    SVX_DLLPRIVATE void                 PosToCategory_Impl( sal_uInt16 nPos, short& rCategory );
+    SVX_DLLPRIVATE void                 CategoryToPos_Impl( short nCategory, sal_uInt16& rPos );
 #endif
 };
 
diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx
index 167cb094d1e1..6b3793d2aea9 100644
--- a/svx/inc/svx/numinf.hxx
+++ b/svx/inc/svx/numinf.hxx
@@ -47,23 +47,23 @@ class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxNumberInfoItem( const USHORT nId  );
+    SvxNumberInfoItem( const sal_uInt16 nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
-                       const USHORT nId  );
+                       const sal_uInt16 nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const String& rVal,
-                       const USHORT nId  );
+                       const sal_uInt16 nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal,
-                       const USHORT nId  );
+                       const sal_uInt16 nId  );
     // if both double and String are supplied, String is used for text formats
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal,
-                       const String& rValueStr, const USHORT nId );
+                       const String& rValueStr, const sal_uInt16 nId );
     SvxNumberInfoItem( const SvxNumberInfoItem& );
     ~SvxNumberInfoItem();
 
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create( SvStream& rStream, USHORT nVer ) const;
-    virtual SvStream&        Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create( SvStream& rStream, sal_uInt16 nVer ) const;
+    virtual SvStream&        Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx
index d174e1d6fba5..6118460a8356 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -55,7 +55,7 @@ class SvxNumRule;
 struct SvxBmpItemInfo
 {
     SvxBrushItem*   pBrushItem;
-    USHORT          nItemId;
+    sal_uInt16          nItemId;
 };
 
 /*-----------------09/09/97 01:05pm-----------------
@@ -64,8 +64,8 @@ struct SvxBmpItemInfo
 class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
 {
     Color           aLineColor;
-    USHORT          nPageType;
-    BOOL            bHTMLMode;
+    sal_uInt16          nPageType;
+    sal_Bool            bHTMLMode;
     Rectangle       aOrgRect;
     VirtualDevice*  pVDev;
 
@@ -80,12 +80,12 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
         com::sun::star::uno::Reference<
             com::sun::star::container::XIndexAccess> > aOutlineSettings;
     public:
-        SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType );
+        SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType );
         ~SvxNumValueSet();
 
     virtual void    UserDraw( const UserDrawEvent& rUDEvt );
 
-    void            SetHTMLMode(BOOL bSet) {bHTMLMode = bSet;}
+    void            SetHTMLMode(sal_Bool bSet) {bHTMLMode = bSet;}
     void            SetNumberingSettings(
         const com::sun::star::uno::Sequence<
             com::sun::star::uno::Sequence<
@@ -109,13 +109,13 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
 {
     String      sBullets;
     Timer       aFormatTimer;
-    BOOL        bGrfNotFound;
+    sal_Bool        bGrfNotFound;
 
     protected:
         DECL_LINK(FormatHdl_Impl, Timer*);
 
-    void            SetGrfNotFound(BOOL bSet) {bGrfNotFound = bSet;}
-    BOOL            IsGrfNotFound()const {return bGrfNotFound;}
+    void            SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;}
+    sal_Bool            IsGrfNotFound()const {return bGrfNotFound;}
 
     Timer&          GetFormatTimer() {return aFormatTimer;}
 
@@ -136,8 +136,8 @@ class SvxNumberingPreview : public Window
     Font                aStdFont;
     long                nPageWidth;
     const String*       pOutlineNames;
-    BOOL                bPosition;
-    UINT16              nActLevel;
+    sal_Bool                bPosition;
+    sal_uInt16              nActLevel;
 
     protected:
         virtual void        Paint( const Rectangle& rRect );
@@ -145,7 +145,7 @@ class SvxNumberingPreview : public Window
     public:
         SvxNumberingPreview(Window* pParent, const ResId& rResId ) :
             Window(pParent, rResId),
-            pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX)
+            pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(sal_False), nActLevel(USHRT_MAX)
             { SetBorderStyle( WINDOW_BORDER_MONO ); }
 
         void    SetNumRule(const SvxNumRule* pNum)
@@ -155,8 +155,8 @@ class SvxNumberingPreview : public Window
         void    SetOutlineNames(const String* pNames)
                         {pOutlineNames = pNames;}
         void    SetPositionMode()
-                        { bPosition = TRUE;}
-        void    SetLevel(USHORT nSet) {nActLevel = nSet;}
+                        { bPosition = sal_True;}
+        void    SetLevel(sal_uInt16 nSet) {nActLevel = nSet;}
 
 };
 
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 1116fd3fa033..5c25582a1c7b 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -92,10 +92,10 @@ public:
     SVX_DLLPUBLIC E3dObjList(const E3dObjList& rSrcList);
     SVX_DLLPUBLIC virtual ~E3dObjList();
 
-    virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
-    virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
-    virtual SdrObject* NbcRemoveObject(ULONG nObjNum);
-    virtual SdrObject* RemoveObject(ULONG nObjNum);
+    virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
+    virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
+    virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum);
+    virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum);
 };
 
 /*************************************************************************
@@ -141,7 +141,7 @@ protected:
     // and no instances should be created from anyone, so i move the constructors
     // to protected area
     E3dObject();
-    E3dObject(BOOL bIsFromChart);
+    E3dObject(sal_Bool bIsFromChart);
 
 public:
     TYPEINFO();
@@ -150,8 +150,8 @@ public:
 
     virtual ~E3dObject();
 
-    virtual UINT32  GetObjInventor() const;
-    virtual UINT16  GetObjIdentifier() const;
+    virtual sal_uInt32  GetObjInventor() const;
+    virtual sal_uInt16  GetObjIdentifier() const;
 
     virtual void    TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
@@ -193,7 +193,7 @@ public:
     // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
     virtual void TakeObjNameSingul(String& rName) const;
     virtual void TakeObjNamePlural(String& rName) const;
-    USHORT GetLogicalGroup() { return 0; }
+    sal_uInt16 GetLogicalGroup() { return 0; }
     virtual void operator=(const SdrObject&);
 
     virtual SdrObjGeoData *NewGeoData() const;
@@ -205,7 +205,7 @@ public:
     void SetSelected(bool bNew);
 
     // Aufbrechen
-    virtual BOOL IsBreakObjPossible();
+    virtual sal_Bool IsBreakObjPossible();
     virtual SdrAttrObj* GetBreakObj();
 };
 
@@ -255,28 +255,28 @@ public :
     virtual sal_uInt32 GetHdlCount() const;
     virtual void    AddToHdlList(SdrHdlList& rHdlList) const;
 
-    // DoubleSided: TRUE/FALSE
-    BOOL GetDoubleSided() const
+    // DoubleSided: sal_True/FALSE
+    sal_Bool GetDoubleSided() const
         { return ((const Svx3DDoubleSidedItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); }
 
-    // NormalsKind: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+    // NormalsKind: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
     sal_uInt16 GetNormalsKind() const
         { return ((const Svx3DNormalsKindItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); }
 
-    // NormalsInvert: TRUE/FALSE
-    BOOL GetNormalsInvert() const
+    // NormalsInvert: sal_True/FALSE
+    sal_Bool GetNormalsInvert() const
         { return ((const Svx3DNormalsInvertItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); }
 
-    // TextureProjX: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+    // TextureProjX: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
     sal_uInt16 GetTextureProjectionX() const
         { return ((const Svx3DTextureProjectionXItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); }
 
-    // TextureProjY: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+    // TextureProjY: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
     sal_uInt16 GetTextureProjectionY() const
         { return ((const Svx3DTextureProjectionYItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); }
 
-    // Shadow3D: TRUE/FALSE
-    BOOL GetShadow3D() const
+    // Shadow3D: sal_True/FALSE
+    sal_Bool GetShadow3D() const
         { return ((const Svx3DShadow3DItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); }
 
     // MaterialColor: Color
@@ -295,24 +295,24 @@ public :
     sal_uInt16 GetMaterialSpecularIntensity() const
         { return ((const Svx3DMaterialSpecularIntensityItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); }
 
-    // TextureFilter: TRUE/FALSE
-    BOOL GetTextureFilter() const
+    // TextureFilter: sal_True/FALSE
+    sal_Bool GetTextureFilter() const
         { return ((const Svx3DTextureFilterItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); }
 
     // #i28528#
     // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
-    BOOL GetReducedLineGeometry() const
+    sal_Bool GetReducedLineGeometry() const
         { return ((const Svx3DReducedLineGeometryItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)).GetValue(); }
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void RecalcSnapRect();
 
     // Parameter Geometrieerzeugung setzen/lesen
-    BOOL GetCreateNormals() const { return bCreateNormals; }
-    void SetCreateNormals(BOOL bNew);
+    sal_Bool GetCreateNormals() const { return bCreateNormals; }
+    void SetCreateNormals(sal_Bool bNew);
 
-    BOOL GetCreateTexture() const { return bCreateTexture; }
-    void SetCreateTexture(BOOL bNew);
+    sal_Bool GetCreateTexture() const { return bCreateTexture; }
+    void SetCreateTexture(sal_Bool bNew);
 
     // Copy-Operator
     virtual void operator=(const SdrObject&);
diff --git a/svx/inc/svx/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx
index 50f18ccb9ed9..8e58cb5ef742 100644
--- a/svx/inc/svx/ofaitem.hxx
+++ b/svx/inc/svx/ofaitem.hxx
@@ -40,7 +40,7 @@ private:
     void* pPtr;
 
 public:
-                             OfaPtrItem( USHORT nWhich, void *pPtr );
+                             OfaPtrItem( sal_uInt16 nWhich, void *pPtr );
                              OfaPtrItem( const OfaPtrItem& );
 
     virtual int              operator==( const SfxPoolItem& ) const;
diff --git a/svx/inc/svx/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx
index 50520aac0204..bea7ae38def5 100644
--- a/svx/inc/svx/optgenrl.hxx
+++ b/svx/inc/svx/optgenrl.hxx
@@ -28,22 +28,22 @@
 #define _SVX_OPTGENRL_HXX
 
 // Defines for setting the fokus of a Edit via a slot from external.
-#define UNKNOWN_EDIT    ((USHORT)0)
-#define COMPANY_EDIT    ((USHORT)1)
-#define FIRSTNAME_EDIT  ((USHORT)2)
-#define LASTNAME_EDIT   ((USHORT)3)
-#define STREET_EDIT     ((USHORT)4)
-#define COUNTRY_EDIT    ((USHORT)5)
-#define PLZ_EDIT        ((USHORT)6)
-#define CITY_EDIT       ((USHORT)7)
-#define STATE_EDIT      ((USHORT)8)
-#define TITLE_EDIT      ((USHORT)9)
-#define POSITION_EDIT   ((USHORT)10)
-#define SHORTNAME_EDIT  ((USHORT)11)
-#define TELPRIV_EDIT    ((USHORT)12)
-#define TELCOMPANY_EDIT ((USHORT)13)
-#define FAX_EDIT        ((USHORT)14)
-#define EMAIL_EDIT      ((USHORT)15)
+#define UNKNOWN_EDIT    ((sal_uInt16)0)
+#define COMPANY_EDIT    ((sal_uInt16)1)
+#define FIRSTNAME_EDIT  ((sal_uInt16)2)
+#define LASTNAME_EDIT   ((sal_uInt16)3)
+#define STREET_EDIT     ((sal_uInt16)4)
+#define COUNTRY_EDIT    ((sal_uInt16)5)
+#define PLZ_EDIT        ((sal_uInt16)6)
+#define CITY_EDIT       ((sal_uInt16)7)
+#define STATE_EDIT      ((sal_uInt16)8)
+#define TITLE_EDIT      ((sal_uInt16)9)
+#define POSITION_EDIT   ((sal_uInt16)10)
+#define SHORTNAME_EDIT  ((sal_uInt16)11)
+#define TELPRIV_EDIT    ((sal_uInt16)12)
+#define TELCOMPANY_EDIT ((sal_uInt16)13)
+#define FAX_EDIT        ((sal_uInt16)14)
+#define EMAIL_EDIT      ((sal_uInt16)15)
 
 #endif // #ifndef _SVX_OPTGENRL_HXX
 
diff --git a/svx/inc/svx/optgrid.hxx b/svx/inc/svx/optgrid.hxx
index 6dd2a5f9371d..dda6afae6104 100644
--- a/svx/inc/svx/optgrid.hxx
+++ b/svx/inc/svx/optgrid.hxx
@@ -43,42 +43,42 @@ class SvxGridTabPage;
 class SVX_DLLPUBLIC SvxOptionsGrid
 {
 protected:
-    UINT32  nFldDrawX;
-    UINT32  nFldDivisionX;
-    UINT32  nFldDrawY;
-    UINT32  nFldDivisionY;
-    UINT32  nFldSnapX;
-    UINT32  nFldSnapY;
-    BOOL    bUseGridsnap:1;
-    BOOL    bSynchronize:1;
-    BOOL    bGridVisible:1;
-    BOOL    bEqualGrid:  1;
+    sal_uInt32  nFldDrawX;
+    sal_uInt32  nFldDivisionX;
+    sal_uInt32  nFldDrawY;
+    sal_uInt32  nFldDivisionY;
+    sal_uInt32  nFldSnapX;
+    sal_uInt32  nFldSnapY;
+    sal_Bool    bUseGridsnap:1;
+    sal_Bool    bSynchronize:1;
+    sal_Bool    bGridVisible:1;
+    sal_Bool    bEqualGrid:  1;
 
 public:
     SvxOptionsGrid();
     ~SvxOptionsGrid();
 
-    void    SetFldDrawX(    UINT32 nSet){nFldDrawX      = nSet;}
-    void    SetFldDivisionX(UINT32 nSet){nFldDivisionX  = nSet;}
-    void    SetFldDrawY   ( UINT32 nSet){nFldDrawY      = nSet;}
-    void    SetFldDivisionY(UINT32 nSet){nFldDivisionY  = nSet;}
-    void    SetFldSnapX(    UINT32 nSet){nFldSnapX      = nSet;}
-    void    SetFldSnapY   ( UINT32 nSet){nFldSnapY      = nSet;}
-    void    SetUseGridSnap( BOOL bSet ) {bUseGridsnap   = bSet;}
-    void    SetSynchronize( BOOL bSet ) {bSynchronize   = bSet;}
-    void    SetGridVisible( BOOL bSet ) {bGridVisible   = bSet;}
-    void    SetEqualGrid( BOOL bSet )   {bEqualGrid     = bSet;}
-
-    UINT32  GetFldDrawX(    ) const {  return nFldDrawX;    }
-    UINT32  GetFldDivisionX() const {  return nFldDivisionX;}
-    UINT32  GetFldDrawY   ( ) const {  return nFldDrawY;    }
-    UINT32  GetFldDivisionY() const {  return nFldDivisionY;}
-    UINT32  GetFldSnapX(    ) const {  return nFldSnapX;    }
-    UINT32  GetFldSnapY   ( ) const {  return nFldSnapY;    }
-    BOOL    GetUseGridSnap( ) const {  return bUseGridsnap; }
-    BOOL    GetSynchronize( ) const {  return bSynchronize; }
-    BOOL    GetGridVisible( ) const {  return bGridVisible; }
-    BOOL    GetEqualGrid()    const {  return bEqualGrid;   }
+    void    SetFldDrawX(    sal_uInt32 nSet){nFldDrawX      = nSet;}
+    void    SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX  = nSet;}
+    void    SetFldDrawY   ( sal_uInt32 nSet){nFldDrawY      = nSet;}
+    void    SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY  = nSet;}
+    void    SetFldSnapX(    sal_uInt32 nSet){nFldSnapX      = nSet;}
+    void    SetFldSnapY   ( sal_uInt32 nSet){nFldSnapY      = nSet;}
+    void    SetUseGridSnap( sal_Bool bSet ) {bUseGridsnap   = bSet;}
+    void    SetSynchronize( sal_Bool bSet ) {bSynchronize   = bSet;}
+    void    SetGridVisible( sal_Bool bSet ) {bGridVisible   = bSet;}
+    void    SetEqualGrid( sal_Bool bSet )   {bEqualGrid     = bSet;}
+
+    sal_uInt32  GetFldDrawX(    ) const {  return nFldDrawX;    }
+    sal_uInt32  GetFldDivisionX() const {  return nFldDivisionX;}
+    sal_uInt32  GetFldDrawY   ( ) const {  return nFldDrawY;    }
+    sal_uInt32  GetFldDivisionY() const {  return nFldDivisionY;}
+    sal_uInt32  GetFldSnapX(    ) const {  return nFldSnapX;    }
+    sal_uInt32  GetFldSnapY   ( ) const {  return nFldSnapY;    }
+    sal_Bool    GetUseGridSnap( ) const {  return bUseGridsnap; }
+    sal_Bool    GetSynchronize( ) const {  return bSynchronize; }
+    sal_Bool    GetGridVisible( ) const {  return bGridVisible; }
+    sal_Bool    GetEqualGrid()    const {  return bEqualGrid;   }
 };
 
 // class SvxGridItem -----------------------------------------------------
@@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem
     friend class SvxGridTabPage;
 
 public:
-    SvxGridItem( USHORT _nWhich) : SfxPoolItem(_nWhich){};
+    SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){};
     SvxGridItem( const SvxGridItem& pTestItem );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
@@ -114,7 +114,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     virtual void        ActivatePage( const SfxItemSet& rSet );
@@ -163,8 +163,8 @@ protected:
     MetricField     aMtrFldBezAngle;
 
 private:
-    BOOL                bAttrModified;
-//  BOOL                bEqualGrid; // Neu
+    sal_Bool                bAttrModified;
+//  sal_Bool                bEqualGrid; // Neu
 
 #ifdef _SVX_OPTGRID_CXX
     DECL_LINK( ClickRotateHdl_Impl, void * );
diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx
index 74a79d8e3a0d..c7554b4a445a 100644
--- a/svx/inc/svx/pagectrl.hxx
+++ b/svx/inc/svx/pagectrl.hxx
@@ -69,13 +69,13 @@ private:
     Color       aFtColor;
     SvxBoxItem* pFtBorder;
 
-    BOOL        bFooter :1;
-    BOOL        bHeader :1;
-    BOOL        bTable  :1;
-    BOOL        bHorz   :1;
-    BOOL        bVert   :1;
+    sal_Bool        bFooter :1;
+    sal_Bool        bHeader :1;
+    sal_Bool        bTable  :1;
+    sal_Bool        bHorz   :1;
+    sal_Bool        bVert   :1;
 
-    USHORT      eUsage;
+    sal_uInt16      eUsage;
 
     String      aLeftText;
     String      aRightText;
@@ -84,8 +84,8 @@ protected:
     virtual void Paint( const Rectangle& rRect );
 
     virtual void DrawPage( const Point& rPoint,
-                           const BOOL bSecond,
-                           const BOOL bEnabled );
+                           const sal_Bool bSecond,
+                           const sal_Bool bEnabled );
 
 public:
     SvxPageWindow( Window* pParent, const ResId& rId );
@@ -143,20 +143,20 @@ public:
     const Color&        GetFtColor() const              { return aFtColor; }
     const SvxBoxItem&   GetFtBorder() const             { return *pFtBorder; }
 
-    void        SetUsage( USHORT eU )                   { eUsage = eU;  }
-    USHORT      GetUsage() const                        { return eUsage;}
+    void        SetUsage( sal_uInt16 eU )                   { eUsage = eU;  }
+    sal_uInt16      GetUsage() const                        { return eUsage;}
 
-    void        SetHeader( BOOL bNew )                  { bHeader = bNew; }
-    BOOL        GetHeader() const                       { return bHeader;}
-    void        SetFooter( BOOL bNew )                  { bFooter = bNew; }
-    BOOL        GetFooter() const                       { return bFooter;}
+    void        SetHeader( sal_Bool bNew )                  { bHeader = bNew; }
+    sal_Bool        GetHeader() const                       { return bHeader;}
+    void        SetFooter( sal_Bool bNew )                  { bFooter = bNew; }
+    sal_Bool        GetFooter() const                       { return bFooter;}
 
-    void        SetTable( BOOL bNew )                   { bTable = bNew; }
-    BOOL        GetTable() const                        { return bTable;}
-    void        SetHorz( BOOL bNew )                    { bHorz = bNew; }
-    BOOL        GetHorz() const                         { return bHorz;}
-    void        SetVert( BOOL bNew )                    { bVert = bNew; }
-    BOOL        GetVert() const                         { return bVert;}
+    void        SetTable( sal_Bool bNew )                   { bTable = bNew; }
+    sal_Bool        GetTable() const                        { return bTable;}
+    void        SetHorz( sal_Bool bNew )                    { bHorz = bNew; }
+    sal_Bool        GetHorz() const                         { return bHorz;}
+    void        SetVert( sal_Bool bNew )                    { bVert = bNew; }
+    sal_Bool        GetVert() const                         { return bVert;}
 
     void        EnableFrameDirection(sal_Bool bEnable);
     //uses enum SvxFrameDirection
diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
index 97a325751ca4..50c7c8f86b59 100644
--- a/svx/inc/svx/pageitem.hxx
+++ b/svx/inc/svx/pageitem.hxx
@@ -81,13 +81,13 @@ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem
 private:
     String          aDescName;          // Name der Vorlage
     SvxNumType      eNumType;           // Numerierung
-    BOOL            bLandscape;         // Portrait / Landscape
-    USHORT          eUse;               // Layout
+    sal_Bool            bLandscape;         // Portrait / Landscape
+    sal_uInt16          eUse;               // Layout
 
 public:
 
     TYPEINFO();
-    SvxPageItem( const USHORT nId );
+    SvxPageItem( const sal_uInt16 nId );
     SvxPageItem( const SvxPageItem& rItem );
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
@@ -98,17 +98,17 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    virtual SfxPoolItem*     Create( SvStream&, USHORT ) const;
-    virtual SvStream&        Store( SvStream& , USHORT nItemVersion ) const;
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+    virtual SfxPoolItem*     Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&        Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     // Ausrichtung
-    USHORT          GetPageUsage() const                { return eUse;       }
-    void            SetPageUsage(USHORT eU)             { eUse= eU;          }
+    sal_uInt16          GetPageUsage() const                { return eUse;       }
+    void            SetPageUsage(sal_uInt16 eU)             { eUse= eU;          }
 
-    BOOL            IsLandscape() const                 { return bLandscape; }
-    void            SetLandscape(BOOL bL)               { bLandscape = bL;   }
+    sal_Bool            IsLandscape() const                 { return bLandscape; }
+    void            SetLandscape(sal_Bool bL)               { bLandscape = bL;   }
 
     // Numerierung
     SvxNumType      GetNumType() const                  { return eNumType;   }
@@ -135,9 +135,9 @@ Dieses Item dient als Container fuer Header- und Footer-Attribute.
 class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem
 {
 public:
-    SvxSetItem( const USHORT nId, const SfxItemSet& rSet );
+    SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet );
     SvxSetItem( const SvxSetItem& rItem );
-    SvxSetItem( const USHORT nId, SfxItemSet* pSet );
+    SvxSetItem( const sal_uInt16 nId, SfxItemSet* pSet );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
@@ -146,8 +146,8 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream&, sal_uInt16 nItemVersion ) const;
 };
 
 
diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx
index 25f454daee6d..f01c9f4948b5 100644
--- a/svx/inc/svx/paraprev.hxx
+++ b/svx/inc/svx/paraprev.hxx
@@ -59,15 +59,15 @@ private:
     long                nRightMargin;
     short               nFirstLineOfst;
     // Abstaende
-    USHORT              nUpper;
-    USHORT              nLower;
+    sal_uInt16              nUpper;
+    sal_uInt16              nLower;
     // Ausrichtung
     SvxAdjust           eAdjust;
     // Letzte Zeile im Blocksatz
     SvxAdjust           eLastLine;
     // Zeilenabstand
     SvxPrevLineSpace    eLine;
-    USHORT              nLineVal;
+    sal_uInt16              nLineVal;
 
     String              aText;
     Rectangle           Lines[9];
@@ -75,7 +75,7 @@ private:
 protected:
     virtual void Paint( const Rectangle& rRect );
 
-    void DrawParagraph( BOOL bAll );
+    void DrawParagraph( sal_Bool bAll );
 
 public:
     SvxParaPrevWindow( Window* pParent, const ResId& rId );
@@ -83,11 +83,11 @@ public:
     void        SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; }
     void        SetLeftMargin( long nNew )  { nLeftMargin = nNew; }
     void        SetRightMargin( long nNew ) { nRightMargin = nNew; }
-    void        SetUpper( USHORT nNew )         { nUpper = nNew; }
-    void        SetLower( USHORT nNew )         { nLower = nNew; }
+    void        SetUpper( sal_uInt16 nNew )         { nUpper = nNew; }
+    void        SetLower( sal_uInt16 nNew )         { nLower = nNew; }
     void        SetAdjust( SvxAdjust eNew )     { eAdjust = eNew; }
     void        SetLastLine( SvxAdjust eNew )   { eLastLine = eNew; }
-    void        SetLineSpace( SvxPrevLineSpace eNew, USHORT nNew = 0 )
+    void        SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 )
                     {   eLine = eNew; nLineVal = nNew; }
     void        SetText( const String& rStr )   { aText = rStr; }
     void        SetSize( Size aNew )            { aSize = aNew; }
@@ -95,18 +95,18 @@ public:
     short       GetFirstLineOfst() const        { return nFirstLineOfst; }
     long        GetLeftMargin() const           { return nLeftMargin; }
     long        GetRightMargin() const          { return nRightMargin; }
-    USHORT      GetUpper() const                { return nUpper; }
-    USHORT      GetLower() const                { return nLower; }
+    sal_uInt16      GetUpper() const                { return nUpper; }
+    sal_uInt16      GetLower() const                { return nLower; }
     SvxAdjust   GetAdjust() const               { return eAdjust; }
 
     SvxPrevLineSpace    GetLineEnum() const     { return eLine; }
-    USHORT              GetLineValue() const    { return nLineVal; }
+    sal_uInt16              GetLineValue() const    { return nLineVal; }
     String              GetText() const         { return aText; }
     Size                GetSize() const         { return aSize; }
 
     void        OutputSizeChanged();
 
-    void        Draw( BOOL bAll )               { DrawParagraph( bAll ); }
+    void        Draw( sal_Bool bAll )               { DrawParagraph( bAll ); }
 };
 
 #endif
diff --git a/svx/inc/svx/passwd.hxx b/svx/inc/svx/passwd.hxx
index 9a6b14f0144a..a52caa23335e 100644
--- a/svx/inc/svx/passwd.hxx
+++ b/svx/inc/svx/passwd.hxx
@@ -66,13 +66,13 @@ private:
 
     Link            aCheckPasswordHdl;
 
-    BOOL            bEmpty;
+    sal_Bool            bEmpty;
 
     DECL_LINK( ButtonHdl, OKButton * );
     DECL_LINK( EditModifyHdl, Edit * );
 
 public:
-                    SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords = FALSE, BOOL bDisableOldPassword = FALSE );
+                    SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False );
                     ~SvxPasswordDialog();
 
     String          GetOldPassword() const { return aOldPasswdED.GetText(); }
diff --git a/svx/inc/svx/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx
index 93d99c4774a2..a3ed8bf6b050 100644
--- a/svx/inc/svx/pfiledlg.hxx
+++ b/svx/inc/svx/pfiledlg.hxx
@@ -46,13 +46,13 @@ private:
 public:
     // with nKind = SID_INSERT_SOUND    or
     //      nKind = SID_INSERT_VIDEO
-    SvxPluginFileDlg (Window *pParent, USHORT nKind );
+    SvxPluginFileDlg (Window *pParent, sal_uInt16 nKind );
     ~SvxPluginFileDlg ();
 
     ErrCode                  Execute();
     String                   GetPath() const;
 
-    static bool IsAvailable (USHORT nKind);
+    static bool IsAvailable (sal_uInt16 nKind);
 
     void                    SetContext( sfx2::FileDialogHelper::Context eNewContext );
 };
diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx
index 0517b6464907..9b2b469d3dac 100644
--- a/svx/inc/svx/polygn3d.hxx
+++ b/svx/inc/svx/polygn3d.hxx
@@ -38,7 +38,7 @@ private:
     basegfx::B3DPolyPolygon aPolyPoly3D;
     basegfx::B3DPolyPolygon aPolyNormals3D;
     basegfx::B2DPolyPolygon aPolyTexture2D;
-    BOOL            bLineOnly;
+    sal_Bool            bLineOnly;
 
     SVX_DLLPRIVATE void CreateDefaultNormals();
     SVX_DLLPRIVATE void CreateDefaultTexture();
@@ -56,18 +56,18 @@ public:
     E3dPolygonObj(
         E3dDefaultAttributes& rDefault,
         const basegfx::B3DPolyPolygon& rPolyPoly3D,
-        BOOL bLinOnly=FALSE);
+        sal_Bool bLinOnly=sal_False);
     E3dPolygonObj(
         E3dDefaultAttributes& rDefault,
         const basegfx::B3DPolyPolygon& rPolyPoly3D,
         const basegfx::B3DPolyPolygon& rPolyNormals3D,
-        BOOL bLinOnly=FALSE);
+        sal_Bool bLinOnly=sal_False);
     E3dPolygonObj(
         E3dDefaultAttributes& rDefault,
         const basegfx::B3DPolyPolygon& rPolyPoly3D,
         const basegfx::B3DPolyPolygon& rPolyNormals3D,
         const basegfx::B2DPolyPolygon& rPolyTexture2D,
-        BOOL bLinOnly=FALSE);
+        sal_Bool bLinOnly=sal_False);
 
     E3dPolygonObj();
     virtual ~E3dPolygonObj();
@@ -76,14 +76,14 @@ public:
     const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; }
     const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; }
 
-    virtual UINT16 GetObjIdentifier() const;
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void operator=(const SdrObject&);
 
     // LineOnly?
-    BOOL GetLineOnly() { return bLineOnly; }
-    void SetLineOnly(BOOL bNew);
+    sal_Bool GetLineOnly() { return bLineOnly; }
+    void SetLineOnly(sal_Bool bNew);
 };
 
 #endif          // _E3D_POLYGON3D_HXX
diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx
index d33a12b671c1..2375a85ecb9b 100644
--- a/svx/inc/svx/polysc3d.hxx
+++ b/svx/inc/svx/polysc3d.hxx
@@ -44,7 +44,7 @@ public:
     E3dPolyScene();
     E3dPolyScene(E3dDefaultAttributes& rDefault);
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 };
 
 #endif          // _E3D_POLYSC3D_HXX
diff --git a/svx/inc/svx/postattr.hxx b/svx/inc/svx/postattr.hxx
index 840312cf0c46..5d75187b58b5 100644
--- a/svx/inc/svx/postattr.hxx
+++ b/svx/inc/svx/postattr.hxx
@@ -46,9 +46,9 @@ class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem
 public:
     TYPEINFO();
 
-    SvxPostItAuthorItem( USHORT nWhich  );
+    SvxPostItAuthorItem( sal_uInt16 nWhich  );
 
-    SvxPostItAuthorItem( const String& rAuthor, USHORT nWhich  );
+    SvxPostItAuthorItem( const String& rAuthor, sal_uInt16 nWhich  );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -78,9 +78,9 @@ class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem
 public:
     TYPEINFO();
 
-    SvxPostItDateItem( USHORT nWhich  );
+    SvxPostItDateItem( sal_uInt16 nWhich  );
 
-    SvxPostItDateItem( const String& rDate, USHORT nWhich  );
+    SvxPostItDateItem( const String& rDate, sal_uInt16 nWhich  );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -109,9 +109,9 @@ class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem
 public:
     TYPEINFO();
 
-    SvxPostItTextItem( USHORT nWhich  );
+    SvxPostItTextItem( sal_uInt16 nWhich  );
 
-    SvxPostItTextItem( const String& rText, USHORT nWhich  );
+    SvxPostItTextItem( const String& rText, sal_uInt16 nWhich  );
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx
index 54ec2788521f..4d6e8d29d49d 100644
--- a/svx/inc/svx/pszctrl.hxx
+++ b/svx/inc/svx/pszctrl.hxx
@@ -47,14 +47,14 @@ private:
 public:
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxPosSizeStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     ~SvxPosSizeStatusBarControl();
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rEvt );
     virtual void    Command( const CommandEvent& rCEvt );
 
-    static ULONG    GetDefItemWidth( const StatusBar& rStb );
+    static sal_uIntPtr  GetDefItemWidth( const StatusBar& rStb );
 };
 
 
diff --git a/svx/inc/svx/relfld.hxx b/svx/inc/svx/relfld.hxx
index 02d9ca20a5d3..192870b1d1b9 100644
--- a/svx/inc/svx/relfld.hxx
+++ b/svx/inc/svx/relfld.hxx
@@ -46,12 +46,12 @@
 class SVX_DLLPUBLIC SvxRelativeField : public MetricField
 {
 private:
-    USHORT          nRelMin;
-    USHORT          nRelMax;
-    USHORT          nRelStep;
-    BOOL            bRelativeMode;
-    BOOL            bRelative;
-    BOOL            bNegativeEnabled;
+    sal_uInt16          nRelMin;
+    sal_uInt16          nRelMax;
+    sal_uInt16          nRelStep;
+    sal_Bool            bRelativeMode;
+    sal_Bool            bRelative;
+    sal_Bool            bNegativeEnabled;
 
 protected:
     void            Modify();
@@ -60,12 +60,12 @@ public:
     SvxRelativeField( Window* pParent, WinBits nWinStyle = 0 );
     SvxRelativeField( Window* pParent, const ResId& rResId );
 
-    void            EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150,
-                                        USHORT nStep = 5 );
-    BOOL            IsRelativeMode() const { return bRelativeMode; }
-    void            SetRelative( BOOL bRelative = FALSE );
-    BOOL            IsRelative() const { return bRelative; }
-    void            EnableNegativeMode() {bNegativeEnabled = TRUE;}
+    void            EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150,
+                                        sal_uInt16 nStep = 5 );
+    sal_Bool            IsRelativeMode() const { return bRelativeMode; }
+    void            SetRelative( sal_Bool bRelative = sal_False );
+    sal_Bool            IsRelative() const { return bRelative; }
+    void            EnableNegativeMode() {bNegativeEnabled = sal_True;}
 };
 
 
diff --git a/svx/inc/svx/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx
index 8177713e6013..d379713e9a37 100644
--- a/svx/inc/svx/rotmodit.hxx
+++ b/svx/inc/svx/rotmodit.hxx
@@ -47,21 +47,21 @@ class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem
 public:
                 TYPEINFO();
 
-                SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, USHORT nWhich=0);
+                SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0);
                 SvxRotateModeItem( const SvxRotateModeItem& rItem );
                 ~SvxRotateModeItem();
 
-    virtual USHORT              GetValueCount() const;
-    virtual String              GetValueText( USHORT nVal ) const;
+    virtual sal_uInt16              GetValueCount() const;
+    virtual String              GetValueText( sal_uInt16 nVal ) const;
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*        Create(SvStream &, USHORT) const;
-    virtual USHORT              GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*        Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16              GetVersion( sal_uInt16 nFileVersion ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                                  SfxMapUnit eCoreMetric,
                                                  SfxMapUnit ePresMetric,
                                                  String& rText, const IntlWrapper * = 0 ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 
diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index e8deecfed145..6b37b0cb85b0 100644
--- a/svx/inc/svx/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
@@ -65,7 +65,7 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow
 {
  public:
 
-    SvxRubyChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    SvxRubyChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW( SvxRubyChildWindow );
 
@@ -128,7 +128,7 @@ class SvxRubyDialog : public SfxModelessDialog
     long                nLastPos;
     long                nCurrentEdit;
 
-    BOOL                bModified;
+    sal_Bool                bModified;
 
     com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl;
     SfxBindings*    pBindings;
@@ -152,13 +152,13 @@ class SvxRubyDialog : public SfxModelessDialog
     void                AssertOneEntry();
 
     void                Update();
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
 
     long                GetLastPos() const {return nLastPos;}
     void                SetLastPos(long nSet) {nLastPos = nSet;}
 
-    BOOL                IsModified() const {return bModified;}
-    void                SetModified(BOOL bSet) {bModified = bSet;}
+    sal_Bool                IsModified() const {return bModified;}
+    void                SetModified(sal_Bool bSet) {bModified = bSet;}
 
     void EnableControls(sal_Bool bEnable)
         {
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index d27f3a079495..8031dbbd3112 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -63,13 +63,13 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     SvxObjectItem *pObjectItem;    //Objekt
     Window *pEditWin;
     SvxRuler_Impl *pRuler_Imp;
-    BOOL bAppSetNullOffset :1;
-    BOOL bHorz :1;
+    sal_Bool bAppSetNullOffset :1;
+    sal_Bool bHorz :1;
     long lLogicNullOffset;      // in logischen Koordinaten
     long lAppNullOffset;        // in logischen Koordinaten
     long lMinFrame;             // minimale Framebreite in Pixel
     long lInitialDragPos;
-    USHORT nFlags;
+    sal_uInt16 nFlags;
     enum {
         NONE = 0x0000,
         DRAG_OBJECT =  0x0001,
@@ -82,28 +82,28 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
         DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL
         }
     nDragType;
-    USHORT nDefTabType;
-    USHORT nTabCount;
-    USHORT nTabBufSize;
+    sal_uInt16 nDefTabType;
+    sal_uInt16 nTabCount;
+    sal_uInt16 nTabBufSize;
     long lDefTabDist;
     long lTabPos;
     RulerTab *pTabs;            // Tabpositionen in Pixel
     RulerIndent *pIndents;      // Absatzraender in Pixel
     RulerBorder *pBorders;
-    USHORT nBorderCount;
+    sal_uInt16 nBorderCount;
     RulerBorder *pObjectBorders;
     SfxBindings *pBindings;
     long nDragOffset;
     long nMaxLeft;
     long nMaxRight;
-    BOOL bValid;
-    BOOL bListening;
-    BOOL bActive;
+    sal_Bool bValid;
+    sal_Bool bListening;
+    sal_Bool bActive;
 //#if 0 // _SOLAR__PRIVATE
     void StartListening_Impl();
-    long GetCorrectedDragPos( BOOL bLeft = TRUE, BOOL bRight = TRUE );
-    void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE);
-    USHORT GetObjectBordersOff(USHORT nIdx) const;
+    long GetCorrectedDragPos( sal_Bool bLeft = sal_True, sal_Bool bRight = sal_True );
+    void DrawLine_Impl(long &lTabPos, int, sal_Bool Hori=sal_True);
+    sal_uInt16 GetObjectBordersOff(sal_uInt16 nIdx) const;
 
     // Seitenr"ander oder umgebender Rahmen
     void UpdateFrame(const SvxLongLRSpaceItem *);
@@ -118,7 +118,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     // Seitenposition und -breite
     void Update(const SvxPagePosSizeItem *);
     // Spalten
-    void Update(const SvxColumnItem *, USHORT nSID);
+    void Update(const SvxColumnItem *, sal_uInt16 nSID);
     // Object Selektion
     void Update(const SvxObjectItem *);
     // Protect
@@ -192,8 +192,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     DECL_LINK( MenuSelect, Menu * );
     void PrepareProportional_Impl(RulerType);
 
-    USHORT GetNextVisible(USHORT nColumn);
-    USHORT GetPrevVisible(USHORT nColumn);
+    sal_uInt16 GetNextVisible(sal_uInt16 nColumn);
+    sal_uInt16 GetPrevVisible(sal_uInt16 nColumn);
 //#endif
 
     void Update();
@@ -217,16 +217,16 @@ protected:
 
     // Berechnung der Grenzwerte fuer Objectgrenzen
     // Werte sind bezogen auf die Seite
-    virtual BOOL    CalcLimits(long &nMax1, long &nMax2, BOOL bFirst) const;
-    BOOL IsActLastColumn(
-        BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const ;
-    BOOL IsActFirstColumn(
-        BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const;
-    USHORT GetActLeftColumn(
-        BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const;
-    USHORT GetActRightColumn (
-        BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const;
-    long CalcPropMaxRight(USHORT nCol=USHRT_MAX) const;
+    virtual sal_Bool    CalcLimits(long &nMax1, long &nMax2, sal_Bool bFirst) const;
+    sal_Bool IsActLastColumn(
+        sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const ;
+    sal_Bool IsActFirstColumn(
+        sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const;
+    sal_uInt16 GetActLeftColumn(
+        sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const;
+    sal_uInt16 GetActRightColumn (
+        sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const;
+    long CalcPropMaxRight(sal_uInt16 nCol=USHRT_MAX) const;
 
 public:
 #define     SVXRULER_SUPPORT_TABS                       0x0001
@@ -240,7 +240,7 @@ public:
 
     SvxRuler(Window* pParent,
              Window *pEditWin,
-             USHORT nRulerFlags,
+             sal_uInt16 nRulerFlags,
              SfxBindings &rBindings,
              WinBits nWinStyle = WB_STDRULER);
     ~SvxRuler();
@@ -248,7 +248,7 @@ public:
     void SetMinFrameSize(long lSize);
     long GetMinFrameSize() const ;
 
-    USHORT GetRulerFlags() const { return nFlags; }
+    sal_uInt16 GetRulerFlags() const { return nFlags; }
 
     void SetDefTabDist(long);
     long GetDefTabDist() const;
@@ -257,13 +257,13 @@ public:
     void SetNullOffsetLogic(long lOff = 0);
     long GetNullOffsetLogic() const { return lAppNullOffset; }
 
-    void SetActive(BOOL bOn = TRUE);
-    BOOL IsActive() const { return bActive; }
+    void SetActive(sal_Bool bOn = sal_True);
+    sal_Bool IsActive() const { return bActive; }
 
     void ForceUpdate() { Update(); }
 
     //#i24363# tab stops relative to indent
-    void SetTabsRelativeToIndent( BOOL bRel = TRUE );
+    void SetTabsRelativeToIndent( sal_Bool bRel = sal_True );
 };
 
 #endif
diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index f6b81e1eedb8..753422f609c2 100644
--- a/svx/inc/svx/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
@@ -44,8 +44,8 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
   protected:
 
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual String           GetValueText() const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -60,7 +60,7 @@ private:
 
 public:
     TYPEINFO();
-    SvxLongLRSpaceItem(long lLeft, long lRight, USHORT nId);
+    SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId);
     SvxLongLRSpaceItem(const SvxLongLRSpaceItem &);
     SvxLongLRSpaceItem();
 
@@ -80,8 +80,8 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
   protected:
 
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual String           GetValueText() const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -96,7 +96,7 @@ private:
 
 public:
     TYPEINFO();
-    SvxLongULSpaceItem(long lUpper, long lLower, USHORT nId);
+    SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId);
     SvxLongULSpaceItem(const SvxLongULSpaceItem &);
     SvxLongULSpaceItem();
 
@@ -115,8 +115,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem
     long lHeight;
 protected:
     virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual String           GetValueText() const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -145,13 +145,13 @@ struct SvxColumnDescription
 {
     long nStart;                    /* Spaltenbeginn */
     long nEnd;                      /* Spaltenende */
-    BOOL   bVisible;                   /* Sichtbarkeit */
+    sal_Bool   bVisible;                   /* Sichtbarkeit */
 
     long nEndMin;         //min. possible position of end
     long nEndMax;         //max. possible position of end
 
     SvxColumnDescription():
-        nStart(0), nEnd(0), bVisible(TRUE), nEndMin(0), nEndMax(0) {}
+        nStart(0), nEnd(0), bVisible(sal_True), nEndMin(0), nEndMax(0) {}
 
     SvxColumnDescription(const SvxColumnDescription &rCopy) :
         nStart(rCopy.nStart), nEnd(rCopy.nEnd),
@@ -159,13 +159,13 @@ struct SvxColumnDescription
         nEndMin(rCopy.nEndMin), nEndMax(rCopy.nEndMax)
          {}
 
-    SvxColumnDescription(long start, long end, BOOL bVis = TRUE):
+    SvxColumnDescription(long start, long end, sal_Bool bVis = sal_True):
         nStart(start), nEnd(end),
         bVisible(bVis),
         nEndMin(0), nEndMax(0) {}
 
     SvxColumnDescription(long start, long end,
-                        long endMin, long endMax, BOOL bVis = TRUE):
+                        long endMin, long endMax, sal_Bool bVis = sal_True):
         nStart(start), nEnd(end),
         bVisible(bVis),
         nEndMin(endMin), nEndMax(endMax)
@@ -194,9 +194,9 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
     long    nLeft,      // Linker Rand bei Tabelle
            nRight;      // Rechter Rand bei Tabelle; bei Spalten immer gleich
                         // zum umgebenden Rahmen
-    USHORT nActColumn;  // die aktuelle Spalte
-    BOOL    bTable;     // Tabelle?
-    BOOL    bOrtho;     // Gleichverteilte Spalten
+    sal_uInt16 nActColumn;  // die aktuelle Spalte
+    sal_Bool    bTable;     // Tabelle?
+    sal_Bool    bOrtho;     // Gleichverteilte Spalten
 
     void DeleteAndDestroyColumns();
 
@@ -210,47 +210,47 @@ protected:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 public:
     TYPEINFO();
     // rechter Rand des umgebenden Rahmens
     // nLeft, nRight jeweils der Abstand zum umgebenden Rahmen
-    SvxColumnItem(USHORT nAct = 0); // Spalten
-    SvxColumnItem(USHORT nActCol,
-                  USHORT nLeft, USHORT nRight = 0); // Tabelle mit Raendern
+    SvxColumnItem(sal_uInt16 nAct = 0); // Spalten
+    SvxColumnItem(sal_uInt16 nActCol,
+                  sal_uInt16 nLeft, sal_uInt16 nRight = 0); // Tabelle mit Raendern
     SvxColumnItem(const SvxColumnItem &);
     ~SvxColumnItem();
 
     const SvxColumnItem &operator=(const SvxColumnItem &);
 
-    USHORT Count() const { return aColumns.Count(); }
-    SvxColumnDescription &operator[](USHORT i)
+    sal_uInt16 Count() const { return aColumns.Count(); }
+    SvxColumnDescription &operator[](sal_uInt16 i)
         { return *(SvxColumnDescription*)aColumns[i]; }
-    const SvxColumnDescription &operator[](USHORT i) const
+    const SvxColumnDescription &operator[](sal_uInt16 i) const
         { return *(SvxColumnDescription*)aColumns[i]; }
-    void Insert(const SvxColumnDescription &rDesc, USHORT nPos) {
+    void Insert(const SvxColumnDescription &rDesc, sal_uInt16 nPos) {
         SvxColumnDescription* pDesc = new SvxColumnDescription(rDesc);
         aColumns.Insert(pDesc, nPos);
     }
     void   Append(const SvxColumnDescription &rDesc) { Insert(rDesc, Count()); }
     void   SetLeft(long left) { nLeft = left; }
     void   SetRight(long right) { nRight = right; }
-    void   SetActColumn(USHORT nCol) { nActColumn = nCol; }
+    void   SetActColumn(sal_uInt16 nCol) { nActColumn = nCol; }
 
-    USHORT GetActColumn() const { return nActColumn; }
-    BOOL   IsFirstAct() const { return nActColumn == 0; }
-    BOOL   IsLastAct() const { return nActColumn == Count()-1; }
+    sal_uInt16 GetActColumn() const { return nActColumn; }
+    sal_Bool   IsFirstAct() const { return nActColumn == 0; }
+    sal_Bool   IsLastAct() const { return nActColumn == Count()-1; }
     long GetLeft() { return nLeft; }
     long GetRight() { return nRight; }
 
-    BOOL   IsTable() const { return bTable; }
+    sal_Bool   IsTable() const { return bTable; }
 
-    BOOL   CalcOrtho() const;
-    void   SetOrtho(BOOL bVal) { bOrtho = bVal; }
-    BOOL   IsOrtho () const { return FALSE ; }
+    sal_Bool   CalcOrtho() const;
+    void   SetOrtho(sal_Bool bVal) { bOrtho = bVal; }
+    sal_Bool   IsOrtho () const { return sal_False ; }
 
-    BOOL IsConsistent() const  { return nActColumn < aColumns.Count(); }
+    sal_Bool IsConsistent() const  { return nActColumn < aColumns.Count(); }
     long   GetVisibleRight() const;// rechter sichtbare Rand der aktuellen Spalte
 };
 
@@ -263,7 +263,7 @@ private:
     long   nEndX;                      /* Ende in X-Richtung */
     long   nStartY;                    /* Beginn in Y-Richtung */
     long   nEndY;                      /* Ende in Y-Richtung */
-    BOOL   bLimits;                    /* Grenzwertkontrolle durch die Applikation */
+    sal_Bool   bLimits;                    /* Grenzwertkontrolle durch die Applikation */
 protected:
     virtual int              operator==( const SfxPoolItem& ) const;
 
@@ -274,18 +274,18 @@ protected:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 private:
     SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i.
 public:
     TYPEINFO();
     SvxObjectItem(long nStartX, long nEndX,
                   long nStartY, long nEndY,
-                  BOOL bLimits = FALSE);
+                  sal_Bool bLimits = sal_False);
     SvxObjectItem(const SvxObjectItem &);
 
-    BOOL   HasLimits() const { return bLimits; }
+    sal_Bool   HasLimits() const { return bLimits; }
 
     long   GetStartX() const { return nStartX; }
     long   GetEndX() const { return nEndX; }
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index dfda9ac1a36e..a55eac577419 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -128,7 +128,7 @@ public:
         { return ((const Svx3DFocalLengthItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); }
 
     // Two sided lighting:
-    BOOL GetTwoSidedLighting() const
+    sal_Bool GetTwoSidedLighting() const
         { return ((const Svx3DTwoSidedLightingItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); }
 
     // Lightcolor:
@@ -154,21 +154,21 @@ public:
         { return ((const Svx3DAmbientcolorItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue(); }
 
     // Light on/off:
-    BOOL GetLightOnOff1() const
+    sal_Bool GetLightOnOff1() const
         { return ((const Svx3DLightOnOff1Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); }
-    BOOL GetLightOnOff2() const
+    sal_Bool GetLightOnOff2() const
         { return ((const Svx3DLightOnOff2Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); }
-    BOOL GetLightOnOff3() const
+    sal_Bool GetLightOnOff3() const
         { return ((const Svx3DLightOnOff3Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); }
-    BOOL GetLightOnOff4() const
+    sal_Bool GetLightOnOff4() const
         { return ((const Svx3DLightOnOff4Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); }
-    BOOL GetLightOnOff5() const
+    sal_Bool GetLightOnOff5() const
         { return ((const Svx3DLightOnOff5Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); }
-    BOOL GetLightOnOff6() const
+    sal_Bool GetLightOnOff6() const
         { return ((const Svx3DLightOnOff6Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); }
-    BOOL GetLightOnOff7() const
+    sal_Bool GetLightOnOff7() const
         { return ((const Svx3DLightOnOff7Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); }
-    BOOL GetLightOnOff8() const
+    sal_Bool GetLightOnOff8() const
         { return ((const Svx3DLightOnOff8Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); }
 
     // Light direction:
@@ -198,9 +198,9 @@ public:
         { return ((const Svx3DShadeModeItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); }
 
     // set flag to draw only selected
-    void SetDrawOnlySelected(BOOL bNew) { bDrawOnlySelected = bNew; }
+    void SetDrawOnlySelected(sal_Bool bNew) { bDrawOnlySelected = bNew; }
     bool GetDrawOnlySelected() const { return bDrawOnlySelected; }
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 
     virtual void    NbcSetSnapRect(const Rectangle& rRect);
     virtual void    NbcMove(const Size& rSize);
@@ -233,7 +233,7 @@ public:
     B3dCamera& GetCameraSet() { return aCameraSet; }
 
     // Aufbrechen
-    virtual BOOL IsBreakObjPossible();
+    virtual sal_Bool IsBreakObjPossible();
 
     basegfx::B3DVector GetShadowPlaneDirection() const;
     void SetShadowPlaneDirection(const basegfx::B3DVector& rVec);
@@ -243,7 +243,7 @@ public:
 
     // create moves
     virtual FASTBOOL BegCreate(SdrDragStat& rStat);
-    virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden
+    virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden
     virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
     virtual FASTBOOL BckCreate(SdrDragStat& rStat);
     virtual void BrkCreate(SdrDragStat& rStat);
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx
index f78a98081efb..381221354397 100644
--- a/svx/inc/svx/sdangitm.hxx
+++ b/svx/inc/svx/sdangitm.hxx
@@ -38,10 +38,10 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
 public:
     TYPEINFO();
     SdrAngleItem(): SfxInt32Item() {}
-    SdrAngleItem(USHORT nId, INT32 nAngle=0): SfxInt32Item(nId,nAngle) {}
-    SdrAngleItem(USHORT nId, SvStream& rIn):  SfxInt32Item(nId,rIn) {}
+    SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {}
+    SdrAngleItem(sal_uInt16 nId, SvStream& rIn):  SfxInt32Item(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres,
                                                 SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
index 882c25a1fdaf..889207e22d5e 100644
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/svx/inc/svx/sdasaitm.hxx
@@ -64,8 +64,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
             virtual SfxPoolItem*        Clone( SfxItemPool* pPool = NULL ) const;
             virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-            virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-            virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+            virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+            virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
 
 #ifdef SDR_ISPOOLABLE
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index 0eee8e872453..41218bd401f7 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -99,8 +99,8 @@ private:
             virtual SfxPoolItem*        Clone( SfxItemPool* pPool = NULL ) const;
             virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-            virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-            virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+            virtual sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+            virtual sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
             const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const;
 
@@ -129,7 +129,7 @@ class SdrCustomShapeReplacementURLItem : public SfxStringItem
 //---------------------------
 class SdrTextWordWrapItem : public SdrOnOffItem {
 public:
-    SdrTextWordWrapItem( BOOL bAuto = FALSE ):  SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {}
+    SdrTextWordWrapItem( sal_Bool bAuto = sal_False ):  SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {}
     SdrTextWordWrapItem( SvStream& rIn )  :     SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, rIn )   {}
 };
 
@@ -138,7 +138,7 @@ public:
 //-------------------------------
 class SdrTextAutoGrowSizeItem : public SdrOnOffItem {
 public:
-    SdrTextAutoGrowSizeItem( BOOL bAuto = FALSE ):      SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {}
+    SdrTextAutoGrowSizeItem( sal_Bool bAuto = sal_False ):      SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {}
     SdrTextAutoGrowSizeItem( SvStream& rIn )   :        SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, rIn )   {}
 };
 
diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx
index 8ed0c2a0bb04..83a0f7806db1 100644
--- a/svx/inc/svx/sdgcoitm.hxx
+++ b/svx/inc/svx/sdgcoitm.hxx
@@ -46,7 +46,7 @@ public:
                             SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 //-------------------
@@ -63,7 +63,7 @@ public:
                             SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 //-------------------
@@ -80,7 +80,7 @@ public:
                             SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 #endif // _SDGCOITM_HXX
diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx
index 9980db89a858..0a14d64a9c53 100644
--- a/svx/inc/svx/sdgcpitm.hxx
+++ b/svx/inc/svx/sdgcpitm.hxx
@@ -43,12 +43,12 @@ public:
 
                             SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0,
                                              sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0,
-                                             USHORT nWhichId = SDRATTR_GRAFCROP ) :
+                                             sal_uInt16 nWhichId = SDRATTR_GRAFCROP ) :
                                 SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, nWhichId ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
-    virtual USHORT          GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 };
 
 #endif // _SDGCPITM_HXX
diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx
index 13026e67988b..8a3a17bdad4e 100644
--- a/svx/inc/svx/sdggaitm.hxx
+++ b/svx/inc/svx/sdggaitm.hxx
@@ -42,14 +42,14 @@ public:
 
                             TYPEINFO();
 
-                            SdrGrafGamma100Item( ULONG nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {}
+                            SdrGrafGamma100Item( sal_uIntPtr nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {}
                             SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif // _SDGGAITM_HXX
diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx
index ca43ea6b2b31..41d37fbe5642 100644
--- a/svx/inc/svx/sdginitm.hxx
+++ b/svx/inc/svx/sdginitm.hxx
@@ -42,11 +42,11 @@ public:
 
                             TYPEINFO();
 
-                            SdrGrafInvertItem( BOOL bInvert = FALSE ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
+                            SdrGrafInvertItem( sal_Bool bInvert = sal_False ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
                             SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 #endif // _SDGINITM_HXX
diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx
index 41f81f168b24..afa5eea3fd19 100644
--- a/svx/inc/svx/sdgluitm.hxx
+++ b/svx/inc/svx/sdgluitm.hxx
@@ -46,7 +46,7 @@ public:
                             SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 //----------------------
@@ -63,7 +63,7 @@ public:
                             SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 #endif // _SDGLUITM_HXX
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index 77577b31b7d2..7e79d6020ab1 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -43,15 +43,15 @@ public:
 
                             TYPEINFO();
 
-                            SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (USHORT)eMode ) {}
+                            SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {}
                             SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
+    virtual sal_uInt16          GetValueCount() const;
     GraphicDrawMode         GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); }
 
-    virtual String          GetValueTextByPos( USHORT nPos ) const;
+    virtual String          GetValueTextByPos( sal_uInt16 nPos ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                                  SfxMapUnit eCoreMetric,
                                                  SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx
index 47359d9b6bbf..af80263dba00 100644
--- a/svx/inc/svx/sdgtritm.hxx
+++ b/svx/inc/svx/sdgtritm.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
 public:
 
                             TYPEINFO();
-                            SdrGrafTransparenceItem( USHORT nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
+                            SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
                             SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 #endif // _SDGTRITM_HXX
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index 6e74cba29a59..a92e9f0944b8 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -40,10 +40,10 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
 public:
     TYPEINFO();
     SdrMetricItem(): SfxInt32Item() {}
-    SdrMetricItem(USHORT nId, INT32 nVal=0):  SfxInt32Item(nId,nVal) {}
-    SdrMetricItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
+    SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0):  SfxInt32Item(nId,nVal) {}
+    SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual FASTBOOL HasMetrics() const;
     virtual FASTBOOL ScaleMetrics(long nMul, long nDiv);
 
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index 415cfd151bc9..b5bb0b877189 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -40,12 +40,12 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
 public:
     TYPEINFO();
     SdrOnOffItem(): SfxBoolItem() {}
-    SdrOnOffItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {}
-    SdrOnOffItem(USHORT nId, SvStream& rIn):  SfxBoolItem(nId,rIn) {}
+    SdrOnOffItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {}
+    SdrOnOffItem(sal_uInt16 nId, SvStream& rIn):  SfxBoolItem(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual String  GetValueTextByVal(BOOL bVal) const;
+    virtual String  GetValueTextByVal(sal_Bool bVal) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 
diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx
index 59f31998b71a..39b102f0b4ac 100644
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/svx/inc/svx/sdprcitm.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
 public:
     TYPEINFO();
     SdrPercentItem(): SfxUInt16Item() {}
-    SdrPercentItem(USHORT nId, UINT16 nVal=0): SfxUInt16Item(nId,nVal) {}
-    SdrPercentItem(USHORT nId, SvStream& rIn):  SfxUInt16Item(nId,rIn) {}
+    SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {}
+    SdrPercentItem(sal_uInt16 nId, SvStream& rIn):  SfxUInt16Item(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 
@@ -63,10 +63,10 @@ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item
 public:
     TYPEINFO();
     SdrSignedPercentItem(): SfxInt16Item() {}
-    SdrSignedPercentItem( USHORT nId, INT16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {}
-    SdrSignedPercentItem( USHORT nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {}
+    SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {}
+    SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {}
     virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const;
 
diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx
index 95f98ce943f6..6201fbeb833c 100644
--- a/svx/inc/svx/sdshitm.hxx
+++ b/svx/inc/svx/sdshitm.hxx
@@ -37,7 +37,7 @@
 //------------------------------
 class SdrShadowItem: public SdrOnOffItem {
 public:
-    SdrShadowItem(BOOL bShadow=FALSE): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
+    SdrShadowItem(sal_Bool bShadow=sal_False): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
     SdrShadowItem(SvStream& rIn):      SdrOnOffItem(SDRATTR_SHADOW, rIn)     {}
 };
 
diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx
index 34a2cf4eb924..787ed8b3c355 100644
--- a/svx/inc/svx/sdshtitm.hxx
+++ b/svx/inc/svx/sdshtitm.hxx
@@ -35,7 +35,7 @@
 //---------------------
 class SdrShadowTransparenceItem: public SdrPercentItem {
 public:
-    SdrShadowTransparenceItem(USHORT nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {}
+    SdrShadowTransparenceItem(sal_uInt16 nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {}
     SdrShadowTransparenceItem(SvStream& rIn)   : SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,rIn)     {}
 };
 
diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx
index c10b75a8ffc7..d60e83859eaf 100644
--- a/svx/inc/svx/sdtaaitm.hxx
+++ b/svx/inc/svx/sdtaaitm.hxx
@@ -34,10 +34,10 @@
 class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item {
 public:
     TYPEINFO();
-    SdrTextAniAmountItem(INT16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
+    SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
     SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual FASTBOOL HasMetrics() const;
     virtual FASTBOOL ScaleMetrics(long nMul, long nDiv);
 
diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx
index 6459924bab5b..05f58b6abd20 100644
--- a/svx/inc/svx/sdtacitm.hxx
+++ b/svx/inc/svx/sdtacitm.hxx
@@ -33,7 +33,7 @@
 // Anzahl der Durchlaeufe. 0=Endlos.
 class SdrTextAniCountItem: public SfxUInt16Item {
 public:
-    SdrTextAniCountItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
+    SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
     SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn)  {}
 };
 
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index 2317f41bdbe1..f7d92cf97d14 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -43,17 +43,17 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT,
 class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(USHORT)eDir) {}
+    SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {}
     SdrTextAniDirectionItem(SvStream& rIn)                           : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn)  {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*   Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT         GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16         GetValueCount() const; // { return 4; }
     SdrTextAniDirection GetValue() const      { return (SdrTextAniDirection)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx
index e76ddb8ec7c4..77168575ff14 100644
--- a/svx/inc/svx/sdtagitm.hxx
+++ b/svx/inc/svx/sdtagitm.hxx
@@ -35,7 +35,7 @@
 //------------------------------------
 class SdrTextAutoGrowHeightItem: public SdrOnOffItem {
 public:
-    SdrTextAutoGrowHeightItem(BOOL bAuto=TRUE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {}
+    SdrTextAutoGrowHeightItem(sal_Bool bAuto=sal_True): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {}
     SdrTextAutoGrowHeightItem(SvStream& rIn)  : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,rIn)   {}
 };
 
@@ -44,7 +44,7 @@ public:
 //------------------------------------
 class SdrTextAutoGrowWidthItem: public SdrOnOffItem {
 public:
-    SdrTextAutoGrowWidthItem(BOOL bAuto=FALSE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {}
+    SdrTextAutoGrowWidthItem(sal_Bool bAuto=sal_False): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {}
     SdrTextAutoGrowWidthItem(SvStream& rIn)   : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,rIn)   {}
 };
 
diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx
index a7e5d9506dcb..7e59841c92c4 100644
--- a/svx/inc/svx/sdtaiitm.hxx
+++ b/svx/inc/svx/sdtaiitm.hxx
@@ -32,13 +32,13 @@
 
 class SdrTextAniStartInsideItem: public SdrYesNoItem {
 public:
-    SdrTextAniStartInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
+    SdrTextAniStartInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
     SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {}
 };
 
 class SdrTextAniStopInsideItem: public SdrYesNoItem {
 public:
-    SdrTextAniStopInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
+    SdrTextAniStopInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
     SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {}
 };
 
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index 6caba22c1ffc..e1ca695d2169 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -45,17 +45,17 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP,      // Kopfbuendig (so wie man e
 class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(USHORT)eAdj) {}
+    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {}
     SdrTextVertAdjustItem(SvStream& rIn)                               : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*      Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT            GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16            GetValueCount() const; // { return 5; }
             SdrTextVertAdjust GetValue() const      { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
@@ -72,17 +72,17 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT,     // Linksbuendig verankert
 class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(USHORT)eAdj) {}
+    SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {}
     SdrTextHorzAdjustItem(SvStream& rIn)                                 : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*      Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT            GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16            GetValueCount() const; // { return 5; }
             SdrTextHorzAdjust GetValue() const      { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index f303692644ee..90a163d426b5 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -45,8 +45,8 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
 //   Einfach nur Blinken. Direction und Amount ohne Wirkung.
 //   Frequenz siehe Delay, 0=0.5Hz (Delay=250).
 //   Count=Anzahl der blinker. 0=Endlos.
-//   StartInside: FALSE=beginnend mit Pause, TRUE=Beginnend mit Puls
-//   StopInside:  FALSE=Nach Count blinkern nicht sichtbar, TRUE=sichtbar
+//   StartInside: sal_False=beginnend mit Pause, sal_True=Beginnend mit Puls
+//   StopInside:  sal_False=Nach Count blinkern nicht sichtbar, sal_True=sichtbar
 //                (nur wenn Count!=0)
 // - SDRTEXTANI_SCROLL:
 //   Schrift laeuft rein, laeuft vollstaendig durch. Wenn ganz verschwunden
@@ -54,12 +54,12 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
 //   Delay in ms, Sonderfall Delay=0 wird auf 50ms defaulted (20Hz)
 //   Count=Durchlaufanzahl (0=Endlos)
 //   Direction: ist eben die Richtung in die gescrollt wird.
-//   StartInside: FALSE=Schrift wird auch beim ersten Durchlauf reingescrollt
-//                TRUE=Der linke Teil der Schrift steht beim ersten Durchlauf
+//   StartInside: sal_False=Schrift wird auch beim ersten Durchlauf reingescrollt
+//                sal_True=Der linke Teil der Schrift steht beim ersten Durchlauf
 //                     bereits da (im sichtbaren "Scrollbereich")
-//   StopInside:  FALSE=Schrift wird auch beim letzten Durchlauf vollstaendig
+//   StopInside:  sal_False=Schrift wird auch beim letzten Durchlauf vollstaendig
 //                      rausgescrollt
-//                TRUE=Schrift wird beim letzten Durchlauf nicht rausgescrollt
+//                sal_True=Schrift wird beim letzten Durchlauf nicht rausgescrollt
 //                (nur wenn Count!=0)
 //   Amount: Schrittweite in logischen Einheiten. Negative Werte bedeuten
 //           Pixel statt log. Einheiten. Wenn Amount=0, dann wird auf
@@ -74,31 +74,31 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
 //   Alle andern Parameter wie SDRTEXTANI_SCROLL
 // - SDRTEXTANI_SLIDE:
 //   Schrift wird nur reingeschoben bis zur Originalposition.
-//   -> also wie SCROLL mit StartInside=FALSE, StopInside=TRUE
+//   -> also wie SCROLL mit StartInside=sal_False, StopInside=TRUE
 //   und Count=1. Count=0 wird als Count=1 interpretiert.
 //   Fuer jeden Count>1 wird der Text jedoch ruekwaerts wieder vollstaendig
 //   rausgeschoben (aehnlich wie ALTERNATE) und dann wieder reingeschoben.
 //   StopInside wird nicht ausgewertet, weil immer Inside gestoppt wird.
 //   StartInside wird nicht ausgewertet, weil immer Outside gestartet wird.
 //   Alle andern Parameter wie SDRTEXTANI_SCROLL
-// StartInside,StopInside: Bei TRUE ist die anfaengliche/entgueltige
+// StartInside,StopInside: Bei sal_True ist die anfaengliche/entgueltige
 // Textposition abhaengig von der Textverankerung am Zeichenobjekt. Sie
 // entspricht der Textposition bei normalem Paint (ohne Laufschrift).
 
 class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(USHORT)eKind) {}
+    SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {}
     SdrTextAniKindItem(SvStream& rIn)                       : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*      Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT            GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16            GetValueCount() const; // { return 5; }
             SdrTextAniKind GetValue() const      { return (SdrTextAniKind)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx
index 68069fffa11f..eeb1ca587ffb 100644
--- a/svx/inc/svx/sdtayitm.hxx
+++ b/svx/inc/svx/sdtayitm.hxx
@@ -34,10 +34,10 @@
 class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item {
 public:
     TYPEINFO();
-    SdrTextAniDelayItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
+    SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
     SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn)  {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx
index 1763b24bd937..17d2e49a8499 100644
--- a/svx/inc/svx/sdtcfitm.hxx
+++ b/svx/inc/svx/sdtcfitm.hxx
@@ -35,7 +35,7 @@
 //------------------------------------
 class SdrTextContourFrameItem: public SdrOnOffItem {
 public:
-    SdrTextContourFrameItem(BOOL bOn=FALSE): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
+    SdrTextContourFrameItem(sal_Bool bOn=sal_False): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
     SdrTextContourFrameItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,rIn) {}
 };
 
diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx
index dbfbfab2aeac..a47daa354b76 100644
--- a/svx/inc/svx/sdtfchim.hxx
+++ b/svx/inc/svx/sdtfchim.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
 public:
 
     TYPEINFO();
-    SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE );
+    SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight = sal_False );
     SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation,
@@ -46,8 +46,8 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*     Clone( SfxItemPool* pPool = NULL ) const;
     SVX_DLLPRIVATE virtual  sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    SVX_DLLPRIVATE virtual  sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual  sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual  sal_Bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual  sal_Bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
 #ifdef SDR_ISPOOLABLE
     SVX_DLLPRIVATE virtual int IsPoolable() const;
diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
index 324b8f8d0143..f3f18ed8acac 100644
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/svx/inc/svx/sdtfsitm.hxx
@@ -51,21 +51,21 @@ enum SdrFitToSizeType {SDRTEXTFIT_NONE,         // - kein FitToSize
 class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(USHORT)eFit) {}
+    SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {}
     SdrTextFitToSizeTypeItem(SvStream& rIn)                        : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn)  {}
     virtual SfxPoolItem*     Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*     Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT           GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem*     Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16           GetValueCount() const; // { return 4; }
             SdrFitToSizeType GetValue() const      { return (SdrFitToSizeType)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
     virtual int              HasBoolValue() const;
-    virtual BOOL             GetBoolValue() const;
-    virtual void             SetBoolValue(BOOL bVal);
+    virtual sal_Bool             GetBoolValue() const;
+    virtual void             SetBoolValue(sal_Bool bVal);
 };
 
 #endif
diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx
index 6486cda18e31..29e13913df06 100644
--- a/svx/inc/svx/sdynitm.hxx
+++ b/svx/inc/svx/sdynitm.hxx
@@ -40,11 +40,11 @@ class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
 public:
     TYPEINFO();
     SdrYesNoItem(): SfxBoolItem() {}
-    SdrYesNoItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {}
-    SdrYesNoItem(USHORT nId, SvStream& rIn):  SfxBoolItem(nId,rIn) {}
+    SdrYesNoItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {}
+    SdrYesNoItem(sal_uInt16 nId, SvStream& rIn):  SfxBoolItem(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual String  GetValueTextByVal(BOOL bVal) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual String  GetValueTextByVal(sal_Bool bVal) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 #ifdef SDR_ISPOOLABLE
     virtual int IsPoolable() const;
diff --git a/svx/inc/svx/selctrl.hxx b/svx/inc/svx/selctrl.hxx
index 5d7fac4f4a5e..792b4862bf04 100644
--- a/svx/inc/svx/selctrl.hxx
+++ b/svx/inc/svx/selctrl.hxx
@@ -37,19 +37,19 @@
 class SVX_DLLPUBLIC SvxSelectionModeControl : public SfxStatusBarControl
 {
 public:
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void    Click();
     virtual void    Paint( const UserDrawEvent& rEvt );
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxSelectionModeControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static  ULONG   GetDefItemWidth(const StatusBar& rStb);
+    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
 
 private:
-    USHORT  nState;
+    sal_uInt16  nState;
 
 #ifdef _SVX_SELCTRL_CXX
     SVX_DLLPRIVATE void DrawItemText_Impl();
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index e24dedbdc22c..c9c59c64f6c3 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -72,11 +72,11 @@ private:
     SvxSimpTblContainer aPrivContainer;
     HeaderBar           aHeaderBar;
     long                nOldPos;
-    USHORT              nHeaderItemId;
-    BOOL                bResizeFlag;
-    BOOL                bPaintFlag;
-    BOOL                bSortDirection;
-    USHORT              nSortCol;
+    sal_uInt16              nHeaderItemId;
+    sal_Bool                bResizeFlag;
+    sal_Bool                bPaintFlag;
+    sal_Bool                bSortDirection;
+    sal_uInt16              nSortCol;
     Window*             pMyParentWin;
 
     DECL_LINK( StartDragHdl, HeaderBar* );
@@ -112,7 +112,7 @@ public:
     ~SvxSimpleTable();
 
     void            InsertHeaderEntry(const XubString& rText,
-                            USHORT nCol=HEADERBAR_APPEND,
+                            sal_uInt16 nCol=HEADERBAR_APPEND,
                             HeaderBarItemBits nBits = HIB_STDSTYLE);
 
     void            SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
@@ -137,11 +137,11 @@ public:
 
     void            ShowTable();
     void            HideTable();
-    BOOL            IsVisible() const;
+    sal_Bool            IsVisible() const;
 
     void            EnableTable();
     void            DisableTable();
-    BOOL            IsEnabled() const;
+    sal_Bool            IsEnabled() const;
 
     void            TableToTop();
     void            SetPosPixel( const Point& rNewPos );
@@ -154,11 +154,11 @@ public:
     Size            GetSizePixel() const;
     Size            GetOutputSizePixel() const;
 
-    USHORT          GetSelectedCol();
-    void            SortByCol(USHORT,BOOL bDir=TRUE);
-    BOOL            GetSortDirection(){ return bSortDirection;}
-    USHORT          GetSortedCol(){ return nSortCol;}
-    SvLBoxItem*     GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const;
+    sal_uInt16          GetSelectedCol();
+    void            SortByCol(sal_uInt16,sal_Bool bDir=sal_True);
+    sal_Bool            GetSortDirection(){ return bSortDirection;}
+    sal_uInt16          GetSortedCol(){ return nSortCol;}
+    SvLBoxItem*     GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const;
 
     CommandEvent    GetCommandEvent()const;
     inline sal_Bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx
index 90dfca18c173..08c5c4eff7f1 100644
--- a/svx/inc/svx/sphere3d.hxx
+++ b/svx/inc/svx/sphere3d.hxx
@@ -67,8 +67,8 @@ public:
     sal_uInt32 GetVerticalSegments() const
         { return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); }
 
-    virtual UINT16 GetObjIdentifier() const;
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void operator=(const SdrObject&);
 
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 0253f61a7785..c2a7893be044 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -64,7 +64,7 @@ struct SearchDlg_Impl;
 
 struct SearchAttrItem
 {
-    USHORT          nSlot;
+    sal_uInt16          nSlot;
     SfxPoolItem*    pItem;
 };
 
@@ -82,17 +82,17 @@ public:
     void            Put( const SfxItemSet& rSet );
     SfxItemSet&     Get( SfxItemSet& rSet );
     void            Clear();
-    USHORT          Count() const { return SrchAttrItemList::Count(); }
-    SearchAttrItem& operator[](USHORT nPos) const
+    sal_uInt16          Count() const { return SrchAttrItemList::Count(); }
+    SearchAttrItem& operator[](sal_uInt16 nPos) const
                         { return SrchAttrItemList::operator[]( nPos ); }
-    SearchAttrItem& GetObject( USHORT nPos ) const
+    SearchAttrItem& GetObject( sal_uInt16 nPos ) const
                         { return SrchAttrItemList::GetObject( nPos ); }
 
     // der Pointer auf das Item wird nicht kopiert!!! (also nicht l"oschen)
     void Insert( const SearchAttrItem& rItem )
         { SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); }
     // l"oscht die Pointer auf die Items
-    void Remove( USHORT nPos, USHORT nLen = 1 );
+    void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
 };
 
 #ifndef SV_NODIALOG
@@ -107,7 +107,7 @@ class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
 {
     SvxSearchDialog *dialog;
 public:
-    SvxSearchDialogWrapper( Window*pParent, USHORT nId,
+    SvxSearchDialogWrapper( Window*pParent, sal_uInt16 nId,
                             SfxBindings* pBindings, SfxChildWinInfo* pInfo );
 
     ~SvxSearchDialogWrapper ();
@@ -140,7 +140,7 @@ public:
     SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind );
     ~SvxSearchDialog();
 
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 
     // Window
     virtual void    Activate();
@@ -153,12 +153,12 @@ public:
     const SearchAttrItemList*   GetReplaceItemList() const
                                     { return pReplaceList; }
 
-    inline BOOL     HasSearchAttributes() const;
-    inline BOOL     HasReplaceAttributes() const;
+    inline sal_Bool     HasSearchAttributes() const;
+    inline sal_Bool     HasReplaceAttributes() const;
 
     PushButton&     GetReplaceBtn() { return aReplaceBtn; }
 
-    INT32           GetTransliterationFlags() const;
+    sal_Int32           GetTransliterationFlags() const;
 
 private:
     FixedText       aSearchText;
@@ -214,14 +214,14 @@ private:
     CheckBox        aAllSheetsCB;
 
     SfxBindings&    rBindings;
-    BOOL            bWriter;
-    BOOL            bSearch;
-    BOOL            bFormat;
-    USHORT          nOptions;
+    sal_Bool            bWriter;
+    sal_Bool            bSearch;
+    sal_Bool            bFormat;
+    sal_uInt16          nOptions;
     FASTBOOL        bSet;
     FASTBOOL        bReadOnly;
     FASTBOOL        bConstruct;
-    ULONG           nModifyFlag;
+    sal_uIntPtr         nModifyFlag;
     String          aStylesStr;
     String          aLayoutStr;
     LocalizedString aCalcStr;
@@ -240,7 +240,7 @@ private:
     SvxSearchController*    pSearchSetController;
     SvxSearchController*    pReplaceSetController;
 
-    mutable INT32           nTransliterationFlags;
+    mutable sal_Int32           nTransliterationFlags;
 
 #ifdef _SVX_SRCHDLG_CXX
     DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit );
@@ -260,31 +260,31 @@ private:
     void            Init_Impl( int bHasItemSet );
     void            InitAttrList_Impl( const SfxItemSet* pSSet,
                                        const SfxItemSet* pRSet );
-    void            Remember_Impl( const String &rStr,BOOL bSearch );
+    void            Remember_Impl( const String &rStr,sal_Bool bSearch );
     void            PaintAttrText_Impl();
-    String&         BuildAttrText_Impl( String& rStr, BOOL bSrchFlag ) const;
+    String&         BuildAttrText_Impl( String& rStr, sal_Bool bSrchFlag ) const;
 
     void            TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool );
-    void            EnableControls_Impl( const USHORT nFlags );
+    void            EnableControls_Impl( const sal_uInt16 nFlags );
     void            EnableControl_Impl( Control* pCtrl );
     void            SetItem_Impl( const SvxSearchItem* pItem );
 
     void            SetModifyFlag_Impl( const Control* pCtrl );
     void            SaveToModule_Impl();
 
-    void            ApplyTransliterationFlags_Impl( INT32 nSettings );
+    void            ApplyTransliterationFlags_Impl( sal_Int32 nSettings );
 #endif
 };
 
 #include <sfx2/layout-post.hxx>
 
-inline BOOL SvxSearchDialog::HasSearchAttributes() const
+inline sal_Bool SvxSearchDialog::HasSearchAttributes() const
 {
     int bLen = aSearchAttrText.GetText().Len();
     return ( aSearchAttrText.IsEnabled() && bLen );
 }
 
-inline BOOL SvxSearchDialog::HasReplaceAttributes() const
+inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const
 {
     int bLen = aReplaceAttrText.GetText().Len();
     return ( aReplaceAttrText.IsEnabled() && bLen );
diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx
index 36b0676fece4..f96562661703 100644
--- a/svx/inc/svx/subtoolboxcontrol.hxx
+++ b/svx/inc/svx/subtoolboxcontrol.hxx
@@ -40,7 +40,7 @@ class SVX_DLLPUBLIC SvxSubToolBoxControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxSubToolBoxControl();
 
     virtual SfxPopupWindowType  GetPopupWindowType() const;
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index 15640bb17cba..a197fded69c9 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -71,10 +71,10 @@ protected:
 
     Pointer                     aAktCreatePointer;
 
-    INT32                       nAutoCloseDistPix;
-    INT32                       nFreeHandMinDistPix;
-    UINT32                      nAktInvent;     // Aktuell eingestelltes
-    UINT16                      nAktIdent;      // Obj fuer Neuerzeugung
+    sal_Int32                       nAutoCloseDistPix;
+    sal_Int32                       nFreeHandMinDistPix;
+    sal_uInt32                      nAktInvent;     // Aktuell eingestelltes
+    sal_uInt16                      nAktIdent;      // Obj fuer Neuerzeugung
 
     unsigned                    bAutoTextEdit : 1; // Textedit nach dem erzeugen eines Textrahmens starten
     unsigned                    b1stPointAsCenter : 1;
@@ -92,9 +92,9 @@ protected:
     sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
         sal_Int16 nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject);
 
-    void ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/);
-    void HideCreateObj(/*OutputDevice* pOut, BOOL bFull*/);
-    BOOL CheckEdgeMode();
+    void ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
+    void HideCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
+    sal_Bool CheckEdgeMode();
 
 protected:
     // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -102,14 +102,14 @@ protected:
     virtual ~SdrCreateView();
 
 public:
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
     virtual void BrkAction();
     virtual void TakeActionRect(Rectangle& rRect) const;
 
-    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
 
     void SetActiveLayer(const String& rName) { aAktLayer=rName; }
     const String& GetActiveLayer() const { return aAktLayer; }
@@ -119,70 +119,70 @@ public:
     // Ist der MeasureLayer nicht gesetzt (Leerstring), so
     // wird der ActiveLayer auch fuer Bemassung verwendet.
     void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); }
-    void SetEditMode(BOOL bOn=TRUE) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
-    void SetCreateMode(BOOL bOn=TRUE) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
-    void SetGluePointEditMode(BOOL bOn=TRUE) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
+    void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
+    void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
+    void SetGluePointEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
 
     // Feststellen, ob Textwerkzeug aktiviert
-    BOOL IsTextTool() const;
+    sal_Bool IsTextTool() const;
 
     // Feststellen, ob Objektverbinderwerkzeug aktiviert
-    BOOL IsEdgeTool() const;
+    sal_Bool IsEdgeTool() const;
 
     // Feststellen, ob Bemassungswerkzeug aktiviert
-    BOOL IsMeasureTool() const;
+    sal_Bool IsMeasureTool() const;
 
-    void SetCurrentObj(UINT16 nIdent, UINT32 nInvent=SdrInventor);
-    void TakeCurrentObj(UINT16& nIdent, UINT32& nInvent) const  { nInvent=nAktInvent; nIdent=nAktIdent; }
-    UINT32 GetCurrentObjInventor() const { return nAktInvent; }
-    UINT16 GetCurrentObjIdentifier() const { return nAktIdent; }
+    void SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent=SdrInventor);
+    void TakeCurrentObj(sal_uInt16& nIdent, sal_uInt32& nInvent) const  { nInvent=nAktInvent; nIdent=nAktIdent; }
+    sal_uInt32 GetCurrentObjInventor() const { return nAktInvent; }
+    sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; }
 
     // Starten des normalen Create
-    BOOL BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+    sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
     sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject);
     void MovCreateObj(const Point& rPnt);
-    BOOL EndCreateObj(SdrCreateCmd eCmd);
+    sal_Bool EndCreateObj(SdrCreateCmd eCmd);
     void BckCreateObj();  // z.B. wieder 1 Polygonpunkt zurueck.
     void BrkCreateObj();
-    BOOL IsCreateObj() const { return pAktCreate!=NULL; }
+    sal_Bool IsCreateObj() const { return pAktCreate!=NULL; }
     SdrObject* GetCreateObj() const { return pAktCreate; }
 
     // BegCreateCaptionObj() erzeugt ein SdrCaptionObj (Legendenobjekt).
     // rObjSiz ist die anfaengliche Groesse des Legenden-Textrahmens.
     // gedraggd wird lediglich die Laenge des Zipfel.
-    BOOL BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+    sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
 
-    // Wenn TextEditAfterCreate auf TRUE steht (das ist der Default),
+    // Wenn TextEditAfterCreate auf sal_True steht (das ist der Default),
     // dann wird nach dem erzeugen eines Textrahmenobjekts (OBJ_TEXT,
     // OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION)
     // automatisch ein TextEdit (SdrObjEditView::SdrBeginTextEdit) gestartet.
-    BOOL IsTextEditAfterCreate() const { return bAutoTextEdit; }
-    void SetTextEditAfterCreate(BOOL bOn) { bAutoTextEdit = bOn; }
+    sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
+    void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; }
 
     // Erzeugen eines Kreises/Rechtecks/Textrahmens wobei der 1. Punkt
     // nicht die linke obere Ecke, sondern das Zentrum des Objekts vorgibt.
     // Persistentes Flag. Default=FALSE.
-    BOOL IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
-    void SetCreate1stPointAsCenter(BOOL bOn) { b1stPointAsCenter = bOn; }
+    sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
+    void SetCreate1stPointAsCenter(sal_Bool bOn) { b1stPointAsCenter = bOn; }
 
     // Fuer Polylines (OBJ_PLIN) und Freihandlinien (OBJ_FREELINE). Ist dieses
-    // Flag TRUE, werden diese beiden Objekttypen implizit geschlossen und in
+    // Flag sal_True, werden diese beiden Objekttypen implizit geschlossen und in
     // Polygon (OBJ_POLY) bzw. Freihandflaeche (OBJ_FREEFILL) gewandelt falls
     // zum Ende des Create die Distanz zwischen Startpunkt und Endpunkt des
     // Objekts <=n Pixel ist, wobei SetAutoCloseDistPix vorgegeben wird.
     // Default=TRUE.
-    BOOL IsAutoClosePolys() const { return bAutoClosePolys; }
-    void SetAutoClosePolys(BOOL bOn) { bAutoClosePolys=bOn; }
+    sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; }
+    void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; }
 
     // Default=5 Pixel.
-    USHORT GetAutoCloseDistPix() const { return USHORT(nAutoCloseDistPix); }
-    void SetAutoCloseDistPix(USHORT nVal) { nAutoCloseDistPix=nVal; }
+    sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); }
+    void SetAutoCloseDistPix(sal_uInt16 nVal) { nAutoCloseDistPix=nVal; }
 
     // Vorgabe des minimalen Pixelabstands zwischen 2 Bezierpunkten bei der
     // Erzeugung einer Freihandlinie.
     // Default=10 Pixel.
-    USHORT GetFreeHandMinDistPix() const { return USHORT(nFreeHandMinDistPix); }
-    void SetFreeHandMinDistPix(USHORT nVal) { nFreeHandMinDistPix=nVal; }
+    sal_uInt16 GetFreeHandMinDistPix() const { return sal_uInt16(nFreeHandMinDistPix); }
+    void SetFreeHandMinDistPix(sal_uInt16 nVal) { nFreeHandMinDistPix=nVal; }
 
     // Wer das (zur restlichen Create-Funktionalitaet von SvDraw) inkompatible
     // Create-Interface am PathObj beibehalten moechte muss das nachfolgende
@@ -190,19 +190,19 @@ public:
     //     OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL
     // Dieses Flag hat nur voruebergehenden Character. Die betroffenen
     // Applikationen sollten alsbald umgestellt werden.
-    // Default=FALSE;
-    BOOL IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
-    void SetUseIncompatiblePathCreateInterface(BOOL bOn) { bUseIncompatiblePathCreateInterface = bOn; }
+    // Default=sal_False;
+    sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
+    void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
     void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV);
     void HideConnectMarker();
 
     // Attribute des ggf. gerade in der Erzeugung befindlichen Objekts
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
-    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 };
 
 #endif //_SVDCRTV_HXX
diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx
index a9e5d175680c..d702a6eac5ab 100644
--- a/svx/inc/svx/svddef.hxx
+++ b/svx/inc/svx/svddef.hxx
@@ -95,7 +95,7 @@
 #define SDRATTR_MISC_FIRST              (SDRATTR_CAPTION_LAST + 1)  /* 1097   */ /* 1097   */ /* 1080   */ /* Pool V1: 1053 */
 #define SDRATTR_ECKENRADIUS             (SDRATTR_MISC_FIRST + 0)   /*   1097 */ /*   1097 */ /*   1080 long, def=0       */
 #define SDRATTR_TEXT_MINFRAMEHEIGHT     (SDRATTR_MISC_FIRST + 1)   /*   1098 */ /*   1098 */ /*   1081 long, def=0       */
-#define SDRATTR_TEXT_AUTOGROWHEIGHT     (SDRATTR_MISC_FIRST + 2)   /*   1099 */ /*   1099 */ /*   1082 BOOL, def=TRUE    */
+#define SDRATTR_TEXT_AUTOGROWHEIGHT     (SDRATTR_MISC_FIRST + 2)   /*   1099 */ /*   1099 */ /*   1082 sal_Bool, def=sal_True    */
 #define SDRATTR_TEXT_FITTOSIZE          (SDRATTR_MISC_FIRST + 3)   /*   1100 */ /*   1100 */ /*   1083 enum, def=SDRTEXTFIT_NONE */
 #define SDRATTR_TEXT_LEFTDIST           (SDRATTR_MISC_FIRST + 4)   /*   1101 */ /*   1101 */ /*   1084 long, def=0 */ /* Pool V2 */
 #define SDRATTR_TEXT_RIGHTDIST          (SDRATTR_MISC_FIRST + 5)   /*   1102 */ /*   1102 */ /*   1085 long, def=0 */ /* Pool V2 */
@@ -105,15 +105,15 @@
 #define SDRATTR_TEXT_MAXFRAMEHEIGHT     (SDRATTR_MISC_FIRST + 9)   /*   1106 */ /*   1106 */ /*   1089 long, def=0     - Pool V2 */
 #define SDRATTR_TEXT_MINFRAMEWIDTH      (SDRATTR_MISC_FIRST +10)   /*   1107 */ /*   1107 */ /*   1090 long, def=0     - Pool V2 */
 #define SDRATTR_TEXT_MAXFRAMEWIDTH      (SDRATTR_MISC_FIRST +11)   /*   1108 */ /*   1108 */ /*   1091 long, def=0     - Pool V2 */
-#define SDRATTR_TEXT_AUTOGROWWIDTH      (SDRATTR_MISC_FIRST +12)   /*   1109 */ /*   1109 */ /*   1092 BOOL, def=FALSE - Pool V2 */
+#define SDRATTR_TEXT_AUTOGROWWIDTH      (SDRATTR_MISC_FIRST +12)   /*   1109 */ /*   1109 */ /*   1092 sal_Bool, def=sal_False - Pool V2 */
 #define SDRATTR_TEXT_HORZADJUST         (SDRATTR_MISC_FIRST +13)   /*   1110 */ /*   1110 */ /*   1093 enum, def=SDRTEXTHORZADJUST_LEFT */ /* Pool V2+ (04-12-1995) */
 #define SDRATTR_TEXT_ANIKIND            (SDRATTR_MISC_FIRST +14)   /*   1111 */ /*   1111 */ /*   1094 enum, def=SDRTEXTANI_NONE - Pool V2/V4 */
 #define SDRATTR_TEXT_ANIDIRECTION       (SDRATTR_MISC_FIRST +15)   /*   1112 */ /*   1112 */ /*   1095 enum, def=SDRTEXTANI_LEFT - Pool V2/V4 */
-#define SDRATTR_TEXT_ANISTARTINSIDE     (SDRATTR_MISC_FIRST +16)   /*   1113 */ /*   1113 */ /*   1096 BOOL, def=FALSE - Pool V2/V4 */
-#define SDRATTR_TEXT_ANISTOPINSIDE      (SDRATTR_MISC_FIRST +17)   /*   1114 */ /*   1114 */ /*   1097 BOOL, def=FALSE - Pool V2/V4 */
-#define SDRATTR_TEXT_ANICOUNT           (SDRATTR_MISC_FIRST +18)   /*   1115 */ /*   1115 */ /*   1098 USHORT, def=0   - Pool V2/V4 */
-#define SDRATTR_TEXT_ANIDELAY           (SDRATTR_MISC_FIRST +19)   /*   1116 */ /*   1116 */ /*   1099 USHORT, def=0   - Pool V2/V4 */
-#define SDRATTR_TEXT_ANIAMOUNT          (SDRATTR_MISC_FIRST +20)   /*   1117 */ /*   1117 */ /*   1100 USHORT, def=0   - Pool V2/V4 */
+#define SDRATTR_TEXT_ANISTARTINSIDE     (SDRATTR_MISC_FIRST +16)   /*   1113 */ /*   1113 */ /*   1096 sal_Bool, def=sal_False - Pool V2/V4 */
+#define SDRATTR_TEXT_ANISTOPINSIDE      (SDRATTR_MISC_FIRST +17)   /*   1114 */ /*   1114 */ /*   1097 sal_Bool, def=sal_False - Pool V2/V4 */
+#define SDRATTR_TEXT_ANICOUNT           (SDRATTR_MISC_FIRST +18)   /*   1115 */ /*   1115 */ /*   1098 sal_uInt16, def=0   - Pool V2/V4 */
+#define SDRATTR_TEXT_ANIDELAY           (SDRATTR_MISC_FIRST +19)   /*   1116 */ /*   1116 */ /*   1099 sal_uInt16, def=0   - Pool V2/V4 */
+#define SDRATTR_TEXT_ANIAMOUNT          (SDRATTR_MISC_FIRST +20)   /*   1117 */ /*   1117 */ /*   1100 sal_uInt16, def=0   - Pool V2/V4 */
 #define SDRATTR_TEXT_CONTOURFRAME       (SDRATTR_MISC_FIRST +21)   /*   1118 */ /*   1118 */ /*   1101 */             /* Pool V2 */
 #define SDRATTR_CUSTOMSHAPE_ADJUSTMENT  (SDRATTR_MISC_FIRST +22)   /*   1119 */ /*   1119 */ /*   1102 */             /* Pool V2 */
 #define SDRATTR_XMLATTRIBUTES           (SDRATTR_MISC_FIRST +23)   /*   1120 */ /*   1120 */ /*   1103 */             /* Pool V2 */
@@ -168,10 +168,10 @@
 
 // Nur fuer Interfaceing, not implemented yet.                     /*  V4+   */
 #define SDRATTR_NOTPERSIST_FIRST    (SDRATTR_CIRC_LAST + 1)          /* 1180   */ /* 1172   */ /* 1127   */ /* 1110   */ /* Pool V1: 1058 */
-#define SDRATTR_OBJMOVEPROTECT      (SDRATTR_NOTPERSIST_FIRST+ 0)  /*   1180  BOOL,   def=FALSE */
-#define SDRATTR_OBJSIZEPROTECT      (SDRATTR_NOTPERSIST_FIRST+ 1)  /*   1181  BOOL,   def=FALSE */
-#define SDRATTR_OBJPRINTABLE        (SDRATTR_NOTPERSIST_FIRST+ 2)  /*   1182  BOOL,   def=TRUE  */
-#define SDRATTR_LAYERID             (SDRATTR_NOTPERSIST_FIRST+ 3)  /*   1183  USHORT, def=0     */
+#define SDRATTR_OBJMOVEPROTECT      (SDRATTR_NOTPERSIST_FIRST+ 0)  /*   1180  sal_Bool,   def=sal_False */
+#define SDRATTR_OBJSIZEPROTECT      (SDRATTR_NOTPERSIST_FIRST+ 1)  /*   1181  sal_Bool,   def=sal_False */
+#define SDRATTR_OBJPRINTABLE        (SDRATTR_NOTPERSIST_FIRST+ 2)  /*   1182  sal_Bool,   def=sal_True  */
+#define SDRATTR_LAYERID             (SDRATTR_NOTPERSIST_FIRST+ 3)  /*   1183  sal_uInt16, def=0     */
 #define SDRATTR_LAYERNAME           (SDRATTR_NOTPERSIST_FIRST+ 4)  /*   1184  String, def=""    */
 #define SDRATTR_OBJECTNAME          (SDRATTR_NOTPERSIST_FIRST+ 5)  /*   1185  String, def=""    */
 #define SDRATTR_ALLPOSITIONX        (SDRATTR_NOTPERSIST_FIRST+ 6)  /*   1186  long,   def=0     */
diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx
index 4b24c69bafcd..00355132fab2 100644
--- a/svx/inc/svx/svddrag.hxx
+++ b/svx/inc/svx/svddrag.hxx
@@ -84,12 +84,12 @@ protected:
     void*     aReservePtr4;
 
     FASTBOOL  bShown;    // Xor sichrbar?
-    USHORT    nMinMov;   // Soviel muss erstmal minimal bewegt werden
+    sal_uInt16    nMinMov;   // Soviel muss erstmal minimal bewegt werden
     FASTBOOL  bMinMoved; // MinMove durchbrochen?
 
     FASTBOOL  bHorFixed; // nur Vertikal draggen
     FASTBOOL  bVerFixed; // nur Horizontal draggen
-    FASTBOOL  bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet
+    FASTBOOL  bWantNoSnap; // sal_True=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet
                           // werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben.
     FASTBOOL  bOrtho4;
     FASTBOOL  bOrtho8;
@@ -98,19 +98,19 @@ protected:
 
 protected:
     void Clear(FASTBOOL bLeaveOne);
-    Point& Pnt(ULONG nNum)                           { return *((Point*)aPnts.GetObject(nNum)); }
+    Point& Pnt(sal_uIntPtr nNum)                           { return *((Point*)aPnts.GetObject(nNum)); }
 //public:
     SdrDragStatUserData*    pUser;     // Userdata
 public:
     SdrDragStat(): aPnts(1024,16,16)                 { pUser=NULL; Reset(); }
-    ~SdrDragStat()                                   { Clear(FALSE); }
+    ~SdrDragStat()                                   { Clear(sal_False); }
     void         Reset();
     SdrView*     GetView() const                     { return pView; }
     void         SetView(SdrView* pV)                { pView=pV; }
     SdrPageView* GetPageView() const                 { return pPageView; }
     void         SetPageView(SdrPageView* pPV)       { pPageView=pPV; }
-    const Point& GetPoint(ULONG nNum) const          { return *((Point*)aPnts.GetObject(nNum)); }
-    ULONG        GetPointAnz() const                 { return aPnts.Count(); }
+    const Point& GetPoint(sal_uIntPtr nNum) const          { return *((Point*)aPnts.GetObject(nNum)); }
+    sal_uIntPtr        GetPointAnz() const                 { return aPnts.Count(); }
     const Point& GetStart() const                    { return GetPoint(0); }
     Point&       Start()                             { return Pnt(0); }
     const Point& GetPrev() const                     { return GetPoint(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
@@ -133,10 +133,10 @@ public:
     void         SetShown(FASTBOOL bOn)              { bShown=bOn; }
 
     FASTBOOL     IsMinMoved() const                  { return bMinMoved; }
-    void         SetMinMoved()                       { bMinMoved=TRUE; }
-    void         ResetMinMoved()                     { bMinMoved=FALSE; }
-    void         SetMinMove(USHORT nDist)            { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
-    USHORT       GetMinMove() const                  { return nMinMov; }
+    void         SetMinMoved()                       { bMinMoved=sal_True; }
+    void         ResetMinMoved()                     { bMinMoved=sal_False; }
+    void         SetMinMove(sal_uInt16 nDist)            { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
+    sal_uInt16       GetMinMove() const                  { return nMinMov; }
 
     FASTBOOL     IsHorFixed() const                  { return bHorFixed; }
     void         SetHorFixed(FASTBOOL bOn)           { bHorFixed=bOn; }
@@ -146,16 +146,16 @@ public:
     // Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!"
     // z.B. fuer den Winkel des Kreisbogen...
     FASTBOOL     IsNoSnap() const                     { return bWantNoSnap; }
-    void         SetNoSnap(FASTBOOL bOn=TRUE)         { bWantNoSnap=bOn; }
+    void         SetNoSnap(FASTBOOL bOn=sal_True)         { bWantNoSnap=bOn; }
 
     // Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins)
     // sinnvoll auf ihm angewendet werden kann.
     // Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt)
     FASTBOOL     IsOrtho4Possible() const             { return bOrtho4; }
-    void         SetOrtho4Possible(FASTBOOL bOn=TRUE) { bOrtho4=bOn; }
+    void         SetOrtho4Possible(FASTBOOL bOn=sal_True) { bOrtho4=bOn; }
     // Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien)
     FASTBOOL     IsOrtho8Possible() const             { return bOrtho8; }
-    void         SetOrtho8Possible(FASTBOOL bOn=TRUE) { bOrtho8=bOn; }
+    void         SetOrtho8Possible(FASTBOOL bOn=sal_True) { bOrtho8=bOn; }
 
     // Wird vom gedraggten Objekt gesetzt
     FASTBOOL     IsEndDragChangesAttributes() const   { return bEndDragChangesAttributes; }
@@ -170,7 +170,7 @@ public:
     Point KorregPos(const Point& rNow, const Point& rPrev) const;
     void  Reset(const Point& rPnt);
     void  NextMove(const Point& rPnt);
-    void  NextPoint(FASTBOOL bSaveReal=FALSE);
+    void  NextPoint(FASTBOOL bSaveReal=sal_False);
     void  PrevPoint();
     FASTBOOL CheckMinMoved(const Point& rPnt);
     long  GetDX() const                     { return GetNow().X()-GetPrev().X(); }
diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx
index 9ad7a412dcc3..66b2c8643717 100644
--- a/svx/inc/svx/svddrgv.hxx
+++ b/svx/inc/svx/svddrgv.hxx
@@ -67,10 +67,10 @@ protected:
     SdrMarkList                 aFollowingEdges; // Wenn Knoten gedraggd werden, sollen alle Kanten als Xor folgen
     SdrHdlKind                  eDragHdl;
 
-    ULONG                       nDragXorPolyLimit;
-    ULONG                       nDragXorPointLimit;
-    USHORT                      nRubberEdgeDraggingLimit;
-    USHORT                      nDetailedEdgeDraggingLimit;
+    sal_uIntPtr                     nDragXorPolyLimit;
+    sal_uIntPtr                     nDragXorPointLimit;
+    sal_uInt16                      nRubberEdgeDraggingLimit;
+    sal_uInt16                      nDetailedEdgeDraggingLimit;
 
     unsigned                    bFramDrag : 1;        // z.Zt. FrameDrag
     unsigned                    bDragSpecial : 1;     // z.Zt. Special Obj-Dragging
@@ -110,7 +110,7 @@ protected:
     virtual ~SdrDragView();
 
 public:
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
@@ -124,72 +124,72 @@ public:
     // In der Regel ist das die linke obere Ecke des zu erwartenden neuen
     // SnapRects. Ausnahme: CaptionObj. Dort ist es die Position des
     // "Schwanzendes".
-    // Bei Returncode FALSE konnte ich die Position nicht bestimmen
+    // Bei Returncode sal_False konnte ich die Position nicht bestimmen
     // (z.B. Punktverschiebung, Mehrfachselektion, Schieben der
     // Spiegelschse, ...)
-    BOOL TakeDragObjAnchorPos(Point& rPos, BOOL bTopRight = FALSE ) const;
+    sal_Bool TakeDragObjAnchorPos(Point& rPos, sal_Bool bTopRight = sal_False ) const;
 
     // Wird pForcedMeth uebergeben, so wird pHdl, ... nicht ausgewerten, sondern diese
     // Drag-Methode verwendet. Die Instanz geht dabei ins Eigentum der View ueber und
     // wird zum Ende des Draggings destruiert.
-    virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
+    virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
     void MovDragObj(const Point& rPnt);
-    BOOL EndDragObj(BOOL bCopy=FALSE);
+    sal_Bool EndDragObj(sal_Bool bCopy=sal_False);
     void BrkDragObj();
-    BOOL IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
+    sal_Bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
     SdrHdl* GetDragHdl() const { return pDragHdl; }
     SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; }
-    BOOL IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
-    BOOL IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
+    sal_Bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
+    sal_Bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
 
     // Wer das beim BegDrag oder mittendrin schon festlegen will.
-    // (Wird bei jedem BegDrag auf FALSE zurueckgesetzt, also nach
+    // (Wird bei jedem BegDrag auf sal_False zurueckgesetzt, also nach
     // BegDrag setzen.)
-    void SetDragWithCopy(BOOL bOn) { bDragWithCopy = bOn; }
-    BOOL IsDragWithCopy() const { return bDragWithCopy; }
+    void SetDragWithCopy(sal_Bool bOn) { bDragWithCopy = bOn; }
+    sal_Bool IsDragWithCopy() const { return bDragWithCopy; }
 
-    void SetInsertGluePoint(BOOL bOn) { bInsGluePoint = bOn; }
-    BOOL IsInsertGluePoint() const { return bInsGluePoint; }
+    void SetInsertGluePoint(sal_Bool bOn) { bInsGluePoint = bOn; }
+    sal_Bool IsInsertGluePoint() const { return bInsGluePoint; }
 
     // Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt.
-    BOOL IsInsObjPointPossible() const;
-    BOOL IsInsPointPossible() const { return IsInsObjPointPossible(); }
+    sal_Bool IsInsObjPointPossible() const;
+    sal_Bool IsInsPointPossible() const { return IsInsObjPointPossible(); }
     sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); }
     void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
-    BOOL EndInsObjPoint(SdrCreateCmd eCmd);
+    sal_Bool EndInsObjPoint(SdrCreateCmd eCmd);
     void BrkInsObjPoint() { BrkDragObj(); }
-    BOOL IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
+    sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
 
     // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird
     // spaeter vielleicht einen passenden Pointer dafuer liefern
-    void SetInsObjPointMode(BOOL bOn) { bInsObjPointMode = bOn; }
-    BOOL IsInsObjPointMode() const { return bInsObjPointMode; }
+    void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; }
+    sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; }
 
-    BOOL IsInsGluePointPossible() const;
-    BOOL BegInsGluePoint(const Point& rPnt);
+    sal_Bool IsInsGluePointPossible() const;
+    sal_Bool BegInsGluePoint(const Point& rPnt);
     void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); }
-    BOOL EndInsGluePoint() { return EndDragObj(); }
+    sal_Bool EndInsGluePoint() { return EndDragObj(); }
     void BrkInsGluePoint() { BrkDragObj(); }
-    BOOL IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
+    sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
 
     // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird
     // spaeter vielleicht einen passenden Pointer dafuer liefern
-    void SetInsGluePointMode(BOOL bOn) { bInsGluePointMode = bOn; }
-    BOOL IsInsGluePointMode() const { return bInsGluePointMode; }
+    void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; }
+    sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; }
 
     // Begrenzungslinien ueber's gesamte Win waehrend des Draggens
     // Persistent. Default=FALSE.
-    void SetDragStripes(BOOL bOn);
-    BOOL IsDragStripes() const { return bDragStripes; }
+    void SetDragStripes(sal_Bool bOn);
+    sal_Bool IsDragStripes() const { return bDragStripes; }
 
     // Handles waehrend des Draggens verstecken
-    //HMHvoid SetDragHdlHide(BOOL bOn);
+    //HMHvoid SetDragHdlHide(sal_Bool bOn);
     //HMHBOOL IsDragHdlHide() const { return bNoDragHdl; }
 
     // Beim Draggen von Polygonpunkten und Klebepunkten
     // die Maus verstecken. Default=FALSE
-    void SetMouseHideWhileDraggingPoints(BOOL bOn) { bMouseHideWhileDraggingPoints = bOn; }
-    BOOL IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
+    void SetMouseHideWhileDraggingPoints(sal_Bool bOn) { bMouseHideWhileDraggingPoints = bOn; }
+    sal_Bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
 
     // Beim Draggen werden i.d.R. die Konturen der markierten Objekte
     // als Xor-Polygone dargestellt. Wird dieses Flag hier gesetzt,
@@ -198,22 +198,22 @@ public:
     // hat diese Einstellung keine Auswirkung.
     // Auch waerend des Draggens umschaltbar.
     // Default=Off
-    void SetNoDragXorPolys(BOOL bOn);
-    BOOL IsNoDragXorPolys() const { return bNoDragXorPolys; }
+    void SetNoDragXorPolys(sal_Bool bOn);
+    sal_Bool IsNoDragXorPolys() const { return bNoDragXorPolys; }
 
     // Uebersteigt die Anzahl der markierten Objekte den hier eingestellten
     // Wert, wird implizit (temporaer) auf NoDragPolys geschaltet.
     // PolyPolygone etc werden entsprechend als mehrere Objekte gewertet.
     // Default=100
-    void  SetDragXorPolyLimit(ULONG nObjAnz) { nDragXorPolyLimit=nObjAnz; }
-    ULONG GetDragXorPolyLimit() const { return nDragXorPolyLimit; }
+    void  SetDragXorPolyLimit(sal_uIntPtr nObjAnz) { nDragXorPolyLimit=nObjAnz; }
+    sal_uIntPtr GetDragXorPolyLimit() const { return nDragXorPolyLimit; }
 
     // Wie DragXorPolyLimit, jedoch bezogen auf die Gesamtpunktanzahl
     // aller Polygone. Default=500.
     // Auf NoDragPolys wird (temporaer) geschaltet, wenn eins der Limits
     // ueberstiegen wird.
-    void  SetDragXorPointLimit(ULONG nPntAnz) { nDragXorPointLimit=nPntAnz; }
-    ULONG GetDragXorPointLimit() const { return nDragXorPointLimit; }
+    void  SetDragXorPointLimit(sal_uIntPtr nPntAnz) { nDragXorPointLimit=nPntAnz; }
+    sal_uIntPtr GetDragXorPointLimit() const { return nDragXorPointLimit; }
 
     void SetSolidDragging(bool bOn);
     bool IsSolidDragging() const;
@@ -221,14 +221,14 @@ public:
     // Dragging/Creating von Verbindern:
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Verbinder an Objektscheitelpunkte ankleben
-    // Default=TRUE=Ja
-    void SetAutoVertexConnectors(BOOL bOn) { bAutoVertexCon = bOn; }
-    BOOL IsAutoVertexConnectors() const { return bAutoVertexCon; }
+    // Default=sal_True=Ja
+    void SetAutoVertexConnectors(sal_Bool bOn) { bAutoVertexCon = bOn; }
+    sal_Bool IsAutoVertexConnectors() const { return bAutoVertexCon; }
 
     // Verbinder an Objektecken ankleben
-    // Default=FALSE=Nein
-    void SetAutoCornerConnectors(BOOL bOn) { bAutoCornerCon = bOn; }
-    BOOL IsAutoCornerConnectors() const { return bAutoCornerCon; }
+    // Default=sal_False=Nein
+    void SetAutoCornerConnectors(sal_Bool bOn) { bAutoCornerCon = bOn; }
+    sal_Bool IsAutoCornerConnectors() const { return bAutoCornerCon; }
 
     // Dragging von verbundenen Objekten (Nodes):
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -237,22 +237,22 @@ public:
     // Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar.
     // Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich.
     // Defaultwert ist 10
-    void SetDetailedEdgeDragging(BOOL bOn); // Default an
-    BOOL IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
+    void SetDetailedEdgeDragging(sal_Bool bOn); // Default an
+    sal_Bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
 
-    void SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz);
-    USHORT GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; }
+    void SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz);
+    sal_uInt16 GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; }
 
     // EdgeDraggingLimit: Sind mehr als nEdgeObjAnz Kanten betroffen, werden
     // diese beim interaktiven Draggen nicht mit angezeigt.
     // Gemeint sind hier die "Gummibaender", die weniger Rechenzeit benoetigen
     // als die kompletten Neuberechnungen beim DetailedEdgeDragging.
     // Defaultwert ist 100
-    void SetRubberEdgeDragging(BOOL bOn);  // Default an
-    BOOL IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
+    void SetRubberEdgeDragging(sal_Bool bOn);  // Default an
+    sal_Bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
 
-    void SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz);
-    USHORT GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; }
+    void SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz);
+    sal_uInt16 GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; }
 
     // Verbinderhandling also zu deutsch wie folgt (bei Defaulteinstellungen):
     // - Sind bis max 10 Verbinder betroffen werden diese bei jedem
@@ -264,29 +264,29 @@ public:
 
     // Ist ein spezieller Dragmode eingeschaltet, wie Rotate, Mirror oder Crook,
     // dann leitet ein Hit auf das markierte Objekt genau dieses Dragging ein.
-    // Setzt man MarkedHitMovesAlways auf TRUE, so leitet ein Hit auf das
+    // Setzt man MarkedHitMovesAlways auf sal_True, so leitet ein Hit auf das
     // markierte Objekt immer ein Moven ein, unabhaengig vom gesetzten DragMode.
     // Dieses Flag ist persistent und sollte von der App fuer den Anwender
     // konfigurierbar sein!
-    void SetMarkedHitMovesAlways(BOOL bOn) { bMarkedHitMovesAlways = bOn; }
-    BOOL IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
+    void SetMarkedHitMovesAlways(sal_Bool bOn) { bMarkedHitMovesAlways = bOn; }
+    sal_Bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
 
     // Beim Draggen der Spiegelachse das Spiegelbild der markierten Objekte
     // als Xor darstellen? Persistent. Noch nicht implementiert. Default TRUE.
-    void SetMirrRefDragObj(BOOL bOn) { bMirrRefDragObj = bOn; }
-    BOOL IsMirrRefDragObj() const { return bMirrRefDragObj; }
+    void SetMirrRefDragObj(sal_Bool bOn) { bMirrRefDragObj = bOn; }
+    sal_Bool IsMirrRefDragObj() const { return bMirrRefDragObj; }
 
-    BOOL IsOrthoDesired() const;
+    sal_Bool IsOrthoDesired() const;
 
     // Beim Resize die Mitte als Referenz
     // Default=FALSE.
-    BOOL IsResizeAtCenter() const { return bResizeAtCenter; }
-    void SetResizeAtCenter(BOOL bOn) { bResizeAtCenter = bOn; }
+    sal_Bool IsResizeAtCenter() const { return bResizeAtCenter; }
+    void SetResizeAtCenter(sal_Bool bOn) { bResizeAtCenter = bOn; }
 
     // Symmetrisches Crook
     // Default=FALSE.
-    BOOL IsCrookAtCenter() const { return bCrookAtCenter; }
-    void SetCrookAtCenter(BOOL bOn) { bCrookAtCenter = bOn; }
+    sal_Bool IsCrookAtCenter() const { return bCrookAtCenter; }
+    void SetCrookAtCenter(sal_Bool bOn) { bCrookAtCenter = bOn; }
 
     // Begrenzung des Arbeitsbereichs. Die Begrenzung bezieht sich auf die
     // View, nicht auf die einzelnen PageViews. Von der View wird diese
@@ -305,7 +305,7 @@ public:
 
     // Das DragLimit ist bezogen auf die Page des Objekts.
     // (Oder auf die View??? Muss ich mal^^^^recherchieren. Joe.)
-    // FALSE=Kein Limit.
+    // sal_False=Kein Limit.
     // Das Rueckgabe-Rect muss absolute Koordinaten enthalten. Der Maximale
     // Dragbereich wird von der View dann so gewaehlt, dass das SnapRect des
     // Objekts bis Maximal auf die Kante des LimitRects gemoved bzw. gesized
@@ -314,7 +314,7 @@ public:
     // Rundungsfehler auftreten koennen, wodurch das LimitRect minnimal
     // ueberschritten werden koennte...
     // Implementiert fuer Move und Resize.
-    virtual BOOL TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
+    virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
 };
 
 #endif //_SVDDRGV_HXX
diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx
index 83429ae6c58e..a9ad00e3c6d7 100644
--- a/svx/inc/svx/svdedtv.hxx
+++ b/svx/inc/svx/svdedtv.hxx
@@ -149,12 +149,12 @@ protected:
     void ImpBroadcastEdgesOfMarkedNodes();
 
     // Konvertierung der markierten Objekte in Poly bzw. Bezier.
-    void ImpConvertTo(BOOL bPath, BOOL bLineToArea);
+    void ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea);
 
     // Konvertiert ein Obj, wirft bei Erfolg das alte as seiner Liste und
     // fuegt das neue an dessen Position ein. Inkl Undo. Es wird weder ein
     // MarkEntry noch ein ModelChgBroadcast generiert.
-    SdrObject* ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea);
+    SdrObject* ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea);
 
     // Setzen der beiden Flags bToTopPossible und bToBtmPossible.
     // bToTopPossibleDirty und bToBtmPossibleDirty werden dabei gleichzeitig
@@ -177,11 +177,11 @@ protected:
     // fuer DismantleMarkedObjects
     sal_Bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, sal_Bool bMakeLines) const;
     sal_Bool ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const;
-    void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines);
+    void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines);
     void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode,
-        BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect);
-    void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion);
-    BOOL ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
+        sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect);
+    void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion);
+    sal_Bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
     void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID);
 
     // Entfernt alle Obj der MarkList aus ihren ObjLists inkl Undo.
@@ -223,11 +223,11 @@ public:
     void AddUndoActions( std::vector< SdrUndoAction* >& );
 
     // Layerverwaltung. Mit Undo.
-    SdrLayer* InsertNewLayer(const String& rName, USHORT nPos=0xFFFF);
+    SdrLayer* InsertNewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
     // Loeschen eines Layer inkl. aller darauf befindlichen Objekte
     void      DeleteLayer(const String& rName);
     // Verschieben eines Layer (Layerreihenfolge aendern)
-    void      MoveLayer(const String& rName, USHORT nNewPos);
+    void      MoveLayer(const String& rName, sal_uInt16 nNewPos);
 
     // Markierte Objekte die ausserhalb ihrer Page liegen
     // werden ggf. einer anderen Page zugewiesen
@@ -235,23 +235,23 @@ public:
     void ForceMarkedObjToAnotherPage();
     void ForceMarkedToAnotherPage()   { ForceMarkedObjToAnotherPage(); }
 
-    BOOL IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
+    sal_Bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
 
     // Loeschen aller markierten Objekte
     void DeleteMarkedObj();
-    BOOL IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
+    sal_Bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
 
     // Logisch- umschliessendes Rect aller markierten Objekte setzen.
     // Das das wirklich geschieht ist nicht garantiert, denn eine
     // waagerechte Linie hat z.B. immer eine Hoehe von 0.
-    void SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy=FALSE);
+    void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False);
     void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
     void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
     long GetMarkedObjRotate() const;
     void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false);
     void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false);
-    void MirrorMarkedObjHorizontal(BOOL bCopy=FALSE);
-    void MirrorMarkedObjVertical(BOOL bCopy=FALSE);
+    void MirrorMarkedObjHorizontal(sal_Bool bCopy=sal_False);
+    void MirrorMarkedObjVertical(sal_Bool bCopy=sal_False);
     long GetMarkedObjShear() const;
     void ShearMarkedObj(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false);
     void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
@@ -259,28 +259,28 @@ public:
 
     // Markierte Objekte kopieren und anstelle der alten markieren
     void CopyMarkedObj();
-    void SetAllMarkedRect(const Rectangle& rRect, BOOL bCopy=FALSE) { SetMarkedObjRect(rRect,bCopy); }
-    void MoveAllMarked(const Size& rSiz, BOOL bCopy=FALSE) { MoveMarkedObj   (rSiz,bCopy); }
-    void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, BOOL bCopy=FALSE) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
+    void SetAllMarkedRect(const Rectangle& rRect, sal_Bool bCopy=sal_False) { SetMarkedObjRect(rRect,bCopy); }
+    void MoveAllMarked(const Size& rSiz, sal_Bool bCopy=sal_False) { MoveMarkedObj   (rSiz,bCopy); }
+    void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, sal_Bool bCopy=sal_False) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
     long GetAllMarkedRotate() const { return GetMarkedObjRotate(); }
-    void RotateAllMarked(const Point& rRef, long nWink, BOOL bCopy=FALSE) { RotateMarkedObj(rRef,nWink,bCopy); }
-    void MirrorAllMarked(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
-    void MirrorAllMarkedHorizontal(BOOL bCopy=FALSE) { MirrorMarkedObjHorizontal(bCopy); }
-    void MirrorAllMarkedVertical(BOOL bCopy=FALSE) { MirrorMarkedObjVertical(bCopy); }
+    void RotateAllMarked(const Point& rRef, long nWink, sal_Bool bCopy=sal_False) { RotateMarkedObj(rRef,nWink,bCopy); }
+    void MirrorAllMarked(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
+    void MirrorAllMarkedHorizontal(sal_Bool bCopy=sal_False) { MirrorMarkedObjHorizontal(bCopy); }
+    void MirrorAllMarkedVertical(sal_Bool bCopy=sal_False) { MirrorMarkedObjVertical(bCopy); }
     long GetAllMarkedShear() const { return GetMarkedObjShear(); }
-    void ShearAllMarked(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
-    void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
+    void ShearAllMarked(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
+    void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
     void CopyMarked() { CopyMarkedObj(); }
-    BOOL IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
-    BOOL IsResizeAllowed(BOOL bProp=FALSE) const;
-    BOOL IsRotateAllowed(BOOL b90Deg=FALSE) const;
-    BOOL IsMirrorAllowed(BOOL b45Deg=FALSE, BOOL b90Deg=FALSE) const;
-    BOOL IsTransparenceAllowed() const;
-    BOOL IsGradientAllowed() const;
-    BOOL IsShearAllowed() const;
-    BOOL IsEdgeRadiusAllowed() const;
-    BOOL IsCrookAllowed(BOOL bNoContortion=FALSE) const;
-    BOOL IsDistortAllowed(BOOL bNoContortion=FALSE) const;
+    sal_Bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
+    sal_Bool IsResizeAllowed(sal_Bool bProp=sal_False) const;
+    sal_Bool IsRotateAllowed(sal_Bool b90Deg=sal_False) const;
+    sal_Bool IsMirrorAllowed(sal_Bool b45Deg=sal_False, sal_Bool b90Deg=sal_False) const;
+    sal_Bool IsTransparenceAllowed() const;
+    sal_Bool IsGradientAllowed() const;
+    sal_Bool IsShearAllowed() const;
+    sal_Bool IsEdgeRadiusAllowed() const;
+    sal_Bool IsCrookAllowed(sal_Bool bNoContortion=sal_False) const;
+    sal_Bool IsDistortAllowed(sal_Bool bNoContortion=sal_False) const;
 
     // Vereinigen mehrerer Objekte zu einem PolyPolygon:
     // - Rechtecke/Kreise/Text... werden implizit gewandelt.
@@ -306,9 +306,9 @@ public:
     // Memberobjekten um PathObjs handelt.
     // bMakeLines=TRUE: alle Polygone werden in einzelne Linien bzw.
     //                  Beziersegmente zerlegt
-    void DismantleMarkedObjects(BOOL bMakeLines=FALSE);
-    BOOL IsCombinePossible(BOOL bNoPolyPoly=FALSE) const;
-    BOOL IsDismantlePossible(BOOL bMakeLines=FALSE) const;
+    void DismantleMarkedObjects(sal_Bool bMakeLines=sal_False);
+    sal_Bool IsCombinePossible(sal_Bool bNoPolyPoly=sal_False) const;
+    sal_Bool IsDismantlePossible(sal_Bool bMakeLines=sal_False) const;
 
     // Ein neues bereits fertig konstruiertes Obj einfuegen. Das Obj gehoert
     // anschliessend dem Model. Nach dem Einfuegen wird das neue Objekt
@@ -317,7 +317,7 @@ public:
     // wenn der Ziel-Layer gesperrt oder nicht sichtbar ist. In diesem Fall
     // returniert die Methode mit FALSE.
     // Die Methode generiert u.a. auch eine Undo-Action.
-    BOOL InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0);
+    sal_Bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0);
 
     // Ein Zeichenobjekt durch ein neues ersetzen. *pNewObj gehoert
     // anschliessend mir, *pOldObj wandert ins Undo.
@@ -327,13 +327,13 @@ public:
     // ReplaceObject(...);
     // ...
     // EndUndo();
-    void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark=TRUE);
+    void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True);
 
-    void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll);
-    void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
-    void MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
-    SfxItemSet GetAttrFromMarked(BOOL bOnlyHardAttr) const;
-    void SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll);
+    void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
+    void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
+    void MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
+    SfxItemSet GetAttrFromMarked(sal_Bool bOnlyHardAttr) const;
+    void SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
 
     // Geometrische Attribute (Position, Groesse, Drehwinkel)
     // Bei der Position wird ein evtl. gesetzter PageOrigin beruecksichtigt.
@@ -348,14 +348,14 @@ public:
     SfxStyleSheet* GetStyleSheetFromMarked() const;
 
     // z.Zt. noch ohne Undo :(
-    void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const;
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
-    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 
     // Alle markierten Objekte zu einer Gruppe zusammenfassen.
     // Anschliessend wird die neue Gruppe markiert. Bei einer
@@ -373,25 +373,25 @@ public:
     // zusaetzlich markiert.
     void UnGroupMarked();
 
-    BOOL IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
-    BOOL IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
-    BOOL IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
+    sal_Bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
+    sal_Bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
+    sal_Bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
 
-    // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die BOOL-
-    // Funktionen returnen TRUE, wenn wenigstens eins der markierten
+    // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die sal_Bool-
+    // Funktionen returnen sal_True, wenn wenigstens eins der markierten
     // Objekte gewandelt werden kann. Memberobjekte von Gruppenobjekten
     // werden ebenfalls gewandelt. Naehere Beschreibung siehe SdrObj.HXX.
-    BOOL IsConvertToPathObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); }
-    BOOL IsConvertToPolyObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); }
-    BOOL IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
-    void ConvertMarkedToPathObj(BOOL bLineToArea);
-    void ConvertMarkedToPolyObj(BOOL bLineToArea);
+    sal_Bool IsConvertToPathObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); }
+    sal_Bool IsConvertToPolyObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); }
+    sal_Bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
+    void ConvertMarkedToPathObj(sal_Bool bLineToArea);
+    void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
 
     // Alle markierten Objekte untereinander ausrichten. Normalerweise werden
-    // das SnapRect der Obj verwendet. Ist bBoundRects=TRUE, werden stattdessen
+    // das SnapRect der Obj verwendet. Ist bBoundRects=sal_True, werden stattdessen
     // die BoundRects ausgerichtet.
-    void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects=FALSE);
-    BOOL IsAlignPossible() const;
+    void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects=sal_False);
+    sal_Bool IsAlignPossible() const;
 
     // Markierte Objekte etwas nach "oben" holen
     void MovMarkedToTop();
@@ -419,12 +419,12 @@ public:
     // Feststellen, ob nach vorn/hinten stellen moeglich ist
     // GetMaxToTop/BtmObj() wird von diesen Methoden nur begrenzt
     // beruecksichtigt, d.h. es kann vorkommen dass IsToTopPossible()
-    // TRUE liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei
+    // sal_True liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei
     // Mehrfachselektion), weil eine von der abgeleiteten View ueber
     // GetMaxToTopObj() auferlegte Restriktion dies verhindert.
-    BOOL IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
-    BOOL IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
-    BOOL IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
+    sal_Bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
+    sal_Bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
+    sal_Bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
 
     // Ueber diese Methoden stellt die View fest, wie weit ein Objekt
     // nach vorn bzw. nach hinten gestellt werden darf (Z-Order). Das
@@ -436,21 +436,21 @@ public:
     // Folgende Methode wird gerufen, wenn z.B. durch ToTop, ToBtm, ... die
     // Reihenfolgen der Objekte geaendert wurde. Der Aufruf erfolgt dann nach
     // jedem SdrObjList::SetObjectOrdNum(nOldPos,nNewPos);
-    virtual void ObjOrderChanged(SdrObject* pObj, ULONG nOldPos, ULONG nNewPos);
+    virtual void ObjOrderChanged(SdrObject* pObj, sal_uIntPtr nOldPos, sal_uIntPtr nNewPos);
 
     // Falls ein oder mehrere Objekte des Types SdrGrafObj oder SdrOle2Obj
     // markiert sind und diese in der Lage sind ein StarView-Metafile zu
     // liefern, konvertiert diese Methode das Metafile in Drawingobjekte.
     // Die SdrGrafObjs/SdrOle2Objs werden dann durch die neue Objekte ersetzt.
     void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=NULL);
-    BOOL IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
+    sal_Bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
 
     // Wird der Modus VirtualObjectBundling eingeschaltet, werden beim
     // ToTop/ToBtm virtuelle Objekte die dasselbe Objekt referenzieren
     // in ihrer Z-Order buendig zusammengehalten (Writer).
-    // Defaulteinstellung ist FALSE=ausgeschaltet.
-    void SetVirtualObjectBundling(BOOL bOn) { bBundleVirtObj=bOn; }
-    BOOL IsVirtualObjectBundling() const { return bBundleVirtObj; }
+    // Defaulteinstellung ist sal_False=ausgeschaltet.
+    void SetVirtualObjectBundling(sal_Bool bOn) { bBundleVirtObj=bOn; }
+    sal_Bool IsVirtualObjectBundling() const { return bBundleVirtObj; }
 
     // von der SdrMarkView ueberladen fuer den internen gebrauch
     virtual void MarkListHasChanged();
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index 505c52f8064a..aec7a656077e 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -105,7 +105,7 @@ protected:
     Link                        aOldCalcFieldValueLink; // Zum rufen des alten Handlers
     Point                       aMacroDownPos;
 
-    USHORT                      nMacroTol;
+    sal_uInt16                      nMacroTol;
 
     unsigned                    bTextEditDontDelete : 1;   // Outliner und View bei SdrEndTextEdit nicht deleten (f. Rechtschreibpruefung)
     unsigned                    bTextEditOnlyOneView : 1;  // Nur eine OutlinerView (f. Rechtschreibpruefung)
@@ -125,13 +125,13 @@ protected:
 
     // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen.
     // pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein.
-    OutlinerView* ImpMakeOutlinerView(Window* pWin, BOOL bNoPaint, OutlinerView* pGivenView) const;
+    OutlinerView* ImpMakeOutlinerView(Window* pWin, sal_Bool bNoPaint, OutlinerView* pGivenView) const;
     void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect) const;
     void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const;
 
-    // Feststellen, ob der gesamte Text markiert ist. Liefert auch TRUE wenn
+    // Feststellen, ob der gesamte Text markiert ist. Liefert auch sal_True wenn
     // kein Text vorhanden ist.
-    BOOL ImpIsTextEditAllSelected() const;
+    sal_Bool ImpIsTextEditAllSelected() const;
     void ImpMakeTextCursorAreaVisible();
 
     // Handler fuer AutoGrowing Text bei aktivem Outliner
@@ -151,7 +151,7 @@ protected:
 
 public:
     // Actionhandling fuer Macromodus
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BrkAction();
@@ -166,8 +166,8 @@ public:
     //************************************************************************
     // QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken
     // editiert werden sollen. Default=TRUE. Persistent.
-    void SetQuickTextEditMode(BOOL bOn) { bQuickTextEditMode=bOn; }
-    BOOL IsQuickTextEditMode() const { return bQuickTextEditMode; }
+    void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; }
+    sal_Bool IsQuickTextEditMode() const { return bQuickTextEditMode; }
 
     // Starten des TextEditMode. Ist pWin==NULL, wird das erste an der View
     // angemeldete Win verwendet.
@@ -178,7 +178,7 @@ public:
     // Ueber den Parameter pEditOutliner kann die Applikation einen eigenen
     // Outliner vorgeben, der zum Editieren verwendet wird. Dieser gehoert
     // nach Aufruf von SdrBeginTextEdit der SdrObjEditView und wird von dieser
-    // spaeter via delete zerstoert (falls bDontDeleteOutliner=FALSE). Die
+    // spaeter via delete zerstoert (falls bDontDeleteOutliner=sal_False). Die
     // SdrObjEditView setzt dann das Modusflag (EditEngine/Outliner) an
     // dieser Instanz und ausserdem auch den StatusEventHdl.
     // Ebenso kann eine spezifische OutlinerView vorgegeben werden.
@@ -194,23 +194,23 @@ public:
     virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False);
     virtual bool IsTextEdit() const;
 
-    // TRUE=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert
+    // sal_True=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert
     // ansonsten handelt es sich um ein beschriftetes Zeichenobjekt, an dem
     // der Text ja bekanntlich hor. und vert. zentriert wird.
-    BOOL IsTextEditFrame() const;
+    sal_Bool IsTextEditFrame() const;
 
-    // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb der
+    // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der
     // des Objektbereichs oder der OutlinerView liegt.
-    BOOL IsTextEditHit(const Point& rHit, short nTol) const;
+    sal_Bool IsTextEditHit(const Point& rHit, short nTol) const;
 
-    // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb des
+    // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb des
     // Handle-dicken Rahmens liegt, der die OutlinerView bei TextFrames
     // umschliesst.
-    BOOL IsTextEditFrameHit(const Point& rHit) const;
+    sal_Bool IsTextEditFrameHit(const Point& rHit) const;
 
     // Bei aktiver Selektion, also zwischen MouseButtonDown und
     // MouseButtonUp liefert diese Methode immer TRUE.
-    BOOL IsTextEditInSelectionMode() const;
+    sal_Bool IsTextEditInSelectionMode() const;
 
     // Folgende Methode addiert einen passenden Offset zum MouseEvent
     // um diesen an den Outliner weiterzureichen.
@@ -234,24 +234,24 @@ public:
     const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; }
     OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; }
 
-    virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin);
-    BOOL Cut(ULONG nFormat=SDR_ANYFORMAT);
-    BOOL Yank(ULONG nFormat=SDR_ANYFORMAT);
-    BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
+    sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+    sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+    sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT);
 
     // #97766# make virtual to change implementation e.g. for SdOutlineView
     virtual sal_uInt16 GetScriptType() const;
 
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
-    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 
     // Intern: Beim Splitteraufziehen neue OutlinerView...
     virtual void AddWindowToPaintView(OutputDevice* pNewWin);
@@ -262,16 +262,16 @@ public:
     //************************************************************************
     // Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei
     // SdrView::GetPreferedPointer() aus. Hat nur Wirkung, wenn das Dokument
-    // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==TRUE).
-    void SetMacroMode(BOOL bOn) { bMacroMode=bOn; }
-    BOOL IsMacroMode() const { return bMacroMode; }
-    BOOL BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin);
-    BOOL BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
+    // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True).
+    void SetMacroMode(sal_Bool bOn) { bMacroMode=bOn; }
+    sal_Bool IsMacroMode() const { return bMacroMode; }
+    sal_Bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin);
+    sal_Bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
     void MovMacroObj(const Point& rPnt);
     void BrkMacroObj();
-    BOOL EndMacroObj();
-    BOOL IsMacroObj() const { return pMacroObj!=NULL; }
-    BOOL IsMacroObjDown() const { return bMacroDown; }
+    sal_Bool EndMacroObj();
+    sal_Bool IsMacroObj() const { return pMacroObj!=NULL; }
+    sal_Bool IsMacroObjDown() const { return bMacroDown; }
 
     /** fills the given any with a XTextCursor for the current text selection.
         Leaves the any untouched if there currently is no text selected */
@@ -282,7 +282,7 @@ public:
     rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; }
 
     /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */
-    virtual bool SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const;
+    virtual bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const;
 
     /** returns a format paint brush set from the current selection */
     virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet  );
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 527c1ac17bf8..f1ba2d3cf93b 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -41,11 +41,11 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per
-//   static BOOL CopyData(pData,nLen,nFormat);
+//   static sal_Bool CopyData(pData,nLen,nFormat);
 // bereitgestellt werden, wobei pData/nLen einen SvMemoryStream beschreiben in
 // dem ein SdrModel gestreamt wird an dem fuer die Zeitdauer des Streamens das
-// Flag SdrModel::SetStreamingSdrModel(TRUE) gesetzt wird.
-// ULONG SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define
+// Flag SdrModel::SetStreamingSdrModel(sal_True) gesetzt wird.
+// sal_uIntPtr SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define
 
 class SdrOutliner;
 class SdrModel;
@@ -62,7 +62,7 @@ namespace com { namespace sun { namespace star { namespace lang {
 // Ist pMod<>NULL, dann wird der MapMode des uebergebenen
 // Models verwendet. Die resultierende Default-Fonthoehe bleibt
 // jedoch dieselbe (die logische Fonthoehe wird umgerechnet).
-SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod );
+SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod );
 
 // Globale Defaulteinstellungen fuer die DrawingEngine.
 // Diese Einstellungen sollte man direkt beim Applikationsstart
@@ -73,7 +73,7 @@ friend class SdrAttrObj;
     String     aFontName;
     FontFamily eFontFamily;
     Color      aFontColor;
-    ULONG      nFontHeight;
+    sal_uIntPtr      nFontHeight;
     MapUnit    eMapUnit;
     Fraction   aMapFraction;
 
@@ -96,8 +96,8 @@ public:
     // 847/100mm entspricht also ca. 24 Point. Verwendet man stattdessen
     // beispielsweise Twips (SetMapUnit(MAP_TWIP)) (20 Twip = 1 Point) muss
     // man als Fonthoehe 480 angeben um 24 Point als default zu erhalten.
-    static void       SetFontHeight(ULONG nHeight)         { GetDefaults().nFontHeight=nHeight; }
-    static ULONG      GetFontHeight()                      { return GetDefaults().nFontHeight; }
+    static void       SetFontHeight(sal_uIntPtr nHeight)         { GetDefaults().nFontHeight=nHeight; }
+    static sal_uIntPtr      GetFontHeight()                      { return GetDefaults().nFontHeight; }
     // Der MapMode wird fuer den globalen Outliner benoetigt.
     // Gleichzeitig bekommt auch jedes neu instanziierte SdrModel
     // diesen MapMode default zugewiesen.
@@ -119,26 +119,26 @@ public:
     // Ist pMod<>NULL, dann wird der MapMode des uebergebenen
     // Models verwendet. Die resultierende Default-Fonthoehe bleibt
     // jedoch dieselbe (die logische Fonthoehe wird umgerechnet).
-    friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod );
+    friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod );
 };
 
 class SfxItemSet;
 // Liefert eine Ersatzdarstellung fuer einen XFillStyle
-// Bei XFILL_NONE gibt's FALSE und rCol bleibt unveraendert.
+// Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert.
 SVX_DLLPUBLIC FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
 
 // Ein Container fuer USHORTs (im Prinzip ein dynamisches Array)
 class UShortCont {
     Container aArr;
 public:
-    UShortCont(USHORT nBlock, USHORT nInit, USHORT nResize): aArr(nBlock,nInit,nResize) {}
+    UShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize): aArr(nBlock,nInit,nResize) {}
     void   Clear()                                           { aArr.Clear(); }
-    void   Insert(USHORT nElem, ULONG nPos=CONTAINER_APPEND) { aArr.Insert((void*)ULONG(nElem),nPos); }
-    void   Remove(ULONG nPos)                                { aArr.Remove(nPos); }
-    void   Replace(USHORT nElem, ULONG nPos)                 { aArr.Replace((void*)ULONG(nElem),nPos); }
-    USHORT GetObject(ULONG nPos)                       const { return USHORT(ULONG(aArr.GetObject(nPos))); }
-    ULONG  GetPos(USHORT nElem)                        const { return aArr.GetPos((void*)(ULONG)nElem); }
-    ULONG  GetCount()                                  const { return aArr.Count(); }
+    void   Insert(sal_uInt16 nElem, sal_uIntPtr nPos=CONTAINER_APPEND) { aArr.Insert((void*)sal_uIntPtr(nElem),nPos); }
+    void   Remove(sal_uIntPtr nPos)                                { aArr.Remove(nPos); }
+    void   Replace(sal_uInt16 nElem, sal_uIntPtr nPos)                 { aArr.Replace((void*)sal_uIntPtr(nElem),nPos); }
+    sal_uInt16 GetObject(sal_uIntPtr nPos)                       const { return sal_uInt16(sal_uIntPtr(aArr.GetObject(nPos))); }
+    sal_uIntPtr  GetPos(sal_uInt16 nElem)                        const { return aArr.GetPos((void*)(sal_uIntPtr)nElem); }
+    sal_uIntPtr  GetCount()                                  const { return aArr.Count(); }
     void   Sort();
 };
 
@@ -151,7 +151,7 @@ private:
 //#endif // __PRIVATE
 public:
     ContainerSorter(Container& rNewCont): rCont(rNewCont) {}
-    void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const;
+    void DoSort(sal_uIntPtr a=0, sal_uIntPtr b=0xFFFFFFFF) const;
 #ifdef This_Is_Just_For_A_Comment
     Compare() muss returnieren:
       -1 falls *pElem1<*pElem2
@@ -184,25 +184,25 @@ class ImpSdrHdcMerk
     ImpColorMerk* pFarbMerk;
     ImpClipMerk*  pClipMerk;
     Color*        pLineColorMerk;
-    USHORT        nMode;
+    sal_uInt16        nMode;
 public:
-    ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=TRUE);
+    ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=sal_True);
     ~ImpSdrHdcMerk();
     void Save(const OutputDevice& rOut);
     FASTBOOL IsSaved() const                 { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; }
-    void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const;
+    void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const;
 };
 //#endif // __PRIVATE
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen
-// Liefert TRUE, wenn der Set solchen Items enthaelt.
-BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE=NULL);
+// Liefert sal_True, wenn der Set solchen Items enthaelt.
+sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE=NULL);
 
 // zurueck erhaelt man einen neuen WhichTable den
 // man dann irgendwann mit delete platthauen muss.
-USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd);
+sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd);
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -217,46 +217,46 @@ class Link;
 class SVX_DLLPUBLIC SvdProgressInfo
 {
 private:
-    ULONG nSumActionCount;  // Summe aller Actions
-    ULONG nSumCurAction;    // Summe aller bearbeiteten Actions
+    sal_uIntPtr nSumActionCount;    // Summe aller Actions
+    sal_uIntPtr nSumCurAction;  // Summe aller bearbeiteten Actions
 
-    ULONG nActionCount;     // Anzahl der Actions im akt. Obj.
-    ULONG nCurAction;       // Anzahl bearbeiteter Act. im akt. Obj.
+    sal_uIntPtr nActionCount;       // Anzahl der Actions im akt. Obj.
+    sal_uIntPtr nCurAction;     // Anzahl bearbeiteter Act. im akt. Obj.
 
-    ULONG nInsertCount;     // Anzahl einzufuegender Act. im akt. Obj.
-    ULONG nCurInsert;       // Anzahl bereits eingefuegter Actions
+    sal_uIntPtr nInsertCount;       // Anzahl einzufuegender Act. im akt. Obj.
+    sal_uIntPtr nCurInsert;     // Anzahl bereits eingefuegter Actions
 
-    ULONG nObjCount;        // Anzahl der selektierten Objekte
-    ULONG nCurObj;          // Aktuelles Objekt
+    sal_uIntPtr nObjCount;      // Anzahl der selektierten Objekte
+    sal_uIntPtr nCurObj;            // Aktuelles Objekt
 
     Link *pLink;
 
 public:
     SvdProgressInfo( Link *_pLink );
 
-    void Init( ULONG _nSumActionCount, ULONG _nObjCount );
+    void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount );
 
-    BOOL SetNextObject();
+    sal_Bool SetNextObject();
 
-    void SetActionCount( ULONG _nActionCount );
-    void SetInsertCount( ULONG _nInsertCount );
+    void SetActionCount( sal_uIntPtr _nActionCount );
+    void SetInsertCount( sal_uIntPtr _nInsertCount );
 
-    BOOL ReportActions( ULONG nAnzActions );
-    BOOL ReportInserts( ULONG nAnzInserts );
+    sal_Bool ReportActions( sal_uIntPtr nAnzActions );
+    sal_Bool ReportInserts( sal_uIntPtr nAnzInserts );
 
-    ULONG GetSumActionCount() const { return nSumActionCount; };
-    ULONG GetSumCurAction() const { return nSumCurAction; };
-    ULONG GetObjCount() const { return nObjCount; };
-    ULONG GetCurObj() const { return nCurObj; };
+    sal_uIntPtr GetSumActionCount() const { return nSumActionCount; };
+    sal_uIntPtr GetSumCurAction() const { return nSumCurAction; };
+    sal_uIntPtr GetObjCount() const { return nObjCount; };
+    sal_uIntPtr GetCurObj() const { return nCurObj; };
 
-    ULONG GetActionCount() const { return nActionCount; };
-    ULONG GetCurAction() const { return nCurAction; };
+    sal_uIntPtr GetActionCount() const { return nActionCount; };
+    sal_uIntPtr GetCurAction() const { return nCurAction; };
 
-    ULONG GetInsertCount() const { return nInsertCount; };
-    ULONG GetCurInsert() const { return nCurInsert; };
+    sal_uIntPtr GetInsertCount() const { return nInsertCount; };
+    sal_uIntPtr GetCurInsert() const { return nCurInsert; };
 
     void ReportError();
-    BOOL ReportRescales( ULONG nAnzRescales );
+    sal_Bool ReportRescales( sal_uIntPtr nAnzRescales );
 };
 
 
@@ -287,18 +287,18 @@ class AutoTimer;
 
 class OLEObjCache : public Container
 {
-    ULONG               nSize;
+    sal_uIntPtr             nSize;
     AutoTimer*          pTimer;
 
     void UnloadOnDemand();
-    BOOL UnloadObj( SdrOle2Obj* pObj );
+    sal_Bool UnloadObj( SdrOle2Obj* pObj );
     DECL_LINK( UnloadCheckHdl, AutoTimer* );
 
 public:
     OLEObjCache();
     SVX_DLLPUBLIC ~OLEObjCache();
 
-    void SetSize(ULONG nNewSize);
+    void SetSize(sal_uIntPtr nNewSize);
     void InsertObj(SdrOle2Obj* pObj);
     void RemoveObj(SdrOle2Obj* pObj);
 };
@@ -315,7 +315,7 @@ public:
     SdrOutliner*        pOutliner;
     SdrEngineDefaults*  pDefaults;
     ResMgr*             pResMgr;
-    ULONG               nExchangeFormat;
+    sal_uIntPtr                 nExchangeFormat;
     OLEObjCache         aOLEObjCache;
 
 
diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx
index 88cd48974f9c..efded3a48182 100644
--- a/svx/inc/svx/svdglev.hxx
+++ b/svx/inc/svx/svdglev.hxx
@@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView
     void ImpCopyMarkedGluePoints();
     typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*);
     typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*);
-    void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
+    void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
     void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
 
 protected:
@@ -74,15 +74,15 @@ public:
     // checken bzw. setzen/loeschen will.
     // Moegliche Werte fuer nThisEsc sind z.Zt.
     // SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM
-    TRISTATE IsMarkedGluePointsEscDir(USHORT nThisEsc) const;
-    void SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn);
-    BOOL IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+    TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const;
+    void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn);
+    sal_Bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
 
     // Checken/setzen, ob die Klebepunktpositionen relativ zur
-    // Objektgroesse sind (Percent=TRUE) oder nicht (Percent=FALSE)
+    // Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False)
     TRISTATE IsMarkedGluePointsPercent() const;
-    void SetMarkedGluePointsPercent(BOOL bOn);
-    BOOL IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+    void SetMarkedGluePointsPercent(sal_Bool bOn);
+    sal_Bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
 
     // bVert=FALSE: Horizontales Alignment checken/setzen
     //      SDRHORZALIGN_CENTER
@@ -94,23 +94,23 @@ public:
     //      SDRVERTALIGN_TOP
     //      SDRVERTALIGN_BOTTOM
     //      SDRVERTALIGN_DONTCARE (nur bei Get())
-    USHORT GetMarkedGluePointsAlign(BOOL bVert) const;
-    void SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign);
-    BOOL IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+    sal_uInt16 GetMarkedGluePointsAlign(sal_Bool bVert) const;
+    void SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign);
+    sal_Bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
 
     // Alle merkierten Klebepunkte entfernen
     void DeleteMarkedGluePoints();
-    BOOL IsDeleteMarkedGluePointsPossible() const;
+    sal_Bool IsDeleteMarkedGluePointsPossible() const;
 
     void MoveMarkedGluePoints  (const Size& rSiz, bool bCopy=false);
     void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
     void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false);
-    void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE);
-    void MirrorMarkedGluePointsHorizontal(BOOL bCopy=FALSE);
-    void MirrorMarkedGluePointsVertical(BOOL bCopy=FALSE);
-    void ShearMarkedGluePoints(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE);
-    void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE);
-    void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE);
+    void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False);
+    void MirrorMarkedGluePointsHorizontal(sal_Bool bCopy=sal_False);
+    void MirrorMarkedGluePointsVertical(sal_Bool bCopy=sal_False);
+    void ShearMarkedGluePoints(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False);
+    void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False);
+    void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False);
 
     void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert);
 };
diff --git a/svx/inc/svx/svdglob.hxx b/svx/inc/svx/svdglob.hxx
index 588869ff9890..1065860621db 100644
--- a/svx/inc/svx/svdglob.hxx
+++ b/svx/inc/svx/svdglob.hxx
@@ -53,7 +53,7 @@ ResMgr* ImpGetResMgr();
 
 class SdrResId: ResId {
 public:
-    SdrResId(USHORT nId): ResId(nId,*ImpGetResMgr()) {}
+    SdrResId(sal_uInt16 nId): ResId(nId,*ImpGetResMgr()) {}
 };
 
 // ResourceCache fuer haeuffig benoetigte Strings
diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx
index 965aaf25225e..334b79229aa0 100644
--- a/svx/inc/svx/svdglue.hxx
+++ b/svx/inc/svx/svdglue.hxx
@@ -64,25 +64,25 @@ class SdrObject;
 class SVX_DLLPUBLIC SdrGluePoint {
     // Bezugspunkt ist SdrObject::GetSnapRect().Center()
     // bNoPercent=FALSE: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align)
-    // bNoPercent=TRUE : Position ist in log Einh, rel zum Bezugspunkt
+    // bNoPercent=sal_True : Position ist in log Einh, rel zum Bezugspunkt
     Point    aPos;
-    USHORT   nEscDir;
-    USHORT   nId;
-    USHORT   nAlign;
+    sal_uInt16   nEscDir;
+    sal_uInt16   nId;
+    sal_uInt16   nAlign;
     FASTBOOL bNoPercent:1;
     FASTBOOL bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
     FASTBOOL bUserDefined:1; // #i38892#
 public:
-    SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=FALSE; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
-    SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
+    SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; }
+    SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=sal_False; bUserDefined=sal_True; }
     bool operator==(const SdrGluePoint& rCmpGP) const   { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; }
     bool operator!=(const SdrGluePoint& rCmpGP) const   { return !operator==(rCmpGP); }
     const Point& GetPos() const                             { return aPos; }
     void         SetPos(const Point& rNewPos)               { aPos=rNewPos; }
-    USHORT       GetEscDir() const                          { return nEscDir; }
-    void         SetEscDir(USHORT nNewEsc)                  { nEscDir=nNewEsc; }
-    USHORT       GetId() const                              { return nId; }
-    void         SetId(USHORT nNewId)                       { nId=nNewId; }
+    sal_uInt16       GetEscDir() const                          { return nEscDir; }
+    void         SetEscDir(sal_uInt16 nNewEsc)                  { nEscDir=nNewEsc; }
+    sal_uInt16       GetId() const                              { return nId; }
+    void         SetId(sal_uInt16 nNewId)                       { nId=nNewId; }
     bool         IsPercent() const                          { return !bNoPercent; }
     void         SetPercent(FASTBOOL bOn)                   { bNoPercent=!bOn; }
     // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
@@ -93,12 +93,12 @@ public:
     FASTBOOL     IsUserDefined() const                   { return bUserDefined; }
     void         SetUserDefined(FASTBOOL bNew)           { bUserDefined = bNew; }
 
-    USHORT       GetAlign() const                           { return nAlign; }
-    void         SetAlign(USHORT nAlg)                      { nAlign=nAlg; }
-    USHORT       GetHorzAlign() const                       { return nAlign&0x00FF; }
-    void         SetHorzAlign(USHORT nAlg)                  { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); }
-    USHORT       GetVertAlign() const                       { return nAlign&0xFF00; }
-    void         SetVertAlign(USHORT nAlg)                  { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
+    sal_uInt16       GetAlign() const                           { return nAlign; }
+    void         SetAlign(sal_uInt16 nAlg)                      { nAlign=nAlg; }
+    sal_uInt16       GetHorzAlign() const                       { return nAlign&0x00FF; }
+    void         SetHorzAlign(sal_uInt16 nAlg)                  { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); }
+    sal_uInt16       GetVertAlign() const                       { return nAlign&0xFF00; }
+    void         SetVertAlign(sal_uInt16 nAlg)                  { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
     void         Draw(OutputDevice& rOut, const SdrObject* pObj) const;
     FASTBOOL     IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const;
     void         Invalidate(Window& rWin, const SdrObject* pObj) const;
@@ -106,8 +106,8 @@ public:
     void         SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj);
     long         GetAlignAngle() const;
     void         SetAlignAngle(long nWink);
-    long         EscDirToAngle(USHORT nEsc) const;
-    USHORT       EscAngleToDir(long nWink) const;
+    long         EscDirToAngle(sal_uInt16 nEsc) const;
+    sal_uInt16       EscAngleToDir(long nWink) const;
     void         Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
     void         Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
     void         Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
@@ -119,22 +119,22 @@ public:
 class SVX_DLLPUBLIC SdrGluePointList {
     Container aList;
 protected:
-    SdrGluePoint* GetObject(USHORT i) const { return (SdrGluePoint*)(aList.GetObject(i)); }
+    SdrGluePoint* GetObject(sal_uInt16 i) const { return (SdrGluePoint*)(aList.GetObject(i)); }
 public:
     SdrGluePointList(): aList(1024,4,4) {}
     SdrGluePointList(const SdrGluePointList& rSrcList): aList(1024,4,4)     { *this=rSrcList; }
     ~SdrGluePointList()                                                     { Clear(); }
     void                Clear();
     void                operator=(const SdrGluePointList& rSrcList);
-    USHORT              GetCount() const                                    { return USHORT(aList.Count()); }
+    sal_uInt16              GetCount() const                                    { return sal_uInt16(aList.Count()); }
     // Beim Insert wird dem Objekt (also dem GluePoint) automatisch eine Id zugewiesen.
     // ReturnCode ist der Index des neuen GluePoints in der Liste
-    USHORT              Insert(const SdrGluePoint& rGP);
-    void                Delete(USHORT nPos)                                 { delete (SdrGluePoint*)aList.Remove(nPos); }
-    SdrGluePoint&       operator[](USHORT nPos)                             { return *GetObject(nPos); }
-    const SdrGluePoint& operator[](USHORT nPos) const                       { return *GetObject(nPos); }
-    USHORT              FindGluePoint(USHORT nId) const;
-    USHORT              HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=FALSE, FASTBOOL bNext=FALSE, USHORT nId0=0) const;
+    sal_uInt16              Insert(const SdrGluePoint& rGP);
+    void                Delete(sal_uInt16 nPos)                                 { delete (SdrGluePoint*)aList.Remove(nPos); }
+    SdrGluePoint&       operator[](sal_uInt16 nPos)                             { return *GetObject(nPos); }
+    const SdrGluePoint& operator[](sal_uInt16 nPos) const                       { return *GetObject(nPos); }
+    sal_uInt16              FindGluePoint(sal_uInt16 nId) const;
+    sal_uInt16              HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=sal_False, FASTBOOL bNext=sal_False, sal_uInt16 nId0=0) const;
     void                Invalidate(Window& rWin, const SdrObject* pObj) const;
     // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
     void                SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj);
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index f96b650d2be4..92a7071551a4 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -214,14 +214,14 @@ public:
     SdrObject* GetObj() const { return pObj;  }
     void SetObj(SdrObject* pNewObj);
 
-    BOOL IsSelected() const { return bSelect; }
-    void SetSelected(BOOL bJa=TRUE);
+    sal_Bool IsSelected() const { return bSelect; }
+    void SetSelected(sal_Bool bJa=sal_True);
 
-    void Set1PixMore(BOOL bJa=TRUE);
+    void Set1PixMore(sal_Bool bJa=sal_True);
     void SetDrehWink(long n);
 
-    BOOL IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; }
-    BOOL IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT  || eKind==HDL_RIGHT; }
+    sal_Bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; }
+    sal_Bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT  || eKind==HDL_RIGHT; }
 
     void SetObjHdlNum(sal_uInt32 nNum) { nObjHdlNum=nNum; }
     sal_uInt32 GetObjHdlNum() const { return nObjHdlNum; }
@@ -232,8 +232,8 @@ public:
     void SetPointNum(sal_uInt32 nNum) { nPPntNum=nNum; }
     sal_uInt32 GetPointNum() const { return nPPntNum; }
 
-    void SetPlusHdl(BOOL bOn) { bPlusHdl=bOn; }
-    BOOL IsPlusHdl() const { return bPlusHdl; }
+    void SetPlusHdl(sal_Bool bOn) { bPlusHdl=bOn; }
+    sal_Bool IsPlusHdl() const { return bPlusHdl; }
 
     void SetSourceHdlNum(sal_uInt32 nNum) { nSourceHdlNum=nNum; }
     sal_uInt32 GetSourceHdlNum() const { return nSourceHdlNum; }
@@ -242,7 +242,7 @@ public:
     bool IsHdlHit(const Point& rPnt) const;
 
     // #97016# II
-    virtual BOOL IsFocusHdl() const;
+    virtual sal_Bool IsFocusHdl() const;
 
     void SetMoveOutside( bool bMoveOutside );
 
@@ -286,13 +286,13 @@ private:
     SVX_DLLPRIVATE void CallColorChangeLink();
 
 public:
-    SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), BOOL bLum = FALSE);
+    SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), sal_Bool bLum = sal_False);
     virtual ~SdrHdlColor();
 
-    BOOL IsUseLuminance() const { return bUseLuminance; }
+    sal_Bool IsUseLuminance() const { return bUseLuminance; }
 
     Color GetColor() const { return aMarkerColor; }
-    void SetColor(Color aNew, BOOL bCallLink = FALSE);
+    void SetColor(Color aNew, sal_Bool bCallLink = sal_False);
 
     const Size& GetSize() const { return aMarkerSize; }
     void SetSize(const Size& rNew);
@@ -324,10 +324,10 @@ private:
     virtual void CreateB2dIAObject();
 
 public:
-    SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad = TRUE);
+    SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad = sal_True);
     virtual ~SdrHdlGradient();
 
-    BOOL IsGradient() const { return bGradient; }
+    sal_Bool IsGradient() const { return bGradient; }
 
     // set the associated color handles
     void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { pColHdl1 = pL1; pColHdl2 = pL2; }
@@ -341,13 +341,13 @@ public:
     DECL_LINK(ColorChangeHdl, SdrHdl*);
 
     // transformation call, create gradient from this handle
-    void FromIAOToItem(SdrObject* pObj, BOOL bSetItemOnObject, BOOL bUndo);
+    void FromIAOToItem(SdrObject* pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo);
 
     // selection flags for interaction
-    BOOL IsMoveSingleHandle() const { return bMoveSingleHandle; }
-    void SetMoveSingleHandle(BOOL bNew) { bMoveSingleHandle = bNew; }
-    BOOL IsMoveFirstHandle() const { return bMoveFirstHandle; }
-    void SetMoveFirstHandle(BOOL bNew) { bMoveFirstHandle = bNew; }
+    sal_Bool IsMoveSingleHandle() const { return bMoveSingleHandle; }
+    void SetMoveSingleHandle(sal_Bool bNew) { bMoveSingleHandle = bNew; }
+    sal_Bool IsMoveFirstHandle() const { return bMoveFirstHandle; }
+    void SetMoveFirstHandle(sal_Bool bNew) { bMoveFirstHandle = bNew; }
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -414,7 +414,7 @@ public:
 
     void SetLineCode(SdrEdgeLineCode eCode);
     SdrEdgeLineCode GetLineCode() const     { return eLineCode; }
-    BOOL IsHorzDrag() const;
+    sal_Bool IsHorzDrag() const;
     virtual Pointer GetPointer() const;
 };
 
@@ -455,10 +455,10 @@ class ImplHdlListData;
 class SVX_DLLPUBLIC SdrHdlList
 {
 protected:
-    ULONG                   mnFocusIndex;
+    sal_uIntPtr                 mnFocusIndex;
     SdrMarkView*                pView;
     Container                   aList;
-    USHORT                      nHdlSize;
+    sal_uInt16                      nHdlSize;
 
     unsigned                    bRotateShear : 1;
     unsigned                    bDistortShear : 1;
@@ -468,8 +468,8 @@ protected:
 private:
     SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList(1024,64,64)  {}
     SVX_DLLPRIVATE void operator=(const SdrHdlList&)                 {}
-    SVX_DLLPRIVATE BOOL operator==(const SdrHdlList&) const      { return FALSE; }
-    SVX_DLLPRIVATE BOOL operator!=(const SdrHdlList&) const      { return FALSE; }
+    SVX_DLLPRIVATE sal_Bool operator==(const SdrHdlList&) const      { return sal_False; }
+    SVX_DLLPRIVATE sal_Bool operator!=(const SdrHdlList&) const      { return sal_False; }
 
 public:
     SdrHdlList(SdrMarkView* pV);
@@ -489,28 +489,28 @@ public:
     //             2.Level PageView (Pointer)
     //             3.Level Position (x+y)
     void     Sort();
-    ULONG    GetHdlCount() const                       { return aList.Count(); }
-    SdrHdl*  GetHdl(ULONG nNum) const                  { return (SdrHdl*)(aList.GetObject(nNum)); }
-    ULONG    GetHdlNum(const SdrHdl* pHdl) const;
-    void     SetHdlSize(USHORT nSiz);
-    USHORT   GetHdlSize() const                        { return nHdlSize; }
-    void     SetMoveOutside(BOOL bOn);
-    BOOL IsMoveOutside() const                     { return bMoveOutside; }
-    void     SetRotateShear(BOOL bOn);
-    BOOL IsRotateShear() const                     { return bRotateShear; }
-    void     SetDistortShear(BOOL bOn);
-    BOOL IsDistortShear() const                    { return bDistortShear; }
-    void     SetFineHdl(BOOL bOn);
-    BOOL IsFineHdl() const                        { return bFineHandles; }
+    sal_uIntPtr    GetHdlCount() const                       { return aList.Count(); }
+    SdrHdl*  GetHdl(sal_uIntPtr nNum) const                  { return (SdrHdl*)(aList.GetObject(nNum)); }
+    sal_uIntPtr    GetHdlNum(const SdrHdl* pHdl) const;
+    void     SetHdlSize(sal_uInt16 nSiz);
+    sal_uInt16   GetHdlSize() const                        { return nHdlSize; }
+    void     SetMoveOutside(sal_Bool bOn);
+    sal_Bool IsMoveOutside() const                     { return bMoveOutside; }
+    void     SetRotateShear(sal_Bool bOn);
+    sal_Bool IsRotateShear() const                     { return bRotateShear; }
+    void     SetDistortShear(sal_Bool bOn);
+    sal_Bool IsDistortShear() const                    { return bDistortShear; }
+    void     SetFineHdl(sal_Bool bOn);
+    sal_Bool IsFineHdl() const                        { return bFineHandles; }
 
     // AddHdl uebernimmt das Handle in sein Eigentum. Es muss
     // also auf dem Heap stehen, da Clear() ein delete macht.
-    void    AddHdl(SdrHdl* pHdl, BOOL bAtBegin=FALSE);
-    SdrHdl* RemoveHdl(ULONG nNum);
+    void    AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False);
+    SdrHdl* RemoveHdl(sal_uIntPtr nNum);
 
     // Zuletzt eingefuegte Handles werden am ehesten getroffen
     // (wenn Handles uebereinander liegen).
-    SdrHdl* IsHdlListHit(const Point& rPnt, BOOL bBack=FALSE, BOOL bNext=FALSE, SdrHdl* pHdl0=NULL) const;
+    SdrHdl* IsHdlListHit(const Point& rPnt, sal_Bool bBack=sal_False, sal_Bool bNext=sal_False, SdrHdl* pHdl0=NULL) const;
     SdrHdl* GetHdl(SdrHdlKind eKind1) const;
 };
 
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index 1d5677ec95f6..a41d69a38eff 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -68,7 +68,7 @@ public:
     const Point&    GetPos() const                    { return aPos; }
 
     Pointer         GetPointer() const;
-    FASTBOOL        IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const;
+    FASTBOOL        IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const;
     // OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben
     Rectangle       GetBoundRect(const OutputDevice& rOut) const;
 
@@ -83,7 +83,7 @@ public:
 class SVX_DLLPUBLIC SdrHelpLineList {
     Container aList;
 protected:
-    SdrHelpLine* GetObject(USHORT i) const { return (SdrHelpLine*)(aList.GetObject(i)); }
+    SdrHelpLine* GetObject(sal_uInt16 i) const { return (SdrHelpLine*)(aList.GetObject(i)); }
 public:
     SdrHelpLineList(): aList(1024,4,4) {}
     SdrHelpLineList(const SdrHelpLineList& rSrcList): aList(1024,4,4)      { *this=rSrcList; }
@@ -92,13 +92,13 @@ public:
     void               operator=(const SdrHelpLineList& rSrcList);
     bool operator==(const SdrHelpLineList& rCmp) const;
     bool operator!=(const SdrHelpLineList& rCmp) const                 { return !operator==(rCmp); }
-    USHORT             GetCount() const                                    { return USHORT(aList.Count()); }
-    void               Insert(const SdrHelpLine& rHL, USHORT nPos=0xFFFF)  { aList.Insert(new SdrHelpLine(rHL),nPos); }
-    void               Delete(USHORT nPos)                                 { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900#
-    void               Move(USHORT nPos, USHORT nNewPos)                   { aList.Insert(aList.Remove(nPos),nNewPos); }
-    SdrHelpLine&       operator[](USHORT nPos)                             { return *GetObject(nPos); }
-    const SdrHelpLine& operator[](USHORT nPos) const                       { return *GetObject(nPos); }
-    USHORT             HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const;
+    sal_uInt16             GetCount() const                                    { return sal_uInt16(aList.Count()); }
+    void               Insert(const SdrHelpLine& rHL, sal_uInt16 nPos=0xFFFF)  { aList.Insert(new SdrHelpLine(rHL),nPos); }
+    void               Delete(sal_uInt16 nPos)                                 { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900#
+    void               Move(sal_uInt16 nPos, sal_uInt16 nNewPos)                   { aList.Insert(aList.Remove(nPos),nNewPos); }
+    SdrHelpLine&       operator[](sal_uInt16 nPos)                             { return *GetObject(nPos); }
+    const SdrHelpLine& operator[](sal_uInt16 nPos) const                       { return *GetObject(nPos); }
+    sal_uInt16             HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svditer.hxx b/svx/inc/svx/svditer.hxx
index 8ab6c32ea061..2c7b9cb4c9f8 100644
--- a/svx/inc/svx/svditer.hxx
+++ b/svx/inc/svx/svditer.hxx
@@ -46,14 +46,14 @@ class SVX_DLLPUBLIC SdrObjListIter
 {
     List                        maObjList;
     sal_uInt32                  mnIndex;
-    BOOL                        mbReverse;
+    sal_Bool                        mbReverse;
 
-    void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bUseZOrder);
+    void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder);
     void ImpProcessMarkList(const SdrMarkList& rMarkList, SdrIterMode eMode);
-    void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, BOOL bUseZOrder);
+    void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder);
 
 public:
-    SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+    SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
     /** This variant lets the user choose the order in which to travel over
         the objects.
         @param bUseZOrder
@@ -61,17 +61,17 @@ public:
             Otherwise the navigation position as returned by
             SdrObject::GetNavigationPosition() is used.
     */
-    SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+    SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
 
     /* SJ: the following function can now be used with every
        SdrObject and is no longer limited to group objects */
-    SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+    SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
 
     /** Iterates over a list of marked objects received from the SdrMarkView. */
-    SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+    SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
 
     void Reset() { mnIndex = (mbReverse ? maObjList.Count() : 0L); }
-    BOOL IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); }
+    sal_Bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); }
     SdrObject* Next() { return (SdrObject*)maObjList.GetObject(mbReverse ? --mnIndex : mnIndex++); }
 
     sal_uInt32 Count() { return maObjList.Count(); }
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index 492df9a12212..b38ada9733d7 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -44,7 +44,7 @@ protected:
     String      maTitle;
     String      maDescription;
     SdrModel*  pModel; // zum Broadcasten
-    UINT16     nType;  // 0=Userdefined,1=Standardlayer
+    sal_uInt16     nType;  // 0=Userdefined,1=Standardlayer
     SdrLayerID nID;
 protected:
     SdrLayer(SdrLayerID nNewID, const String& rNewName)       { nID=nNewID; aName=rNewName; nType=0; pModel=NULL; }
@@ -69,7 +69,7 @@ public:
     // Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll.
     // Es wird dann laenderspeziefisch der passende Name gesetzt. SetName()
     // setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined".
-    void          SetStandardLayer(FASTBOOL bStd=TRUE);
+    void          SetStandardLayer(FASTBOOL bStd=sal_True);
     FASTBOOL      IsStandardLayer() const                     { return nType==1; }
 };
 
@@ -105,30 +105,30 @@ public:
     void                 SetParent(SdrLayerAdmin* pNewParent)                        { pParent=pNewParent; }
     void                 SetModel(SdrModel* pNewModel);
     SdrModel*            GetModel() const                                            { return pModel; }
-    void                 InsertLayer(SdrLayer* pLayer, USHORT nPos=0xFFFF)           { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); }
-    SdrLayer*            RemoveLayer(USHORT nPos);
+    void                 InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos=0xFFFF)           { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); }
+    SdrLayer*            RemoveLayer(sal_uInt16 nPos);
     // Alle Layer loeschen
     void               ClearLayer();
     // Neuer Layer wird angelegt und eingefuegt
-    SdrLayer*          NewLayer(const String& rName, USHORT nPos=0xFFFF);
+    SdrLayer*          NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
     void               DeleteLayer(SdrLayer* pLayer)                                 { aLayer.Remove(pLayer); delete pLayer; Broadcast(); }
-    void               MoveLayer(SdrLayer* pLayer, USHORT nNewPos=0xFFFF);
-    SdrLayer*          MoveLayer(USHORT nPos, USHORT nNewPos);
+    void               MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos=0xFFFF);
+    SdrLayer*          MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos);
     // Neuer Layer, Name wird aus der Resource geholt
-    SdrLayer*          NewStandardLayer(USHORT nPos=0xFFFF);
+    SdrLayer*          NewStandardLayer(sal_uInt16 nPos=0xFFFF);
 
     // Iterieren ueber alle Layer
-    USHORT             GetLayerCount() const                                         { return USHORT(aLayer.Count()); }
-    SdrLayer*          GetLayer(USHORT i)                                            { return (SdrLayer*)(aLayer.GetObject(i)); }
-    const SdrLayer*    GetLayer(USHORT i) const                                      { return (SdrLayer*)(aLayer.GetObject(i)); }
+    sal_uInt16             GetLayerCount() const                                         { return sal_uInt16(aLayer.Count()); }
+    SdrLayer*          GetLayer(sal_uInt16 i)                                            { return (SdrLayer*)(aLayer.GetObject(i)); }
+    const SdrLayer*    GetLayer(sal_uInt16 i) const                                      { return (SdrLayer*)(aLayer.GetObject(i)); }
 
-    USHORT             GetLayerPos(SdrLayer* pLayer) const;
+    sal_uInt16             GetLayerPos(SdrLayer* pLayer) const;
 
     SdrLayer*          GetLayer(const String& rName, FASTBOOL bInherited)            { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); }
     const SdrLayer*    GetLayer(const String& rName, FASTBOOL bInherited) const;
           SdrLayerID   GetLayerID(const String& rName, FASTBOOL bInherited) const;
-          SdrLayer*    GetLayerPerID(USHORT nID)                                     { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
-    const SdrLayer*    GetLayerPerID(USHORT nID) const;
+          SdrLayer*    GetLayerPerID(sal_uInt16 nID)                                     { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
+    const SdrLayer*    GetLayerPerID(sal_uInt16 nID) const;
 
     void               SetControlLayerName(const String& rNewName) { aControlLayerName=rNewName; }
     const String&      GetControlLayerName() const                 { return aControlLayerName; }
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index d67704b19c7d..2a05e81e0007 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SdrUShortCont
     sal_Bool                                            mbSorted;
 
 private:
-    void CheckSort(ULONG nPos);
+    void CheckSort(sal_uLong nPos);
 
 public:
     SdrUShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize)
@@ -98,9 +98,9 @@ public:
         }
     }
 
-    void Insert(sal_uInt16 nElem, ULONG nPos = CONTAINER_APPEND)
+    void Insert(sal_uInt16 nElem, sal_uLong nPos = CONTAINER_APPEND)
     {
-        maArray.Insert((void*)ULONG(nElem),nPos);
+        maArray.Insert((void*)sal_uLong(nElem),nPos);
 
         if(mbSorted)
         {
@@ -108,14 +108,14 @@ public:
         }
     }
 
-    void Remove(ULONG nPos)
+    void Remove(sal_uLong nPos)
     {
         maArray.Remove(nPos);
     }
 
-    void Replace(sal_uInt16 nElem, ULONG nPos)
+    void Replace(sal_uInt16 nElem, sal_uLong nPos)
     {
-        maArray.Replace((void*)ULONG(nElem), nPos);
+        maArray.Replace((void*)sal_uLong(nElem), nPos);
 
         if(mbSorted)
         {
@@ -123,24 +123,24 @@ public:
         }
     }
 
-    sal_uInt16 GetObject(ULONG nPos) const
+    sal_uInt16 GetObject(sal_uLong nPos) const
     {
         return sal_uInt16(sal_uIntPtr(maArray.GetObject(nPos)));
     }
 
-    ULONG GetPos(sal_uInt16 nElem) const
+    sal_uLong GetPos(sal_uInt16 nElem) const
     {
-        return maArray.GetPos((void*)(ULONG)nElem);
+        return maArray.GetPos((void*)(sal_uLong)nElem);
     }
 
-    ULONG GetCount() const
+    sal_uLong GetCount() const
     {
         return maArray.Count();
     }
 
     sal_Bool Exist(sal_uInt16 nElem) const
     {
-        return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(ULONG)nElem));
+        return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(sal_uLong)nElem));
     }
 };
 
@@ -321,20 +321,20 @@ public:
         mbSorted = sal_False;
     }
 
-    ULONG GetMarkCount() const
+    sal_uLong GetMarkCount() const
     {
         return maList.Count();
     }
 
-    SdrMark* GetMark(ULONG nNum) const
+    SdrMark* GetMark(sal_uLong nNum) const
     {
         return (SdrMark*)(maList.GetObject(nNum));
     }
 
-    ULONG FindObject(const SdrObject* pObj) const;
+    sal_uLong FindObject(const SdrObject* pObj) const;
     void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True);
-    void DeleteMark(ULONG nNum);
-    void ReplaceMark(const SdrMark& rNewMark, ULONG nNum);
+    void DeleteMark(sal_uLong nNum);
+    void ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum);
     void Merge(const SdrMarkList& rSrcList, sal_Bool bReverse = sal_False);
     sal_Bool DeletePageView(const SdrPageView& rPV);
     sal_Bool InsertPageView(const SdrPageView& rPV);
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 21e9b5c5a05f..a32147a3032f 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -166,15 +166,15 @@ public:
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts
-// neu zu bestimmen und unbenutztes wegzuwerfen). FALSE == aktiv
-#define LOADREFCOUNTS (FALSE)
+// neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv
+#define LOADREFCOUNTS (sal_False)
 
 struct SdrDocumentStreamInfo
 {
     FASTBOOL        mbDeleteAfterUse;
     String          maUserData;
     com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef;
-    BOOL            mbDummy1 : 1;
+    sal_Bool            mbDummy1 : 1;
 };
 
 struct SdrModelImpl;
@@ -205,27 +205,27 @@ protected:
                     m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell
     SdrOutliner*    pDrawOutliner;  // ein Outliner zur Textausgabe
     SdrOutliner*    pHitTestOutliner;// ein Outliner fuer den HitTest
-    ULONG           nDefTextHgt;    // Default Texthoehe in logischen Einheiten
+    sal_uIntPtr           nDefTextHgt;    // Default Texthoehe in logischen Einheiten
     OutputDevice*   pRefOutDev;     // ReferenzDevice fuer die EditEngine
-    ULONG           nProgressAkt;   // fuer den
-    ULONG           nProgressMax;   // ProgressBar-
-    ULONG           nProgressOfs;   // -Handler
+    sal_uIntPtr           nProgressAkt;   // fuer den
+    sal_uIntPtr           nProgressMax;   // ProgressBar-
+    sal_uIntPtr           nProgressOfs;   // -Handler
     rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
     SfxStyleSheet*  pDefaultStyleSheet;
     sfx2::LinkManager* pLinkManager;   // LinkManager
     Container*      pUndoStack;
     Container*      pRedoStack;
     SdrUndoGroup*   pAktUndoGroup;  // Fuer mehrstufige
-    USHORT          nUndoLevel;     // Undo-Klammerung
+    sal_uInt16          nUndoLevel;     // Undo-Klammerung
     bool            mbUndoEnabled;  // If false no undo is recorded or we are during the execution of an undo action
-    USHORT          nProgressPercent; // fuer den ProgressBar-Handler
-    USHORT          nLoadVersion;   // Versionsnummer der geladenen Datei
+    sal_uInt16          nProgressPercent; // fuer den ProgressBar-Handler
+    sal_uInt16          nLoadVersion;   // Versionsnummer der geladenen Datei
     FASTBOOL        bExtColorTable; // Keinen eigenen ColorTable
     sal_Bool        mbChanged;
     FASTBOOL        bInfoChanged;
     FASTBOOL        bPagNumsDirty;
     FASTBOOL        bMPgNumsDirty;
-    FASTBOOL        bPageNotValid;  // TRUE=Doc ist nur ObjektTraeger. Page ist nicht gueltig.
+    FASTBOOL        bPageNotValid;  // sal_True=Doc ist nur ObjektTraeger. Page ist nicht gueltig.
     FASTBOOL        bSavePortable;  // Metafiles portabel speichern
     FASTBOOL        bNoBitmapCaching;   // Bitmaps fuer Screenoutput cachen
     FASTBOOL        bReadOnly;
@@ -234,12 +234,12 @@ protected:
     FASTBOOL        bSwapGraphics;
     FASTBOOL        bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode
     FASTBOOL        bSaveOLEPreview;      // save preview metafile of OLE objects
-    UINT16          nStreamCompressMode;  // Komprimiert schreiben?
-    UINT16          nStreamNumberFormat;
-    UINT16          nDefaultTabulator;
-    UINT32          nMaxUndoCount;
+    sal_uInt16          nStreamCompressMode;  // Komprimiert schreiben?
+    sal_uInt16          nStreamNumberFormat;
+    sal_uInt16          nDefaultTabulator;
+    sal_uInt32          nMaxUndoCount;
     FASTBOOL        bSaveNative;
-    BOOL            bStarDrawPreviewMode;
+    sal_Bool            bStarDrawPreviewMode;
 
 
 //////////////////////////////////////////////////////////////////////////////
@@ -266,19 +266,19 @@ public:
     bool IsAllowShapePropertyChangeListener() const;
     void SetAllowShapePropertyChangeListener( bool bAllow );
 
-    UINT16          nStarDrawPreviewMasterPageNum;
+    sal_uInt16          nStarDrawPreviewMasterPageNum;
     // Reserven fuer kompatible Erweiterungen
 //-/    SfxItemPool*    pUndoItemPool;
     SotStorage*     pModelStorage;
     SvxForbiddenCharactersTable* mpForbiddenCharactersTable;
-    ULONG           nSwapGraphicsMode;
+    sal_uIntPtr         nSwapGraphicsMode;
 
     SdrOutlinerCache* mpOutlinerCache;
     SdrModelImpl*   mpImpl;
-    UINT16          mnCharCompressType;
-    UINT16          mnHandoutPageCount;
-    UINT16          nReserveUInt6;
-    UINT16          nReserveUInt7;
+    sal_uInt16          mnCharCompressType;
+    sal_uInt16          mnHandoutPageCount;
+    sal_uInt16          nReserveUInt6;
+    sal_uInt16          nReserveUInt7;
     FASTBOOL        mbModelLocked;
     FASTBOOL        mbKernAsianPunctuation;
     FASTBOOL        mbAddExtLeading;
@@ -299,8 +299,8 @@ public:
 public:
     const SvNumberFormatter& GetNumberFormatter() const;
 
-    UINT16 getHandoutPageCount() const { return mnHandoutPageCount; }
-    void setHandoutPageCount( UINT16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; }
+    sal_uInt16 getHandoutPageCount() const { return mnHandoutPageCount; }
+    void setHandoutPageCount( sal_uInt16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; }
 
 protected:
 
@@ -314,7 +314,7 @@ private:
 //#if 0 // _SOLAR__PRIVATE
     SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo);
     SVX_DLLPRIVATE void ImpSetUIUnit();
-    SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit = FALSE );
+    SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False );
     SVX_DLLPRIVATE void ImpReformatAllTextObjects();
     SVX_DLLPRIVATE void ImpReformatAllEdgeObjects();    // #103122#
     SVX_DLLPRIVATE void ImpCreateTables();
@@ -353,7 +353,7 @@ public:
     // Hier kann man erfragen, ob das Model gerade eingrstreamt wird
     FASTBOOL IsLoading() const                  { return sal_False /*BFS01 bLoading */; }
     // Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken
-    // zu ermoeglichen. Wird rbDeleteAfterUse auf TRUE gesetzt, so wird
+    // zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird
     // die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert.
     // Wenn diese Methode NULL liefert, wird zum Swappen eine temporaere
     // Datei angelegt.
@@ -385,7 +385,7 @@ public:
     const SdrTextObj*    GetFormattingTextObj() const;
     // Die TextDefaults (Font,Hoehe,Farbe) in ein Set putten
     void                 SetTextDefaults() const;
-    static void          SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt );
+    static void          SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt );
 
     // ReferenzDevice fuer die EditEngine
     void                 SetRefDevice(OutputDevice* pDev);
@@ -393,11 +393,11 @@ public:
     // Wenn ein neuer MapMode am RefDevice gesetzt wird o.ae.
     void                 RefDeviceChanged(); // noch nicht implementiert
     // Default-Schrifthoehe in logischen Einheiten
-    void                 SetDefaultFontHeight(ULONG nVal);
-    ULONG                GetDefaultFontHeight() const           { return nDefTextHgt; }
+    void                 SetDefaultFontHeight(sal_uIntPtr nVal);
+    sal_uIntPtr                GetDefaultFontHeight() const           { return nDefTextHgt; }
     // Default-Tabulatorweite fuer die EditEngine
-    void                 SetDefaultTabulator(USHORT nVal);
-    USHORT               GetDefaultTabulator() const            { return nDefaultTabulator; }
+    void                 SetDefaultTabulator(sal_uInt16 nVal);
+    sal_uInt16               GetDefaultTabulator() const            { return nDefaultTabulator; }
 
     // Der DefaultStyleSheet wird jedem Zeichenobjekt verbraten das in diesem
     // Model eingefuegt wird und kein StyleSheet gesetzt hat.
@@ -452,20 +452,20 @@ public:
     FASTBOOL         IsUIOnlyKomma() const                      { return bUIOnlyKomma; }
 
     static void      TakeUnitStr(FieldUnit eUnit, String& rStr);
-    void             TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=FALSE, sal_Int32 nNumDigits = -1) const;
-    void             TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=FALSE) const;
-    void             TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=FALSE) const;
+    void             TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=sal_False, sal_Int32 nNumDigits = -1) const;
+    void             TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=sal_False) const;
+    void             TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=sal_False) const;
 
     // RecalcPageNums wird idR. nur von der Page gerufen.
     FASTBOOL         IsPagNumsDirty() const                     { return bPagNumsDirty; };
     FASTBOOL         IsMPgNumsDirty() const                     { return bMPgNumsDirty; };
     void             RecalcPageNums(FASTBOOL bMaster);
     // Nach dem Insert gehoert die Page dem SdrModel.
-    virtual void     InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF);
-    virtual void     DeletePage(USHORT nPgNum);
+    virtual void     InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
+    virtual void     DeletePage(sal_uInt16 nPgNum);
     // Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert)
-    virtual SdrPage* RemovePage(USHORT nPgNum);
-    virtual void     MovePage(USHORT nPgNum, USHORT nNewPos);
+    virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
+    virtual void     MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
     const SdrPage* GetPage(sal_uInt16 nPgNum) const;
     SdrPage* GetPage(sal_uInt16 nPgNum);
     sal_uInt16 GetPageCount() const;
@@ -473,11 +473,11 @@ public:
     virtual void PageListChanged();
 
     // Masterpages
-    virtual void     InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF);
-    virtual void     DeleteMasterPage(USHORT nPgNum);
+    virtual void     InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
+    virtual void     DeleteMasterPage(sal_uInt16 nPgNum);
     // Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert)
-    virtual SdrPage* RemoveMasterPage(USHORT nPgNum);
-    virtual void     MoveMasterPage(USHORT nPgNum, USHORT nNewPos);
+    virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
+    virtual void     MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
     const SdrPage* GetMasterPage(sal_uInt16 nPgNum) const;
     SdrPage* GetMasterPage(sal_uInt16 nPgNum);
     sal_uInt16 GetMasterPageCount() const;
@@ -494,29 +494,29 @@ public:
     // auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese
     // Kennzeichnung wird fuers Clipboard/Drag&Drop benoetigt.
     FASTBOOL        IsPageNotValid() const                     { return bPageNotValid; }
-    void            SetPageNotValid(FASTBOOL bJa=TRUE)         { bPageNotValid=bJa; }
+    void            SetPageNotValid(FASTBOOL bJa=sal_True)         { bPageNotValid=bJa; }
 
-    // Schaltet man dieses Flag auf TRUE, so werden Grafikobjekte
+    // Schaltet man dieses Flag auf sal_True, so werden Grafikobjekte
     // portabel gespeichert. Es findet dann beim Speichern ggf.
     // eine implizite Wandlung von Metafiles statt.
     // Default=FALSE. Flag ist nicht persistent.
     FASTBOOL        IsSavePortable() const                     { return bSavePortable; }
-    void            SetSavePortable(FASTBOOL bJa=TRUE)         { bSavePortable=bJa; }
+    void            SetSavePortable(FASTBOOL bJa=sal_True)         { bSavePortable=bJa; }
 
-    // Schaltet man dieses Flag auf TRUE, so werden
+    // Schaltet man dieses Flag auf sal_True, so werden
     // Pixelobjekte (stark) komprimiert gespeichert.
     // Default=FALSE. Flag ist nicht persistent.
     FASTBOOL        IsSaveCompressed() const                   { return bSaveCompressed; }
-    void            SetSaveCompressed(FASTBOOL bJa=TRUE)       { bSaveCompressed=bJa; }
+    void            SetSaveCompressed(FASTBOOL bJa=sal_True)       { bSaveCompressed=bJa; }
 
-    // Schaltet man dieses Flag auf TRUE, so werden
+    // Schaltet man dieses Flag auf sal_True, so werden
     // Grafikobjekte mit gesetztem Native-Link
     // native gespeichert.
     // Default=FALSE. Flag ist nicht persistent.
     FASTBOOL        IsSaveNative() const                       { return bSaveNative; }
-    void            SetSaveNative(FASTBOOL bJa=TRUE)           { bSaveNative=bJa; }
+    void            SetSaveNative(FASTBOOL bJa=sal_True)           { bSaveNative=bJa; }
 
-    // Schaltet man dieses Flag auf TRUE, so werden die Grafiken
+    // Schaltet man dieses Flag auf sal_True, so werden die Grafiken
     // von Grafikobjekten:
     // - beim Laden eines Dokuments nicht sofort mitgeladen,
     //   sondern erst wenn sie gebraucht (z.B. angezeigt) werden.
@@ -526,9 +526,9 @@ public:
     // GetDocumentStream() ueberladen werden.
     // Default=FALSE. Flag ist nicht persistent.
     FASTBOOL        IsSwapGraphics() const { return bSwapGraphics; }
-    void            SetSwapGraphics(FASTBOOL bJa=TRUE);
-    void            SetSwapGraphicsMode(ULONG nMode) { nSwapGraphicsMode = nMode; }
-    ULONG           GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
+    void            SetSwapGraphics(FASTBOOL bJa=sal_True);
+    void            SetSwapGraphicsMode(sal_uIntPtr nMode) { nSwapGraphicsMode = nMode; }
+    sal_uIntPtr         GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
 
     FASTBOOL        IsSaveOLEPreview() const          { return bSaveOLEPreview; }
     void            SetSaveOLEPreview( FASTBOOL bSet) { bSaveOLEPreview = bSet; }
@@ -541,9 +541,9 @@ public:
     // (Speicher sparen).
     // Default=Cache eingeschaltet. Flag ist nicht persistent.
     FASTBOOL        IsBitmapCaching() const                     { return !bNoBitmapCaching; }
-    void            SetBitmapCaching(FASTBOOL bJa=TRUE)         { bNoBitmapCaching=!bJa; }
+    void            SetBitmapCaching(FASTBOOL bJa=sal_True)         { bNoBitmapCaching=!bJa; }
 
-    // Defaultmaessig (FALSE) kann man Textrahmen ohne Fuellung durch
+    // Defaultmaessig (sal_False) kann man Textrahmen ohne Fuellung durch
     // Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie
     // nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet.
     FASTBOOL        IsPickThroughTransparentTextFrames() const  { return bTransparentTextFrames; }
@@ -553,7 +553,7 @@ public:
     // Wird nur von den Possibility-Methoden der View ausgewerdet.
     // Direkte Manipulationen am Model, ... berueksichtigen dieses Flag nicht.
     // Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files
-    // TRUE oder FALSE liefern (Methode wird oeffters gerufen, also ein Flag
+    // sal_True oder sal_False liefern (Methode wird oeffters gerufen, also ein Flag
     // verwenden!).
     virtual FASTBOOL IsReadOnly() const;
     virtual void     SetReadOnly(FASTBOOL bYes);
@@ -563,26 +563,26 @@ public:
     // rSourceModel ist anschliessend u.U. weitgehend leer.
     // nFirstPageNum,nLastPageNum: Die aus rSourceModel zu uebernehmenden Seiten
     // nDestPos..................: Einfuegeposition
-    // bMergeMasterPages.........: TRUE =benoetigte MasterPages werden aus
+    // bMergeMasterPages.........: sal_True =benoetigte MasterPages werden aus
     //                                   rSourceModel ebenfalls uebernommen
-    //                             FALSE=Die MasterPageDescriptoren der Seiten
+    //                             sal_False=Die MasterPageDescriptoren der Seiten
     //                                   aus rSourceModel werden auf die
     //                                   vorhandenen MasterPages gemappt.
     // bUndo.....................: Fuer das Merging wird eine UndoAction generiert.
     //                             Undo ist nur fuer das ZielModel, nicht fuer
     //                             rSourceModel.
-    // bTreadSourceAsConst.......: TRUE=Das SourceModel wird nicht veraendert,.
+    // bTreadSourceAsConst.......: sal_True=Das SourceModel wird nicht veraendert,.
     //                             d.h die Seiten werden kopiert.
     virtual void Merge(SdrModel& rSourceModel,
-               USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF,
-               USHORT nDestPos=0xFFFF,
-               FASTBOOL bMergeMasterPages=FALSE, FASTBOOL bAllMasterPages=FALSE,
-               FASTBOOL bUndo=TRUE, FASTBOOL bTreadSourceAsConst=FALSE);
+               sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF,
+               sal_uInt16 nDestPos=0xFFFF,
+               FASTBOOL bMergeMasterPages=sal_False, FASTBOOL bAllMasterPages=sal_False,
+               FASTBOOL bUndo=sal_True, FASTBOOL bTreadSourceAsConst=sal_False);
 
-    // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,FALSE,FALSE,bUndo,!bMoveNoCopy);
-    void CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
-                   USHORT nDestPos,
-                   FASTBOOL bUndo=TRUE, FASTBOOL bMoveNoCopy=FALSE);
+    // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,sal_False,bUndo,!bMoveNoCopy);
+    void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+                   sal_uInt16 nDestPos,
+                   FASTBOOL bUndo=sal_True, FASTBOOL bMoveNoCopy=sal_False);
 
     // Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions
     // beliebig tief zu klammern. Als Kommentar der
@@ -598,7 +598,7 @@ public:
     void BegUndo(SdrUndoGroup* pUndoGrp); // Undo-Klammerung auf
     void EndUndo();                       // Undo-Klammerung zu
     void AddUndo(SdrUndoAction* pUndo);
-    USHORT GetUndoBracketLevel() const                       { return nUndoLevel; }
+    sal_uInt16 GetUndoBracketLevel() const                       { return nUndoLevel; }
     const SdrUndoGroup* GetAktUndoGroup() const              { return pAktUndoGroup; }
     // nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
     void SetUndoComment(const String& rComment);
@@ -607,15 +607,15 @@ public:
     // Das Undo-Managment findet nur statt, wenn kein NotifyUndoAction-Handler
     // gesetzt ist.
     // Default ist 16. Minimaler MaxUndoActionCount ist 1!
-    void  SetMaxUndoActionCount(ULONG nAnz);
-    ULONG GetMaxUndoActionCount() const { return nMaxUndoCount; }
+    void  SetMaxUndoActionCount(sal_uIntPtr nAnz);
+    sal_uIntPtr GetMaxUndoActionCount() const { return nMaxUndoCount; }
     void  ClearUndoBuffer();
     // UndoAction(0) ist die aktuelle (also die zuletzt eingegangene)
-    ULONG GetUndoActionCount() const                      { return pUndoStack!=NULL ? pUndoStack->Count() : 0; }
-    const SfxUndoAction* GetUndoAction(ULONG nNum) const  { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); }
+    sal_uIntPtr GetUndoActionCount() const                      { return pUndoStack!=NULL ? pUndoStack->Count() : 0; }
+    const SfxUndoAction* GetUndoAction(sal_uIntPtr nNum) const  { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); }
     // RedoAction(0) ist die aktuelle (also die des letzten Undo)
-    ULONG GetRedoActionCount() const                      { return pRedoStack!=NULL ? pRedoStack->Count() : 0; }
-    const SfxUndoAction* GetRedoAction(ULONG nNum) const  { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); }
+    sal_uIntPtr GetRedoActionCount() const                      { return pRedoStack!=NULL ? pRedoStack->Count() : 0; }
+    const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const  { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); }
 
     FASTBOOL Undo();
     FASTBOOL Redo();
@@ -646,7 +646,7 @@ public:
     // Hier kann man einen Handler setzen der beim Streamen mehrfach gerufen
     // wird und ungefaehre Auskunft ueber den Fortschreitungszustand der
     // Funktion gibt. Der Handler muss folgendes Aussehen haben:
-    //   void __EXPORT class::IOProgressHdl(const USHORT& nPercent);
+    //   void __EXPORT class::IOProgressHdl(const sal_uInt16& nPercent);
     // Der erste Aufruf des Handlers erfolgt grundsaetzlich mit 0, der letzte
     // mit 100. Dazwischen erfolgen maximal 99 Aufrufe mit Werten 1...99.
     // Man kann also durchaus bei 0 den Progressbar Initiallisieren und bei
@@ -679,13 +679,13 @@ public:
     // durch. Geprueft wird insbesondere die Verkettung von Verschachtelten
     // Gruppenobjekten, aber auch Stati wie bInserted sowie Model* und Page*
     // der Objects, SubLists und Pages. Bei korrekter Struktur liefert die
-    // Methode TRUE, andernfalls FALSE.
+    // Methode sal_True, andernfalls FALSE.
     // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL
     // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni)
     FASTBOOL CheckConsistence() const;
 
-    void    SetStarDrawPreviewMode(BOOL bPreview);
-    BOOL    IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
+    void    SetStarDrawPreviewMode(sal_Bool bPreview);
+    sal_Bool    IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
 
     SotStorage* GetModelStorage() const { return pModelStorage; }
     void        SetModelStorage( SotStorage* pStor ) { pModelStorage = pStor; }
@@ -695,14 +695,14 @@ public:
 
     // these functions are used by the api to disable repaints during a
     // set of api calls.
-    BOOL isLocked() const { return (BOOL)mbModelLocked; }
-    void setLock( BOOL bLock );
+    sal_Bool isLocked() const { return (sal_Bool)mbModelLocked; }
+    void setLock( sal_Bool bLock );
 
     void            SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
     vos::ORef<SvxForbiddenCharactersTable>  GetForbiddenCharsTable() const;
 
-    void SetCharCompressType( UINT16 nType );
-    UINT16 GetCharCompressType() const { return mnCharCompressType; }
+    void SetCharCompressType( sal_uInt16 nType );
+    sal_uInt16 GetCharCompressType() const { return mnCharCompressType; }
 
     void SetKernAsianPunctuation( sal_Bool bEnabled );
     sal_Bool IsKernAsianPunctuation() const { return (sal_Bool)mbKernAsianPunctuation; }
@@ -712,9 +712,9 @@ public:
 
     void ReformatAllTextObjects();
 
-    FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const;
+    FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const;
 
-    SdrOutliner* createOutliner( USHORT nOutlinerMode );
+    SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode );
     void disposeOutliner( SdrOutliner* pOutliner );
 
     sal_Bool IsWriter() const { return !bMyPool; }
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index fc136b8e5a3c..26845f0ff68d 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -134,9 +134,9 @@ protected:
     Rectangle                   aMarkedPointsRect;
     Rectangle                   aMarkedGluePointsRect;
 
-    USHORT                      nFrameHandlesLimit;
-    ULONG                   mnInsPointNum;      // Nummer des InsPoint
-    ULONG                       nMarkableObjCount;
+    sal_uInt16                      nFrameHandlesLimit;
+    sal_uIntPtr                 mnInsPointNum;      // Nummer des InsPoint
+    sal_uIntPtr                     nMarkableObjCount;
 
     SdrDragMode                 eDragMode;        // Persistent
     SdrViewEditMode             eEditMode;      // Persistent
@@ -169,7 +169,7 @@ protected:
     virtual void SetMarkRects();                                             // Rects an den PageViews
     virtual void CheckMarked();                                              // MarkList nach Del und Lock Layer durchsuchen...
     virtual void AddDragModeHdl(SdrDragMode eMode);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
 
     // add custom handles (used by other apps, e.g. AnchorPos)
     virtual void AddCustomHdl();
@@ -178,18 +178,18 @@ protected:
     void ForceUndirtyMrkPnt() const                                       { if (bMrkPntDirty) UndirtyMrkPnt(); }
 
     //HMHvoid ImpShowMarkHdl(bool bNoRefHdl);
-    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const;
-    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const;
-    BOOL ImpIsFrameHandles() const;
-    void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0, USHORT nOpt=0) const;
+    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const;
+    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const;
+    sal_Bool ImpIsFrameHandles() const;
+    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const;
 
     // Macht aus einer Winkelangabe in 1/100deg einen String inkl. Grad-Zeichen
-    BOOL ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark);
-    virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark);
-    BOOL MarkGluePoints(const Rectangle* pRect, BOOL bUnmark);
+    sal_Bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark);
+    virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark);
+    sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark);
 
-    void SetMoveOutside(BOOL bOn);
-    BOOL IsMoveOutside() const;
+    void SetMoveOutside(sal_Bool bOn);
+    sal_Bool IsMoveOutside() const;
 
 protected:
     // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -197,7 +197,7 @@ protected:
     virtual ~SdrMarkView();
 
 public:
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
@@ -206,9 +206,9 @@ public:
 
     virtual void ClearPageView();
     virtual void HideSdrPage();
-    virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
+    virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
 
-    // Liefert TRUE wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen
+    // Liefert sal_True wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen
     // selektiert werden (solange wie der Rahmen aufgezogen wird).
     sal_Bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); }
 
@@ -224,35 +224,35 @@ public:
     // Das Interface wird hier evtl noch geaendert wg. Ortho-Drag
     void SetDragMode(SdrDragMode eMode);
     SdrDragMode GetDragMode() const { return eDragMode; }
-    BOOL ChkDragMode(SdrDragMode eMode) const;
-    void SetFrameHandles(BOOL bOn);
-    BOOL IsFrameHandles() const { return bForceFrameHandles; }
+    sal_Bool ChkDragMode(SdrDragMode eMode) const;
+    void SetFrameHandles(sal_Bool bOn);
+    sal_Bool IsFrameHandles() const { return bForceFrameHandles; }
 
     // Limit, ab wann implizit auf FrameHandles umgeschaltet wird. default=50.
-    void SetFrameHandlesLimit(USHORT nAnz) { nFrameHandlesLimit=nAnz; }
-    USHORT GetFrameHandlesLimit() const { return nFrameHandlesLimit; }
+    void SetFrameHandlesLimit(sal_uInt16 nAnz) { nFrameHandlesLimit=nAnz; }
+    sal_uInt16 GetFrameHandlesLimit() const { return nFrameHandlesLimit; }
 
     void SetEditMode(SdrViewEditMode eMode);
     SdrViewEditMode GetEditMode() const { return eEditMode; }
 
-    void SetEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
-    BOOL IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
-    void SetCreateMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
-    BOOL IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
-    void SetGluePointEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
-    BOOL IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; }
+    void SetEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
+    sal_Bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
+    void SetCreateMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
+    sal_Bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
+    void SetGluePointEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
+    sal_Bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; }
 
-    void SetDesignMode(BOOL bOn=TRUE);
-    BOOL IsDesignMode() const { return bDesignMode; }
+    void SetDesignMode(sal_Bool bOn=sal_True);
+    sal_Bool IsDesignMode() const { return bDesignMode; }
 
-    void SetFrameDragSingles(BOOL bOn=TRUE) { SetFrameHandles(bOn); }
-    BOOL IsFrameDragSingles() const { return IsFrameHandles(); }
+    void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }
+    sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); }
 
     // Feststellen, ob und wo ein Objekt bzw. ob ein Referenzpunkt
     // (Rotationsmittelpunkt,Spiegelachse) getroffen wird (SW special).
     SdrHitKind PickSomething(const Point& rPnt, short nTol=-2) const;
-    BOOL HasMarkableObj() const;
-    ULONG GetMarkableObjCount() const;
+    sal_Bool HasMarkableObj() const;
+    sal_uIntPtr GetMarkableObjCount() const;
     //HMHvoid ShowMarkHdl(bool bNoRefHdl = false);
     //HMHvoid HideMarkHdl(bool bNoRefHdl = false);
     //HMHBOOL IsMarkHdlShown() const { return bHdlShown; }
@@ -268,11 +268,11 @@ protected:
 public:
     // all available const methods for read access to selection
     const SdrMarkList& GetMarkedObjectList() const { return mpSdrViewSelection->GetMarkedObjectList(); }
-    ULONG TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); }
-    SdrPageView* GetSdrPageViewOfMarkedByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); }
-    SdrMark* GetSdrMarkByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum); }
-    SdrObject* GetMarkedObjectByIndex(ULONG nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
-    ULONG GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
+    sal_uIntPtr TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); }
+    SdrPageView* GetSdrPageViewOfMarkedByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); }
+    SdrMark* GetSdrMarkByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum); }
+    SdrObject* GetMarkedObjectByIndex(sal_uIntPtr nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
+    sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
     void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); }
     sal_Bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); }
     String GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); }
@@ -296,47 +296,47 @@ public:
     void showMarkHandles();
     bool areMarkHandlesHidden() const { return mbMarkHandlesHidden; }
 
-    BOOL IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); }
-    BOOL IsMarkedObjHit(const Point& rPnt, short nTol=-2) const;
+    sal_Bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); }
+    sal_Bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const;
 
     // Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD (ni)
-    SdrHdl* PickHandle(const Point& rPnt, ULONG nOptions=0, SdrHdl* pHdl0=NULL) const;
+    SdrHdl* PickHandle(const Point& rPnt, sal_uIntPtr nOptions=0, SdrHdl* pHdl0=NULL) const;
 
     // Pick: Unterstuetzte Optionen fuer nOptions sind:
     // SDRSEARCH_DEEP SDRSEARCH_ALSOONMASTER SDRSEARCH_TESTMARKABLE SDRSEARCH_TESTTEXTEDIT
     // SDRSEARCH_WITHTEXT SDRSEARCH_TESTTEXTAREA SDRSEARCH_BACKWARD SDRSEARCH_MARKED
     // SDRSEARCH_WHOLEPAGE
-    virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum=NULL, USHORT* pnPassNum=NULL) const;
-    virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const;
-    // BOOL PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
-    BOOL MarkObj(const Point& rPnt, short nTol=-2, BOOL bToggle=FALSE, BOOL bDeep=FALSE);
+    virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const;
+    virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
+    // sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
+    sal_Bool MarkObj(const Point& rPnt, short nTol=-2, sal_Bool bToggle=sal_False, sal_Bool bDeep=sal_False);
 
     // Pick: Unterstuetzte Optionen fuer nOptions sind SDRSEARCH_PASS2BOUND und SDRSEARCH_PASS3NEAREST
-    BOOL PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum=NULL, ULONG nOptions=0) const;
+    sal_Bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const;
 
     // Sucht sich das Oberste der markierten Objekte (O1) und sucht von dort
     // aus in Richtung nach Unten dann das erste nichtmarkierte Objekt (O2).
     // Bei Erfolg wird die Markierung von O1 entfernt, an O2 gesetzt und TRUE
-    // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+    // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
     // andere Richtung.
-    BOOL MarkNextObj(BOOL bPrev=FALSE);
+    sal_Bool MarkNextObj(sal_Bool bPrev=sal_False);
 
     // Sucht sich das Oberste der markierten Objekte (O1) das von rPnt/nTol
     // getroffen wird und sucht von dort aus in Richtung nach Unten dann das
     // erste nichtmarkierte Objekt (O2). Bei Erfolg wird die Markierung von
-    // O1 entfernt, an O2 gesetzt und TRUE returniert.
-    // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
-    BOOL MarkNextObj(const Point& rPnt, short nTol=-2, BOOL bPrev=FALSE);
+    // O1 entfernt, an O2 gesetzt und sal_True returniert.
+    // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+    sal_Bool MarkNextObj(const Point& rPnt, short nTol=-2, sal_Bool bPrev=sal_False);
 
     // Alle Objekte innerhalb eines rechteckigen Bereichs markieren
     // Markiert werden nur Objekte, die vollstaendig eingeschlossen sind.
-    BOOL MarkObj(const Rectangle& rRect, BOOL bUnmark=FALSE);
-    void MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark=FALSE, BOOL bImpNoSetMarkHdl=FALSE);
+    sal_Bool MarkObj(const Rectangle& rRect, sal_Bool bUnmark=sal_False);
+    void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False);
     void MarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten
     void UnmarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten
 
     // Diese Funktion kostet etwas Zeit, da die MarkList durchsucht werden muss.
-    BOOL IsObjMarked(SdrObject* pObj) const;
+    sal_Bool IsObjMarked(SdrObject* pObj) const;
     // void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline
     void UnMarkAll(SdrPageView* pPV=NULL) { UnmarkAllObj(pPV); }
 
@@ -344,8 +344,8 @@ public:
     // Der Wert ist als Kantenlaenge zu betrachten. Gerade Werte werden
     // auf Ungerade aufgerundet: 3->3, 4->5, 5->5, 6->7, 7->7, ...
     // Defaultwert ist 7, Mindestwert 3 Pixel.
-    USHORT GetMarkHdlSizePixel() const;
-    void SetMarkHdlSizePixel(USHORT nSiz);
+    sal_uInt16 GetMarkHdlSizePixel() const;
+    void SetMarkHdlSizePixel(sal_uInt16 nSiz);
 
     // Die Groesse der Markierungs-Handles wird ueber die jeweilige Aufloesung
     // und die Groesse des Bereichs der markierten Objekte so angepasst, dass
@@ -353,53 +353,53 @@ public:
     // Dazu muessen die Handles ggf. verkleinert dargestellt werden. Mit der
     // MinMarkHdlSize kann man hierfuer eine Mindestgroesse angeben.
     // Defaultwert ist 3, Mindestwert 3 Pixel.
-    BOOL IsSolidMarkHdl() const { return aHdl.IsFineHdl(); }
-    void SetSolidMarkHdl(BOOL bOn);
+    sal_Bool IsSolidMarkHdl() const { return aHdl.IsFineHdl(); }
+    void SetSolidMarkHdl(sal_Bool bOn);
 
-    virtual BOOL HasMarkablePoints() const;
-    virtual ULONG GetMarkablePointCount() const;
-    virtual BOOL HasMarkedPoints() const;
-    virtual ULONG GetMarkedPointCount() const;
+    virtual sal_Bool HasMarkablePoints() const;
+    virtual sal_uIntPtr GetMarkablePointCount() const;
+    virtual sal_Bool HasMarkedPoints() const;
+    virtual sal_uIntPtr GetMarkedPointCount() const;
 
     // Nicht alle Punkte lassen sich markieren:
-    virtual BOOL IsPointMarkable(const SdrHdl& rHdl) const;
-    virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE);
+    virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const;
+    virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False);
 
     /** should only be used from outside svx for special ui elements */
-    BOOL MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark);
+    sal_Bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark);
 
     // alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten)
-    BOOL MarkPoints(const Rectangle& rRect, BOOL bUnmark=FALSE) { return MarkPoints(&rRect,bUnmark); }
-    BOOL UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); }
-    BOOL UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); }
-    BOOL IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); }
-    BOOL MarkAllPoints() { return MarkPoints(NULL,FALSE); }
-    BOOL UnmarkAllPoints() { return MarkPoints(NULL,TRUE); }
-    BOOL UnMarkAllPoints() { return MarkPoints(NULL,TRUE); }
+    sal_Bool MarkPoints(const Rectangle& rRect, sal_Bool bUnmark=sal_False) { return MarkPoints(&rRect,bUnmark); }
+    sal_Bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); }
+    sal_Bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); }
+    sal_Bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); }
+    sal_Bool MarkAllPoints() { return MarkPoints(NULL,sal_False); }
+    sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); }
+    sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); }
 
     // Sucht sich den ersten markierten Punkt (P1) und sucht von dort
     // aus in den ersten nichtmarkierte Punkt (P2).
     // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE
-    // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+    // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
     // andere Richtung.
-    BOOL MarkNextPoint(BOOL bPrev=FALSE);
+    sal_Bool MarkNextPoint(sal_Bool bPrev=sal_False);
 
     // Sucht sich den ersten markierten Punkt (P1) das von rPnt
     // getroffen wird und sucht von dort aus den
     // ersten nichtmarkierten Punkt (P2). Bei Erfolg wird die Markierung von
-    // P1 entfernt, an P2 gesetzt und TRUE returniert.
-    // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
-    BOOL MarkNextPoint(const Point& rPnt, BOOL bPrev=FALSE);
+    // P1 entfernt, an P2 gesetzt und sal_True returniert.
+    // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+    sal_Bool MarkNextPoint(const Point& rPnt, sal_Bool bPrev=sal_False);
 
     // Die Nummer des passenden Handles raussuchen. Nicht gefunden
     // liefert CONTAINER_ENTRY_NOTFOUND.
-    ULONG GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
-    SdrHdl* GetHdl(ULONG nHdlNum)  const { return aHdl.GetHdl(nHdlNum); }
+    sal_uIntPtr GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
+    SdrHdl* GetHdl(sal_uIntPtr nHdlNum)  const { return aHdl.GetHdl(nHdlNum); }
     const SdrHdlList& GetHdlList() const { return aHdl; }
 
     // Selektionsrahmen fuer Punktmarkierung aufziehen.
-    // Wird nur gestartet, wenn HasMarkablePoints() TRUE liefert.
-    // BOOL BegMarkPoints(const Point& rPnt, OutputDevice* pOut);
+    // Wird nur gestartet, wenn HasMarkablePoints() sal_True liefert.
+    // sal_Bool BegMarkPoints(const Point& rPnt, OutputDevice* pOut);
     sal_Bool BegMarkPoints(const Point& rPnt, sal_Bool bUnmark = sal_False);
     void MovMarkPoints(const Point& rPnt);
     sal_Bool EndMarkPoints();
@@ -407,21 +407,21 @@ public:
     sal_Bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); }
 
     // Zusatzhandles dauerhaft sichtbar schalten
-    void SetPlusHandlesAlwaysVisible(BOOL bOn);
-    BOOL IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
+    void SetPlusHandlesAlwaysVisible(sal_Bool bOn);
+    sal_Bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
 
     // Handles sichrbar waerend TextEdit (in doppelter Groesse)?
     // Persistent, default=FALSE
-    void SetMarkHdlWhenTextEdit(BOOL bOn) { bMarkHdlWhenTextEdit=bOn; }
-    BOOL IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
+    void SetMarkHdlWhenTextEdit(sal_Bool bOn) { bMarkHdlWhenTextEdit=bOn; }
+    sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
 
-    BOOL HasMarkableGluePoints() const;
-    ULONG GetMarkableGluePointCount() const;
-    BOOL HasMarkedGluePoints() const;
-    ULONG GetMarkedGluePointCount() const;
+    sal_Bool HasMarkableGluePoints() const;
+    sal_uIntPtr GetMarkableGluePointCount() const;
+    sal_Bool HasMarkedGluePoints() const;
+    sal_uIntPtr GetMarkedGluePointCount() const;
 
     // Ein Klebepunkt wird eindeutig identifiziert durch das SdrObject
-    // (dem er zugehoert) sowie einem USHORT nId (da jedes SdrObject je
+    // (dem er zugehoert) sowie einem sal_uInt16 nId (da jedes SdrObject je
     // mehrere Klebepunkte haben kann. Hier an der View kommt zudem noch
     // eine SdrPageView, die stets korrekt gesetzt sein sollte.
     // Alternativ kann ein Klebepunkt durch ein SdrHdl bezeichnet werden.
@@ -432,52 +432,52 @@ public:
     // Handleliste erneut berechnet. Alle vorher gemerkten SdrHdl* sind
     // damit ungueltig, ebenso die Punkt-Id's!
     // Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD
-    BOOL PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions=0) const;
-    BOOL MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV, BOOL bUnmark=FALSE);
-    BOOL UnmarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,TRUE); }
-    BOOL IsGluePointMarked(const SdrObject* pObj, USHORT nId) const;
-    BOOL UnmarkGluePoint(const SdrHdl& rHdl);
+    sal_Bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
+    sal_Bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, sal_Bool bUnmark=sal_False);
+    sal_Bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,sal_True); }
+    sal_Bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const;
+    sal_Bool UnmarkGluePoint(const SdrHdl& rHdl);
 
     // Hdl eines markierten GluePoints holen. Nicht markierte
     // GluePoints haben keine Handles
-    SdrHdl* GetGluePointHdl(const SdrObject* pObj, USHORT nId) const;
-    BOOL IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; }
+    SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const;
+    sal_Bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; }
 
     // alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten)
-    BOOL MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,FALSE); }
-    BOOL UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,TRUE); }
-    BOOL MarkAllGluePoints() { return MarkGluePoints(NULL,FALSE); }
-    BOOL UnmarkAllGluePoints() { return MarkGluePoints(NULL,TRUE); }
+    sal_Bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_False); }
+    sal_Bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_True); }
+    sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); }
+    sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); }
 
     // Sucht sich den ersten markierten Klebepunkt (P1) und sucht von dort
     // aus in den ersten nichtmarkierte Klebepunkt (P2).
     // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE
-    // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+    // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
     // andere Richtung.
-    BOOL MarkNextGluePoint(BOOL bPrev=FALSE);
+    sal_Bool MarkNextGluePoint(sal_Bool bPrev=sal_False);
 
     // Sucht sich den ersten markierten Klebepunkt (P1) das von rPnt
     // getroffen wird und sucht von dort aus den
     // ersten nichtmarkierten Klebepunkt (P2). Bei Erfolg wird die Markierung
-    // von P1 entfernt, an P2 gesetzt und TRUE returniert.
-    // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
-    BOOL MarkNextGluePoint(const Point& rPnt, BOOL bPrev=FALSE);
+    // von P1 entfernt, an P2 gesetzt und sal_True returniert.
+    // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+    sal_Bool MarkNextGluePoint(const Point& rPnt, sal_Bool bPrev=sal_False);
 
     // Selektionsrahmen fuer Klebepunktmarkierung aufziehen.
-    // Wird nur gestartet, wenn HasMarkableGluePoints() TRUE liefert.
-    // Der GlueEditMode TRUE wird nicht abgefragt.
-    // BOOL BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut);
+    // Wird nur gestartet, wenn HasMarkableGluePoints() sal_True liefert.
+    // Der GlueEditMode sal_True wird nicht abgefragt.
+    // sal_Bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut);
     sal_Bool BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark = sal_False);
     void MovMarkGluePoints(const Point& rPnt);
     sal_Bool EndMarkGluePoints();
     void BrkMarkGluePoints();
     sal_Bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); }
 
-    // bRestraintPaint=FALSE bewirkt, dass die Handles nicht sofort wieder gemalt werden.
+    // bRestraintPaint=sal_False bewirkt, dass die Handles nicht sofort wieder gemalt werden.
     // AdjustMarkHdl wird eh' nur gerufen, wenn was geaendert wurde; was idR ein Invalidate
     // zur Folge hat. Am Ende von des Redraw werden die Handles automatisch gezeichnet.
-    // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb TRUE!
-    void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=TRUE);
+    // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb sal_True!
+    void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=sal_True);
 
     const Rectangle& GetMarkedObjRect() const; // SnapRects der Objekte, ohne Strichstaerke
     Rectangle GetMarkedObjBoundRect() const;   // inkl. Strichstaerke, ueberstehende Fetzen, ...
@@ -497,9 +497,9 @@ public:
     // liegen alle Memberobjekte der Gruppe im direkten Zugriff. Alle anderen
     // Objekte koennen waerendessen nicht bearbeitet werden (bis zum naechsten
     // LeaveGroup()). Bei einer seitenuebergreifenden Markierung wird jede Page
-    // separat abgearbeitet. Die Methode liefert TRUE, wenn wenigstens eine
+    // separat abgearbeitet. Die Methode liefert sal_True, wenn wenigstens eine
     // Gruppe betreten wurde.
-    BOOL EnterMarkedGroup();
+    sal_Bool EnterMarkedGroup();
 
     // Den Mittelpunkt des letzten Crook-Dragging abholen. Den kann man
     // bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen.
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 6d19b3f6ade0..db0477648599 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -174,7 +174,7 @@ public:
     };
     sal_Bool IsDefaultGeometry( const DefaultType eDefaultType ) const;
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
     virtual void SetModel(SdrModel* pNewModel);
@@ -199,7 +199,7 @@ public:
     virtual void NbcSetSnapRect(const Rectangle& rRect);
     virtual void NbcSetLogicRect(const Rectangle& rRect);
 
-    virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
 
     virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr );
 
@@ -212,9 +212,9 @@ public:
     virtual FASTBOOL MovCreate(SdrDragStat& rStat); // #i37448#
     virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
 
-    virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const;
-    virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
-    virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
+    virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const;
+    virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True);
+    virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True);
     virtual FASTBOOL IsAutoGrowHeight() const;
     virtual FASTBOOL IsAutoGrowWidth() const;
     virtual void SetVerticalWriting( sal_Bool bVertical );
@@ -222,8 +222,8 @@ public:
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
     virtual void EndTextEdit( SdrOutliner& rOutl );
     virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const;
-    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE,
-        Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False,
+        Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
     virtual void operator=(const SdrObject& rObj);
 
     virtual void TakeObjNameSingul(String& rName) const;
@@ -236,7 +236,7 @@ public:
 
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void SetPage( SdrPage* pNewPage );
 
diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx
index 9c50c633ad72..002a838284cb 100644
--- a/svx/inc/svx/svdoattr.hxx
+++ b/svx/inc/svx/svdoattr.hxx
@@ -74,10 +74,10 @@ public:
     TYPEINFO();
 
     // Feststellen, ob bFilledObj && Fuellung!=FillNone
-    BOOL HasFill() const;
+    sal_Bool HasFill() const;
 
     // Feststellen, ob Linie!=LineNone
-    BOOL HasLine() const;
+    sal_Bool HasLine() const;
 
     virtual const Rectangle& GetSnapRect() const;
 
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 40cc992e96d9..86d6f0717bb7 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -182,7 +182,7 @@ public:
     OutputDevice*               pOut;
     const SetOfByte*            pVisiLayer;
     const SdrPageView*          pPageView;
-    USHORT                      nTol;
+    sal_uInt16                      nTol;
     FASTBOOL                    bDown;
 
 public:
@@ -191,7 +191,7 @@ public:
         pVisiLayer(NULL),
         pPageView(NULL),
         nTol(0),
-        bDown(FALSE)
+        bDown(sal_False)
     {}
 };
 
@@ -208,9 +208,9 @@ public:
 class SVX_DLLPUBLIC SdrObjUserData
 {
 protected:
-    UINT32                      nInventor;
-    UINT16                      nIdentifier;
-    UINT16                      nVersion;
+    sal_uInt32                      nInventor;
+    sal_uInt16                      nIdentifier;
+    sal_uInt16                      nVersion;
 
 private:
     SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData);        // nicht implementiert
@@ -220,7 +220,7 @@ private:
 public:
     TYPEINFO();
 
-    SdrObjUserData(UINT32 nInv, UINT16 nId, UINT16 nVer)
+    SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer)
     :   nInventor(nInv),
         nIdentifier(nId),
         nVersion(nVer)
@@ -233,8 +233,8 @@ public:
     virtual ~SdrObjUserData();
 
     virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0
-    UINT32  GetInventor() const { return nInventor; }
-    UINT16  GetId() const { return nIdentifier; }
+    sal_uInt32  GetInventor() const { return nInventor; }
+    sal_uInt16  GetId() const { return nIdentifier; }
 
     virtual FASTBOOL HasMacro (const SdrObject* pObj) const;
     virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
@@ -259,11 +259,11 @@ public:
     ~SdrObjUserDataList() { Clear(); }
 
     void Clear();
-    USHORT GetUserDataCount() const { return USHORT(aList.Count()); }
-    SdrObjUserData* GetUserData(USHORT nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); }
-    void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF) { aList.Insert(pData,nPos); }
-    SdrObjUserData* RemoveUserData(USHORT nNum) { return (SdrObjUserData*)aList.Remove(nNum);}
-    void DeleteUserData(USHORT nNum) { delete RemoveUserData(nNum); }
+    sal_uInt16 GetUserDataCount() const { return sal_uInt16(aList.Count()); }
+    SdrObjUserData* GetUserData(sal_uInt16 nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); }
+    void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF) { aList.Insert(pData,nPos); }
+    SdrObjUserData* RemoveUserData(sal_uInt16 nNum) { return (SdrObjUserData*)aList.Remove(nNum);}
+    void DeleteUserData(sal_uInt16 nNum) { delete RemoveUserData(nNum); }
 };
 
 //************************************************************
@@ -279,10 +279,10 @@ public:
     Rectangle                   aBoundRect;
     Point                       aAnchor;
     SdrGluePointList*           pGPL;
-    BOOL                        bMovProt;
-    BOOL                        bSizProt;
-    BOOL                        bNoPrint;
-    BOOL                        bClosedObj;
+    sal_Bool                        bMovProt;
+    sal_Bool                        bSizProt;
+    sal_Bool                        bNoPrint;
+    sal_Bool                        bClosedObj;
     bool                        mbVisible;
     SdrLayerID                  mnLayerID;
 
@@ -303,7 +303,7 @@ class SdrObjPlusData
     friend class                SdrObject;
 
 public:
-    SfxBroadcaster*             pBroadcast;    // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=TRUE). Auch fuer Konnektoren etc.
+    SfxBroadcaster*             pBroadcast;    // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=sal_True). Auch fuer Konnektoren etc.
     SdrObjUserDataList*         pUserDataList; // applikationsspeziefische Daten
     SdrGluePointList*           pGluePoints;   // Klebepunkte zum Ankleben von Objektverbindern
     AutoTimer*                  pAutoTimer;
@@ -334,49 +334,49 @@ public:
 class SdrObjTransformInfoRec
 {
 public:
-    unsigned                    bSelectAllowed : 1;     // FALSE=Obj kann nicht selektiert werden
-    unsigned                    bMoveAllowed : 1;       // FALSE=Obj kann nicht verschoben werden
-    unsigned                    bResizeFreeAllowed : 1; // FALSE=Obj kann nicht frei resized werden
-    unsigned                    bResizePropAllowed : 1; // FALSE=Obj kann nichtmal proportional resized werden
-    unsigned                    bRotateFreeAllowed : 1; // FALSE=Obj kann nicht frei gedreht werden
-    unsigned                    bRotate90Allowed : 1;   // FALSE=Obj kann nichtmal im 90deg Raster gedreht werden
-    unsigned                    bMirrorFreeAllowed : 1; // FALSE=Obj kann nicht frei gespiegelt werden
-    unsigned                    bMirror45Allowed : 1;   // FALSE=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden
-    unsigned                    bMirror90Allowed : 1;   // FALSE=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden
-    unsigned                    bTransparenceAllowed : 1; // FALSE=Obj does not have an interactive transparence control
-    unsigned                    bGradientAllowed : 1; // FALSE=Obj dooes not have an interactive gradient control
-    unsigned                    bShearAllowed : 1;      // FALSE=Obj kann nicht verzerrt werden
+    unsigned                    bSelectAllowed : 1;     // sal_False=Obj kann nicht selektiert werden
+    unsigned                    bMoveAllowed : 1;       // sal_False=Obj kann nicht verschoben werden
+    unsigned                    bResizeFreeAllowed : 1; // sal_False=Obj kann nicht frei resized werden
+    unsigned                    bResizePropAllowed : 1; // sal_False=Obj kann nichtmal proportional resized werden
+    unsigned                    bRotateFreeAllowed : 1; // sal_False=Obj kann nicht frei gedreht werden
+    unsigned                    bRotate90Allowed : 1;   // sal_False=Obj kann nichtmal im 90deg Raster gedreht werden
+    unsigned                    bMirrorFreeAllowed : 1; // sal_False=Obj kann nicht frei gespiegelt werden
+    unsigned                    bMirror45Allowed : 1;   // sal_False=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden
+    unsigned                    bMirror90Allowed : 1;   // sal_False=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden
+    unsigned                    bTransparenceAllowed : 1; // sal_False=Obj does not have an interactive transparence control
+    unsigned                    bGradientAllowed : 1; // sal_False=Obj dooes not have an interactive gradient control
+    unsigned                    bShearAllowed : 1;      // sal_False=Obj kann nicht verzerrt werden
     unsigned                    bEdgeRadiusAllowed : 1;
-    unsigned                    bNoOrthoDesired : 1;    // TRUE bei Rect; ... FALSE bei BMP,MTF;
-    unsigned                    bNoContortion : 1;      // FALSE=Kein verzerren (bei Crook) moeglich (nur TRUE bei PathObj und Gruppierten PathObjs)
-    unsigned                    bCanConvToPath : 1;     // FALSE=Keine Konvertierung in PathObj moeglich
-    unsigned                    bCanConvToPoly : 1;     // FALSE=Keine Konvertierung in PolyObj moeglich
-    unsigned                    bCanConvToContour : 1;     // FALSE=no conversion down to whole contour possible
-    unsigned                    bCanConvToPathLineToArea : 1; // FALSE=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea
-    unsigned                    bCanConvToPolyLineToArea : 1; // FALSE=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea
+    unsigned                    bNoOrthoDesired : 1;    // sal_True bei Rect; ... sal_False bei BMP,MTF;
+    unsigned                    bNoContortion : 1;      // sal_False=Kein verzerren (bei Crook) moeglich (nur sal_True bei PathObj und Gruppierten PathObjs)
+    unsigned                    bCanConvToPath : 1;     // sal_False=Keine Konvertierung in PathObj moeglich
+    unsigned                    bCanConvToPoly : 1;     // sal_False=Keine Konvertierung in PolyObj moeglich
+    unsigned                    bCanConvToContour : 1;     // sal_False=no conversion down to whole contour possible
+    unsigned                    bCanConvToPathLineToArea : 1; // sal_False=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea
+    unsigned                    bCanConvToPolyLineToArea : 1; // sal_False=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea
 
 public:
     SdrObjTransformInfoRec()
-    :   bSelectAllowed(TRUE),
-        bMoveAllowed(TRUE),
-        bResizeFreeAllowed(TRUE),
-        bResizePropAllowed(TRUE),
-        bRotateFreeAllowed(TRUE),
-        bRotate90Allowed(TRUE),
-        bMirrorFreeAllowed(TRUE),
-        bMirror45Allowed(TRUE),
-        bMirror90Allowed(TRUE),
-        bTransparenceAllowed(TRUE),
-        bGradientAllowed(TRUE),
-        bShearAllowed(TRUE),
-        bEdgeRadiusAllowed(TRUE),
-        bNoOrthoDesired(TRUE),
-        bNoContortion(TRUE),
-        bCanConvToPath(TRUE),
-        bCanConvToPoly(TRUE),
-        bCanConvToContour(FALSE),
-        bCanConvToPathLineToArea(TRUE),
-        bCanConvToPolyLineToArea(TRUE)
+    :   bSelectAllowed(sal_True),
+        bMoveAllowed(sal_True),
+        bResizeFreeAllowed(sal_True),
+        bResizePropAllowed(sal_True),
+        bRotateFreeAllowed(sal_True),
+        bRotate90Allowed(sal_True),
+        bMirrorFreeAllowed(sal_True),
+        bMirror45Allowed(sal_True),
+        bMirror90Allowed(sal_True),
+        bTransparenceAllowed(sal_True),
+        bGradientAllowed(sal_True),
+        bShearAllowed(sal_True),
+        bEdgeRadiusAllowed(sal_True),
+        bNoOrthoDesired(sal_True),
+        bNoContortion(sal_True),
+        bCanConvToPath(sal_True),
+        bCanConvToPoly(sal_True),
+        bCanConvToContour(sal_False),
+        bCanConvToPathLineToArea(sal_True),
+        bCanConvToPolyLineToArea(sal_True)
     {}
 };
 
@@ -466,7 +466,7 @@ protected:
     unsigned                    bVirtObj : 1;
     unsigned                    bSnapRectDirty : 1;
     unsigned                    bNetLock : 1;   // ni
-    unsigned                    bInserted : 1;  // nur wenn TRUE gibt's RepaintBroadcast & SetModify
+    unsigned                    bInserted : 1;  // nur wenn sal_True gibt's RepaintBroadcast & SetModify
     unsigned                    bGrouped : 1;   // Member eines GroupObjektes?
 
     // Die folgende Flags werden gestreamt
@@ -474,7 +474,7 @@ protected:
     unsigned                    bSizProt : 1; // If true, the size is protected
     unsigned                    bNoPrint : 1; // If true, the object is not printed.
     unsigned                    mbVisible : 1; // If false, the object is not visible on screen (but maybe on printer, depending on bNoprint
-    // Wenn bEmptyPresObj TRUE ist, handelt es sich um ein
+    // Wenn bEmptyPresObj sal_True ist, handelt es sich um ein
     // Praesentationsobjekt, dem noch kein Inhalt zugewiesen
     // wurde. Default ist das Flag auf FALSE. Die Verwaltung
     // uebernimmt die Applikation. Im Zuweisungsoperator sowie
@@ -482,10 +482,10 @@ protected:
     // Das Flag ist persistent.
     unsigned                    bEmptyPresObj : 1;     // Leeres Praesentationsobjekt (Draw)
 
-    // TRUE=Objekt ist als Objekt der MasterPage nicht sichtbar
+    // sal_True=Objekt ist als Objekt der MasterPage nicht sichtbar
     unsigned                    bNotVisibleAsMaster : 1;
 
-    // TRUE=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ...
+    // sal_True=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ...
     unsigned                    bClosedObj : 1;
 
     unsigned                    bIsEdge : 1;
@@ -518,14 +518,14 @@ protected:
     Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
 
     // Fuer GetDragComment
-    void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0) const;
+    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0) const;
 
     void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); }
 
-    String GetWinkStr(long nWink, FASTBOOL bNoDegChar=FALSE) const;
-    String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=FALSE) const;
+    String GetWinkStr(long nWink, FASTBOOL bNoDegChar=sal_False) const;
+    String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=sal_False) const;
 
-    // bNotMyself=TRUE bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
+    // bNotMyself=sal_True bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
     // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect
     // i.d.R. gleich mit um die Neuberechnung zu sparen.
 public:
@@ -577,8 +577,8 @@ public:
 
     virtual void AddReference(SdrVirtObj& rVrtObj);
     virtual void DelReference(SdrVirtObj& rVrtObj);
-    virtual UINT32 GetObjInventor() const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt32 GetObjInventor() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
     // Layer interface
@@ -626,15 +626,15 @@ public:
     // Wird die Reihenfolge der Objekte in der Liste veraendert, so wird ein
     // Dirty-Flag gesetzt (an der Page). Beim naechsten SdrObject::GetOrdNum()
     // werden die Ordnungsnummer aller Objekte der Liste neu bestimmt.
-    UINT32 GetOrdNum() const;
+    sal_uInt32 GetOrdNum() const;
 
     // Diese Methode sollte nur verwendet werden, wenn man ganz  genau weiss,
     // was man macht:
-    UINT32 GetOrdNumDirect() const { return nOrdNum; }
+    sal_uInt32 GetOrdNumDirect() const { return nOrdNum; }
 
     // Das Setzen der Ordnungsnummer sollte nur vom Model bzw. von der Page
     // geschehen.
-    void SetOrdNum(UINT32 nNum) { nOrdNum=nNum; }
+    void SetOrdNum(sal_uInt32 nNum) { nOrdNum=nNum; }
 
     /** Return the position in the navigation order for the called object.
         Note that this method may update the navigation position of the
@@ -683,7 +683,7 @@ public:
     // Tooling for painting a single object to a OutputDevice. This will be needed as long
     // as not all painting is changed to use DrawContact objects.
     sal_Bool SingleObjectPainter(OutputDevice& rOut) const;
-    BOOL LineGeometryUsageIsNecessary() const;
+    sal_Bool LineGeometryUsageIsNecessary() const;
 
     // Clone() soll eine komplette Kopie des Objektes erzeugen.
     virtual SdrObject* Clone() const;
@@ -710,7 +710,7 @@ public:
     // Polygon wird das wohl ein einfacher Selektionshandle sein, bei einer
     // Bezierkurve dagegen koennen das schon bis zu 3 Handles werden (inkl Gewichte).
     // GetHdl() und GetPlusHdl() muessen Handleinstanzen mit new erzeugen!
-    // Ein Objekt, das bei HasSpacialDrag() TRUE liefert muss diese Methoden
+    // Ein Objekt, das bei HasSpacialDrag() sal_True liefert muss diese Methoden
     // zur Verfuegung stellen (inkl. FillHdlList).
     virtual sal_uInt32 GetHdlCount() const;
     virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const;
@@ -724,8 +724,8 @@ public:
     // Stuetzstellen bei Splines, Gewichte bei Bezierkurven und Pointer von
     // Labelobjekten muss vom Objekt selbst gehandled werden. Um das Model
     // Statusfrei zu halten werden die Statusdaten an der View gehalten und dem
-    // Objekt dann uebergeben. EndDrag liefrt im Normalfall TRUE fuer Erfolg.
-    // FALSE kann zurueckgegeben werden, wenn das Dragging das Objekt nicht
+    // Objekt dann uebergeben. EndDrag liefrt im Normalfall sal_True fuer Erfolg.
+    // sal_False kann zurueckgegeben werden, wenn das Dragging das Objekt nicht
     // veraendert hat, wobei dir evtl. Tatsache das die Maus nicht bewegt wurde
     // bereits von der View abgefangen wird.
     virtual bool hasSpecialDrag() const;
@@ -749,16 +749,16 @@ public:
     // BegCreate()-Methode gerufen. Bei jedem MausMode wird dann MovCreate
     // gerufen. BrkCreate() bedeutet, dass der User die interaktive Objekt-
     // erzeugung abgebrochen hat. EndCreate() wird gerufen beim MouseUp-Event.
-    // Liefert EndCreate() ein TRUE, so ist die Objekterzeugung abgeschlossen;
+    // Liefert EndCreate() ein sal_True, so ist die Objekterzeugung abgeschlossen;
     // das Objekt wird in die entsprechende Liste eingefuegt. Andernfalls
-    // (EndCreate()==FALSE) gehe ich davon aus, dass weitere Punkte zur
+    // (EndCreate()==sal_False) gehe ich davon aus, dass weitere Punkte zur
     // Objekterzeugung notwendig sind (Polygon,...). Der Parameter eCmd
     // enthaelt die Anzahl der Mausklicks (so die App diese durchreicht).
     // BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten
     // Polygonpunkt wieder loeschen).
-    // RetrunCode: TRUE=Weiter gehts, FALSE=Create dadurch abgebrochen.
+    // RetrunCode: sal_True=Weiter gehts, sal_False=Create dadurch abgebrochen.
     virtual FASTBOOL BegCreate(SdrDragStat& rStat);
-    virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden
+    virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden
     virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
     virtual FASTBOOL BckCreate(SdrDragStat& rStat);
     virtual void BrkCreate(SdrDragStat& rStat);
@@ -821,7 +821,7 @@ public:
 
     // Drehwinkel und Shear
     virtual long GetRotateAngle() const;
-    virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+    virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const;
 
     // Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte,
     // Kreismittelpunkt, ...)
@@ -922,10 +922,10 @@ public:
     // Automatische Klebepunkte:
     // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern
     // i.d.R. 0=oben, 1=rechts, 2=unten, 3=links
-    virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
 
     // i.d.R. 0=linksoben, 1=rechtsoben, 2=rechtsunten, 3=linksunten
-    virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
 
     // Liste aller Klebepunkte. Kann NULL sein.
     virtual const SdrGluePointList* GetGluePointList() const;
@@ -970,9 +970,9 @@ public:
     // Bezierkurve (oder beides) zu verwandeln, dann sollten die folgenden
     // Methoden ueberladen werden.
     // Z.B. Ein RectObj mit Strichstaerke 10, SOLID_PEN in Polygon wandeln:
-    // Im Modus bLineToArea=FALSE soll ein PolyObj mit 4 Stuetzstellen,
+    // Im Modus bLineToArea=sal_False soll ein PolyObj mit 4 Stuetzstellen,
     // Strichstaerke 10 und SOLiD_PEN erzeugt werden.
-    // Im Modus bLineToArea=TRUE dagegen soll das generierte Obj immer ein
+    // Im Modus bLineToArea=sal_True dagegen soll das generierte Obj immer ein
     // LinienAttribut NULL_PEN haben, und die Linie (auch Linienmuster) selbst
     // durch Polygonflaechen emuliert werden, die dadurch anschliessend vom
     // Anwender manipuliert werden koennen. Das RectObj kann sich somit also
@@ -984,21 +984,21 @@ public:
     // Der Returnwert ist jeweils ein SdrObject*, da als Rueckgabe zur Not
     // auch Gruppenobjekte erlaubt sind (z.B. fuer SdrTextObj).
     // Bei der Konvertierung von TextObj nach PathObj wird es wohl so sein,
-    // dass beide Modi (bLineToArea=TRUE/FALSE) identisch sind.
+    // dass beide Modi (bLineToArea=sal_True/sal_False) identisch sind.
     // Defaulted sind diese Methoden auf "Ich kann das nicht" (FALSE/NULL).
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
-    SdrObject* ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
+    SdrObject* ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const;
 
     // convert this path object to contour object; bForceLineDash converts even
     // when there is no filled new polygon created from line-to-polygon conversion,
     // specially used for XLINE_DASH and 3D conversion
-    SdrObject* ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const;
-    SdrObject* ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const;
+    SdrObject* ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const;
+    SdrObject* ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const;
 
     // TRUE: Referenz auf ein Obj
     sal_Bool IsVirtualObj() const { return bVirtObj; }
 
-    // TRUE=Obj kann warsch. gefuellt werden; FALSE=Obj kann warsch. Linienenden haben.
+    // sal_True=Obj kann warsch. gefuellt werden; sal_False=Obj kann warsch. Linienenden haben.
     // ungueltig, wenn es sich um ein GroupObj handelt.
     sal_Bool IsClosedObj() const { return bClosedObj; }
 
@@ -1006,8 +1006,8 @@ public:
     sal_Bool Is3DObj() const { return bIs3DObj; }
     sal_Bool IsUnoObj() const { return bIsUnoObj; }
     sal_Bool IsMasterCachable() const { return !bNotMasterCachable; }
-    sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=TRUE; return r; }
-    void ShareUnlock() { bNetLock=FALSE; }
+    sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=sal_True; return r; }
+    void ShareUnlock() { bNetLock=sal_False; }
     sal_Bool IsShareLock() const { return bNetLock; }
     void SetMarkProtect(sal_Bool bProt) { bMarkProt=bProt; }
     sal_Bool IsMarkProtect() const { return bMarkProt; }
@@ -1035,16 +1035,16 @@ public:
     sal_Bool DoesSupportTextIndentingOnLineWidthChange() const { return mbSupportTextIndentingOnLineWidthChange; }
 
     // applikationsspeziefische Daten
-    USHORT GetUserDataCount() const;
-    SdrObjUserData* GetUserData(USHORT nNum) const;
+    sal_uInt16 GetUserDataCount() const;
+    SdrObjUserData* GetUserData(sal_uInt16 nNum) const;
 
     // Insert uebernimmt den auf dem Heap angelegten Record in den Besitz
     // des Zeichenobjekts
-    void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF);
+    void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF);
 
     // Delete entfernt den Record aus der Liste und ruft
     // ein delete (FreeMem+Dtor).
-    void DeleteUserData(USHORT nNum);
+    void DeleteUserData(sal_uInt16 nNum);
 
     // ItemPool fuer dieses Objekt wechseln
     void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L);
@@ -1108,7 +1108,7 @@ public:
     // to use (0,0) as upper left and will be scaled to the given size in the matrix.
     virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon);
 
-    sal_Bool IsTransparent( BOOL bCheckForAlphaChannel = FALSE ) const;
+    sal_Bool IsTransparent( sal_Bool bCheckForAlphaChannel = sal_False ) const;
 
     // #116168#
     // Give info if object is in destruction
@@ -1155,8 +1155,8 @@ private:
 class SVX_DLLPUBLIC SdrObjFactory
 {
 public:
-    UINT32                      nInventor;
-    UINT16                      nIdentifier;
+    sal_uInt32                      nInventor;
+    sal_uInt16                      nIdentifier;
 
     // fuer MakeNewObj():
     SdrPage*                    pPage;
@@ -1168,14 +1168,14 @@ public:
     SdrObjUserData*             pNewData;
 
 private:
-    SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel);
-    SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1);
+    SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel);
+    SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1);
 
 public:
-    static SdrObject* MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL);
+    static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL);
     static void InsertMakeObjectHdl(const Link& rLink);
     static void RemoveMakeObjectHdl(const Link& rLink);
-    static SdrObjUserData* MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj);
+    static SdrObjUserData* MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj);
     static void InsertMakeUserDataHdl(const Link& rLink);
     static void RemoveMakeUserDataHdl(const Link& rLink);
 };
diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
index 24a11e6b51de..7bac32cb9c1e 100644
--- a/svx/inc/svx/svdocapt.hxx
+++ b/svx/inc/svx/svdocapt.hxx
@@ -92,15 +92,15 @@ public:
     virtual ~SdrCaptionObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void operator=(const SdrObject& rObj);
 
     // for calc: special shadow only for text box
-    void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = TRUE; }
+    void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = sal_True; }
     sal_Bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; }
 
     // for calc: fixed note tail position.
-    void SetFixedTail() { mbFixedTail = TRUE; }
+    void SetFixedTail() { mbFixedTail = sal_True; }
 
     virtual void TakeObjNameSingul(String& rName) const;
     virtual void TakeObjNamePlural(String& rName) const;
@@ -149,7 +149,7 @@ protected:
     virtual void RestGeoData(const SdrObjGeoData& rGeo);
 
 public:
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     const Point& GetTailPos() const;
     void SetTailPos(const Point& rPos);
diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx
index a39417925a1e..969920906dce 100644
--- a/svx/inc/svx/svdocirc.hxx
+++ b/svx/inc/svx/svdocirc.hxx
@@ -81,7 +81,7 @@ private:
     SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // Werte vom Pool kopieren
     SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren
 
-    // Liefert TRUE, wenn das Painten ein XPolygon erfordert.
+    // Liefert sal_True, wenn das Painten ein XPolygon erfordert.
     SVX_DLLPRIVATE FASTBOOL PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc
     SVX_DLLPRIVATE virtual void RecalcXPoly();
 
@@ -103,7 +103,7 @@ public:
     virtual ~SdrCircObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
 
     virtual void TakeObjNameSingul(String& rName) const;
@@ -137,7 +137,7 @@ public:
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
     virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
     virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
 protected:
     virtual SdrObjGeoData* NewGeoData() const;
diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
index 843c49424674..77f3861898a3 100644
--- a/svx/inc/svx/svdoedge.hxx
+++ b/svx/inc/svx/svdoedge.hxx
@@ -58,13 +58,13 @@ protected:
     SdrObject*                  pObj;          // Referenziertes Objekt
     long                        nXDist;        // Hor. Objektabstand wenn bXDistOvr=TRUE
     long                        nYDist;        // Vert. Objektabstand wenn bYDistOvr=TRUE
-    USHORT                      nConId;        // Konnektornummer
+    sal_uInt16                      nConId;        // Konnektornummer
 
     // bitfield
-    unsigned                    bBestConn : 1;   // TRUE= es wird der guenstigste Konnektor gesucht
-    unsigned                    bBestVertex : 1; // TRUE= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
-    unsigned                    bXDistOvr : 1;   // TRUE= Hor. Objektabstand wurde gedragt (Overwrite)
-    unsigned                    bYDistOvr : 1;   // TRUE= Vert. Objektabstand wurde gedragt (Overwrite)
+    unsigned                    bBestConn : 1;   // sal_True= es wird der guenstigste Konnektor gesucht
+    unsigned                    bBestVertex : 1; // sal_True= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
+    unsigned                    bXDistOvr : 1;   // sal_True= Hor. Objektabstand wurde gedragt (Overwrite)
+    unsigned                    bYDistOvr : 1;   // sal_True= Vert. Objektabstand wurde gedragt (Overwrite)
     unsigned                    bAutoVertex : 1; // AutoConnector am Scheitelpunkt nCon
     unsigned                    bAutoCorner : 1; // AutoConnector am Eckpunkt nCon
 
@@ -75,14 +75,14 @@ public:
     void ResetVars();
     FASTBOOL TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsolutePos) const;
 
-    inline void SetBestConnection( BOOL rB ) { bBestConn = rB; };
-    inline void SetBestVertex( BOOL rB ) { bBestVertex = rB; };
-    inline void SetAutoVertex( BOOL rB ) { bAutoVertex = rB; };
-    inline void SetConnectorId( USHORT nId ) { nConId = nId; };
+    inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; };
+    inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; };
+    inline void SetAutoVertex( sal_Bool rB ) { bAutoVertex = rB; };
+    inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; };
 
-    inline BOOL IsBestConnection() const { return bBestConn; };
-    inline BOOL IsBestVertex() const { return bBestVertex; };
-    inline BOOL IsAutoVertex() const { return bAutoVertex; };
+    inline sal_Bool IsBestConnection() const { return bBestConn; };
+    inline sal_Bool IsBestVertex() const { return bBestVertex; };
+    inline sal_Bool IsAutoVertex() const { return bAutoVertex; };
     inline sal_uInt16 GetConnectorId() const { return nConId; };
     inline SdrObject* GetObject() const { return pObj; }
 };
@@ -108,9 +108,9 @@ public:
     // Nachfolgende Werte werden von ImpCalcEdgeTrack gesetzt
     long                        nAngle1;           // Austrittswinkel am Obj1
     long                        nAngle2;           // Austrittswinkel am Obj2
-    USHORT                      nObj1Lines;        // 1..3
-    USHORT                      nObj2Lines;        // 1..3
-    USHORT                      nMiddleLine;       // 0xFFFF=keine, sonst Punktnummer des Linienbeginns
+    sal_uInt16                      nObj1Lines;        // 1..3
+    sal_uInt16                      nObj2Lines;        // 1..3
+    sal_uInt16                      nMiddleLine;       // 0xFFFF=keine, sonst Punktnummer des Linienbeginns
     char                        cOrthoForm;        // Form des Ortho-Verbindes, z.B. 'Z','U',I','L','S',...
 
 public:
@@ -125,7 +125,7 @@ public:
 
     Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode);
     const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); }
-    USHORT ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
+    sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
     FASTBOOL ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
     void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal);
     long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
@@ -141,7 +141,7 @@ public:
     SdrObjConnection            aCon1;  // Verbindungszustand des Linienanfangs
     SdrObjConnection            aCon2;  // Verbindungszustand des Linienendes
     XPolygon*                   pEdgeTrack;
-    sal_Bool                    bEdgeTrackDirty;// TRUE=Verbindungsverlauf muss neu berechnet werden.
+    sal_Bool                    bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden.
     sal_Bool                    bEdgeTrackUserDefined;
     SdrEdgeInfoRec              aEdgeInfo;
 
@@ -175,7 +175,7 @@ protected:
     SdrEdgeInfoRec              aEdgeInfo;
 
     // bitfield
-    unsigned                    bEdgeTrackDirty : 1; // TRUE=Verbindungsverlauf muss neu berechnet werden.
+    unsigned                    bEdgeTrackDirty : 1; // sal_True=Verbindungsverlauf muss neu berechnet werden.
     unsigned                    bEdgeTrackUserDefined : 1;
 
     // #109007#
@@ -207,9 +207,9 @@ protected:
     XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const;
     XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1,
         const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2,
-        ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const;
+        sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const;
     static FASTBOOL ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL);
-    USHORT ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const;
+    sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const;
     FASTBOOL ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte
     void ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt);
     void ImpUndirtyEdgeTrack();  // eventuelle Neuberechnung des Verbindungsverlaufs
@@ -225,19 +225,19 @@ public:
 
     SdrObjConnection& GetConnection(FASTBOOL bTail1) { return *(bTail1 ? &aCon1 : &aCon2); }
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual const Rectangle& GetCurrentBoundRect() const;
     virtual const Rectangle& GetSnapRect() const;
     virtual FASTBOOL IsNode() const;
-    virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
-    virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
+    virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
     virtual const SdrGluePointList* GetGluePointList() const;
     virtual SdrGluePointList* ForceGluePointList();
     virtual FASTBOOL IsEdge() const;
 
     // bTail1=TRUE: Linienanfang, sonst LinienEnde
     // pObj=NULL: Disconnect
-    void SetEdgeTrackDirty() { bEdgeTrackDirty=TRUE; }
+    void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; }
     void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj);
     void DisconnectFromNode(FASTBOOL bTail1);
     SdrObject* GetConnectedNode(FASTBOOL bTail1) const;
@@ -280,7 +280,7 @@ public:
     virtual void BrkCreate(SdrDragStat& rStat);
     virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
     virtual Pointer GetCreatePointer() const;
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual sal_uInt32 GetSnapPointCount() const;
     virtual Point GetSnapPoint(sal_uInt32 i) const;
@@ -300,8 +300,8 @@ public:
     void Reformat();
 
     // helper methods for the StarOffice api
-    Point GetTailPoint( BOOL bTail ) const;
-    void SetTailPoint( BOOL bTail, const Point& rPt );
+    Point GetTailPoint( sal_Bool bTail ) const;
+    void SetTailPoint( sal_Bool bTail, const Point& rPt );
     void setGluePointIndex( sal_Bool bTail, sal_Int32 nId = -1 );
     sal_Int32 getGluePointIndex( sal_Bool bTail );
 
@@ -320,24 +320,24 @@ public:
 //
 // Zur Bestimmung der Verlaufslinie werden folgende Item-Parameter des SdrItemPool verwendet:
 //
-//  USHORT EdgeFlowAngle       Default 9000 (=90.00 Deg), min 0, max 9000
+//  sal_uInt16 EdgeFlowAngle       Default 9000 (=90.00 Deg), min 0, max 9000
 //      Verlauffreiheitswinkel.
 //      Der Winkel, in dem die Verbindungslinie verlaufen darf.
 //
-//  USHORT EdgeEscAngle        Default 9000 (=90.00 Deg), min 0, max 9000
+//  sal_uInt16 EdgeEscAngle        Default 9000 (=90.00 Deg), min 0, max 9000
 //      Objektaustrittswinkel.
 //      Der Winkel, in dem die Verbindungslinie aus dem Objekt austreten darf.
 //
-//  BOOL   EdgeEscAsRay        Default FALSE
-//      TRUE= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus.
+//  sal_Bool   EdgeEscAsRay        Default FALSE
+//      sal_True= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus.
 //      Also Winkelvorgabe durch die Strecke ObjMitte/Konnektor.
 //
-//  BOOL   EdgeEscUseObjAngle  Default FALSE
+//  sal_Bool   EdgeEscUseObjAngle  Default FALSE
 //      Objektdrehwinkelberuecksichtigung.
-//      TRUE= Bei der Bestimmung des Objektaustrittswinkels wird der
+//      sal_True= Bei der Bestimmung des Objektaustrittswinkels wird der
 //      Drehwinkel des Objekts als Offset beruecksichtigt.
 //
-//  ULONG  EdgeFlowDefDist     Default 0, min 0, max ?
+//  sal_uIntPtr  EdgeFlowDefDist     Default 0, min 0, max ?
 //      Das ist der Default-Mindestabstand der bei der Berechnung der
 //      Verbindungslinie zu den angedockten Objekten in logischen Einheiten.
 //      Dieser Abstand wird innerhalb des Objektes "ueberschrieben", sobald
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 1eba8822402a..fa5b56e403e5 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -140,7 +140,7 @@ public:
     void                    SetGraphic(const Graphic& rGrf);
     const Graphic&          GetGraphic() const;
 
-    Graphic                 GetTransformedGraphic( ULONG nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const;
+    Graphic                 GetTransformedGraphic( sal_uIntPtr nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const;
 
     GraphicType             GetGraphicType() const;
 
@@ -161,7 +161,7 @@ public:
 
     void                    SetGraphicLink(const String& rFileName, const String& rFilterName);
     void                    ReleaseGraphicLink();
-    sal_Bool IsLinkedGraphic() const { return (BOOL)aFileName.Len(); }
+    sal_Bool IsLinkedGraphic() const { return (sal_Bool)aFileName.Len(); }
 
     void                    SetFileName(const String& rFileName);
     const String&           GetFileName() const { return aFileName; }
@@ -172,7 +172,7 @@ public:
     void                    StopAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L);
 
     virtual void            TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16          GetObjIdentifier() const;
+    virtual sal_uInt16          GetObjIdentifier() const;
 
     virtual void            TakeObjNameSingul(String& rName) const;
     virtual void            TakeObjNamePlural(String& rName) const;
@@ -201,7 +201,7 @@ public:
     virtual void            SetPage(SdrPage* pNewPage);
     virtual void            SetModel(SdrModel* pNewModel);
 
-    virtual SdrObject*      DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject*      DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void            AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
 
diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx
index 440e758291ca..9cf0ad056047 100644
--- a/svx/inc/svx/svdogrp.hxx
+++ b/svx/inc/svx/svdogrp.hxx
@@ -64,7 +64,7 @@ public:
     virtual ~SdrObjGroup();
 
     virtual void SetBoundRectDirty();
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
     virtual SdrLayerID GetLayer() const;
     virtual void NbcSetLayer(SdrLayerID nLayer);
@@ -93,7 +93,7 @@ public:
     virtual FASTBOOL BegCreate(SdrDragStat& rStat);
 
     virtual long GetRotateAngle() const;
-    virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+    virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const;
 
     virtual void Move(const Size& rSiz);
     virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
@@ -118,7 +118,7 @@ public:
     virtual void NbcReformatText();
     virtual void ReformatText();
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 };
 
 #endif //_SVDOGRP_HXX
diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx
index fe8740dd40ed..9be5e7e2e73b 100644
--- a/svx/inc/svx/svdomeas.hxx
+++ b/svx/inc/svx/svdomeas.hxx
@@ -85,7 +85,7 @@ protected:
     void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const;
     basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const;
     void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const;
-    void SetTextDirty() { bTextDirty=TRUE; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
+    void SetTextDirty() { bTextDirty=sal_True; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
     void UndirtyText() const;
 
     virtual SdrObjGeoData* NewGeoData() const;
@@ -99,7 +99,7 @@ public:
     virtual ~SdrMeasureObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
     virtual void operator=(const SdrObject& rObj);
 
@@ -140,19 +140,19 @@ public:
     virtual Point GetPoint(sal_uInt32 i) const;
     virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
     virtual const Size& GetTextSize() const;
-    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE,
-        Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False,
+        Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
     virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
-    virtual USHORT GetOutlinerViewAnchorMode() const;
+    virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
     virtual OutlinerParaObject* GetOutlinerParaObject() const;
 
-    virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+    virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
         FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
 
     // #i97878#
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx
index 5b0980d8bb30..46991a66c526 100644
--- a/svx/inc/svx/svdomedia.hxx
+++ b/svx/inc/svx/svdomedia.hxx
@@ -56,7 +56,7 @@ public:
         virtual FASTBOOL            HasTextEdit() const;
 
         virtual void                TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-        virtual UINT16              GetObjIdentifier() const;
+        virtual sal_uInt16              GetObjIdentifier() const;
 
         virtual void                TakeObjNameSingul(String& rName) const;
         virtual void                TakeObjNamePlural(String& rName) const;
diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx
index 79933be98a9b..59327e85868d 100644
--- a/svx/inc/svx/svdoole2.hxx
+++ b/svx/inc/svx/svdoole2.hxx
@@ -68,8 +68,8 @@ protected:
     String                      aProgName;
 
     // wg. Kompatibilitaet erstmal am SdrTextObj
-    BOOL                        bFrame : 1;
-    BOOL                        bInDestruction : 1;
+    sal_Bool                        bFrame : 1;
+    sal_Bool                        bInDestruction : 1;
     mutable bool                m_bTypeAsked;
     mutable bool                m_bChart;
 
@@ -85,10 +85,10 @@ protected:
 public:
     TYPEINFO();
 
-    SdrOle2Obj(FASTBOOL bFrame_=FALSE);
-    SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=FALSE);
-    SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=FALSE);
-    SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=FALSE);
+    SdrOle2Obj(FASTBOOL bFrame_=sal_False);
+    SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=sal_False);
+    SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=sal_False);
+    SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=sal_False);
     virtual ~SdrOle2Obj();
 
     // access to svt::EmbeddedObjectRef
@@ -140,7 +140,7 @@ public:
     virtual SdrObject* getFullDragClone() const;
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjNameSingul(String& rName) const;
     virtual void TakeObjNamePlural(String& rName) const;
 
@@ -155,7 +155,7 @@ public:
     static sal_Bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
                                          sal_Int64 nAspect );
     static sal_Bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
-    BOOL Unload();
+    sal_Bool Unload();
     void Connect();
     void Disconnect();
     void ObjectLoaded();
diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx
index eea49236531e..7307bc7275bb 100644
--- a/svx/inc/svx/svdopage.hxx
+++ b/svx/inc/svx/svdopage.hxx
@@ -62,7 +62,7 @@ public:
     // #i96598#
     virtual void SetBoundRectDirty();
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
     virtual void operator=(const SdrObject& rObj);
 
diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx
index 4ed1deb47f1f..0030d48d6d6c 100644
--- a/svx/inc/svx/svdopath.hxx
+++ b/svx/inc/svx/svdopath.hxx
@@ -93,7 +93,7 @@ public:
     virtual ~SdrPathObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
     virtual void operator=(const SdrObject& rObj);
 
@@ -154,7 +154,7 @@ protected:
     virtual void RestGeoData(const SdrObjGeoData& rGeo);
 
 public:
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     // Bezierpolygon holen/setzen
     const basegfx::B2DPolyPolygon& GetPathPoly() const { return maPathPolygon; }
diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
index b333ed8757f1..20fe1c3adc76 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -62,7 +62,7 @@ protected:
     XPolygon*                   mpXPoly;
 
 protected:
-    // Liefert TRUE, wenn das Painten ein Polygon erfordert.
+    // Liefert sal_True, wenn das Painten ein Polygon erfordert.
     FASTBOOL PaintNeedsXPoly(long nEckRad) const;
 
 protected:
@@ -87,12 +87,12 @@ public:
     // Konstruktion eines Textrahmens
     SdrRectObj(SdrObjKind eNewTextKind);
     SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect);
-    // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
-    SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+    // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+    SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
     virtual ~SdrRectObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
 
     virtual void TakeObjNameSingul(String& rName) const;
@@ -125,10 +125,10 @@ public:
     virtual FASTBOOL DoMacro(const SdrObjMacroHitRec& rRec);
     virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
 
-    virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
-    virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
+    virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 };
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index 02044f0dbc25..a9039c55d486 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -201,8 +201,8 @@ public:
 
     // Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
     // der des EditOutliners) und die PaperSize gesetzt.
-    virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, ::Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
-    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+    virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, ::Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
+    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
     virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const;
     virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const;
 
@@ -218,11 +218,11 @@ public:
     virtual void SetPage(SdrPage* pNewPage);
     virtual void SetModel(SdrModel* pNewModel);
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void SetChanged();
 
-    virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const;
-    virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
+    virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const;
+    virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True);
     virtual void TakeObjNameSingul(String& rName) const;
     virtual void TakeObjNamePlural(String& rName) const;
     virtual void operator=(const SdrObject& rObj);
@@ -265,7 +265,7 @@ public:
     virtual void EndTextEdit(SdrOutliner& rOutl);
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
     virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
-    virtual USHORT GetOutlinerViewAnchorMode() const;
+    virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
 
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
 
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index 3a15d33f2cdd..fe6d298af405 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -178,8 +178,8 @@ private:
 
 protected:
     // Das aRect ist gleichzeig auch das Rect vom RectObj und CircObj.
-    // Bei bTextFrame=TRUE wird der Text in dieses Rect hineinformatiert.
-    // Bei bTextFrame=FALSE wird der Text am Mittelpunkt des Rect zentriert.
+    // Bei bTextFrame=sal_True wird der Text in dieses Rect hineinformatiert.
+    // Bei bTextFrame=sal_False wird der Text am Mittelpunkt des Rect zentriert.
     Rectangle                   aRect;
 
     // Der GeoStat enthaelt den Drehwinkel und einen Shearwinkel
@@ -206,7 +206,7 @@ protected:
     //     OBJ_TEXTEXT      Textfortsetzungsrahmen
     //     OBJ_TITLETEXT    TitleText fuer StarDraw-Praesentation
     //     OBJ_OUTLINETEXT  OutlineText fuer StarDraw-Praesentation
-    // eTextKind hat nur Bedeutung, wenn bTextFrame=TRUE, da es sich sonst
+    // eTextKind hat nur Bedeutung, wenn bTextFrame=sal_True, da es sich sonst
     // um ein beschriftetes Grafikobjekt handelt.
     SdrObjKind                  eTextKind;
 
@@ -223,36 +223,36 @@ public:
 protected:
     // Fuer beschriftete Zeichenobjekte ist bTextFrame=FALSE. Der Textblock
     // wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame=
-    // TRUE wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen
-    // ist durch ein SdrRectObj mit bTextFrame=TRUE realisiert.
-    BOOL                        bTextFrame : 1;
-    BOOL                        bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
-    BOOL                        bNoShear : 1;            // Obj darf nicht gesheart werden   (->Graf+Ole+TextFrame)
-    BOOL                        bNoRotate : 1;           // Obj darf nicht gedreht werden    (->Ole)
-    BOOL                        bNoMirror : 1;           // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
-    BOOL                        bTextSizeDirty : 1;
+    // sal_True wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen
+    // ist durch ein SdrRectObj mit bTextFrame=sal_True realisiert.
+    sal_Bool                        bTextFrame : 1;
+    sal_Bool                        bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
+    sal_Bool                        bNoShear : 1;            // Obj darf nicht gesheart werden   (->Graf+Ole+TextFrame)
+    sal_Bool                        bNoRotate : 1;           // Obj darf nicht gedreht werden    (->Ole)
+    sal_Bool                        bNoMirror : 1;           // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
+    sal_Bool                        bTextSizeDirty : 1;
 
     // #101684#
-    BOOL                        mbInEditMode : 1;   // Is this text obejct in edit mode?
+    sal_Bool                        mbInEditMode : 1;   // Is this text obejct in edit mode?
 
     // Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom
     // der App beim Create gesetzt.
     // Wenn das Objekt dann spaeter in der Breite resized wird, wird
-    // AutoGrowWidth abgeschaltet (Hart auf FALSE attributiert). Das Flag wird
-    // dann ebenfalls auf FALSE gesetzt, sodass sich das Objekt anschliessend
+    // AutoGrowWidth abgeschaltet (Hart auf sal_False attributiert). Das Flag wird
+    // dann ebenfalls auf sal_False gesetzt, sodass sich das Objekt anschliessend
     // wie ein normales Textobjekt verhaelt.
     // Resize in der Breite kann sein:
     // - Interaktives Resize in Einfach- oder Mehrfachselektion
     // - Positions+Groesse Dialog
-    BOOL                        bDisableAutoWidthOnDragging : 1;
+    sal_Bool                        bDisableAutoWidthOnDragging : 1;
 
     // #111096#
     // Allow text suppression
-    BOOL                        mbTextHidden : 1;
+    sal_Bool                        mbTextHidden : 1;
 
     // #111096#
     // Flag for allowing text animation. Default is sal_true.
-    BOOL                        mbTextAnimationAllowed : 1;
+    sal_Bool                        mbTextAnimationAllowed : 1;
 
     SdrOutliner& ImpGetDrawOutliner() const;
 
@@ -283,10 +283,10 @@ protected:
     void ImpCheckShear();
     Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
     void ImpSetTextEditParams() const;
-    void SetTextSizeDirty() { bTextSizeDirty=TRUE; }
+    void SetTextSizeDirty() { bTextSizeDirty=sal_True; }
 
     // rAnchorRect ist InOut-Parameter!
-    void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const;
+    void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const;
 
     virtual SdrObjGeoData* NewGeoData() const;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
@@ -308,15 +308,15 @@ protected:
     SdrTextObj(SdrObjKind eNewTextKind);
     SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect);
 
-    // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
-    SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+    // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+    SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
     virtual ~SdrTextObj();
 
 public:
     TYPEINFO();
 
     // #101684#
-    BOOL IsInEditMode() const { return mbInEditMode; }
+    sal_Bool IsInEditMode() const { return mbInEditMode; }
 
     // via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden.
     // Bei RTL_TEXTENCODING_DONTKNOW wird der CharSet der aktuellen Plattform verwendet.
@@ -331,12 +331,12 @@ public:
     void SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet);
     void ReleaseTextLink();
     FASTBOOL IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; }
-    FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=FALSE);
+    FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=sal_False);
     FASTBOOL LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet);
 
-    virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const;
-    virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
-    virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
+    virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const;
+    virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True);
+    virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True);
     void NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact);
     FASTBOOL IsTextFrame() const { return bTextFrame; }
     FASTBOOL IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); }
@@ -368,8 +368,8 @@ public:
     FASTBOOL IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; }
     void NbcSetText(const String& rStr);
     void SetText(const String& rStr);
-    void NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat);
-    void SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+    void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
+    void SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
 
     // FitToSize und Fontwork wird bei GetTextSize() nicht berueksichtigt!
     virtual const Size& GetTextSize() const;
@@ -377,8 +377,8 @@ public:
 
     // Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
     // der des EditOutliners) und die PaperSize gesetzt.
-    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE,
-        Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False,
+        Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
     virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const;
     const GeoStat& GetGeoStat() const { return aGeo; }
 
@@ -421,7 +421,7 @@ public:
     virtual void SetPage(SdrPage* pNewPage);
     virtual void SetModel(SdrModel* pNewModel);
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 
     // Wird zur Bestimmung des Textankerbereichs benoetigt
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
@@ -435,7 +435,7 @@ public:
     virtual void NbcSetLogicRect(const Rectangle& rRect);
     virtual const Rectangle& GetLogicRect() const;
     virtual long GetRotateAngle() const;
-    virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+    virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const;
 
     virtual sal_uInt32 GetSnapPointCount() const;
     virtual Point GetSnapPoint(sal_uInt32 i) const;
@@ -466,7 +466,7 @@ public:
     virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
     virtual void EndTextEdit(SdrOutliner& rOutl);
-    virtual USHORT GetOutlinerViewAnchorMode() const;
+    virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
 
     void StartTextAnimation(OutputDevice* pOutDev, const Point& rOffset, long nExtraData=0L);
     void StopTextAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L);
@@ -480,10 +480,10 @@ public:
     virtual void NbcReformatText();
     virtual void ReformatText();
 
-    virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+    virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
         FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
 
diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx
index c30f22064674..db8d5058ed67 100644
--- a/svx/inc/svx/svdouno.hxx
+++ b/svx/inc/svx/svdouno.hxx
@@ -63,7 +63,7 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj
 
     String                      aUnoControlModelTypeName;
     String                      aUnoControlTypeName;
-    BOOL                        bOwnUnoControlModel;
+    sal_Bool                        bOwnUnoControlModel;
 
 protected:
     ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden
@@ -76,17 +76,17 @@ private:
 public:
     TYPEINFO();
 
-    SdrUnoObj(const String& rModelName, BOOL bOwnsModel = TRUE);
+    SdrUnoObj(const String& rModelName, sal_Bool bOwnsModel = sal_True);
     SdrUnoObj(const String& rModelName,
         const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac,
-        BOOL bOwnsModel = TRUE);
+        sal_Bool bOwnsModel = sal_True);
     virtual ~SdrUnoObj();
 
     virtual void SetPage(SdrPage* pNewPage);
     virtual void SetModel(SdrModel* pModel);
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 
     virtual void operator = (const SdrObject& rObj);
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx
index cc7015197b23..f06ded64e8b6 100644
--- a/svx/inc/svx/svdoutl.hxx
+++ b/svx/inc/svx/svdoutl.hxx
@@ -43,7 +43,7 @@ protected:
     const SdrPage* mpVisualizedPage;
 
 public:
-    SdrOutliner( SfxItemPool* pItemPool, USHORT nMode );
+    SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode );
     virtual ~SdrOutliner() ;
 
     void  SetTextObj( const SdrTextObj* pObj );
@@ -53,7 +53,7 @@ public:
     void setVisualizedPage(const SdrPage* pPage) { if(pPage != mpVisualizedPage) mpVisualizedPage = pPage; }
     const SdrPage* getVisualizedPage() const { return mpVisualizedPage; }
 
-    virtual String  CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor);
+    virtual String  CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor);
 };
 
 #endif //_SVDOUTL_HXX
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index 2c1f1ae0878c..dba62f84730e 100644
--- a/svx/inc/svx/svdovirt.hxx
+++ b/svx/inc/svx/svdovirt.hxx
@@ -70,8 +70,8 @@ public:
     virtual void SetModel(SdrModel* pNewModel);
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT32 GetObjInventor() const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt32 GetObjInventor() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual SdrObjList* GetSubList() const;
 
     virtual const Rectangle& GetCurrentBoundRect() const;
@@ -131,7 +131,7 @@ public:
     virtual void NbcSetLogicRect(const Rectangle& rRect);
 
     virtual long GetRotateAngle() const;
-    virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+    virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const;
 
     virtual sal_uInt32 GetSnapPointCount() const;
     virtual Point GetSnapPoint(sal_uInt32 i) const;
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 784598d7d544..75eb5b331ab6 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -113,7 +113,7 @@ public:
     // !!! Diese Methode nur fuer Leute, die ganz genau wissen was sie tun !!!
 
     // #110094# This should not be needed (!)
-    void SetObjOrdNumsDirty()                           { bObjOrdNumsDirty=TRUE; }
+    void SetObjOrdNumsDirty()                           { bObjOrdNumsDirty=sal_True; }
     // pModel, pPage, pUpList und pOwnerObj werden Zuweisungeoperator nicht veraendert!
     void operator=(const SdrObjList& rSrcList);
     void CopyObjects(const SdrObjList& rSrcList);
@@ -132,23 +132,23 @@ public:
     // Neuberechnung der Objekt-Ordnungsnummern
     void     RecalcObjOrdNums();
     FASTBOOL IsObjOrdNumsDirty() const        { return bObjOrdNumsDirty; }
-    virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND
+    virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND
                                  , const SdrInsertReason* pReason=NULL
                                                                       );
-    virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND
+    virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND
                               , const SdrInsertReason* pReason=NULL
                                                                      );
     // aus Liste entfernen ohne delete
-    virtual SdrObject* NbcRemoveObject(ULONG nObjNum);
-    virtual SdrObject* RemoveObject(ULONG nObjNum);
+    virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum);
+    virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum);
     // Vorhandenes Objekt durch ein anderes ersetzen.
     // Wie Remove&Insert jedoch performanter, da die Ordnungsnummern
     // nicht Dirty gesetzt werden muessen.
-    virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
-    virtual SdrObject* ReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
+    virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum);
+    virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum);
     // Die Z-Order eines Objekts veraendern
-    virtual SdrObject* NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
-    virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
+    virtual SdrObject* NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum);
+    virtual SdrObject* SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum);
 
     virtual void SetRectsDirty();
 
@@ -165,14 +165,14 @@ public:
     // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln.
     void BurnInStyleSheetAttributes();
 
-    ULONG      GetObjCount() const;
-    SdrObject* GetObj(ULONG nNum) const;
+    sal_uIntPtr      GetObjCount() const;
+    SdrObject* GetObj(sal_uIntPtr nNum) const;
 
     // Gelinkte Seite oder gelinktes Gruppenobjekt
     virtual FASTBOOL IsReadOnly() const;
 
     // Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ...
-    ULONG   CountAllObjects() const;
+    sal_uIntPtr   CountAllObjects() const;
 
     // Alle aufgelagerten Teile (z.B. Grafiken) der Liste in den
     // Speicher laden.
@@ -199,7 +199,7 @@ public:
         operation is performed recursively, such that the content of
         the given object contains no groups afterwards.
      */
-    virtual void UnGroupObj( ULONG nObjNum );
+    virtual void UnGroupObj( sal_uIntPtr nObjNum );
 
     /** Return whether there is an explicit, user defined, object navigation
         order.  When there is one this method returns <TRUE/> and the
@@ -342,17 +342,17 @@ private:
     SVX_DLLPRIVATE SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList);      // never implemented
     SVX_DLLPRIVATE void           operator=(const SdrPageGridFrameList& rSrcList);  // never implemented
 protected:
-    SdrPageGridFrame* GetObject(USHORT i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); }
+    SdrPageGridFrame* GetObject(sal_uInt16 i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); }
 public:
     SdrPageGridFrameList(): aList(1024,4,4)                            {}
     ~SdrPageGridFrameList()                                            { Clear(); }
     void           Clear();
-    USHORT         GetCount() const                                    { return USHORT(aList.Count()); }
-    void           Insert(const SdrPageGridFrame& rGF, USHORT nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); }
-    void           Delete(USHORT nPos)                                 { delete (SdrPageGridFrame*)aList.Remove(nPos); }
-    void           Move(USHORT nPos, USHORT nNewPos)                   { aList.Insert(aList.Remove(nPos),nNewPos); }
-    SdrPageGridFrame&       operator[](USHORT nPos)                    { return *GetObject(nPos); }
-    const SdrPageGridFrame& operator[](USHORT nPos) const              { return *GetObject(nPos); }
+    sal_uInt16         GetCount() const                                    { return sal_uInt16(aList.Count()); }
+    void           Insert(const SdrPageGridFrame& rGF, sal_uInt16 nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); }
+    void           Delete(sal_uInt16 nPos)                                 { delete (SdrPageGridFrame*)aList.Remove(nPos); }
+    void           Move(sal_uInt16 nPos, sal_uInt16 nNewPos)                   { aList.Insert(aList.Remove(nPos),nNewPos); }
+    SdrPageGridFrame&       operator[](sal_uInt16 nPos)                    { return *GetObject(nPos); }
+    const SdrPageGridFrame& operator[](sal_uInt16 nPos) const              { return *GetObject(nPos); }
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -430,12 +430,12 @@ public:
 // and thus has to set mxUnoPage
 friend class ChXChartDocument;
 
-    INT32 nWdt;     // Seitengroesse
-    INT32 nHgt;     // Seitengroesse
-    INT32 nBordLft; // Seitenrand links
-    INT32 nBordUpp; // Seitenrand oben
-    INT32 nBordRgt; // Seitenrand rechts
-    INT32 nBordLwr; // Seitenrand unten
+    sal_Int32 nWdt;     // Seitengroesse
+    sal_Int32 nHgt;     // Seitengroesse
+    sal_Int32 nBordLft; // Seitenrand links
+    sal_Int32 nBordUpp; // Seitenrand oben
+    sal_Int32 nBordRgt; // Seitenrand rechts
+    sal_Int32 nBordLwr; // Seitenrand unten
 
     // this is a weak reference to a possible living api wrapper for this page
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoPage;
@@ -455,7 +455,7 @@ protected:
     ::sdr::MasterPageDescriptor*                    mpMasterPageDescriptor;
 
     SetOfByte  aPrefVisiLayers;
-    USHORT     nPageNum;
+    sal_uInt16     nPageNum;
 
     // bitfield
     unsigned            mbMaster : 1;               // flag if this is a MasterPage
@@ -496,17 +496,17 @@ public:
     virtual Size GetSize() const;
     virtual void SetOrientation(Orientation eOri);
     virtual Orientation GetOrientation() const;
-    virtual INT32 GetWdt() const;
-    virtual INT32 GetHgt() const;
-    virtual void  SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr);
-    virtual void  SetLftBorder(INT32 nBorder);
-    virtual void  SetUppBorder(INT32 nBorder);
-    virtual void  SetRgtBorder(INT32 nBorder);
-    virtual void  SetLwrBorder(INT32 nBorder);
-    virtual INT32 GetLftBorder() const;
-    virtual INT32 GetUppBorder() const;
-    virtual INT32 GetRgtBorder() const;
-    virtual INT32 GetLwrBorder() const;
+    virtual sal_Int32 GetWdt() const;
+    virtual sal_Int32 GetHgt() const;
+    virtual void  SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr);
+    virtual void  SetLftBorder(sal_Int32 nBorder);
+    virtual void  SetUppBorder(sal_Int32 nBorder);
+    virtual void  SetRgtBorder(sal_Int32 nBorder);
+    virtual void  SetLwrBorder(sal_Int32 nBorder);
+    virtual sal_Int32 GetLftBorder() const;
+    virtual sal_Int32 GetUppBorder() const;
+    virtual sal_Int32 GetRgtBorder() const;
+    virtual sal_Int32 GetLwrBorder() const;
 
     virtual void SetModel(SdrModel* pNewModel);
 
@@ -532,11 +532,11 @@ public:
     // GetBitmap und GetMetafile sind noch nicht implementiert.
     // Bitmap in Bildschirmaufloesung und -farbtiefe aus den Objekten der
     // Page erzeugen.
-    Bitmap        GetBitmap(FASTBOOL bTrimBorders=TRUE) const               { return GetBitmap(aPrefVisiLayers,bTrimBorders); }
-    Bitmap        GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=TRUE) const;
+    Bitmap        GetBitmap(FASTBOOL bTrimBorders=sal_True) const               { return GetBitmap(aPrefVisiLayers,bTrimBorders); }
+    Bitmap        GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True) const;
     // Metafile aus den Objekten der Page erzeugen
-    GDIMetaFile   GetMetaFile(FASTBOOL bTrimBorders=TRUE)                   { return GetMetaFile(aPrefVisiLayers,bTrimBorders); }
-    GDIMetaFile   GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=TRUE);
+    GDIMetaFile   GetMetaFile(FASTBOOL bTrimBorders=sal_True)                   { return GetMetaFile(aPrefVisiLayers,bTrimBorders); }
+    GDIMetaFile   GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True);
 
     virtual String GetLayoutName() const;
 
@@ -559,7 +559,7 @@ public:
 
     virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const;
 
-    FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const;
+    FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const;
 
     /** *deprecated* returns an averaged background color of this page */
     // #i75566# GetBackgroundColor -> GetPageBackgroundColor
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index cd7b8a6de81e..e085ccd212dc 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -128,7 +128,7 @@ private:
     SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow);
 
 protected:
-    void ImpInvalidateHelpLineArea(USHORT nNum) const;
+    void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const;
 
 protected:
     void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa);
@@ -179,7 +179,7 @@ public:
     void InvalidateAllWin();
 
     // rRect bezieht sich auf die Page
-    void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=FALSE);
+    void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False);
 
     // PrePaint call forwarded from app windows
     void PrePaint();
@@ -249,13 +249,13 @@ public:
 
     const SdrHelpLineList& GetHelpLines() const { return aHelpLines; }
     void SetHelpLines(const SdrHelpLineList& rHLL);
-    //void SetHelpLinePos(USHORT nNum, const Point& rNewPos);
-    void SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine);
-    void DeleteHelpLine(USHORT nNum);
-    void InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum=0xFFFF);
-    void MoveHelpLine(USHORT nNum, USHORT nNewNum) { aHelpLines.Move(nNum,nNewNum); }
+    //void SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos);
+    void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine);
+    void DeleteHelpLine(sal_uInt16 nNum);
+    void InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum=0xFFFF);
+    void MoveHelpLine(sal_uInt16 nNum, sal_uInt16 nNewNum) { aHelpLines.Move(nNum,nNewNum); }
 
-    // Liefert TRUE, wenn Layer des Obj sichtbar und nicht gesperrt.
+    // Liefert sal_True, wenn Layer des Obj sichtbar und nicht gesperrt.
     // Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein,
     // gesperrt sein darf keiner.
     sal_Bool IsObjMarkable(SdrObject* pObj) const;
@@ -273,7 +273,7 @@ public:
     void LeaveAllGroup();
 
     // Feststellen, wie weit hinabgestiegen wurde (0=Root(Page))
-    USHORT GetEnteredLevel() const;
+    sal_uInt16 GetEnteredLevel() const;
 
     // Name der aktuellen Objektgruppe
     String GetActualGroupName() const;
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 69f32ad327e5..32475e51b7b8 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -162,12 +162,12 @@ protected:
 
     SdrAnimationMode            eAnimationMode;
 
-    USHORT                      nHitTolPix;
-    USHORT                      nMinMovPix;
-    USHORT                      nHitTolLog;
-    USHORT                      nMinMovLog;
-    ULONG                       nMasterCacheMode;
-    ULONG                       nGraphicManagerDrawMode;
+    sal_uInt16                      nHitTolPix;
+    sal_uInt16                      nMinMovPix;
+    sal_uInt16                      nHitTolLog;
+    sal_uInt16                      nMinMovLog;
+    sal_uIntPtr                     nMasterCacheMode;
+    sal_uIntPtr                       nGraphicManagerDrawMode;
 
     // hold an incarnation of Drawinglayer configuration options
     SvtOptionsDrawinglayer      maDrawinglayerOpt;
@@ -188,9 +188,9 @@ protected:
     unsigned                    bSwapAsynchron : 1;
     unsigned                    bPrintPreview : 1;
 
-    // BOOL fuer die Verwaltung des anzuzeigenden Status
-    // Gruppe Betreten/Verlassen. Default ist TRUE, wird aber
-    // beispielsweise beim Chart auf FALSE gesetzt, da dort
+    // sal_Bool fuer die Verwaltung des anzuzeigenden Status
+    // Gruppe Betreten/Verlassen. Default ist sal_True, wird aber
+    // beispielsweise beim Chart auf sal_False gesetzt, da dort
     // die Ghosted-Effekte zur Darstellug unerwuenscht sind.
     unsigned                    bVisualizeEnteredGroup : 1;
     unsigned                    bAnimationPause : 1;
@@ -254,8 +254,8 @@ private:
     DECL_LINK(ImpComeBackHdl,Timer*);
 
 protected:
-    USHORT ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
-    USHORT ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const;
+    sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
+    sal_uInt16 ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const;
 
     // Wenn man den IdleStatus des Systems nicht abwarten will (auf const geschummelt):
     void FlushComeBackTimer() const;
@@ -263,12 +263,12 @@ protected:
     void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=(unsigned)bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
     void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=(unsigned)bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
     void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=(unsigned)bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
-    BOOL ImpIsGlueVisible2() const { return bGlueVisible2; }
-    BOOL ImpIsGlueVisible3() const { return bGlueVisible3; }
-    BOOL ImpIsGlueVisible4() const { return bGlueVisible4; }
+    sal_Bool ImpIsGlueVisible2() const { return bGlueVisible2; }
+    sal_Bool ImpIsGlueVisible3() const { return bGlueVisible3; }
+    sal_Bool ImpIsGlueVisible4() const { return bGlueVisible4; }
 
 public:
-    BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
+    sal_Bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
 protected:
 
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
@@ -296,7 +296,7 @@ public:
 //  virtual void Clear(); // PageViews loeschen, Markierungen weg, ...
     SdrModel* GetModel() const { return pMod; }
 
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
@@ -314,18 +314,18 @@ public:
     // jedem MapMode(Scaling)-wechsel gerufen werden, damit ich aus meinen
     // Pixelwerten logische Werte berechnen kann.
     void SetActualWin(const OutputDevice* pWin);
-    void SetMinMoveDistancePixel(USHORT nVal) { nMinMovPix=nVal; TheresNewMapMode(); }
-    USHORT GetMinMoveDistancePixel() const { return (USHORT)nMinMovPix; }
-    void SetHitTolerancePixel(USHORT nVal) { nHitTolPix=nVal; TheresNewMapMode(); }
-    USHORT GetHitTolerancePixel() const { return (USHORT)nHitTolPix; }
+    void SetMinMoveDistancePixel(sal_uInt16 nVal) { nMinMovPix=nVal; TheresNewMapMode(); }
+    sal_uInt16 GetMinMoveDistancePixel() const { return (sal_uInt16)nMinMovPix; }
+    void SetHitTolerancePixel(sal_uInt16 nVal) { nHitTolPix=nVal; TheresNewMapMode(); }
+    sal_uInt16 GetHitTolerancePixel() const { return (sal_uInt16)nHitTolPix; }
 
     // data read access on logic HitTolerance and MinMoveTolerance
-    USHORT getHitTolLog() const { return nHitTolLog; }
-    USHORT getMinMovLog() const { return nMinMovLog; }
+    sal_uInt16 getHitTolLog() const { return nHitTolLog; }
+    sal_uInt16 getMinMovLog() const { return nMinMovLog; }
 
     // Flag zur Visualisierung von Gruppen abfragen/testen
-    BOOL DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
-    void SetVisualizeEnteredGroup(BOOL bNew) { bVisualizeEnteredGroup = bNew; }
+    sal_Bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
+    void SetVisualizeEnteredGroup(sal_Bool bNew) { bVisualizeEnteredGroup = bNew; }
 
     // Am DragStatus laesst sich beispielsweise erfragen, welche
     // entfernung bereits gedraggd wurde, etc.
@@ -341,8 +341,8 @@ public:
     virtual void HideSdrPage();
 
     // Iterieren ueber alle angemeldeten PageViews
-//  USHORT GetPageViewCount() const { return USHORT(aPagV.Count()); }
-//  SdrPageView* GetPageViewByIndex(USHORT nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); }
+//  sal_uInt16 GetPageViewCount() const { return sal_uInt16(aPagV.Count()); }
+//  SdrPageView* GetPageViewByIndex(sal_uInt16 nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); }
     SdrPageView* GetSdrPageView() const { return mpPageView; }
 
     // Pageview einer bestimmten Seite ermitteln
@@ -360,17 +360,17 @@ public:
     virtual void AddWindowToPaintView(OutputDevice* pNewWin);
     virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin);
 
-    void SetLayerVisible(const String& rName, BOOL bShow=TRUE);
+    void SetLayerVisible(const String& rName, sal_Bool bShow=sal_True);
     bool IsLayerVisible(const String& rName) const;
-    void SetAllLayersVisible(BOOL bShow=TRUE);
+    void SetAllLayersVisible(sal_Bool bShow=sal_True);
 
-    void SetLayerLocked(const String& rName, BOOL bLock=TRUE);
+    void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True);
     bool IsLayerLocked(const String& rName) const;
-    void SetAllLayersLocked(BOOL bLock=TRUE);
+    void SetAllLayersLocked(sal_Bool bLock=sal_True);
 
-    void SetLayerPrintable(const String& rName, BOOL bPrn=TRUE);
+    void SetLayerPrintable(const String& rName, sal_Bool bPrn=sal_True);
     bool IsLayerPrintable(const String& rName) const;
-    void SetAllLayersPrintable(BOOL bPrn=TRUE);
+    void SetAllLayersPrintable(sal_Bool bPrn=sal_True);
 
     // PrePaint call forwarded from app windows
     void PrePaint();
@@ -412,14 +412,14 @@ protected:
     void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const;
 
 public:
-    BOOL IsPageVisible() const { return bPageVisible; }             // Seite (weisse Flaeche) malen oder nicht
-    BOOL IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
-    BOOL IsBordVisible() const { return bBordVisible; }             // Seitenrandlinie malen oder nicht
-    BOOL IsGridVisible() const { return bGridVisible; }             // Rastergitter malen oder nicht
-    BOOL IsGridFront() const { return bGridFront  ; }               // Rastergitter ueber die Objekte druebermalen oder dahinter
-    BOOL IsHlplVisible() const { return bHlplVisible; }             // Hilfslinien der Seiten malen oder nicht
-    BOOL IsHlplFront() const { return bHlplFront  ; }               // Hilfslinie ueber die Objekte druebermalen oder dahinter
-    BOOL IsGlueVisible() const { return bGlueVisible; }             // Konnektoren der objekte sichtbar oder nicht
+    sal_Bool IsPageVisible() const { return bPageVisible; }             // Seite (weisse Flaeche) malen oder nicht
+    sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
+    sal_Bool IsBordVisible() const { return bBordVisible; }             // Seitenrandlinie malen oder nicht
+    sal_Bool IsGridVisible() const { return bGridVisible; }             // Rastergitter malen oder nicht
+    sal_Bool IsGridFront() const { return bGridFront  ; }               // Rastergitter ueber die Objekte druebermalen oder dahinter
+    sal_Bool IsHlplVisible() const { return bHlplVisible; }             // Hilfslinien der Seiten malen oder nicht
+    sal_Bool IsHlplFront() const { return bHlplFront  ; }               // Hilfslinie ueber die Objekte druebermalen oder dahinter
+    sal_Bool IsGlueVisible() const { return bGlueVisible; }             // Konnektoren der objekte sichtbar oder nicht
     Color GetGridColor() const;
     void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); }
     void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); }
@@ -450,7 +450,7 @@ public:
     const Size& GetGridFine() const { return aGridFin; }
 
     void InvalidateAllWin();
-    void InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix=FALSE);
+    void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False);
 
     // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss
     // man diese beiden folgenden Methoden ueberladen und entsprechend anders
@@ -474,13 +474,13 @@ public:
 
     // DefaultAttribute an der View: Neu erzeugte Objekte bekommen diese
     // Attribute direkt nach dem Erzeugen erstmal zugewiesen.
-    void SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll);
+    void SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
     const SfxItemSet& GetDefaultAttr() const { return aDefaultAttr; }
-    void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
     SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; }
 
-    void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll);
-    void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
+    void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
+    void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
 
     // Aufziehen eines animierten Rechtecks fuer Applikationsspeziefische
     // Verwendung. Alle Positionsangaben in logischen View-Koordinaten.
@@ -494,32 +494,32 @@ public:
     sal_Bool IsEncirclement() const { return (0L != mpEncirclementOverlay); }
 
     // use this mode as mode to draw all internal GraphicManager objects with
-    ULONG GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; }
-    void SetGraphicManagerDrawMode( ULONG nMode ) { nGraphicManagerDrawMode = nMode; }
+    sal_uIntPtr GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; }
+    void SetGraphicManagerDrawMode( sal_uIntPtr nMode ) { nGraphicManagerDrawMode = nMode; }
 
     // SwapIn (z.B. von Grafiken) asynchron durchfuehren. Also nicht
     // beim Paint sofort nachladen, sondern dort das Nachladen anstossen.
     // Nach Abschluss des Nachladens wird das Objekt dann angezeigt.
     // Hat nur z.Zt. Wirkung, wenn SwapGraphics am Model eingeschaltet ist.
     // Default=FALSE. Flag ist nicht persistent.
-    BOOL IsSwapAsynchron() const { return bSwapAsynchron; }
-    void SetSwapAsynchron(BOOL bJa=TRUE) { bSwapAsynchron=bJa; }
-    virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-
-    virtual BOOL MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
-    virtual BOOL MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
-    virtual BOOL MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
-    virtual BOOL Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return FALSE; }
-    BOOL Cut(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
-    BOOL Yank(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
-    BOOL Paste(Window* /*pWin*/=NULL, ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
+    sal_Bool IsSwapAsynchron() const { return bSwapAsynchron; }
+    void SetSwapAsynchron(sal_Bool bJa=sal_True) { bSwapAsynchron=bJa; }
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+
+    virtual sal_Bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+    virtual sal_Bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+    virtual sal_Bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+    virtual sal_Bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return sal_False; }
+    sal_Bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
+    sal_Bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
+    sal_Bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
 
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
-    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 
     virtual void MakeVisible(const Rectangle& rRect, Window& rWin);
 
@@ -529,8 +529,8 @@ public:
     // Animation aktivieren/deaktivieren fuer ::Paint
     // wird z.Zt. ausgewertet von SdrGrafObj, wenn in dem eine Animation steckt
     // Das Unterbinden der automatischen Animation wird z.B. fuer die Dia-Show benoetigt
-    BOOL IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
-    void SetAnimationEnabled( BOOL bEnable=TRUE );
+    sal_Bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
+    void SetAnimationEnabled( sal_Bool bEnable=sal_True );
 
     // set/unset pause state for animations
     bool IsAnimationPause() const { return bAnimationPause; }
@@ -543,10 +543,10 @@ public:
     void SetAnimationMode( const SdrAnimationMode eMode );
     SdrAnimationMode GetAnimationMode() const { return eAnimationMode; }
 
-    // bei bShow=FALSE wird der Browser destruiert
+    // bei bShow=sal_False wird der Browser destruiert
 #ifdef DBG_UTIL
-    void ShowItemBrowser(BOOL bShow=TRUE);
-    BOOL IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); }
+    void ShowItemBrowser(sal_Bool bShow=sal_True);
+    sal_Bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); }
     Window* GetItemBrowser() const { return (Window*)pItemBrowser; }
 #endif
 
@@ -555,7 +555,7 @@ public:
     void VisAreaChanged(const OutputDevice* pOut=NULL);
     void VisAreaChanged(const SdrPageWindow& rWindow);
 
-    BOOL IsPrintPreview() const { return bPrintPreview; }
+    sal_Bool IsPrintPreview() const { return bPrintPreview; }
     void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; }
 
     const svtools::ColorConfig& getColorConfig() const;
diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx
index c6628c28a790..c187a2ddb3eb 100644
--- a/svx/inc/svx/svdpoev.hxx
+++ b/svx/inc/svx/svdpoev.hxx
@@ -52,8 +52,8 @@ class SVX_DLLPUBLIC SdrPolyEditView: public SdrEditView, public IPolyPolygonEdit
     friend class                SdrEditView;
 
 protected:
-    BOOL                        bSetMarkedPointsSmoothPossible : 1;
-    BOOL                        bSetMarkedSegmentsKindPossible : 1;
+    sal_Bool                        bSetMarkedPointsSmoothPossible : 1;
+    sal_Bool                        bSetMarkedSegmentsKindPossible : 1;
 
     SdrPathSmoothKind           eMarkedPointsSmooth;
     SdrPathSegmentKind          eMarkedSegmentsKind;
@@ -75,18 +75,18 @@ protected:
     virtual ~SdrPolyEditView();
 
 public:
-    BOOL IsSetMarkedPointsSmoothPossible() const;
+    sal_Bool IsSetMarkedPointsSmoothPossible() const;
     SdrPathSmoothKind GetMarkedPointsSmooth() const;
     void SetMarkedPointsSmooth(SdrPathSmoothKind eKind);
 
     // Ein PolySegment kann eine Strecke oder eine Bezierkurve sein.
-    BOOL IsSetMarkedSegmentsKindPossible() const;
+    sal_Bool IsSetMarkedSegmentsKindPossible() const;
     SdrPathSegmentKind GetMarkedSegmentsKind() const;
     void SetMarkedSegmentsKind(SdrPathSegmentKind eKind);
 
     // Moeglicherweise ist das Obj hinterher geloescht:
     void DeleteMarkedPoints();
-    BOOL IsDeleteMarkedPointsPossible() const;
+    sal_Bool IsDeleteMarkedPointsPossible() const;
 
     void MoveMarkedPoints(const Size& rSiz, bool bCopy=false);
     void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
@@ -99,7 +99,7 @@ public:
     // Alle markierten Polylines werden zu Polygonen, alle offenen
     // Bezierkurven zu geschlossenen.
     void ShutMarkedObjects();
-    void CloseMarkedObjects(BOOL bToggle=FALSE, BOOL bOpen=FALSE); // , long nOpenDistance=0);
+    void CloseMarkedObjects(sal_Bool bToggle=sal_False, sal_Bool bOpen=sal_False); // , long nOpenDistance=0);
     bool IsOpenCloseMarkedObjectsPossible() const;
     SdrObjClosedKind GetMarkedObjectsClosedState() const;
 
diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx
index 2d15f50a204e..4ad6d42a013c 100644
--- a/svx/inc/svx/svdsnpv.hxx
+++ b/svx/inc/svx/svdsnpv.hxx
@@ -78,7 +78,7 @@ protected:
     Fraction                    aSnapWdtX;
     Fraction                    aSnapWdtY;
 
-    USHORT                      nMagnSizPix;
+    sal_uInt16                      nMagnSizPix;
     long                        nSnapAngle;
     long                        nEliminatePolyPointLimitAngle;
 
@@ -103,7 +103,7 @@ protected:
     unsigned                    bMoveOnlyDragging : 1;       // Objekte nur verschieben bei Resize/Rotate/...
     unsigned                    bSlantButShear : 1;          // Slant anstelle von Shear anwenden
     unsigned                    bCrookNoContortion : 1;      // Objekte bei Crook nicht verzerren
-    unsigned                    bHlplFixed : 1;       // TRUE=Hilfslinien fixiert, also nicht verschiebbar
+    unsigned                    bHlplFixed : 1;       // sal_True=Hilfslinien fixiert, also nicht verschiebbar
     unsigned                    bEliminatePolyPoints : 1;
 
 private:
@@ -115,7 +115,7 @@ protected:
     virtual ~SdrSnapView();
 
 public:
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
@@ -128,8 +128,8 @@ public:
 
     void SetSnapMagnetic(const Size& rSiz) { if (rSiz!=aMagnSiz) { aMagnSiz=rSiz; } }
     const Size& GetSnapMagnetic() const { return aMagnSiz; }
-    void SetSnapMagneticPixel(USHORT nPix) { nMagnSizPix=nPix; }
-    USHORT GetSnapMagneticPixel() const { return nMagnSizPix; }
+    void SetSnapMagneticPixel(sal_uInt16 nPix) { nMagnSizPix=nPix; }
+    sal_uInt16 GetSnapMagneticPixel() const { return nMagnSizPix; }
 
     // RecalcLogicSnapMagnetic muss bei jedem Wechsel des OutputDevices
     // sowie bei jedem Wechsel des MapModes gerufen werden!
@@ -139,48 +139,48 @@ public:
     // Auf die View bezogene Koordinaten!
     // Rueckgabewerte sind SDRSNAP_NOTSNAPPED,SDRSNAP_XSNAPPED,
     // SDRSNAP_YSNAPPED oder SDRSNAP_XYSNAPPED
-    USHORT SnapPos(Point& rPnt, const SdrPageView* pPV) const;
+    sal_uInt16 SnapPos(Point& rPnt, const SdrPageView* pPV) const;
     Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const;
-    USHORT SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const;
+    sal_uInt16 SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const;
     void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const;
 
     // Alle Fangeinstellungen sind Persistent.
-    BOOL IsSnapEnabled() const { return bSnapEnab; }
-    BOOL IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter
-    BOOL IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender
-    BOOL IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien
-    BOOL IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten
-    BOOL IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten
-    BOOL IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte
-    void SetSnapEnabled(BOOL bOn) { bSnapEnab=bOn; }
-    void SetGridSnap(BOOL bOn) { bGridSnap=bOn; }
-    void SetBordSnap(BOOL bOn) { bBordSnap=bOn; }
-    void SetHlplSnap(BOOL bOn) { bHlplSnap=bOn; }
-    void SetOFrmSnap(BOOL bOn) { bOFrmSnap=bOn; }
-    void SetOPntSnap(BOOL bOn) { bOPntSnap=bOn; }
-    void SetOConSnap(BOOL bOn) { bOConSnap=bOn; }
+    sal_Bool IsSnapEnabled() const { return bSnapEnab; }
+    sal_Bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter
+    sal_Bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender
+    sal_Bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien
+    sal_Bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten
+    sal_Bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten
+    sal_Bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte
+    void SetSnapEnabled(sal_Bool bOn) { bSnapEnab=bOn; }
+    void SetGridSnap(sal_Bool bOn) { bGridSnap=bOn; }
+    void SetBordSnap(sal_Bool bOn) { bBordSnap=bOn; }
+    void SetHlplSnap(sal_Bool bOn) { bHlplSnap=bOn; }
+    void SetOFrmSnap(sal_Bool bOn) { bOFrmSnap=bOn; }
+    void SetOPntSnap(sal_Bool bOn) { bOPntSnap=bOn; }
+    void SetOConSnap(sal_Bool bOn) { bOConSnap=bOn; }
 
     // Normalerweise werden beim Move-Dragging von Zeichenobjekten alle
     // 4 Ecken des Object-SnapRects gefangen. Folgende Einstellmoeglichkeit,
     // wenn man nur auf die linke obere Ecke fangen will (z.B. DialogEditor):
     // Persistent, Default=FALSE.
-    void SetMoveSnapOnlyTopLeft(BOOL bOn) { bMoveSnapOnlyTopLeft=bOn; }
-    BOOL IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
+    void SetMoveSnapOnlyTopLeft(sal_Bool bOn) { bMoveSnapOnlyTopLeft=bOn; }
+    sal_Bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
 
     // Hilfslinien fixiert (nicht verschiebbar)
     // Persistent, Default=FALSE.
-    BOOL IsHlplFixed() const { return bHlplFixed; }
-    void SetHlplFixed(BOOL bOn) { bHlplFixed=bOn; }
+    sal_Bool IsHlplFixed() const { return bHlplFixed; }
+    void SetHlplFixed(sal_Bool bOn) { bHlplFixed=bOn; }
 
-    BOOL IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
-    BOOL IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
-    BOOL IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
-    BOOL IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
+    sal_Bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
+    sal_Bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
+    sal_Bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
+    sal_Bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
 
-    void SetMoveMFrmSnap(BOOL bOn) { bMoveMFrmSnap=bOn; }
-    void SetMoveOFrmSnap(BOOL bOn) { bMoveOFrmSnap=bOn; }
-    void SetMoveOPntSnap(BOOL bOn) { bMoveOPntSnap=bOn; }
-    void SetMoveOConSnap(BOOL bOn) { bMoveOConSnap=bOn; }
+    void SetMoveMFrmSnap(sal_Bool bOn) { bMoveMFrmSnap=bOn; }
+    void SetMoveOFrmSnap(sal_Bool bOn) { bMoveOFrmSnap=bOn; }
+    void SetMoveOPntSnap(sal_Bool bOn) { bMoveOPntSnap=bOn; }
+    void SetMoveOConSnap(sal_Bool bOn) { bMoveOConSnap=bOn; }
 
     // #114409#-1 Migrate PageOrigin
     sal_Bool BegSetPageOrg(const Point& rPnt);
@@ -189,12 +189,12 @@ public:
     void BrkSetPageOrg();
     sal_Bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); }
 
-    // HitTest. Bei TRUE steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV
+    // HitTest. Bei sal_True steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV
     // die zugehoerige PageView.
-    sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const;
+    sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const;
 
     // Verschieben einer vorhandenen Hilfslinie. nHelpLineNum und pPV von PickHelpLine verwenden.
-    sal_Bool BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV);
+    sal_Bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV);
     // Interaktives einfuegen einer neuen Hilfslinie
     sal_Bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind);
     Pointer GetDraggedHelpLinePointer() const;
@@ -208,7 +208,7 @@ public:
 
     // SnapAngle ist fuer Winkel im Kreis, RotateDragging, ...
     // Der Winkelfang wird unterdrueckt, wenn er mit
-    // durch SetAngleSnapEnabled(FALSE) ausgeschaltet ist.
+    // durch SetAngleSnapEnabled(sal_False) ausgeschaltet ist.
     // Der Winkelfang ist unabhaengig vom Koordinatenfang
     // und somit von der Einstellung IsSnapEnabled()
     // Es sollten nur Werte angegeben werden fuer die gilt:
@@ -218,8 +218,8 @@ public:
     // - Shear (Dragging)
     // - Kreisbogen/-sektor/-abschnitt Winkel (Create und Dragging)
     // Persistent.
-    void SetAngleSnapEnabled(BOOL bOn) { bAngleSnapEnab=bOn; }
-    BOOL IsAngleSnapEnabled() const { return bAngleSnapEnab; }
+    void SetAngleSnapEnabled(sal_Bool bOn) { bAngleSnapEnab=bOn; }
+    sal_Bool IsAngleSnapEnabled() const { return bAngleSnapEnab; }
     void SetSnapAngle(long nWink) { nSnapAngle=nWink; }
     long GetSnapAngle() const { return nSnapAngle; }
 
@@ -243,8 +243,8 @@ public:
     //     - Linie behaelt beim Draggen ihren Winkel bei und wird nur    (ni)
     //       verlaengert bzw. verkuerzt.
     // Defaultmaessig ist Ortho ausgeschaltet. Persistent.
-    void SetOrtho(BOOL bOn) { bOrtho=bOn; } // unvollstaendig
-    BOOL IsOrtho() const { return bOrtho; }
+    void SetOrtho(sal_Bool bOn) { bOrtho=bOn; } // unvollstaendig
+    sal_Bool IsOrtho() const { return bOrtho; }
 
     // BigOrtho hat nur Relevanz wenn Ortho eingeschaltet ist.
     // Beispiel: Ein Rechteck wird mit eingeschaltetem Ortho (also ein Quadrat)
@@ -256,23 +256,23 @@ public:
     //   tetem BigOrtho bekaeme man dagegen ein Quadrat der Kantenlaenge 80.
     // Gleiches gilt auch fuer Resize.
     // Defaultmaessig ist BigOrtho eingeschaltet. Persistent.
-    void SetBigOrtho(BOOL bOn) { bBigOrtho=bOn; }
-    BOOL IsBigOrtho() const { return bBigOrtho; }
+    void SetBigOrtho(sal_Bool bOn) { bBigOrtho=bOn; }
+    sal_Bool IsBigOrtho() const { return bBigOrtho; }
 
-    // bei MoveOnlyDragging=TRUE wird bei Resize/Rotate/Shear/Mirror/Crook
+    // bei MoveOnlyDragging=sal_True wird bei Resize/Rotate/Shear/Mirror/Crook
     // nur das Zentrum der markierten Objekte transformiert. Groesse, Form
     // und Drehwinkel der Objekte bleiben erhalten, nur ihre Positionen
     // aendern sich. Persistent. Default=FALSE. (ni)
-    void SetMoveOnlyDragging(BOOL bOn) { bMoveOnlyDragging=bOn; }
-    BOOL IsMoveOnlyDragging() const { return bMoveOnlyDragging; }
+    void SetMoveOnlyDragging(sal_Bool bOn) { bMoveOnlyDragging=bOn; }
+    sal_Bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; }
 
     // Slant anstelle von Shear anwenden. Persistent. Default=FALSE.
-    void SetSlantButShear(BOOL bOn) { bSlantButShear=bOn; }
-    BOOL IsSlantButShear() const { return bSlantButShear; }
+    void SetSlantButShear(sal_Bool bOn) { bSlantButShear=bOn; }
+    sal_Bool IsSlantButShear() const { return bSlantButShear; }
 
     // Objekte bei Crook nicht verzerren. Persistent. Default=FALSE. (ni)
-    void SetCrookNoContortion(BOOL bOn) { bCrookNoContortion=bOn; }
-    BOOL IsCrookNoContortion() const { return bCrookNoContortion; }
+    void SetCrookNoContortion(sal_Bool bOn) { bCrookNoContortion=bOn; }
+    sal_Bool IsCrookNoContortion() const { return bCrookNoContortion; }
 
     // Crook-Modus. Persistent. Default=SDRCROOK_ROTATE. (ni)
     void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; }
@@ -281,8 +281,8 @@ public:
     // Special fuer IBM: Beim Draggen eines Polygonpunkts wird dieser
     // geloescht, wenn seine beiden angrenzenden Linien eh' fast eine
     // durchgehende Linie sind.
-    void SetEliminatePolyPoints(BOOL bOn) { bEliminatePolyPoints=bOn; }
-    BOOL IsEliminatePolyPoints() const { return bEliminatePolyPoints; }
+    void SetEliminatePolyPoints(sal_Bool bOn) { bEliminatePolyPoints=bOn; }
+    sal_Bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; }
     void SetEliminatePolyPointLimitAngle(long nAngle) { nEliminatePolyPointLimitAngle=nAngle; }
     long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; }
 };
diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx
index 6774236d197c..f7bc7c72fcbc 100644
--- a/svx/inc/svx/svdtext.hxx
+++ b/svx/inc/svx/svdtext.hxx
@@ -54,7 +54,7 @@ public:
     virtual ~SdrText();
 
     virtual void SetModel(SdrModel* pNewModel);
-    virtual void ForceOutlinerParaObject( USHORT nOutlMode );
+    virtual void ForceOutlinerParaObject( sal_uInt16 nOutlMode );
 
     virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject );
     virtual OutlinerParaObject* GetOutlinerParaObject() const;
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index 36116e821369..d1cc076fe824 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -68,7 +68,7 @@ inline void MovePoly(PolyPolygon& rPoly, const Size& S)  { rPoly.Move(S.Width(),
 void MoveXPoly(XPolygon& rPoly, const Size& S);
 void MoveXPoly(XPolyPolygon& rPoly, const Size& S);
 
-SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, FASTBOOL bNoJustify=FALSE);
+SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, FASTBOOL bNoJustify=sal_False);
 inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact);
 void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
 void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
@@ -90,11 +90,11 @@ void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2);
 void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
 void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
 
-inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
-SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
-void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
-void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
-void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
+inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
+SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
+void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
+void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
+void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
 
 // rPnt.X bzw rPnt.Y wird auf rCenter.X bzw. rCenter.Y gesetzt!
 // anschliessend muss rPnt nur noch um rCenter gedreht werden.
@@ -180,7 +180,7 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad
 SVX_DLLPUBLIC long GetAngle(const Point& rPnt);
 long NormAngle180(long a); // Winkel normalisieren auf -180.00..179.99
 SVX_DLLPUBLIC long NormAngle360(long a); // Winkel normalisieren auf    0.00..359.99
-USHORT GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen
+sal_uInt16 GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen
 // Berechnet die Laenge von (0,0) via a^2 + b^2 = c^2
 // Zur Vermeidung von Ueberlaeufen werden ggf. einige Stellen ignoriert.
 long GetLen(const Point& rPnt);
@@ -305,14 +305,14 @@ private:
     SVX_DLLPRIVATE void Undirty();
     SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty) ((SdrFormatter*)this)->Undirty(); }
 public:
-    SdrFormatter(MapUnit eSrc, MapUnit eDst)     { eSrcMU=eSrc; bSrcFU=FALSE; eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
-    SdrFormatter(MapUnit eSrc, FieldUnit eDst)   { eSrcMU=eSrc; bSrcFU=FALSE; eDstFU=eDst; bDstFU=TRUE;  bDirty=TRUE; }
-    SdrFormatter(FieldUnit eSrc, MapUnit eDst)   { eSrcFU=eSrc; bSrcFU=TRUE;  eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
-    SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=TRUE;  eDstFU=eDst; bDstFU=TRUE;  bDirty=TRUE; }
-    void SetSourceUnit(MapUnit eSrc)        { eSrcMU=eSrc; bSrcFU=FALSE; bDirty=TRUE; }
-    void SetSourceUnit(FieldUnit eSrc)      { eSrcFU=eSrc; bSrcFU=TRUE;  bDirty=TRUE; }
-    void SetDestinationUnit(MapUnit eDst)   { eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
-    void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=TRUE;  bDirty=TRUE; }
+    SdrFormatter(MapUnit eSrc, MapUnit eDst)     { eSrcMU=eSrc; bSrcFU=sal_False; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+    SdrFormatter(MapUnit eSrc, FieldUnit eDst)   { eSrcMU=eSrc; bSrcFU=sal_False; eDstFU=eDst; bDstFU=sal_True;  bDirty=sal_True; }
+    SdrFormatter(FieldUnit eSrc, MapUnit eDst)   { eSrcFU=eSrc; bSrcFU=sal_True;  eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+    SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True;  eDstFU=eDst; bDstFU=sal_True;  bDirty=sal_True; }
+    void SetSourceUnit(MapUnit eSrc)        { eSrcMU=eSrc; bSrcFU=sal_False; bDirty=sal_True; }
+    void SetSourceUnit(FieldUnit eSrc)      { eSrcFU=eSrc; bSrcFU=sal_True;  bDirty=sal_True; }
+    void SetDestinationUnit(MapUnit eDst)   { eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+    void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=sal_True;  bDirty=sal_True; }
     void TakeStr(long nVal, XubString& rStr) const;
     static void TakeUnitStr(MapUnit eUnit, XubString& rStr);
     static void TakeUnitStr(FieldUnit eUnit, XubString& rStr);
diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx
index 9c895e3f5302..67161e8eb748 100644
--- a/svx/inc/svx/svdtypes.hxx
+++ b/svx/inc/svx/svdtypes.hxx
@@ -40,10 +40,10 @@
 //  @@@@  @@@@@  @@  @@   @@@@  @@@@@   @@@@  @@@@@  @@@@    @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const UINT32 SdrInventor=UINT32('S')*0x00000001+
-                         UINT32('V')*0x00000100+
-                         UINT32('D')*0x00010000+
-                         UINT32('r')*0x01000000;
+const sal_uInt32 SdrInventor=sal_uInt32('S')*0x00000001+
+                         sal_uInt32('V')*0x00000100+
+                         sal_uInt32('D')*0x00010000+
+                         sal_uInt32('r')*0x01000000;
 
 // Kommandos fuer EndCreate()
 enum SdrCreateCmd {SDRCREATE_NEXTPOINT,     // Naechster Polygonpunkt, Kreissegment: Naechste Koordinate
@@ -90,10 +90,10 @@ enum SdrConvertType {SDRCONVERT_POLY,   // reines Polygon erzeugen
 // dann diesen Wert:
 #define SDRLAYER_NOTFOUND 0xFF
 // Man kann diesen Wert jodoch ohne Bedenken den Methoden des SdrLayerSet
-// zuwerfen, bekommt dann jedoch immer FALSE, bzw. tut die Methode nix.
+// zuwerfen, bekommt dann jedoch immer sal_False, bzw. tut die Methode nix.
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Typdeklaration fuer Layer-IDs
-typedef BYTE SdrLayerID;
+typedef sal_uInt8 SdrLayerID;
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 3ef31455b6e7..5329be5973eb 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -74,7 +74,7 @@ protected:
 
 public:
     TYPEINFO();
-    virtual BOOL CanRepeat(SfxRepeatTarget& rView) const;
+    virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
     virtual void Repeat(SfxRepeatTarget& rView);
 
     virtual String GetRepeatComment(SfxRepeatTarget& rView) const;
@@ -111,8 +111,8 @@ public:
     virtual ~SdrUndoGroup();
 
     void Clear();
-    ULONG GetActionCount() const { return aBuf.Count(); }
-    SdrUndoAction* GetAction(ULONG nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); }
+    sal_uIntPtr GetActionCount() const { return aBuf.Count(); }
+    SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); }
     void AddAction(SdrUndoAction* pAct);
     void push_front( SdrUndoAction* pAct );
 
@@ -145,9 +145,9 @@ protected:
 protected:
     SdrUndoObj(SdrObject& rNewObj);
 
-    void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat=FALSE) const;
+    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat=sal_False) const;
 
-    static void GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat = FALSE );
+    static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat = sal_False );
 
     // #94278# new method for evtl. PageChange at UNDO/REDO
     void ImpShowPageOfThisObject();
@@ -186,7 +186,7 @@ protected:
     SdrUndoGroup*               pUndoGroup;
 
 public:
-    SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=FALSE, FASTBOOL bSaveText=FALSE);
+    SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=sal_False, FASTBOOL bSaveText=sal_False);
     virtual ~SdrUndoAttrObj();
     void SetRepeatAttr(const SfxItemSet& rSet);
     virtual void Undo();
@@ -270,7 +270,7 @@ protected:
     SdrObjList*                 pObjList;
     SdrView*                    pView;      // um bei ObjDel, Undo die
     SdrPageView*                pPageView;  // Selektion widerherstellen zu koennen
-    UINT32                      nOrdNum;
+    sal_uInt32                      nOrdNum;
     // Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes
     // statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE
 
@@ -295,7 +295,7 @@ protected:
 class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList
 {
 public:
-    SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
+    SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False)
     : SdrUndoObjList(rNewObj,bOrdNumDirect) {}
 
     virtual void Undo();
@@ -314,7 +314,7 @@ public:
 class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList
 {
 public:
-    SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
+    SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False)
     :   SdrUndoObjList(rNewObj,bOrdNumDirect) {}
 
     virtual void Undo();
@@ -332,8 +332,8 @@ public:
 class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj
 {
 public:
-    SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
-    :   SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(TRUE); }
+    SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False)
+    :   SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); }
 
     virtual void Undo();
     virtual void Redo();
@@ -356,7 +356,7 @@ public:
 class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj
 {
 public:
-    SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
+    SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False)
     :   SdrUndoInsertObj(rNewObj,bOrdNumDirect) {}
 
     virtual void Undo();
@@ -382,7 +382,7 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
 
 protected:
     SdrObjList*                 pObjList;
-    UINT32                      nOrdNum;
+    sal_uInt32                      nOrdNum;
     SdrObject*                  pNewObj;
 
 public:
@@ -410,7 +410,7 @@ public:
 class SdrUndoCopyObj : public SdrUndoNewObj
 {
 public:
-    SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
+    SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False)
     :   SdrUndoNewObj(rNewObj,bOrdNumDirect) {}
 
     virtual String GetComment() const;
@@ -423,11 +423,11 @@ public:
 class SdrUndoObjOrdNum : public SdrUndoObj
 {
 protected:
-    UINT32                      nOldOrdNum;
-    UINT32                      nNewOrdNum;
+    sal_uInt32                      nOldOrdNum;
+    sal_uInt32                      nNewOrdNum;
 
 public:
-    SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1);
+    SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1);
 
     virtual void Undo();
     virtual void Redo();
@@ -461,7 +461,7 @@ protected:
     OutlinerParaObject*         pOldText;
     OutlinerParaObject*         pNewText;
     FASTBOOL                    bNewTextAvailable;
-    BOOL                        bEmptyPresObj;
+    sal_Bool                        bEmptyPresObj;
     sal_Int32                   mnText;
 
 public:
@@ -534,11 +534,11 @@ class SdrUndoLayer : public SdrUndoAction
 protected:
     SdrLayer*                   pLayer;
     SdrLayerAdmin*              pLayerAdmin;
-    USHORT                      nNum;
+    sal_uInt16                      nNum;
     FASTBOOL                    bItsMine;
 
 protected:
-    SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
+    SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
     virtual ~SdrUndoLayer();
 };
 
@@ -552,7 +552,7 @@ protected:
 class SdrUndoNewLayer : public SdrUndoLayer
 {
 public:
-    SdrUndoNewLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
+    SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
     : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {}
 
     virtual void Undo();
@@ -571,8 +571,8 @@ public:
 class SdrUndoDelLayer : public SdrUndoLayer
 {
 public:
-    SdrUndoDelLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
-    : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=TRUE; }
+    SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
+    : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=sal_True; }
 
     virtual void Undo();
     virtual void Redo();
@@ -589,10 +589,10 @@ public:
 
 class SdrUndoMoveLayer : public SdrUndoLayer
 {
-    USHORT                      nNeuPos;
+    sal_uInt16                      nNeuPos;
 
 public:
-    SdrUndoMoveLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, USHORT nNeuPos1)
+    SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
     :   SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {}
 
     virtual void Undo();
@@ -626,14 +626,14 @@ protected:
     SdrPage&                    mrPage;
 
 protected:
-    void ImpInsertPage(USHORT nNum);
-    void ImpRemovePage(USHORT nNum);
-    void ImpMovePage(USHORT nOldNum, USHORT nNewNum);
+    void ImpInsertPage(sal_uInt16 nNum);
+    void ImpRemovePage(sal_uInt16 nNum);
+    void ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum);
 
 protected:
     SdrUndoPage(SdrPage& rNewPg);
 
-    void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT n=0, FASTBOOL bRepeat=FALSE) const;
+    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, FASTBOOL bRepeat=sal_False) const;
 };
 
 //************************************************************
@@ -647,7 +647,7 @@ protected:
 class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage
 {
 protected:
-    USHORT                      nPageNum;
+    sal_uInt16                      nPageNum;
 
     // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page
     // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE
@@ -736,11 +736,11 @@ public:
 class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage
 {
 protected:
-    USHORT                      nOldPageNum;
-    USHORT                      nNewPageNum;
+    sal_uInt16                      nOldPageNum;
+    sal_uInt16                      nNewPageNum;
 
 public:
-    SdrUndoSetPageNum(SdrPage& rNewPg, USHORT nOldPageNum1, USHORT nNewPageNum1)
+    SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1)
     :   SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {}
 
     virtual void Undo();
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index 66fd720db37a..c189c8daf9a2 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -122,11 +122,11 @@ struct SVX_DLLPUBLIC SdrViewEvent
     SdrHdlKind                  eHdlKind;
     SdrCreateCmd                eEndCreateCmd;   // auch fuer EndInsPoint
 
-    UINT16                      nMouseClicks;
-    UINT16                      nMouseMode;
-    UINT16                      nMouseCode;
-    UINT16                      nHlplIdx;
-    UINT16                      nGlueId;
+    sal_uInt16                      nMouseClicks;
+    sal_uInt16                      nMouseMode;
+    sal_uInt16                      nMouseCode;
+    sal_uInt16                      nHlplIdx;
+    sal_uInt16                      nGlueId;
 
     unsigned                    bMouseDown : 1;
     unsigned                    bMouseUp : 1;
@@ -148,7 +148,7 @@ public:
     ~SdrViewEvent();
 
     // nEventKind ist SDRMOUSEBUTTONDOWN, SDRMOUSEMOVE oder SDRMOUSEBUTTONUP
-    void SetMouseEvent(const MouseEvent& rMEvt, USHORT nEventKind);
+    void SetMouseEvent(const MouseEvent& rMEvt, sal_uInt16 nEventKind);
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -210,44 +210,44 @@ public:
     //      pSdrView->DoMouseEvent(aVEvt);
     //      SetPointer(GetPreferedPointer(...))
     //      CaptureMouse(...)
-    void EnableExtendedMouseEventDispatcher(BOOL bOn) { bNoExtendedMouseDispatcher = !bOn; }
-    BOOL IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; }
+    void EnableExtendedMouseEventDispatcher(sal_Bool bOn) { bNoExtendedMouseDispatcher = !bOn; }
+    sal_Bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; }
 
-    void EnableExtendedKeyInputDispatcher(BOOL bOn) { bNoExtendedKeyDispatcher=!bOn; }
-    BOOL IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
+    void EnableExtendedKeyInputDispatcher(sal_Bool bOn) { bNoExtendedKeyDispatcher=!bOn; }
+    sal_Bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
 
-    void EnableExtendedCommandEventDispatcher(BOOL bOn) { bNoExtendedCommandDispatcher=!bOn; }
-    BOOL IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
+    void EnableExtendedCommandEventDispatcher(sal_Bool bOn) { bNoExtendedCommandDispatcher=!bOn; }
+    sal_Bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
 
-    void EnableTextEditOnObjectsWithoutTextIfTextTool(BOOL bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
-    BOOL IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
+    void EnableTextEditOnObjectsWithoutTextIfTextTool(sal_Bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
+    sal_Bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
 
     void SetMasterPagePaintCaching(sal_Bool bOn);
     sal_Bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; }
 
-    BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin);
+    sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
 
     virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll=sal_False) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr=sal_False) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
 
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
 
     SfxStyleSheet* GetStyleSheet() const;
 
     // unvollstaendige Implementation:
     // Das OutputDevice ist notwendig, damit ich die HandleSize ermitteln kann.
     // Bei NULL wird das 1. angemeldete Win verwendet.
-    Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier=0, BOOL bLeftDown=FALSE) const;
-    SdrHitKind PickAnything(const MouseEvent& rMEvt, USHORT nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const;
+    Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const;
+    SdrHitKind PickAnything(const MouseEvent& rMEvt, sal_uInt16 nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const;
     SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const;
-    BOOL DoMouseEvent(const SdrViewEvent& rVEvt);
+    sal_Bool DoMouseEvent(const SdrViewEvent& rVEvt);
     virtual SdrViewContext GetContext() const;
 
     // Die Methoden beruecksichtigen den jeweiligen Kontex:
@@ -256,27 +256,27 @@ public:
     // - Klebepunkt-Editmode
     // - TextEdit
     // - ... to be continued
-    BOOL IsMarkPossible() const;
+    sal_Bool IsMarkPossible() const;
     void MarkAll();
     void UnmarkAll();
-    BOOL IsAllMarked() const;
-    BOOL IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit!
-    BOOL MarkNext(BOOL bPrev=FALSE);
-    BOOL MarkNext(const Point& rPnt, BOOL bPrev=FALSE);
+    sal_Bool IsAllMarked() const;
+    sal_Bool IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit!
+    sal_Bool MarkNext(sal_Bool bPrev=sal_False);
+    sal_Bool MarkNext(const Point& rPnt, sal_Bool bPrev=sal_False);
 
     const Rectangle& GetMarkedRect() const;
     void SetMarkedRect(const Rectangle& rRect);
 
     virtual void DeleteMarked();
-    BOOL IsDeleteMarkedPossible() const;
-    BOOL IsDeletePossible() const { return IsDeleteMarkedPossible(); }
+    sal_Bool IsDeleteMarkedPossible() const;
+    sal_Bool IsDeletePossible() const { return IsDeleteMarkedPossible(); }
 
     // Markieren von Objekten, Polygonpunkten oder Klebepunkten (je nach View-
     // Kontext) durch Aufziehen eines Selektionsrahmens.
     //   bAddMark=TRUE: zur bestehenden Selektion hinzumarkieren (->Shift)
     //   bUnmark=TRUE: Bereits selektierte Objekte/Punkte/Klebepunkte die innerhalb
     //                 des aufgezogenen Rahmens liegen werden deselektiert.
-    BOOL BegMark(const Point& rPnt, BOOL bAddMark=FALSE, BOOL bUnmark=FALSE);
+    sal_Bool BegMark(const Point& rPnt, sal_Bool bAddMark=sal_False, sal_Bool bUnmark=sal_False);
 
     // Folgende Actions sind moeglich:
     //   - ObjectCreating
@@ -311,28 +311,28 @@ public:
 // ~~~~~~~~~~~~~~~~~~~~
 //   Einfache Events:
 //   ~~~~~~~~~~~~~~~~
-//     BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-//     BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
-//     BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
-//     BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
-//     BOOL Command(const CommandEvent& rCEvt, Window* pWin);
+//     sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+//     sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+//     sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+//     sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+//     sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
 //
 //   Exchange (Clipboard derzeit noch ohne SdrPrivateData):
 //   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//     BOOL Cut(ULONG nFormat=SDR_ANYFORMAT);
-//     BOOL Yank(ULONG nFormat=SDR_ANYFORMAT);
-//     BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT);
+//     sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+//     sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+//     sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT);
 //
 //   SfxItems:
 //   ~~~~~~~~~
-//     BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
-//     BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
+//     sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
+//     sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
 //     SfxStyleSheet* GetStyleSheet() const;
-//     BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+//     sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 //
 //   Sonstiges:
 //   ~~~~~~~~~~
-//     Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nTol=0) const;
+//     Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const;
 //     String  GetStatusText();
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////// */
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index 9bdd6e005cc3..f600ec5d7bc6 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -56,12 +56,12 @@ class SVX_DLLPUBLIC SdrExchangeView: public SdrObjEditView
 protected:
 
     void                ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst);
-    void                ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions);
-    BOOL                ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
+    void                ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions);
+    sal_Bool                ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
     Point               GetPastePos(SdrObjList* pLst, OutputDevice* pOut=NULL);
 
     // liefert True, wenn rPt geaendert wurde
-    BOOL                ImpLimitToWorkArea(Point& rPt) const;
+    sal_Bool                ImpLimitToWorkArea(Point& rPt) const;
 
 protected:
     // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -75,11 +75,11 @@ public:
     // Alle markierten Objekte in ein Metafile stecken. Z.Zt. noch etwas
     // buggee (Offset..., Fremdgrafikobjekte (SdrGrafObj), Virtuelle
     // Objektkopien (SdrVirtObj) mit Ankerpos<>(0,0)).
-    virtual GDIMetaFile GetMarkedObjMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const;
+    virtual GDIMetaFile GetMarkedObjMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const;
 
     // Alle markierten Objekte auf eine Bitmap malen. Diese hat die Farbtiefe
     // und Aufloesung des Bildschirms.
-    virtual Bitmap      GetMarkedObjBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const;
+    virtual Bitmap      GetMarkedObjBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const;
 
     // Alle markierten Objekte in ein neues Model kopieren. Dieses neue Model
     // hat dann genau eine Page. Das Flag PageNotValid an diesem Model ist
@@ -93,8 +93,8 @@ public:
     // der Default-Layer zugewiesen (Layer 0, (dokumentglobaler Standardlayer).
     virtual SdrModel*   GetMarkedObjModel() const;
 
-    GDIMetaFile     GetAllMarkedMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); }
-    Bitmap          GetAllMarkedBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); }
+    GDIMetaFile     GetAllMarkedMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); }
+    Bitmap          GetAllMarkedBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); }
     Graphic         GetAllMarkedGraphic() const;
     SdrModel*       GetAllMarkedModel() const { return GetMarkedObjModel(); }
 
@@ -117,7 +117,7 @@ public:
     Point           GetViewCenter(const OutputDevice* pOut=NULL) const;
 
     // Bei allen Paste-Methoden werden die neuen Draw-Objekte markiert.
-    // Wird der Parameter bAddMark auf TRUE gesetzt, so werden die neuen
+    // Wird der Parameter bAddMark auf sal_True gesetzt, so werden die neuen
     // DrawObjekte zu einer bereits bestehenden Selektion "hinzumarkiert".
     // Dieser Fall ist fuer Drag&Drop mit mehreren Items gedacht.
     // Die Methoden mit Point-Parameter fuegen neue Objekte zentriert an
@@ -126,37 +126,37 @@ public:
     // eingefuegt. Die Positionierung (rPos bzw. Zentrierung) bezieht sich
     // dann nichtmehr auf die View sondern auf die Page.
     // Hinweis: SdrObjList ist Basisklasse von SdrPage.
-    // Die Methoden liefern TRUE, wenn die Objekte erfolgreich erzeugt und
-    // eingefuegt wurden. Bei pLst=FALSE und kein TextEdit aktiv kann man
+    // Die Methoden liefern sal_True, wenn die Objekte erfolgreich erzeugt und
+    // eingefuegt wurden. Bei pLst=sal_False und kein TextEdit aktiv kann man
     // sich dann auch darauf verlassen, dass diese an der View markiert sind.
     // Andernfalls erfolgt die Markierung nur, wenn pLst z.Zt. auch an der
     // View angezeigt wird.
     // Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
     // SDRINSERT_ADDMARK (siehe svdedtv.hxx).
-    BOOL            Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); }
-    BOOL            Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
-    BOOL            Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); }
-    BOOL            Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
-    BOOL            Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); }
-    virtual BOOL    Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
-    BOOL            Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); }
-    BOOL            Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
-    // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
-    BOOL            Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); }
-    BOOL            Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
+    sal_Bool            Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); }
+    sal_Bool            Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    sal_Bool            Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); }
+    sal_Bool            Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    sal_Bool            Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); }
+    virtual sal_Bool    Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    sal_Bool            Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); }
+    sal_Bool            Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+    sal_Bool            Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); }
+    sal_Bool            Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
 
     // Feststellen, ob ein bestimmtes Format ueber Drag&Drop bzw. ueber's
     // Clipboard angenommen werden kann.
-    BOOL            IsExchangeFormatSupported(ULONG nFormat) const;
+    sal_Bool            IsExchangeFormatSupported(sal_uIntPtr nFormat) const;
 
-    BOOL            Cut( ULONG nFormat = SDR_ANYFORMAT );
-    void            CutMarked( ULONG nFormat=SDR_ANYFORMAT );
+    sal_Bool            Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+    void            CutMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT );
 
-    BOOL            Yank( ULONG nFormat = SDR_ANYFORMAT );
-    void            YankMarked( ULONG nFormat=SDR_ANYFORMAT );
+    sal_Bool            Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+    void            YankMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT );
 
-    BOOL            Paste( Window* pWin = NULL, ULONG nFormat = SDR_ANYFORMAT );
-    BOOL            PasteClipboard( OutputDevice* pOut = NULL, ULONG nFormat = SDR_ANYFORMAT, UINT32 nOptions = 0 );
+    sal_Bool            Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
+    sal_Bool            PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
 };
 
 #endif //_SVDXCGV_HXX
diff --git a/svx/inc/svx/svimbase.hxx b/svx/inc/svx/svimbase.hxx
index ba10f76b01f9..4ed98e229a32 100644
--- a/svx/inc/svx/svimbase.hxx
+++ b/svx/inc/svx/svimbase.hxx
@@ -56,14 +56,14 @@ enum SimDepthType
 
 struct SimColor
 {
-    BYTE cBlue;
-    BYTE cGreen;
-    BYTE cRed;
+    sal_uInt8 cBlue;
+    sal_uInt8 cGreen;
+    sal_uInt8 cRed;
 };
 
 // ------------------------------------------------------------------------
 
-inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 )
+inline sal_Bool operator==( const SimColor& rCol1, const SimColor& rCol2 )
 {
     return ( ( rCol1.cRed == rCol2.cRed ) &&
              ( rCol1.cGreen == rCol2.cGreen ) &&
@@ -76,7 +76,7 @@ inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 )
 
 struct SimPalette
 {
-    ULONG       nColors;
+    sal_uIntPtr     nColors;
     SimColor    aColorArray[ 256 ];
 };
 
@@ -102,39 +102,39 @@ private:
     SimPalette*         pPal2;
     SimPalette*         pPal3;
     SimPalette*         pPal4;
-    ULONG               nWidth1;
-    ULONG               nWidth2;
-    ULONG               nWidth3;
-    ULONG               nWidth4;
-    ULONG               nHeight1;
-    ULONG               nHeight2;
-    ULONG               nHeight3;
-    ULONG               nHeight4;
-    ULONG               nAlignedWidth1;
-    ULONG               nAlignedWidth2;
-    ULONG               nAlignedWidth3;
-    ULONG               nAlignedWidth4;
-    ULONG               nWhichOrg;
+    sal_uIntPtr             nWidth1;
+    sal_uIntPtr             nWidth2;
+    sal_uIntPtr             nWidth3;
+    sal_uIntPtr             nWidth4;
+    sal_uIntPtr             nHeight1;
+    sal_uIntPtr             nHeight2;
+    sal_uIntPtr             nHeight3;
+    sal_uIntPtr             nHeight4;
+    sal_uIntPtr             nAlignedWidth1;
+    sal_uIntPtr             nAlignedWidth2;
+    sal_uIntPtr             nAlignedWidth3;
+    sal_uIntPtr             nAlignedWidth4;
+    sal_uIntPtr             nWhichOrg;
     SimDepthType        eOrgDepth;
     SimDepthType        eUndoDepth;
     SimDepthType        eRedoDepth;
-    BOOL                bIsUndo;
-    BOOL                bIsRedo;
-    BOOL                bCreateUndo;
-    BOOL                bValid;
-    BOOL                bDitherAll;
-
-    HPBYTE              BitmapToArray24( const Bitmap& rBitmap, ULONG* pWidth,
-                                         ULONG* pHeight, ULONG* pAlignedWidth,
+    sal_Bool                bIsUndo;
+    sal_Bool                bIsRedo;
+    sal_Bool                bCreateUndo;
+    sal_Bool                bValid;
+    sal_Bool                bDitherAll;
+
+    HPBYTE              BitmapToArray24( const Bitmap& rBitmap, sal_uIntPtr* pWidth,
+                                         sal_uIntPtr* pHeight, sal_uIntPtr* pAlignedWidth,
                                          SfxViewFrame *pFrame = NULL );
-    BOOL                Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap,
-                                         const ULONG nWidth, const ULONG nHeight,
-                                         const ULONG nColorCount = 256,
-                                         ULONG nLast = 0, SfxProgress* pProgress = NULL );
+    sal_Bool                Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap,
+                                         const sal_uIntPtr nWidth, const sal_uIntPtr nHeight,
+                                         const sal_uIntPtr nColorCount = 256,
+                                         sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL );
 
     Bitmap              CreateSaveBitmap( const SimDepthType eDepth, SfxViewFrame *pFrame = NULL );
 
-    HPBYTE              CreateArray24( ULONG nWidth, ULONG nHeight );
+    HPBYTE              CreateArray24( sal_uIntPtr nWidth, sal_uIntPtr nHeight );
     void                DeleteArray( HPBYTE pArray );
 
                         SvImageBase(const SvImageBase& rSvImageBase);
@@ -144,23 +144,23 @@ public:
 
                         SvImageBase();
                         SvImageBase( const Bitmap& rBitmap,
-                                     const ULONG nColorCount = 256,
-                                     ULONG nLast = 0, SfxProgress* pProgress = NULL );
+                                     const sal_uIntPtr nColorCount = 256,
+                                     sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL );
                         ~SvImageBase();
 
-    BOOL                IsValid() { return bValid; }
+    sal_Bool                IsValid() { return bValid; }
 
-    ULONG               GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; }
-    ULONG               GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; }
+    sal_uIntPtr             GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; }
+    sal_uIntPtr             GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; }
 
-    ULONG               GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; }
-    ULONG               GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; }
+    sal_uIntPtr             GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; }
+    sal_uIntPtr             GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; }
 
-    ULONG               GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; }
-    ULONG               GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; }
+    sal_uIntPtr             GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; }
+    sal_uIntPtr             GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; }
 
-    ULONG               GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); }
-    ULONG               GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); }
+    sal_uIntPtr             GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); }
+    sal_uIntPtr             GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); }
 
     // Farbtiefe des Ausgangsbildes ermitteln und setzen
     SimDepthType        GetDepth() const { return eOrgDepth; }
@@ -174,10 +174,10 @@ public:
     void                SetRedoDepth(const SimDepthType eDepth) { eRedoDepth = eDepth; }
 
     // Vor- und Ruecklauf der Bildverarbeitung
-    BOOL                BeginProcessing( BOOL bUndo = TRUE );
+    sal_Bool                BeginProcessing( sal_Bool bUndo = sal_True );
     void                EndProcessing();
 
-    BOOL                BeginProcessingExt(ULONG nWidth, ULONG nHeight, BOOL bUndo = TRUE);
+    sal_Bool                BeginProcessingExt(sal_uIntPtr nWidth, sal_uIntPtr nHeight, sal_Bool bUndo = sal_True);
     void                EndProcessingExt() { EndProcessing(); }
 
     // Zeiger auf Arrays zur Verfuegung stellen
@@ -185,12 +185,12 @@ public:
     HPBYTE              GetDestPointer() { return pDestArray; }
 
     // DIB-Erzeugung fuer Anzeige
-    BOOL                CreateOutBitmap( const ULONG nColorCount = 256, ULONG nLast = 0,
+    sal_Bool                CreateOutBitmap( const sal_uIntPtr nColorCount = 256, sal_uIntPtr nLast = 0,
                                          SfxProgress* pProgress = NULL );
 
     // Undo-Verwaltung
-    BOOL                DoUndo( SfxProgress* pProgress = NULL );
-    BOOL                DoRedo( SfxProgress* pProgress = NULL );
+    sal_Bool                DoUndo( SfxProgress* pProgress = NULL );
+    sal_Bool                DoRedo( SfxProgress* pProgress = NULL );
 
     // DIB-Rueckgabe fuer Anzeige
     const Bitmap&       GetOutBitmap() const;
@@ -207,6 +207,6 @@ public:
 // - DitherBitmap -
 // ----------------
 
-BOOL DitherBitmap( Bitmap& rBitmap, BOOL bDitherAlways = FALSE );
+sal_Bool DitherBitmap( Bitmap& rBitmap, sal_Bool bDitherAlways = sal_False );
 
 #endif // _SVIMBASE_HXX
diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx
index e39c39f3e513..16a56f84b864 100644
--- a/svx/inc/svx/svx3ditems.hxx
+++ b/svx/inc/svx/svx3ditems.hxx
@@ -70,14 +70,14 @@ public:
 
 class SVX_DLLPUBLIC Svx3DDoubleSidedItem : public SfxBoolItem {
 public:
-    Svx3DDoubleSidedItem(BOOL bVal = 0);
+    Svx3DDoubleSidedItem(sal_Bool bVal = 0);
 };
 
 // #i28528#
 // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
 class Svx3DReducedLineGeometryItem : public SfxBoolItem {
 public:
-    Svx3DReducedLineGeometryItem(BOOL bVal = 0);
+    Svx3DReducedLineGeometryItem(sal_Bool bVal = 0);
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -87,14 +87,14 @@ public:
     Svx3DNormalsKindItem(sal_uInt16 nVal = 0);
 
     // use drawing::NormalsKind
-    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
 class Svx3DNormalsInvertItem : public SfxBoolItem {
 public:
-    SVX_DLLPUBLIC Svx3DNormalsInvertItem(BOOL bVal = 0);
+    SVX_DLLPUBLIC Svx3DNormalsInvertItem(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item {
@@ -102,8 +102,8 @@ public:
     Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0);
 
     // use drawing::TextureProjectionMode
-    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
@@ -112,14 +112,14 @@ public:
     Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0);
 
     // use drawing::TextureProjectionMode
-    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
 class Svx3DShadow3DItem : public SfxBoolItem {
 public:
-    SVX_DLLPUBLIC Svx3DShadow3DItem(BOOL bVal = 0);
+    SVX_DLLPUBLIC Svx3DShadow3DItem(sal_Bool bVal = 0);
 };
 
 class Svx3DMaterialColorItem : public SvxColorItem {
@@ -147,8 +147,8 @@ public:
     Svx3DTextureKindItem(sal_uInt16 nVal = 3);
 
     // use drawing::TextureKind
-    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
@@ -157,14 +157,14 @@ public:
     Svx3DTextureModeItem(sal_uInt16 nVal = 2);
 
     // use drawing:TextureMode
-    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
 class Svx3DTextureFilterItem : public SfxBoolItem {
 public:
-    SVX_DLLPUBLIC Svx3DTextureFilterItem(BOOL bVal = 0);
+    SVX_DLLPUBLIC Svx3DTextureFilterItem(sal_Bool bVal = 0);
 };
 
 // Svx3D _3DSCENE_ Items
@@ -173,8 +173,8 @@ public:
     Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE);
 
     // use drawing::ProjectionMode
-    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
@@ -190,7 +190,7 @@ public:
 
 class Svx3DTwoSidedLightingItem : public SfxBoolItem {
 public:
-    SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(BOOL bVal = 0);
+    SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightcolor1Item : public SvxColorItem {
@@ -240,42 +240,42 @@ public:
 
 class SVX_DLLPUBLIC Svx3DLightOnOff1Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff1Item(BOOL bVal = 1);
+    Svx3DLightOnOff1Item(sal_Bool bVal = 1);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff2Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff2Item(BOOL bVal = 0);
+    Svx3DLightOnOff2Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff3Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff3Item(BOOL bVal = 0);
+    Svx3DLightOnOff3Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff4Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff4Item(BOOL bVal = 0);
+    Svx3DLightOnOff4Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff5Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff5Item(BOOL bVal = 0);
+    Svx3DLightOnOff5Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff6Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff6Item(BOOL bVal = 0);
+    Svx3DLightOnOff6Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff7Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff7Item(BOOL bVal = 0);
+    Svx3DLightOnOff7Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff8Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff8Item(BOOL bVal = 0);
+    Svx3DLightOnOff8Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightDirection1Item : public SvxB3DVectorItem {
@@ -328,8 +328,8 @@ public:
     Svx3DShadeModeItem(sal_uInt16 nVal = 2);
 
     // use drawing::ShadeMode
-    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual  sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual  sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
@@ -337,7 +337,7 @@ public:
 // #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed
 class Svx3DSmoothNormalsItem : public SfxBoolItem {
 public:
-    Svx3DSmoothNormalsItem(BOOL bVal = 1);
+    Svx3DSmoothNormalsItem(sal_Bool bVal = 1);
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -345,7 +345,7 @@ public:
 // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack
 class Svx3DSmoothLidsItem : public SfxBoolItem {
 public:
-    Svx3DSmoothLidsItem(BOOL bVal = 0);
+    Svx3DSmoothLidsItem(sal_Bool bVal = 0);
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -353,7 +353,7 @@ public:
 // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode
 class Svx3DCharacterModeItem : public SfxBoolItem {
 public:
-    Svx3DCharacterModeItem(BOOL bVal = 0);
+    Svx3DCharacterModeItem(sal_Bool bVal = 0);
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -361,7 +361,7 @@ public:
 // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront
 class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem {
 public:
-    Svx3DCloseFrontItem(BOOL bVal = 1);
+    Svx3DCloseFrontItem(sal_Bool bVal = 1);
     SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -369,7 +369,7 @@ public:
 // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack
 class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem {
 public:
-    Svx3DCloseBackItem(BOOL bVal = 1);
+    Svx3DCloseBackItem(sal_Bool bVal = 1);
     SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 983a048a4ff7..56a4985db54d 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -50,7 +50,7 @@ namespace linguistic2{
 }}}}
 class SvxSpellWrapper; //add for SvxSpellCheckDialog
 typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
-typedef USHORT*     (*DialogGetRanges)();
+typedef sal_uInt16*     (*DialogGetRanges)();
 
 struct ExchangeData;
 class INetURLObject;
@@ -84,8 +84,8 @@ class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDi
 class AbstractSvxZoomDialog : public VclAbstractDialog //add for SvxZoomDialog
 {
  public:
-    virtual void    SetLimits( USHORT nMin, USHORT nMax ) = 0;
-    virtual void    HideButton( USHORT nBtnId )= 0;
+    virtual void    SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) = 0;
+    virtual void    HideButton( sal_uInt16 nBtnId )= 0;
     virtual const SfxItemSet*   GetOutputItemSet() const = 0 ;
 };
 
@@ -125,7 +125,7 @@ public:
 class AbstractGalleryIdDialog :public VclAbstractDialog  //add for GalleryIdDialog
 {
 public:
-    virtual ULONG   GetId() const =0;
+    virtual sal_uIntPtr GetId() const =0;
 };
 
 class AbstractURLDlg :public VclAbstractDialog  //add for URLDlg
@@ -141,17 +141,17 @@ public:
 class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog  //add for SvxHlinkDlgMarkWnd
 {
 public:
-    virtual BOOL    MoveTo ( Point aNewPos )const = 0;
-    virtual BOOL    ConnectToDialog( BOOL bDoit = TRUE )const = 0;
+    virtual sal_Bool    MoveTo ( Point aNewPos )const = 0;
+    virtual sal_Bool    ConnectToDialog( sal_Bool bDoit = sal_True )const = 0;
     virtual void    RefreshTree ( String aStrURL ) = 0;
     virtual void    SelectEntry ( String aStrMark ) = 0;
-    virtual USHORT  SetError( USHORT nError) = 0;
+    virtual sal_uInt16  SetError( sal_uInt16 nError) = 0;
     // in class Window
     virtual void    SetSizePixel( const Size& rNewSize ) = 0;
     virtual Size    GetSizePixel() const = 0;
-    virtual void    Hide( USHORT nFlags = 0 ) = 0;
-    virtual BOOL    IsVisible() const = 0;
-    virtual void    Invalidate( USHORT nFlags = 0 ) = 0;
+    virtual void    Hide( sal_uInt16 nFlags = 0 ) = 0;
+    virtual sal_Bool    IsVisible() const = 0;
+    virtual void    Invalidate( sal_uInt16 nFlags = 0 ) = 0;
 };
 
 class AbstractSvxSearchFormatDialog : public SfxAbstractTabDialog   //for SvxSearchFormatDialog
@@ -165,16 +165,16 @@ public:
 class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog  //add for SvxSearchSimilarityDialog
 {
 public:
-    virtual USHORT  GetOther() =0 ;
-    virtual USHORT  GetShorter() =0 ;
-    virtual USHORT  GetLonger() =0 ;
-    virtual BOOL    IsRelaxed() =0 ;
+    virtual sal_uInt16  GetOther() =0 ;
+    virtual sal_uInt16  GetShorter() =0 ;
+    virtual sal_uInt16  GetLonger() =0 ;
+    virtual sal_Bool    IsRelaxed() =0 ;
 };
 
 class AbstractSvxJSearchOptionsDialog :public VclAbstractDialog  //add for SvxJSearchOptionsDialog
 {
 public:
-    virtual INT32           GetTransliterationFlags() const = 0;
+    virtual sal_Int32           GetTransliterationFlags() const = 0;
 };
 
 class AbstractFmInputRecordNoDialog :public VclAbstractDialog  //add for FmInputRecordNoDialog
@@ -223,7 +223,7 @@ public:
 class AbstractSvxMessDialog :public VclAbstractDialog  //add for SvxMessDialog
 {
 public:
-    virtual void    SetButtonText( USHORT nBtnId, const String& rNewTxt ) = 0;
+    virtual void    SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) = 0;
 };
 
 class AbstractSvxMultiPathDialog :public VclAbstractDialog  //add for SvxMultiPathDialog
@@ -292,14 +292,14 @@ public:
     virtual const SfxItemSet*   GetOutputItemSet() const = 0;
     virtual void                SetPrevHdl( const Link& rLink ) = 0;
     virtual void                SetNextHdl( const Link& rLink ) = 0;
-    virtual void                EnableTravel(BOOL bNext, BOOL bPrev) = 0;
+    virtual void                EnableTravel(sal_Bool bNext, sal_Bool bPrev) = 0;
     virtual String              GetNote()  = 0;
     virtual void                SetNote(const String& rTxt)  = 0;
     virtual void                ShowLastAuthor(const String& rAuthor, const String& rDate) = 0;
     virtual void                DontChangeAuthor() = 0;
     virtual void                HideAuthor() = 0;
-    virtual void                SetReadonlyPostIt(BOOL bDisable) = 0;
-    virtual BOOL                IsOkEnabled() const  = 0;
+    virtual void                SetReadonlyPostIt(sal_Bool bDisable) = 0;
+    virtual sal_Bool                IsOkEnabled() const  = 0;
     virtual Window *            GetWindow() = 0;
 };
 
@@ -346,7 +346,7 @@ public:
 
     virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
                                         const SdrView* pView,
-                                        USHORT nAnchorTypes = 0 ) = 0;      //add for SvxCaptionTabDialog CHINA001
+                                        sal_uInt16 nAnchorTypes = 0 ) = 0;      //add for SvxCaptionTabDialog CHINA001
 
     virtual AbstractSvxDistributeDialog*    CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
@@ -385,19 +385,19 @@ public:
                                             sal_uInt32 nResId) = 0;
     virtual VclAbstractDialog*      CreateSvxSearchAttributeDialog( Window* pParent,  //add for SvxSearchAttributeDialog
                                             SearchAttrItemList& rLst,
-                                            const USHORT* pWhRanges)=0;
+                                            const sal_uInt16* pWhRanges)=0;
     virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,  //add for SvxSearchSimilarityDialog
-                                                            BOOL bRelax,
-                                                            USHORT nOther,
-                                                            USHORT nShorter,
-                                                            USHORT nLonger ) = 0;
+                                                            sal_Bool bRelax,
+                                                            sal_uInt16 nOther,
+                                                            sal_uInt16 nShorter,
+                                                            sal_uInt16 nLonger ) = 0;
     virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
                                             const SfxItemSet& rCoreSet,
-                                            BOOL bEnableSelector = FALSE) = 0;
+                                            sal_Bool bEnableSelector = sal_False) = 0;
     virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
                                                                 const SfxItemSet* pAttr,
                                                                 const SdrView* pView,
-                                                                USHORT nAnchorTypes = 0) = 0;
+                                                                sal_uInt16 nAnchorTypes = 0) = 0;
     virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent,  //add for SchTransformTabDialog
                                                                 const SfxItemSet* pAttr,
                                                                 const SdrView* pSdrView,
@@ -406,7 +406,7 @@ public:
                                                                  )=0;
     virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
                                                             const SfxItemSet& rOptionsSet,
-                                                            INT32 nInitialFlags )=0;
+                                                            sal_Int32 nInitialFlags )=0;
     virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0;
     virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 >  &xSpl,
@@ -426,8 +426,8 @@ public:
                                             const String& rText, const String& rDesc,
                                             Image* pImg = NULL ) = 0; //add for SvxMessDialog
 
-    virtual AbstractSvxMultiPathDialog *    CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog
-    virtual AbstractSvxMultiFileDialog *    CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog
+    virtual AbstractSvxMultiPathDialog *    CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiPathDialog
+    virtual AbstractSvxMultiFileDialog *    CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiFileDialog
     virtual AbstractSvxHpLinkDlg *  CreateSvxHpLinkDlg (Window* pParent,  //add for SvxMultiFileDialog
                                             SfxBindings* pBindings,
                                             sal_uInt32 nResId)=0;
@@ -441,14 +441,14 @@ public:
                                                 RECT_POINT eLightSource, sal_uInt32 nResId )=0;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterPosterSepia (Window* pParent,  //add for GraphicFilterPoster & GraphicFilterSepia
                                                 const Graphic& rGraphic,
-                                                USHORT nCount,
+                                                sal_uInt16 nCount,
                                                 sal_uInt32 nResId)=0;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterSolarize (Window* pParent,  //add for GraphicFilterSolarize
                                                 const Graphic& rGraphic,
-                                                BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId)=0;
+                                                sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 nResId)=0;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterMosaic (Window* pParent,  //add for GraphicFilterMosaic
                                                 const Graphic& rGraphic,
-                                                USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId)=0;
+                                                sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId)=0;
     virtual AbstractSvxAreaTabDialog*       CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
                                                             const SfxItemSet* pAttr,
                                                             SdrModel* pModel,
@@ -456,7 +456,7 @@ public:
     virtual SfxAbstractTabDialog*           CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
                                                                  SdrModel* pModel,
                                                                  const SdrObject* pObj = NULL,
-                                                                BOOL bHasObj = TRUE )=0;
+                                                                sal_Bool bHasObj = sal_True )=0;
     virtual VclAbstractDialog*              CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
     virtual SfxAbstractDialog*              CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
                                                                         const SfxItemSet& rAttr,
@@ -470,16 +470,16 @@ public:
                                                                         )=0;
     virtual AbstractSvxPostItDialog*        CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
                                                                         const SfxItemSet& rCoreSet,
-                                                                        BOOL bPrevNext = FALSE, BOOL bRedline = FALSE )=0;
+                                                                        sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False )=0;
     virtual VclAbstractDialog*          CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0;
 
     virtual CreateSvxDistributePage     GetSvxDistributePageCreatorFunc() = 0; //  add for SvxDistributePage
-    virtual DialogGetRanges         GetDialogGetRangesFunc( USHORT nId ) = 0; //add for SvxPostItDialog
+    virtual DialogGetRanges         GetDialogGetRangesFunc( sal_uInt16 nId ) = 0; //add for SvxPostItDialog
 
     virtual AbstractScriptSelectorDialog*
         CreateScriptSelectorDialog(
             Window* pParent,
-            BOOL bShowSlots,
+            sal_Bool bShowSlots,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
         ) = 0;
 
diff --git a/svx/inc/svx/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx
index fdd757b1a91b..70064c21c4fe 100644
--- a/svx/inc/svx/svxgrahicitem.hxx
+++ b/svx/inc/svx/svxgrahicitem.hxx
@@ -40,7 +40,7 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem
 public:
                             TYPEINFO();
                             SvxGraphicItem();
-                            SvxGraphicItem( USHORT nWhich ,const Graphic& rGraphic);
+                            SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic);
                             SvxGraphicItem( const SvxGraphicItem& );
 
 
diff --git a/svx/inc/svx/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx
index 843ff2a487af..4068980b05b5 100644
--- a/svx/inc/svx/swframeexample.hxx
+++ b/svx/inc/svx/swframeexample.hxx
@@ -65,7 +65,7 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public Window
 
     short       nWrap;
     short       nAnchor;
-    BOOL        bTrans;
+    sal_Bool        bTrans;
 
     Point       aRelPos;
 
@@ -83,7 +83,7 @@ public:
     SvxSwFrameExample(Window* pParent, const ResId& rResID);
     ~SvxSwFrameExample();
 
-    inline void SetWrap(USHORT nW)          { nWrap     = nW; }
+    inline void SetWrap(sal_uInt16 nW)          { nWrap     = nW; }
 
     inline void SetHAlign(short nH)      { nHAlign   = nH; }
     inline void SetHoriRel(short nR)         { nHRel     = nR; }
@@ -91,7 +91,7 @@ public:
     inline void SetVAlign(short nV)      { nVAlign   = nV; }
     inline void SetVertRel(short nR)         { nVRel     = nR; }
 
-    inline void SetTransparent(BOOL bT)     { bTrans    = bT; }
+    inline void SetTransparent(sal_Bool bT)     { bTrans    = bT; }
     inline void SetAnchor(short nA)          { nAnchor   = nA; }
 
     void SetRelPos(const Point& rP);
diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx
index 647d6bc0d807..1cf8f2cd1802 100644
--- a/svx/inc/svx/sxcaitm.hxx
+++ b/svx/inc/svx/sxcaitm.hxx
@@ -36,12 +36,12 @@
 
 //------------------------------------
 // class SdrCaptionFixedAngleItem
-// TRUE=Winkel durch SdrCaptionAngleItem vorgegeben
-// FALSE=Freier Winkel
+// sal_True=Winkel durch SdrCaptionAngleItem vorgegeben
+// sal_False=Freier Winkel
 //------------------------------------
 class SdrCaptionFixedAngleItem: public SdrOnOffItem {
 public:
-    SdrCaptionFixedAngleItem(BOOL bFix=TRUE): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
+    SdrCaptionFixedAngleItem(sal_Bool bFix=sal_True): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
     SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn)  {}
 };
 
diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx
index adf69962b8a3..13379ab9fcbb 100644
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/svx/inc/svx/sxcecitm.hxx
@@ -41,26 +41,26 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST
 class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< USHORT >(eDir)) {}
+    SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {}
     SdrCaptionEscDirItem(SvStream& rIn)                              : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn)  {}
     virtual SfxPoolItem*     Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*     Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT           GetValueCount() const; // { return 3; }
+    virtual SfxPoolItem*     Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16           GetValueCount() const; // { return 3; }
     SdrCaptionEscDir GetValue() const      { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); }
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
 //------------------------------------
 // class SdrCaptionEscIsRelItem
-// TRUE=Linienaustrittsposition relativ
-// FALSE=Linienaustrittsposition absolut
+// sal_True=Linienaustrittsposition relativ
+// sal_False=Linienaustrittsposition absolut
 //------------------------------------
 class SdrCaptionEscIsRelItem: public SdrYesNoItem {
 public:
-    SdrCaptionEscIsRelItem(BOOL bRel=TRUE): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
+    SdrCaptionEscIsRelItem(sal_Bool bRel=sal_True): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
     SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn)  {}
 };
 
diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
index e5c7ac2d1724..6134fe6ad5d4 100644
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/svx/inc/svx/sxcikitm.hxx
@@ -38,17 +38,17 @@ enum SdrCircKind {SDRCIRC_FULL,
 class SdrCircKindItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< USHORT >(eKind)) {}
+    SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
     SdrCircKindItem(SvStream& rIn)                 : SfxEnumItem(SDRATTR_CIRCKIND,rIn)   {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT       GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16       GetValueCount() const; // { return 4; }
             SdrCircKind  GetValue() const      { return (SdrCircKind)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx
index 65011beff599..2563897b4ae1 100644
--- a/svx/inc/svx/sxcllitm.hxx
+++ b/svx/inc/svx/sxcllitm.hxx
@@ -51,7 +51,7 @@ public:
 //------------------------------------
 class SdrCaptionFitLineLenItem: public SdrYesNoItem {
 public:
-    SdrCaptionFitLineLenItem(BOOL bBestFit=TRUE): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
+    SdrCaptionFitLineLenItem(sal_Bool bBestFit=sal_True): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
     SdrCaptionFitLineLenItem(SvStream& rIn)     : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn)      {}
 };
 
diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx
index 7cc2cefc8a55..bf2f049a976b 100644
--- a/svx/inc/svx/sxctitm.hxx
+++ b/svx/inc/svx/sxctitm.hxx
@@ -39,13 +39,13 @@ enum SdrCaptionType   {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4};
 class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< USHORT >(eStyle)) {}
+    SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
     SdrCaptionTypeItem(SvStream& rIn)                      : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn)    {}
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const; // { return 4; }
             SdrCaptionType  GetValue() const      { return (SdrCaptionType)SfxEnumItem::GetValue(); }
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
index 1a881af22b01..936a7c75f888 100644
--- a/svx/inc/svx/sxekitm.hxx
+++ b/svx/inc/svx/sxekitm.hxx
@@ -43,15 +43,15 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES,
 class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< USHORT >(eStyle)) {}
+    SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
     SdrEdgeKindItem(SvStream& rIn)                        : SfxEnumItem(SDRATTR_EDGEKIND,rIn)    {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT       GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16       GetValueCount() const; // { return 5; }
             SdrEdgeKind  GetValue() const      { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx
index aa60cf8d030c..5057f9d05f85 100644
--- a/svx/inc/svx/sxelditm.hxx
+++ b/svx/inc/svx/sxelditm.hxx
@@ -33,7 +33,7 @@
 
 class SdrEdgeLineDeltaAnzItem: public SfxUInt16Item {
 public:
-    SdrEdgeLineDeltaAnzItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
+    SdrEdgeLineDeltaAnzItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
     SdrEdgeLineDeltaAnzItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn)  {}
 };
 
@@ -41,24 +41,24 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem {
 public:
     SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal)  {}
     SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {}
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem {
 public:
     SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal)  {}
     SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {}
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem {
 public:
     SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal)  {}
     SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {}
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx
index 442dc52bbaa1..fab72e1bea9d 100644
--- a/svx/inc/svx/sxenditm.hxx
+++ b/svx/inc/svx/sxenditm.hxx
@@ -35,32 +35,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem {
 public:
     SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal)  {}
     SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {}
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem {
 public:
     SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal)  {}
     SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {}
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem {
 public:
     SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal)  {}
     SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {}
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem {
 public:
     SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal)  {}
     SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {}
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SdrEdgeNode1GlueDistItem: public SdrMetricItem {
diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx
index 514b6ec9a713..e40010bb1ad4 100644
--- a/svx/inc/svx/sxfiitm.hxx
+++ b/svx/inc/svx/sxfiitm.hxx
@@ -38,13 +38,13 @@ class SdrFractionItem: public SfxPoolItem {
     Fraction nValue;
 public:
     TYPEINFO_VISIBILITY( SVX_DLLPUBLIC );
-    SdrFractionItem(USHORT nId=0): SfxPoolItem(nId) {}
-    SdrFractionItem(USHORT nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
-    SdrFractionItem(USHORT nId, SvStream& rIn);
+    SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {}
+    SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
+    SdrFractionItem(sal_uInt16 nId, SvStream& rIn);
     virtual int              operator==(const SfxPoolItem&) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const;
-    virtual SfxPoolItem*     Create(SvStream&, USHORT nVer) const;
-    virtual SvStream&        Store(SvStream&, USHORT nItemVers) const;
+    virtual SfxPoolItem*     Create(SvStream&, sal_uInt16 nVer) const;
+    virtual SvStream&        Store(SvStream&, sal_uInt16 nItemVers) const;
     virtual SfxPoolItem*     Clone(SfxItemPool *pPool=NULL) const;
             const Fraction&  GetValue() const { return nValue; }
             void             SetValue(const Fraction& rVal) { nValue = rVal; }
diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx
index ed476ade709e..fa346dee0e9c 100644
--- a/svx/inc/svx/sxlayitm.hxx
+++ b/svx/inc/svx/sxlayitm.hxx
@@ -37,7 +37,7 @@
 //------------------------------
 class SdrLayerIdItem: public SfxUInt16Item {
 public:
-    SdrLayerIdItem(USHORT nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId)  {}
+    SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId)  {}
     SdrLayerIdItem(SvStream& rIn): SfxUInt16Item(SDRATTR_LAYERID,rIn) {}
     SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); }
 };
diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
index 2e1a7fd74b5a..3cf0dcbe9351 100644
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/svx/inc/svx/sxmkitm.hxx
@@ -38,17 +38,17 @@ enum SdrMeasureKind     {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i.
 class SdrMeasureKindItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< USHORT >(eKind)) {}
+    SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
     SdrMeasureKindItem(SvStream& rIn)                      : SfxEnumItem(SDRATTR_MEASUREKIND,rIn)    {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*   Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT         GetValueCount() const; // { return 2; }
+    virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16         GetValueCount() const; // { return 2; }
             SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx
index e9b35bc425bc..0d7f3d1fb777 100644
--- a/svx/inc/svx/sxmtaitm.hxx
+++ b/svx/inc/svx/sxmtaitm.hxx
@@ -33,7 +33,7 @@
 
 // Den Text automatisch zurechtdrehen (Automatisches UpsideDown).
 // TextUpsideDown bleibt trotzdem weiterhin wirksam und dreht
-// den Text bei TRUE nochmal.
+// den Text bei sal_True nochmal.
 class SdrMeasureTextAutoAngleItem: public SdrYesNoItem {
 public:
     SdrMeasureTextAutoAngleItem(bool bOn=true): SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {}
diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx
index c971f69f652f..f43943bcc8d0 100644
--- a/svx/inc/svx/sxmtfitm.hxx
+++ b/svx/inc/svx/sxmtfitm.hxx
@@ -51,7 +51,7 @@ public:
 // The decimal places used for the measure value
 class SdrMeasureDecimalPlacesItem: public SfxInt16Item {
 public:
-    SdrMeasureDecimalPlacesItem(INT16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal)  {}
+    SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal)  {}
     SdrMeasureDecimalPlacesItem(SvStream& rIn): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,rIn) {}
 };
 
diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
index f056c4cc732e..383ee89a23ba 100644
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/svx/inc/svx/sxmtpitm.hxx
@@ -40,17 +40,17 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR
 class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< USHORT >(ePos)) {}
+    SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
     SdrMeasureTextHPosItem(SvStream& rIn)                               : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn)    {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*   Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT         GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16         GetValueCount() const; // { return 4; }
             SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
@@ -60,17 +60,17 @@ public:
 class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< USHORT >(ePos)) {}
+    SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
     SdrMeasureTextVPosItem(SvStream& rIn)                               : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn)    {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*   Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT         GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16         GetValueCount() const; // { return 5; }
             SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index d8c65975c92a..aeb9dfeec955 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -37,17 +37,17 @@
 class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< USHORT >(eUnit)) {}
+    SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {}
     SdrMeasureUnitItem(SvStream& rIn)             : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn)   {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT       GetValueCount() const; // { return 14; }
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16       GetValueCount() const; // { return 14; }
             FieldUnit    GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); }
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx
index e3f11e57bc3a..ccc284f3ecbe 100644
--- a/svx/inc/svx/sxsiitm.hxx
+++ b/svx/inc/svx/sxsiitm.hxx
@@ -34,11 +34,11 @@
 class SdrScaleItem: public SdrFractionItem {
 public:
     TYPEINFO();
-    SdrScaleItem(USHORT nId=0): SdrFractionItem(nId,Fraction(1,1)) {}
-    SdrScaleItem(USHORT nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
-    SdrScaleItem(USHORT nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
+    SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {}
+    SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
+    SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const;
-    virtual SfxPoolItem*     Create(SvStream&, USHORT nVer) const;
+    virtual SfxPoolItem*     Create(SvStream&, sal_uInt16 nVer) const;
     virtual SfxPoolItem*     Clone(SfxItemPool *pPool=NULL) const;
 };
 
diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx
index a197e110f8ab..dc22f238b97e 100644
--- a/svx/inc/svx/tabarea.hxx
+++ b/svx/inc/svx/tabarea.hxx
@@ -62,7 +62,7 @@ enum PageType
 
 // define ----------------------------------------------------------------
 
-typedef USHORT ChangeType; // auch in tab_line.hxx (mitpflegen !!!)
+typedef sal_uInt16 ChangeType; // auch in tab_line.hxx (mitpflegen !!!)
 
 #define CT_NONE                 ( (ChangeType) 0x0000 )
 #define CT_MODIFIED             ( (ChangeType) 0x0001 )
diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx
index dd4d6033960c..86febb53f9f4 100644
--- a/svx/inc/svx/tabline.hxx
+++ b/svx/inc/svx/tabline.hxx
@@ -45,7 +45,7 @@
 class SvxBrushItem;
 // define ----------------------------------------------------------------
 
-typedef USHORT ChangeType; // auch in tab_area.hxx (mitpflegen !!!)
+typedef sal_uInt16 ChangeType; // auch in tab_area.hxx (mitpflegen !!!)
 
 #define CT_NONE                 ( (ChangeType) 0x0000 )
 #define CT_MODIFIED             ( (ChangeType) 0x0001 )
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 0fb270351df9..813fa08e0374 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -186,12 +186,12 @@ class SVX_DLLPUBLIC SvxStyleToolBoxControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxStyleToolBoxControl();
 
     virtual Window* CreateItemWindow( Window *pParent );
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 
     DECL_LINK( VisibilityNotification, void* );
@@ -213,11 +213,11 @@ private:
     SfxStyleControllerItem_Impl*        pBoundItems [MAX_FAMILIES];
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xBoundItems[MAX_FAMILIES];
     SfxTemplateItem*                    pFamilyState[MAX_FAMILIES];
-    USHORT                              nActFamily; // Id in der ToolBox = Position - 1
-    USHORT                              nActFilter; // FilterIdx
-    USHORT                              nAppFilter; // Filter, den die App gesetzt hat
+    sal_uInt16                              nActFamily; // Id in der ToolBox = Position - 1
+    sal_uInt16                              nActFilter; // FilterIdx
+    sal_uInt16                              nAppFilter; // Filter, den die App gesetzt hat
     String                              aCurSel;
-    BOOL                                bListening;
+    sal_Bool                                bListening;
     Impl*                               pImpl;
 
     SVX_DLLPRIVATE void Update();
@@ -226,7 +226,7 @@ private:
 
 friend class SfxStyleControllerItem_Impl;
 
-    SVX_DLLPRIVATE void         SetFamilyState  ( USHORT nIdx, const SfxTemplateItem* pItem );
+    SVX_DLLPRIVATE void         SetFamilyState  ( sal_uInt16 nIdx, const SfxTemplateItem* pItem );
     SVX_DLLPRIVATE SfxStyleFamily   GetActFamily    ();
 };
 
@@ -239,9 +239,9 @@ class SVX_DLLPUBLIC SvxFontNameToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontNameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFontNameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 
-    virtual void    StateChanged        ( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged        ( sal_uInt16 nSID, SfxItemState eState,
                                           const SfxPoolItem* pState );
     virtual Window* CreateItemWindow    ( Window *pParent );
 };
@@ -264,7 +264,7 @@ class SVX_DLLPUBLIC SvxFontHeightToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontHeightToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFontHeightToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFontHeightToolBoxControl();
 
     // new controller API
@@ -289,10 +289,10 @@ class SVX_DLLPUBLIC SvxFontColorToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFontColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFontColorToolBoxControl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
@@ -316,14 +316,14 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontColorExtToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFontColorExtToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFontColorExtToolBoxControl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
-    virtual void                Select( BOOL bMod1 = FALSE );
+    virtual void                Select( sal_Bool bMod1 = sal_False );
 
 };
 
@@ -339,10 +339,10 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
     ::svx::ToolboxButtonColorUpdater*   pBtnUpdater;
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxColorToolBoxControl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
@@ -359,11 +359,11 @@ class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFrameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFrameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 
 };
@@ -379,11 +379,11 @@ class SVX_DLLPUBLIC SvxFrameLineStyleToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFrameLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFrameLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
 
@@ -399,12 +399,12 @@ class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl
     ::svx::ToolboxButtonColorUpdater*   pBtnUpdater;
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFrameLineColorToolBoxControl( USHORT nSlotId,
-                                     USHORT nId,
+    SvxFrameLineColorToolBoxControl( sal_uInt16 nSlotId,
+                                     sal_uInt16 nId,
                                      ToolBox& rTbx );
     ~SvxFrameLineColorToolBoxControl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
@@ -420,13 +420,13 @@ private:
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxReloadControllerItem( USHORT nSlotId,
-                             USHORT nId,
+    SvxReloadControllerItem( sal_uInt16 nSlotId,
+                             sal_uInt16 nId,
                              ToolBox& rTbx );
     ~SvxReloadControllerItem();
 
 protected:
-    virtual void StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                const SfxPoolItem* pState );
 };
 
@@ -437,10 +437,10 @@ private:
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxSimpleUndoRedoController();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
 
diff --git a/svx/inc/svx/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx
index 669b03e87c73..85504738eafa 100644
--- a/svx/inc/svx/tbxalign.hxx
+++ b/svx/inc/svx/tbxalign.hxx
@@ -44,7 +44,7 @@ public:
 
             SFX_DECL_TOOLBOX_CONTROL();
 
-            SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+            SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
             ~SvxTbxCtlAlign() {}
 private:
     rtl::OUString m_aSubTbName;
diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx
index 892a03257e5b..fbeeb1899105 100644
--- a/svx/inc/svx/tbxcolorupdate.hxx
+++ b/svx/inc/svx/tbxcolorupdate.hxx
@@ -56,10 +56,10 @@ namespace svx
     class SVX_DLLPUBLIC ToolboxButtonColorUpdater
     {
     public:
-                    ToolboxButtonColorUpdater( USHORT   nSlotId,
-                                                USHORT   nTbxBtnId,
+                    ToolboxButtonColorUpdater( sal_uInt16   nSlotId,
+                                                sal_uInt16   nTbxBtnId,
                                                 ToolBox* ptrTbx,
-                                                USHORT   nMode = 0 );
+                                                sal_uInt16   nMode = 0 );
                     ~ToolboxButtonColorUpdater();
 
         void        Update( const Color& rColor );
@@ -68,14 +68,14 @@ namespace svx
         void        DrawChar(VirtualDevice&, const Color&);
 
     private:
-        USHORT      mnDrawMode;
-        USHORT      mnBtnId;
-        USHORT      mnSlotId;
+        sal_uInt16      mnDrawMode;
+        sal_uInt16      mnBtnId;
+        sal_uInt16      mnSlotId;
         ToolBox*    mpTbx;
         Color       maCurColor;
         Rectangle   maUpdRect;
         Size        maBmpSize;
-        BOOL        mbWasHiContrastMode;
+        sal_Bool        mbWasHiContrastMode;
     };
 
 //........................................................................
diff --git a/svx/inc/svx/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx
index 39bfc09cf8b1..301fb401a789 100644
--- a/svx/inc/svx/tbxctl.hxx
+++ b/svx/inc/svx/tbxctl.hxx
@@ -47,13 +47,13 @@ protected:
     using SfxToolBoxControl::Select;
 
 public:
-    SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxTbxCtlDraw() {}
 
     SFX_DECL_TOOLBOX_CONTROL();
 
-    virtual void                Select( BOOL bMod1 = FALSE );
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                Select( sal_Bool bMod1 = sal_False );
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
 };
diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx
index 21aa3ea871ed..114ccf4814b1 100644
--- a/svx/inc/svx/tbxcustomshapes.hxx
+++ b/svx/inc/svx/tbxcustomshapes.hxx
@@ -40,15 +40,15 @@ class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
 {
 public:
     using SfxToolBoxControl::Select;
-    virtual void                Select( BOOL bMod1 = FALSE );
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                Select( sal_Bool bMod1 = sal_False );
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
 
             SFX_DECL_TOOLBOX_CONTROL();
 
-            SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+            SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
             ~SvxTbxCtlCustomShapes() {}
 
     //interface XSubToolbarController:
diff --git a/svx/inc/svx/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx
index 8f071f38792b..295f9e4539d4 100644
--- a/svx/inc/svx/tbxdraw.hxx
+++ b/svx/inc/svx/tbxdraw.hxx
@@ -49,17 +49,17 @@ protected:
     using SfxPopupWindow::StateChanged;
 
 public:
-    SvxPopupWindowTbxMgr(   USHORT nId,
+    SvxPopupWindowTbxMgr(   sal_uInt16 nId,
                             SfxToolBoxControl* pTbxCtl,
                             ResId aRIdWin,
                             ResId aRIdTbx );
-    SvxPopupWindowTbxMgr(   USHORT nId,
+    SvxPopupWindowTbxMgr(   sal_uInt16 nId,
                             WindowAlign eAlign,
                             ResId aRIdWin,
                             ResId aRIdTbx );
     ~SvxPopupWindowTbxMgr();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState);
     virtual SfxPopupWindow*     Clone() const;
     virtual void                PopupModeEnd();
@@ -67,7 +67,7 @@ public:
     void                        StartSelection();
 
     // toolbox click or execute may chage the default selection in the tools toolbox
-    virtual void                UserEvent( ULONG nEvent, void* pEventData );
+    virtual void                UserEvent( sal_uIntPtr nEvent, void* pEventData );
 };
 
 
diff --git a/svx/inc/svx/txencbox.hxx b/svx/inc/svx/txencbox.hxx
index e24716f8c953..ede3461d2b43 100644
--- a/svx/inc/svx/txencbox.hxx
+++ b/svx/inc/svx/txencbox.hxx
@@ -42,7 +42,7 @@ class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox
 private:
     const SvxTextEncodingTable*     m_pEncTable;
 
-    SVX_DLLPRIVATE USHORT               EncodingToPos_Impl( rtl_TextEncoding nEnc ) const;
+    SVX_DLLPRIVATE sal_uInt16               EncodingToPos_Impl( rtl_TextEncoding nEnc ) const;
 
 public:
                         SvxTextEncodingBox( Window* pParent, const ResId& rResId );
@@ -64,7 +64,7 @@ public:
             RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
             <TRUE/> whenever the box is used in import dialogs. */
     void                FillFromTextEncodingTable(
-                            sal_Bool bExcludeImportSubsets = FALSE,
+                            sal_Bool bExcludeImportSubsets = sal_False,
                             sal_uInt32 nExcludeInfoFlags = 0,
                             sal_uInt32 nButIncludeInfoFlags = 0
                             );
@@ -85,7 +85,7 @@ public:
             RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
             <TRUE/> whenever the box is used in import dialogs. */
     void                FillFromDbTextEncodingMap(
-                            sal_Bool bExcludeImportSubsets = FALSE,
+                            sal_Bool bExcludeImportSubsets = sal_False,
                             sal_uInt32 nExcludeInfoFlags = 0,
                             sal_uInt32 nButIncludeInfoFlags = 0
                             );
@@ -99,22 +99,22 @@ public:
                             { return m_pEncTable; }
 
     void                InsertTextEncoding( const rtl_TextEncoding nEnc,
-                            USHORT nPos = LISTBOX_APPEND );
+                            sal_uInt16 nPos = LISTBOX_APPEND );
 
     void                InsertTextEncoding( const rtl_TextEncoding nEnc,
                             const String& rEntry,
-                            USHORT nPos = LISTBOX_APPEND );
+                            sal_uInt16 nPos = LISTBOX_APPEND );
 
     void                RemoveTextEncoding( const rtl_TextEncoding nEnc );
 
     void                SelectTextEncoding( const rtl_TextEncoding nEnc,
-                            BOOL bSelect = TRUE );
+                            sal_Bool bSelect = sal_True );
 
     rtl_TextEncoding    GetSelectTextEncoding() const;
 
     const String&       GetSelectTextString() const;
 
-    BOOL                IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const;
+    sal_Bool                IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const;
 };
 
 #endif
diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx
index 34cb60371582..92b04c659f19 100644
--- a/svx/inc/svx/unoprov.hxx
+++ b/svx/inc/svx/unoprov.hxx
@@ -43,15 +43,15 @@ class SfxItemPool;
 struct UHashMapEntry
 {
     ::rtl::OUString aIdentifier;
-    UINT32 nId;
+    sal_uInt32 nId;
 
-    UHashMapEntry(const sal_Char * value, sal_Int32 length, UINT32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { }
+    UHashMapEntry(const sal_Char * value, sal_Int32 length, sal_uInt32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { }
 };
 
 DECLARE_LIST( UHashMapEntryList, UHashMapEntry* )
 
 #define HASHARRAYSIZE   0x10
-#define UHASHMAP_NOTFOUND sal::static_int_cast< UINT32 >(~0)
+#define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0)
 
 class UHashMap
 {
@@ -62,7 +62,7 @@ public:
     UHashMap( UHashMapEntry* pMap );
     ~UHashMap() {};
 
-    UINT32 getId( const ::rtl::OUString& rCompareString );
+    sal_uInt32 getId( const ::rtl::OUString& rCompareString );
 };
 
 /***********************************************************************
@@ -103,12 +103,12 @@ class SVX_DLLPUBLIC SvxUnoPropertyMapProvider
 {
     SfxItemPropertyMapEntry* aMapArr[SVXMAP_END];
     SvxItemPropertySet* aSetArr[SVXMAP_END];
-//  void Sort(USHORT nId);
+//  void Sort(sal_uInt16 nId);
 public:
     SvxUnoPropertyMapProvider();
     ~SvxUnoPropertyMapProvider();
-    const SfxItemPropertyMapEntry* GetMap(UINT16 nPropertyId);
-    const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool);
+    const SfxItemPropertyMapEntry* GetMap(sal_uInt16 nPropertyId);
+    const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool);
 };
 
 /***********************************************************************
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 6b749c05be61..13154829eb4a 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -193,7 +193,7 @@ public:
     const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; }
     SdrObject* GetSdrObject() const {return mpObj.get();}
     void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; }
-    ::com::sun::star::uno::Any GetBitmap( BOOL bMetaFile = FALSE ) const throw ();
+    ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw ();
     static SvxShape* GetShapeForSdrObj( SdrObject* pObj ) throw ();
 
     ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier();
diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx
index 07e6ef79f7ca..e7c678a8a358 100644
--- a/svx/inc/svx/unoshtxt.hxx
+++ b/svx/inc/svx/unoshtxt.hxx
@@ -83,7 +83,7 @@ public:
 //  static sal_Bool hasLevels( const SdrObject* pObject );
 
     // the SvxViewForwarder interface
-    virtual BOOL        IsValid() const;
+    virtual sal_Bool        IsValid() const;
     virtual Rectangle   GetVisArea() const;
     virtual Point       LogicToPixel( const Point&, const MapMode& ) const;
     virtual Point       PixelToLogic( const Point&, const MapMode& ) const;
diff --git a/svx/inc/svx/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx
index 8c350e31918b..175704f83749 100644
--- a/svx/inc/svx/verttexttbxctrl.hxx
+++ b/svx/inc/svx/verttexttbxctrl.hxx
@@ -37,10 +37,10 @@ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl
 {
     sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked
 public:
-    SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxVertCTLTextTbxCtrl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     void    SetVert(sal_Bool bSet) {bCheckVertical = bSet;}
 
@@ -52,7 +52,7 @@ class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 /* -----------------------------12.09.2002 11:50------------------------------
 
@@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 #endif
diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx
index ec17badd0052..776d6d672da7 100644
--- a/svx/inc/svx/view3d.hxx
+++ b/svx/inc/svx/view3d.hxx
@@ -74,17 +74,17 @@ protected:
     // Migrate selections
     Impl3DMirrorConstructOverlay*                   mpMirrorOverlay;
 
-    BOOL                        bDoubleSided;
+    sal_Bool                        bDoubleSided;
 
     void InitView();
 
-    void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
-    void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
+    void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
+    void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
     void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj);
     void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj);
 
     void InitScene(E3dScene* pScene, double fW, double fH, double fCamZ);
-    void ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, BOOL& rGroupSelected) const;
+    void ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, sal_Bool& rGroupSelected) const;
     void BreakSingle3DObj(E3dObject* pObj);
 
 public:
@@ -97,7 +97,7 @@ public:
 
     // Zugriff auf die Default-Attribute
     E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; }
-    virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
+    virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
     virtual void CheckPossibilities();
 
     // Event setzen/rausruecken
@@ -111,21 +111,21 @@ public:
     // Bei Paste muss - falls in eine Scene eingefuegt wird - die
     // Objekte der Szene eingefuegt werden, die Szene selbst aber nicht
     using SdrView::Paste;
-    virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
+    virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
 
     // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
-    BOOL ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
+    sal_Bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
 
-    BOOL HasMarkedScene();
+    sal_Bool HasMarkedScene();
     E3dScene* GetMarkedScene();
 
-    BOOL IsConvertTo3DObjPossible() const;
-    void ConvertMarkedObjTo3D(BOOL bExtrude=TRUE, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
+    sal_Bool IsConvertTo3DObjPossible() const;
+    void ConvertMarkedObjTo3D(sal_Bool bExtrude=sal_True, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
 
     // Nachtraeglichhe Korrekturmoeglichkeit um alle Extrudes in einer
     // bestimmten Tiefensortierung anzulegen
     void DoDepthArrange(E3dScene* pScene, double fDepth);
-    void ConvertMarkedToPolyObj(BOOL bLineToArea);
+    void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
     E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
     void Start3DCreation();
 
@@ -133,7 +133,7 @@ public:
     sal_Bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); }
 
     virtual void MovAction(const Point& rPnt);
-    void End3DCreation(BOOL bUseDefaultValuesForMirrorAxes=FALSE);
+    void End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes=sal_False);
     void ResetCreationActive();
 
     double GetDefaultCamPosZ();
@@ -256,22 +256,22 @@ public:
     long GetVDefaultSegments() const { return nVDefaultSegments; }
     void SetVDefaultSegments(long nSegs) { nVDefaultSegments = nSegs; }
 
-    BOOL IsBreak3DObjPossible() const;
+    sal_Bool IsBreak3DObjPossible() const;
     void Break3DObj();
 
-    BOOL DoubleSided () const
+    sal_Bool DoubleSided () const
     {
         return bDoubleSided;
     }
 
-    BOOL &DoubleSided ()
+    sal_Bool &DoubleSided ()
     {
         return bDoubleSided;
     }
 
     void MergeScenes();
-    SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE) const;
-    void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE);
+    SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const;
+    void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False);
 };
 
 #endif          // _E3D_VIEW3D_HXX
diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx
index fe79fc2641e0..febb15fe28ca 100644
--- a/svx/inc/svx/viewlayoutitem.hxx
+++ b/svx/inc/svx/viewlayoutitem.hxx
@@ -42,7 +42,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item
 public:
     TYPEINFO();
 
-    SvxViewLayoutItem( USHORT nColumns = 0, bool bBookMode = false, USHORT nWhich = SID_ATTR_VIEWLAYOUT );
+    SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT );
     SvxViewLayoutItem( const SvxViewLayoutItem& );
     ~SvxViewLayoutItem();
 
@@ -52,10 +52,10 @@ public:
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStrm, USHORT nVersion ) const;                       // leer
-    virtual SvStream&       Store( SvStream& rStrm , USHORT nItemVersion ) const;                   // leer
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );   // leer
+    virtual SfxPoolItem*    Create( SvStream& rStrm, sal_uInt16 nVersion ) const;                       // leer
+    virtual SvStream&       Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const;                   // leer
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );   // leer
 };
 
 //------------------------------------------------------------------------
diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx
index a26f559b23b2..2a766e81e1a9 100644
--- a/svx/inc/svx/viewpt3d.hxx
+++ b/svx/inc/svx/viewpt3d.hxx
@@ -78,7 +78,7 @@ class SVX_DLLPUBLIC Viewport3D
 
     basegfx::B3DPoint       aViewPoint;     // Beobachterstandpunkt in Weltkoordinaten;
                                     // wird mit der Transformation berechnet
-    BOOL            bTfValid;       // Flag, ob Transformation gueltig ist
+    sal_Bool            bTfValid;       // Flag, ob Transformation gueltig ist
 
     double fWRatio;                 // Device/View-Seitenverhaeltnisse
     double fHRatio;
@@ -105,11 +105,11 @@ class SVX_DLLPUBLIC Viewport3D
     double  GetFarClipDist() const  { return fFarClipDist; }
 
     void SetProjection(ProjectionType ePrj)
-        { eProjection = ePrj; bTfValid = FALSE; }
+        { eProjection = ePrj; bTfValid = sal_False; }
     ProjectionType GetProjection() const { return(eProjection); }
 
     void SetAspectMapping(AspectMapType eAsp)
-        { eAspectMapping = eAsp; bTfValid = FALSE; }
+        { eAspectMapping = eAsp; bTfValid = sal_False; }
     AspectMapType GetAspectMapping() { return eAspectMapping; }
 
     void SetViewWindow(double fX, double fY, double fW, double fH);
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index f3b2d98c138d..89104131a16a 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -50,22 +50,22 @@ protected:
     XBitmapType     eType;
     XBitmapStyle    eStyle;
     GraphicObject   aGraphicObject;
-    USHORT*         pPixelArray;
+    sal_uInt16*         pPixelArray;
     Size            aArraySize;
     Color           aPixelColor;
     Color           aBckgrColor;
-    BOOL            bGraphicDirty;
+    sal_Bool            bGraphicDirty;
 
 public:
     XOBitmap();
     XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE );
     XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE );
 #if defined HP9000 || defined SINIX
-    XOBitmap( const USHORT* pArray, const Color& aPixelColor,
+    XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor,
              const Color& aBckgrColor, const Size& rSize = aXOBitmapDefaultSize,
              XBitmapStyle eStyle = XBITMAP_TILE );
 #else
-    XOBitmap( const USHORT* pArray, const Color& aPixelColor,
+    XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor,
              const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
              XBitmapStyle eStyle = XBITMAP_TILE );
 #endif
@@ -78,20 +78,20 @@ public:
     void Bitmap2Array();
     void Array2Bitmap();
 
-    void SetGraphicObject( const GraphicObject& rObj )  { aGraphicObject = rObj; bGraphicDirty = FALSE; }
-    void SetBitmap( const Bitmap& rBmp )                { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = FALSE; }
+    void SetGraphicObject( const GraphicObject& rObj )  { aGraphicObject = rObj; bGraphicDirty = sal_False; }
+    void SetBitmap( const Bitmap& rBmp )                { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = sal_False; }
     void SetBitmapType( XBitmapType eNewType )          { eType = eNewType; }
     void SetBitmapStyle( XBitmapStyle eNewStyle )       { eStyle = eNewStyle; }
-    void SetPixelArray( const USHORT* pArray );
-    void SetPixelSize( const Size& rSize )              { aArraySize  = rSize;  bGraphicDirty = TRUE; }
-    void SetPixelColor( const Color& rColor )           { aPixelColor = rColor; bGraphicDirty = TRUE; }
-    void SetBackgroundColor( const Color& rColor )      { aBckgrColor = rColor; bGraphicDirty = TRUE; }
+    void SetPixelArray( const sal_uInt16* pArray );
+    void SetPixelSize( const Size& rSize )              { aArraySize  = rSize;  bGraphicDirty = sal_True; }
+    void SetPixelColor( const Color& rColor )           { aPixelColor = rColor; bGraphicDirty = sal_True; }
+    void SetBackgroundColor( const Color& rColor )      { aBckgrColor = rColor; bGraphicDirty = sal_True; }
 
     XBitmapType             GetBitmapType() const               { return eType; }
     XBitmapStyle            GetBitmapStyle() const              { return eStyle; }
     const GraphicObject&    GetGraphicObject() const;
     Bitmap                  GetBitmap() const;
-    USHORT*                 GetPixelArray() const               { return pPixelArray; }
+    sal_uInt16*                 GetPixelArray() const               { return pPixelArray; }
     Color                   GetPixelColor() const               { return aPixelColor; }
     Color                   GetBackgroundColor() const          { return aBckgrColor; }
 };
diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx
index 5b0a214b67ed..f835507c3a4c 100644
--- a/svx/inc/svx/xbtmpit.hxx
+++ b/svx/inc/svx/xbtmpit.hxx
@@ -50,16 +50,16 @@ public:
             XFillBitmapItem( SfxItemPool* pPool, const XOBitmap& rTheBitmap );
             XFillBitmapItem( SfxItemPool* pPool );
             XFillBitmapItem( const XFillBitmapItem& rItem );
-            XFillBitmapItem( SvStream& rIn, USHORT nVer = 0 );
+            XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 );
 
     virtual int             operator==( const SfxPoolItem& rItem ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
-    virtual SvStream&       Store( SvStream& rOut, USHORT nItemVersion  ) const;
-    virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
+    virtual SvStream&       Store( SvStream& rOut, sal_uInt16 nItemVersion  ) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -69,7 +69,7 @@ public:
     const XOBitmap& GetBitmapValue( const XBitmapTable* pTable = 0 ) const; // GetValue -> GetBitmapValue
     void  SetBitmapValue( const XOBitmap& rNew )  { aXOBitmap = rNew; Detach(); } // SetValue -> SetBitmapValue
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XFillBitmapItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx
index d1827a37ad8c..d2bc3f410a97 100644
--- a/svx/inc/svx/xcolit.hxx
+++ b/svx/inc/svx/xcolit.hxx
@@ -45,19 +45,19 @@ class SVX_DLLPUBLIC XColorItem : public NameOrIndex
 public:
             TYPEINFO();
             XColorItem() {}
-            XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor);
+            XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor);
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-            XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor);
-            XColorItem(USHORT nWhich, SvStream& rIn);
+            XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor);
+            XColorItem(sal_uInt16 nWhich, SvStream& rIn);
             XColorItem(const XColorItem& rItem);
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
     const Color&    GetColorValue(const XColorTable* pTable = 0) const;
     void            SetColorValue(const Color& rNew) { aColor = rNew; Detach(); }
diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx
index 3005c2a1b752..79621f11b628 100644
--- a/svx/inc/svx/xdash.hxx
+++ b/svx/inc/svx/xdash.hxx
@@ -41,32 +41,32 @@ class SVX_DLLPUBLIC XDash
 {
 protected:
     XDashStyle  eDash;
-    USHORT      nDots;
-    ULONG       nDotLen;
-    USHORT      nDashes;
-    ULONG       nDashLen;
-    ULONG       nDistance;
+    sal_uInt16      nDots;
+    sal_uIntPtr       nDotLen;
+    sal_uInt16      nDashes;
+    sal_uIntPtr       nDashLen;
+    sal_uIntPtr       nDistance;
 
 public:
           XDash(XDashStyle eDash = XDASH_RECT,
-                USHORT nDots = 1, ULONG nDotLen = 20,
-                USHORT nDashes = 1, ULONG nDashLen = 20, ULONG nDistance = 20);
+                sal_uInt16 nDots = 1, sal_uIntPtr nDotLen = 20,
+                sal_uInt16 nDashes = 1, sal_uIntPtr nDashLen = 20, sal_uIntPtr nDistance = 20);
 
     bool operator==(const XDash& rDash) const;
 
     void SetDashStyle(XDashStyle eNewStyle) { eDash = eNewStyle; }
-    void SetDots(USHORT nNewDots)           { nDots = nNewDots; }
-    void SetDotLen(ULONG nNewDotLen)        { nDotLen = nNewDotLen; }
-    void SetDashes(USHORT nNewDashes)       { nDashes = nNewDashes; }
-    void SetDashLen(ULONG nNewDashLen)      { nDashLen = nNewDashLen; }
-    void SetDistance(ULONG nNewDistance)    { nDistance = nNewDistance; }
+    void SetDots(sal_uInt16 nNewDots)           { nDots = nNewDots; }
+    void SetDotLen(sal_uIntPtr nNewDotLen)        { nDotLen = nNewDotLen; }
+    void SetDashes(sal_uInt16 nNewDashes)       { nDashes = nNewDashes; }
+    void SetDashLen(sal_uIntPtr nNewDashLen)      { nDashLen = nNewDashLen; }
+    void SetDistance(sal_uIntPtr nNewDistance)    { nDistance = nNewDistance; }
 
     XDashStyle  GetDashStyle() const        { return eDash; }
-    USHORT      GetDots() const             { return nDots; }
-    ULONG       GetDotLen() const           { return nDotLen; }
-    USHORT      GetDashes() const           { return nDashes; }
-    ULONG       GetDashLen() const          { return nDashLen; }
-    ULONG       GetDistance() const         { return nDistance; }
+    sal_uInt16      GetDots() const             { return nDots; }
+    sal_uIntPtr       GetDotLen() const           { return nDotLen; }
+    sal_uInt16      GetDashes() const           { return nDashes; }
+    sal_uIntPtr       GetDashLen() const          { return nDashLen; }
+    sal_uIntPtr       GetDistance() const         { return nDistance; }
 
     // XDash is translated into an array of doubles which describe the lengths of the
     // dashes, dots and empty passages. It returns the complete length of the full DashDot
diff --git a/svx/inc/svx/xexch.hxx b/svx/inc/svx/xexch.hxx
index ff317f0a7541..a3b1f10c6d1c 100644
--- a/svx/inc/svx/xexch.hxx
+++ b/svx/inc/svx/xexch.hxx
@@ -60,7 +60,7 @@ public:
     SVX_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData );
     SVX_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStm, XFillExchangeData& rXFillExchangeData );
 
-    static ULONG        RegisterClipboardFormatName();
+    static sal_uLong        RegisterClipboardFormatName();
     XFillAttrSetItem*   GetXFillAttrSetItem() { return pXFillAttrSetItem; }
 };
 
diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx
index 40ddb71dd717..df954983f3d2 100644
--- a/svx/inc/svx/xfillit0.hxx
+++ b/svx/inc/svx/xfillit0.hxx
@@ -46,16 +46,16 @@ public:
                             XFillStyleItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual sal_uInt16          GetValueCount() const;
     XFillStyle              GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); }
 };
 
diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx
index 2c3df96a8ec2..f13308b613b6 100644
--- a/svx/inc/svx/xflasit.hxx
+++ b/svx/inc/svx/xflasit.hxx
@@ -47,8 +47,8 @@ public:
                             XFillAttrSetItem(const XFillAttrSetItem& rAttr,
                                              SfxItemPool* pItemPool);
     virtual SfxPoolItem*    Clone( SfxItemPool* pToPool ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream& rStream, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream& rStream, sal_uInt16 nItemVersion ) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx
index 8d94d3ec23cd..265443a8c9ac 100644
--- a/svx/inc/svx/xflbckit.hxx
+++ b/svx/inc/svx/xflbckit.hxx
@@ -42,12 +42,12 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem
 public:
                             TYPEINFO();
 
-                            XFillBackgroundItem( BOOL bFill = FALSE );
+                            XFillBackgroundItem( sal_Bool bFill = sal_False );
                             SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn );
 
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx
index d06d0f6622e4..bb49400742b8 100644
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/svx/inc/svx/xflbmpit.hxx
@@ -45,14 +45,14 @@ public:
                             SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    SVX_DLLPRIVATE virtual USHORT           GetValueCount() const;
+    SVX_DLLPRIVATE virtual sal_uInt16           GetValueCount() const;
     SVX_DLLPRIVATE RECT_POINT               GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); }
 };
 
diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx
index adf1c25ca109..4779a76522b3 100644
--- a/svx/inc/svx/xflbmsli.hxx
+++ b/svx/inc/svx/xflbmsli.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFillBmpSizeLogItem( BOOL bLog = TRUE );
+                            XFillBmpSizeLogItem( sal_Bool bLog = sal_True );
                             SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx
index d4de1a3d81c2..5d8a4cf3e9a6 100644
--- a/svx/inc/svx/xflbmsxy.hxx
+++ b/svx/inc/svx/xflbmsxy.hxx
@@ -45,7 +45,7 @@ public:
                             SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -72,7 +72,7 @@ public:
                             SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx
index 75477624e690..9625bab80d96 100644
--- a/svx/inc/svx/xflbmtit.hxx
+++ b/svx/inc/svx/xflbmtit.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFillBmpTileItem( BOOL bTile = TRUE );
+                            XFillBmpTileItem( sal_Bool bTile = sal_True );
                             XFillBmpTileItem( SvStream& rIn );
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx
index 498704376eaf..19d04ea79e9f 100644
--- a/svx/inc/svx/xflboxy.hxx
+++ b/svx/inc/svx/xflboxy.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 );
+                            XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 );
                             SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -64,11 +64,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 );
+                            XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 );
                             SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx
index 1f5c79df977b..b5cc2ead7d27 100644
--- a/svx/inc/svx/xflbstit.hxx
+++ b/svx/inc/svx/xflbstit.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFillBmpStretchItem( BOOL bStretch = TRUE );
+                            XFillBmpStretchItem( sal_Bool bStretch = sal_True );
                             XFillBmpStretchItem( SvStream& rIn );
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx
index 35d401eb9c6a..2ca52a3e5e75 100644
--- a/svx/inc/svx/xflbtoxy.hxx
+++ b/svx/inc/svx/xflbtoxy.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillBmpTileOffsetXItem( USHORT nOffX = 0 );
+                            XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 );
                             SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -64,11 +64,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillBmpTileOffsetYItem( USHORT nOffX = 0 );
+                            XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 );
                             SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx
index a3b03b48d30b..367814bb4f0c 100644
--- a/svx/inc/svx/xflclit.hxx
+++ b/svx/inc/svx/xflclit.hxx
@@ -43,15 +43,15 @@ class SVX_DLLPUBLIC XFillColorItem : public XColorItem
 public:
             TYPEINFO();
             XFillColorItem() {}
-            XFillColorItem(INT32 nIndex, const Color& rTheColor);
+            XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
             XFillColorItem(const String& rName, const Color& rTheColor);
             XFillColorItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx
index c501a153b66a..9862cf7fa92e 100644
--- a/svx/inc/svx/xflftrit.hxx
+++ b/svx/inc/svx/xflftrit.hxx
@@ -41,31 +41,31 @@ private:
 
     long                    nDummy1;
     long                    nDummy2;
-    BOOL                    bEnabled;
+    sal_Bool                    bEnabled;
 
 public:
                             TYPEINFO();
 
                             XFillFloatTransparenceItem();
-                            XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable = TRUE );
-                            XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, BOOL bEnable = TRUE );
-                            XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, BOOL bEnable = TRUE );
+                            XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable = sal_True );
+                            XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True );
+                            XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True );
                             XFillFloatTransparenceItem(SfxItemPool* pPool );
                             XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem );
 
     virtual int             operator==( const SfxPoolItem& rItem ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const;
 
-    BOOL                    IsEnabled() const { return bEnabled; }
-    void                    SetEnabled( BOOL bEnable ) { bEnabled = bEnable; }
+    sal_Bool                    IsEnabled() const { return bEnabled; }
+    void                    SetEnabled( sal_Bool bEnable ) { bEnabled = bEnable; }
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XFillFloatTransparenceItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx
index 4725a2d7383f..30c918d59e21 100644
--- a/svx/inc/svx/xflgrit.hxx
+++ b/svx/inc/svx/xflgrit.hxx
@@ -44,21 +44,21 @@ class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex
 public:
             TYPEINFO();
             XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
-            XFillGradientItem(INT32 nIndex, const XGradient& rTheGradient);
+            XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient);
             XFillGradientItem(const UniString& rName, const XGradient& rTheGradient);
             XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient);
             XFillGradientItem(SfxItemPool* pPool );
             XFillGradientItem(const XFillGradientItem& rItem);
-            XFillGradientItem(SvStream& rIn, USHORT nVer = 0);
+            XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0);
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
-    virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -66,7 +66,7 @@ public:
     const XGradient&        GetGradientValue(const XGradientTable* pTable = 0) const; // GetValue -> GetGradientValue
     void                    SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XFillGradientItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx
index 01dadc6405f9..a666381dd4e3 100644
--- a/svx/inc/svx/xflhtit.hxx
+++ b/svx/inc/svx/xflhtit.hxx
@@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex
 public:
                             TYPEINFO();
                             XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
-                            XFillHatchItem(INT32 nIndex, const XHatch& rTheHatch);
+                            XFillHatchItem(sal_Int32 nIndex, const XHatch& rTheHatch);
                             XFillHatchItem(const String& rName, const XHatch& rTheHatch);
                             XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
                             XFillHatchItem(SfxItemPool* pPool );
@@ -53,11 +53,11 @@ public:
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -68,7 +68,7 @@ public:
     const XHatch&           GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue
     void                    SetHatchValue(const XHatch& rNew)  { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XFillHatchItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx
index ee44a24e791c..9f2bab545579 100644
--- a/svx/inc/svx/xfltrit.hxx
+++ b/svx/inc/svx/xfltrit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillTransparenceItem(USHORT nFillTransparence = 0);
+                            XFillTransparenceItem(sal_uInt16 nFillTransparence = 0);
                             XFillTransparenceItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = NULL) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx
index 575121c5eaf1..e73033dee160 100644
--- a/svx/inc/svx/xftadit.hxx
+++ b/svx/inc/svx/xftadit.hxx
@@ -44,12 +44,12 @@ public:
                             XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER);
                             XFormTextAdjustItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const;
     XFormTextAdjust         GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); }
     // #FontWork#
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx
index a549c74648b5..d0ba783761ea 100644
--- a/svx/inc/svx/xftdiit.hxx
+++ b/svx/inc/svx/xftdiit.hxx
@@ -44,7 +44,7 @@ public:
                             XFormTextDistanceItem(long nDist = 0);
                             XFormTextDistanceItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx
index b920bc7fc8f0..742268f5e333 100644
--- a/svx/inc/svx/xftmrit.hxx
+++ b/svx/inc/svx/xftmrit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFormTextMirrorItem(BOOL bMirror = FALSE);
+                            XFormTextMirrorItem(sal_Bool bMirror = sal_False);
                             XFormTextMirrorItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx
index 6a46c1f0cabf..11382718f5d9 100644
--- a/svx/inc/svx/xftouit.hxx
+++ b/svx/inc/svx/xftouit.hxx
@@ -40,10 +40,10 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFormTextOutlineItem(BOOL bOutline = FALSE);
+                            XFormTextOutlineItem(sal_Bool bOutline = sal_False);
                             XFormTextOutlineItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx
index 40fc477a86bf..22feb75be0f7 100644
--- a/svx/inc/svx/xftsfit.hxx
+++ b/svx/inc/svx/xftsfit.hxx
@@ -43,12 +43,12 @@ public:
                             XFormTextStdFormItem(XFormTextStdForm = XFTFORM_NONE);
                             XFormTextStdFormItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const;
     XFormTextStdForm        GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); }
     // #FontWork#
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx
index bccac9df40bb..fc473db4bb47 100644
--- a/svx/inc/svx/xftshcit.hxx
+++ b/svx/inc/svx/xftshcit.hxx
@@ -42,12 +42,12 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem
 public:
             TYPEINFO();
             XFormTextShadowColorItem() {}
-            XFormTextShadowColorItem(INT32 nIndex, const Color& rTheColor);
+            XFormTextShadowColorItem(sal_Int32 nIndex, const Color& rTheColor);
             XFormTextShadowColorItem(const String& rName, const Color& rTheColor);
             XFormTextShadowColorItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx
index a63aab17dbc2..6bd8c12c02cf 100644
--- a/svx/inc/svx/xftshit.hxx
+++ b/svx/inc/svx/xftshit.hxx
@@ -44,12 +44,12 @@ public:
                             XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE);
                             XFormTextShadowItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const;
     XFormTextShadow         GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); }
     // #FontWork#
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx
index 97789eeed5f2..9a959c246e0e 100644
--- a/svx/inc/svx/xftshtit.hxx
+++ b/svx/inc/svx/xftshtit.hxx
@@ -40,10 +40,10 @@ class XFormTextShadowTranspItem: public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFormTextShadowTranspItem(USHORT nShdwTransparence = 0);
+                            XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0);
                             XFormTextShadowTranspItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = NULL) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx
index a9918da33577..cc43565834b3 100644
--- a/svx/inc/svx/xftshxy.hxx
+++ b/svx/inc/svx/xftshxy.hxx
@@ -44,7 +44,7 @@ public:
                             XFormTextShadowXValItem(long nVal = 0);
                             XFormTextShadowXValItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 /*************************************************************************
@@ -60,7 +60,7 @@ public:
                             XFormTextShadowYValItem(long nVal = 0);
                             XFormTextShadowYValItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx
index 78d3dac329c6..e55a8f8ccaa4 100644
--- a/svx/inc/svx/xftstit.hxx
+++ b/svx/inc/svx/xftstit.hxx
@@ -44,7 +44,7 @@ public:
                             XFormTextStartItem(long nStart = 0);
                             XFormTextStartItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx
index b7bf350d3ddb..313c2c2dd6c1 100644
--- a/svx/inc/svx/xgrad.hxx
+++ b/svx/inc/svx/xgrad.hxx
@@ -43,20 +43,20 @@ protected:
     Color           aStartColor;
     Color           aEndColor;
     long            nAngle;
-    USHORT          nBorder;
-    USHORT          nOfsX;
-    USHORT          nOfsY;
-    USHORT          nIntensStart;
-    USHORT          nIntensEnd;
-    USHORT          nStepCount;
+    sal_uInt16          nBorder;
+    sal_uInt16          nOfsX;
+    sal_uInt16          nOfsY;
+    sal_uInt16          nIntensStart;
+    sal_uInt16          nIntensEnd;
+    sal_uInt16          nStepCount;
 
 public:
     XGradient();
     XGradient( const Color& rStart, const Color& rEnd,
                XGradientStyle eStyle = XGRAD_LINEAR, long nAngle = 0,
-               USHORT nXOfs = 50, USHORT nYOfs = 50, USHORT nBorder = 0,
-               USHORT nStartIntens = 100, USHORT nEndIntens = 100,
-               USHORT nSteps = 0 );
+               sal_uInt16 nXOfs = 50, sal_uInt16 nYOfs = 50, sal_uInt16 nBorder = 0,
+               sal_uInt16 nStartIntens = 100, sal_uInt16 nEndIntens = 100,
+               sal_uInt16 nSteps = 0 );
 
     bool operator==(const XGradient& rGradient) const;
 
@@ -64,23 +64,23 @@ public:
     void SetStartColor(const Color& rColor)         { aStartColor = rColor; }
     void SetEndColor(const Color& rColor)           { aEndColor = rColor; }
     void SetAngle(long nNewAngle)                   { nAngle = nNewAngle; }
-    void SetBorder(USHORT nNewBorder)               { nBorder = nNewBorder; }
-    void SetXOffset(USHORT nNewOffset)              { nOfsX = nNewOffset; }
-    void SetYOffset(USHORT nNewOffset)              { nOfsY = nNewOffset; }
-    void SetStartIntens(USHORT nNewIntens)          { nIntensStart = nNewIntens; }
-    void SetEndIntens(USHORT nNewIntens)            { nIntensEnd = nNewIntens; }
-    void SetSteps(USHORT nSteps)                    { nStepCount = nSteps; }
+    void SetBorder(sal_uInt16 nNewBorder)               { nBorder = nNewBorder; }
+    void SetXOffset(sal_uInt16 nNewOffset)              { nOfsX = nNewOffset; }
+    void SetYOffset(sal_uInt16 nNewOffset)              { nOfsY = nNewOffset; }
+    void SetStartIntens(sal_uInt16 nNewIntens)          { nIntensStart = nNewIntens; }
+    void SetEndIntens(sal_uInt16 nNewIntens)            { nIntensEnd = nNewIntens; }
+    void SetSteps(sal_uInt16 nSteps)                    { nStepCount = nSteps; }
 
     XGradientStyle GetGradientStyle() const         { return eStyle; }
     Color          GetStartColor() const            { return aStartColor; }
     Color          GetEndColor() const              { return aEndColor; }
     long           GetAngle() const                 { return nAngle; }
-    USHORT         GetBorder() const                { return nBorder; }
-    USHORT         GetXOffset() const               { return nOfsX; }
-    USHORT         GetYOffset() const               { return nOfsY; }
-    USHORT         GetStartIntens() const           { return nIntensStart; }
-    USHORT         GetEndIntens() const             { return nIntensEnd; }
-    USHORT         GetSteps() const                 { return nStepCount; }
+    sal_uInt16         GetBorder() const                { return nBorder; }
+    sal_uInt16         GetXOffset() const               { return nOfsX; }
+    sal_uInt16         GetYOffset() const               { return nOfsY; }
+    sal_uInt16         GetStartIntens() const           { return nIntensStart; }
+    sal_uInt16         GetEndIntens() const             { return nIntensEnd; }
+    sal_uInt16         GetSteps() const                 { return nStepCount; }
 };
 
 #endif
diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx
index c08590d7840a..69f0941b3972 100644
--- a/svx/inc/svx/xgrscit.hxx
+++ b/svx/inc/svx/xgrscit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XGradientStepCountItem( USHORT nStepCount = 0 );
+                            XGradientStepCountItem( sal_uInt16 nStepCount = 0 );
                             XGradientStepCountItem( SvStream& rIn );
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 6f82da63e0b9..aa68537d2173 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -44,14 +44,14 @@ class SfxItemPool;
 class NameOrIndex;
 class XPropertyList;
 
-typedef BOOL (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
+typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
 
 //-------------------
 // class NameOrIndex
 //-------------------
 class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem
 {
-    INT32    nPalIndex;
+    sal_Int32    nPalIndex;
 
 protected:
     void    Detach()    { nPalIndex = -1; }
@@ -59,30 +59,30 @@ protected:
 public:
             TYPEINFO();
             NameOrIndex() { nPalIndex = -1; }
-            NameOrIndex(USHORT nWhich, INT32 nIndex);
-            NameOrIndex(USHORT nWhich,
+            NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex);
+            NameOrIndex(sal_uInt16 nWhich,
                         const String& rName= String());
-            NameOrIndex(USHORT nWhich, SvStream& rIn);
+            NameOrIndex(sal_uInt16 nWhich, SvStream& rIn);
             NameOrIndex(const NameOrIndex& rNameOrIndex);
            ~NameOrIndex() {};
 
     virtual int          operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&    Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&    Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
             String       GetName() const              { return GetValue();   }
             void         SetName(const String& rName) { SetValue(rName);     }
-            INT32        GetIndex() const             { return nPalIndex;    }
-            void         SetIndex(INT32 nIndex)        { nPalIndex = nIndex;  }
-            BOOL         IsIndex() const          { return (nPalIndex >= 0); }
+            sal_Int32        GetIndex() const             { return nPalIndex;    }
+            void         SetIndex(sal_Int32 nIndex)        { nPalIndex = nIndex;  }
+            sal_Bool         IsIndex() const          { return (nPalIndex >= 0); }
 
     /** this static checks if the given NameOrIndex item has a unique name for its value.
         The returned String is a unique name for an item with this value in both given pools.
         Argument pPool2 can be null.
         If returned string equals NameOrIndex->GetName(), the name was already unique.
     */
-    static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults = NULL );
+    static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults = NULL );
 };
 
 #endif
diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx
index e21b45d426dd..a30af2c1a86a 100644
--- a/svx/inc/svx/xlineit0.hxx
+++ b/svx/inc/svx/xlineit0.hxx
@@ -42,16 +42,16 @@ public:
                             XLineStyleItem(XLineStyle = XLINE_SOLID);
                             XLineStyleItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual sal_uInt16          GetValueCount() const;
     XLineStyle              GetValue() const { return (XLineStyle) SfxEnumItem::GetValue(); }
 };
 
diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx
index ced38d815614..97a8d4142bd6 100644
--- a/svx/inc/svx/xlinjoit.hxx
+++ b/svx/inc/svx/xlinjoit.hxx
@@ -43,17 +43,17 @@ public:
                             XLineJointItem( XLineJoint eLineJoint = XLINEJOINT_ROUND );
                             XLineJointItem( SvStream& rIn );
 
-    virtual USHORT           GetVersion( USHORT nFileFormatVersion ) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nFileFormatVersion ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual USHORT          GetValueCount() const;
+    virtual sal_uInt16          GetValueCount() const;
     XLineJoint              GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); }
 };
 
diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx
index d2eb6594c585..2b1da62d6d88 100644
--- a/svx/inc/svx/xlnasit.hxx
+++ b/svx/inc/svx/xlnasit.hxx
@@ -48,8 +48,8 @@ public:
                             XLineAttrSetItem(const XLineAttrSetItem& rAttr,
                                              SfxItemPool* pItemPool);
     virtual SfxPoolItem*    Clone( SfxItemPool* pToPool ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream& rStream, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream& rStream, sal_uInt16 nItemVersion ) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx
index 71af958c588b..ba34121c756b 100644
--- a/svx/inc/svx/xlnclit.hxx
+++ b/svx/inc/svx/xlnclit.hxx
@@ -39,15 +39,15 @@ class SVX_DLLPUBLIC XLineColorItem : public XColorItem
 public:
             TYPEINFO();
             XLineColorItem() {}
-            XLineColorItem(INT32 nIndex, const Color& rTheColor);
+            XLineColorItem(sal_Int32 nIndex, const Color& rTheColor);
             XLineColorItem(const String& rName, const Color& rTheColor);
             XLineColorItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
index 70f8e33aac83..0cfefadb550c 100644
--- a/svx/inc/svx/xlndsit.hxx
+++ b/svx/inc/svx/xlndsit.hxx
@@ -47,7 +47,7 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex
 public:
                             TYPEINFO();
                             XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
-                            XLineDashItem(INT32 nIndex, const XDash& rTheDash);
+                            XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash);
                             XLineDashItem(const String& rName, const XDash& rTheDash);
                             XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
                             XLineDashItem(SfxItemPool* pPool );
@@ -56,11 +56,11 @@ public:
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -72,7 +72,7 @@ public:
     const XDash&            GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue
     void                    SetDashValue(const XDash& rNew)   { aDash = rNew; Detach(); } // SetValue -> SetDashValue
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XLineDashItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx
index c40253a2f4a5..43dafb8e08f5 100644
--- a/svx/inc/svx/xlnedcit.hxx
+++ b/svx/inc/svx/xlnedcit.hxx
@@ -38,13 +38,13 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XLineEndCenterItem(BOOL bEndCenter = FALSE);
+                            XLineEndCenterItem(sal_Bool bEndCenter = sal_False);
                             XLineEndCenterItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx
index 99609e6e55df..1a999f903794 100644
--- a/svx/inc/svx/xlnedit.hxx
+++ b/svx/inc/svx/xlnedit.hxx
@@ -43,7 +43,7 @@ class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex
 
 public:
             TYPEINFO();
-            XLineEndItem(INT32 nIndex = -1);
+            XLineEndItem(sal_Int32 nIndex = -1);
             XLineEndItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
             XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
             XLineEndItem(SfxItemPool* pPool );
@@ -52,11 +52,11 @@ public:
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx
index 1ca29d361178..dcfebeaa997f 100644
--- a/svx/inc/svx/xlnedwit.hxx
+++ b/svx/inc/svx/xlnedwit.hxx
@@ -44,10 +44,10 @@ public:
                             XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT);
                             XLineEndWidthItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx
index df544c9b0d8e..e3f5ddaf97ed 100644
--- a/svx/inc/svx/xlnstcit.hxx
+++ b/svx/inc/svx/xlnstcit.hxx
@@ -38,13 +38,13 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XLineStartCenterItem(BOOL bStartCenter = FALSE);
+                            XLineStartCenterItem(sal_Bool bStartCenter = sal_False);
                             XLineStartCenterItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx
index f360dd3205e4..26f8d092e0ab 100644
--- a/svx/inc/svx/xlnstit.hxx
+++ b/svx/inc/svx/xlnstit.hxx
@@ -43,7 +43,7 @@ class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex
 
 public:
             TYPEINFO();
-            XLineStartItem(INT32 nIndex = -1);
+            XLineStartItem(sal_Int32 nIndex = -1);
             XLineStartItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
             XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
             XLineStartItem(SfxItemPool* pPool );
@@ -52,11 +52,11 @@ public:
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx
index 86b5aa579325..7675ac4ce821 100644
--- a/svx/inc/svx/xlnstwit.hxx
+++ b/svx/inc/svx/xlnstwit.hxx
@@ -43,10 +43,10 @@ public:
             XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT);
             XLineStartWidthItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx
index a79a1c0daba2..91c8e8d87bb9 100644
--- a/svx/inc/svx/xlntrit.hxx
+++ b/svx/inc/svx/xlntrit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XLineTransparenceItem(USHORT nLineTransparence = 0);
+                            XLineTransparenceItem(sal_uInt16 nLineTransparence = 0);
                             XLineTransparenceItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = NULL) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx
index 4649a515c69a..143b786923ff 100644
--- a/svx/inc/svx/xlnwtit.hxx
+++ b/svx/inc/svx/xlnwtit.hxx
@@ -41,10 +41,10 @@ public:
                             XLineWidthItem(long nWidth = 0);
                             XLineWidthItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx
index e17c78cd5ccb..5c7812775afa 100644
--- a/svx/inc/svx/xmlgrhlp.hxx
+++ b/svx/inc/svx/xmlgrhlp.hxx
@@ -85,7 +85,7 @@ private:
     SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const ::rtl::OUString& rPictureStorageName );
     SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName,
                                                       const ::rtl::OUString& rPictureStreamName,
-                                                      BOOL bTruncate );
+                                                      sal_Bool bTruncate );
     SVX_DLLPRIVATE String                      ImplGetGraphicMimeType( const String& rFileName ) const;
     SVX_DLLPRIVATE Graphic                      ImplReadGraphic( const ::rtl::OUString& rPictureStorageName,
                                                  const ::rtl::OUString& rPictureStreamName );
@@ -99,7 +99,7 @@ protected:
                                 ~SvXMLGraphicHelper();
     void                        Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage,
                                       SvXMLGraphicHelperMode eCreateMode,
-                                      BOOL bDirect );
+                                      sal_Bool bDirect );
 
     virtual void SAL_CALL       disposing();
 
@@ -108,7 +108,7 @@ public:
 
     static SvXMLGraphicHelper*  Create( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& rXMLStorage,
                                         SvXMLGraphicHelperMode eCreateMode,
-                                        BOOL bDirect = TRUE );
+                                        sal_Bool bDirect = sal_True );
     static SvXMLGraphicHelper*  Create( SvXMLGraphicHelperMode eCreateMode );
 
     static void                 Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper );
@@ -136,7 +136,7 @@ namespace svx
 
     You should call dispose after you no longer need this component.
 
-    uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == TRUE in
+    uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == sal_True in
     SvXMLGraphicHelper
  */
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
@@ -152,7 +152,7 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementatio
     To write the Pictures stream, you have to call dispose at this component.
     Make sure you call dipose before you commit the parent storage.
 
-    uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == TRUE in
+    uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == sal_True in
     SvXMLGraphicHelper
  */
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
diff --git a/svx/inc/svx/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx
index aa1a38f183bd..47ee75e6bac1 100644
--- a/svx/inc/svx/xmlsecctrl.hxx
+++ b/svx/inc/svx/xmlsecctrl.hxx
@@ -46,10 +46,10 @@ private:
 public:
     SFX_DECL_STATUSBAR_CONTROL();
 
-    XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb );
+    XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb );
     ~XmlSecStatusBarControl();
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rEvt );
     virtual void    Command( const CommandEvent& rCEvt );
     static long     GetDefItemWidth( StatusBar& _rStatusBar );
diff --git a/svx/inc/svx/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx
index 726eb2f83d9c..1d0fca8de220 100644
--- a/svx/inc/svx/xoutbmp.hxx
+++ b/svx/inc/svx/xoutbmp.hxx
@@ -67,24 +67,24 @@ public:
     static BitmapEx     CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev,
                                                  const MapMode& rMapMode, const Size& rLogSize,
                                                  const Point& rPoint, const Size& rSize );
-    static Graphic      MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags );
-    static Animation    MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr );
-    static USHORT       WriteGraphic( const Graphic& rGraphic, String& rFileName,
-                                      const String& rFilterName, const ULONG nFlags = 0L,
+    static Graphic      MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags );
+    static Animation    MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr );
+    static sal_uInt16       WriteGraphic( const Graphic& rGraphic, String& rFileName,
+                                      const String& rFilterName, const sal_uIntPtr nFlags = 0L,
                                       const Size* pMtfSize_100TH_MM = NULL );
     static void         DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt,
                                                const Size& rSize, const BitmapEx& rBmpEx );
     static void         DrawTiledBitmapEx( OutputDevice* pOutDev, const Point& rStartPt, const Size& rGrfSize,
                                            const Rectangle& rTileRect, const BitmapEx& rBmpEx );
 
-    static USHORT       ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
-                                       GraphicFilter& rFilter, const USHORT nFormat,
+    static sal_uInt16       ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
+                                       GraphicFilter& rFilter, const sal_uInt16 nFormat,
                                        const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL );
 
-    static Bitmap       DetectEdges( const Bitmap& rBmp, const BYTE cThreshold );
+    static Bitmap       DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold );
 
-    static Polygon      GetCountour( const Bitmap& rBmp, const ULONG nContourFlags,
-                                     const BYTE cEdgeDetectThreshold = 50,
+    static Polygon      GetCountour( const Bitmap& rBmp, const sal_uIntPtr nContourFlags,
+                                     const sal_uInt8 cEdgeDetectThreshold = 50,
                                      const Rectangle* pWorkRect = NULL );
 };
 
@@ -92,6 +92,6 @@ public:
 // - DitherBitmap -
 // ----------------
 
-SVX_DLLPUBLIC BOOL DitherBitmap( Bitmap& rBitmap );
+SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap );
 
 #endif // _XOUTBMP_HXX
diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx
index 28b7e3dcdd3e..a645494f8ae4 100644
--- a/svx/inc/svx/xpoly.hxx
+++ b/svx/inc/svx/xpoly.hxx
@@ -75,59 +75,59 @@ protected:
     void    CheckReference();
 
     // Hilfsfunktionen fuer Bezierkonvertierung
-    void    SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT);
+    void    SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT);
     void    GenBezArc(const Point& rCenter, long nRx, long nRy,
-                      long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd,
-                      USHORT nQuad, USHORT nFirst);
-    BOOL    CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2);
+                      long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
+                      sal_uInt16 nQuad, sal_uInt16 nFirst);
+    sal_Bool    CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2);
 
 public:
-    XPolygon( USHORT nSize=16, USHORT nResize=16 );
+    XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 );
     XPolygon( const XPolygon& rXPoly );
     XPolygon( const Polygon& rPoly );
     XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 );
     XPolygon( const Point& rCenter, long nRx, long nRy,
-              USHORT nStartAngle = 0, USHORT nEndAngle = 3600,
-              BOOL bClose = TRUE );
+              sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600,
+              sal_Bool bClose = sal_True );
 
     ~XPolygon();
 
-    void        SetSize( USHORT nSize );
-    USHORT      GetSize() const;
+    void        SetSize( sal_uInt16 nSize );
+    sal_uInt16      GetSize() const;
 
-    void        SetPointCount( USHORT nPoints );
-    USHORT      GetPointCount() const;
+    void        SetPointCount( sal_uInt16 nPoints );
+    sal_uInt16      GetPointCount() const;
 
-    void        Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags );
-    void        Insert( USHORT nPos, const XPolygon& rXPoly );
-    void        Insert( USHORT nPos, const Polygon& rPoly );
-    void        Remove( USHORT nPos, USHORT nCount );
+    void        Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags );
+    void        Insert( sal_uInt16 nPos, const XPolygon& rXPoly );
+    void        Insert( sal_uInt16 nPos, const Polygon& rPoly );
+    void        Remove( sal_uInt16 nPos, sal_uInt16 nCount );
     void        Move( long nHorzMove, long nVertMove );
     Rectangle   GetBoundRect() const;
 
-    const Point&    operator[]( USHORT nPos ) const;
-          Point&    operator[]( USHORT nPos );
+    const Point&    operator[]( sal_uInt16 nPos ) const;
+          Point&    operator[]( sal_uInt16 nPos );
     XPolygon&       operator=( const XPolygon& rXPoly );
-    BOOL            operator==( const XPolygon& rXPoly ) const;
-    BOOL            operator!=( const XPolygon& rXPoly ) const;
+    sal_Bool            operator==( const XPolygon& rXPoly ) const;
+    sal_Bool            operator!=( const XPolygon& rXPoly ) const;
 
-    XPolyFlags  GetFlags( USHORT nPos ) const;
-    void        SetFlags( USHORT nPos, XPolyFlags eFlags );
-    BOOL        IsControl(USHORT nPos) const;
-    BOOL        IsSmooth(USHORT nPos) const;
+    XPolyFlags  GetFlags( sal_uInt16 nPos ) const;
+    void        SetFlags( sal_uInt16 nPos, XPolyFlags eFlags );
+    sal_Bool        IsControl(sal_uInt16 nPos) const;
+    sal_Bool        IsSmooth(sal_uInt16 nPos) const;
 
     // Abstand zwischen zwei Punkten
-    double  CalcDistance(USHORT nP1, USHORT nP2);
+    double  CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2);
 
     // Bezierkonvertierungen
-    void CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt);
-    void CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext);
-    void PointsToBezier(USHORT nFirst);
+    void CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt);
+    void CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext);
+    void PointsToBezier(sal_uInt16 nFirst);
 
     // Transformationen
     void Translate(const Point& rTrans);
     void Rotate(const Point& rCenter, double fSin, double fCos);
-    void Rotate(const Point& rCenter, USHORT nAngle);
+    void Rotate(const Point& rCenter, sal_uInt16 nAngle);
     void Scale(double fSx, double fSy);
     void SlantX(long nYRef, double fSin, double fCos);
     void SlantY(long nXRef, double fSin, double fCos);
@@ -160,7 +160,7 @@ protected:
     void    CheckReference();
 
 public:
-                    XPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 );
+                    XPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 );
                     XPolyPolygon( const XPolygon& rXPoly );
                     XPolyPolygon( const XPolyPolygon& rXPolyPoly );
                     XPolyPolygon( const PolyPolygon& rPolyPoly);
@@ -168,31 +168,31 @@ public:
                     ~XPolyPolygon();
 
     void            Insert( const XPolygon& rXPoly,
-                            USHORT nPos = XPOLYPOLY_APPEND );
+                            sal_uInt16 nPos = XPOLYPOLY_APPEND );
     void            Insert( const XPolyPolygon& rXPoly,
-                            USHORT nPos=XPOLYPOLY_APPEND );
-    XPolygon        Remove( USHORT nPos );
-    XPolygon        Replace( const XPolygon& rXPoly, USHORT nPos );
-    const XPolygon& GetObject( USHORT nPos ) const;
+                            sal_uInt16 nPos=XPOLYPOLY_APPEND );
+    XPolygon        Remove( sal_uInt16 nPos );
+    XPolygon        Replace( const XPolygon& rXPoly, sal_uInt16 nPos );
+    const XPolygon& GetObject( sal_uInt16 nPos ) const;
 
     void            Clear();
-    USHORT          Count() const;
+    sal_uInt16          Count() const;
 
     void            Move( long nHorzMove, long nVertMove );
     Rectangle       GetBoundRect() const;
 
-    const XPolygon& operator[]( USHORT nPos ) const
+    const XPolygon& operator[]( sal_uInt16 nPos ) const
                         { return GetObject( nPos ); }
-    XPolygon&       operator[]( USHORT nPos );
+    XPolygon&       operator[]( sal_uInt16 nPos );
 
     XPolyPolygon&   operator=( const XPolyPolygon& rXPolyPoly );
-    BOOL            operator==( const XPolyPolygon& rXPolyPoly ) const;
-    BOOL            operator!=( const XPolyPolygon& rXPolyPoly ) const;
+    sal_Bool            operator==( const XPolyPolygon& rXPolyPoly ) const;
+    sal_Bool            operator!=( const XPolyPolygon& rXPolyPoly ) const;
 
     // Transformationen
     void Translate(const Point& rTrans);
     void Rotate(const Point& rCenter, double fSin, double fCos);
-    void Rotate(const Point& rCenter, USHORT nAngle);
+    void Rotate(const Point& rCenter, sal_uInt16 nAngle);
     void Scale(double fSx, double fSy);
     void SlantX(long nYRef, double fSin, double fCos);
     void SlantY(long nXRef, double fSin, double fCos);
diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx
index 1c8b33cc278d..d9379ced1e68 100644
--- a/svx/inc/svx/xsflclit.hxx
+++ b/svx/inc/svx/xsflclit.hxx
@@ -38,19 +38,19 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
 public:
             TYPEINFO();
             SVX_DLLPRIVATE XSecondaryFillColorItem() {}
-            SVX_DLLPRIVATE XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor);
+            SVX_DLLPRIVATE XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
             XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
             SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    SVX_DLLPRIVATE virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
+    SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
 };
 
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 7ef8e659b08f..721b84a19955 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -216,14 +216,14 @@ protected:
     Table               aTable;
     Table*              pBmpTable;
 
-    BOOL                bTableDirty;
-    BOOL                bBitmapsDirty;
-    BOOL                bOwnPool;
+    sal_Bool                bTableDirty;
+    sal_Bool                bBitmapsDirty;
+    sal_Bool                bOwnPool;
 
                         XPropertyTable( const String& rPath,
                                         XOutdevItemPool* pXPool = NULL,
-                                        USHORT nInitSize = 16,
-                                        USHORT nReSize = 16 );
+                                        sal_uInt16 nInitSize = 16,
+                                        sal_uInt16 nReSize = 16 );
                         XPropertyTable( SvStream& rIn );
     void                Clear();
 
@@ -232,10 +232,10 @@ public:
 
     long                Count() const;
 
-    BOOL                Insert(long nIndex, XPropertyEntry* pEntry);
+    sal_Bool                Insert(long nIndex, XPropertyEntry* pEntry);
     XPropertyEntry*     Replace(long nIndex, XPropertyEntry* pEntry);
-    XPropertyEntry*     Remove(long nIndex, USHORT nDummy);
-    XPropertyEntry*     Get( long nIndex, USHORT nDummy ) const;
+    XPropertyEntry*     Remove(long nIndex, sal_uInt16 nDummy);
+    XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
 
     long                Get(const String& rName);
     Bitmap*             GetBitmap( long nIndex ) const;
@@ -244,15 +244,15 @@ public:
     void                SetName( const String& rString );
     const String&       GetPath() const { return aPath; }
     void                SetPath( const String& rString ) { aPath = rString; }
-    BOOL                IsDirty() const { return bTableDirty && bBitmapsDirty; }
-    void                SetDirty( BOOL bDirty = TRUE )
+    sal_Bool                IsDirty() const { return bTableDirty && bBitmapsDirty; }
+    void                SetDirty( sal_Bool bDirty = sal_True )
                             { bTableDirty = bDirty; bBitmapsDirty = bDirty; }
 
-    virtual BOOL        Load() = 0;
-    virtual BOOL        Save() = 0;
-    virtual BOOL        Create() = 0;
-    virtual BOOL        CreateBitmapsForUI() = 0;
-    virtual Bitmap*     CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0;
+    virtual sal_Bool        Load() = 0;
+    virtual sal_Bool        Save() = 0;
+    virtual sal_Bool        Create() = 0;
+    virtual sal_Bool        CreateBitmapsForUI() = 0;
+    virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
 };
 
 // --------------------
@@ -269,14 +269,14 @@ protected:
     List                aList;
     List*               pBmpList;
 
-    BOOL                bListDirty;
-    BOOL                bBitmapsDirty;
-    BOOL                bOwnPool;
+    sal_Bool                bListDirty;
+    sal_Bool                bBitmapsDirty;
+    sal_Bool                bOwnPool;
 
                         XPropertyList(  const String& rPath,
                                         XOutdevItemPool* pXPool = NULL,
-                                        USHORT nInitSize = 16,
-                                        USHORT nReSize = 16 );
+                                        sal_uInt16 nInitSize = 16,
+                                        sal_uInt16 nReSize = 16 );
                         XPropertyList( SvStream& rIn );
     void                Clear();
 
@@ -287,8 +287,8 @@ public:
 
     void                Insert( XPropertyEntry* pEntry, long nIndex = LIST_APPEND );
     XPropertyEntry*     Replace( XPropertyEntry* pEntry, long nIndex );
-    XPropertyEntry*     Remove( long nIndex, USHORT nDummy );
-    XPropertyEntry*     Get( long nIndex, USHORT nDummy ) const;
+    XPropertyEntry*     Remove( long nIndex, sal_uInt16 nDummy );
+    XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
 
     long                Get(const String& rName);
     Bitmap*             GetBitmap( long nIndex ) const;
@@ -297,15 +297,15 @@ public:
     void                SetName( const String& rString );
     const String&       GetPath() const { return aPath; }
     void                SetPath( const String& rString ) { aPath = rString; }
-    BOOL                IsDirty() const { return bListDirty && bBitmapsDirty; }
-    void                SetDirty( BOOL bDirty = TRUE )
+    sal_Bool                IsDirty() const { return bListDirty && bBitmapsDirty; }
+    void                SetDirty( sal_Bool bDirty = sal_True )
                             { bListDirty = bDirty; bBitmapsDirty = bDirty; }
 
-    virtual BOOL        Load() = 0;
-    virtual BOOL        Save() = 0;
-    virtual BOOL        Create() = 0;
-    virtual BOOL        CreateBitmapsForUI() = 0;
-    virtual Bitmap*     CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0;
+    virtual sal_Bool        Load() = 0;
+    virtual sal_Bool        Save() = 0;
+    virtual sal_Bool        Create() = 0;
+    virtual sal_Bool        CreateBitmapsForUI() = 0;
+    virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
 };
 
 // ------------------
@@ -317,8 +317,8 @@ class SVX_DLLPUBLIC XColorTable : public XPropertyTable
 public:
                     XColorTable( const String& rPath,
                                  XOutdevItemPool* pXPool = NULL,
-                                 USHORT nInitSize = 16,
-                                 USHORT nReSize = 16 );
+                                 sal_uInt16 nInitSize = 16,
+                                 sal_uInt16 nReSize = 16 );
     virtual         ~XColorTable();
 
     using XPropertyTable::Replace;
@@ -328,11 +328,11 @@ public:
     using XPropertyTable::Get;
     XColorEntry*    GetColor(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 
     static XColorTable* GetStdColorTable();
 };
@@ -346,8 +346,8 @@ class XColorList : public XPropertyList
 public:
                     XColorList( const String& rPath,
                                 XOutdevItemPool* pXPool = NULL,
-                                USHORT nInitSize = 16,
-                                USHORT nReSize = 16 );
+                                sal_uInt16 nInitSize = 16,
+                                sal_uInt16 nReSize = 16 );
     virtual         ~XColorList();
 
     using XPropertyList::Replace;
@@ -357,11 +357,11 @@ public:
     using XPropertyList::Get;
     XColorEntry*    GetColor(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // --------------------
@@ -373,8 +373,8 @@ class XLineEndTable : public XPropertyTable
 public:
                     XLineEndTable( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual         ~XLineEndTable();
 
     using XPropertyTable::Replace;
@@ -384,11 +384,11 @@ public:
     using XPropertyTable::Get;
     XLineEndEntry*  GetLineEnd(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -415,11 +415,11 @@ public:
     using XPropertyList::Get;
     XLineEndEntry* GetLineEnd(long nIndex) const;
 
-    virtual BOOL Load();
-    virtual BOOL Save();
-    virtual BOOL Create();
-    virtual BOOL CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+    virtual sal_Bool Load();
+    virtual sal_Bool Save();
+    virtual sal_Bool Create();
+    virtual sal_Bool CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // --------------------
@@ -431,8 +431,8 @@ class XDashTable : public XPropertyTable
 public:
                     XDashTable( const String& rPath,
                                 XOutdevItemPool* pXPool = NULL,
-                                USHORT nInitSize = 16,
-                                USHORT nReSize = 16 );
+                                sal_uInt16 nInitSize = 16,
+                                sal_uInt16 nReSize = 16 );
     virtual         ~XDashTable();
 
     using XPropertyTable::Replace;
@@ -442,11 +442,11 @@ public:
     using XPropertyTable::Get;
     XDashEntry*     GetDash(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -473,11 +473,11 @@ public:
     using XPropertyList::Get;
     XDashEntry* GetDash(long nIndex) const;
 
-    virtual BOOL Load();
-    virtual BOOL Save();
-    virtual BOOL Create();
-    virtual BOOL CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+    virtual sal_Bool Load();
+    virtual sal_Bool Save();
+    virtual sal_Bool Create();
+    virtual sal_Bool CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // --------------------
@@ -489,8 +489,8 @@ class XHatchTable : public XPropertyTable
 public:
                     XHatchTable( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual         ~XHatchTable();
 
     using XPropertyTable::Replace;
@@ -500,11 +500,11 @@ public:
     using XPropertyTable::Get;
     XHatchEntry*    GetHatch(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -531,11 +531,11 @@ public:
     using XPropertyList::Get;
     XHatchEntry* GetHatch(long nIndex) const;
 
-    virtual BOOL Load();
-    virtual BOOL Save();
-    virtual BOOL Create();
-    virtual BOOL CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+    virtual sal_Bool Load();
+    virtual sal_Bool Save();
+    virtual sal_Bool Create();
+    virtual sal_Bool CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // ---------------------
@@ -547,8 +547,8 @@ class XGradientTable : public XPropertyTable
 public:
                     XGradientTable( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual         ~XGradientTable();
 
     using XPropertyTable::Replace;
@@ -558,11 +558,11 @@ public:
     using XPropertyTable::Get;
     XGradientEntry* GetGradient(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -589,11 +589,11 @@ public:
     using XPropertyList::Get;
     XGradientEntry* GetGradient(long nIndex) const;
 
-    virtual BOOL Load();
-    virtual BOOL Save();
-    virtual BOOL Create();
-    virtual BOOL CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+    virtual sal_Bool Load();
+    virtual sal_Bool Save();
+    virtual sal_Bool Create();
+    virtual sal_Bool CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // ---------------------
@@ -605,8 +605,8 @@ class XBitmapTable : public XPropertyTable
 public:
                     XBitmapTable( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual         ~XBitmapTable();
 
     using XPropertyTable::Replace;
@@ -616,11 +616,11 @@ public:
     using XPropertyTable::Get;
     XBitmapEntry*   GetBitmap(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -632,8 +632,8 @@ class SVX_DLLPUBLIC XBitmapList : public XPropertyList
 public:
                     XBitmapList( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual         ~XBitmapList();
 
     using XPropertyList::Replace;
@@ -643,11 +643,11 @@ public:
     using XPropertyList::Get;
     XBitmapEntry*   GetBitmap(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 #endif // _XTABLE_HXX
diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx
index dc7013853de4..73ed4878cee7 100644
--- a/svx/inc/svx/xtextit0.hxx
+++ b/svx/inc/svx/xtextit0.hxx
@@ -45,12 +45,12 @@ public:
                             XFormTextStyleItem(XFormTextStyle = XFT_NONE);
                             XFormTextStyleItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const;
     XFormTextStyle          GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); }
     // #FontWork#
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 /*************************************************************************
@@ -63,10 +63,10 @@ class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFormTextHideFormItem(BOOL bHide = FALSE);
+                            XFormTextHideFormItem(sal_Bool bHide = sal_False);
                             XFormTextHideFormItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
index 7788bb1023f1..24b1c8607dab 100644
--- a/svx/inc/svx/zoom_def.hxx
+++ b/svx/inc/svx/zoom_def.hxx
@@ -1,8 +1,8 @@
 #ifndef _SVX_ZOOM_DEF_HXX
 #define _SVX_ZOOM_DEF_HXX
 
-#define ZOOMBTN_OPTIMAL     ((USHORT)0x0001)
-#define ZOOMBTN_PAGEWIDTH   ((USHORT)0x0002)
-#define ZOOMBTN_WHOLEPAGE   ((USHORT)0x0004)
+#define ZOOMBTN_OPTIMAL     ((sal_uInt16)0x0001)
+#define ZOOMBTN_PAGEWIDTH   ((sal_uInt16)0x0002)
+#define ZOOMBTN_WHOLEPAGE   ((sal_uInt16)0x0004)
 
 #endif
diff --git a/svx/inc/svx/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx
index ea3ecdb33025..0d790b23f155 100644
--- a/svx/inc/svx/zoomctrl.hxx
+++ b/svx/inc/svx/zoomctrl.hxx
@@ -37,20 +37,20 @@
 class SVX_DLLPUBLIC SvxZoomStatusBarControl : public SfxStatusBarControl
 {
 private:
-    USHORT  nZoom;
-    USHORT  nValueSet;
+    sal_uInt16  nZoom;
+    sal_uInt16  nValueSet;
 
 public:
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rEvt );
     virtual void    Command( const CommandEvent& rCEvt );
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxZoomStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxZoomStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static  ULONG   GetDefItemWidth(const StatusBar& rStb);
+    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
 
 };
 
diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx
index a1a0eeebffbe..348e9ebe869a 100644
--- a/svx/inc/svx/zoomitem.hxx
+++ b/svx/inc/svx/zoomitem.hxx
@@ -48,20 +48,20 @@ enum SvxZoomType
 
 class SVX_DLLPUBLIC SvxZoomItem: public SfxUInt16Item
 {
-    USHORT                  nValueSet;  // erlaubte Werte (siehe #defines unten)
+    sal_uInt16                  nValueSet;  // erlaubte Werte (siehe #defines unten)
     SvxZoomType             eType;
 
 public:
     TYPEINFO();
 
     SvxZoomItem( SvxZoomType eZoomType = SVX_ZOOM_PERCENT,
-                 USHORT nVal = 0, USHORT nWhich = SID_ATTR_ZOOM );
+                 sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM );
     SvxZoomItem( const SvxZoomItem& );
     ~SvxZoomItem();
 
-    void                    SetValueSet( USHORT nValues ) { nValueSet = nValues; }
-    USHORT                  GetValueSet() const { return nValueSet; }
-    FASTBOOL                IsValueAllowed( USHORT nValue ) const
+    void                    SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; }
+    sal_uInt16                  GetValueSet() const { return nValueSet; }
+    FASTBOOL                IsValueAllowed( sal_uInt16 nValue ) const
                             { return nValue == ( nValue & nValueSet ); }
 
     SvxZoomType             GetType() const { return eType; }
@@ -69,11 +69,11 @@ public:
                             { eType = eNewType; }
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStrm, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream& rStrm , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStrm, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 //------------------------------------------------------------------------
diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx
index eef8ec40ccac..46032056fc30 100644
--- a/svx/inc/svx/zoomsliderctrl.hxx
+++ b/svx/inc/svx/zoomsliderctrl.hxx
@@ -42,20 +42,20 @@ private:
     struct SvxZoomSliderControl_Impl;
     SvxZoomSliderControl_Impl* mpImpl;
 
-    USHORT Offset2Zoom( long nOffset ) const;
-    long Zoom2Offset( USHORT nZoom ) const;
+    sal_uInt16 Offset2Zoom( long nOffset ) const;
+    long Zoom2Offset( sal_uInt16 nZoom ) const;
 
 public:
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb );
+    SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb );
     ~SvxZoomSliderControl();
 
-    virtual void  StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void  StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void  Paint( const UserDrawEvent& rEvt );
-    virtual BOOL  MouseButtonDown( const MouseEvent & );
-    virtual BOOL  MouseMove( const MouseEvent & rEvt );
+    virtual sal_Bool  MouseButtonDown( const MouseEvent & );
+    virtual sal_Bool  MouseMove( const MouseEvent & rEvt );
 };
 
 #endif
diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx
index 163e1c8ec155..93b1dedb1170 100644
--- a/svx/inc/svx/zoomslideritem.hxx
+++ b/svx/inc/svx/zoomslideritem.hxx
@@ -39,28 +39,28 @@
 class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item
 {
     com::sun::star::uno::Sequence < sal_Int32 > maValues;
-    USHORT mnMinZoom;
-    USHORT mnMaxZoom;
+    sal_uInt16 mnMinZoom;
+    sal_uInt16 mnMaxZoom;
 
 public:
     TYPEINFO();
 
-    SvxZoomSliderItem( USHORT nCurrentZoom = 100, USHORT nMinZoom = 20, USHORT nMaxZoom = 600, USHORT nWhich = SID_ATTR_ZOOMSLIDER );
+    SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER );
     SvxZoomSliderItem( const SvxZoomSliderItem& );
     ~SvxZoomSliderItem();
 
     void AddSnappingPoint( sal_Int32 nNew );
     const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const;
-    USHORT GetMinZoom() const {return mnMinZoom;}
-    USHORT GetMaxZoom() const {return mnMaxZoom;}
+    sal_uInt16 GetMinZoom() const {return mnMinZoom;}
+    sal_uInt16 GetMaxZoom() const {return mnMaxZoom;}
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStrm, USHORT nVersion ) const;                       // leer
-    virtual SvStream&       Store( SvStream& rStrm , USHORT nItemVersion ) const;                   // leer
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );   // leer
+    virtual SfxPoolItem*    Create( SvStream& rStrm, sal_uInt16 nVersion ) const;                       // leer
+    virtual SvStream&       Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const;                   // leer
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );   // leer
 };
 
 //------------------------------------------------------------------------
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index aec07042e1fc..21c47230df48 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -139,8 +139,8 @@ private:
 
     FindTextFieldControl* m_pFindTextFieldControl;
 
-    USHORT m_nDownSearchId; // item position of findbar
-    USHORT m_nUpSearchId;   // item position of findbar
+    sal_uInt16 m_nDownSearchId; // item position of findbar
+    sal_uInt16 m_nUpSearchId;   // item position of findbar
 
 };
 
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index a0af47a95cdd..7b7f85110558 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -44,15 +44,15 @@ class ImpXPolygon
 {
 public:
     Point*          pPointAry;
-    BYTE*           pFlagAry;
+    sal_uInt8*           pFlagAry;
     Point*          pOldPointAry;
-    BOOL            bDeleteOldPoints;
-    USHORT          nSize;
-    USHORT          nResize;
-    USHORT          nPoints;
-    USHORT          nRefCount;
+    sal_Bool            bDeleteOldPoints;
+    sal_uInt16          nSize;
+    sal_uInt16          nResize;
+    sal_uInt16          nPoints;
+    sal_uInt16          nRefCount;
 
-    ImpXPolygon( USHORT nInitSize = 16, USHORT nResize=16 );
+    ImpXPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize=16 );
     ImpXPolygon( const ImpXPolygon& rImpXPoly );
     ~ImpXPolygon();
 
@@ -64,13 +64,13 @@ public:
         if ( bDeleteOldPoints )
         {
             delete[] (char*)pOldPointAry;
-            bDeleteOldPoints = FALSE;
+            bDeleteOldPoints = sal_False;
         }
     }
 
-    void Resize( USHORT nNewSize, BOOL bDeletePoints = TRUE );
-    void InsertSpace( USHORT nPos, USHORT nCount );
-    void Remove( USHORT nPos, USHORT nCount );
+    void Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints = sal_True );
+    void InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount );
+    void Remove( sal_uInt16 nPos, sal_uInt16 nCount );
 };
 
 
@@ -89,9 +89,9 @@ class ImpXPolyPolygon
 {
 public:
     XPolygonList aXPolyList;
-    USHORT       nRefCount;
+    sal_uInt16       nRefCount;
 
-                 ImpXPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 ) :
+                 ImpXPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ) :
                     aXPolyList( 1024, nInitSize, nResize )
                     { nRefCount = 1; }
                 ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly );
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 1c342f5dbfba..92633a105323 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -105,23 +105,23 @@ namespace accessibility
         SfxBroadcaster&         GetBroadcaster() const { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); }
 
         // SvxTextForwarder
-        USHORT          GetParagraphCount() const { return 1; }
-        USHORT          GetTextLen( USHORT /*nParagraph*/ ) const { return 0; }
+        sal_uInt16          GetParagraphCount() const { return 1; }
+        sal_uInt16          GetTextLen( sal_uInt16 /*nParagraph*/ ) const { return 0; }
         String          GetText( const ESelection& /*rSel*/ ) const { return String(); }
-        SfxItemSet      GetAttribs( const ESelection& /*rSel*/, BOOL /*bOnlyHardAttrib*/ = 0 ) const
+        SfxItemSet      GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const
         {
             // AW: Very dangerous: The former implementation used a SfxItemPool created on the
             // fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
             // a deleted Pool by design.
             return SfxItemSet(SdrObject::GetGlobalDrawObjectItemPool());
         }
-        SfxItemSet      GetParaAttribs( USHORT /*nPara*/ ) const { return GetAttribs(ESelection()); }
-        void            SetParaAttribs( USHORT /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
+        SfxItemSet      GetParaAttribs( sal_uInt16 /*nPara*/ ) const { return GetAttribs(ESelection()); }
+        void            SetParaAttribs( sal_uInt16 /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
         void            RemoveAttribs( const ESelection& /*rSelection*/, sal_Bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ){}
-        void            GetPortions( USHORT /*nPara*/, SvUShorts& /*rList*/ ) const {}
+        void            GetPortions( sal_uInt16 /*nPara*/, SvUShorts& /*rList*/ ) const {}
 
-        USHORT          GetItemState( const ESelection& /*rSel*/, USHORT /*nWhich*/ ) const { return 0; }
-        USHORT          GetItemState( USHORT /*nPara*/, USHORT /*nWhich*/ ) const { return 0; }
+        sal_uInt16          GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
+        sal_uInt16          GetItemState( sal_uInt16 /*nPara*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
 
         SfxItemPool*    GetPool() const { return NULL; }
 
@@ -133,35 +133,35 @@ namespace accessibility
         const SfxItemSet * GetEmptyItemSetPtr() { return 0; }
 
         void        AppendParagraph() {}
-        xub_StrLen  AppendTextPortion( USHORT /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
+        xub_StrLen  AppendTextPortion( sal_uInt16 /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
 
         //XTextCopy
         void        CopyText(const SvxTextForwarder& ){}
 
-        XubString       CalcFieldValue( const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
+        XubString       CalcFieldValue( const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
         {
             return  XubString();
         }
-        void            FieldClicked( const SvxFieldItem&, USHORT, xub_StrLen ) {;}
+        void            FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen ) {;}
 
-        BOOL            IsValid() const { return sal_True; }
+        sal_Bool            IsValid() const { return sal_True; }
 
         void            SetNotifyHdl( const Link& ) {}
-        LanguageType    GetLanguage( USHORT, USHORT ) const { return LANGUAGE_DONTKNOW; }
-        USHORT          GetFieldCount( USHORT ) const { return 0; }
-        EFieldInfo      GetFieldInfo( USHORT, USHORT ) const { return EFieldInfo(); }
-        EBulletInfo     GetBulletInfo( USHORT ) const { return EBulletInfo(); }
-        Rectangle       GetCharBounds( USHORT, USHORT ) const { return Rectangle(); }
-        Rectangle       GetParaBounds( USHORT ) const { return Rectangle(); }
+        LanguageType    GetLanguage( sal_uInt16, sal_uInt16 ) const { return LANGUAGE_DONTKNOW; }
+        sal_uInt16          GetFieldCount( sal_uInt16 ) const { return 0; }
+        EFieldInfo      GetFieldInfo( sal_uInt16, sal_uInt16 ) const { return EFieldInfo(); }
+        EBulletInfo     GetBulletInfo( sal_uInt16 ) const { return EBulletInfo(); }
+        Rectangle       GetCharBounds( sal_uInt16, sal_uInt16 ) const { return Rectangle(); }
+        Rectangle       GetParaBounds( sal_uInt16 ) const { return Rectangle(); }
         MapMode         GetMapMode() const { return MapMode(); }
         OutputDevice*   GetRefDevice() const { return NULL; }
-        sal_Bool        GetIndexAtPoint( const Point&, USHORT&, USHORT& ) const { return sal_False; }
-        sal_Bool        GetWordIndices( USHORT, USHORT, USHORT&, USHORT& ) const { return sal_False; }
-        sal_Bool        GetAttributeRun( USHORT&, USHORT&, USHORT, USHORT ) const { return sal_False; }
-        USHORT          GetLineCount( USHORT nPara ) const { return nPara == 0 ? 1 : 0; }
-        USHORT          GetLineLen( USHORT, USHORT ) const { return 0; }
-        void            GetLineBoundaries( /*out*/USHORT & rStart, /*out*/USHORT & rEnd, USHORT /*nParagraph*/, USHORT /*nLine*/ ) const  { rStart = rEnd = 0; }
-        USHORT          GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const   { return 0; }
+        sal_Bool        GetIndexAtPoint( const Point&, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
+        sal_Bool        GetWordIndices( sal_uInt16, sal_uInt16, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
+        sal_Bool        GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const { return sal_False; }
+        sal_uInt16          GetLineCount( sal_uInt16 nPara ) const { return nPara == 0 ? 1 : 0; }
+        sal_uInt16          GetLineLen( sal_uInt16, sal_uInt16 ) const { return 0; }
+        void            GetLineBoundaries( /*out*/sal_uInt16 & rStart, /*out*/sal_uInt16 & rEnd, sal_uInt16 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const  { rStart = rEnd = 0; }
+        sal_uInt16          GetLineNumberAtIndex( sal_uInt16 /*nPara*/, sal_uInt16 /*nIndex*/ ) const   { return 0; }
 
         // the following two methods would, strictly speaking, require
         // a switch to a real EditSource, too. Fortunately, the
@@ -173,9 +173,9 @@ namespace accessibility
         // shapes).
         sal_Bool        Delete( const ESelection& ) { return sal_False; }
         sal_Bool        InsertText( const String&, const ESelection& ) { return sal_False; }
-        sal_Bool        QuickFormatDoc( BOOL ) { return sal_True; }
-        sal_Int16       GetDepth( USHORT ) const { return -1; }
-        sal_Bool        SetDepth( USHORT, sal_Int16 ) { return sal_True; }
+        sal_Bool        QuickFormatDoc( sal_Bool ) { return sal_True; }
+        sal_Int16       GetDepth( sal_uInt16 ) const { return -1; }
+        sal_Bool        SetDepth( sal_uInt16, sal_Int16 ) { return sal_True; }
 
         Rectangle       GetVisArea() const { return Rectangle(); }
         Point           LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const { return rPoint; }
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 82c522e1b0ff..76d9ae56dfba 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -179,7 +179,7 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent(  )
         Window* pTabPage = mpFrameSel->GetParent();
         sal_Int32 nChildren = pTabPage->GetChildCount();
         for( nIdx = 0; nIdx < nChildren; ++nIdx )
-            if( pTabPage->GetChild( static_cast< USHORT >( nIdx ) ) == mpFrameSel )
+            if( pTabPage->GetChild( static_cast< sal_uInt16 >( nIdx ) ) == mpFrameSel )
                 break;
     }
     else
@@ -619,7 +619,7 @@ void    AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus)
     aEvent.FocusFlags = 0;
     if(bGetFocus)
     {
-        USHORT nFocusFlags = mpFrameSel->GetGetFocusFlags();
+        sal_uInt16 nFocusFlags = mpFrameSel->GetGetFocusFlags();
         if(nFocusFlags&GETFOCUS_TAB)
             aEvent.FocusFlags |= AwtFocusChangeReason::TAB;
         if(nFocusFlags&GETFOCUS_CURSOR)
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 4c1869f6997a..0d255ed5933f 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -254,7 +254,7 @@ void AccessibleShape::UpdateStates (void)
     // XXX fix_me this has to be done with an extra interface later on
     if ( m_pShape && maShapeTreeInfo.GetSdrView() )
     {
-        bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == TRUE;
+        bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == sal_True;
     }
 
     if (bShapeIsSelected)
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 25bed87a23ad..4b3d2eab45fd 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -576,7 +576,7 @@ namespace accessibility
                         DBG_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!");
                     }
 
-                    USHORT nMaxValidParaIndex( static_cast< USHORT >( GetTextForwarder().GetParagraphCount() ) - 1 );
+                    sal_uInt16 nMaxValidParaIndex( static_cast< sal_uInt16 >( GetTextForwarder().GetParagraphCount() ) - 1 );
 
                     // notify all affected paragraphs (TODO: may be suboptimal,
                     // since some paragraphs might stay selected)
@@ -861,7 +861,7 @@ namespace accessibility
                 DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX,
                            "AccessibleTextHelper_Impl::UpdateVisibleChildren: index value overflow");
 
-                aTmpBB = rCacheTF.GetParaBounds( static_cast< USHORT >( nCurrPara ) );
+                aTmpBB = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( nCurrPara ) );
 
                 // convert to screen coordinates
                 aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF );
@@ -1723,7 +1723,7 @@ namespace accessibility
             DBG_ASSERT(nChild >= 0 && nChild <= USHRT_MAX,
                        "AccessibleTextHelper_Impl::getAccessibleAt: index value overflow");
 
-            Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< USHORT > (nChild) ) );
+            Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< sal_uInt16 > (nChild) ) );
 
             if( aParaBounds.IsInside( aLogPoint ) )
                 return getAccessibleChild( nChild - mnFirstVisibleChild + GetStartIndex() );
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 0119e7c71cbf..5ffd4e9cd45a 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -558,7 +558,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
     svtools::ColorConfig aColorConfig;
-    UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+    sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
     return static_cast<sal_Int32>(nColor);
 }
 
@@ -568,7 +568,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
 sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
+    sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
 
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index c1509eacc843..c0e49e4f78b1 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -100,9 +100,9 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::
     ensureAlive();
 
     uno::Reference< accessibility::XAccessible >    xRet;
-    const USHORT nItemId = sal::static_int_cast<USHORT>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
+    const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
 
-    if( USHORT(-1) != nItemId )
+    if( sal_uInt16(-1) != nItemId )
     {
         if ( !m_pTable )
             m_pTable = new SvxShowCharSetAcc(this);
@@ -249,7 +249,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
 // - SvxShowCharSetItem -
 // ----------------
 
-SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*  _pParent,USHORT _nPos ) :
+SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*  _pParent,sal_uInt16 _nPos ) :
     mrParent( rParent )
     ,mnId( _nPos )
     ,m_pItem(NULL)
@@ -333,7 +333,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper,
 sal_Bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException)
 {
     return m_pParent && m_pParent->getCharSetControl()->IsSelected(
-        sal::static_int_cast<USHORT>(nAccessibleChildIndex));
+        sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex));
 }
 // -----------------------------------------------------------------------------
         // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
@@ -385,7 +385,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce
     OExternalLockGuard aGuard( this );
     ensureAlive();
     uno::Reference< accessibility::XAccessible >    xRet;
-    SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< USHORT >( i ) );
+    SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< sal_uInt16 >( i ) );
 
     if( pItem )
     {
@@ -483,10 +483,10 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce
     ensureAlive();
 
     uno::Reference< accessibility::XAccessible >    xRet;
-    const USHORT nItemId = sal::static_int_cast<USHORT>(
+    const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(
         m_pParent->getCharSetControl()->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
 
-    if( USHORT(-1) != nItemId )
+    if( sal_uInt16(-1) != nItemId )
     {
         SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( nItemId );
         xRet = pItem->GetAccessible();
@@ -590,7 +590,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In
     OExternalLockGuard aGuard( this );
     ensureAlive();
     ::svx::SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem(
-        sal::static_int_cast<USHORT>(getAccessibleIndex(nRow,nColumn) ));
+        sal::static_int_cast<sal_uInt16>(getAccessibleIndex(nRow,nColumn) ));
     if ( !pItem  )
         throw IndexOutOfBoundsException();
     return pItem->GetAccessible();
@@ -622,14 +622,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
-    return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<USHORT>(nChildIndex));
+    return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
 }
 // -----------------------------------------------------------------------------
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
-    return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<USHORT>(nChildIndex));
+    return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
 }
 // -----------------------------------------------------------------------------
 
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 3545805f4966..0781ade6c97a 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -348,8 +348,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
 
         // pShape2d Umwandeln in Szene mit 3D Objekt
         E3dDefaultAttributes a3DDefaultAttr;
-        a3DDefaultAttr.SetDefaultLatheCharacterMode( TRUE );
-        a3DDefaultAttr.SetDefaultExtrudeCharacterMode( TRUE );
+        a3DDefaultAttr.SetDefaultLatheCharacterMode( sal_True );
+        a3DDefaultAttr.SetDefaultExtrudeCharacterMode( sal_True );
 
         E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
 
@@ -370,7 +370,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
         {
             aSet.Put( XLineStyleItem( XLINE_SOLID ) );
             aSet.Put( XFillStyleItem ( XFILL_NONE ) );
-            aSet.Put( Svx3DDoubleSidedItem( TRUE ) );
+            aSet.Put( Svx3DDoubleSidedItem( sal_True ) );
         }
         else
         {
@@ -410,7 +410,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             }
             else
             {
-                SdrObject* pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE );
+                SdrObject* pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False );
                 SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
                 if ( pPath )
                     aPolyPoly = pPath->GetPathPoly();
@@ -516,7 +516,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             double fW = rVolume.getWidth();
             double fH = rVolume.getHeight();
 
-            rCamera.SetAutoAdjustProjection( FALSE );
+            rCamera.SetAutoAdjustProjection( sal_False );
             rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH);
             basegfx::B3DPoint aLookAt( 0.0, 0.0, 0.0 );
             basegfx::B3DPoint aCamPos( 0.0, 0.0, 100.0 );
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index ae7a1398c9e7..c20360db7c4b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -316,7 +316,7 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende
                     nShearWink = -nShearWink;
                     nTan = -nTan;
                 }
-                pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, FALSE);
+                pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False);
             }
             if( nRotateAngle )
             {
@@ -399,7 +399,7 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng
                     nShearWink = -nShearWink;
                     nTan = -nTan;
                 }
-                pObj->Shear( aRect.Center(), nShearWink, nTan, FALSE);
+                pObj->Shear( aRect.Center(), nShearWink, nTan, sal_False);
             }
             sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle();
             if( nRotateAngle )
@@ -435,7 +435,7 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng
                 }
                 else
                 {
-                    pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE );
+                    pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False );
                     SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
                     if ( pPath )
                         aPP = pPath->GetPathPoly();
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 5a24cb1fd75d..0af22d94334b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -239,7 +239,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
         if ( rText.getLength() )
         {
             // generating vcl/font
-            USHORT nScriptType = i18n::ScriptType::LATIN;
+            sal_uInt16 nScriptType = i18n::ScriptType::LATIN;
             Reference< i18n::XBreakIterator > xBI( EnhancedCustomShapeFontWork::GetBreakIterator() );
             if ( xBI.is() )
             {
@@ -254,7 +254,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                         nScriptType = i18n::ScriptType::LATIN;
                 }
             }
-            UINT16 nFntItm = EE_CHAR_FONTINFO;
+            sal_uInt16 nFntItm = EE_CHAR_FONTINFO;
             if ( nScriptType == i18n::ScriptType::COMPLEX )
                 nFntItm = EE_CHAR_FONTINFO_CTL;
             else if ( nScriptType == i18n::ScriptType::ASIAN )
@@ -300,7 +300,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                 {
                     FWCharacterData aCharacterData;
                     rtl::OUString aCharText( (sal_Unicode)rText[ i ] );
-                    if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) )
+                    if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) )
                     {
                         sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText, 0, STRING_LEN );
                         std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin();
@@ -358,7 +358,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                     aVirDev.SetFont( aFont );
                 }
                 FWCharacterData aCharacterData;
-                if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) )
+                if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) )
                 {
                     aParagraphIter->vCharacters.push_back( aCharacterData );
                 }
@@ -368,7 +368,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                 for ( i = 0; i < rText.getLength(); i++ )
                 {
                     FWCharacterData aCharacterData;
-                    if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, i, 1, TRUE, nWidth, pDXArry ) )
+                    if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, i, 1, sal_True, nWidth, pDXArry ) )
                     {
                         std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin();
                         std::vector< PolyPolygon >::iterator aOutlineIEnd  = aCharacterData.vOutlines.end();
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 4cec80db354d..f0879be033ee 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -53,7 +53,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem);
 |*
 \************************************************************************/
 
-SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     m_aSubTbxResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" ) )
 {
@@ -113,7 +113,7 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBo
 |*
 \************************************************************************/
 
-void SvxTbxCtlCustomShapes::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState )
 {
     SfxToolBoxControl::StateChanged( nSID, eState, pState );
@@ -146,7 +146,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void SvxTbxCtlCustomShapes::Select( BOOL /*bMod1*/ )
+void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ )
 {
      if ( m_aCommand.getLength() > 0 )
     {
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 6e021ce20d3d..22dcdcc3a1be 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -38,7 +38,7 @@ namespace svx {
   -----------------------------------------------------------------------*/
 SpellDialogChildWindow::SpellDialogChildWindow (
     Window* _pParent,
-    USHORT nId,
+    sal_uInt16 nId,
     SfxBindings* pBindings,
     SfxChildWinInfo* /*pInfo*/)
     : SfxChildWindow (_pParent, nId)
@@ -52,7 +52,7 @@ SpellDialogChildWindow::SpellDialogChildWindow (
                                             this );
     pWindow = m_pAbstractSpellDialog->GetWindow();
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
-    SetHideNotDelete (TRUE);
+    SetHideNotDelete (sal_True);
 }
 /*-------------------------------------------------------------------------
 
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index d010109d34b3..9c2a5fc9a3bb 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -61,7 +61,7 @@
              ( pMinG[i] <= nG ) && ( pMaxG[i] >= nG ) &&            \
              ( pMinB[i] <= nB ) && ( pMaxB[i] >= nB ) )             \
         {                                                           \
-            aCol = pDstCols[i]; bReplace = TRUE; break;             \
+            aCol = pDstCols[i]; bReplace = sal_True; break;             \
         }                                                           \
     }                                                               \
 }
@@ -186,16 +186,16 @@ void MaskSet::onEditColor()
 class MaskData
 {
     SvxBmpMask*     pMask;
-    BOOL            bIsReady;
-    BOOL            bExecState;
+    sal_Bool            bIsReady;
+    sal_Bool            bExecState;
     SfxBindings&    rBindings;
 
 public:
                 MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind );
 
-    BOOL        IsCbxReady() const { return bIsReady; }
-    void        SetExecState( BOOL bState ) { bExecState = bState; }
-    BOOL        IsExecReady() const { return bExecState; }
+    sal_Bool        IsCbxReady() const { return bIsReady; }
+    void        SetExecState( sal_Bool bState ) { bExecState = bState; }
+    sal_Bool        IsExecReady() const { return bExecState; }
 
                 DECL_LINK( PipetteHdl, ToolBox* pTbx );
                 DECL_LINK( CbxHdl, CheckBox* pCbx );
@@ -209,8 +209,8 @@ public:
 MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) :
 
     pMask       ( pBmpMask ),
-    bIsReady    ( FALSE ),
-    bExecState  ( FALSE ),
+    bIsReady    ( sal_False ),
+    bExecState  ( sal_False ),
     rBindings   ( rBind )
 
 {
@@ -257,7 +257,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx )
         pSet->SelectItem( 1 );
         pSet->Select();
 
-        pMask->aTbxPipette.CheckItem( TBI_PIPETTE, TRUE );
+        pMask->aTbxPipette.CheckItem( TBI_PIPETTE, sal_True );
         PipetteHdl( &( pMask->aTbxPipette ) );
     }
 
@@ -343,7 +343,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
 
 IMPL_LINK( MaskData, ExecHdl, PushButton*, EMPTYARG )
 {
-    SfxBoolItem aBItem( SID_BMPMASK_EXEC, TRUE );
+    SfxBoolItem aBItem( SID_BMPMASK_EXEC, sal_True );
     rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L );
 
     return 0L;
@@ -367,7 +367,7 @@ void ColorWindow::Paint( const Rectangle &/*Rect*/ )
 
 //-------------------------------------------------------------------------
 
-SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask,
+SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask,
                                             SfxBindings& rBindings ) :
             SfxControllerItem   ( nId_, rBindings ),
             rBmpMask            ( rMask)
@@ -376,7 +376,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask,
 
 //-------------------------------------------------------------------------
 
-void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
+void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
                                          const SfxPoolItem* pItem )
 {
     if ( ( nSID == SID_BMPMASK_EXEC ) && pItem )
@@ -391,7 +391,7 @@ void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
 
 //-------------------------------------------------------------------------
 
-SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, USHORT nId,
+SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId,
                                               SfxBindings* pBindings,
                                               SfxChildWinInfo* pInfo ) :
         SfxChildWindow( pParent_, nId )
@@ -555,9 +555,9 @@ void SvxBmpMask::onSelect( MaskSet* pSet )
 
 //-------------------------------------------------------------------------
 
-BOOL SvxBmpMask::Close()
+sal_Bool SvxBmpMask::Close()
 {
-    SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, FALSE );
+    SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, sal_False );
     GetBindings().GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aItem2, 0L );
 
     return SfxDockingWindow::Close();
@@ -565,7 +565,7 @@ BOOL SvxBmpMask::Close()
 
 //-------------------------------------------------------------------------
 
-BOOL SvxBmpMask::NeedsColorTable() const
+sal_Bool SvxBmpMask::NeedsColorTable() const
 {
     return ( aLbColor1.GetEntryCount() == 0 );
 }
@@ -615,36 +615,36 @@ void SvxBmpMask::PipetteClicked()
 {
     if( pQSet1->GetSelectItemId() == 1 )
     {
-        aCbx1.Check( TRUE );
+        aCbx1.Check( sal_True );
         pData->CbxHdl( &aCbx1 );
         pQSet1->SetItemColor( 1, aPipetteColor );
     }
     else if( pQSet2->GetSelectItemId() == 1 )
     {
-        aCbx2.Check( TRUE );
+        aCbx2.Check( sal_True );
         pData->CbxHdl( &aCbx2 );
         pQSet2->SetItemColor( 1, aPipetteColor );
     }
     else if( pQSet3->GetSelectItemId() == 1 )
     {
-        aCbx3.Check( TRUE );
+        aCbx3.Check( sal_True );
         pData->CbxHdl( &aCbx3 );
         pQSet3->SetItemColor( 1, aPipetteColor );
     }
     else if( pQSet4->GetSelectItemId() == 1 )
     {
-        aCbx4.Check( TRUE );
+        aCbx4.Check( sal_True );
         pData->CbxHdl( &aCbx4 );
         pQSet4->SetItemColor( 1, aPipetteColor );
     }
 
-    aTbxPipette.CheckItem( TBI_PIPETTE, FALSE );
+    aTbxPipette.CheckItem( TBI_PIPETTE, sal_False );
     pData->PipetteHdl( &aTbxPipette );
 }
 
 //-------------------------------------------------------------------------
 
-void SvxBmpMask::SetExecState( BOOL bEnable )
+void SvxBmpMask::SetExecState( sal_Bool bEnable )
 {
     pData->SetExecState( bEnable );
 
@@ -656,36 +656,36 @@ void SvxBmpMask::SetExecState( BOOL bEnable )
 
 //-------------------------------------------------------------------------
 
-USHORT SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, ULONG* pTols )
+sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols )
 {
-    USHORT  nCount = 0;
+    sal_uInt16  nCount = 0;
 
     if ( aCbx1.IsChecked() )
     {
         pSrcCols[nCount] = pQSet1->GetItemColor( 1 );
         pDstCols[nCount] = aLbColor1.GetSelectEntryColor();
-        pTols[nCount++] = static_cast<ULONG>(aSp1.GetValue());
+        pTols[nCount++] = static_cast<sal_uIntPtr>(aSp1.GetValue());
     }
 
     if ( aCbx2.IsChecked() )
     {
         pSrcCols[nCount] = pQSet2->GetItemColor( 1 );
         pDstCols[nCount] = aLbColor2.GetSelectEntryColor();
-        pTols[nCount++] = static_cast<ULONG>(aSp2.GetValue());
+        pTols[nCount++] = static_cast<sal_uIntPtr>(aSp2.GetValue());
     }
 
     if ( aCbx3.IsChecked() )
     {
         pSrcCols[nCount] = pQSet3->GetItemColor( 1 );
         pDstCols[nCount] = aLbColor3.GetSelectEntryColor();
-        pTols[nCount++] = static_cast<ULONG>(aSp3.GetValue());
+        pTols[nCount++] = static_cast<sal_uIntPtr>(aSp3.GetValue());
     }
 
     if ( aCbx4.IsChecked() )
     {
         pSrcCols[nCount] = pQSet4->GetItemColor( 1 );
         pDstCols[nCount] = aLbColor4.GetSelectEntryColor();
-        pTols[nCount++] = static_cast<ULONG>(aSp4.GetValue());
+        pTols[nCount++] = static_cast<sal_uIntPtr>(aSp4.GetValue());
     }
 
     return nCount;
@@ -698,8 +698,8 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap )
     Bitmap          aBitmap( rBitmap );
     Color           pSrcCols[4];
     Color           pDstCols[4];
-    ULONG           pTols[4];
-    const USHORT    nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+    sal_uIntPtr         pTols[4];
+    const sal_uInt16    nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
 
     EnterWait();
     aBitmap.Replace( pSrcCols, pDstCols, nCount, pTols );
@@ -740,11 +740,11 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation )
     Animation   aAnimation( rAnimation );
     Color       pSrcCols[4];
     Color       pDstCols[4];
-    ULONG       pTols[4];
+    sal_uIntPtr     pTols[4];
     InitColorArrays( pSrcCols, pDstCols, pTols );
-    USHORT      nAnimationCount = aAnimation.Count();
+    sal_uInt16      nAnimationCount = aAnimation.Count();
 
-    for( USHORT i = 0; i < nAnimationCount; i++ )
+    for( sal_uInt16 i = 0; i < nAnimationCount; i++ )
     {
         AnimationBitmap aAnimBmp( aAnimation.Get( i ) );
         aAnimBmp.aBmpEx = Mask( aAnimBmp.aBmpEx ).GetBitmapEx();
@@ -761,9 +761,9 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
     GDIMetaFile aMtf;
     Color       pSrcCols[4];
     Color       pDstCols[4];
-    ULONG       pTols[4];
-    USHORT      nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
-    BOOL        pTrans[4];
+    sal_uIntPtr     pTols[4];
+    sal_uInt16      nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+    sal_Bool        pTrans[4];
 
     // Falls keine Farben ausgewaehlt, kopieren wir nur das Mtf
     if( !nCount )
@@ -782,8 +782,8 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
         long*       pMaxG = new long[nCount];
         long*       pMinB = new long[nCount];
         long*       pMaxB = new long[nCount];
-        USHORT      i;
-        BOOL        bReplace;
+        sal_uInt16      i;
+        sal_Bool        bReplace;
 
         aMtf.SetPrefSize( rMtf.GetPrefSize() );
         aMtf.SetPrefMapMode( rMtf.GetPrefMapMode() );
@@ -809,11 +809,11 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
         }
 
         // Actions untersuchen und Farben ggf. ersetzen
-        for( ULONG nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ )
+        for( sal_uIntPtr nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ )
         {
             MetaAction* pAction = rMtf.GetAction( nAct );
 
-            bReplace = FALSE;
+            bReplace = sal_False;
 
             switch( pAction->GetType() )
             {
@@ -1040,9 +1040,9 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color
 Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor )
 {
     Animation   aAnimation( rAnim );
-    USHORT      nAnimationCount = aAnimation.Count();
+    sal_uInt16      nAnimationCount = aAnimation.Count();
 
-    for( USHORT i = 0; i < nAnimationCount; i++ )
+    for( sal_uInt16 i = 0; i < nAnimationCount; i++ )
     {
         AnimationBitmap aAnimBmp( aAnimation.Get( i ) );
         aAnimBmp.aBmpEx = ImpReplaceTransparency( aAnimBmp.aBmpEx, rColor );
@@ -1060,9 +1060,9 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C
     GDIMetaFile     aMtf;
     const MapMode&  rPrefMap = rMtf.GetPrefMapMode();
     const Size&     rPrefSize = rMtf.GetPrefSize();
-    const ULONG     nActionCount = rMtf.GetActionCount();
+    const sal_uIntPtr       nActionCount = rMtf.GetActionCount();
 
-    aVDev.EnableOutput( FALSE );
+    aVDev.EnableOutput( sal_False );
     aMtf.Record( &aVDev );
     aMtf.SetPrefSize( rPrefSize );
     aMtf.SetPrefMapMode( rPrefMap );
@@ -1072,7 +1072,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C
     // Actions nacheinander abspielen; zuerst
     // den gesamten Bereich auf die Ersatzfarbe setzen
     aVDev.DrawRect( Rectangle( rPrefMap.GetOrigin(), rPrefSize ) );
-    for ( ULONG i = 0; i < nActionCount; i++ )
+    for ( sal_uIntPtr i = 0; i < nActionCount; i++ )
     {
         MetaAction* pAct = rMtf.GetAction( i );
 
@@ -1123,13 +1123,13 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
                 {
                     Color   pSrcCols[4];
                     Color   pDstCols[4];
-                    ULONG   pTols[4];
-                    USHORT  nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+                    sal_uIntPtr pTols[4];
+                    sal_uInt16  nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
 
                     if( nCount )
                     {
                         // erstmal alle Transparent-Farben setzen
-                        for( USHORT i = 0; i < nCount; i++ )
+                        for( sal_uInt16 i = 0; i < nCount; i++ )
                         {
                             // Haben wir eine Transparenzfarbe?
                             if( pDstCols[i] == TRANSP_COL )
@@ -1194,7 +1194,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
 
 //-------------------------------------------------------------------------
 
-BOOL SvxBmpMask::IsEyedropping() const
+sal_Bool SvxBmpMask::IsEyedropping() const
 {
     return aTbxPipette.IsItemChecked( TBI_PIPETTE );
 }
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 26dc3137aa52..cff80865e1c8 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -96,7 +96,7 @@ SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
 |*
 \************************************************************************/
 
-SvxContourDlgItem::SvxContourDlgItem( USHORT _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) :
+SvxContourDlgItem::SvxContourDlgItem( sal_uInt16 _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) :
             SfxControllerItem   ( _nId, rBindings ),
             rDlg                ( rContourDlg )
 {
@@ -109,7 +109,7 @@ SvxContourDlgItem::SvxContourDlgItem( USHORT _nId, SvxSuperContourDlg& rContourD
 |*
 \************************************************************************/
 
-void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem )
+void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem )
 {
     if ( pItem && ( SID_CONTOUR_EXEC == nSID ) )
     {
@@ -131,7 +131,7 @@ void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, cons
 |*
 \************************************************************************/
 
-SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId,
+SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 nId,
                                                     SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
             SfxChildWindow( _pParent, nId )
 {
@@ -152,7 +152,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId
 |*
 \************************************************************************/
 
-void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked,
+void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                                                  const PolyPolygon* pPolyPoly, void* pEditingObj )
 {
     if ( SfxViewFrame::Current() &&
@@ -192,10 +192,10 @@ SvxContourDlg::~SvxContourDlg()
 
 PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
                                               const Rectangle* pRect,
-                                              const ULONG nFlags )
+                                              const sal_uIntPtr nFlags )
 {
     Bitmap  aBmp;
-    ULONG   nContourFlags = XOUTBMP_CONTOUR_HORZ;
+    sal_uIntPtr nContourFlags = XOUTBMP_CONTOUR_HORZ;
 
     if ( rGraphic.GetType() == GRAPHIC_BITMAP )
     {
@@ -206,14 +206,14 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
             PolyPolygon         aAnimPolyPoly;
             const Animation     aAnim( rGraphic.GetAnimation() );
             const Size&         rSizePix = aAnim.GetDisplaySizePixel();
-            const USHORT        nCount = aAnim.Count();
+            const sal_uInt16        nCount = aAnim.Count();
 
             if ( aVDev.SetOutputSizePixel( rSizePix ) )
             {
                 aVDev.SetLineColor( Color( COL_BLACK ) );
                 aVDev.SetFillColor( Color( COL_BLACK ) );
 
-                for( USHORT i = 0; i < nCount; i++ )
+                for( sal_uInt16 i = 0; i < nCount; i++ )
                 {
                     const AnimationBitmap& rStepBmp = aAnim.Get( i );
 
@@ -291,7 +291,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
     double          fScaleY;
     Size            aOrgSize;
     Point           aNewPoint;
-    BOOL            bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+    sal_Bool            bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
 
     if ( bPixelMap )
         aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap );
@@ -303,11 +303,11 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
         fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width();
         fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height();
 
-        for ( USHORT j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ )
+        for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ )
         {
             Polygon& rPoly = rContour[ j ];
 
-            for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+            for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
             {
                 if ( bPixelMap )
                     aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap  );
@@ -328,7 +328,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
 |*
 \************************************************************************/
 
-void SvxContourDlg::SetExecState( BOOL bEnable )
+void SvxContourDlg::SetExecState( sal_Bool bEnable )
 {
     pSuperClass->SetExecState( bEnable );
 }
@@ -338,7 +338,7 @@ void SvxContourDlg::SetGraphic( const Graphic& rGraphic )
     pSuperClass->SetGraphic( rGraphic );
 }
 
-void SvxContourDlg::SetGraphicLinked( BOOL bGraphicLinked )
+void SvxContourDlg::SetGraphicLinked( sal_Bool bGraphicLinked )
 {
     pSuperClass->SetGraphicLinked( bGraphicLinked );
 }
@@ -348,7 +348,7 @@ const Graphic& SvxContourDlg::GetGraphic() const
     return pSuperClass->GetGraphic();
 }
 
-BOOL SvxContourDlg::IsGraphicChanged() const
+sal_Bool SvxContourDlg::IsGraphicChanged() const
 {
     return pSuperClass->IsGraphicChanged();
 }
@@ -360,7 +360,7 @@ void SvxContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
 
 PolyPolygon SvxContourDlg::GetPolyPolygon()
 {
-    return pSuperClass->GetPolyPolygon( TRUE );
+    return pSuperClass->GetPolyPolygon( sal_True );
 }
 
 void SvxContourDlg::SetEditingObject( void* pObj )
@@ -373,7 +373,7 @@ const void* SvxContourDlg::GetEditingObject() const
     return pSuperClass->GetEditingObject();
 }
 
-void SvxContourDlg::Update( const Graphic& rGraphic, BOOL bGraphicLinked,
+void SvxContourDlg::Update( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                             const PolyPolygon* pPolyPoly, void* pEditingObj )
 {
     pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj );
@@ -396,8 +396,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
         aContourWnd         ( this, ResId( CTL_CONTOUR, *rResId.GetResMgr() ) ),
         aStbStatus          ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ),
         nGrfChanged         ( 0UL ),
-        bExecState          ( FALSE ),
-        bGraphicLinked      ( FALSE ),
+        bExecState          ( sal_False ),
+        bGraphicLinked      ( sal_False ),
         maImageList         ( SVX_RES( CD_IMAPDLG ) ),
         maImageListH        ( SVX_RES( CDH_IMAPDLG ) )
 {
@@ -494,9 +494,9 @@ void SvxSuperContourDlg::Resize()
 |*
 \************************************************************************/
 
-BOOL SvxSuperContourDlg::Close()
+sal_Bool SvxSuperContourDlg::Close()
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     if ( aTbx1.IsItemEnabled( TBI_APPLY ) )
     {
@@ -506,15 +506,15 @@ BOOL SvxSuperContourDlg::Close()
 
         if ( nRet == RET_YES )
         {
-            SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE );
+            SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True );
             GetBindings().GetDispatcher()->Execute(
                 SID_CONTOUR_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
         }
         else if ( nRet == RET_CANCEL )
-            bRet = FALSE;
+            bRet = sal_False;
     }
 
-    return( bRet ? SfxFloatingWindow::Close() : FALSE );
+    return( bRet ? SfxFloatingWindow::Close() : sal_False );
 }
 
 
@@ -524,7 +524,7 @@ BOOL SvxSuperContourDlg::Close()
 |*
 \************************************************************************/
 
-void SvxSuperContourDlg::SetExecState( BOOL bEnable )
+void SvxSuperContourDlg::SetExecState( sal_Bool bEnable )
 {
     bExecState = bEnable;
 }
@@ -559,13 +559,13 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
     const MapMode   aMap100( MAP_100TH_MM );
     const MapMode   aGrfMap( aGraphic.GetPrefMapMode() );
     OutputDevice*   pOutDev = Application::GetDefaultDevice();
-    BOOL            bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+    sal_Bool            bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
 
-    for ( USHORT j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ )
+    for ( sal_uInt16 j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ )
     {
         Polygon& rPoly = aPolyPoly[ j ];
 
-        for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+        for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
         {
             Point& rPt = rPoly[ i ];
 
@@ -587,7 +587,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
 |*
 \************************************************************************/
 
-PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
+PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic )
 {
     PolyPolygon aRetPolyPoly( aContourWnd.GetPolyPolygon() );
 
@@ -596,13 +596,13 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
         const MapMode   aMap100( MAP_100TH_MM );
         const MapMode   aGrfMap( aGraphic.GetPrefMapMode() );
         OutputDevice*   pOutDev = Application::GetDefaultDevice();
-        BOOL            bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+        sal_Bool            bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
 
-        for ( USHORT j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
+        for ( sal_uInt16 j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
         {
             Polygon& rPoly = aRetPolyPoly[ j ];
 
-            for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+            for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
             {
                 Point& rPt = rPoly[ i ];
 
@@ -624,7 +624,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
 |*
 \************************************************************************/
 
-void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicLinked,
+void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGraphicLinked,
                                  const PolyPolygon* pPolyPoly, void* pEditingObj )
 {
     aUpdateGraphic = rGraphic;
@@ -646,7 +646,7 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicL
 |*
 \************************************************************************/
 
-BOOL SvxSuperContourDlg::IsUndoPossible() const
+sal_Bool SvxSuperContourDlg::IsUndoPossible() const
 {
     return aUndoGraphic.GetType() != GRAPHIC_NONE;
 }
@@ -658,7 +658,7 @@ BOOL SvxSuperContourDlg::IsUndoPossible() const
 |*
 \************************************************************************/
 
-BOOL SvxSuperContourDlg::IsRedoPossible() const
+sal_Bool SvxSuperContourDlg::IsRedoPossible() const
 {
     return aRedoGraphic.GetType() != GRAPHIC_NONE;
 }
@@ -684,7 +684,7 @@ void SvxSuperContourDlg::DoAutoCreate()
 
 void SvxSuperContourDlg::ReducePoints( const long nTol )
 {
-    PolyPolygon aPolyPoly( GetPolyPolygon( FALSE ) );
+    PolyPolygon aPolyPoly( GetPolyPolygon( sal_False ) );
 
     if ( aPolyPoly.Count() )
     {
@@ -693,13 +693,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol )
         Polygon&        rPoly = aPolyPoly[ 0 ];
         OutputDevice*   pOutDev = Application::GetDefaultDevice();
         Point           aPtPix;
-        const USHORT    nSize = rPoly.GetSize();
-        USHORT          nCounter = 0;
+        const sal_uInt16    nSize = rPoly.GetSize();
+        sal_uInt16          nCounter = 0;
 
         if ( nSize )
             aPtPix = pOutDev->LogicToPixel( rPoly[ 0 ], aMapMode );
 
-        for( USHORT i = 1; i < nSize; i++ )
+        for( sal_uInt16 i = 1; i < nSize; i++ )
         {
             const Point&    rNewPt = rPoly[ i ];
             const Point     aNewPtPix( pOutDev->LogicToPixel( rNewPt, aMapMode ) );
@@ -729,13 +729,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol )
 
 IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 {
-    USHORT nNewItemId = pTbx->GetCurItemId();
+    sal_uInt16 nNewItemId = pTbx->GetCurItemId();
 
     switch( pTbx->GetCurItemId() )
     {
         case( TBI_APPLY ):
         {
-            SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE );
+            SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True );
             GetBindings().GetDispatcher()->Execute(
                 SID_CONTOUR_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
         }
@@ -748,32 +748,32 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
                 QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, String( CONT_RESID( STR_CONTOURDLG_WORKPLACE ) ) );
 
                 if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) )
-                    aContourWnd.SetWorkplaceMode( TRUE );
+                    aContourWnd.SetWorkplaceMode( sal_True );
                 else
-                    aTbx1.CheckItem( TBI_WORKPLACE, FALSE );
+                    aTbx1.CheckItem( TBI_WORKPLACE, sal_False );
             }
             else
-                aContourWnd.SetWorkplaceMode( FALSE );
+                aContourWnd.SetWorkplaceMode( sal_False );
         }
         break;
 
         case( TBI_SELECT ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
-            aContourWnd.SetEditMode( TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
+            aContourWnd.SetEditMode( sal_True );
         }
         break;
 
         case( TBI_RECT ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             aContourWnd.SetObjKind( OBJ_RECT );
         }
         break;
 
         case( TBI_CIRCLE ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             aContourWnd.SetObjKind( OBJ_CIRC );
 
         }
@@ -781,14 +781,14 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 
         case( TBI_POLY ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             aContourWnd.SetObjKind( OBJ_POLY );
         }
         break;
 
         case( TBI_FREEPOLY ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             aContourWnd.SetObjKind( OBJ_FREEFILL );
         }
         break;
@@ -815,7 +815,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
             aRedoGraphic = aGraphic;
             aGraphic = aUndoGraphic;
             aUndoGraphic = Graphic();
-            aContourWnd.SetGraphic( aGraphic, FALSE );
+            aContourWnd.SetGraphic( aGraphic, sal_False );
         }
         break;
 
@@ -825,7 +825,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
             aUndoGraphic = aGraphic;
             aGraphic = aRedoGraphic;
             aRedoGraphic = Graphic();
-            aContourWnd.SetGraphic( aGraphic, FALSE );
+            aContourWnd.SetGraphic( aGraphic, sal_False );
         }
         break;
 
@@ -835,7 +835,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 
         case( TBI_PIPETTE ):
         {
-            BOOL bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
+            sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
 
             if ( !bPipette )
                 aStbStatus.Invalidate();
@@ -845,7 +845,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 
                 if ( aQBox.Execute() != RET_YES )
                 {
-                    aTbx1.CheckItem( TBI_PIPETTE, bPipette = FALSE );
+                    aTbx1.CheckItem( TBI_PIPETTE, bPipette = sal_False );
                     aStbStatus.Invalidate();
                 }
             }
@@ -930,7 +930,7 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG )
 
         aUpdateGraphic = Graphic();
         aUpdatePolyPoly = PolyPolygon();
-        bUpdateGraphicLinked = FALSE;
+        bUpdateGraphicLinked = sal_False;
 
         aContourWnd.GetSdrModel()->SetChanged( sal_False );
     }
@@ -953,7 +953,7 @@ IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG )
 
     const Rectangle aWorkRect = aContourWnd.LogicToPixel( aContourWnd.GetWorkRect(), MapMode( MAP_100TH_MM ) );
     const Graphic&  rGraphic = aContourWnd.GetGraphic();
-    const BOOL      bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom();
+    const sal_Bool      bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom();
 
     EnterWait();
     SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : NULL ) );
@@ -973,12 +973,12 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
 {
     const SdrObject*    pObj = pWnd->GetSelectedSdrObject();
     const SdrView*      pView = pWnd->GetSdrView();
-    const BOOL          bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
-    const BOOL          bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) );
-    const BOOL          bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
-    const BOOL          bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE );
-    const BOOL          bDontHide = !( bPipette || bWorkplace );
-    const BOOL          bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP;
+    const sal_Bool          bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
+    const sal_Bool          bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) );
+    const sal_Bool          bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
+    const sal_Bool          bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE );
+    const sal_Bool          bDontHide = !( bPipette || bWorkplace );
+    const sal_Bool          bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP;
 
     aTbx1.EnableItem( TBI_APPLY, bDontHide && bExecState && pWnd->IsChanged() );
 
@@ -1003,7 +1003,7 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
 
     if ( bPolyEdit )
     {
-        USHORT nId = 0;
+        sal_uInt16 nId = 0;
 
         switch( pWnd->GetPolyEditMode() )
         {
@@ -1014,13 +1014,13 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
             break;
         }
 
-        aTbx1.CheckItem( nId, TRUE );
+        aTbx1.CheckItem( nId, sal_True );
     }
     else
     {
-        aTbx1.CheckItem( TBI_POLYEDIT, FALSE );
-        aTbx1.CheckItem( TBI_POLYMOVE, TRUE );
-        aTbx1.CheckItem( TBI_POLYINSERT, FALSE );
+        aTbx1.CheckItem( TBI_POLYEDIT, sal_False );
+        aTbx1.CheckItem( TBI_POLYMOVE, sal_True );
+        aTbx1.CheckItem( TBI_POLYINSERT, sal_False );
         pWnd->SetPolyEditMode( 0 );
     }
 
@@ -1087,7 +1087,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
             if( !!aMask )
             {
                 QueryBox    aQBox( this, WB_YES_NO | WB_DEF_YES, String( CONT_RESID( STR_CONTOURDLG_NEWPIPETTE ) ) );
-                BOOL        bNewContour;
+                sal_Bool        bNewContour;
 
                 aRedoGraphic = Graphic();
                 aUndoGraphic = aGraphic;
@@ -1105,8 +1105,8 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
         LeaveWait();
     }
 
-    aTbx1.CheckItem( TBI_PIPETTE, FALSE );
-    pWnd->SetPipetteMode( FALSE );
+    aTbx1.CheckItem( TBI_PIPETTE, sal_False );
+    pWnd->SetPipetteMode( sal_False );
     aStbStatus.Invalidate();
 
     return 0L;
@@ -1121,9 +1121,9 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
 
 IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd )
 {
-    aTbx1.CheckItem( TBI_WORKPLACE, FALSE );
-    aTbx1.CheckItem( TBI_SELECT, TRUE );
-    pWnd->SetWorkplaceMode( FALSE );
+    aTbx1.CheckItem( TBI_WORKPLACE, sal_False );
+    aTbx1.CheckItem( TBI_SELECT, sal_True );
+    pWnd->SetWorkplaceMode( sal_False );
 
     return 0L;
 }
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 41d7026e7e8f..b86121412ab7 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -81,11 +81,11 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) :
 
     SetStyle( GetStyle() | WB_CLIPCHILDREN );
     aVscrollSB.SetScrollHdl( LINK( this, SvxShowCharSet, VscrollHdl ) );
-    aVscrollSB.EnableDrag( TRUE );
+    aVscrollSB.EnableDrag( sal_True );
     // other settings like aVscroll depend on selected font => see SetFont
 
-    bDrag = FALSE;
-    InitSettings( TRUE, TRUE );
+    bDrag = sal_False;
+    InitSettings( sal_True, sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -93,7 +93,7 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) :
 void SvxShowCharSet::GetFocus()
 {
     Control::GetFocus();
-    SelectIndex( nSelectedIndex, TRUE );
+    SelectIndex( nSelectedIndex, sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -101,7 +101,7 @@ void SvxShowCharSet::GetFocus()
 void SvxShowCharSet::LoseFocus()
 {
     Control::LoseFocus();
-    SelectIndex( nSelectedIndex, FALSE );
+    SelectIndex( nSelectedIndex, sal_False );
 }
 
 // -----------------------------------------------------------------------
@@ -109,9 +109,9 @@ void SvxShowCharSet::LoseFocus()
 void SvxShowCharSet::StateChanged( StateChangedType nType )
 {
     if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
-        InitSettings( TRUE, FALSE );
+        InitSettings( sal_True, sal_False );
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
-        InitSettings( FALSE, TRUE );
+        InitSettings( sal_False, sal_True );
 
     Control::StateChanged( nType );
 }
@@ -122,7 +122,7 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS )
       && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
-        InitSettings( TRUE, TRUE );
+        InitSettings( sal_True, sal_True );
     else
         Control::DataChanged( rDCEvt );
 }
@@ -136,7 +136,7 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt )
         if ( rMEvt.GetClicks() == 1 )
         {
             GrabFocus();
-            bDrag = TRUE;
+            bDrag = sal_True;
             CaptureMouse();
 
             int nIndex = PixelToMapIndex( rMEvt.GetPosPixel() );
@@ -158,7 +158,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt )
         if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel()))
             aSelectHdl.Call( this );
         ReleaseMouse();
-        bDrag = FALSE;
+        bDrag = sal_False;
     }
 }
 
@@ -195,14 +195,14 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt )
 
 // -----------------------------------------------------------------------------
 
-USHORT SvxShowCharSet::GetRowPos(USHORT _nPos) const
+sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) const
 {
     return _nPos / COLUMN_COUNT ;
 }
 
 // -----------------------------------------------------------------------------
 
-USHORT SvxShowCharSet::GetColumnPos(USHORT _nPos) const
+sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const
 {
     return _nPos % COLUMN_COUNT ;
 }
@@ -221,9 +221,9 @@ int SvxShowCharSet::FirstInView( void ) const
 
 int SvxShowCharSet::LastInView( void ) const
 {
-    ULONG nIndex = FirstInView();
+    sal_uIntPtr nIndex = FirstInView();
     nIndex += ROW_COUNT * COLUMN_COUNT - 1;
-    ULONG nCompare = sal::static_int_cast<ULONG>( maFontCharMap.GetCharCount() - 1 );
+    sal_uIntPtr nCompare = sal::static_int_cast<sal_uIntPtr>( maFontCharMap.GetCharCount() - 1 );
     if( nIndex > nCompare )
         nIndex = nCompare;
     return nIndex;
@@ -310,7 +310,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt )
 
     if ( tmpSelected >= 0 )
     {
-        SelectIndex( tmpSelected, TRUE );
+        SelectIndex( tmpSelected, sal_True );
         aPreSelectHdl.Call( this );
     }
 }
@@ -440,7 +440,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 )
 
 // -----------------------------------------------------------------------
 
-void SvxShowCharSet::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxShowCharSet::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
 
@@ -486,12 +486,12 @@ void SvxShowCharSet::SetFont( const Font& rFont )
     aFont.SetAlign( ALIGN_TOP );
     int nFontHeight = (aOrigSize.Height() - 5) * 2 / (3 * ROW_COUNT);
     aFont.SetSize( PixelToLogic( Size( 0, nFontHeight ) ) );
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     Control::SetFont( aFont );
     GetFontCharMap( maFontCharMap );
 
     // hide scrollbar when there is nothing to scroll
-    BOOL bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT);
+    sal_Bool bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT);
 
     nX = (aOrigSize.Width() - (bNeedVscroll ? SBWIDTH : 0)) / COLUMN_COUNT;
     nY = aOrigSize.Height() / ROW_COUNT;
@@ -522,7 +522,7 @@ void SvxShowCharSet::SetFont( const Font& rFont )
 
 // -----------------------------------------------------------------------
 
-void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus )
+void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus )
 {
     if( nNewIndex < 0 )
     {
@@ -607,7 +607,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus )
 
 // -----------------------------------------------------------------------
 
-void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, BOOL bFocus )
+void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus )
 {
     // get next available char of current font
     sal_UCS4 cNext = maFontCharMap.GetNextChar( cNew - 1 );
@@ -678,7 +678,7 @@ void SvxShowCharSet::ReleaseAccessible()
     if ( aFind == m_aItems.end() )
     {
         OSL_ENSURE(m_pAccessible,"Who wants to create a child of my table without a parent?");
-        aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< USHORT >(_nPos)))).first;
+        aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< sal_uInt16 >(_nPos)))).first;
         rtl::OUStringBuffer buf;
         buf.appendUtf32( maFontCharMap.GetCharFromIndex( _nPos ) );
         aFind->second->maText = buf.makeStringAndClear();
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 80096ce70f32..0a54e3464730 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -88,17 +88,17 @@ void SvxCheckListBox::Init_Impl()
 
 // -----------------------------------------------------------------------
 
-void SvxCheckListBox::InsertEntry( const String& rStr, USHORT nPos,
+void SvxCheckListBox::InsertEntry( const String& rStr, sal_uInt16 nPos,
                                    void* pUserData,
                                    SvLBoxButtonKind eButtonKind )
 {
-    SvTreeListBox::InsertEntry( rStr, NULL, FALSE, nPos, pUserData,
+    SvTreeListBox::InsertEntry( rStr, NULL, sal_False, nPos, pUserData,
                                 eButtonKind );
 }
 
 // -----------------------------------------------------------------------
 
-void SvxCheckListBox::RemoveEntry( USHORT nPos )
+void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos )
 {
     if ( nPos < GetEntryCount() )
         SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) );
@@ -106,7 +106,7 @@ void SvxCheckListBox::RemoveEntry( USHORT nPos )
 
 // -----------------------------------------------------------------------
 
-void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect )
+void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect )
 {
     if ( nPos < GetEntryCount() )
         Select( GetEntry( nPos ), bSelect );
@@ -114,18 +114,18 @@ void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect )
 
 // -----------------------------------------------------------------------
 
-USHORT SvxCheckListBox::GetSelectEntryPos() const
+sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const
 {
     SvLBoxEntry* pEntry = GetCurEntry();
 
     if ( pEntry )
-        return (USHORT)GetModel()->GetAbsPos( pEntry );
+        return (sal_uInt16)GetModel()->GetAbsPos( pEntry );
     return LISTBOX_ENTRY_NOTFOUND;
 }
 
 // -----------------------------------------------------------------------
 
-String SvxCheckListBox::GetText( USHORT nPos ) const
+String SvxCheckListBox::GetText( sal_uInt16 nPos ) const
 {
     SvLBoxEntry* pEntry = GetEntry( nPos );
 
@@ -136,12 +136,12 @@ String SvxCheckListBox::GetText( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-USHORT SvxCheckListBox::GetCheckedEntryCount() const
+sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const
 {
-    USHORT nCheckCount = 0;
-    USHORT nCount = (USHORT)GetEntryCount();
+    sal_uInt16 nCheckCount = 0;
+    sal_uInt16 nCount = (sal_uInt16)GetEntryCount();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         if ( IsChecked( i ) )
             nCheckCount++;
@@ -151,7 +151,7 @@ USHORT SvxCheckListBox::GetCheckedEntryCount() const
 
 // -----------------------------------------------------------------------
 
-void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck )
+void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck )
 {
     if ( nPos < GetEntryCount() )
         SetCheckButtonState(
@@ -161,17 +161,17 @@ void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck )
 
 // -----------------------------------------------------------------------
 
-BOOL SvxCheckListBox::IsChecked( USHORT nPos ) const
+sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const
 {
     if ( nPos < GetEntryCount() )
         return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED);
     else
-        return FALSE;
+        return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void* SvxCheckListBox::SetEntryData ( USHORT nPos, void* pNewData )
+void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData )
 {
     void* pOld = NULL;
 
@@ -185,7 +185,7 @@ void* SvxCheckListBox::SetEntryData ( USHORT nPos, void* pNewData )
 
 // -----------------------------------------------------------------------
 
-void* SvxCheckListBox::GetEntryData( USHORT nPos ) const
+void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const
 {
     if ( nPos < GetEntryCount() )
         return GetEntry( nPos )->GetUserData();
@@ -217,13 +217,13 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
 
         if ( pEntry )
         {
-            BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+            sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
             SvLBoxItem* pItem = GetItem( pEntry, aPnt.X() );
 
             if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON )
             {
                 SvTreeListBox::MouseButtonDown( rMEvt );
-                Select( pEntry, TRUE );
+                Select( pEntry, sal_True );
                 return;
             }
             else
@@ -258,7 +258,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
 
         if ( pEntry )
         {
-            BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+            sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
             ToggleCheckButton( pEntry );
             if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) )
                 CheckButtonHdl();
@@ -270,7 +270,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
 
 // -----------------------------------------------------------------------
 
-SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
+SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
 {
     return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData, eButtonKind );
 }
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 84670ee32418..81091d7d7e98 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -88,33 +88,33 @@ void SvxXConnectionPreview::Construct()
     DBG_ASSERT( pView, "Keine gueltige View Uebergeben!" );
 
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    ULONG nMarkCount = rMarkList.GetMarkCount();
+    sal_uIntPtr nMarkCount = rMarkList.GetMarkCount();
 
     if( nMarkCount >= 1 )
     {
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
 
 
-        for( USHORT i = 0; i < nMarkCount && !bFound; i++ )
+        for( sal_uInt16 i = 0; i < nMarkCount && !bFound; i++ )
         {
             pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
-            UINT32 nInv = pObj->GetObjInventor();
-            UINT16 nId = pObj->GetObjIdentifier();
+            sal_uInt32 nInv = pObj->GetObjInventor();
+            sal_uInt16 nId = pObj->GetObjIdentifier();
             if( nInv == SdrInventor && nId == OBJ_EDGE )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 SdrEdgeObj* pTmpEdgeObj = (SdrEdgeObj*) pObj;
                 pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone();
 
-                SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( TRUE );
-                SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( FALSE );
+                SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_True );
+                SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_False );
 
-                rConn1 = pTmpEdgeObj->GetConnection( TRUE );
-                rConn2 = pTmpEdgeObj->GetConnection( FALSE );
+                rConn1 = pTmpEdgeObj->GetConnection( sal_True );
+                rConn2 = pTmpEdgeObj->GetConnection( sal_False );
 
-                SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( TRUE );
-                SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( FALSE );
+                SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( sal_True );
+                SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( sal_False );
 
                 // #110094#
                 // potential memory leak here (!). Create SdrObjList only when there is
@@ -128,13 +128,13 @@ void SvxXConnectionPreview::Construct()
                 {
                     SdrObject* pObj1 = pTmpObj1->Clone();
                     pObjList->InsertObject( pObj1 );
-                    pEdgeObj->ConnectToNode( TRUE, pObj1 );
+                    pEdgeObj->ConnectToNode( sal_True, pObj1 );
                 }
                 if( pTmpObj2 )
                 {
                     SdrObject* pObj2 = pTmpObj2->Clone();
                     pObjList->InsertObject( pObj2 );
-                    pEdgeObj->ConnectToNode( FALSE, pObj2 );
+                    pEdgeObj->ConnectToNode( sal_False, pObj2 );
                 }
                 pObjList->InsertObject( pEdgeObj );
             }
@@ -210,7 +210,7 @@ void SvxXConnectionPreview::Construct()
         Fraction aFrac2( aSize.Height(), aRect.GetHeight() );
         Fraction aMaxFrac( aFrac1 > aFrac2 ? aFrac1 : aFrac2 );
         Fraction aMinFrac( aFrac1 <= aFrac2 ? aFrac1 : aFrac2 );
-        BOOL bChange = (BOOL) ( (double)aMinFrac > 1.0 );
+        sal_Bool bChange = (sal_Bool) ( (double)aMinFrac > 1.0 );
         aMapMode.SetScaleX( aMinFrac );
         aMapMode.SetScaleY( aMinFrac );
 
@@ -297,7 +297,7 @@ void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs )
 |*
 *************************************************************************/
 
-USHORT SvxXConnectionPreview::GetLineDeltaAnz()
+sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz()
 {
     const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet();
     sal_uInt16 nCount(0);
@@ -316,9 +316,9 @@ USHORT SvxXConnectionPreview::GetLineDeltaAnz()
 
 void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    BOOL bZoomIn  = rMEvt.IsLeft() && !rMEvt.IsShift();
-    BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
-    BOOL bCtrl    = rMEvt.IsMod1();
+    sal_Bool bZoomIn  = rMEvt.IsLeft() && !rMEvt.IsShift();
+    sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
+    sal_Bool bCtrl    = rMEvt.IsMod1();
 
     if( bZoomIn || bZoomOut )
     {
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 0017966f1eaf..4993d15839e4 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -61,17 +61,17 @@ class SvxSuperContourDlg : public SvxContourDlg
     MetricField         aMtfTolerance;
     ContourWindow       aContourWnd;
     StatusBar           aStbStatus;
-    ULONG               nGrfChanged;
-    BOOL                bExecState;
-    BOOL                bPipetteMode;
-    BOOL                bWorkplaceMode;
-    BOOL                bUpdateGraphicLinked;
-    BOOL                bGraphicLinked;
+    sal_uIntPtr             nGrfChanged;
+    sal_Bool                bExecState;
+    sal_Bool                bPipetteMode;
+    sal_Bool                bWorkplaceMode;
+    sal_Bool                bUpdateGraphicLinked;
+    sal_Bool                bGraphicLinked;
     ImageList           maImageList;
     ImageList           maImageListH;
 
     virtual void        Resize();
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
 
     void                DoAutoCreate();
     void                ReducePoints( const long nTol = 8 );
@@ -93,23 +93,23 @@ public:
                                             Window* pParent, const ResId& rResId );
                         ~SvxSuperContourDlg();
 
-    void                SetExecState( BOOL bEnable );
+    void                SetExecState( sal_Bool bEnable );
 
     void                SetGraphic( const Graphic& rGraphic );
-    void                SetGraphicLinked( BOOL bLinked ) { bGraphicLinked = bLinked; }
+    void                SetGraphicLinked( sal_Bool bLinked ) { bGraphicLinked = bLinked; }
     const Graphic&      GetGraphic() const { return aGraphic; }
-    BOOL                IsGraphicChanged() const { return nGrfChanged > 0UL; }
+    sal_Bool                IsGraphicChanged() const { return nGrfChanged > 0UL; }
 
     void                SetPolyPolygon( const PolyPolygon& rPolyPoly );
-    PolyPolygon         GetPolyPolygon( BOOL bRescaleToGraphic = TRUE );
+    PolyPolygon         GetPolyPolygon( sal_Bool bRescaleToGraphic = sal_True );
 
     void                SetEditingObject( void* pObj ) { pCheckObj = pObj; }
     const void*         GetEditingObject() const { return pCheckObj; }
 
-    BOOL                IsUndoPossible() const;
-    BOOL                IsRedoPossible() const;
+    sal_Bool                IsUndoPossible() const;
+    sal_Bool                IsRedoPossible() const;
 
-    void                UpdateGraphic( const Graphic& rGraphic, BOOL bGraphicLinked,
+    void                UpdateGraphic( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                                 const PolyPolygon* pPolyPoly = NULL,
                                 void* pEditingObj = NULL );
 
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 5019be9f9472..a7f98ea124de 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -53,9 +53,9 @@
 ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) :
             GraphCtrl       ( pParent, rResId ),
             aWorkRect       ( 0, 0, 0, 0 ),
-            bPipetteMode    ( FALSE ),
-            bWorkplaceMode  ( FALSE ),
-            bClickValid     ( FALSE )
+            bPipetteMode    ( sal_False ),
+            bWorkplaceMode  ( sal_False ),
+            bClickValid     ( sal_False )
 {
     SetWinStyle( WB_SDRMODE );
 }
@@ -81,7 +81,7 @@ ContourWindow::~ContourWindow()
 void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
 {
     SdrPage*        pPage = (SdrPage*) pModel->GetPage( 0 );
-    const USHORT    nPolyCount = rPolyPoly.Count();
+    const sal_uInt16    nPolyCount = rPolyPoly.Count();
 
     // zuerst alle Zeichenobjekte loeschen
     aPolyPoly = rPolyPoly;
@@ -93,7 +93,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
 
     pPage->Clear();
 
-    for ( USHORT i = 0; i < nPolyCount; i++ )
+    for ( sal_uInt16 i = 0; i < nPolyCount; i++ )
     {
         basegfx::B2DPolyPolygon aPolyPolygon;
         aPolyPolygon.append(aPolyPoly[ i ].getB2DPolygon());
@@ -169,7 +169,7 @@ void ContourWindow::InitSdrModel()
     aSet.Put( XFillColorItem( String(), TRANSCOL ) );
     aSet.Put( XFillTransparenceItem( 50 ) );
     pView->SetAttributes( aSet );
-    pView->SetFrameDragSingles( TRUE );
+    pView->SetFrameDragSingles( sal_True );
 }
 
 
@@ -192,10 +192,10 @@ void ContourWindow::SdrObjCreated( const SdrObject&  )
 |*
 \************************************************************************/
 
-BOOL ContourWindow::IsContourChanged() const
+sal_Bool ContourWindow::IsContourChanged() const
 {
     SdrPage*    pPage = (SdrPage*) pModel->GetPage( 0 );
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if ( pPage && pPage->GetObjCount() )
         bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged();
@@ -219,7 +219,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
         SetPolyPolygon( PolyPolygon() );
         aWorkRect = Rectangle( aLogPt, aLogPt );
         Paint( Rectangle( Point(), GetGraphicSize() ) );
-        SetEditMode( TRUE );
+        SetEditMode( sal_True );
     }
 
     if ( !bPipetteMode )
@@ -235,7 +235,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
 
 void ContourWindow::MouseMove( const MouseEvent& rMEvt )
 {
-    bClickValid = FALSE;
+    bClickValid = sal_False;
 
     if ( bPipetteMode )
     {
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 0e32da5767cb..94addbe0b51f 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -45,9 +45,9 @@ class ContourWindow : public GraphCtrl
     Link                aPipetteLink;
     Link                aPipetteClickLink;
     Link                aWorkplaceClickLink;
-    BOOL                bPipetteMode;
-    BOOL                bWorkplaceMode;
-    BOOL                bClickValid;
+    sal_Bool                bPipetteMode;
+    sal_Bool                bWorkplaceMode;
+    sal_Bool                bClickValid;
 
 protected:
 
@@ -68,15 +68,15 @@ public:
     void                SetPolyPolygon( const PolyPolygon& rPolyPoly );
     const PolyPolygon&  GetPolyPolygon();
 
-    void                SetPipetteMode( const BOOL bPipette ) { bPipetteMode = bPipette; }
-    BOOL                IsPipetteMode() const { return bPipetteMode; }
+    void                SetPipetteMode( const sal_Bool bPipette ) { bPipetteMode = bPipette; }
+    sal_Bool                IsPipetteMode() const { return bPipetteMode; }
     const Color&        GetPipetteColor() const { return aPipetteColor; }
 
-    BOOL                IsClickValid() const { return bClickValid; }
-    BOOL                IsContourChanged() const;
+    sal_Bool                IsClickValid() const { return bClickValid; }
+    sal_Bool                IsContourChanged() const;
 
-    void                SetWorkplaceMode( const BOOL bWorkplace ) { bWorkplaceMode = bWorkplace; }
-    BOOL                IsWorkplaceMode() const { return bWorkplaceMode; }
+    void                SetWorkplaceMode( const sal_Bool bWorkplace ) { bWorkplaceMode = bWorkplace; }
+    sal_Bool                IsWorkplaceMode() const { return bWorkplaceMode; }
     const Rectangle&    GetWorkRect() const { return aWorkRect; }
 
     void                SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; }
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 503814823467..c3f1f0b17a52 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -46,7 +46,7 @@
 //  Local Defines and Function
 //----------------------------------------------------------------------------
 
-inline void EnableDisable( Window& rWin, BOOL bEnable )
+inline void EnableDisable( Window& rWin, sal_Bool bEnable )
 {
     if (bEnable)
         rWin.Enable();
@@ -67,7 +67,7 @@ static long nStaticTabs[]=
 
 RedlinData::RedlinData()
 {
-    bDisabled=FALSE;
+    bDisabled=sal_False;
     pData=NULL;
 }
 RedlinData::~RedlinData()
@@ -112,7 +112,7 @@ DBG_NAME(SvLBoxColorString);
 #*
 #************************************************************************/
 
-SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,USHORT nFlags,const XubString& rStr,
+SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr,
                                     const Color& rCol)
 
 : SvLBoxString( pEntry, nFlags, rStr )
@@ -202,7 +202,7 @@ SvLBoxItem* SvLBoxColorString::Create() const
 #************************************************************************/
 
 void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
-                             USHORT nFlags, SvLBoxEntry* pEntry )
+                             sal_uInt16 nFlags, SvLBoxEntry* pEntry )
 {
     Color aColor=rDev.GetTextColor();
     Color a2Color=aColor;
@@ -221,10 +221,10 @@ void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
 SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ):
         SvxSimpleTable(pParent,nBits )
 {
-    bAuthor=FALSE;
-    bDate=FALSE;
-    bIsCalc=FALSE;
-    bComment=FALSE;
+    bAuthor=sal_False;
+    bDate=sal_False;
+    bIsCalc=sal_False;
+    bComment=sal_False;
     nDatePos=WRITER_DATE;
     pCommentSearcher=NULL;
     SetNodeDefaultImages();
@@ -233,10 +233,10 @@ SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ):
 SvxRedlinTable::SvxRedlinTable( Window* pParent,const ResId& rResId):
         SvxSimpleTable(pParent,rResId)
 {
-    bAuthor=FALSE;
-    bDate=FALSE;
-    bIsCalc=FALSE;
-    bComment=FALSE;
+    bAuthor=sal_False;
+    bDate=sal_False;
+    bIsCalc=sal_False;
+    bComment=sal_False;
     nDatePos=WRITER_DATE;
     pCommentSearcher=NULL;
     SetNodeDefaultImages();
@@ -289,7 +289,7 @@ StringCompare SvxRedlinTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight)
 
     return eCompare;
 }
-void SvxRedlinTable::SetCalcView(BOOL bFlag)
+void SvxRedlinTable::SetCalcView(sal_Bool bFlag)
 {
     bIsCalc=bFlag;
     if(bFlag)
@@ -306,7 +306,7 @@ void SvxRedlinTable::SetCalcView(BOOL bFlag)
 void SvxRedlinTable::UpdateFilterTest()
 {
     Date aDateMax;
-    USHORT nYEAR=aDateMax.GetYear()+100;
+    sal_uInt16 nYEAR=aDateMax.GetYear()+100;
     aDateMax.SetYear(nYEAR);
     Date aDateMin(1,1,1989);
     Time aTMin(0);
@@ -347,12 +347,12 @@ void SvxRedlinTable::UpdateFilterTest()
 }
 
 
-void SvxRedlinTable::SetFilterDate(BOOL bFlag)
+void SvxRedlinTable::SetFilterDate(sal_Bool bFlag)
 {
     bDate=bFlag;
 }
 
-void SvxRedlinTable::SetDateTimeMode(USHORT nMode)
+void SvxRedlinTable::SetDateTimeMode(sal_uInt16 nMode)
 {
     nDaTiMode=nMode;
 }
@@ -377,7 +377,7 @@ void SvxRedlinTable::SetLastTime(const Time& aTime)
     aDaTiLast.SetTime(aTime.GetTime());
 }
 
-void SvxRedlinTable::SetFilterAuthor(BOOL bFlag)
+void SvxRedlinTable::SetFilterAuthor(sal_Bool bFlag)
 {
     bAuthor=bFlag;
 }
@@ -387,7 +387,7 @@ void SvxRedlinTable::SetAuthor(const String &aString)
     aAuthor=aString;
 }
 
-void SvxRedlinTable::SetFilterComment(BOOL bFlag)
+void SvxRedlinTable::SetFilterComment(sal_Bool bFlag)
 {
     bComment=bFlag;
 }
@@ -402,18 +402,18 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara )
     }
 }
 
-BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData)
+sal_Bool SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData)
 {
-    BOOL nTheFlag=TRUE;
+    sal_Bool nTheFlag=sal_True;
     String aString=rString.GetToken(WRITER_AUTHOR,'\t');
     if(pUserData==NULL)
     {
         if(bAuthor)
         {
             if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
-                nTheFlag=TRUE;
+                nTheFlag=sal_True;
             else
-                nTheFlag=FALSE;
+                nTheFlag=sal_False;
         }
     }
     else
@@ -424,18 +424,18 @@ BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserD
     return nTheFlag;
 }
 
-BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData)
+sal_Bool SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData)
 {
-    BOOL nTheFlag=TRUE;
+    sal_Bool nTheFlag=sal_True;
     String aString=rString.GetToken(CALC_AUTHOR,'\t');
     if(pUserData==NULL)
     {
         if(bAuthor)
         {
             if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
-                nTheFlag=TRUE;
+                nTheFlag=sal_True;
             else
-                nTheFlag=FALSE;
+                nTheFlag=sal_False;
         }
     }
     else
@@ -446,7 +446,7 @@ BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserDat
     return nTheFlag;
 }
 
-BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
+sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
                                   const DateTime *pDateTime,const String* pCommentStr)
 {
     bool nTheFlag=true;
@@ -475,15 +475,15 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
     return nTheFlag;
 }
 
-BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime)
+sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime)
 {
-    BOOL nTheFlag=TRUE;
+    sal_Bool nTheFlag=sal_True;
     if(bAuthor)
     {
         if(aAuthor.CompareTo(*pAuthorStr)==COMPARE_EQUAL)
-            nTheFlag=TRUE;
+            nTheFlag=sal_True;
         else
-            nTheFlag=FALSE;
+            nTheFlag=sal_False;
     }
     if(bDate && nTheFlag)
     {
@@ -499,7 +499,7 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDate
     return nTheFlag;
 }
 
-BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr)
+sal_Bool SvxRedlinTable::IsValidComment(const String* pCommentStr)
 {
     bool nTheFlag=true;
 
@@ -514,7 +514,7 @@ BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr)
 }
 
 SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,
-                                SvLBoxEntry* pParent,ULONG nPos)
+                                SvLBoxEntry* pParent,sal_uIntPtr nPos)
 {
     aEntryColor=GetTextColor();
     if(pUserData!=NULL)
@@ -536,12 +536,12 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat
     else
         aCurEntry.Erase();
 
-    return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData );
+    return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
 
 }
 
 SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,const Color& aColor,
-                                SvLBoxEntry* pParent,ULONG nPos)
+                                SvLBoxEntry* pParent,sal_uIntPtr nPos)
 {
     aEntryColor=aColor;
 
@@ -558,7 +558,7 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat
     else
         aCurEntry.Erase();
 
-    return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData );
+    return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
 }
 
 SvLBoxEntry* SvxRedlinTable::CreateEntry() const
@@ -589,11 +589,11 @@ void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr,
     XubString aToken;
 
     xub_Unicode* pCurToken = (xub_Unicode*)aCurEntry.GetBuffer();
-    USHORT nCurTokenLen;
+    sal_uInt16 nCurTokenLen;
     xub_Unicode* pNextToken = (xub_Unicode*)GetToken( pCurToken, nCurTokenLen );
-    USHORT nCount = TabCount(); nCount--;
+    sal_uInt16 nCount = TabCount(); nCount--;
 
-    for( USHORT nToken = 0; nToken < nCount; nToken++ )
+    for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ )
     {
         if( pCurToken && nCurTokenLen )
             // aToken.Assign( pCurToken, nCurTokenLen );
@@ -718,32 +718,32 @@ void SvxTPView::InsertCalcHeader()
     aViewData.InsertHeaderEntry(aString);
 }
 
-void SvxTPView::EnableAccept(BOOL nFlag)
+void SvxTPView::EnableAccept(sal_Bool nFlag)
 {
     PbAccept.Enable(nFlag);
 }
 
-void SvxTPView::EnableAcceptAll(BOOL nFlag)
+void SvxTPView::EnableAcceptAll(sal_Bool nFlag)
 {
     PbAcceptAll.Enable(nFlag);
 }
 
-void SvxTPView::EnableReject(BOOL nFlag)
+void SvxTPView::EnableReject(sal_Bool nFlag)
 {
     PbReject.Enable(nFlag);
 }
 
-void SvxTPView::EnableRejectAll(BOOL nFlag)
+void SvxTPView::EnableRejectAll(sal_Bool nFlag)
 {
     PbRejectAll.Enable(nFlag);
 }
 
-void SvxTPView::ShowUndo(BOOL nFlag)
+void SvxTPView::ShowUndo(sal_Bool nFlag)
 {
     PbUndo.Show(nFlag);
 }
 
-void SvxTPView::EnableUndo(BOOL nFlag)
+void SvxTPView::EnableUndo(sal_Bool nFlag)
 {
     PbUndo.Enable(nFlag);
 }
@@ -753,7 +753,7 @@ Size SvxTPView::GetMinSizePixel()
     Size aSize=aMinSize;
     if(PbUndo.IsVisible())
     {
-        ULONG nSize=PbUndo.GetSizePixel().Width()
+        sal_uIntPtr nSize=PbUndo.GetSizePixel().Width()
                     +PbUndo.GetPosPixel().X()
                     +PbAccept.GetPosPixel().X();
 
@@ -824,7 +824,7 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
     aEdComment  ( this, SVX_RES( ED_COMMENT) ),
     aActionStr  (       SVX_RES( STR_ACTION) ),
     aStrMyName  (       SVX_RES( STR_FILTER) ),
-    bModified   (FALSE)
+    bModified   (sal_False)
 {
     Image aImgTimeHC( SVX_RES( IMG_TIME_H ) );
     FreeResource();
@@ -832,8 +832,8 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
     aIbClock.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST );
     aIbClock2.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST );
 
-    aDfDate.SetShowDateCentury( TRUE );
-    aDfDate2.SetShowDateCentury( TRUE );
+    aDfDate.SetShowDateCentury( sal_True );
+    aDfDate2.SetShowDateCentury( sal_True );
 
     aRangeStr=aCbRange.GetText();
     aLbDate.SelectEntryPos(0);
@@ -873,7 +873,7 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
     aTfDate2.SetTime(aTime);
     HideRange();
     ShowAction();
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
 void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable)
@@ -886,7 +886,7 @@ String SvxTPFilter::GetMyName() const
     return aStrMyName;
 }
 
-void SvxTPFilter::DisableRange(BOOL bFlag)
+void SvxTPFilter::DisableRange(sal_Bool bFlag)
 {
     if(bFlag)
     {
@@ -902,43 +902,43 @@ void SvxTPFilter::DisableRange(BOOL bFlag)
     }
 }
 
-void SvxTPFilter::ShowDateFields(USHORT nKind)
+void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
 {
     String aEmpty;
     switch(nKind)
     {
         case FLT_DATE_BEFORE:
-                EnableDateLine1(TRUE);
-                EnableDateLine2(FALSE);
+                EnableDateLine1(sal_True);
+                EnableDateLine2(sal_False);
                 break;
         case FLT_DATE_SINCE:
-                EnableDateLine1(TRUE);
-                EnableDateLine2(FALSE);
+                EnableDateLine1(sal_True);
+                EnableDateLine2(sal_False);
                 break;
         case FLT_DATE_EQUAL:
-                EnableDateLine1(TRUE);
+                EnableDateLine1(sal_True);
                 aTfDate.Disable();
                 aTfDate.SetText(aEmpty);
-                EnableDateLine2(FALSE);
+                EnableDateLine2(sal_False);
                 break;
         case FLT_DATE_NOTEQUAL:
-                EnableDateLine1(TRUE);
+                EnableDateLine1(sal_True);
                 aTfDate.Disable();
                 aTfDate.SetText(aEmpty);
-                EnableDateLine2(FALSE);
+                EnableDateLine2(sal_False);
                 break;
         case FLT_DATE_BETWEEN:
-                EnableDateLine1(TRUE);
-                EnableDateLine2(TRUE);
+                EnableDateLine1(sal_True);
+                EnableDateLine2(sal_True);
                 break;
         case FLT_DATE_SAVE:
-                EnableDateLine1(FALSE);
-                EnableDateLine2(FALSE);
+                EnableDateLine1(sal_False);
+                EnableDateLine2(sal_False);
                 break;
     }
 }
 
-void SvxTPFilter::EnableDateLine1(BOOL bFlag)
+void SvxTPFilter::EnableDateLine1(sal_Bool bFlag)
 {
     if(bFlag && aCbDate.IsChecked())
     {
@@ -953,7 +953,7 @@ void SvxTPFilter::EnableDateLine1(BOOL bFlag)
         aIbClock.Disable();
     }
 }
-void SvxTPFilter::EnableDateLine2(BOOL bFlag)
+void SvxTPFilter::EnableDateLine2(sal_Bool bFlag)
 {
     String aEmpty;
     if(bFlag && aCbDate.IsChecked())
@@ -1015,22 +1015,22 @@ void SvxTPFilter::SetLastTime(const Time &aTime)
     aTfDate2.SetTime(aTime);
 }
 
-void SvxTPFilter::SetDateMode(USHORT nMode)
+void SvxTPFilter::SetDateMode(sal_uInt16 nMode)
 {
     aLbDate.SelectEntryPos(nMode);
     SelDateHdl(&aLbDate);
 }
 
-USHORT SvxTPFilter::GetDateMode()
+sal_uInt16 SvxTPFilter::GetDateMode()
 {
-    return (USHORT) aLbDate.GetSelectEntryPos();
+    return (sal_uInt16) aLbDate.GetSelectEntryPos();
 }
 void SvxTPFilter::ClearAuthors()
 {
     aLbAuthor.Clear();
 }
 
-void SvxTPFilter::InsertAuthor( const String& rString, USHORT nPos)
+void SvxTPFilter::InsertAuthor( const String& rString, sal_uInt16 nPos)
 {
     aLbAuthor.InsertEntry(rString,nPos);
 }
@@ -1040,17 +1040,17 @@ String SvxTPFilter::GetSelectedAuthor() const
     return aLbAuthor.GetSelectEntry();
 }
 
-USHORT  SvxTPFilter::GetSelectedAuthorPos()
+sal_uInt16  SvxTPFilter::GetSelectedAuthorPos()
 {
-    return (USHORT) aLbAuthor.GetSelectEntryPos();
+    return (sal_uInt16) aLbAuthor.GetSelectEntryPos();
 }
 
-void SvxTPFilter::SelectedAuthorPos(USHORT nPos)
+void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos)
 {
     aLbAuthor.SelectEntryPos(nPos);
 }
 
-USHORT SvxTPFilter::SelectAuthor(const String& aString)
+sal_uInt16 SvxTPFilter::SelectAuthor(const String& aString)
 {
     aLbAuthor.SelectEntry(aString);
     return aLbAuthor.GetSelectEntryPos();
@@ -1071,7 +1071,7 @@ void SvxTPFilter::SetFocusToRange()
     aEdRange.GrabFocus();
 }
 
-void SvxTPFilter::HideRange(BOOL bHide)
+void SvxTPFilter::HideRange(sal_Bool bHide)
 {
     if(bHide)
     {
@@ -1081,7 +1081,7 @@ void SvxTPFilter::HideRange(BOOL bHide)
     }
     else
     {
-        ShowAction(FALSE);
+        ShowAction(sal_False);
         aCbRange.SetText(aRangeStr);
         aCbRange.Show();
         aEdRange.Show();
@@ -1089,7 +1089,7 @@ void SvxTPFilter::HideRange(BOOL bHide)
     }
 }
 
-void SvxTPFilter::HideClocks(BOOL bHide)
+void SvxTPFilter::HideClocks(sal_Bool bHide)
 {
     if(bHide)
     {
@@ -1112,66 +1112,66 @@ String SvxTPFilter::GetComment()const
     return aEdComment.GetText();
 }
 
-BOOL SvxTPFilter::IsDate()
+sal_Bool SvxTPFilter::IsDate()
 {
     return aCbDate.IsChecked();
 }
 
-BOOL SvxTPFilter::IsAuthor()
+sal_Bool SvxTPFilter::IsAuthor()
 {
     return aCbAuthor.IsChecked();
 }
 
-BOOL SvxTPFilter::IsRange()
+sal_Bool SvxTPFilter::IsRange()
 {
     return aCbRange.IsChecked();
 }
-BOOL SvxTPFilter::IsAction()
+sal_Bool SvxTPFilter::IsAction()
 {
     return aCbRange.IsChecked();
 }
 
-BOOL SvxTPFilter::IsComment()
+sal_Bool SvxTPFilter::IsComment()
 {
     return aCbComment.IsChecked();
 }
 
-void SvxTPFilter::CheckDate(BOOL bFlag)
+void SvxTPFilter::CheckDate(sal_Bool bFlag)
 {
     aCbDate.Check(bFlag);
     RowEnableHdl(&aCbDate);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::CheckAuthor(BOOL bFlag)
+void SvxTPFilter::CheckAuthor(sal_Bool bFlag)
 {
     aCbAuthor.Check(bFlag);
     RowEnableHdl(&aCbAuthor);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::CheckRange(BOOL bFlag)
+void SvxTPFilter::CheckRange(sal_Bool bFlag)
 {
     aCbRange.Check(bFlag);
     RowEnableHdl(&aCbRange);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::CheckAction(BOOL bFlag)
+void SvxTPFilter::CheckAction(sal_Bool bFlag)
 {
     aCbRange.Check(bFlag);
     RowEnableHdl(&aCbRange);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::CheckComment(BOOL bFlag)
+void SvxTPFilter::CheckComment(sal_Bool bFlag)
 {
     aCbComment.Check(bFlag);
     RowEnableHdl(&aCbComment);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::ShowAction(BOOL bShow)
+void SvxTPFilter::ShowAction(sal_Bool bShow)
 {
     if(!bShow)
     {
@@ -1197,7 +1197,7 @@ ListBox* SvxTPFilter::GetLbAction()
 
 IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb )
 {
-    ShowDateFields((USHORT)aLbDate.GetSelectEntryPos());
+    ShowDateFields((sal_uInt16)aLbDate.GetSelectEntryPos());
     ModifyHdl(pLb);
     return 0;
 }
@@ -1208,8 +1208,8 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB )
     {
         aLbDate.Enable(aCbDate.IsChecked());
         aLbDate.Invalidate();
-        EnableDateLine1(FALSE);
-        EnableDateLine2(FALSE);
+        EnableDateLine1(sal_False);
+        EnableDateLine2(sal_False);
         if(aCbDate.IsChecked()) SelDateHdl(&aLbDate);
     }
     else if(pCB==&aCbAuthor)
@@ -1278,7 +1278,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr)
             aModifyComLink.Call(this);
         }
 
-        bModified=TRUE;
+        bModified=sal_True;
         aModifyLink.Call(this);
     }
     return 0;
@@ -1302,7 +1302,7 @@ void SvxTPFilter::DeactivatePage()
             pRedlinTable->SetFilterComment(IsComment());
 
             utl::SearchParam aSearchParam( aEdComment.GetText(),
-                    utl::SearchParam::SRCH_REGEXP,FALSE,FALSE,FALSE );
+                    utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False );
 
             pRedlinTable->SetCommentParams(&aSearchParam);
 
@@ -1311,7 +1311,7 @@ void SvxTPFilter::DeactivatePage()
 
         aReadyLink.Call(this);
     }
-    bModified=FALSE;
+    bModified=sal_False;
     TabPage::DeactivatePage();
 }
 
@@ -1454,17 +1454,17 @@ void SvxAcceptChgCtr::Resize()
 {
     aMinSize=pTPView->GetMinSizePixel();
     Size aSize=GetOutputSizePixel();
-    BOOL bFlag=FALSE;
+    sal_Bool bFlag=sal_False;
 
     if(aMinSize.Height()>aSize.Height())
     {
         aSize.Height()=aMinSize.Height();
-        bFlag=TRUE;
+        bFlag=sal_True;
     }
     if(aMinSize.Width()>aSize.Width())
     {
         aSize.Width()=aMinSize.Width();
-        bFlag=TRUE;
+        bFlag=sal_True;
     }
 
     if(bFlag)
@@ -1496,12 +1496,12 @@ void SvxAcceptChgCtr::ShowViewPage()
     aTCAccept.SetCurPageId(TP_VIEW);
 }
 
-BOOL SvxAcceptChgCtr::IsFilterPageVisible()
+sal_Bool SvxAcceptChgCtr::IsFilterPageVisible()
 {
     return (aTCAccept.GetCurPageId()==TP_FILTER);
 }
 
-BOOL SvxAcceptChgCtr::IsViewPageVisible()
+sal_Bool SvxAcceptChgCtr::IsViewPageVisible()
 {
     return (aTCAccept.GetCurPageId()==TP_VIEW);
 }
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 68c7d970fecb..4a4088c47253 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -50,9 +50,9 @@
 
 namespace svx
 {
-    USHORT administrateDatabaseRegistration( Window* _parentWindow )
+    sal_uInt16 administrateDatabaseRegistration( Window* _parentWindow )
     {
-        USHORT nResult = RET_CANCEL;
+        sal_uInt16 nResult = RET_CANCEL;
 
         SfxItemSet aRegistrationItems( SFX_APP()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 );
 
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 562b194ab56a..2e5501e589af 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -78,7 +78,7 @@ DialControlBmp::DialControlBmp( Window& rParent ) :
     mrParent( rParent ),
     mbEnabled( true )
 {
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 void DialControlBmp::InitBitmap( const Size& rSize, const Font& rFont )
@@ -183,7 +183,7 @@ void DialControlBmp::DrawBackground()
     SetFillColor();
     Erase();
 
-    EnableRTL( TRUE ); // #107807# draw 3D effect in correct direction
+    EnableRTL( sal_True ); // #107807# draw 3D effect in correct direction
 
     sal_uInt8 nDiff = mbEnabled ? 0x18 : 0x10;
     Color aColor;
@@ -210,7 +210,7 @@ void DialControlBmp::DrawBackground()
     SetFillColor( aColor );
     DrawPie( maRect, maRect.TopLeft(), maRect.LeftCenter() );
 
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 
     // *** calibration ***
 
@@ -277,7 +277,7 @@ void DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont )
 
     mnCenterX = maWinSize.Width() / 2;
     mnCenterY = maWinSize.Height() / 2;
-    maWinFont.SetTransparent( TRUE );
+    maWinFont.SetTransparent( sal_True );
 
     maBmpEnabled.DrawBackground( maWinSize, true );
     maBmpDisabled.DrawBackground( maWinSize, false );
@@ -451,7 +451,7 @@ const Link& DialControl::GetModifyHdl() const
 void DialControl::Init( const Size& rWinSize, const Font& rWinFont )
 {
     mpImpl->Init( rWinSize, rWinFont );
-    EnableRTL( FALSE ); // #107807# don't mirror mouse handling
+    EnableRTL( sal_False ); // #107807# don't mirror mouse handling
     SetOutputSizePixel( mpImpl->maWinSize );
     SetBackground();
 }
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 95c27a5dcec8..5f05d360007c 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -90,7 +90,7 @@ void Svx3DPreviewControl::Construct()
 {
     // Do never mirror the preview window.  This explicitly includes right
     // to left writing environments.
-    EnableRTL (FALSE);
+    EnableRTL (sal_False);
     SetMapMode( MAP_100TH_MM );
 
     // Model
@@ -119,7 +119,7 @@ void Svx3DPreviewControl::Construct()
     double fH = rVolume.getHeight();
     double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0);
 
-    rCamera.SetAutoAdjustProjection(FALSE);
+    rCamera.SetAutoAdjustProjection(sal_False);
     rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
     basegfx::B3DPoint aLookAt;
     double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ();
@@ -387,7 +387,7 @@ void Svx3DLightControl::Construct2()
         double fH = rVolume.getHeight();
         double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0);
 
-        rCamera.SetAutoAdjustProjection(FALSE);
+        rCamera.SetAutoAdjustProjection(sal_False);
         rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
         basegfx::B3DPoint aLookAt;
         double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ();
@@ -1095,8 +1095,8 @@ void SvxLightCtl3D::CheckSelection()
     {
         double fHor, fVer;
         maLightControl.GetPosition(fHor, fVer);
-        maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
-        maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+        maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+        maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
     }
 }
 
@@ -1115,8 +1115,8 @@ void SvxLightCtl3D::move( double fDeltaHor, double fDeltaVer )
         return;
 
     maLightControl.SetPosition(fHor, fVer);
-    maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
-    maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+    maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+    maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
 
     if(maUserInteractiveChangeCallback.IsSet())
     {
@@ -1296,8 +1296,8 @@ IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG)
     double fHor, fVer;
 
     maLightControl.GetPosition(fHor, fVer);
-    maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
-    maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+    maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+    maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
 
     if(maUserInteractiveChangeCallback.IsSet())
     {
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 56873298382f..7d3d6d05912c 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -83,7 +83,7 @@ Bitmap& SvxRectCtl::GetRectBitmap( void )
 }
 
 SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt,
-                        USHORT nBorder, USHORT nCircle, CTL_STYLE eStyle ) :
+                        sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle ) :
 
     Control( pParent, rResId ),
 
@@ -156,7 +156,7 @@ void SvxRectCtl::Resize_Impl()
         break;
     }
     Reset();
-    InitSettings( TRUE, TRUE );
+    InitSettings( sal_True, sal_True );
 }
 // -----------------------------------------------------------------------
 
@@ -189,18 +189,18 @@ void SvxRectCtl::InitRectBitmap( void )
     aColorAry2[6] = rStyles.GetDialogColor();
 
 #ifdef DBG_UTIL
-    static BOOL     bModify = FALSE;
-    BOOL&           rModify = bModify;
+    static sal_Bool     bModify = sal_False;
+    sal_Bool&           rModify = bModify;
     if( rModify )
     {
         static int      n = 0;
-        static UINT8    r = 0xFF;
-        static UINT8    g = 0x00;
-        static UINT8    b = 0xFF;
+        static sal_uInt8    r = 0xFF;
+        static sal_uInt8    g = 0x00;
+        static sal_uInt8    b = 0xFF;
         int&            rn = n;
-        UINT8&          rr = r;
-        UINT8&          rg = g;
-        UINT8&          rb = b;
+        sal_uInt8&          rr = r;
+        sal_uInt8&          rg = g;
+        sal_uInt8&          rb = b;
         aColorAry2[ rn ] = Color( rr, rg, rb );
     }
 #endif
@@ -210,7 +210,7 @@ void SvxRectCtl::InitRectBitmap( void )
 
 // -----------------------------------------------------------------------
 
-void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
 
@@ -282,7 +282,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
     if(!IsCompletelyDisabled())
     {
         RECT_POINT eNewRP = eRP;
-        BOOL bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
+        sal_Bool bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
 
         switch( rKeyEvt.GetKeyCode().GetCode() )
         {
@@ -367,9 +367,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
 void SvxRectCtl::StateChanged( StateChangedType nType )
 {
     if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
-        InitSettings( TRUE, FALSE );
+        InitSettings( sal_True, sal_False );
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
-        InitSettings( FALSE, TRUE );
+        InitSettings( sal_False, sal_True );
 
     Window::StateChanged( nType );
 }
@@ -379,7 +379,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType )
 void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
-        InitSettings( TRUE, TRUE );
+        InitSettings( sal_True, sal_True );
     else
         Window::DataChanged( rDCEvt );
 }
@@ -464,8 +464,8 @@ void SvxRectCtl::Paint( const Rectangle& )
     Point aBtnPnt2( 11,0 );
     Point aBtnPnt3( 22,0 );
 
-    BOOL bNoHorz = (m_nState & CS_NOHORZ) != 0;
-    BOOL bNoVert = (m_nState & CS_NOVERT) != 0;
+    sal_Bool bNoHorz = (m_nState & CS_NOHORZ) != 0;
+    sal_Bool bNoVert = (m_nState & CS_NOVERT) != 0;
 
     Bitmap&         rBitmap = GetRectBitmap();
 
@@ -698,7 +698,7 @@ void SvxRectCtl::SetState( CTL_STATE nState )
         ( (SvxTabPage*) GetParent() )->PointChanged( this, eRP );
 }
 
-UINT8 SvxRectCtl::GetNumOfChilds( void ) const
+sal_uInt8 SvxRectCtl::GetNumOfChilds( void ) const
 {
     return ( eCS == CS_ANGLE )? 8 : 9;
 }
@@ -801,12 +801,12 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) :
 
 void SvxAngleCtl::Initialize()
 {
-    bPositive = TRUE;
+    bPositive = sal_True;
 
     // aFont.SetName( "Helvetica" );
     aFont.SetSize( aFontSize );
     aFont.SetWeight( WEIGHT_NORMAL );
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
 
     SetFont( aFont );
 }
@@ -873,10 +873,10 @@ void SvxAngleCtl::Paint( const Rectangle& )
 |*
 \************************************************************************/
 
-SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) :
+SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) :
                         Control     ( pParent, rResId ),
                         nLines      ( nNumber ),
-                        bPaintable  ( TRUE )
+                        bPaintable  ( sal_True )
 {
     // SetMapMode( MAP_100TH_MM );
     aRectSize = GetOutputSize();
@@ -886,8 +886,8 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber )
     SetLineColor( Application::GetSettings().GetStyleSettings().GetShadowColor() );
 
     nSquares = nLines * nLines;
-    pPixel = new USHORT[ nSquares ];
-    rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
+    pPixel = new sal_uInt16[ nSquares ];
+    rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
 }
 
 /*************************************************************************
@@ -907,7 +907,7 @@ SvxPixelCtl::~SvxPixelCtl( )
 |*
 \************************************************************************/
 
-void SvxPixelCtl::ChangePixel( USHORT nPixel )
+void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel )
 {
     if( *( pPixel + nPixel) == 0 )
         *( pPixel + nPixel) = 1; // koennte erweitert werden auf mehrere Farben
@@ -925,10 +925,10 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     Point aPt = PixelToLogic( rMEvt.GetPosPixel() );
     Point aPtTl, aPtBr;
-    USHORT  nX, nY;
+    sal_uInt16  nX, nY;
 
-    nX = (USHORT) ( aPt.X() * nLines / aRectSize.Width() );
-    nY = (USHORT) ( aPt.Y() * nLines / aRectSize.Height() );
+    nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() );
+    nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() );
 
     ChangePixel( nX + nY * nLines );
 
@@ -951,7 +951,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
 
 void SvxPixelCtl::Paint( const Rectangle& )
 {
-    USHORT  i, j, nTmp;
+    sal_uInt16  i, j, nTmp;
     Point   aPtTl, aPtBr;
 
     if( bPaintable )
@@ -961,16 +961,16 @@ void SvxPixelCtl::Paint( const Rectangle& )
         for( i = 1; i < nLines; i++)
         {
             // horizontal
-            nTmp = (USHORT) ( aRectSize.Height() * i / nLines );
+            nTmp = (sal_uInt16) ( aRectSize.Height() * i / nLines );
             DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) );
             // vertikal
-            nTmp = (USHORT) ( aRectSize.Width() * i / nLines );
+            nTmp = (sal_uInt16) ( aRectSize.Width() * i / nLines );
             DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) );
         }
 
         // Rechtecke (Quadrate) zeichnen
         Control::SetLineColor();
-        USHORT nLastPixel = *pPixel ? 0 : 1;
+        sal_uInt16 nLastPixel = *pPixel ? 0 : 1;
 
         for( i = 0; i < nLines; i++)
         {
@@ -1014,9 +1014,9 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
         aPixelColor = rXBmp.GetPixelColor();
         aBackgroundColor = rXBmp.GetBackgroundColor();
 
-        USHORT* pArray = rXBmp.GetPixelArray();
+        sal_uInt16* pArray = rXBmp.GetPixelArray();
 
-        for( USHORT i = 0; i < nSquares; i++ )
+        for( sal_uInt16 i = 0; i < nSquares; i++ )
             *( pPixel + i ) = *( pArray + i );
     }
 }
@@ -1027,7 +1027,7 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
 |*
 \************************************************************************/
 
-USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
+sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel )
 {
     return( *( pPixel + nPixel ) );
 }
@@ -1041,7 +1041,7 @@ USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
 void SvxPixelCtl::Reset()
 {
     // clear pixel area
-    rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
+    rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
     Invalidate();
 }
 
@@ -1090,14 +1090,14 @@ void ColorLB::Fill( const XColorTable* pColorTab )
 {
     long nCount = pColorTab->Count();
     XColorEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
         pEntry = pColorTab->GetColor( i );
         InsertEntry( pEntry->GetColor(), pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
@@ -1109,7 +1109,7 @@ void ColorLB::Append( XColorEntry* pEntry, Bitmap* )
 
 /************************************************************************/
 
-void ColorLB::Modify( XColorEntry* pEntry, USHORT nPos, Bitmap*  )
+void ColorLB::Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap*  )
 {
     RemoveEntry( nPos );
     InsertEntry( pEntry->GetColor(), pEntry->GetName(), nPos );
@@ -1125,14 +1125,14 @@ void FillAttrLB::Fill( const XColorTable* pColorTab )
 {
     long nCount = pColorTab->Count();
     XColorEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
         pEntry = pColorTab->GetColor( i );
         InsertEntry( pEntry->GetColor(), pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /*************************************************************************
@@ -1141,7 +1141,7 @@ void FillAttrLB::Fill( const XColorTable* pColorTab )
 |*
 \************************************************************************/
 
-HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList ( NULL ),
   mbUserDraw( bUserDraw )
@@ -1149,7 +1149,7 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
     EnableUserDraw( mbUserDraw );
 }
 
-HatchingLB::HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ )
+HatchingLB::HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, aWB ),
   mpList ( NULL ),
   mbUserDraw( bUserDraw )
@@ -1163,7 +1163,7 @@ void HatchingLB::Fill( const XHatchList* pList )
     XHatchEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1183,7 +1183,7 @@ void HatchingLB::Fill( const XHatchList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1199,7 +1199,7 @@ void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
         {
             OutputDevice* pDevice = rUDEvt.GetDevice();
 
-            ULONG nOldDrawMode = pDevice->GetDrawMode();
+            sal_uIntPtr nOldDrawMode = pDevice->GetDrawMode();
             pDevice->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
 
             XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch();
@@ -1236,7 +1236,7 @@ void HatchingLB::Append( XHatchEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void HatchingLB::Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1249,11 +1249,11 @@ void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
-                                    const XHatch& rHatch, USHORT nDist )
+                                    const XHatch& rHatch, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XHatchEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
 
     long i;
@@ -1264,10 +1264,10 @@ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
         aStr = pEntry->GetName();
 
         if( rStr == aStr && rHatch == pEntry->GetHatch() )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 /*************************************************************************
@@ -1280,7 +1280,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
 {
     long nCount = pList->Count();
     XHatchEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1291,7 +1291,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 /*************************************************************************
@@ -1300,7 +1300,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
 |*
 \************************************************************************/
 
-GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+GradientLB::GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList(NULL),
   mbUserDraw( bUserDraw )
@@ -1308,7 +1308,7 @@ GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
     EnableUserDraw( mbUserDraw);
 }
 
-GradientLB::GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ )
+GradientLB::GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, aWB ),
   mpList(NULL),
   mbUserDraw( bUserDraw )
@@ -1322,7 +1322,7 @@ void GradientLB::Fill( const XGradientList* pList )
     XGradientEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1342,7 +1342,7 @@ void GradientLB::Fill( const XGradientList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1360,7 +1360,7 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
 
             XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient();
             Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(), rXGrad.GetStartColor(), rXGrad.GetEndColor() );
-            aGradient.SetAngle( (USHORT)rXGrad.GetAngle() );
+            aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() );
             aGradient.SetBorder( rXGrad.GetBorder() );
             aGradient.SetOfsX( rXGrad.GetXOffset() );
             aGradient.SetOfsY( rXGrad.GetYOffset() );
@@ -1374,14 +1374,14 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
             {
                 long nWidth = pDevice->GetOutputSize().Width();
 
-                pWin->EnableRTL( FALSE );
+                pWin->EnableRTL( sal_False );
 
                 Rectangle aMirrorRect( Point( nWidth - aRect.Left() - aRect.GetWidth(), aRect.Top() ),
                                        aRect.GetSize() );
 
                 pDevice->DrawGradient( aMirrorRect, aGradient );
 
-                pWin->EnableRTL( TRUE );
+                pWin->EnableRTL( sal_True );
             }
             else
                 pDevice->DrawGradient( aRect, aGradient );
@@ -1408,7 +1408,7 @@ void GradientLB::Append( XGradientEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void GradientLB::Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1421,11 +1421,11 @@ void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rStr,
-                                const XGradient& rGradient, USHORT nDist )
+                                const XGradient& rGradient, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XGradientEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
 
     long i;
@@ -1436,10 +1436,10 @@ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rS
         aStr = pEntry->GetName();
 
         if( rStr == aStr && rGradient == pEntry->GetGradient() )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 /*************************************************************************
@@ -1452,7 +1452,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
 {
     long nCount = pList->Count();
     XGradientEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1463,7 +1463,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 /*************************************************************************
@@ -1472,7 +1472,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
 |*
 \************************************************************************/
 
-BitmapLB::BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+BitmapLB::BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList( NULL ),
   mbUserDraw( bUserDraw )
@@ -1511,7 +1511,7 @@ void BitmapLB::Fill( const XBitmapList* pList )
     XBitmapEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1531,7 +1531,7 @@ void BitmapLB::Fill( const XBitmapList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void BitmapLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1596,7 +1596,7 @@ void BitmapLB::Append( XBitmapEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void BitmapLB::Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void BitmapLB::Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1618,7 +1618,7 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     long i;
     for( i = 0; i < nCount && !bFound; i++ )
@@ -1630,11 +1630,11 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
 
         if( rStr == aStr )
         {
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 ) );
 }
 
 /*************************************************************************
@@ -1685,7 +1685,7 @@ void FillAttrLB::Fill( const XBitmapList* pList )
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1696,7 +1696,7 @@ void FillAttrLB::Fill( const XBitmapList* pList )
 
         ListBox::InsertEntry( pEntry->GetName(), aVD.GetBitmap( Point( 0, 2 ), Size( 32, 12 ) ) );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
@@ -1706,7 +1706,7 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     long i;
     for( i = 0; i < nCount && !bFound; i++ )
@@ -1718,14 +1718,14 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
 
         if( rStr == aStr )
         {
-            bFound = TRUE;
+            bFound = sal_True;
         }
         /*
         if( rStr == aStr && rBmp == aBmp )
-            bFound = TRUE; */
+            bFound = sal_True; */
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 ) );
 }
 
 /*************************************************************************
@@ -1736,13 +1736,13 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
 
 void FillTypeLB::Fill()
 {
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
     InsertEntry( String( SVX_RES( RID_SVXSTR_INVISIBLE ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_COLOR ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_GRADIENT ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_HATCH ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_BITMAP ) ) );
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /*************************************************************************
@@ -1755,7 +1755,7 @@ void LineLB::Fill( const XDashList* pList )
 {
     long nCount = pList->Count();
     XDashEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1769,7 +1769,7 @@ void LineLB::Fill( const XDashList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void LineLB::FillStyles()
@@ -1808,7 +1808,7 @@ void LineLB::Append( XDashEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1821,11 +1821,11 @@ void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
-                                const XDash& rDash, USHORT nDist )
+                                const XDash& rDash, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XDashEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
     XDash aDash;
 
@@ -1838,10 +1838,10 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
         aDash = pEntry->GetDash();
 
         if( rStr == aStr && rDash == aDash )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 /*************************************************************************
@@ -1850,12 +1850,12 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
 |*
 \************************************************************************/
 
-void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
+void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart )
 {
     long nCount = pList->Count();
     XLineEndEntry* pEntry;
     VirtualDevice aVD;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1864,7 +1864,7 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
         if( pBitmap )
         {
             Size aBmpSize( pBitmap->GetSizePixel() );
-            aVD.SetOutputSizePixel( aBmpSize, FALSE );
+            aVD.SetOutputSizePixel( aBmpSize, sal_False );
             aVD.DrawBitmap( Point(), *pBitmap );
             InsertEntry( pEntry->GetName(),
                 aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1875,20 +1875,20 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
         else
             InsertEntry( pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
 
 void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp,
-                        BOOL bStart )
+                        sal_Bool bStart )
 {
     if( pBmp )
     {
         VirtualDevice aVD;
         Size aBmpSize( pBmp->GetSizePixel() );
 
-        aVD.SetOutputSizePixel( aBmpSize, FALSE );
+        aVD.SetOutputSizePixel( aBmpSize, sal_False );
         aVD.DrawBitmap( Point(), *pBmp );
         InsertEntry( pEntry->GetName(),
             aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1900,8 +1900,8 @@ void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp,
 
 /************************************************************************/
 
-void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp,
-                        BOOL bStart )
+void LineEndLB::Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp,
+                        sal_Bool bStart )
 {
     RemoveEntry( nPos );
 
@@ -1910,7 +1910,7 @@ void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp,
         VirtualDevice aVD;
         Size aBmpSize( pBmp->GetSizePixel() );
 
-        aVD.SetOutputSizePixel( aBmpSize, FALSE );
+        aVD.SetOutputSizePixel( aBmpSize, sal_False );
         aVD.DrawBitmap( Point(), *pBmp );
         InsertEntry( pEntry->GetName(),
             aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -2055,7 +2055,7 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId )
     mbWithSymbol( sal_False )
 {
     const Size aOutputSize(GetOutputSize());
-    InitSettings( TRUE, TRUE );
+    InitSettings( sal_True, sal_True );
 
     const sal_Int32 nDistance(500L);
     const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index dede78faef1d..44a9762a023a 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -42,7 +42,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
 {
     FieldUnit eUnit = FUNIT_INCH;
     const SfxPoolItem* pItem = NULL;
-    if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) )
         eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue();
     else
     {
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 1b77364b6c7e..da320eea50d7 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -898,7 +898,7 @@ void SaveProgressDialog::end()
 
 //===============================================
 RecovDocListEntry::RecovDocListEntry(      SvLBoxEntry* pEntry,
-                                           USHORT       nFlags,
+                                           sal_uInt16       nFlags,
                                      const String&      sText )
     : SvLBoxString( pEntry, nFlags, sText )
 {
@@ -907,14 +907,14 @@ RecovDocListEntry::RecovDocListEntry(      SvLBoxEntry* pEntry,
 //===============================================
 void RecovDocListEntry::Paint(const Point&       aPos   ,
                                     SvLBox&      aDevice,
-                                    USHORT       /*nFlags */,
+                                    sal_uInt16       /*nFlags */,
                                     SvLBoxEntry* pEntry )
 {
     const Image*        pImg  = 0;
     const String*       pTxt  = 0;
           RecovDocList* pList = static_cast< RecovDocList* >(&aDevice);
 
-    BOOL      bHC         = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool      bHC         = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
 
     TURLInfo* pInfo  = (TURLInfo*)pEntry->GetUserData();
     switch(pInfo->RecoveryState)
@@ -1086,7 +1086,7 @@ RecoveryDialog::RecoveryDialog(Window*       pParent,
 
     m_aFileListLB.SetBackground( rStyleSettings.GetDialogColor() );
 
-    m_aNextBtn.Enable(TRUE);
+    m_aNextBtn.Enable(sal_True);
     m_aNextBtn.SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) );
     m_aCancelBtn.SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) );
 
@@ -1131,8 +1131,8 @@ short RecoveryDialog::execute()
                 // Dialog was started first time ...
                 // wait for user decision ("start" or "cancel" recovery)
                 // This decision will be made inside the NextBtn handler.
-                m_aNextBtn.Enable(TRUE);
-                m_aCancelBtn.Enable(TRUE);
+                m_aNextBtn.Enable(sal_True);
+                m_aCancelBtn.Enable(sal_True);
                 m_bWaitForUser = sal_True;
                 while(m_bWaitForUser)
                     Application::Yield();
@@ -1150,8 +1150,8 @@ short RecoveryDialog::execute()
                 // do it asynchronous (to allow repaints)
                 // and wait for this asynchronous operation.
                 m_aDescrFT.SetText( m_aTitleRecoveryInProgress );
-                m_aNextBtn.Enable(FALSE);
-                m_aCancelBtn.Enable(FALSE);
+                m_aNextBtn.Enable(sal_False);
+                m_aCancelBtn.Enable(sal_False);
                 m_pCore->setProgressHandler(m_xProgress);
                 m_pCore->setUpdateListener(this);
                 m_pCore->doRecovery();
@@ -1173,15 +1173,15 @@ short RecoveryDialog::execute()
                  {
                      m_aDescrFT.SetText(m_aRecoveryOnlyFinishDescr);
                      m_aNextBtn.SetText(m_aRecoveryOnlyFinish);
-                     m_aNextBtn.Enable(TRUE);
-                     m_aCancelBtn.Enable(FALSE);
+                     m_aNextBtn.Enable(sal_True);
+                     m_aCancelBtn.Enable(sal_False);
                  }
                  else
                  {
                     m_aDescrFT.SetText(m_aTitleRecoveryReport);
                     m_aNextBtn.SetText(m_aNextStr);
-                    m_aNextBtn.Enable(TRUE);
-                    m_aCancelBtn.Enable(TRUE);
+                    m_aNextBtn.Enable(sal_True);
+                    m_aCancelBtn.Enable(sal_True);
                  }
 
                  m_bWaitForUser = sal_True;
@@ -1358,8 +1358,8 @@ void RecoveryDialog::start()
 //===============================================
 void RecoveryDialog::updateItems()
 {
-    ULONG c = m_aFileListLB.GetEntryCount();
-    ULONG i = 0;
+    sal_uIntPtr c = m_aFileListLB.GetEntryCount();
+    sal_uIntPtr i = 0;
     for ( i=0; i<c; ++i )
     {
         SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i);
@@ -1382,8 +1382,8 @@ void RecoveryDialog::updateItems()
 //===============================================
 void RecoveryDialog::stepNext(TURLInfo* pItem)
 {
-    ULONG c = m_aFileListLB.GetEntryCount();
-    ULONG i = 0;
+    sal_uIntPtr c = m_aFileListLB.GetEntryCount();
+    sal_uIntPtr i = 0;
     for (i=0; i<c; ++i)
     {
         SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i);
@@ -1533,7 +1533,7 @@ void BrokenRecoveryDialog::impl_refresh()
 
         m_bExecutionNeeded = sal_True;
 
-        USHORT nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
+        sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
         m_aFileListLB.SetEntryData( nPos, (void*)&rInfo );
     }
     m_sSavePath = ::rtl::OUString();
@@ -1697,13 +1697,13 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             ExtTextEngine* pTextEngine = GetTextEngine();
             DBG_ASSERT( pTextEngine, "no text engine" );
 
-            ULONG i, nParaCount = pTextEngine->GetParagraphCount();
-            USHORT nLineCount = 0;
+            sal_uIntPtr i, nParaCount = pTextEngine->GetParagraphCount();
+            sal_uInt16 nLineCount = 0;
 
             for ( i = 0; i < nParaCount; ++i )
                 nLineCount = nLineCount + pTextEngine->GetLineCount(i);
 
-            USHORT nVisCols = 0, nVisLines = 0;
+            sal_uInt16 nVisCols = 0, nVisLines = 0;
             GetMaxVisColumnsAndLines( nVisCols, nVisLines );
             GetVScrollBar()->Show( nLineCount > nVisLines );
 
@@ -1950,14 +1950,14 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             default:
 #ifdef WNT
             case 0:
-                maSystemBtn.Check( TRUE );
+                maSystemBtn.Check( sal_True );
                 break;
 #endif
             case 1:
-                maDirectBtn.Check( TRUE );
+                maDirectBtn.Check( sal_True );
                 break;
             case 2:
-                maManualBtn.Check( TRUE );
+                maManualBtn.Check( sal_True );
                 break;
             }
 
@@ -2019,7 +2019,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             GetTextEngine()->SetFont( aFont );
 
             // no blinking cursor and a little left margin
-            EnableCursor( FALSE );
+            EnableCursor( sal_False );
             SetLeftMargin( 4 );
         }
 
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index e8088e53282f..b1e7757c07f9 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -72,7 +72,7 @@ namespace
     // -----------------------------------------------------------------------
     void initFont(Font& _rFont)
     {
-        _rFont.SetTransparent(TRUE);
+        _rFont.SetTransparent(sal_True);
         _rFont.SetAlign(ALIGN_BASELINE);
     }
     // -----------------------------------------------------------------------
@@ -98,7 +98,7 @@ namespace
     void setFont( const SvxFont& rNewFont, SvxFont& rImplFont )
     {
         rImplFont = rNewFont;
-        rImplFont.SetTransparent( TRUE );
+        rImplFont.SetTransparent( sal_True );
         rImplFont.SetAlign( ALIGN_BASELINE );
     }
 
@@ -114,7 +114,7 @@ class FontPrevWin_Impl
 
     SvxFont                         aFont;
     Printer*                        pPrinter;
-    BOOL                            bDelPrinter;
+    sal_Bool                            bDelPrinter;
 
     Reference < XBreakIterator >    xBreak;
     SvULongs                        aTextWidth;
@@ -133,9 +133,9 @@ class FontPrevWin_Impl
     long                            n100PercentFontWidth;       // initial -1 -> not set yet
     long                            n100PercentFontWidthCJK;
     long                            n100PercentFontWidthCTL;
-    UINT16                          nFontWidthScale;
+    sal_uInt16                          nFontWidthScale;
 
-    BOOL                            bSelection      : 1,
+    sal_Bool                            bSelection      : 1,
                                     bGetSelection   : 1,
                                     bUseResText     : 1,
                                     bTwoLines       : 1,
@@ -147,13 +147,13 @@ class FontPrevWin_Impl
     void                _CheckScript();
 public:
     inline FontPrevWin_Impl() :
-        pPrinter( NULL ), bDelPrinter( FALSE ),
+        pPrinter( NULL ), bDelPrinter( sal_False ),
         pColor( NULL ), pBackColor( 0 ),
         cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ),
-        bSelection( FALSE ), bGetSelection( FALSE ), bUseResText( FALSE ),
-        bTwoLines( FALSE ),
-        bIsCJKUI( FALSE ), bIsCTLUI( FALSE ),
-        bUseFontNameAsText( FALSE ), bTextInited( FALSE )
+        bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ),
+        bTwoLines( sal_False ),
+        bIsCJKUI( sal_False ), bIsCTLUI( sal_False ),
+        bUseFontNameAsText( sal_False ), bTextInited( sal_False )
         {
             Invalidate100PercentFontWidth();
         }
@@ -170,9 +170,9 @@ public:
     Size                CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, SvxFont &rFont );
     void                DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, SvxFont &rFont );
 
-    BOOL                SetFontWidthScale( UINT16 nScaleInPercent );
+    sal_Bool                SetFontWidthScale( sal_uInt16 nScaleInPercent );
     inline void         Invalidate100PercentFontWidth();
-    inline BOOL         Is100PercentFontWidthValid() const;
+    inline sal_Bool         Is100PercentFontWidthValid() const;
     void                ScaleFontWidth( const OutputDevice& rOutDev );
                             // scales rNonCJKFont and aCJKFont depending on nFontWidthScale and
                             //  sets the 100%-Font-Widths
@@ -189,7 +189,7 @@ inline void FontPrevWin_Impl::Invalidate100PercentFontWidth()
     n100PercentFontWidth = n100PercentFontWidthCJK = n100PercentFontWidthCTL = -1;
 }
 
-inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const
+inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const
 {
     DBG_ASSERT( ( n100PercentFontWidth == -1 && n100PercentFontWidthCJK == -1 ) ||
                 ( n100PercentFontWidth != -1 && n100PercentFontWidthCJK != -1 ) ||
@@ -228,8 +228,8 @@ void FontPrevWin_Impl::_CheckScript()
     }
     if( xBreak.is() )
     {
-        USHORT nScript = xBreak->getScriptType( aText, 0 );
-        USHORT nChg = 0;
+        sal_uInt16 nScript = xBreak->getScriptType( aText, 0 );
+        sal_uInt16 nChg = 0;
         if( com::sun::star::i18n::ScriptType::WEAK == nScript )
         {
             nChg = (xub_StrLen)xBreak->endOfScript( aText, nChg, nScript );
@@ -262,13 +262,13 @@ void FontPrevWin_Impl::_CheckScript()
                 aScriptChg.push_back( nChg );
             }
             aScriptType.Insert( nScript, nCnt );
-            aTextWidth.Insert( ULONG(0), nCnt++ );
+            aTextWidth.Insert( sal_uIntPtr(0), nCnt++ );
 
             if( nChg < aText.Len() )
                 nScript = xBreak->getScriptType( aText, nChg );
             else
                 break;
-        } while( TRUE );
+        } while( sal_True );
     }
 }
 
@@ -285,8 +285,8 @@ void FontPrevWin_Impl::_CheckScript()
 Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter,
     SvxFont &rFont )
 {
-    USHORT nScript;
-    USHORT nIdx = 0;
+    sal_uInt16 nScript;
+    sal_uInt16 nIdx = 0;
     xub_StrLen nStart = 0;
     xub_StrLen nEnd;
     size_t nCnt = aScriptChg.size();
@@ -310,7 +310,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
     do
     {
         SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont);
-        ULONG nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ).
+        sal_uIntPtr nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ).
                        Width();
         aTextWidth[ nIdx++ ] = nWidth;
         nTxtWidth += nWidth;
@@ -335,7 +335,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
         else
             break;
     }
-    while( TRUE );
+    while( sal_True );
     nHeight -= nAscent;
     nCJKHeight -= nCJKAscent;
     nCTLHeight -= nCTLAscent;
@@ -364,8 +364,8 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
     Point &rPt, SvxFont &rFont )
 {
     Font aOldFont = _pPrinter->GetFont();
-    USHORT nScript;
-    USHORT nIdx = 0;
+    sal_uInt16 nScript;
+    sal_uInt16 nIdx = 0;
     xub_StrLen nStart = 0;
     xub_StrLen nEnd;
     size_t nCnt = aScriptChg.size();
@@ -396,21 +396,21 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
         else
             break;
     }
-    while( TRUE );
+    while( sal_True );
     _pPrinter->SetFont( aOldFont );
 }
 
 // -----------------------------------------------------------------------
 
-BOOL FontPrevWin_Impl::SetFontWidthScale( UINT16 nScale )
+sal_Bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale )
 {
     if( nFontWidthScale != nScale )
     {
         nFontWidthScale = nScale;
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -432,7 +432,7 @@ void FontPrevWin_Impl::ScaleFontWidth( const OutputDevice& rOutDev )
 
 // class SvxFontPrevWindow -----------------------------------------------
 
-void SvxFontPrevWindow::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxFontPrevWindow::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
 
@@ -471,13 +471,13 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) :
     if ( !pImpl->pPrinter )
     {
         pImpl->pPrinter = new Printer;
-        pImpl->bDelPrinter = TRUE;
+        pImpl->bDelPrinter = sal_True;
     }
     SetMapMode( MapMode( MAP_TWIP ) );
     initFont(pImpl->aFont);
     initFont(pImpl->aCJKFont);
     initFont(pImpl->aCTLFont);
-    InitSettings( TRUE, TRUE );
+    InitSettings( sal_True, sal_True );
     SetBorderStyle( WINDOW_BORDER_MONO );
 
     LanguageType eLanguage = Application::GetSettings().GetUILanguage();
@@ -528,9 +528,9 @@ SvxFont& SvxFontPrevWindow::GetCJKFont()
 void SvxFontPrevWindow::StateChanged( StateChangedType nType )
 {
     if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
-        InitSettings( TRUE, FALSE );
+        InitSettings( sal_True, sal_False );
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
-        InitSettings( FALSE, TRUE );
+        InitSettings( sal_False, sal_True );
 
     Window::StateChanged( nType );
 }
@@ -540,7 +540,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType )
 void SvxFontPrevWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
-        InitSettings( TRUE, TRUE );
+        InitSettings( sal_True, sal_True );
     else
         Window::DataChanged( rDCEvt );
 }
@@ -561,14 +561,14 @@ const SvxFont& SvxFontPrevWindow::GetFont() const
 void SvxFontPrevWindow::SetPreviewText( const ::rtl::OUString& rString )
 {
     pImpl->aText = rString;
-    pImpl->bTextInited = TRUE;
+    pImpl->bTextInited = sal_True;
 }
 
 // -----------------------------------------------------------------------
 
 void SvxFontPrevWindow::SetFontNameAsPreviewText()
 {
-    pImpl->bUseFontNameAsText = TRUE;
+    pImpl->bUseFontNameAsText = sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -640,7 +640,7 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor)
 
 // -----------------------------------------------------------------------
 
-void SvxFontPrevWindow::UseResourceText( BOOL bUse )
+void SvxFontPrevWindow::UseResourceText( sal_Bool bUse )
 {
     pImpl->bUseResText = bUse;
 }
@@ -663,7 +663,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
         if ( pSh && !pImpl->bGetSelection && !pImpl->bUseFontNameAsText )
         {
             pImpl->aText = pSh->GetSelectionText();
-            pImpl->bGetSelection = TRUE;
+            pImpl->bGetSelection = sal_True;
             pImpl->bSelection = pImpl->aText.Len() != 0;
 
         }
@@ -806,14 +806,14 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
 /* -----------------------------04.12.00 16:26--------------------------------
 
  ---------------------------------------------------------------------------*/
-BOOL SvxFontPrevWindow::IsTwoLines() const
+sal_Bool SvxFontPrevWindow::IsTwoLines() const
 {
     return pImpl->bTwoLines;
 }
 /* -----------------------------04.12.00 16:26--------------------------------
 
  ---------------------------------------------------------------------------*/
-void SvxFontPrevWindow::SetTwoLines(BOOL bSet)
+void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet)
 {
     pImpl->bTwoLines = bSet;}
 
@@ -828,7 +828,7 @@ void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd)
 
 // -----------------------------------------------------------------------
 
-void SvxFontPrevWindow::SetFontWidthScale( UINT16 n )
+void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n )
 {
     if( pImpl->SetFontWidthScale( n ) )
         Invalidate();
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index a6b03a17d890..984d7dca4af4 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -100,7 +100,7 @@ SvxFontListBox::SvxFontListBox( Window* pParent, const ResId& rResId ) :
     maStdFont( GetFont() ),
     mbUseFont( false )
 {
-    maStdFont.SetTransparent( TRUE );
+    maStdFont.SetTransparent( sal_True );
     maEntryFont = maStdFont;
 }
 
@@ -125,10 +125,10 @@ void SvxFontListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect )
 
 void SvxFontListBox::SetNoSelection()
 {
-    SelectAll( FALSE, TRUE );
+    SelectAll( sal_False, sal_True );
 }
 
-ULONG SvxFontListBox::GetSelectEntryPos() const
+sal_uLong SvxFontListBox::GetSelectEntryPos() const
 {
     SvLBoxEntry* pSvLBoxEntry = FirstSelected();
     return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index c62cea74c69a..ae2eb6c04098 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -60,7 +60,7 @@ SFX_IMPL_DOCKINGWINDOW( SvxFontWorkChildWindow, SID_FONTWORK );
 
 SvxFontWorkControllerItem::SvxFontWorkControllerItem
 (
-    USHORT _nId,
+    sal_uInt16 _nId,
     SvxFontWorkDialog& rDlg,
     SfxBindings& rBindings
 ) :
@@ -77,7 +77,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem
 |*
 \************************************************************************/
 
-void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/,
+void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/,
                                               const SfxPoolItem* pItem )
 {
     switch ( GetId() )
@@ -190,7 +190,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
 SvxFontWorkChildWindow::SvxFontWorkChildWindow
 (
     Window* _pParent,
-    USHORT nId,
+    sal_uInt16 nId,
     SfxBindings* pBindings,
     SfxChildWinInfo* pInfo
 ) :
@@ -293,10 +293,10 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
 
     // System-Metrik setzen
     const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
-    SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
-    SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE );
-    SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE );
-    SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE );
+    SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True );
+    SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True );
+    SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True );
+    SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True );
     if( eDlgUnit == FUNIT_MM )
     {
         aMtrFldDistance.SetSpinSize( 50 );
@@ -334,7 +334,7 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
 
 SvxFontWorkDialog::~SvxFontWorkDialog()
 {
-    for (USHORT i = 0; i < CONTROLLER_COUNT; i++)
+    for (sal_uInt16 i = 0; i < CONTROLLER_COUNT; i++)
         DELETEZ(pCtrlItems[i]);
 }
 
@@ -404,7 +404,7 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
 {
     if ( pItem )
     {
-        USHORT nId = TBI_STYLE_OFF;
+        sal_uInt16 nId = TBI_STYLE_OFF;
 
         switch ( pItem->GetValue() )
         {
@@ -419,16 +419,16 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
         // Make sure that there is allways exactly one checked toolbox item.
         if ( pItem->GetValue() == XFT_NONE )
         {
-            aTbxStyle.CheckItem(TBI_STYLE_ROTATE, FALSE);
-            aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, FALSE);
-            aTbxStyle.CheckItem(TBI_STYLE_SLANTX, FALSE);
-            aTbxStyle.CheckItem(TBI_STYLE_SLANTY, FALSE);
+            aTbxStyle.CheckItem(TBI_STYLE_ROTATE, sal_False);
+            aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, sal_False);
+            aTbxStyle.CheckItem(TBI_STYLE_SLANTX, sal_False);
+            aTbxStyle.CheckItem(TBI_STYLE_SLANTY, sal_False);
 
-            aTbxStyle.CheckItem(TBI_STYLE_OFF, TRUE);
+            aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_True);
         }
         else
         {
-            aTbxStyle.CheckItem(TBI_STYLE_OFF, FALSE);
+            aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_False);
             aTbxStyle.CheckItem(nId);
         }
 
@@ -448,7 +448,7 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem)
 {
     if ( pItem )
     {
-        USHORT nId;
+        sal_uInt16 nId;
 
         aTbxAdjust.Enable();
         aMtrFldDistance.Enable();
@@ -537,7 +537,7 @@ void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem)
 
         if ( pItem->GetValue() != XFTFORM_NONE )
             aFormSet.SelectItem(
-                sal::static_int_cast< USHORT >(pItem->GetValue()));
+                sal::static_int_cast< sal_uInt16 >(pItem->GetValue()));
     }
     else
         aFormSet.Disable();
@@ -574,11 +574,11 @@ void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem)
 \************************************************************************/
 
 void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
-                                        BOOL bRestoreValues)
+                                        sal_Bool bRestoreValues)
 {
     if ( pItem )
     {
-        USHORT nId;
+        sal_uInt16 nId;
 
         aTbxShadow.Enable();
 
@@ -709,7 +709,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
     if ( pItem && !aMtrFldShadowX.HasChildPathFocus() )
     {
         // #i19251#
-        // INT32 nValue = pItem->GetValue();
+        // sal_Int32 nValue = pItem->GetValue();
 
         // #i19251#
         // The two involved fields/items are used double and contain/give different
@@ -764,7 +764,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem)
 
 IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
 {
-    USHORT nId = aTbxStyle.GetCurItemId();
+    sal_uInt16 nId = aTbxStyle.GetCurItemId();
 
     // Execute this block when a different toolbox item has been clicked or
     // when the off item has been clicked.  The later is necessary to
@@ -796,7 +796,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG )
 {
-    USHORT nId = aTbxAdjust.GetCurItemId();
+    sal_uInt16 nId = aTbxAdjust.GetCurItemId();
 
     if ( nId == TBI_ADJUST_MIRROR )
     {
@@ -827,7 +827,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG )
 {
-    USHORT nId = aTbxShadow.GetCurItemId();
+    sal_uInt16 nId = aTbxShadow.GetCurItemId();
 
     if ( nId == TBI_SHOWFORM )
     {
@@ -860,7 +860,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG )
 
         XFormTextShadowItem aItem(eShadow);
         GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SFX_CALLMODE_RECORD, &aItem, 0L );
-        SetShadow_Impl(&aItem, TRUE);
+        SetShadow_Impl(&aItem, sal_True);
     }
     return 0;
 }
@@ -888,16 +888,16 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
     const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
     if( eDlgUnit != aMtrFldDistance.GetUnit() )
     {
-        SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
-        SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE );
+        SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True );
+        SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True );
         aMtrFldDistance.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
         aMtrFldTextStart.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
     }
     if( eDlgUnit != aMtrFldShadowX.GetUnit() &&
         aTbxShadow.IsItemChecked( TBI_SHADOW_NORMAL ) )
     {
-        SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE );
-        SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE );
+        SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True );
+        SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True );
         aMtrFldShadowX.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
         aMtrFldShadowY.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
     }
@@ -984,7 +984,7 @@ void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable)
 |*
 \************************************************************************/
 
-void SvxFontWorkDialog::SetActive(BOOL /*bActivate*/)
+void SvxFontWorkDialog::SetActive(sal_Bool /*bActivate*/)
 {
 }
 
@@ -1005,7 +1005,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
     Rectangle   aRect;
     XFormTextAdjust eAdjust = XFT_AUTOSIZE;
 
-//-/    rOldObj.TakeAttributes(aAttr, TRUE, FALSE);
+//-/    rOldObj.TakeAttributes(aAttr, sal_True, sal_False);
     aAttr.Put(rOldObj.GetMergedItemSet());
 
     const XFormTextStdFormItem& rOldForm = (const XFormTextStdFormItem&)
@@ -1088,8 +1088,8 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
             basegfx::B2DPolyPolygon aPolyPolygon;
             basegfx::B2DPolygon aLine;
             long nR = aRect.GetWidth() / 2;
-            basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, FALSE).getB2DPolygon());
-            basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, FALSE).getB2DPolygon());
+            basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, sal_False).getB2DPolygon());
+            basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, sal_False).getB2DPolygon());
 
             // Polygone schliessen
             aTopArc.setClosed(true);
@@ -1119,7 +1119,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
 
             if ( eForm == XFTFORM_BUTTON4 )
             {
-                basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, FALSE).getB2DPolygon());
+                basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, sal_False).getB2DPolygon());
                 aNewArc.setClosed(true);
                 aPolyPolygon.append(aNewArc);
                 eAdjust = XFT_CENTER;
@@ -1142,7 +1142,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
 
             if ( eForm == XFTFORM_BUTTON4 )
             {
-                basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, FALSE).getB2DPolygon());
+                basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, sal_False).getB2DPolygon());
                 aNewArc.setClosed(true);
                 aPolyPolygon.append(aNewArc);
             }
@@ -1176,7 +1176,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
 
         rView.BegUndo( SVX_RESSTR( RID_SVXSTR_FONTWORK_UNDOCREATE ) );
         OutlinerParaObject* pPara = rOldObj.GetOutlinerParaObject();
-        BOOL bHide = TRUE;
+        sal_Bool bHide = sal_True;
 
         if ( pPara != NULL )
         {
@@ -1184,9 +1184,9 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
             pNewObj->SetOutlinerParaObject(pPara);
         }
         else
-            bHide = FALSE;
+            bHide = sal_False;
 
-        rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, TRUE);
+        rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, sal_True);
         pNewObj->SetLayer(rOldObj.GetLayer());
         aAttr.Put(XFormTextHideFormItem(bHide));
         aAttr.Put(XFormTextAdjustItem(eAdjust));
@@ -1229,8 +1229,8 @@ void SvxFontWorkDialog::ApplyImageList()
 
     ResMgr* _pMgr = &DIALOG_MGR();
 
-    USHORT nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1;
-    USHORT nTextResId = RID_SVXSTR_FONTWORK_FORM1;
+    sal_uInt16 nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1;
+    sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1;
 
     bool bInit = aFormSet.GetItemCount() == 0;
 
@@ -1244,7 +1244,7 @@ void SvxFontWorkDialog::ApplyImageList()
 */
     }
 
-    USHORT i;
+    sal_uInt16 i;
     for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ )
     {
         if( bInit )
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 8d9ebac5a5aa..45ceac57c564 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -748,7 +748,7 @@ inline Point lclToMapUnit( long nSubXPos, long nSubYPos )
 /** Returns a polygon constructed from a vector of points. */
 inline Polygon lclCreatePolygon( const PointVec& rPoints )
 {
-    return Polygon( static_cast< USHORT >( rPoints.size() ), &rPoints[ 0 ] );
+    return Polygon( static_cast< sal_uInt16 >( rPoints.size() ), &rPoints[ 0 ] );
 }
 
 /** Returns a polygon constructed from the four passed points. */
@@ -1230,9 +1230,9 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid
 {
     maColor = rBorder.GetColor();
 
-    USHORT nPrim = rBorder.GetOutWidth();
-    USHORT nDist = rBorder.GetDistance();
-    USHORT nSecn = rBorder.GetInWidth();
+    sal_uInt16 nPrim = rBorder.GetOutWidth();
+    sal_uInt16 nDist = rBorder.GetDistance();
+    sal_uInt16 nSecn = rBorder.GetInWidth();
 
     if( !nSecn )    // no or single frame border
     {
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 16bc17976aa4..d25473f32570 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -111,7 +111,7 @@ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder )
 }
 
 /** Converts an SvxBorderLine line width (in twips) to a pixel line width. */
-inline sal_uInt16 lclGetPixel( USHORT nWidth )
+inline sal_uInt16 lclGetPixel( sal_uInt16 nWidth )
 {
     // convert all core styles expect 0 to a visible UI style (at least 1 pixel), map 1pt to 1pixel
     return nWidth ? std::min< sal_uInt16 >( std::max< sal_uInt16 >( (nWidth + 5) / 20, 1 ), FRAMESEL_GEOM_WIDTH ) : 0;
@@ -219,7 +219,7 @@ void FrameBorder::SetKeyboardNeighbors(
     meKeyBottom = eBottom;
 }
 
-FrameBorderType FrameBorder::GetKeyboardNeighbor( USHORT nKeyCode ) const
+FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const
 {
     FrameBorderType eBorder = FRAMEBORDER_NONE;
     switch( nKeyCode )
@@ -426,7 +426,7 @@ void FrameSelectorImpl::InitBorderGeometry()
             aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs,     aRect.Bottom() - nDiagFocusOffsY ) );
             aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs,     aRect.Bottom() + mnFocusOffs     ) );
             aFocusVec.push_back( Point( aRect.Right() - nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs     ) );
-            maTLBR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
+            maTLBR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
 
             aFocusVec.clear();
             aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs,     aRect.Top()    + nDiagFocusOffsY ) );
@@ -435,7 +435,7 @@ void FrameSelectorImpl::InitBorderGeometry()
             aFocusVec.push_back( Point( aRect.Left()  - mnFocusOffs,     aRect.Bottom() - nDiagFocusOffsY ) );
             aFocusVec.push_back( Point( aRect.Left()  - mnFocusOffs,     aRect.Bottom() + mnFocusOffs     ) );
             aFocusVec.push_back( Point( aRect.Left()  + nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs     ) );
-            maBLTR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
+            maBLTR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
         }
     }
 
@@ -577,7 +577,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder )
     long nTLPos = 0;
     long nBRPos = mnCtrlSize - mnArrowSize;
     Point aPos1, aPos2;
-    USHORT nImgId1 = 0, nImgId2 = 0;
+    sal_uInt16 nImgId1 = 0, nImgId2 = 0;
     switch( rBorder.GetType() )
     {
         case FRAMEBORDER_LEFT:
@@ -606,7 +606,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder )
     }
 
     // Arrow or marker? Do not draw arrows into disabled control.
-    USHORT nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8;
+    sal_uInt16 nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8;
     maVirDev.DrawImage( aPos1, maILArrows.GetImage( nImgId1 + nSelectAdd ) );
     maVirDev.DrawImage( aPos2, maILArrows.GetImage( nImgId2 + nSelectAdd ) );
 }
@@ -680,7 +680,7 @@ void FrameSelectorImpl::DrawAllTrackingRects()
         aPPoly.Insert( Polygon( Rectangle( maVirDevPos, maVirDev.GetOutputSizePixel() ) ) );
 
     aPPoly.Optimize( POLY_OPTIMIZE_CLOSE );
-    for( USHORT nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx )
+    for( sal_uInt16 nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx )
         mrFrameSel.InvertTracking( aPPoly.GetObject( nIdx ), SHOWTRACK_SMALL | SHOWTRACK_WINDOW );
 }
 
@@ -862,7 +862,7 @@ void FrameSelector::HideAllBorders()
         mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE );
 }
 
-bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSecn ) const
+bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSecn ) const
 {
     VisFrameBorderCIter aIt( mxImpl->maEnabBorders );
     if( !aIt.Is() )
@@ -941,7 +941,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
         mxImpl->SelectBorder( **aIt, bSelect );
 }
 
-void FrameSelector::SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSecn )
+void FrameSelector::SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSecn )
 {
     mxImpl->maCurrStyle.SetOutWidth( nPrim );
     mxImpl->maCurrStyle.SetDistance( nDist );
@@ -1111,7 +1111,7 @@ void FrameSelector::KeyInput( const KeyEvent& rKEvt )
     KeyCode aKeyCode = rKEvt.GetKeyCode();
     if( !aKeyCode.GetModifier() )
     {
-        USHORT nCode = aKeyCode.GetCode();
+        sal_uInt16 nCode = aKeyCode.GetCode();
         switch( nCode )
         {
             case KEY_SPACE:
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 7c0794d8bb6e..66f4e34eb022 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -84,8 +84,8 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
             aMap100         ( MAP_100TH_MM ),
             eObjKind        ( OBJ_NONE ),
             nPolyEdit       ( 0 ),
-            bEditMode       ( FALSE ),
-            bSdrMode        ( FALSE ),
+            bEditMode       ( sal_False ),
+            bSdrMode        ( sal_False ),
             mpAccContext    ( NULL ),
             pModel          ( NULL ),
             pView           ( NULL )
@@ -97,7 +97,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
 
     SetWinStyle( nWinBits );
 
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 
@@ -113,9 +113,9 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
             nWinStyle       ( 0 ),
             eObjKind        ( OBJ_NONE ),
             nPolyEdit       ( 0 ),
-            bEditMode       ( FALSE ),
-            bSdrMode        ( FALSE ),
-            bAnim           ( FALSE ),
+            bEditMode       ( sal_False ),
+            bSdrMode        ( sal_False ),
+            bAnim           ( sal_False ),
             mpAccContext    ( NULL ),
             pModel          ( NULL ),
             pView           ( NULL )
@@ -124,7 +124,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
     aUpdateTimer.SetTimeout( 500 );
     aUpdateTimer.SetTimeoutHdl( LINK( this, GraphCtrl, UpdateHdl ) );
     aUpdateTimer.Start();
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 
@@ -207,12 +207,12 @@ void GraphCtrl::InitSdrModel()
     // View anlegen
     pView = new GraphCtrlView( pModel, this );
     pView->SetWorkArea( Rectangle( Point(), aGraphSize ) );
-    pView->EnableExtendedMouseEventDispatcher( TRUE );
+    pView->EnableExtendedMouseEventDispatcher( sal_True );
     pView->ShowSdrPage(pView->GetModel()->GetPage(0));
 //  pView->ShowSdrPage(pView->GetModel()->GetPage(0));
-    pView->SetFrameDragSingles( TRUE );
+    pView->SetFrameDragSingles( sal_True );
     pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC );
-    pView->SetEditMode( TRUE );
+    pView->SetEditMode( sal_True );
 
     // #i72889# set neeeded flags
     pView->SetPagePaintingAllowed(false);
@@ -231,7 +231,7 @@ void GraphCtrl::InitSdrModel()
 |*
 \************************************************************************/
 
-void GraphCtrl::SetGraphic( const Graphic& rGraphic, BOOL bNewModel )
+void GraphCtrl::SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel )
 {
     // Bitmaps dithern wir ggf. fuer die Anzeige
     if ( !bAnim && ( rGraphic.GetType() == GRAPHIC_BITMAP )  )
@@ -402,7 +402,7 @@ void GraphCtrl::MarkListHasChanged()
 void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
 {
     KeyCode aCode( rKEvt.GetKeyCode() );
-    BOOL    bProc = FALSE;
+    sal_Bool    bProc = sal_False;
 
     switch ( aCode.GetCode() )
     {
@@ -412,7 +412,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
             if ( bSdrMode )
             {
                 pView->DeleteMarked();
-                bProc = TRUE;
+                bProc = sal_True;
                 if( !pView->AreObjectsMarked() )
                     ((Dialog*)GetParent())->GrabFocusToFirstControl();
             }
@@ -445,7 +445,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
                 {
                     ((Dialog*)GetParent())->GrabFocusToFirstControl();
                 }
-                bProc = TRUE;
+                bProc = sal_True;
             }
         }
         break;
@@ -466,7 +466,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
                         pView->UnmarkAllObj();
                         pView->MarkNextObj (bForward);
                     }
-                    bProc = TRUE;
+                    bProc = sal_True;
                 }
                 else if(aCode.IsMod1())
                 {
@@ -489,7 +489,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
             {
                 // #97016# mark last object
                 pView->UnmarkAllObj();
-                pView->MarkNextObj(FALSE);
+                pView->MarkNextObj(sal_False);
 
                 bProc = true;
             }
@@ -501,7 +501,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
             if ( aCode.IsMod1() )
             {
                 pView->UnmarkAllObj();
-                pView->MarkNextObj(TRUE);
+                pView->MarkNextObj(sal_True);
 
                 bProc = true;
             }
@@ -617,13 +617,13 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
                         if(pView->IsDragObj())
                         {
                             FASTBOOL bWasNoSnap = rDragStat.IsNoSnap();
-                            BOOL bWasSnapEnabled = pView->IsSnapEnabled();
+                            sal_Bool bWasSnapEnabled = pView->IsSnapEnabled();
 
                             // switch snapping off
                             if(!bWasNoSnap)
-                                ((SdrDragStat&)rDragStat).SetNoSnap(TRUE);
+                                ((SdrDragStat&)rDragStat).SetNoSnap(sal_True);
                             if(bWasSnapEnabled)
-                                pView->SetSnapEnabled(FALSE);
+                                pView->SetSnapEnabled(sal_False);
 
                             pView->MovAction(aEndPoint);
                             pView->EndDragObj();
@@ -696,7 +696,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
                         }
                     }
 
-                    bProc = TRUE;
+                    bProc = sal_True;
                 }
             }
         }
@@ -848,17 +848,17 @@ SdrObject* GraphCtrl::GetSelectedSdrObject() const
 |*
 \************************************************************************/
 
-void GraphCtrl::SetEditMode( const BOOL _bEditMode )
+void GraphCtrl::SetEditMode( const sal_Bool _bEditMode )
 {
     if ( bSdrMode )
     {
         bEditMode = _bEditMode;
         pView->SetEditMode( bEditMode );
         eObjKind = OBJ_NONE;
-        pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) );
+        pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) );
     }
     else
-        bEditMode = FALSE;
+        bEditMode = sal_False;
 }
 
 
@@ -868,7 +868,7 @@ void GraphCtrl::SetEditMode( const BOOL _bEditMode )
 |*
 \************************************************************************/
 
-void GraphCtrl::SetPolyEditMode( const USHORT _nPolyEdit )
+void GraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit )
 {
     if ( bSdrMode && ( _nPolyEdit != nPolyEdit ) )
     {
@@ -890,10 +890,10 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
 {
     if ( bSdrMode )
     {
-        bEditMode = FALSE;
+        bEditMode = sal_False;
         pView->SetEditMode( bEditMode );
         eObjKind = _eObjKind;
-        pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) );
+        pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) );
     }
     else
         eObjKind = OBJ_NONE;
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 99d8d507f13c..53cead9f00cf 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -46,10 +46,10 @@
 // - SvxGraphicFilter -
 // --------------------
 
-ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
+sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
 {
     const Graphic&  rGraphic = rFilterObject.GetGraphic();
-    ULONG           nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;
+    sal_uIntPtr         nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;
 
     if( rGraphic.GetType() == GRAPHIC_BITMAP )
     {
@@ -63,7 +63,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
             case( SID_GRFFILTER_INVERT ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -81,14 +81,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_SMOOTH ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -106,14 +106,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_SHARPEN ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -131,14 +131,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_REMOVENOISE ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -156,14 +156,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_SOBEL ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -181,17 +181,17 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_MOSAIC ):
             {
-                //CHINA001 GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, FALSE );
+                //CHINA001 GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, sal_False );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC);
+                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, sal_False, RID_SVX_GRFFILTER_DLG_MOSAIC);
                     DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
                     if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
                         aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -233,7 +233,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
             case( SID_GRFFILTER_POPART  ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -251,7 +251,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
@@ -272,11 +272,11 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
 
             case( SID_GRFFILTER_SOLARIZE ):
             {
-                //CHINA001 GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, FALSE );
+                //CHINA001 GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, sal_False );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, FALSE, RID_SVX_GRFFILTER_DLG_SOLARIZE );
+                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, sal_False, RID_SVX_GRFFILTER_DLG_SOLARIZE );
                     DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
                     if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
                         aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -483,7 +483,7 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, p )
 // ----------------
 
 GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
-                                          USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) :
+                                          sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) :
     GraphicFilterDialog( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
     maFtWidth   ( this, SVX_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
     maMtrWidth  ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
@@ -556,7 +556,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
 // ------------------
 
 GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
-                                              BYTE cGreyThreshold, BOOL bInvert ) :
+                                              sal_uInt8 cGreyThreshold, sal_Bool bInvert ) :
     GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
     maFtThreshold   ( this, SVX_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
     maMtrThreshold  ( this, SVX_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
@@ -620,7 +620,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
 // ----------------------
 
 GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
-                                        USHORT nSepiaPercent ) :
+                                        sal_uInt16 nSepiaPercent ) :
     GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
     maFtSepia       ( this, SVX_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
     maMtrSepia      ( this, SVX_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
@@ -670,7 +670,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
 // -----------------------
 
 GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
-                                          USHORT nPosterCount ) :
+                                          sal_uInt16 nPosterCount ) :
     GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
     maFtPoster      ( this, SVX_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
     maNumPoster     ( this, SVX_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
@@ -696,7 +696,7 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
                                                  double fScaleX, double fScaleY )
 {
     Graphic         aRet;
-    const USHORT    nPosterCount = GetPosterColorCount();
+    const sal_uInt16    nPosterCount = GetPosterColorCount();
 
     if( rGraphic.IsAnimated() )
     {
@@ -756,7 +756,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
                                                  double fScaleX, double fScaleY )
 {
     Graphic aRet;
-    USHORT  nAzim, nElev;
+    sal_uInt16  nAzim, nElev;
 
     switch( maCtlLight.GetActualRP() )
     {
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 2da5df325dfa..67e34801ca34 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -71,7 +71,7 @@ static const long MINBODY = 56;  // 1mm in twips rounded
 static const long DEF_DIST_WRITER = 500;    // 5mm (Writer)
 static const long DEF_DIST_CALC = 250;      // 2,5mm (Calc)
 
-static USHORT pRanges[] =
+static sal_uInt16 pRanges[] =
 {
     SID_ATTR_BRUSH,          SID_ATTR_BRUSH,
     SID_ATTR_BORDER_OUTER,   SID_ATTR_BORDER_OUTER,
@@ -96,7 +96,7 @@ static USHORT pRanges[] =
 // gibt den Bereich der Which-Werte zurueck
 
 
-USHORT* SvxHeaderPage::GetRanges()
+sal_uInt16* SvxHeaderPage::GetRanges()
 {
     return pRanges;
 }
@@ -110,7 +110,7 @@ SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet )
 
 //------------------------------------------------------------------------
 
-USHORT* SvxFooterPage::GetRanges()
+sal_uInt16* SvxFooterPage::GetRanges()
 {
     return pRanges;
 }
@@ -142,7 +142,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) :
 
 // -----------------------------------------------------------------------
 
-SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, USHORT nSetId ) :
+SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAttr, sal_uInt16 nSetId ) :
 
     SfxTabPage( pParent, SVX_RES( nResId ), rAttr ),
 
@@ -164,12 +164,12 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U
 
     nId                         ( nSetId ),
     pBBSet                      ( NULL ),
-    bDisableQueryBox            ( FALSE ),
-    bEnableBackgroundSelector   ( TRUE )
+    bDisableQueryBox            ( sal_False ),
+    bEnableBackgroundSelector   ( sal_True )
 
 {
     InitHandler();
-    aBspWin.EnableRTL( FALSE );
+    aBspWin.EnableRTL( sal_False );
 
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
@@ -193,20 +193,20 @@ SvxHFPage::~SvxHFPage()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
 {
-    const USHORT        nWSize      = GetWhich( SID_ATTR_PAGE_SIZE );
-    const USHORT        nWLRSpace   = GetWhich( SID_ATTR_LRSPACE );
-    const USHORT        nWULSpace   = GetWhich( SID_ATTR_ULSPACE );
-    const USHORT        nWOn        = GetWhich( SID_ATTR_PAGE_ON );
-    const USHORT        nWDynamic   = GetWhich( SID_ATTR_PAGE_DYNAMIC );
-    const USHORT        nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
-    const USHORT        nWShared    = GetWhich( SID_ATTR_PAGE_SHARED );
-    const USHORT        nWBrush     = GetWhich( SID_ATTR_BRUSH );
-    const USHORT        nWBox       = GetWhich( SID_ATTR_BORDER_OUTER );
-    const USHORT        nWBoxInfo   = GetWhich( SID_ATTR_BORDER_INNER );
-    const USHORT        nWShadow    = GetWhich( SID_ATTR_BORDER_SHADOW );
-    const USHORT        aWhichTab[] = { nWSize,     nWSize,
+    const sal_uInt16        nWSize      = GetWhich( SID_ATTR_PAGE_SIZE );
+    const sal_uInt16        nWLRSpace   = GetWhich( SID_ATTR_LRSPACE );
+    const sal_uInt16        nWULSpace   = GetWhich( SID_ATTR_ULSPACE );
+    const sal_uInt16        nWOn        = GetWhich( SID_ATTR_PAGE_ON );
+    const sal_uInt16        nWDynamic   = GetWhich( SID_ATTR_PAGE_DYNAMIC );
+    const sal_uInt16        nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
+    const sal_uInt16        nWShared    = GetWhich( SID_ATTR_PAGE_SHARED );
+    const sal_uInt16        nWBrush     = GetWhich( SID_ATTR_BRUSH );
+    const sal_uInt16        nWBox       = GetWhich( SID_ATTR_BORDER_OUTER );
+    const sal_uInt16        nWBoxInfo   = GetWhich( SID_ATTR_BORDER_INNER );
+    const sal_uInt16        nWShadow    = GetWhich( SID_ATTR_BORDER_SHADOW );
+    const sal_uInt16        aWhichTab[] = { nWSize,     nWSize,
                                         nWLRSpace,  nWLRSpace,
                                         nWULSpace,  nWULSpace,
                                         nWOn,       nWOn,
@@ -252,15 +252,15 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
 
     // Raender
     SvxLRSpaceItem aLR( nWLRSpace );
-    aLR.SetLeft( (USHORT)GetCoreValue( aLMEdit, eUnit ) );
-    aLR.SetRight( (USHORT)GetCoreValue( aRMEdit, eUnit ) );
+    aLR.SetLeft( (sal_uInt16)GetCoreValue( aLMEdit, eUnit ) );
+    aLR.SetRight( (sal_uInt16)GetCoreValue( aRMEdit, eUnit ) );
     aSet.Put( aLR );
 
     SvxULSpaceItem aUL( nWULSpace );
     if ( nId == SID_ATTR_PAGE_HEADERSET )
-        aUL.SetLower( (USHORT)nDist );
+        aUL.SetLower( (sal_uInt16)nDist );
     else
-        aUL.SetUpper( (USHORT)nDist );
+        aUL.SetUpper( (sal_uInt16)nDist );
     aSet.Put( aUL );
 
     // Hintergrund und Umrandung?
@@ -272,7 +272,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
         const SfxPoolItem* pItem;
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) )
+             GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
         {
             _pSet = &( (SvxSetItem*)pItem )->GetItemSet();
 
@@ -291,7 +291,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
     SvxSetItem aSetItem( GetWhich( nId ), aSet );
     rSet.Put( aSetItem );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -308,7 +308,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
     //
     const SvxSetItem* pSetItem = 0;
 
-    if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), FALSE,
+    if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -372,9 +372,9 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aTurnOnBox.Check( FALSE );
-        aHeightDynBtn.Check( TRUE );
-        aCntSharedBox.Check( TRUE );
+        aTurnOnBox.Check( sal_False );
+        aHeightDynBtn.Check( sal_True );
+        aCntSharedBox.Check( sal_True );
     }
 
     TurnOnHdl(0);
@@ -388,10 +388,10 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
     aCntSharedBox.SaveValue();
     RangeHdl( 0 );
 
-    USHORT nHtmlMode = 0;
+    sal_uInt16 nHtmlMode = 0;
     const SfxPoolItem* pItem = 0;
     SfxObjectShell* pShell;
-    if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) ||
+    if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
         ( 0 != (pShell = SfxObjectShell::Current()) &&
                     0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
     {
@@ -444,7 +444,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
         aRMLbl.Enable();
         aRMEdit.Enable();
 
-        USHORT nUsage = aBspWin.GetUsage();
+        sal_uInt16 nUsage = aBspWin.GetUsage();
 
         if( nUsage == SVX_PAGE_RIGHT || nUsage == SVX_PAGE_LEFT )
             aCntSharedBox.Disable();
@@ -454,16 +454,16 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
     }
     else
     {
-        BOOL bDelete = TRUE;
+        sal_Bool bDelete = sal_True;
 
-        if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == TRUE )
+        if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == sal_True )
             bDelete = ( QueryBox( this, SVX_RES( RID_SVXQBX_DELETE_HEADFOOT ) ).Execute() == RET_YES );
 
         if ( bDelete )
         {
             aDistFT.Disable();
             aDistEdit.Disable();
-            aDynSpacingCB.Enable(FALSE);
+            aDynSpacingCB.Enable(sal_False);
             aHeightFT.Disable();
             aHeightEdit.Disable();
             aHeightDynBtn.Disable();
@@ -522,10 +522,10 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
     if ( !pBBSet )
     {
         // nur die n"otigen Items f"uer Umrandung und Hintergrund benutzen
-        USHORT nBrush = GetWhich( SID_ATTR_BRUSH );
-        USHORT nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
-        USHORT nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
-        USHORT nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
+        sal_uInt16 nBrush = GetWhich( SID_ATTR_BRUSH );
+        sal_uInt16 nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
+        sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+        sal_uInt16 nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
 
         // einen leeren Set erzeugenc
         pBBSet = new SfxItemSet( *GetItemSet().GetPool(), nBrush, nBrush,
@@ -534,12 +534,12 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
         const SfxPoolItem* pItem;
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) )
+             GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
             // wenn es schon einen gesetzen Set gibt, dann diesen benutzen
             pBBSet->Put( ( (SvxSetItem*)pItem)->GetItemSet() );
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( nInner, FALSE, &pItem ) )
+             GetItemSet().GetItemState( nInner, sal_False, &pItem ) )
             // das gesetze InfoItem wird immer ben"otigt
             pBBSet->Put( *pItem );
     }
@@ -565,7 +565,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
 
             //----------------------------------------------------------------
 
-            USHORT nWhich = GetWhich( SID_ATTR_BRUSH );
+            sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH );
 
             if ( pBBSet->GetItemState( nWhich ) == SFX_ITEM_SET )
             {
@@ -628,12 +628,12 @@ void SvxHFPage::UpdateExample()
 
 void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 {
-    USHORT nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
+    sal_uInt16 nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
 
-    if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
+    if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
     {
         const SvxSetItem& rSetItem =
-            (const SvxSetItem&)rSet.Get( nWhich, FALSE );
+            (const SvxSetItem&)rSet.Get( nWhich, sal_False );
         const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
         const SfxBoolItem& rOn =
             (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -660,10 +660,10 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
     nWhich = GetWhich( SID_ATTR_PAGE_FOOTERSET );
 
-    if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
+    if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
     {
         const SvxSetItem& rSetItem =
-            (const SvxSetItem&)rSet.Get( nWhich, FALSE );
+            (const SvxSetItem&)rSet.Get( nWhich, sal_False );
         const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
         const SfxBoolItem& rOn =
             (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -750,7 +750,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
         aBspWin.SetBottom( 0 );
     }
 
-    USHORT nUsage = SVX_PAGE_ALL;
+    sal_uInt16 nUsage = SVX_PAGE_ALL;
     pItem = GetItem( rSet, SID_ATTR_PAGE );
 
     if ( pItem )
@@ -776,7 +776,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
     const SvxSetItem* pSetItem = 0;
 
     if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ),
-                                            FALSE,
+                                            sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -797,7 +797,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
             aBspWin.SetHdDist( nDist );
             aBspWin.SetHdLeft( rLR.GetLeft() );
             aBspWin.SetHdRight( rLR.GetRight() );
-            aBspWin.SetHeader( TRUE );
+            aBspWin.SetHeader( sal_True );
         }
         else
             pSetItem = 0;
@@ -805,7 +805,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aBspWin.SetHeader( FALSE );
+        aBspWin.SetHeader( sal_False );
 
         if ( SID_ATTR_PAGE_HEADERSET == nId )
             aCntSharedBox.Disable();
@@ -813,7 +813,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
     pSetItem = 0;
 
     if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ),
-                                            FALSE,
+                                            sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
@@ -834,7 +834,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
             aBspWin.SetFtDist( nDist );
             aBspWin.SetFtLeft( rLR.GetLeft() );
             aBspWin.SetFtRight( rLR.GetRight() );
-            aBspWin.SetFooter( TRUE );
+            aBspWin.SetFooter( sal_True );
         }
         else
             pSetItem = 0;
@@ -842,7 +842,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aBspWin.SetFooter( FALSE );
+        aBspWin.SetFooter( sal_False );
 
         if ( SID_ATTR_PAGE_FOOTERSET == nId )
             aCntSharedBox.Disable();
@@ -852,7 +852,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( pItem && pItem->ISA(SfxBoolItem) )
     {
-        aBspWin.SetTable( TRUE );
+        aBspWin.SetTable( sal_True );
         aBspWin.SetHorz( ( (SfxBoolItem*)pItem )->GetValue() );
     }
 
@@ -860,7 +860,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( pItem && pItem->ISA(SfxBoolItem) )
     {
-        aBspWin.SetTable( TRUE );
+        aBspWin.SetTable( sal_True );
         aBspWin.SetVert( ( (SfxBoolItem*)pItem )->GetValue() );
     }
     ResetBackground_Impl( rSet );
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index dcca52044531..3b15bc245779 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -57,7 +57,7 @@ struct MyStruct
     SfxWorkWindow*      pWorkWin;
 };
 
-SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
+SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
                                                 SfxBindings* pBindings,
                                                 SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId ),
@@ -71,7 +71,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
     mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG );
     DBG_ASSERT(mpDlg, "Dialogdiet fail!");//CHINA001
     pWindow = mpDlg->GetWindow();
-    ((MyStruct*)pImp)->bVisible = FALSE;
+    ((MyStruct*)pImp)->bVisible = sal_False;
 
     Window* pTopWindow = 0;
     if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 &&
@@ -92,7 +92,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
 
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
 
-    SetHideNotDelete( TRUE );
+    SetHideNotDelete( sal_True );
 }
 
 SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
index 51897af95da8..d29a4f5969e1 100644
--- a/svx/source/dialog/hyprdlg.hxx
+++ b/svx/source/dialog/hyprdlg.hxx
@@ -96,17 +96,17 @@ private:
     String              sSearchTitle;
     PopupMenu           aLinkPopup;
     PopupMenu           *pTargetMenu;
-    BOOL                bNoDoc;
-    BOOL                bSend;
-    BOOL                bHasOldName;
+    sal_Bool                bNoDoc;
+    sal_Bool                bSend;
+    sal_Bool                bHasOldName;
     long                nMaxWidth;
     long                nMinWidth;
     long                nMaxHeight;
-    BOOL                bHtmlMode;
+    sal_Bool                bHtmlMode;
 
     SfxImageManager*    mpManager;
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
 
     // DockingWindow
@@ -114,7 +114,7 @@ private:
     virtual void Resizing(Size& rSize);
 
     // Drag&Drop
-    BOOL         GetDragData(USHORT nItem, ULONG nDDFormatId, String& rBuffer);
+    sal_Bool         GetDragData(sal_uInt16 nItem, sal_uIntPtr nDDFormatId, String& rBuffer);
 
     DECL_LINK(TBClickHdl, ToolBox *);
     DECL_LINK(TBSelectHdl, ToolBox *);
@@ -127,9 +127,9 @@ private:
 
     void    OpenDoc( const String& rURL, SfxViewFrame* pViewFrame );
     void    EnableLink();
-    void    SendToApp(USHORT nType);
+    void    SendToApp(sal_uInt16 nType);
     void    AddToHistory(const String& rName, const String& rURL);
-    void    TargetMenu(const String& rSelEntry, BOOL bExecute);
+    void    TargetMenu(const String& rSelEntry, sal_Bool bExecute);
     String  GetSelTarget();
 
     void    SetImages();
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index b8f150736ea1..dc7b438db0af 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -117,10 +117,10 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) :
     aLinkPopup          ( SVX_RES( RID_SVXMN_HYPERLINK ) ),
     pTargetMenu         ( NULL ),
 
-    bNoDoc              ( TRUE ),
-    bSend               ( FALSE ),
-    bHasOldName         ( FALSE ),
-    bHtmlMode           ( FALSE )
+    bNoDoc              ( sal_True ),
+    bSend               ( sal_False ),
+    bHasOldName         ( sal_False ),
+    bHtmlMode           ( sal_False )
 
 {
     FreeResource();
@@ -234,14 +234,14 @@ void SvxHyperlinkDlg::Resize()
 
         if (nNewUrlWidth && nNewNameWidth)  // Flackern reduzieren
         {
-            SetUpdateMode(FALSE);
+            SetUpdateMode(sal_False);
 
             // Comboboxen resizen
             aUrlCB.DoResize(nNewUrlWidth);
             aNameCB.DoResize(nNewNameWidth);
             RecalcItems();  // Alle Elemente neu anordnen
 
-            SetUpdateMode(TRUE);
+            SetUpdateMode(sal_True);
         }
     }
 }
@@ -265,16 +265,16 @@ void SvxHyperlinkDlg::Resizing(Size& rSize)
     Beschreibung: Im Dokument selektierten Hyperlink in Leiste anzeigen
  --------------------------------------------------------------------*/
 
-void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxHyperlinkDlg::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                                     const SfxPoolItem* pState )
 {
     if ( nSID == SID_HYPERLINK_DIALOG )
     {
         if( eState != SFX_ITEM_DISABLED)
         {
-            EnableItem( BTN_OPENDIALOG, TRUE );
+            EnableItem( BTN_OPENDIALOG, sal_True );
 
-            BOOL bItem = FALSE;
+            sal_Bool bItem = sal_False;
             if ( pState && eState == SFX_ITEM_AVAILABLE )
                     bItem = ((SfxBoolItem*)pState)->GetValue();
             SetItemState ( BTN_OPENDIALOG, bItem ? STATE_CHECK : STATE_NOCHECK );
@@ -282,16 +282,16 @@ void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
         else
         {
             SetItemState ( BTN_OPENDIALOG, STATE_NOCHECK );
-            EnableItem( BTN_OPENDIALOG, FALSE );
+            EnableItem( BTN_OPENDIALOG, sal_False );
         }
     }
 
     if (nSID == SID_HYPERLINK_SETLINK)
     {
         if (eState == SFX_ITEM_DISABLED)
-            bNoDoc = TRUE;
+            bNoDoc = sal_True;
         else
-            bNoDoc = FALSE;
+            bNoDoc = sal_False;
         EnableItem(BTN_TARGET, !bNoDoc);
         EnableLink();
     }
@@ -302,15 +302,15 @@ void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
         {
             const SvxHyperlinkItem& rHLnkItem = *((const SvxHyperlinkItem*)pState);
 
-            USHORT nNamePos = aNameCB.GetEntryPos(aNameCB.GetText());
-            USHORT nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText());
-            USHORT nNotFound = COMBOBOX_ENTRY_NOTFOUND;
+            sal_uInt16 nNamePos = aNameCB.GetEntryPos(aNameCB.GetText());
+            sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText());
+            sal_uInt16 nNotFound = COMBOBOX_ENTRY_NOTFOUND;
 
             if (!bHasOldName &&
                 (nNamePos == nNotFound || nUrlPos == nNotFound))
             {
                 sOldName = aNameCB.GetText();
-                bHasOldName = TRUE;
+                bHasOldName = sal_True;
             }
             if (rHLnkItem.GetName().Len())
             {
@@ -328,7 +328,7 @@ void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
                 aUrlCB.SetText(aUrlCB.GetEntry(0));
             }
 
-            TargetMenu(rHLnkItem.GetTargetFrame(), FALSE);
+            TargetMenu(rHLnkItem.GetTargetFrame(), sal_False);
             bHtmlMode = (rHLnkItem.GetInsertMode() & HLINK_HTMLMODE) != 0;
         }
         else
@@ -360,7 +360,7 @@ IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox )
         break;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*--------------------------------------------------------------------
@@ -391,7 +391,7 @@ IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox )
         break;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
@@ -419,7 +419,7 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
 
             sal_uInt16         nCount = aSearchConfig.Count();
             String sFound;
-            for (USHORT i = 0; i < nCount; i++)
+            for (sal_uInt16 i = 0; i < nCount; i++)
             {
                 const SvxSearchEngineData& rData = aSearchConfig.GetData(i);
                 //check if it's the configured default search engine
@@ -439,9 +439,9 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
                     pMenu->InsertItem( i + 1, rData.sEngineName);
                 }
             }
-            pBox->SetItemDown(BTN_INET_SEARCH, TRUE, TRUE);
+            pBox->SetItemDown(BTN_INET_SEARCH, sal_True, sal_True);
             pMenu->Execute( this, GetItemRect( BTN_INET_SEARCH ), FLOATWIN_POPUPMODE_DOWN );
-            pBox->SetItemDown(BTN_INET_SEARCH, FALSE, TRUE);
+            pBox->SetItemDown(BTN_INET_SEARCH, sal_False, sal_True);
             EndSelection();
             delete pMenu;
         }
@@ -450,24 +450,24 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
         case BTN_TARGET:
         {
             // Target Frame einstellen
-            TargetMenu(GetSelTarget(), TRUE);
+            TargetMenu(GetSelTarget(), sal_True);
             EndSelection();
         }
         break;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
 
-void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
+void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, sal_Bool bExecute)
 {
     if (pTargetMenu && !bExecute)
     {
-        for (USHORT i = 1; i <= pTargetMenu->GetItemCount(); i++)
+        for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++)
         {
             if (pTargetMenu->GetItemText(i) == rSelEntry)
             {
@@ -484,10 +484,10 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
         TargetList aList;
         pVwFrm->GetTopFrame().GetTargetList(aList);
 
-        USHORT nCount = (USHORT)aList.Count();
+        sal_uInt16 nCount = (sal_uInt16)aList.Count();
         if( nCount )
         {
-            BOOL bChecked = FALSE;
+            sal_Bool bChecked = sal_False;
 
             if (pTargetMenu != NULL)
                 delete pTargetMenu;
@@ -495,7 +495,7 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
             pTargetMenu = new PopupMenu;
             pTargetMenu->SetMenuFlags( pTargetMenu->GetMenuFlags() |
                                        MENU_FLAG_NOAUTOMNEMONICS );
-            USHORT i;
+            sal_uInt16 i;
             for ( i = 0; i < nCount; i++ )
             {
                 String sEntry(*aList.GetObject(i));
@@ -504,7 +504,7 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
                 if (sEntry == rSelEntry)
                 {
                     pTargetMenu->CheckItem(i + 1);
-                    bChecked = TRUE;
+                    bChecked = sal_True;
                 }
             }
             for ( i = nCount; i; i-- )
@@ -515,7 +515,7 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
 
             if (bExecute)
             {
-                USHORT nEntry = pTargetMenu->Execute(
+                sal_uInt16 nEntry = pTargetMenu->Execute(
                     this, GetItemRect( BTN_TARGET ), FLOATWIN_POPUPMODE_DOWN );
                 if ( nEntry )
                     pTargetMenu->CheckItem( nEntry );
@@ -540,7 +540,7 @@ IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu )
             break;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*--------------------------------------------------------------------
@@ -601,7 +601,7 @@ IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
 
     if ((nTok = sText.GetTokenCount(cToken)) > 1)
     {
-        for (USHORT i = 0; i < nTok; i++)
+        for (sal_uInt16 i = 0; i < nTok; i++)
         {
             sURL += sText.GetToken(i, cToken);
             if(i < nTok -1)
@@ -620,7 +620,7 @@ IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
         pViewFrame = pViewFrame->GetTopViewFrame();
     OpenDoc( sURL, pViewFrame );
 
-    return TRUE;
+    return sal_True;
 }
 
 /*--------------------------------------------------------------------
@@ -635,7 +635,7 @@ IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl )
         ComboModifyHdl(&aUrlCB);
     }
 
-    return TRUE;
+    return sal_True;
 }
 /*--------------------------------------------------------------------
     Beschreibung: Link-Button enablen/disablen
@@ -643,7 +643,7 @@ IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl )
 
 void SvxHyperlinkDlg::EnableLink()
 {
-    BOOL bEnable = aUrlCB.GetText().Len() != 0;
+    sal_Bool bEnable = aUrlCB.GetText().Len() != 0;
 
     EnableItem(BTN_LINK, (!bNoDoc) & bEnable);
 }
@@ -652,10 +652,10 @@ void SvxHyperlinkDlg::EnableLink()
     Beschreibung: URL im Dokument einfuegen
  --------------------------------------------------------------------*/
 
-void SvxHyperlinkDlg::SendToApp(USHORT nType)
+void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType)
 {
-    BOOL bIsFile = FALSE;
-    bSend = TRUE;
+    sal_Bool bIsFile = sal_False;
+    bSend = sal_True;
     String sURL( aUrlCB.GetText() );
 
     if ( !sURL.Len() )
@@ -667,13 +667,13 @@ void SvxHyperlinkDlg::SendToApp(USHORT nType)
                                                   INetURLObject::DECODE_UNAMBIGUOUS ) );
     sURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
     if ( aObj.GetProtocol() == INET_PROT_FILE )
-        bIsFile = TRUE;
+        bIsFile = sal_True;
 
     if ( bIsFile )
     {
         EnterWait();
-        SfxMedium aMedium( sURL, STREAM_STD_READ, TRUE );
-        if ( aMedium.Exists( FALSE ) == FALSE )
+        SfxMedium aMedium( sURL, STREAM_STD_READ, sal_True );
+        if ( aMedium.Exists( sal_False ) == sal_False )
         {
             LeaveWait();
             QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) );
@@ -716,7 +716,7 @@ String SvxHyperlinkDlg::GetSelTarget()
 
     if (pTargetMenu != NULL)
     {
-        for (USHORT i = 1; i <= pTargetMenu->GetItemCount(); i++)
+        for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++)
         {
             if (pTargetMenu->IsItemChecked(i))
             {
@@ -740,7 +740,7 @@ void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
     if (bHasOldName && sOldName.Len())
     {
         sName = sOldName;
-        bHasOldName = FALSE;
+        bHasOldName = sal_False;
     }
 
     if (!sName.Len())
@@ -748,9 +748,9 @@ void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
 
     if (rURL.Len())
     {
-        USHORT nNamePos = aNameCB.GetEntryPos(sName);
-        USHORT nUrlPos = aUrlCB.GetEntryPos(rURL);
-        USHORT nPos = COMBOBOX_ENTRY_NOTFOUND;
+        sal_uInt16 nNamePos = aNameCB.GetEntryPos(sName);
+        sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(rURL);
+        sal_uInt16 nPos = COMBOBOX_ENTRY_NOTFOUND;
 
         if (nNamePos != COMBOBOX_ENTRY_NOTFOUND)
             nPos = nNamePos;
@@ -777,7 +777,7 @@ void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
 
 IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
 {
-    USHORT nPos = pCombo->GetEntryPos(pCombo->GetText());
+    sal_uInt16 nPos = pCombo->GetEntryPos(pCombo->GetText());
 
     if (nPos != COMBOBOX_ENTRY_NOTFOUND)
     {
@@ -785,10 +785,10 @@ IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
         aUrlCB.SetText(aUrlCB.GetEntry(nPos));
 
         EnableLink();
-        EnableItem(BTN_INSERT_BOOKMARK, TRUE);
-        EnableItem(BTN_INET_SEARCH, TRUE);
+        EnableItem(BTN_INSERT_BOOKMARK, sal_True);
+        EnableItem(BTN_INET_SEARCH, sal_True);
     }
-    return TRUE;
+    return sal_True;
 }
 
 /*--------------------------------------------------------------------
@@ -797,10 +797,10 @@ IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
 
 IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo )
 {
-    BOOL bEnable = TRUE;
+    sal_Bool bEnable = sal_True;
 
     if (!pCombo->GetText().Len())
-        bEnable = FALSE;
+        bEnable = sal_False;
 
     if (pCombo == &aNameCB)
     {
@@ -811,14 +811,14 @@ IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo )
     EnableLink();
 
     if (aUrlCB.GetText().Len())
-        bEnable = TRUE;
+        bEnable = sal_True;
     else
-        bEnable = FALSE;
+        bEnable = sal_False;
 
     if (IsItemEnabled(BTN_INSERT_BOOKMARK) != bEnable)
         EnableItem(BTN_INSERT_BOOKMARK, bEnable);
 
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------
@@ -867,12 +867,12 @@ HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) :
 long HyperCombo::Notify( NotifyEvent& rNEvt )
 {
     long nHandled = 0;
-    static BOOL bLocked = FALSE;
+    static sal_Bool bLocked = sal_False;
 
     if (bLocked)    // Keine weiteren RETURNs annehmen (nicht Reentrant!)
         return nHandled;
 
-    bLocked = TRUE;
+    bLocked = sal_True;
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
@@ -891,7 +891,7 @@ long HyperCombo::Notify( NotifyEvent& rNEvt )
     if (!nHandled)
         nHandled = ComboBox::Notify( rNEvt );
 
-    bLocked = FALSE;
+    bLocked = sal_False;
 
     return nHandled;
 }
@@ -952,10 +952,10 @@ void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame )
 {
     SfxStringItem aName( SID_FILE_NAME, rURL );
     SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") );
-    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, TRUE );
-    SfxBoolItem aSilent( SID_SILENT, TRUE );
-    SfxBoolItem aReadOnly( SID_DOC_READONLY, TRUE );
-    SfxBoolItem aExternal( SID_BROWSE, TRUE );
+    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True );
+    SfxBoolItem aSilent( SID_SILENT, sal_True );
+    SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True );
+    SfxBoolItem aExternal( SID_BROWSE, sal_True );
     SfxDispatcher* pDisp = SfxViewFrame::Current() ? SfxViewFrame::Current()->GetDispatcher() : NULL;
 
     if ( pViewFrame )
@@ -977,7 +977,7 @@ SFX_IMPL_CHILDWINDOW(SvxHyperlinkDlgWrapper, SID_HYPERLINK_INSERT)
     Beschreibung: Wrapper fuer Hyperlinkleiste
  --------------------------------------------------------------------*/
 
-SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, USHORT nId,
+SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
                                                 SfxBindings* _pBindings, SfxChildWinInfo* /*pInfo*/ ) :
 
     SfxChildWindow( _pParent, nId )
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index df396bf99f41..9cd43f0f5195 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -120,7 +120,7 @@ inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cS
 |*
 \************************************************************************/
 
-SvxIMapDlgItem::SvxIMapDlgItem( USHORT _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
+SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
             SfxControllerItem   ( _nId, rBindings ),
             rIMap               ( rIMapDlg )
 {
@@ -132,7 +132,7 @@ SvxIMapDlgItem::SvxIMapDlgItem( USHORT _nId, SvxIMapDlg& rIMapDlg, SfxBindings&
 |*
 \************************************************************************/
 
-void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
+void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
                                    const SfxPoolItem* pItem )
 {
     if ( ( nSID == SID_IMAP_EXEC ) && pItem )
@@ -152,7 +152,7 @@ void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
 |*
 \************************************************************************/
 
-SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, USHORT nId,
+SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId,
                                               SfxBindings* pBindings,
                                               SfxChildWinInfo* pInfo ) :
             SfxChildWindow( _pParent, nId )
@@ -232,7 +232,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
     aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
     aTbxIMapDlg1.SetSizePixel( aTbxIMapDlg1.CalcWindowSizePixel() );
     aTbxIMapDlg1.SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) );
-    aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE );
+    aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True );
     TbxClickHdl( &aTbxIMapDlg1 );
 
     SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
@@ -247,16 +247,16 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
     aEdtText.Disable();
     maFtTarget.Disable();
     maCbbTarget.Disable();
-    pOwnData->bExecState = FALSE;
+    pOwnData->bExecState = sal_False;
 
     Resize();
 
     pOwnData->aTimer.SetTimeout( 100 );
     pOwnData->aTimer.SetTimeoutHdl( LINK( this, SvxIMapDlg, UpdateHdl ) );
 
-    aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE );
-    aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE );
-    aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE );
+    aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False );
+    aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False );
+    aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False );
 }
 
 
@@ -312,9 +312,9 @@ void SvxIMapDlg::Resize()
 |*
 \************************************************************************/
 
-BOOL SvxIMapDlg::Close()
+sal_Bool SvxIMapDlg::Close()
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) )
     {
@@ -324,12 +324,12 @@ BOOL SvxIMapDlg::Close()
 
         if( nRet == RET_YES )
         {
-            SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE );
+            SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True );
             GetBindings().GetDispatcher()->Execute(
                 SID_IMAP_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
         }
         else if( nRet == RET_CANCEL )
-            bRet = FALSE;
+            bRet = sal_False;
     }
     else if( pIMapWnd->IsChanged() )
     {
@@ -340,10 +340,10 @@ BOOL SvxIMapDlg::Close()
         if( nRet == RET_YES )
             bRet = DoSave();
         else if( nRet == RET_CANCEL )
-            bRet = FALSE;
+            bRet = sal_False;
     }
 
-    return( bRet ? SfxModelessDialog::Close() : FALSE );
+    return( bRet ? SfxModelessDialog::Close() : sal_False );
 }
 
 
@@ -353,7 +353,7 @@ BOOL SvxIMapDlg::Close()
 |*
 \************************************************************************/
 
-void SvxIMapDlg::SetExecState( BOOL bEnable )
+void SvxIMapDlg::SetExecState( sal_Bool bEnable )
 {
     pOwnData->bExecState = bEnable;
 }
@@ -480,14 +480,14 @@ void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt )
 
 IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 {
-    USHORT nNewItemId = pTbx->GetCurItemId();
+    sal_uInt16 nNewItemId = pTbx->GetCurItemId();
 
     switch( pTbx->GetCurItemId() )
     {
         case( TBI_APPLY ):
         {
             URLLoseFocusHdl( NULL );
-            SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE );
+            SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True );
             GetBindings().GetDispatcher()->Execute(
                 SID_IMAP_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
         }
@@ -503,8 +503,8 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_SELECT ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
-            pIMapWnd->SetEditMode( TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
+            pIMapWnd->SetEditMode( sal_True );
             if( pTbx->IsKeyEvent() )
             {
                 if((pTbx->GetKeyModifier() & KEY_MOD1) != 0)
@@ -517,7 +517,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_RECT ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             pIMapWnd->SetObjKind( OBJ_RECT );
             if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
             {
@@ -529,7 +529,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_CIRCLE ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             pIMapWnd->SetObjKind( OBJ_CIRC );
             if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
             {
@@ -541,7 +541,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_POLY ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             pIMapWnd->SetObjKind( OBJ_POLY );
             if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
             {
@@ -553,7 +553,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_FREEPOLY ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             pIMapWnd->SetObjKind( OBJ_FREEFILL );
             if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
             {
@@ -566,7 +566,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
         case( TBI_ACTIVE ):
         {
             URLLoseFocusHdl( NULL );
-            BOOL bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
+            sal_Bool bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
             pTbx->CheckItem( TBI_ACTIVE, bNewState );
             pIMapWnd->SetCurrentObjState( !bNewState );
         }
@@ -674,7 +674,7 @@ void SvxIMapDlg::DoOpen()
 |*
 \************************************************************************/
 
-BOOL SvxIMapDlg::DoSave()
+sal_Bool SvxIMapDlg::DoSave()
 {
        ::sfx2::FileDialogHelper aDlg(
         com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
@@ -684,7 +684,7 @@ BOOL SvxIMapDlg::DoSave()
     const String    aNCSAFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ) );
     SdrModel*       pModel = pIMapWnd->GetSdrModel();
     const sal_Bool bChanged = pModel->IsChanged();
-    BOOL            bRet = false;
+    sal_Bool            bRet = false;
 
     aDlg.AddFilter( aCERNFilter, DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) );
     aDlg.AddFilter( aNCSAFilter, DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) );
@@ -697,7 +697,7 @@ BOOL SvxIMapDlg::DoSave()
     {
         const String    aFilter( aDlg.GetCurrentFilter() );
         String          aExt;
-        ULONG           nFormat;
+        sal_uIntPtr         nFormat;
 
         if ( aFilter == aBinFilter )
         {
@@ -716,7 +716,7 @@ BOOL SvxIMapDlg::DoSave()
         }
         else
         {
-            return FALSE;
+            return sal_False;
         }
 
         INetURLObject aURL( aDlg.GetPath() );
@@ -740,7 +740,7 @@ BOOL SvxIMapDlg::DoSave()
 
                 delete pOStm;
                 pModel->SetChanged( bChanged );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -776,10 +776,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
 
     if ( !rInfo.bOneMarked )
     {
-        aTbxIMapDlg1.CheckItem( TBI_ACTIVE, FALSE );
-        aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE );
-        aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE );
-        aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE );
+        aTbxIMapDlg1.CheckItem( TBI_ACTIVE, sal_False );
+        aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False );
+        aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False );
+        aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False );
         aStbStatus.SetItemText( 1, aStr );
 
         aFtURL.Disable();
@@ -794,10 +794,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
     }
     else
     {
-        aTbxIMapDlg1.EnableItem( TBI_ACTIVE, TRUE );
+        aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_True );
         aTbxIMapDlg1.CheckItem( TBI_ACTIVE, !rInfo.bActivated );
-        aTbxIMapDlg1.EnableItem( TBI_MACRO, TRUE );
-        aTbxIMapDlg1.EnableItem( TBI_PROPERTY, TRUE );
+        aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_True );
+        aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_True );
 
         aFtURL.Enable();
         maURLBox.Enable();
@@ -949,8 +949,8 @@ IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG )
         SetEditingObject( pOwnData->pUpdateEditingObject );
 
         // Nach Wechsel => default Selektion
-        aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE );
-        pIMapWnd->SetEditMode( TRUE );
+        aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True );
+        pIMapWnd->SetEditMode( sal_True );
     }
 
     // die in der Update-Methode kopierte Liste wieder loeschen
@@ -976,8 +976,8 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
     const SdrObject*    pObj = pWnd->GetSelectedSdrObject();
     const SdrModel*     pModel = pWnd->GetSdrModel();
     const SdrView*      pView = pWnd->GetSdrView();
-    const BOOL          bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
-    const BOOL          bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) );
+    const sal_Bool          bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
+    const sal_Bool          bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) );
 
     aTbxIMapDlg1.EnableItem( TBI_APPLY, pOwnData->bExecState && pWnd->IsChanged() );
 
@@ -999,7 +999,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
 
     if ( bPolyEdit )
     {
-        USHORT nId = 0;
+        sal_uInt16 nId = 0;
 
         switch( pWnd->GetPolyEditMode() )
         {
@@ -1010,13 +1010,13 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
             break;
         }
 
-        aTbxIMapDlg1.CheckItem( nId, TRUE );
+        aTbxIMapDlg1.CheckItem( nId, sal_True );
     }
     else
     {
-        aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, FALSE );
-        aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, TRUE );
-        aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, FALSE );
+        aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, sal_False );
+        aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, sal_True );
+        aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, sal_False );
         pWnd->SetPolyEditMode( 0 );
     }
 
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index 7a6a16a45bd6..fd496a609f90 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -47,7 +47,7 @@ public:
     ImageMap        aUpdateImageMap;
     TargetList      aUpdateTargetList;
     void*           pUpdateEditingObject;
-    BOOL            bExecState;
+    sal_Bool            bExecState;
 
                     IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ) {}
 };
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 4442cb76bad4..ff152a152d51 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -110,7 +110,7 @@ IMapWindow::~IMapWindow()
 
 void IMapWindow::SetImageMap( const ImageMap& rImageMap )
 {
-    ReplaceImageMap( rImageMap, FALSE );
+    ReplaceImageMap( rImageMap, sal_False );
 }
 
 /*************************************************************************
@@ -119,7 +119,7 @@ void IMapWindow::SetImageMap( const ImageMap& rImageMap )
 |*
 \************************************************************************/
 
-void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGraphic*/ )
+void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleToGraphic*/ )
 {
     SdrPage* pPage = 0;
     aIMap = rImageMap;
@@ -143,9 +143,9 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap
     }
 
     // create new drawing objects
-    const USHORT nCount(rImageMap.GetIMapObjectCount());
+    const sal_uInt16 nCount(rImageMap.GetIMapObjectCount());
 
-    for ( USHORT i(nCount); i > 0; i-- )
+    for ( sal_uInt16 i(nCount); i > 0; i-- )
     {
         SdrObject* pNewObj = CreateObj( rImageMap.GetIMapObject( i - 1 ) );
 
@@ -162,11 +162,11 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap
 |*
 \************************************************************************/
 
-BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
+sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
 {
     const SdrObject*    pSdrObj = GetSelectedSdrObject();
     IMapObject*         pIMapObj;
-    BOOL                bRet = FALSE;
+    sal_Bool                bRet = sal_False;
 
     if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != NULL ) )
     {
@@ -174,9 +174,9 @@ BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
         pIMapObj->SetAltText( rNewInfo.aMarkAltText );
         pIMapObj->SetTarget( rNewInfo.aMarkTarget );
         pModel->SetChanged( sal_True );
-        UpdateInfo( FALSE );
+        UpdateInfo( sal_False );
 
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -251,7 +251,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
         case( IMAP_OBJ_RECTANGLE ):
         {
             IMapRectangleObject*    pIMapRectObj = (IMapRectangleObject*) pIMapObj;
-            Rectangle               aDrawRect( pIMapRectObj->GetRectangle( FALSE ) );
+            Rectangle               aDrawRect( pIMapRectObj->GetRectangle( sal_False ) );
 
             // auf Zeichenflaeche clippen
             aDrawRect.Intersection( aClipRect );
@@ -264,8 +264,8 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
         case( IMAP_OBJ_CIRCLE ):
         {
             IMapCircleObject*   pIMapCircleObj = (IMapCircleObject*) pIMapObj;
-            const Point         aCenter( pIMapCircleObj->GetCenter( FALSE ) );
-            const long          nRadius = pIMapCircleObj->GetRadius( FALSE );
+            const Point         aCenter( pIMapCircleObj->GetCenter( sal_False ) );
+            const long          nRadius = pIMapCircleObj->GetRadius( sal_False );
             const Point         aOffset( nRadius, nRadius );
             Rectangle           aCircle( aCenter - aOffset, aCenter + aOffset );
 
@@ -294,7 +294,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
             }
             else
             {
-                const Polygon&  rPoly = pIMapPolyObj->GetPolygon( FALSE );
+                const Polygon&  rPoly = pIMapPolyObj->GetPolygon( sal_False );
                 Polygon         aDrawPoly( rPoly );
 
                 // auf Zeichenflaeche clippen
@@ -356,7 +356,7 @@ void IMapWindow::InitSdrModel()
     aSet.Put( XFillColorItem( String(), TRANSCOL ) );
     aSet.Put( XFillTransparenceItem( 50 ) );
     pView->SetAttributes( aSet );
-    pView->SetFrameDragSingles( TRUE );
+    pView->SetFrameDragSingles( sal_True );
 }
 
 /*************************************************************************
@@ -373,7 +373,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
         {
             SdrRectObj*          pRectObj = (SdrRectObj*) &rObj;
             IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(),
-                String(), String(), String(), String(), String(), TRUE, FALSE );
+                String(), String(), String(), String(), String(), sal_True, sal_False );
 
             pRectObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
         }
@@ -382,11 +382,11 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
         case( OBJ_CIRC ):
         {
             SdrCircObj* pCircObj = (SdrCircObj*) &rObj;
-            SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( FALSE, FALSE );
+            SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( sal_False, sal_False );
             Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
             delete pPathObj;
 
-            IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(),  TRUE, FALSE );
+            IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(),  sal_True, sal_False );
             pObj->SetExtraEllipse( aPoly.GetBoundRect() );
             pCircObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
         }
@@ -403,7 +403,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
             if ( rXPolyPoly.count() )
             {
                 Polygon aPoly(rXPolyPoly.getB2DPolygon(0L));
-                IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(),  TRUE, FALSE );
+                IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(),  sal_True, sal_False );
                 pPathObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
             }
         }
@@ -431,7 +431,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
         String          aDesc;
         String          aTarget;
         IMapObjectPtr   pIMapObj = pUserData->GetObject();
-        BOOL            bActive = TRUE;
+        sal_Bool            bActive = sal_True;
 
         if ( pIMapObj.get() )
         {
@@ -447,17 +447,17 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
             case( OBJ_RECT ):
             {
                 pUserData->ReplaceObject( IMapObjectPtr(new IMapRectangleObject( ( (const SdrRectObj&) rObj ).GetLogicRect(),
-                          aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ) ) );
+                          aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ) ) );
             }
             break;
 
             case( OBJ_CIRC ):
             {
                 const SdrCircObj& rCircObj = (const SdrCircObj&) rObj;
-                SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( FALSE, FALSE );
+                SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( sal_False, sal_False );
                 Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
 
-                IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE );
+                IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False );
                 pObj->SetExtraEllipse( aPoly.GetBoundRect() );
 
                 // wurde von uns nur temporaer angelegt
@@ -477,7 +477,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
                 if ( rXPolyPoly.count() )
                 {
                     Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0L));
-                    IMapPolygonObject*  pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE );
+                    IMapPolygonObject*  pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False );
                     pUserData->ReplaceObject( IMapObjectPtr(pObj) );
                 }
             }
@@ -498,7 +498,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
 void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt)
 {
     GraphCtrl::MouseButtonUp( rMEvt );
-    UpdateInfo( TRUE );
+    UpdateInfo( sal_True );
 }
 
 /*************************************************************************
@@ -510,7 +510,7 @@ void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt)
 void IMapWindow::MarkListHasChanged()
 {
     GraphCtrl::MarkListHasChanged();
-    UpdateInfo( FALSE );
+    UpdateInfo( sal_False );
 }
 
 /*************************************************************************
@@ -527,7 +527,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const
     if ( Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) )
     {
         SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
-        ULONG    nCount;
+        sal_uIntPtr  nCount;
 
         if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) )
         {
@@ -579,11 +579,11 @@ SdrObject* IMapWindow::GetSdrObj( const IMapObject* pIMapObj ) const
 {
     SdrObject*  pSdrObj = NULL;
     SdrPage*    pPage = (SdrPage*) pModel->GetPage( 0 );
-    ULONG       nCount;
+    sal_uIntPtr     nCount;
 
     if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) )
     {
-        for ( ULONG i = 0; i < nCount; i++ )
+        for ( sal_uIntPtr i = 0; i < nCount; i++ )
         {
             SdrObject* pTestObj = pPage->GetObj( i );
 
@@ -612,21 +612,21 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
     {
         PopupMenu           aMenu( SVX_RES( RID_SVXMN_IMAP ) );
         const SdrMarkList&  rMarkList = pView->GetMarkedObjectList();
-        ULONG               nMarked = rMarkList.GetMarkCount();
+        sal_uIntPtr             nMarked = rMarkList.GetMarkCount();
 
-        aMenu.EnableItem( MN_URL, FALSE );
-        aMenu.EnableItem( MN_ACTIVATE, FALSE );
-        aMenu.EnableItem( MN_MACRO, FALSE );
+        aMenu.EnableItem( MN_URL, sal_False );
+        aMenu.EnableItem( MN_ACTIVATE, sal_False );
+        aMenu.EnableItem( MN_MACRO, sal_False );
         aMenu.EnableItem( MN_MARK_ALL, pModel->GetPage( 0 )->GetObjCount() != pView->GetMarkedObjectCount() );
 
         if ( !nMarked )
         {
-            aMenu.EnableItem( MN_POSITION, FALSE );
-            aMenu.EnableItem( MN_FRAME_TO_TOP, FALSE );
-            aMenu.EnableItem( MN_MOREFRONT, FALSE );
-            aMenu.EnableItem( MN_MOREBACK, FALSE );
-            aMenu.EnableItem( MN_FRAME_TO_BOTTOM, FALSE );
-            aMenu.EnableItem( MN_DELETE1, FALSE );
+            aMenu.EnableItem( MN_POSITION, sal_False );
+            aMenu.EnableItem( MN_FRAME_TO_TOP, sal_False );
+            aMenu.EnableItem( MN_MOREFRONT, sal_False );
+            aMenu.EnableItem( MN_MOREBACK, sal_False );
+            aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_False );
+            aMenu.EnableItem( MN_DELETE1, sal_False );
         }
         else
         {
@@ -634,18 +634,18 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
             {
                 SdrObject*  pSdrObj = GetSelectedSdrObject();
 
-                aMenu.EnableItem( MN_URL, TRUE );
-                aMenu.EnableItem( MN_ACTIVATE, TRUE );
-                aMenu.EnableItem( MN_MACRO, TRUE );
+                aMenu.EnableItem( MN_URL, sal_True );
+                aMenu.EnableItem( MN_ACTIVATE, sal_True );
+                aMenu.EnableItem( MN_MACRO, sal_True );
                 aMenu.CheckItem( MN_ACTIVATE, GetIMapObj( pSdrObj )->IsActive() );
             }
 
-            aMenu.EnableItem( MN_POSITION, TRUE );
-            aMenu.EnableItem( MN_FRAME_TO_TOP, TRUE );
-            aMenu.EnableItem( MN_MOREFRONT, TRUE );
-            aMenu.EnableItem( MN_MOREBACK, TRUE );
-            aMenu.EnableItem( MN_FRAME_TO_BOTTOM, TRUE );
-            aMenu.EnableItem( MN_DELETE1, TRUE );
+            aMenu.EnableItem( MN_POSITION, sal_True );
+            aMenu.EnableItem( MN_FRAME_TO_TOP, sal_True );
+            aMenu.EnableItem( MN_MOREFRONT, sal_True );
+            aMenu.EnableItem( MN_MOREBACK, sal_True );
+            aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_True );
+            aMenu.EnableItem( MN_DELETE1, sal_True );
         }
 
         aMenu.SetSelectHdl( LINK( this, IMapWindow, MenuSelectHdl ) );
@@ -691,7 +691,7 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
             pModel->SetChanged( sal_True );
             pView->UnmarkAll();
             pView->MarkObj( pSdrObj, pView->GetSdrPageView() );
-            UpdateInfo( TRUE );
+            UpdateInfo( sal_True );
             nRet =  rEvt.mnAction;
         }
     }
@@ -742,7 +742,7 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt )
 |*
 \************************************************************************/
 
-void IMapWindow::SetCurrentObjState( BOOL bActive )
+void IMapWindow::SetCurrentObjState( sal_Bool bActive )
 {
     SdrObject* pObj = GetSelectedSdrObject();
 
@@ -765,7 +765,7 @@ void IMapWindow::SetCurrentObjState( BOOL bActive )
             aSet.Put( XLineColorItem( String(), Color( COL_BLACK ) ) );
         }
 
-        pView->SetAttributes( aSet, FALSE );
+        pView->SetAttributes( aSet, sal_False );
     }
 }
 
@@ -775,7 +775,7 @@ void IMapWindow::SetCurrentObjState( BOOL bActive )
 |*
 \************************************************************************/
 
-void IMapWindow::UpdateInfo( BOOL bNewObj )
+void IMapWindow::UpdateInfo( sal_Bool bNewObj )
 {
     if ( aInfoLink.IsSet() )
     {
@@ -786,7 +786,7 @@ void IMapWindow::UpdateInfo( BOOL bNewObj )
 
         if ( pIMapObj )
         {
-            aInfo.bOneMarked = TRUE;
+            aInfo.bOneMarked = sal_True;
             aInfo.aMarkURL = pIMapObj->GetURL();
             aInfo.aMarkAltText = pIMapObj->GetAltText();
             aInfo.aMarkTarget = pIMapObj->GetTarget();
@@ -796,8 +796,8 @@ void IMapWindow::UpdateInfo( BOOL bNewObj )
         else
         {
             aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = String();
-            aInfo.bOneMarked = FALSE;
-            aInfo.bActivated = FALSE;
+            aInfo.bOneMarked = sal_False;
+            aInfo.bActivated = sal_False;
         }
 
         aInfoLink.Call( this );
@@ -836,7 +836,7 @@ void IMapWindow::DoMacroAssign()
             const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
             pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() );
             pModel->SetChanged( sal_True );
-            UpdateInfo( FALSE );
+            UpdateInfo( sal_False );
         }
 
         delete pMacroDlg;
@@ -880,7 +880,7 @@ void IMapWindow::DoPropertyDialog()
                 pIMapObj->SetTarget( aDlg->GetTarget() );
                 pIMapObj->SetName( aDlg->GetName() );
                 pModel->SetChanged( sal_True );
-                UpdateInfo( TRUE );
+                UpdateInfo( sal_True );
             }
             delete aDlg; //add by CHINA001
         }
@@ -897,7 +897,7 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
 {
     if (pMenu)
     {
-        USHORT  nId = pMenu->GetCurItemId();
+        sal_uInt16  nId = pMenu->GetCurItemId();
 
         switch(nId)
         {
@@ -911,11 +911,11 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
 
             case( MN_ACTIVATE ):
             {
-                const BOOL bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
+                const sal_Bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
 
                 pMenu->CheckItem( MN_ACTIVATE, bNewState );
                 SetCurrentObjState( bNewState );
-                UpdateInfo( FALSE );
+                UpdateInfo( sal_False );
             }
 
             case( MN_FRAME_TO_TOP ):
@@ -1048,7 +1048,7 @@ void IMapWindow::SelectFirstObject()
     {
         GrabFocus();
         pView->UnmarkAllObj();
-        pView->MarkNextObj(TRUE);
+        pView->MarkNextObj(sal_True);
     }
 }
 
@@ -1057,7 +1057,7 @@ void IMapWindow::StartPolyEdit()
     GrabFocus();
 
     if( !pView->AreObjectsMarked() )
-        pView->MarkNextObj(TRUE);
+        pView->MarkNextObj(sal_True);
 
     const SdrHdlList& rHdlList = pView->GetHdlList();
     SdrHdl* pHdl = rHdlList.GetFocusHdl();
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 1138eb47e68a..bbc6a2c1ed6d 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -51,9 +51,9 @@ struct NotifyInfo
     String  aMarkURL;
     String  aMarkAltText;
     String  aMarkTarget;
-    BOOL    bNewObj;
-    BOOL    bOneMarked;
-    BOOL    bActivated;
+    sal_Bool    bNewObj;
+    sal_Bool    bOneMarked;
+    sal_Bool    bActivated;
 };
 
 
@@ -61,8 +61,8 @@ struct NotifyPosSize
 {
     Size    aPictureSize;
     Point   aMousePos;
-    BOOL    bPictureSize;
-    BOOL    bMousePos;
+    sal_Bool    bPictureSize;
+    sal_Bool    bMousePos;
 };
 
 
@@ -74,10 +74,10 @@ struct NotifyPosSize
 
 #define SVD_IMAP_USERDATA   0x0001
 
-const UINT32 IMapInventor = UINT32('I') * 0x00000001+
-                            UINT32('M') * 0x00000100+
-                            UINT32('A') * 0x00010000+
-                            UINT32('P') * 0x01000000;
+const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+
+                            sal_uInt32('M') * 0x00000100+
+                            sal_uInt32('A') * 0x00010000+
+                            sal_uInt32('P') * 0x01000000;
 
 
 typedef boost::shared_ptr< IMapObject > IMapObjectPtr;
@@ -181,7 +181,7 @@ protected:
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
 
     void                CreateImageMap();
-    void                ReplaceImageMap( const ImageMap& rNewImageMap, BOOL bScaleToGraphic );
+    void                ReplaceImageMap( const ImageMap& rNewImageMap, sal_Bool bScaleToGraphic );
 
     void                ClearTargetList();
 
@@ -190,19 +190,19 @@ protected:
     SdrObject*          GetSdrObj( const IMapObject* pIMapObj ) const;
     SdrObject*          GetHitSdrObj( const Point& rPosPixel ) const;
 
-    void                UpdateInfo( BOOL bNewObj );
+    void                UpdateInfo( sal_Bool bNewObj );
 
 public:
 
                         IMapWindow( Window* pParent, const ResId& rResId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame );
                         ~IMapWindow();
 
-    BOOL                ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
+    sal_Bool                ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
 
     void                SetImageMap( const ImageMap& rImageMap );
     const ImageMap&     GetImageMap();
 
-    void                SetCurrentObjState( BOOL bActive );
+    void                SetCurrentObjState( sal_Bool bActive );
     void                DoMacroAssign();
     void                DoPropertyDialog();
 
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index c06212d02dea..cdc4cfc0b9b8 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star::uno;
 
 // -----------------------------------------------------------------------
 
-String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg )
+String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg )
 {
     INetURLObject aURLObj;
     aURLObj.SetSmartProtocol( INET_PROT_FILE );
@@ -84,14 +84,14 @@ String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg )
 //  misc local helper functions
 //========================================================================
 
-static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
+static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
 {
     const Locale *pLocale = rSeq.getConstArray();
-    INT32 nCount = rSeq.getLength();
+    sal_Int32 nCount = rSeq.getLength();
 
-    Sequence< INT16 >   aLangs( nCount );
-    INT16 *pLang = aLangs.getArray();
-    for (INT32 i = 0;  i < nCount;  ++i)
+    Sequence< sal_Int16 >   aLangs( nCount );
+    sal_Int16 *pLang = aLangs.getArray();
+    for (sal_Int32 i = 0;  i < nCount;  ++i)
     {
         pLang[i] = SvxLocaleToLanguage( pLocale[i] );
 
@@ -101,13 +101,13 @@ static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
 }
 
 
-static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang )
+static sal_Bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nLang )
 {
-    INT32 i = -1;
-    INT32 nLen = rLangSeq.getLength();
+    sal_Int32 i = -1;
+    sal_Int32 nLen = rLangSeq.getLength();
     if (nLen)
     {
-        const INT16 *pLang = rLangSeq.getConstArray();
+        const sal_Int16 *pLang = rLangSeq.getConstArray();
         for (i = 0;  i < nLen;  ++i)
         {
             if (nLang == pLang[i])
@@ -121,20 +121,20 @@ static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang )
 //  class SvxLanguageBox
 //========================================================================
 
-USHORT TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
+sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
 {
-    USHORT  nPos   = LISTBOX_ENTRY_NOTFOUND;
-    USHORT  nCount = rLb.GetEntryCount();
+    sal_uInt16  nPos   = LISTBOX_ENTRY_NOTFOUND;
+    sal_uInt16  nCount = rLb.GetEntryCount();
 
-    for ( USHORT i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ )
-        if ( eType == LanguageType((ULONG)rLb.GetEntryData(i)) )
+    for ( sal_uInt16 i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ )
+        if ( eType == LanguageType((sal_uIntPtr)rLb.GetEntryData(i)) )
             nPos = i;
 
     return nPos;
 }
 
 //-----------------------------------------------------------------------
-SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck ) :
+SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck ) :
     ListBox( pParent, nWinStyle ),
     m_pSpellUsedLang( NULL ),
     m_bWithCheckmark( bCheck )
@@ -142,7 +142,7 @@ SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck
     Init();
 }
 //------------------------------------------------------------------------
-SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck ) :
+SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck ) :
     ListBox( pParent, rResId ),
     m_pSpellUsedLang( NULL ),
     m_bWithCheckmark( bCheck )
@@ -158,8 +158,8 @@ void SvxLanguageBox::Init()
     m_aCheckedImageHC = Image( SVX_RES( RID_SVXIMG_CHECKED_H ) );
     m_aAllString            = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) );
     m_nLangList             = LANG_LIST_EMPTY;
-    m_bHasLangNone          = FALSE;
-    m_bLangNoneIsLangAll    = FALSE;
+    m_bHasLangNone          = sal_False;
+    m_bLangNoneIsLangAll    = sal_False;
 
     // display entries sorted
     SetStyle( GetStyle() | WB_SORT );
@@ -172,12 +172,12 @@ void SvxLanguageBox::Init()
         {
             LanguageType nLangType = aLangTable.GetTypeAtIndex( i );
 
-            BOOL bInsert = TRUE;
+            sal_Bool bInsert = sal_True;
             if ((LANGUAGE_DONTKNOW == nLangType)  ||
                 (LANGUAGE_SYSTEM   == nLangType)  ||
                 (LANGUAGE_USER1 <= nLangType  &&  nLangType <= LANGUAGE_USER9))
             {
-                bInsert = FALSE;
+                bInsert = sal_False;
             }
 
             if ( bInsert )
@@ -196,9 +196,9 @@ SvxLanguageBox::~SvxLanguageBox()
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked )
+sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked )
 {
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
     if( !bChecked )
         nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos );
     else if( GetSettings().GetStyleSettings().GetHighContrastMode() )
@@ -210,8 +210,8 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo
 
 //------------------------------------------------------------------------
 
-void SvxLanguageBox::SetLanguageList( INT16 nLangList,
-        BOOL bHasLangNone, BOOL bLangNoneIsLangAll, BOOL bCheckSpellAvail )
+void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList,
+        sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll, sal_Bool bCheckSpellAvail )
 {
     Clear();
 
@@ -222,12 +222,12 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList,
 
     if ( LANG_LIST_EMPTY != nLangList )
     {
-        Sequence< INT16 > aSpellAvailLang;
-        Sequence< INT16 > aHyphAvailLang;
-        Sequence< INT16 > aThesAvailLang;
-        Sequence< INT16 > aSpellUsedLang;
-        Sequence< INT16 > aHyphUsedLang;
-        Sequence< INT16 > aThesUsedLang;
+        Sequence< sal_Int16 > aSpellAvailLang;
+        Sequence< sal_Int16 > aHyphAvailLang;
+        Sequence< sal_Int16 > aThesAvailLang;
+        Sequence< sal_Int16 > aSpellUsedLang;
+        Sequence< sal_Int16 > aHyphUsedLang;
+        Sequence< sal_Int16 > aThesUsedLang;
         Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY );
         if (xAvail.is())
         {
@@ -334,14 +334,14 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList,
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_uInt16 nPos )
 {
     return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType )
+sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_uInt16 nPos, sal_Int16 nType )
 {
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
     // For obsolete and to be replaced languages check whether an entry of the
@@ -349,7 +349,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
     // string as would be returned by SvtLanguageTable::GetString().
     if (nLang != nLangType)
     {
-        USHORT nAt = TypeToPos_Impl( nLang, *this );
+        sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
         if ( nAt != LISTBOX_ENTRY_NOTFOUND )
             return nAt;
     }
@@ -368,7 +368,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
 
     aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
 
-    USHORT nAt = 0;
+    sal_uInt16 nAt = 0;
     if ( m_bWithCheckmark )
     {
         sal_Bool bFound = sal_False;
@@ -377,31 +377,31 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
         {
             Reference< XSpellChecker1 > xSpell( SvxGetSpellChecker(), UNO_QUERY );
             if ( xSpell.is() )
-                m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() );
+                m_pSpellUsedLang = new Sequence< sal_Int16 >( xSpell->getLanguages() );
         }
         bFound = m_pSpellUsedLang ?
-            lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : FALSE;
+            lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : sal_False;
 
         nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound );
     }
     else
         nAt = InsertEntry( aStrEntry, nPos );
 
-    SetEntryData( nAt, (void*)(ULONG)nLangType );
+    SetEntryData( nAt, (void*)(sal_uIntPtr)nLangType );
     return nAt;
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos )
 {
     return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType );
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
-        BOOL bCheckEntry, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
+        sal_Bool bCheckEntry, sal_uInt16 nPos )
 {
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
     // For obsolete and to be replaced languages check whether an entry of the
@@ -409,7 +409,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
     // string as would be returned by SvtLanguageTable::GetString().
     if (nLang != nLangType)
     {
-        USHORT nAt = TypeToPos_Impl( nLang, *this );
+        sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
         if ( nAt != LISTBOX_ENTRY_NOTFOUND )
             return nAt;
     }
@@ -418,8 +418,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
     if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
         aStrEntry = m_aAllString;
 
-    USHORT nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
-    SetEntryData( nAt, (void*)(ULONG)nLang );
+    sal_uInt16 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
+    SetEntryData( nAt, (void*)(sal_uIntPtr)nLang );
 
     return nAt;
 }
@@ -428,7 +428,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
 
 void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
 {
-    USHORT nAt = TypeToPos_Impl( eLangType, *this );
+    sal_uInt16 nAt = TypeToPos_Impl( eLangType, *this );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         RemoveEntry( nAt );
@@ -438,23 +438,23 @@ void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
 
 LanguageType SvxLanguageBox::GetSelectLanguage() const
 {
-    USHORT       nPos   = GetSelectEntryPos();
+    sal_uInt16       nPos   = GetSelectEntryPos();
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-        return LanguageType( (ULONG)GetEntryData(nPos) );
+        return LanguageType( (sal_uIntPtr)GetEntryData(nPos) );
     else
         return LanguageType( LANGUAGE_DONTKNOW );
 }
 
 //------------------------------------------------------------------------
 
-void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect )
+void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSelect )
 {
     // If the core uses a LangID of an imported MS document and wants to select
     // a language that is replaced, we need to select the replacement instead.
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
 
-    USHORT nAt = TypeToPos_Impl( nLang, *this );
+    sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         SelectEntryPos( nAt, bSelect );
@@ -462,17 +462,17 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect
 
 //------------------------------------------------------------------------
 
-BOOL SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const
+sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const
 {
     // Same here, work on the replacement if applicable.
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
 
-    USHORT nAt = TypeToPos_Impl( nLang, *this );
+    sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         return IsEntryPosSelected( nAt );
     else
-        return FALSE;
+        return sal_False;
 }
 
 #if ENABLE_LAYOUT
@@ -484,7 +484,7 @@ SvxLanguageBox::~SvxLanguageBox ()
 {
 }
 
-SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, BOOL bCheck )
+SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, sal_Bool bCheck )
 : ListBox ( pParent, pFile, bCheck )
 {
 }
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 13f29089b784..df93370dda8e 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -133,9 +133,9 @@ void SvxXMeasurePreview::SetAttributes( const SfxItemSet& rInAttrs )
 
 void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    BOOL bZoomIn  = rMEvt.IsLeft() && !rMEvt.IsShift();
-    BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
-    BOOL bCtrl    = rMEvt.IsMod1();
+    sal_Bool bZoomIn  = rMEvt.IsLeft() && !rMEvt.IsShift();
+    sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
+    sal_Bool bCtrl    = rMEvt.IsMod1();
 
     if( bZoomIn || bZoomOut )
     {
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 8a5bfa75f7fa..83d8206111f8 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -214,7 +214,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
     aFtBezAngle         ( this, SVX_RES( FT_BEZ_ANGLE ) ),
     aMtrFldBezAngle     ( this, SVX_RES( MTR_FLD_BEZ_ANGLE ) ),
 
-    bAttrModified( FALSE )
+    bAttrModified( sal_False )
 {
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
@@ -227,11 +227,11 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
     long nFirst, nLast, nMin, nMax;
 
     lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
-    SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE );
+    SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True );
     lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
 
     lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
-    SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE );
+    SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True );
     lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
 
 
@@ -259,7 +259,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
 
 //------------------------------------------------------------------------
 
-BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
 {
     if ( bAttrModified )
     {
@@ -274,8 +274,8 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
         long nX =GetCoreValue(  aMtrFldDrawX, eUnit );
         long nY = GetCoreValue( aMtrFldDrawY, eUnit );
 
-        aGridItem.nFldDrawX    = (UINT32) nX;
-        aGridItem.nFldDrawY    = (UINT32) nY;
+        aGridItem.nFldDrawX    = (sal_uInt32) nX;
+        aGridItem.nFldDrawY    = (sal_uInt32) nY;
         aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()-1);
         aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()-1);
 
@@ -290,7 +290,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pAttr = 0;
 
-    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE,
+    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False,
                                     (const SfxPoolItem**)&pAttr ))
     {
         const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr;
@@ -308,7 +308,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
     }
 
     ChangeGridsnapHdl_Impl( &aCbxUseGridsnap );
-    bAttrModified = FALSE;
+    bAttrModified = sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -316,7 +316,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
 void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pAttr = NULL;
-    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE,
+    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False,
                                     (const SfxPoolItem**)&pAttr ))
     {
         const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr;
@@ -327,9 +327,9 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
 
     // Metrik ggfs. aendern (da TabPage im Dialog liegt,
     // wo die Metrik eingestellt werden kann
-    //USHORT nWhich = GetWhich( SID_ATTR_METRIC );
+    //sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
     //if( rSet.GetItemState( GetWhich( SID_ATTR_METRIC ) ) >= SFX_ITEM_AVAILABLE )
-    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , FALSE,
+    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False,
                                     (const SfxPoolItem**)&pAttr ))
     {
         const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr;
@@ -343,14 +343,14 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
             long nVal = static_cast<long>(aMtrFldDrawX.Denormalize( aMtrFldDrawX.GetValue( FUNIT_TWIP ) ));
 
             lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
-            SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE );
+            SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True );
             lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
 
             aMtrFldDrawX.SetValue( aMtrFldDrawX.Normalize( nVal ), FUNIT_TWIP );
 
             nVal = static_cast<long>(aMtrFldDrawY.Denormalize( aMtrFldDrawY.GetValue( FUNIT_TWIP ) ));
             lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
-            SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE );
+            SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True );
             lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
             aMtrFldDrawY.SetValue( aMtrFldDrawY.Normalize( nVal ), FUNIT_TWIP );
 
@@ -368,7 +368,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet )
 //------------------------------------------------------------------------
 IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
 {
-    bAttrModified = TRUE;
+    bAttrModified = sal_True;
     if( aCbxSynchronize.IsChecked() )
     {
         if(pField == &aMtrFldDrawX)
@@ -394,7 +394,7 @@ IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
 {
-    bAttrModified = TRUE;
+    bAttrModified = sal_True;
     if( aCbxSynchronize.IsChecked() )
     {
         if(&aNumFldDivisionX == pField)
@@ -408,7 +408,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
 
 IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG )
 {
-    bAttrModified = TRUE;
+    bAttrModified = sal_True;
     return 0;
 }
 
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 0fd6bc5474da..e0c302da38df 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -53,7 +53,7 @@ struct PageWindow_Impl
 
     PageWindow_Impl() :
         pBorder(0),
-        bBitmap(FALSE),
+        bBitmap(sal_False),
         bResetBackground(sal_False),
         bFrameDirection(sal_False),
         nFrameDirection(0) {}
@@ -91,11 +91,11 @@ SvxPageWindow::SvxPageWindow( Window* pParent, const ResId& rId ) :
     nFtHeight   ( 0 ),
     aFtColor    ( COL_TRANSPARENT ),
     pFtBorder   ( 0 ),
-    bFooter     ( FALSE ),
-    bHeader     ( FALSE ),
-    bTable      ( FALSE ),
-    bHorz       ( FALSE ),
-    bVert       ( FALSE ),
+    bFooter     ( sal_False ),
+    bHeader     ( sal_False ),
+    bTable      ( sal_False ),
+    bHorz       ( sal_False ),
+    bVert       ( sal_False ),
     eUsage      ( SVX_PAGE_ALL )
 
 {
@@ -159,23 +159,23 @@ void __EXPORT SvxPageWindow::Paint( const Rectangle& )
             aSz = PixelToLogic( GetSizePixel() );
             nYPos = ( aSz.Height() - aSize.Height() ) / 2;
             long nXPos = ( aSz.Width() - aSize.Width() ) / 2;
-            DrawPage( Point( nXPos, nYPos ), TRUE, TRUE );
+            DrawPage( Point( nXPos, nYPos ), sal_True, sal_True );
         }
         else
             // Hochformat
-            DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), TRUE, TRUE );
+            DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), sal_True, sal_True );
     }
     else
     {
         // Linke und rechte Seite unterschiedlich -> ggf. zwei Seiten malen
-        DrawPage( Point( 0, nYPos ), FALSE, (BOOL)( eUsage & SVX_PAGE_LEFT ) );
-        DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), TRUE,
-                  (BOOL)( eUsage & SVX_PAGE_RIGHT ) );
+        DrawPage( Point( 0, nYPos ), sal_False, (sal_Bool)( eUsage & SVX_PAGE_LEFT ) );
+        DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), sal_True,
+                  (sal_Bool)( eUsage & SVX_PAGE_RIGHT ) );
     }
 }
 
 // -----------------------------------------------------------------------
-void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL bEnabled )
+void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     const Color& rFieldColor = rStyleSettings.GetFieldColor();
@@ -311,12 +311,12 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL
             break;
         }
         sText.Append(cArrow);
-        for(USHORT i = 0; i < sText.Len(); i++)
+        for(sal_uInt16 i = 0; i < sText.Len(); i++)
         {
             String sDraw(sText.GetChar(i));
             long nHDiff = 0;
             long nCharWidth = GetTextWidth(sDraw);
-            BOOL bHorizontal = 0 == aMove.Y();
+            sal_Bool bHorizontal = 0 == aMove.Y();
             if(!bHorizontal)
             {
                 nHDiff = (nAWidth - nCharWidth)/2;
@@ -348,14 +348,14 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL
         long _nTop = bVert ? aRect.Top() + ((nH - nTH) / 2) : aRect.Top();
         Rectangle aCellRect( Point( _nLeft, _nTop ), Size( CELL_WIDTH, CELL_HEIGHT ) );
 
-        for ( USHORT i = 0; i < 3; ++i )
+        for ( sal_uInt16 i = 0; i < 3; ++i )
         {
             aCellRect.Left() = _nLeft;
             aCellRect.Right() = _nLeft + CELL_WIDTH;
             if ( i > 0 )
                 aCellRect.Move( 0, CELL_HEIGHT );
 
-            for ( USHORT j = 0; j < 3; ++j )
+            for ( sal_uInt16 j = 0; j < 3; ++j )
             {
                 if ( j > 0 )
                     aCellRect.Move( CELL_WIDTH, 0 );
@@ -380,10 +380,10 @@ void SvxPageWindow::SetBitmap( Bitmap* pBmp )
     if ( pBmp )
     {
         pImpl->aBitmap = *pBmp;
-        pImpl->bBitmap = TRUE;
+        pImpl->bBitmap = sal_True;
     }
     else
-        pImpl->bBitmap = FALSE;
+        pImpl->bBitmap = sal_False;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index ef0dbb6b0931..2e9283b1c15d 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -71,14 +71,14 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) :
 
 void SvxParaPrevWindow::Paint( const Rectangle& )
 {
-    DrawParagraph( TRUE );
+    DrawParagraph( sal_True );
 }
 
 // -----------------------------------------------------------------------
 
 #define DEF_MARGIN  120
 
-void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
+void SvxParaPrevWindow::DrawParagraph( sal_Bool bAll )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     const Color& rWinColor = rStyleSettings.GetWindowColor();
@@ -97,7 +97,7 @@ void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
     aPnt.X() = DEF_MARGIN / 2;
     SetFillColor( aGrayColor );
 
-    for ( USHORT i = 0; i < 9; ++i )
+    for ( sal_uInt16 i = 0; i < 9; ++i )
     {
         if ( 3 == i )
         {
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index bb689c3fb8fa..2a107d9e23af 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -45,7 +45,7 @@
 
 IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
 {
-    BOOL bOK = TRUE;
+    sal_Bool bOK = sal_True;
     short nRet = RET_OK;
     String aEmpty;
 
@@ -55,7 +55,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
         aNewPasswdED.SetText( aEmpty );
         aRepeatPasswdED.SetText( aEmpty );
         aNewPasswdED.GrabFocus();
-        bOK = FALSE;
+        bOK = sal_False;
     }
 
     if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) )
@@ -63,7 +63,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
         ErrorBox( this, WB_OK, aOldPasswdErrStr ).Execute();
         aOldPasswdED.SetText( aEmpty );
         aOldPasswdED.GrabFocus();
-        bOK = FALSE;
+        bOK = sal_False;
     }
 
     if ( bOK )
@@ -93,7 +93,7 @@ IMPL_LINK( SvxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-SvxPasswordDialog::SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords, BOOL bDisableOldPassword ) :
+SvxPasswordDialog::SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords, sal_Bool bDisableOldPassword ) :
     SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_PASSWORD ) ),
     aOldFL          ( this, SVX_RES( FL_OLD_PASSWD ) ),
     aOldPasswdFT    ( this, SVX_RES( FT_OLD_PASSWD ) ),
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 1224de5ba6ea..2b94fde81edb 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -38,9 +38,9 @@
 SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) :
     MetricField( pParent, nWinSize )
 {
-    bNegativeEnabled = FALSE;
-    bRelativeMode = FALSE;
-    bRelative     = FALSE;
+    bNegativeEnabled = sal_False;
+    bRelativeMode = sal_False;
+    bRelative     = sal_False;
 
     SetDecimalDigits( 2 );
     SetMin( 0 );
@@ -52,9 +52,9 @@ SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) :
 SvxRelativeField::SvxRelativeField( Window* pParent, const ResId& rResId ) :
     MetricField( pParent, rResId )
 {
-    bNegativeEnabled = FALSE;
-    bRelativeMode = FALSE;
-    bRelative     = FALSE;
+    bNegativeEnabled = sal_False;
+    bRelativeMode = sal_False;
+    bRelative     = sal_False;
 
     SetDecimalDigits( 2 );
     SetMin( 0 );
@@ -70,7 +70,7 @@ void SvxRelativeField::Modify()
     if ( bRelativeMode )
     {
         String  aStr = GetText();
-        BOOL    bNewMode = bRelative;
+        sal_Bool    bNewMode = bRelative;
 
         if ( bRelative )
         {
@@ -81,7 +81,7 @@ void SvxRelativeField::Modify()
                 if( ( ( *pStr < sal_Unicode( '0' ) ) || ( *pStr > sal_Unicode( '9' ) ) ) &&
                     ( *pStr != sal_Unicode( '%' ) ) )
                 {
-                    bNewMode = FALSE;
+                    bNewMode = sal_False;
                     break;
                 }
                 pStr++;
@@ -92,7 +92,7 @@ void SvxRelativeField::Modify()
             xub_StrLen nPos = aStr.Search( sal_Unicode( '%' ) );
 
             if ( nPos != STRING_NOTFOUND )
-                bNewMode = TRUE;
+                bNewMode = sal_True;
         }
 
         if ( bNewMode != bRelative )
@@ -104,10 +104,10 @@ void SvxRelativeField::Modify()
 
 // -----------------------------------------------------------------------
 
-void SvxRelativeField::EnableRelativeMode( USHORT nMin,
-                                           USHORT nMax, USHORT nStep )
+void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin,
+                                           sal_uInt16 nMax, sal_uInt16 nStep )
 {
-    bRelativeMode = TRUE;
+    bRelativeMode = sal_True;
     nRelMin       = nMin;
     nRelMax       = nMax;
     nRelStep      = nStep;
@@ -116,14 +116,14 @@ void SvxRelativeField::EnableRelativeMode( USHORT nMin,
 
 // -----------------------------------------------------------------------
 
-void SvxRelativeField::SetRelative( BOOL bNewRelative )
+void SvxRelativeField::SetRelative( sal_Bool bNewRelative )
 {
     Selection aSelection = GetSelection();
     String aStr = GetText();
 
     if ( bNewRelative )
     {
-        bRelative = TRUE;
+        bRelative = sal_True;
         SetDecimalDigits( 0 );
         SetMin( nRelMin );
         SetMax( nRelMax );
@@ -132,7 +132,7 @@ void SvxRelativeField::SetRelative( BOOL bNewRelative )
     }
     else
     {
-        bRelative = FALSE;
+        bRelative = sal_False;
         SetDecimalDigits( 2 );
         SetMin( bNegativeEnabled ? -9999 : 0 );
         SetMax( 9999 );
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 23d62d4de85e..7e2cd0868cce 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -49,7 +49,7 @@
 
 // class SvxRulerItem ----------------------------------------------------
 
-SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings)
+SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindings)
 : SfxControllerItem(_nId, rBindings),
   rRuler(rRul)
 {
@@ -57,7 +57,7 @@ SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings)
 
 // -----------------------------------------------------------------------
 
-void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                  const SfxPoolItem* pState)
 {
     // SFX_ITEM_DONTCARE => pState == -1 => PTR_CAST buff
@@ -76,14 +76,14 @@ void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
         case SID_ATTR_LONG_LRSPACE:
         {
             const SvxLongLRSpaceItem *pItem = PTR_CAST(SvxLongLRSpaceItem, pState);
-            DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxLRSpaceItem erwartet");
+            DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxLRSpaceItem erwartet");
             rRuler.UpdateFrame(pItem);
             break;
         }
         case SID_ATTR_LONG_ULSPACE:
         {
             const SvxLongULSpaceItem *pItem = PTR_CAST(SvxLongULSpaceItem, pState);
-            DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxULSpaceItem erwartet");
+            DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxULSpaceItem erwartet");
             rRuler.UpdateFrame(pItem);
             break;
         }
@@ -91,7 +91,7 @@ void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
         case SID_ATTR_TABSTOP:
         {
             const SvxTabStopItem *pItem = PTR_CAST(SvxTabStopItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxTabStopItem erwartet");
+            DBG_ASSERT(pState?  0 != pItem: sal_True, "SvxTabStopItem erwartet");
             rRuler.Update(pItem);
             break;
         }
@@ -99,7 +99,7 @@ void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
         case SID_ATTR_PARA_LRSPACE:
         {
             const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxLRSpaceItem erwartet");
+            DBG_ASSERT(pState?  0 != pItem: sal_True, "SvxLRSpaceItem erwartet");
             rRuler.UpdatePara(pItem);
             break;
         }
@@ -109,7 +109,7 @@ void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
         case SID_RULER_ROWS_VERTICAL:
         {
             const SvxColumnItem *pItem = PTR_CAST(SvxColumnItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxColumnItem erwartet");
+            DBG_ASSERT(pState?  0 != pItem: sal_True, "SvxColumnItem erwartet");
 #ifdef DBG_UTIL
             if(pItem)
             {
@@ -128,35 +128,35 @@ void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
         case SID_RULER_PAGE_POS:
         {   // Position Seite, Seitenbreite
             const SvxPagePosSizeItem *pItem = PTR_CAST(SvxPagePosSizeItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxPagePosSizeItem erwartet");
+            DBG_ASSERT(pState?  0 != pItem: sal_True, "SvxPagePosSizeItem erwartet");
             rRuler.Update(pItem);
             break;
         }
         case SID_RULER_OBJECT:
         {   // Object-Selektion
             const SvxObjectItem *pItem = PTR_CAST(SvxObjectItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxObjectItem erwartet");
+            DBG_ASSERT(pState?  0 != pItem: sal_True, "SvxObjectItem erwartet");
             rRuler.Update(pItem);
             break;
         }
         case SID_RULER_PROTECT:
         {
             const SvxProtectItem *pItem = PTR_CAST(SvxProtectItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxProtectItem erwartet");
+            DBG_ASSERT(pState?  0 != pItem: sal_True, "SvxProtectItem erwartet");
             rRuler.Update(pItem);
             break;
         }
         case SID_RULER_BORDER_DISTANCE:
         {
             const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxLRSpaceItem erwartet");
+            DBG_ASSERT(pState?  0 != pItem: sal_True, "SvxLRSpaceItem erwartet");
             rRuler.UpdateParaBorder(pItem);
         }
         break;
         case SID_RULER_TEXT_RIGHT_TO_LEFT :
         {
             const SfxBoolItem *pItem = PTR_CAST(SfxBoolItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SfxBoolItem erwartet");
+            DBG_ASSERT(pState?  0 != pItem: sal_True, "SfxBoolItem erwartet");
             rRuler.UpdateTextRTL(pItem);
         }
         break;
diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx
index c8595a92495e..dccb5d97a2ec 100644
--- a/svx/source/dialog/rlrcitem.hxx
+++ b/svx/source/dialog/rlrcitem.hxx
@@ -39,11 +39,11 @@ private:
     SvxRuler& rRuler;
 
 protected:
-    virtual void StateChanged( USHORT,
+    virtual void StateChanged( sal_uInt16,
                                SfxItemState, const SfxPoolItem* pState );
 
 public:
-    SvxRulerItem( USHORT nId, SvxRuler&, SfxBindings& );
+    SvxRulerItem( sal_uInt16 nId, SvxRuler&, SfxBindings& );
 };
 
 
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index d281802ac40e..a85fc023eca5 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -78,7 +78,7 @@ static const sal_Char cRubies[] = "Rubies";
 /* -----------------------------09.01.01 17:24--------------------------------
 
  ---------------------------------------------------------------------------*/
-SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId,
+SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId,
     SfxBindings* pBindings, SfxChildWinInfo* pInfo) :
     SfxChildWindow(_pParent, nId)
 {
@@ -241,7 +241,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
     aHelpPB(this,               ResId(PB_HELP,*rResId.GetResMgr()           )),
     nLastPos(0),
     nCurrentEdit(0),
-    bModified(FALSE),
+    bModified(sal_False),
     pBindings(pBind)
 {
     xImpl = pImpl = new SvxRubyData_Impl;
@@ -268,7 +268,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
     Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl));
     Link aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl));
     Link aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl));
-    for(USHORT i = 0; i < 8; i++)
+    for(sal_uInt16 i = 0; i < 8; i++)
     {
         aEditArr[i]->SetModifyHdl(aEditLk);
         aEditArr[i]->SetJumpHdl(aJumpLk);
@@ -292,7 +292,7 @@ SvxRubyDialog::~SvxRubyDialog()
  ---------------------------------------------------------------------------*/
 void SvxRubyDialog::ClearCharStyleList()
 {
-    for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++)
+    for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++)
     {
         void* pData = aCharStyleLB.GetEntryData(i);
         delete (OUString*)pData;
@@ -302,12 +302,12 @@ void SvxRubyDialog::ClearCharStyleList()
 /* -----------------------------09.01.01 17:17--------------------------------
 
  ---------------------------------------------------------------------------*/
-BOOL    SvxRubyDialog::Close()
+sal_Bool    SvxRubyDialog::Close()
 {
     pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG,
                               SFX_CALLMODE_ASYNCHRON |
                               SFX_CALLMODE_RECORD);
-    return TRUE;
+    return sal_True;
 }
 /* -----------------------------29.01.01 15:26--------------------------------
 
@@ -372,7 +372,7 @@ void SvxRubyDialog::Activate()
                             }
                             if(sName.getLength())
                             {
-                                USHORT nPos = aCharStyleLB.InsertEntry(sName);
+                                sal_uInt16 nPos = aCharStyleLB.InsertEntry(sName);
                                 aCharStyleLB.SetEntryData( nPos, new OUString(sCoreName) );
 
                             }
@@ -407,7 +407,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
 {
     OUString sLeft, sRight;
     const Sequence<PropertyValues>&  aRubyValues = pImpl->GetRubyValues();
-    BOOL bEnable = aRubyValues.getLength() > nPos;
+    sal_Bool bEnable = aRubyValues.getLength() > nPos;
     if(bEnable)
     {
         const Sequence<PropertyValue> aProps = aRubyValues.getConstArray()[nPos];
@@ -421,7 +421,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
         }
     }
     else if(!nPos)
-        bEnable = TRUE;
+        bEnable = sal_True;
     rLeft.Enable(bEnable);
     rRight.Enable(bEnable);
     rLeft.SetText(sLeft);
@@ -441,7 +441,7 @@ void SvxRubyDialog::GetText()
         {
             Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues();
             DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" );
-            SetModified(TRUE);
+            SetModified(sal_True);
             Sequence<PropertyValue> &rProps = aRubyValues.getArray()[i / 2 + nTempLastPos];
             PropertyValue* pProps = rProps.getArray();
             for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++)
@@ -463,7 +463,7 @@ void SvxRubyDialog::Update()
     aScrollSB.SetRange( Range(0, nLen > 4 ? nLen - 4 : 0));
     aScrollSB.SetThumbPos(0);
     SetLastPos(0);
-    SetModified(FALSE);
+    SetModified(sal_False);
 
     sal_Int16 nAdjust = -1;
     sal_Int16 nPosition = -1;
@@ -521,7 +521,7 @@ void SvxRubyDialog::Update()
         sCharStyleName = C2U(cRubies);
     if(sCharStyleName.getLength())
     {
-        for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++)
+        for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++)
         {
             const OUString* pCoreName = (const OUString*)aCharStyleLB.GetEntryData(i);
             if(pCoreName && sCharStyleName == *pCoreName)
@@ -642,7 +642,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox)
             if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyAdjust)))
                 pProps[nProp].Value <<= nAdjust;
         }
-        SetModified(TRUE);
+        SetModified(sal_True);
     }
     aPreviewWin.Invalidate();
     return 0;
@@ -665,7 +665,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox)
             if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyIsAbove)))
                 pProps[nProp].Value.setValue(&bAbove, rType);
         }
-        SetModified(TRUE);
+        SetModified(sal_True);
     }
     aPreviewWin.Invalidate();
     return 0;
@@ -691,7 +691,7 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG )
                 pProps[nProp].Value <<= sStyleName;
             }
         }
-        SetModified(TRUE);
+        SetModified(sal_True);
     }
     return 0;
 }
@@ -700,7 +700,7 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG )
  ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit)
 {
-    for(USHORT i = 0; i < 8; i++)
+    for(sal_uInt16 i = 0; i < 8; i++)
     {
         if(pEdit == aEditArr[i])
         {
@@ -746,8 +746,8 @@ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam)
  ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam)
 {
-    USHORT nIndex = USHRT_MAX;
-    for(USHORT i = 0; i < 8; i++)
+    sal_uInt16 nIndex = USHRT_MAX;
+    for(sal_uInt16 i = 0; i < 8; i++)
     {
         if(aEditArr[i]->HasFocus())
             nIndex = i;
@@ -866,7 +866,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
     long nRubyWidth = GetTextWidth(sRubyText);
     SetFont(aSaveFont);
 
-    USHORT nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos();
+    sal_uInt16 nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos();
     //use center if no adjustment is available
     if(nAdjust > 4)
         nAdjust = 1;
@@ -882,7 +882,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
     long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2;
 
     //use above also if no selection is set
-    BOOL bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1;
+    sal_Bool bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1;
     if(!bAbove)
     {
         long nTmp = nYRuby;
@@ -969,8 +969,8 @@ long  RubyEdit::PreNotify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         const KeyCode&  rKeyCode = pKEvt->GetKeyCode();
-        USHORT nMod = rKeyCode.GetModifier();
-        USHORT nCode = rKeyCode.GetCode();
+        sal_uInt16 nMod = rKeyCode.GetModifier();
+        sal_uInt16 nCode = rKeyCode.GetCode();
         if( nCode == KEY_TAB && (!nMod || KEY_SHIFT == nMod))
         {
             sal_Int32 nParam = KEY_SHIFT == nMod ? -1 : 1;
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 331c38d6bdd6..fa6936e7581e 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -63,7 +63,7 @@ String SvxLongLRSpaceItem::GetValueText() const
 #define TWIP_TO_MM100(TWIP)     ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
 #define MM100_TO_TWIP(MM100)    ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
 
-sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -77,7 +77,7 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
             aLeftRightMargin.Left = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
             aLeftRightMargin.Right = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
             rVal <<= aLeftRightMargin;
-            return TRUE;
+            return sal_True;
         }
 
         case MID_LEFT: nVal = lLeft; break;
@@ -89,11 +89,11 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
         nVal = TWIP_TO_MM100( nVal );
 
     rVal <<= nVal;
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -150,7 +150,7 @@ SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const
 
 //------------------------------------------------------------------------
 
-SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, USHORT nId)
+SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, sal_uInt16 nId)
     : SfxPoolItem(nId),
     lLeft(lL),
     lRight(lR)
@@ -189,7 +189,7 @@ String SvxLongULSpaceItem::GetValueText() const
     return String();
 }
 
-sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -203,7 +203,7 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
             aUpperLowerMargin.Upper = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
             aUpperLowerMargin.Lower = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
             rVal <<= aUpperLowerMargin;
-            return TRUE;
+            return sal_True;
         }
 
         case MID_UPPER: nVal = lLeft; break;
@@ -215,11 +215,11 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
         nVal = TWIP_TO_MM100( nVal );
 
     rVal <<= nVal;
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -275,7 +275,7 @@ SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const
 
 //------------------------------------------------------------------------
 
-SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, USHORT nId)
+SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, sal_uInt16 nId)
     : SfxPoolItem(nId),
     lLeft(lL),
     lRight(lR)
@@ -307,7 +307,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
             lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight;
 }
 
-sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -322,7 +322,7 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
             aPagePosSize.Width = lWidth;
             aPagePosSize.Height = lHeight;
             rVal <<= aPagePosSize;
-            return TRUE;
+            return sal_True;
         }
 
         case MID_X: nVal = aPos.X(); break;
@@ -334,10 +334,10 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
     }
 
     rVal <<= nVal;
-    return TRUE;
+    return sal_True;
 }
 
-sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -432,7 +432,7 @@ SvxPagePosSizeItem::SvxPagePosSizeItem()
 
 void SvxColumnItem::DeleteAndDestroyColumns()
 {
-    for( USHORT i = aColumns.Count(); i>0; )
+    for( sal_uInt16 i = aColumns.Count(); i>0; )
     {
         SvxColumnDescription *pTmp = (SvxColumnDescription *)aColumns[--i];
         aColumns.Remove( i );
@@ -450,19 +450,19 @@ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
        nRight != ((const SvxColumnItem&)rCmp).nRight ||
        bTable != ((const SvxColumnItem&)rCmp).bTable ||
        Count() != ((const SvxColumnItem&)rCmp).Count())
-        return FALSE;
+        return sal_False;
 
-    const USHORT nCount = ((const SvxColumnItem&)rCmp).Count();
-    for(USHORT i = 0; i < nCount;++i) {
+    const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count();
+    for(sal_uInt16 i = 0; i < nCount;++i) {
 #if OSL_DEBUG_LEVEL > 1
         SvxColumnDescription *p1, *p2;
         p1 = (SvxColumnDescription *)aColumns[i];
         p2 = (SvxColumnDescription *)((const SvxColumnItem&)rCmp).aColumns[i];
 #endif
         if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] )
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -494,30 +494,30 @@ SfxPoolItem* SvxColumnItem::Clone( SfxItemPool * ) const
 
 //------------------------------------------------------------------------
 
-SvxColumnItem::SvxColumnItem( USHORT nAct ) :
+SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) :
 
     SfxPoolItem( SID_RULER_BORDERS ),
 
     nLeft       ( 0 ),
     nRight      ( 0 ),
     nActColumn  ( nAct ),
-    bTable      ( FALSE ),
-    bOrtho      (TRUE )
+    bTable      ( sal_False ),
+    bOrtho      (sal_True )
 
 {
 }
 
 //------------------------------------------------------------------------
 
-SvxColumnItem::SvxColumnItem( USHORT nActCol, USHORT left, USHORT right ) :
+SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) :
 
     SfxPoolItem( SID_RULER_BORDERS ),
 
     nLeft       ( left ),
     nRight      ( right ),
     nActColumn  ( nActCol ),
-    bTable      ( TRUE ),
-    bOrtho      ( TRUE )
+    bTable      ( sal_True ),
+    bOrtho      ( sal_True )
 {
 }
 
@@ -527,7 +527,7 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
 
     SfxPoolItem( rCopy ),
 
-      aColumns  ( (BYTE)rCopy.Count() ),
+      aColumns  ( (sal_uInt8)rCopy.Count() ),
       nLeft     ( rCopy.nLeft ),
       nRight    ( rCopy.nRight ),
       nActColumn( rCopy.nActColumn ),
@@ -535,9 +535,9 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
       bOrtho    ( rCopy.bOrtho )
 
 {
-    const USHORT nCount = rCopy.Count();
+    const sal_uInt16 nCount = rCopy.Count();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
         Append( rCopy[i] );
 }
 
@@ -557,37 +557,37 @@ const SvxColumnItem &SvxColumnItem::operator=(const SvxColumnItem &rCopy)
     bTable = rCopy.bTable;
     nActColumn = rCopy.nActColumn;
     DeleteAndDestroyColumns();
-    const USHORT nCount = rCopy.Count();
-    for(USHORT i = 0; i < nCount;++i)
+    const sal_uInt16 nCount = rCopy.Count();
+    for(sal_uInt16 i = 0; i < nCount;++i)
         Insert(rCopy[i], i);
     return *this;
 }
 
 //------------------------------------------------------------------------
 
-BOOL SvxColumnItem::CalcOrtho() const
+sal_Bool SvxColumnItem::CalcOrtho() const
 {
-    const USHORT nCount = Count();
+    const sal_uInt16 nCount = Count();
     DBG_ASSERT(nCount >= 2, "keine Spalten");
     if(nCount < 2)
-        return FALSE;
+        return sal_False;
 
     long nColWidth = (*this)[0].GetWidth();
-    for(USHORT i = 1; i < nCount; ++i) {
+    for(sal_uInt16 i = 1; i < nCount; ++i) {
         if( (*this)[i].GetWidth() != nColWidth)
-            return FALSE;
+            return sal_False;
     }
     //!! Breite Trenner
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
 long SvxColumnItem::GetVisibleRight() const
 {
-    USHORT nIdx = 0;
+    sal_uInt16 nIdx = 0;
 
-    for ( USHORT i = 0; i < nActColumn; ++i )
+    for ( sal_uInt16 i = 0; i < nActColumn; ++i )
     {
         if ( (*this)[i].bVisible )
             ++nIdx;
@@ -595,7 +595,7 @@ long SvxColumnItem::GetVisibleRight() const
     return (*this)[nIdx].nEnd;
 }
 
-sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -615,7 +615,7 @@ sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
     return sal_True;
 }
 
-sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Int32 nVal = 0;
@@ -627,9 +627,9 @@ sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
         }
         case MID_RIGHT: rVal >>= nRight; break;
         case MID_LEFT: rVal >>= nLeft; break;
-        case MID_ORTHO: rVal >>= nVal; bOrtho = (BOOL) nVal; break;
-        case MID_ACTUAL: rVal >>= nVal; nActColumn = (USHORT) nVal; break;
-        case MID_TABLE: rVal >>= nVal; bTable = (BOOL) nVal; break;
+        case MID_ORTHO: rVal >>= nVal; bOrtho = (sal_Bool) nVal; break;
+        case MID_ACTUAL: rVal >>= nVal; nActColumn = (sal_uInt16) nVal; break;
+        case MID_TABLE: rVal >>= nVal; bTable = (sal_Bool) nVal; break;
         default: DBG_ERROR("Wrong MemberId!"); return sal_False;
     }
 
@@ -678,7 +678,7 @@ SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const
 //------------------------------------------------------------------------
 
 SvxObjectItem::SvxObjectItem( long nSX, long nEX,
-                              long nSY, long nEY, BOOL limits ) :
+                              long nSY, long nEY, sal_Bool limits ) :
 
     SfxPoolItem( SID_RULER_OBJECT ),
 
@@ -706,7 +706,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) :
 {
 }
 
-sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -721,13 +721,13 @@ sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
             return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     switch ( nMemberId )
     {
         case MID_START_X : bRet = (rVal >>= nStartX); break;
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx
index 10734e8495f6..7d15a0e2c65e 100644
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -79,7 +79,7 @@ static LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName,
 
     if ( ERROR_SUCCESS == lResult )
     {
-        lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST BYTE *)lpData, cbData );
+        lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST sal_uInt8 *)lpData, cbData );
         RegCloseKey( hKey );
     }
 
@@ -123,14 +123,14 @@ namespace svx{
                 sizeof(szBuffer) ) )
                 maEMailAddrED.SetText( (sal_Unicode *)szBuffer );
 
-            DWORD   fAllowContact = FALSE;
+            DWORD   fAllowContact = sal_False;
             RegReadValue(
                 HKEY_CURRENT_USER,
                 TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
                 TEXT("AllowContact"),
                 &fAllowContact,
                 sizeof(fAllowContact) );
-            maContactCB.Check( (BOOL)fAllowContact );
+            maContactCB.Check( (sal_Bool)fAllowContact );
 
             DWORD   uInternetConnection = 0;
             RegReadValue(
@@ -235,7 +235,7 @@ namespace svx{
                         szBuffer,
                         NULL,
                         NULL,
-                        FALSE,
+                        sal_False,
                         0,
                         NULL, NULL, &StartupInfo, &ProcessInfo )
                     )
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 0545161e858d..199464a0966c 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -54,11 +54,11 @@ SvxSimpTblContainer::SvxSimpTblContainer( Window* pParent, const ResId& rResId):
 
 long SvxSimpTblContainer::PreNotify( NotifyEvent& rNEvt )
 {
-    long nResult = TRUE;
+    long nResult = sal_True;
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nKey = aKeyCode.GetCode();
+        sal_uInt16 nKey = aKeyCode.GetCode();
         if ( nKey == KEY_TAB )
             GetParent()->Notify( rNEvt );
         else if ( m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT ) )
@@ -80,10 +80,10 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,WinBits nBits ):
         aPrivContainer(pParent,nBits|WB_DIALOGCONTROL),
         aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP),
         nHeaderItemId(1),
-        bResizeFlag(FALSE),
-        bPaintFlag(TRUE)
+        bResizeFlag(sal_False),
+        bPaintFlag(sal_True)
 {
-    bSortDirection=TRUE;
+    bSortDirection=sal_True;
     nSortCol=0xFFFF;
     nOldPos=0;
 
@@ -111,11 +111,11 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId):
         aPrivContainer(pParent,rResId),
         aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER  | WB_TABSTOP),
         nHeaderItemId(1),
-        bResizeFlag(TRUE),
-        bPaintFlag(TRUE)
+        bResizeFlag(sal_True),
+        bPaintFlag(sal_True)
 {
 
-    bSortDirection=TRUE;
+    bSortDirection=sal_True;
     nOldPos=0;
     nSortCol=0xFFFF;
 
@@ -198,18 +198,18 @@ void SvxSimpleTable::SetTabs()
 {
     SvHeaderTabListBox::SetTabs();
 
-    USHORT nPrivTabCount = TabCount();
+    sal_uInt16 nPrivTabCount = TabCount();
     if ( nPrivTabCount )
     {
         if ( nPrivTabCount > aHeaderBar.GetItemCount() )
             nPrivTabCount = aHeaderBar.GetItemCount();
 
-        USHORT i, nNewSize = static_cast< USHORT >( GetTab(0) ), nPos = 0;
+        sal_uInt16 i, nNewSize = static_cast< sal_uInt16 >( GetTab(0) ), nPos = 0;
         for ( i = 1; i < nPrivTabCount; ++i )
         {
-            nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos;
+            nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos;
             aHeaderBar.SetItemSize( i, nNewSize );
-            nPos = (USHORT)GetTab(i);
+            nPos = (sal_uInt16)GetTab(i);
         }
 
         aHeaderBar.SetItemSize( i, HEADERBAR_FULLSIZE ); // because no tab for last entry
@@ -225,9 +225,9 @@ void SvxSimpleTable::Paint( const Rectangle& rRect )
 {
     SvHeaderTabListBox::Paint(rRect );
 
-    USHORT nPrivTabCount = TabCount();
-    USHORT nPos = 0;
-    USHORT nNewSize = ( nPrivTabCount > 0 ) ? (USHORT)GetTab(0) : 0;
+    sal_uInt16 nPrivTabCount = TabCount();
+    sal_uInt16 nPos = 0;
+    sal_uInt16 nNewSize = ( nPrivTabCount > 0 ) ? (sal_uInt16)GetTab(0) : 0;
 
     long nOffset=-GetXOffset();
     nOldPos=nOffset;
@@ -240,16 +240,16 @@ void SvxSimpleTable::Paint( const Rectangle& rRect )
         if(nPrivTabCount>aHeaderBar.GetItemCount())
                 nPrivTabCount=aHeaderBar.GetItemCount();
 
-        for(USHORT i=1;i<nPrivTabCount;i++)
+        for(sal_uInt16 i=1;i<nPrivTabCount;i++)
         {
-            nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos;
+            nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos;
             aHeaderBar.SetItemSize( i, nNewSize );
-            nPos= static_cast< USHORT >( GetTab(i) );
+            nPos= static_cast< sal_uInt16 >( GetTab(i) );
         }
     }
-    bPaintFlag=TRUE;
+    bPaintFlag=sal_True;
 }
-void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,USHORT nCol,
+void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,sal_uInt16 nCol,
                                        HeaderBarItemBits nBits)
 {
     xub_StrLen nEnd = rText.Search( sal_Unicode( '\t' ) );
@@ -290,7 +290,7 @@ void SvxSimpleTable::HideTable()
     aPrivContainer.Hide();
 }
 
-BOOL SvxSimpleTable::IsVisible() const
+sal_Bool SvxSimpleTable::IsVisible() const
 {
     return aPrivContainer.IsVisible();
 }
@@ -305,7 +305,7 @@ void SvxSimpleTable::DisableTable()
     aPrivContainer.Disable();
 }
 
-BOOL SvxSimpleTable::IsEnabled() const
+sal_Bool SvxSimpleTable::IsEnabled() const
 {
     return aPrivContainer.IsEnabled();
 }
@@ -359,12 +359,12 @@ void SvxSimpleTable::SetOutputSizePixel(const Size& rNewSize )
     UpdateViewSize();
 }
 
-USHORT SvxSimpleTable::GetSelectedCol()
+sal_uInt16 SvxSimpleTable::GetSelectedCol()
 {
     return (aHeaderBar.GetCurItemId()-1);
 }
 
-void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir)
+void SvxSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir)
 {
     bSortDirection=bDir;
     if(nSortCol!=0xFFFF)
@@ -393,7 +393,7 @@ void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir)
 
 void SvxSimpleTable::HBarClick()
 {
-    USHORT nId=aHeaderBar.GetCurItemId();
+    sal_uInt16 nId=aHeaderBar.GetCurItemId();
 
     if (aHeaderBar.GetItemBits(nId) & HIB_CLICKABLE)
     {
@@ -441,24 +441,24 @@ void SvxSimpleTable::HBarDrag()
 void SvxSimpleTable::HBarEndDrag()
 {
     HideTracking();
-    USHORT nPrivTabCount=TabCount();
-    USHORT nPos=0;
-    USHORT nNewSize=0;
+    sal_uInt16 nPrivTabCount=TabCount();
+    sal_uInt16 nPos=0;
+    sal_uInt16 nNewSize=0;
 
     if(nPrivTabCount)
     {
         if(nPrivTabCount>aHeaderBar.GetItemCount())
                 nPrivTabCount=aHeaderBar.GetItemCount();
 
-        //for(USHORT i=1;i<=nPrivTabCount;i++)
-        for(USHORT i=1;i<nPrivTabCount;i++)
+        //for(sal_uInt16 i=1;i<=nPrivTabCount;i++)
+        for(sal_uInt16 i=1;i<nPrivTabCount;i++)
         {
-            nNewSize = static_cast< USHORT >( aHeaderBar.GetItemSize(i) ) + nPos;
+            nNewSize = static_cast< sal_uInt16 >( aHeaderBar.GetItemSize(i) ) + nPos;
             SetTab( i, nNewSize, MAP_PIXEL );
             nPos = nNewSize;
         }
     }
-    bPaintFlag=FALSE;
+    bPaintFlag=sal_False;
     Invalidate();
     Update();
 }
@@ -520,14 +520,14 @@ IMPL_LINK( SvxSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr)
     return 0;
 }
 
-SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const
+SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const
 {
     DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry");
     SvLBoxItem* pItem = NULL;
 
     if( pEntry )
     {
-        USHORT nCount = pEntry->ItemCount();
+        sal_uInt16 nCount = pEntry->ItemCount();
 
         nPos++;
 
@@ -551,8 +551,8 @@ StringCompare SvxSimpleTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight)
 
     if(pLeftItem != NULL && pRightItem != NULL)
     {
-        USHORT nLeftKind=pLeftItem->IsA();
-        USHORT nRightKind=pRightItem->IsA();
+        sal_uInt16 nLeftKind=pLeftItem->IsA();
+        sal_uInt16 nRightKind=pRightItem->IsA();
 
         if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
             nLeftKind == SV_ITEM_ID_LBOXSTRING )
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 479888463a5c..fe60ac939811 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -47,7 +47,7 @@
 
 SvxSearchController::SvxSearchController
 (
-    USHORT _nId,
+    sal_uInt16 _nId,
     SfxBindings& rBind,
     SvxSearchDialog& rDlg
 ) :
@@ -59,7 +59,7 @@ SvxSearchController::SvxSearchController
 
 // -----------------------------------------------------------------------
 
-void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                         const SfxPoolItem* pState )
 {
     if ( SFX_ITEM_AVAILABLE == eState )
@@ -74,7 +74,7 @@ void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState,
         else if ( SID_SEARCH_OPTIONS == nSID )
         {
             DBG_ASSERT( pState->ISA(SfxUInt16Item), "wrong item type" );
-            USHORT nFlags = (USHORT)( (SfxUInt16Item*)pState )->GetValue();
+            sal_uInt16 nFlags = (sal_uInt16)( (SfxUInt16Item*)pState )->GetValue();
             rSrchDlg.EnableControls_Impl( nFlags );
         }
         else if ( SID_SEARCH_ITEM == nSID )
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index 107280743ba6..6320ddeb8420 100644
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.hxx
@@ -40,10 +40,10 @@ class SvxSearchController : public SfxControllerItem
     SvxSearchDialog&    rSrchDlg;
 
 protected:
-    virtual void        StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
 
 public:
-    SvxSearchController( USHORT nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );
+    SvxSearchController( sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );
 };
 
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 9f6d606dc759..5f91c6dabacb 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -107,7 +107,7 @@ SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem);
 //    rBindings.ExecuteSynchron( nId, (const SfxPoolItem**)&pSearchItem, 0L )
 
 #define GetCheckBoxValue( rBox )                                \
-    rBox.IsEnabled() ? rBox.IsChecked() : FALSE
+    rBox.IsEnabled() ? rBox.IsChecked() : sal_False
 
 #if ENABLE_LAYOUT
 #undef SVX_RES
@@ -119,11 +119,11 @@ struct SearchDlg_Impl
     FixedText   aSearchFormats;
     FixedText   aReplaceFormats;
 
-    BOOL        bMultiLineEdit   : 1,
+    sal_Bool        bMultiLineEdit   : 1,
                 bSaveToModule    : 1,
                 bFocusOnSearch   : 1,
                 bDeltaCalculated : 1;
-    USHORT*     pRanges;
+    sal_uInt16*     pRanges;
     Timer       aSelectionTimer;
 
     uno::Reference< frame::XDispatch > xCommand1Dispatch;
@@ -138,10 +138,10 @@ struct SearchDlg_Impl
 #endif /* !ENABLE_LAYOUT */
         aSearchFormats  ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ),
         aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ),
-        bMultiLineEdit  ( FALSE ),
-        bSaveToModule   ( TRUE ),
-        bFocusOnSearch  ( TRUE ),
-        bDeltaCalculated( FALSE ),
+        bMultiLineEdit  ( sal_False ),
+        bSaveToModule   ( sal_True ),
+        bFocusOnSearch  ( sal_True ),
+        bDeltaCalculated( sal_False ),
         pRanges         ( NULL )
         {
             aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString::createFromAscii("vnd.sun.search:SearchViaComponent1");
@@ -156,14 +156,14 @@ struct SearchDlg_Impl
 
 // -----------------------------------------------------------------------
 
-void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
+void ListToStrArr_Impl( sal_uInt16 nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
 {
     SfxStringListItem* pSrchItem =
         (SfxStringListItem*)SFX_APP()->GetItem( nId );
     List* pLst = pSrchItem ? pSrchItem->GetList() : 0;
 
     if ( pLst )
-        for ( USHORT i = 0; i < pLst->Count(); ++i )
+        for ( sal_uInt16 i = 0; i < pLst->Count(); ++i )
         {
             String* pTmp = new String( *(String*)( pLst->GetObject(i) ) );
             rStrLst.Insert( pTmp, rStrLst.Count() );
@@ -173,12 +173,12 @@ void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
 
 // -----------------------------------------------------------------------
 
-void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst )
+void StrArrToList_Impl( sal_uInt16 nId, const SvStringsDtor& rStrLst )
 {
     DBG_ASSERT( rStrLst.Count(), "vorher abpruefen!!" );
     List aLst;
 
-    for ( USHORT i = 0; i < rStrLst.Count(); ++i )
+    for ( sal_uInt16 i = 0; i < rStrLst.Count(); ++i )
         aLst.Insert( rStrLst[ i ], LIST_APPEND );
 
     SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) );
@@ -188,13 +188,13 @@ void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst )
 
 SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) :
 
-    SrchAttrItemList( (BYTE)rList.Count() )
+    SrchAttrItemList( (sal_uInt8)rList.Count() )
 
 {
     SrchAttrItemList::Insert( &rList, 0 );
     SearchAttrItem* _pData = (SearchAttrItem*)GetData();
 
-    for ( USHORT i = Count(); i; --i, ++_pData )
+    for ( sal_uInt16 i = Count(); i; --i, ++_pData )
         if ( !IsInvalidItem( _pData->pItem ) )
             _pData->pItem = _pData->pItem->Clone();
 }
@@ -217,9 +217,9 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet )
     SfxItemIter aIter( rSet );
     SearchAttrItem aItem;
     const SfxPoolItem* pItem = aIter.GetCurItem();
-    USHORT nWhich;
+    sal_uInt16 nWhich;
 
-    while ( TRUE )
+    while ( sal_True )
     {
         // nur testen, ob vorhanden ist ?
         if( IsInvalidItem( pItem ) )
@@ -249,7 +249,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
     SfxItemPool* pPool = rSet.GetPool();
     SearchAttrItem* _pData = (SearchAttrItem*)GetData();
 
-    for ( USHORT i = Count(); i; --i, ++_pData )
+    for ( sal_uInt16 i = Count(); i; --i, ++_pData )
         if ( IsInvalidItem( _pData->pItem ) )
             rSet.InvalidateItem( pPool->GetWhich( _pData->nSlot ) );
         else
@@ -263,7 +263,7 @@ void SearchAttrItemList::Clear()
 {
     SearchAttrItem* _pData = (SearchAttrItem*)GetData();
 
-    for ( USHORT i = Count(); i; --i, ++_pData )
+    for ( sal_uInt16 i = Count(); i; --i, ++_pData )
         if ( !IsInvalidItem( _pData->pItem ) )
             delete _pData->pItem;
     SrchAttrItemList::Remove( 0, Count() );
@@ -272,13 +272,13 @@ void SearchAttrItemList::Clear()
 // -----------------------------------------------------------------------
 
 // l"oscht die Pointer auf die Items
-void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen )
+void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     if ( nPos + nLen > Count() )
         nLen = Count() - nPos;
     SearchAttrItem* _pData = (SearchAttrItem*)GetData() + nPos;
 
-    for ( USHORT n = nLen; n; --n, ++_pData )
+    for ( sal_uInt16 n = nLen; n; --n, ++_pData )
         if ( !IsInvalidItem( _pData->pItem ) )
             delete _pData->pItem;
 
@@ -341,13 +341,13 @@ void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen )
     aColumnsBtn     ( this, SVX_RES( RB_CALC_COLUMNS ) ),                     \
     aAllSheetsCB    ( this, SVX_RES( CB_ALL_SHEETS ) ),                       \
     rBindings       ( rBind ),                                              \
-    bWriter         ( FALSE ),                                              \
-    bSearch         ( TRUE ),                                               \
-    bFormat         ( FALSE ),                                              \
+    bWriter         ( sal_False ),                                              \
+    bSearch         ( sal_True ),                                               \
+    bFormat         ( sal_False ),                                              \
     nOptions        ( USHRT_MAX ),                                          \
-    bSet            ( FALSE ),                                              \
-    bReadOnly       ( FALSE ),                                              \
-    bConstruct      ( TRUE ),                                               \
+    bSet            ( sal_False ),                                              \
+    bReadOnly       ( sal_False ),                                              \
+    bConstruct      ( sal_True ),                                               \
     nModifyFlag     ( 0 ),                                                  \
     aCalcStr        ( THIS_SVX_RES( STR_WORDCALC ) ),                       \
     pImpl           ( NULL ),                                               \
@@ -486,7 +486,7 @@ void SvxSearchDialog::Construct_Impl()
     SvtCJKOptions aCJKOptions;
     if(!aCJKOptions.IsJapaneseFindEnabled())
     {
-        aJapOptionsCB.Check( FALSE );
+        aJapOptionsCB.Check( sal_False );
         aJapOptionsCB.Hide();
         aJapOptionsBtn.Hide();
     }
@@ -616,7 +616,7 @@ void SvxSearchDialog::Construct_Impl()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxSearchDialog::Close()
+sal_Bool SvxSearchDialog::Close()
 {
     // remember strings speichern
     if ( aSearchStrings.Count() )
@@ -641,12 +641,12 @@ BOOL SvxSearchDialog::Close()
     rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SFX_CALLMODE_SLOT, ppArgs );
     rBindings.Execute( SID_SEARCH_DLG );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-INT32 SvxSearchDialog::GetTransliterationFlags() const
+sal_Int32 SvxSearchDialog::GetTransliterationFlags() const
 {
     if (!aMatchCaseCB.IsChecked())
         nTransliterationFlags |=  TransliterationModules_IGNORE_CASE;
@@ -661,10 +661,10 @@ INT32 SvxSearchDialog::GetTransliterationFlags() const
 
 // -----------------------------------------------------------------------
 
-void SvxSearchDialog::ApplyTransliterationFlags_Impl( INT32 nSettings )
+void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings )
 {
     nTransliterationFlags = nSettings;
-    BOOL bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
+    sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
     aMatchCaseCB            .Check(!bVal );
     bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH);
     aJapMatchFullHalfWidthCB.Check( !bVal );
@@ -688,9 +688,9 @@ void SvxSearchDialog::Activate()
 void SvxSearchDialog::InitControls_Impl()
 {
     // CaseSensitives AutoComplete
-    aSearchLB.EnableAutocomplete( TRUE, TRUE );
+    aSearchLB.EnableAutocomplete( sal_True, sal_True );
     aSearchLB.Show();
-    aReplaceLB.EnableAutocomplete( TRUE, TRUE );
+    aReplaceLB.EnableAutocomplete( sal_True, sal_True );
     aReplaceLB.Show();
 
     aFormatBtn.Disable();
@@ -790,9 +790,9 @@ void SvxSearchDialog::CalculateDelta_Impl()
     if ( pImpl->bDeltaCalculated )
         return;
     else
-        pImpl->bDeltaCalculated = TRUE;
+        pImpl->bDeltaCalculated = sal_True;
 
-    ULONG nDelta = 187, nOffset = 0;
+    sal_uIntPtr nDelta = 187, nOffset = 0;
     SvtCJKOptions aCJKOptions;
 
     pMoreBtn->AddWindow( &aOptionsFL );
@@ -931,7 +931,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
     DBG_ASSERT( pSearchItem, "SearchItem == 0" );
     bWriter = ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_WRITER );
 
-    pImpl->bMultiLineEdit = FALSE;
+    pImpl->bMultiLineEdit = sal_False;
 
     if ( !pImpl->bMultiLineEdit )
     {
@@ -979,7 +979,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
 
     CalculateDelta_Impl();
 
-    FASTBOOL bDraw = FALSE;
+    bool bDraw = sal_False;
     if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC )
     {
         Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl );
@@ -1037,7 +1037,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
             aFormatBtn.Hide();
             aNoFormatBtn.Hide();
             aAttributeBtn.Hide();
-            bDraw = TRUE;
+            bDraw = sal_True;
         }
         else
         {
@@ -1063,7 +1063,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
             aAttributeBtn.Show();
 */
         }
-//       pMoreBtn->SetState( FALSE );
+//       pMoreBtn->SetState( sal_False );
 //       pMoreBtn->Hide();
     }
 
@@ -1076,25 +1076,25 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
     // "Ahnlichkeitssuche?
     if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 )
         aSimilarityBox.Check( pSearchItem->IsLevenshtein() );
-    bSet = TRUE;
+    bSet = sal_True;
 
-    pImpl->bSaveToModule = FALSE;
+    pImpl->bSaveToModule = sal_False;
     FlagHdl_Impl( &aSimilarityBox );
     FlagHdl_Impl( &aJapOptionsCB );
-    pImpl->bSaveToModule = TRUE;
+    pImpl->bSaveToModule = sal_True;
 
-    FASTBOOL bDisableSearch = FALSE;
+    bool bDisableSearch = sal_False;
     SfxViewShell* pViewShell = SfxViewShell::Current();
 
     if ( pViewShell )
     {
-        BOOL bText = !bSearchPattern;
+        sal_Bool bText = !bSearchPattern;
 
         if ( pViewShell->HasSelection( bText ) )
             EnableControl_Impl( &aSelectionBtn );
         else
         {
-            aSelectionBtn.Check( FALSE );
+            aSelectionBtn.Check( sal_False );
             aSelectionBtn.Disable();
         }
     }
@@ -1142,14 +1142,14 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
     }
     else
     {
-        FASTBOOL bSetSearch = ( ( nModifyFlag & MODIFY_SEARCH ) == 0 );
-        FASTBOOL bSetReplace = ( ( nModifyFlag & MODIFY_REPLACE ) == 0 );
+        bool bSetSearch = ( ( nModifyFlag & MODIFY_SEARCH ) == 0 );
+        bool bSetReplace = ( ( nModifyFlag & MODIFY_REPLACE ) == 0 );
 
         if ( pSearchItem->GetSearchString().Len() && bSetSearch )
             aSearchLB.SetText( pSearchItem->GetSearchString() );
         else if ( aSearchStrings.Count() )
         {
-            FASTBOOL bAttributes =
+            bool bAttributes =
                 ( ( pSearchList && pSearchList->Count() ) ||
                   ( pReplaceList && pReplaceList->Count() ) );
 
@@ -1232,9 +1232,9 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
 
     if ( aLayoutBtn.IsChecked() )
     {
-        pImpl->bSaveToModule = FALSE;
+        pImpl->bSaveToModule = sal_False;
         TemplateHdl_Impl( &aLayoutBtn );
-        pImpl->bSaveToModule = TRUE;
+        pImpl->bSaveToModule = sal_True;
     }
 }
 
@@ -1249,8 +1249,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
     if ( !pImpl->pRanges && pSSet )
     {
         sal_sSize nCnt = 0;
-        const USHORT* pPtr = pSSet->GetRanges();
-        const USHORT* pTmp = pPtr;
+        const sal_uInt16* pPtr = pSSet->GetRanges();
+        const sal_uInt16* pTmp = pPtr;
 
         while( *pPtr )
         {
@@ -1258,8 +1258,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
             pPtr += 2;
         }
         nCnt = pPtr - pTmp + 1;
-        pImpl->pRanges = new USHORT[nCnt];
-        memcpy( pImpl->pRanges, pTmp, sizeof(USHORT) * nCnt );
+        pImpl->pRanges = new sal_uInt16[nCnt];
+        memcpy( pImpl->pRanges, pTmp, sizeof(sal_uInt16) * nCnt );
     }
 
     // sorge daf"ur, das die Texte der Attribute richtig stehen
@@ -1275,12 +1275,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
             pSearchList->Put( *pSSet );
 
             if ( !pImpl->bMultiLineEdit )
-                aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, TRUE ) );
+                aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, sal_True ) );
             else
-                pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, TRUE ) );
+                pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, sal_True ) );
 
             if ( aDesc.Len() )
-                bFormat |= TRUE;
+                bFormat |= sal_True;
         }
     }
 
@@ -1294,12 +1294,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
             pReplaceList->Put( *pRSet );
 
             if ( !pImpl->bMultiLineEdit )
-                aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, FALSE ) );
+                aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, sal_False ) );
             else
-                pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, FALSE ) );
+                pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, sal_False ) );
 
             if ( aDesc.Len() )
-                bFormat |= TRUE;
+                bFormat |= sal_True;
         }
     }
 }
@@ -1311,23 +1311,23 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
     if ( pCtrl && !bSet )
         SetModifyFlag_Impl( pCtrl );
     else
-        bSet = FALSE;
+        bSet = sal_False;
 
     if ( pCtrl == &aSimilarityBox )
     {
-        BOOL bIsChecked = aSimilarityBox.IsChecked();
+        sal_Bool bIsChecked = aSimilarityBox.IsChecked();
 
         if ( bIsChecked )
         {
             aSimilarityBtn.Enable();
-            aRegExpBtn.Check( FALSE );
+            aRegExpBtn.Check( sal_False );
             aRegExpBtn.Disable();
             EnableControl_Impl( &aWordBtn );
 
             if ( aLayoutBtn.IsChecked() )
             {
                 EnableControl_Impl( &aMatchCaseCB );
-                aLayoutBtn.Check( FALSE );
+                aLayoutBtn.Check( sal_False );
             }
             aRegExpBtn.Disable();
             aLayoutBtn.Disable();
@@ -1365,11 +1365,11 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
     {
         if ( aLayoutBtn.IsChecked() && !bFormat )
         {
-            aWordBtn.Check( FALSE );
+            aWordBtn.Check( sal_False );
             aWordBtn.Disable();
-            aRegExpBtn.Check( FALSE );
+            aRegExpBtn.Check( sal_False );
             aRegExpBtn.Disable();
-            aMatchCaseCB.Check( FALSE );
+            aMatchCaseCB.Check( sal_False );
             aMatchCaseCB.Disable();
             aNotesBtn.Disable();
 
@@ -1389,7 +1389,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
 
             if ( aRegExpBtn.IsChecked() )
             {
-                aWordBtn.Check( FALSE );
+                aWordBtn.Check( sal_False );
                 aWordBtn.Disable();
                 aSimilarityBox.Disable();
                 aSimilarityBtn.Disable();
@@ -1401,7 +1401,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
             }
 
             // Such-String vorhanden? dann Buttons enablen
-            bSet = TRUE;
+            bSet = sal_True;
             ModifyHdl_Impl( &aSearchLB );
         }
     }
@@ -1412,14 +1412,14 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
             aSearchAllBtn.Disable();
         else
         {
-            bSet = TRUE;
+            bSet = sal_True;
             ModifyHdl_Impl( &aSearchLB );
         }
     }
 
     if ( &aJapOptionsCB == pCtrl )
     {
-        BOOL bEnableJapOpt = aJapOptionsCB.IsChecked();
+        sal_Bool bEnableJapOpt = aJapOptionsCB.IsChecked();
         aMatchCaseCB            .Enable(!bEnableJapOpt );
         aJapMatchFullHalfWidthCB.Enable(!bEnableJapOpt );
         aJapOptionsBtn          .Enable( bEnableJapOpt );
@@ -1434,7 +1434,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
 
 IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
 {
-    FASTBOOL bInclusive = ( aLayoutBtn.GetText() == aLayoutStr );
+    bool bInclusive = ( aLayoutBtn.GetText() == aLayoutStr );
 
     if ( ( pBtn == &aSearchBtn )    ||
          ( pBtn == &aSearchAllBtn ) ||
@@ -1452,22 +1452,22 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
             pSearchItem->SetReplaceString( aReplaceLB.GetText() );
 
             if ( pBtn == &aReplaceBtn )
-                Remember_Impl( aReplaceLB.GetText(), FALSE );
+                Remember_Impl( aReplaceLB.GetText(), sal_False );
             else
             {
-                Remember_Impl( aSearchLB.GetText(), TRUE );
+                Remember_Impl( aSearchLB.GetText(), sal_True );
 
                 if ( pBtn == &aReplaceAllBtn )
-                    Remember_Impl( aReplaceLB.GetText(), FALSE );
+                    Remember_Impl( aReplaceLB.GetText(), sal_False );
             }
         }
 
-        pSearchItem->SetRegExp( FALSE );
-        pSearchItem->SetLevenshtein( FALSE );
+        pSearchItem->SetRegExp( sal_False );
+        pSearchItem->SetLevenshtein( sal_False );
         if (GetCheckBoxValue( aRegExpBtn ))
-            pSearchItem->SetRegExp( TRUE );
+            pSearchItem->SetRegExp( sal_True );
         else if (GetCheckBoxValue( aSimilarityBox ))
-            pSearchItem->SetLevenshtein( TRUE );
+            pSearchItem->SetLevenshtein( sal_True );
 
         pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) );
         pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) );
@@ -1476,7 +1476,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
         pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) );
 
         pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) );
-        INT32 nFlags = GetTransliterationFlags();
+        sal_Int32 nFlags = GetTransliterationFlags();
         if( !pSearchItem->IsUseAsianOptions())
             nFlags &= (TransliterationModules_IGNORE_CASE |
                        TransliterationModules_IGNORE_WIDTH );
@@ -1520,11 +1520,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
             String aStr( aSearchLB.GetText() );
 
             if ( aStr.Len() )
-                Remember_Impl( aStr, TRUE );
+                Remember_Impl( aStr, sal_True );
             aStr = aReplaceLB.GetText();
 
             if ( aStr.Len() )
-                Remember_Impl( aStr, FALSE );
+                Remember_Impl( aStr, sal_False );
         }
         SaveToModule_Impl();
         Close();
@@ -1570,7 +1570,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
             int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute();
             if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
             {
-                INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags = aDlg.GetTransliterationFlags();
+                sal_Int32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 sal_Int32 nFlags = aDlg.GetTransliterationFlags();
                 pSearchItem->SetTransliterationFlags( nFlags );
                 ApplyTransliterationFlags_Impl( nFlags );
             }
@@ -1607,7 +1607,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
     if ( !bSet )
         SetModifyFlag_Impl( pEd );
     else
-        bSet = FALSE;
+        bSet = sal_False;
 
     if ( pEd == &aSearchLB || pEd == &aReplaceLB )
     {
@@ -1657,7 +1657,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
     {
         if ( !pFamilyController )
         {
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
             // Vorlagen-Controller enablen
             switch ( pSearchItem->GetFamily() )
@@ -1724,13 +1724,13 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
 
         if ( !pImpl->bMultiLineEdit )
         {
-            aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, TRUE ) );
-            aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, FALSE ) );
+            aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, sal_True ) );
+            aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, sal_False ) );
         }
         else
         {
-            pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, TRUE ) );
-            pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, FALSE ) );
+            pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, sal_True ) );
+            pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, sal_False ) );
         }
 
         EnableControl_Impl( &aFormatBtn );
@@ -1739,16 +1739,16 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
 
         FocusHdl_Impl( bSearch ? &aSearchLB : &aReplaceLB );
     }
-    bSet = TRUE;
-    pImpl->bSaveToModule = FALSE;
+    bSet = sal_True;
+    pImpl->bSaveToModule = sal_False;
     FlagHdl_Impl( &aLayoutBtn );
-    pImpl->bSaveToModule = TRUE;
+    pImpl->bSaveToModule = sal_True;
     return 0;
 }
 
 // -----------------------------------------------------------------------
 
-void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
+void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch )
 {
     if ( !rStr.Len() )
         return;
@@ -1757,7 +1757,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
     ComboBox* pListBox = _bSearch ? &aSearchLB : &aReplaceLB;
 
     // identische Strings ignorieren
-    for ( USHORT i = 0; i < pArr->Count(); ++i )
+    for ( sal_uInt16 i = 0; i < pArr->Count(); ++i )
     {
         if ( COMPARE_EQUAL == (*pArr)[i]->CompareTo( rStr ) )
             return;
@@ -1769,7 +1769,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
     if ( pArr->Count() >= REMEMBER_SIZE )
     {
         pInsStr = (*pArr)[REMEMBER_SIZE - 1];
-        pListBox->RemoveEntry( USHORT(REMEMBER_SIZE - 1) );
+        pListBox->RemoveEntry( sal_uInt16(REMEMBER_SIZE - 1) );
         pArr->Remove( REMEMBER_SIZE - 1 );
         *pInsStr = rStr;
     }
@@ -1784,14 +1784,14 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
 
 void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
 {
-//  SetUpdateMode( FALSE );
+//  SetUpdateMode( sal_False );
     String aOldSrch( aSearchTmplLB .GetSelectEntry() );
     String aOldRepl( aReplaceTmplLB.GetSelectEntry() );
     aSearchTmplLB .Clear();
     aReplaceTmplLB.Clear();
     rPool.SetSearchMask( pSearchItem->GetFamily(), SFXSTYLEBIT_ALL );
-    aSearchTmplLB.SetUpdateMode( FALSE );
-    aReplaceTmplLB.SetUpdateMode( FALSE );
+    aSearchTmplLB.SetUpdateMode( sal_False );
+    aReplaceTmplLB.SetUpdateMode( sal_False );
     SfxStyleSheetBase* pBase = rPool.First();
 
     while ( pBase )
@@ -1801,8 +1801,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
         aReplaceTmplLB.InsertEntry( pBase->GetName() );
         pBase = rPool.Next();
     }
-    aSearchTmplLB.SetUpdateMode( TRUE );
-    aReplaceTmplLB.SetUpdateMode( TRUE );
+    aSearchTmplLB.SetUpdateMode( sal_True );
+    aReplaceTmplLB.SetUpdateMode( sal_True );
     aSearchTmplLB.SelectEntryPos(0);
 
     if ( aOldSrch.Len() )
@@ -1820,12 +1820,12 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
         EnableControl_Impl( &aReplaceAllBtn );
     }
 //  FlagHdl_Impl(0);
-//  SetUpdateMode( TRUE );
+//  SetUpdateMode( sal_True );
 }
 
 // -----------------------------------------------------------------------
 
-void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
+void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags )
 {
     if ( nFlags == nOptions )
         return;
@@ -1842,19 +1842,19 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
     }
     else if ( !IsVisible() )
         Show();
-    FASTBOOL bNoSearch = TRUE;
+    bool bNoSearch = sal_True;
 
     sal_Bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0;
     aSearchBtn.Enable(bEnableSearch);
 
     if( bEnableSearch )
-        bNoSearch = FALSE;
+        bNoSearch = sal_False;
 
 
     if ( ( SEARCH_OPTIONS_SEARCH_ALL & nOptions ) != 0 )
     {
         aSearchAllBtn.Enable();
-        bNoSearch = FALSE;
+        bNoSearch = sal_False;
     }
     else
         aSearchAllBtn.Disable();
@@ -1864,7 +1864,7 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
         aReplaceText.Enable();
         aReplaceLB.Enable();
         aReplaceTmplLB.Enable();
-        bNoSearch = FALSE;
+        bNoSearch = sal_False;
     }
     else
     {
@@ -1876,7 +1876,7 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
     if ( ( SEARCH_OPTIONS_REPLACE_ALL & nOptions ) != 0 )
     {
         aReplaceAllBtn.Enable();
-        bNoSearch = FALSE;
+        bNoSearch = sal_False;
     }
     else
         aReplaceAllBtn.Disable();
@@ -1933,7 +1933,7 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
         pMoreBtn->Enable();
     else
     {
-        pMoreBtn->SetState( FALSE );
+        pMoreBtn->SetState( sal_False );
         pMoreBtn->Disable();
     }
 */
@@ -2072,9 +2072,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
     if ( pCtrl == &aSearchLB || pCtrl == &pImpl->aSearchFormats )
     {
         if ( pCtrl->HasChildPathFocus() )
-            pImpl->bFocusOnSearch = TRUE;
+            pImpl->bFocusOnSearch = sal_True;
         pCtrl = &aSearchLB;
-        bSearch = TRUE;
+        bSearch = sal_True;
 
         if( nTxtLen )
             EnableControl_Impl( &aNoFormatBtn );
@@ -2084,9 +2084,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
     }
     else
     {
-        pImpl->bFocusOnSearch = FALSE;
+        pImpl->bFocusOnSearch = sal_False;
         pCtrl = &aReplaceLB;
-        bSearch = FALSE;
+        bSearch = sal_False;
 
         if ( ( !pImpl->bMultiLineEdit && aReplaceAttrText.GetText().Len() ) ||
                 ( pImpl->bMultiLineEdit && pImpl->aReplaceFormats.GetText().Len() ) )
@@ -2095,7 +2095,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
             aNoFormatBtn.Disable();
         aAttributeBtn.Disable();
     }
-    bSet = TRUE;
+    bSet = sal_True;
 
     aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
 
@@ -2125,14 +2125,14 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
         return 0;
 
     sal_sSize nCnt = 0;
-    const USHORT* pPtr = pImpl->pRanges;
-    const USHORT* pTmp = pPtr;
+    const sal_uInt16* pPtr = pImpl->pRanges;
+    const sal_uInt16* pTmp = pPtr;
 
     while( *pTmp )
         pTmp++;
     nCnt = pTmp - pPtr + 7;
-    USHORT* pWhRanges = new USHORT[nCnt];
-    USHORT nPos = 0;
+    sal_uInt16* pWhRanges = new sal_uInt16[nCnt];
+    sal_uInt16 nPos = 0;
 
     while( *pPtr )
     {
@@ -2142,7 +2142,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
     pWhRanges[nPos++] = SID_ATTR_PARA_MODEL;
     pWhRanges[nPos++] = SID_ATTR_PARA_MODEL;
 
-    USHORT nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
+    sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
     pWhRanges[nPos++] = nBrushWhich;
     pWhRanges[nPos++] = nBrushWhich;
     pWhRanges[nPos++] = SID_PARA_BACKGRND_DESTINATION;
@@ -2188,10 +2188,10 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
 
             SearchAttrItem* pAItem;
             const SfxPoolItem* pItem;
-            for( USHORT n = 0; n < pList->Count(); ++n )
+            for( sal_uInt16 n = 0; n < pList->Count(); ++n )
                 if( !IsInvalidItem( (pAItem = &pList->GetObject(n))->pItem ) &&
                     SFX_ITEM_SET == aOutSet.GetItemState(
-                        pAItem->pItem->Which(), FALSE, &pItem ) )
+                        pAItem->pItem->Which(), sal_False, &pItem ) )
                 {
                     delete pAItem->pItem;
                     pAItem->pItem = pItem->Clone();
@@ -2214,8 +2214,8 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
 IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG )
 {
     aLayoutBtn.SetText( aStylesStr );
-    bFormat = FALSE;
-    aLayoutBtn.Check( FALSE );
+    bFormat = sal_False;
+    aLayoutBtn.Check( sal_False );
 
     if ( bSearch )
     {
@@ -2233,9 +2233,9 @@ IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG )
             pImpl->aReplaceFormats.SetText( String() );
         pReplaceList->Clear();
     }
-    pImpl->bSaveToModule = FALSE;
+    pImpl->bSaveToModule = sal_False;
     TemplateHdl_Impl( &aLayoutBtn );
-    pImpl->bSaveToModule = TRUE;
+    pImpl->bSaveToModule = sal_True;
     aNoFormatBtn.Disable();
     return 0;
 }
@@ -2272,7 +2272,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer )
             EnableControl_Impl( &aSelectionBtn );
         else
         {
-            aSelectionBtn.Check( FALSE );
+            aSelectionBtn.Check( sal_False );
             aSelectionBtn.Disable();
         }
     }
@@ -2314,7 +2314,7 @@ void SvxSearchDialog::GetReplaceItems( SfxItemSet& rSet )
 // -----------------------------------------------------------------------
 
 String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
-                                             BOOL bSrchFlag ) const
+                                             sal_Bool bSrchFlag ) const
 {
     if ( rStr.Len() )
         rStr.Erase();
@@ -2352,7 +2352,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
 
     ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) );
 
-    for ( USHORT i = 0; i < pList->Count(); ++i )
+    for ( sal_uInt16 i = 0; i < pList->Count(); ++i )
     {
         const SearchAttrItem& rItem = pList->GetObject(i);
 
@@ -2390,7 +2390,7 @@ void SvxSearchDialog::PaintAttrText_Impl()
     BuildAttrText_Impl( aDesc, bSearch );
 
     if ( !bFormat && aDesc.Len() )
-        bFormat = TRUE;
+        bFormat = sal_True;
 
     if ( bSearch )
     {
@@ -2464,15 +2464,15 @@ void SvxSearchDialog::SaveToModule_Impl()
     {
         pSearchItem->SetSearchString ( aSearchLB.GetText() );
         pSearchItem->SetReplaceString( aReplaceLB.GetText() );
-        Remember_Impl( aSearchLB.GetText(), TRUE );
+        Remember_Impl( aSearchLB.GetText(), sal_True );
     }
 
-    pSearchItem->SetRegExp( FALSE );
-    pSearchItem->SetLevenshtein( FALSE );
+    pSearchItem->SetRegExp( sal_False );
+    pSearchItem->SetLevenshtein( sal_False );
     if (GetCheckBoxValue( aRegExpBtn ))
-        pSearchItem->SetRegExp( TRUE );
+        pSearchItem->SetRegExp( sal_True );
     else if (GetCheckBoxValue( aSimilarityBox ))
-        pSearchItem->SetLevenshtein( TRUE );
+        pSearchItem->SetLevenshtein( sal_True );
 
     pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) );
     pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) );
@@ -2481,7 +2481,7 @@ void SvxSearchDialog::SaveToModule_Impl()
     pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) );
 
     pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) );
-    INT32 nFlags = GetTransliterationFlags();
+    sal_Int32 nFlags = GetTransliterationFlags();
     if( !pSearchItem->IsUseAsianOptions())
         nFlags &= (TransliterationModules_IGNORE_CASE |
                    TransliterationModules_IGNORE_WIDTH );
@@ -2508,7 +2508,7 @@ SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG);
 
 // -----------------------------------------------------------------------
 
-SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId,
+SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId,
                                                 SfxBindings* pBindings,
                                                 SfxChildWinInfo* pInfo )
     : SfxChildWindow( _pParent, nId )
@@ -2522,7 +2522,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId,
     pBindings->Update( SID_SEARCH_SEARCHSET );
     pBindings->Update( SID_SEARCH_REPLACESET );
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
-    dialog->bConstruct = FALSE;
+    dialog->bConstruct = sal_False;
 }
 
 SvxSearchDialogWrapper::~SvxSearchDialogWrapper ()
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 482dc467d66c..dd4b03147445 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -121,7 +121,7 @@ static const sal_Unicode aBulletTypes[] =
 
 static Font& lcl_GetDefaultBulletFont()
 {
-    static BOOL bInit = 0;
+    static sal_Bool bInit = 0;
     static Font aDefBulletFont( UniString::CreateFromAscii(
                                 RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ),
                                 String(), Size( 0, 14 ) );
@@ -131,8 +131,8 @@ static Font& lcl_GetDefaultBulletFont()
         aDefBulletFont.SetFamily( FAMILY_DONTKNOW );
         aDefBulletFont.SetPitch( PITCH_DONTKNOW );
         aDefBulletFont.SetWeight( WEIGHT_DONTKNOW );
-        aDefBulletFont.SetTransparent( TRUE );
-        bInit = TRUE;
+        aDefBulletFont.SetTransparent( sal_True );
+        bInit = sal_True;
     }
     return aDefBulletFont;
 }
@@ -158,7 +158,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
 }
 void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 {
-    static USHORT __READONLY_DATA aLinesArr[] =
+    static sal_uInt16 __READONLY_DATA aLinesArr[] =
     {
         15, 10,
         20, 30,
@@ -178,7 +178,7 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 
     OutputDevice*  pDev = rUDEvt.GetDevice();
     Rectangle aRect = rUDEvt.GetRect();
-    USHORT  nItemId = rUDEvt.GetItemId();
+    sal_uInt16  nItemId = rUDEvt.GetItemId();
     long nRectWidth = aRect.GetWidth();
     long nRectHeight = aRect.GetHeight();
     Size aRectSize(nRectWidth, aRect.GetHeight());
@@ -227,7 +227,7 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
         {
             Point aStart(aBLPos.X() + nRectWidth *25 / 100,0);
             Point aEnd(aBLPos.X() + nRectWidth * 9 / 10,0);
-            for( USHORT i = 11; i < 100; i += 33)
+            for( sal_uInt16 i = 11; i < 100; i += 33)
             {
                 aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight  * i / 100;
                 pVDev->DrawLine(aStart, aEnd);
@@ -245,9 +245,9 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
             NUM_PAGETYPE_BULLET == nPageType )
     {
         Point aStart(aBLPos.X() + nRectWidth / 9,0);
-        for( USHORT i = 0; i < 3; i++ )
+        for( sal_uInt16 i = 0; i < 3; i++ )
         {
-            USHORT nY = 11 + i * 33;
+            sal_uInt16 nY = 11 + i * 33;
             aStart.Y() = aBLPos.Y() + nRectHeight  * nY / 100;
             String sText;
             if(nPageType == NUM_PAGETYPE_BULLET)
@@ -400,7 +400,7 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 #ifdef DBG_UTIL
             catch(Exception&)
             {
-                static sal_Bool bAssert = FALSE;
+                static sal_Bool bAssert = sal_False;
                 if(!bAssert)
                 {
                     DBG_ERROR("exception in ::UserDraw");
@@ -427,13 +427,13 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 /*                                                                        */
 /**************************************************************************/
 
-SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType ) :
+SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) :
 
     ValueSet( pParent, rResId ),
 
     aLineColor  ( COL_LIGHTGRAY ),
     nPageType   ( nType ),
-    bHTMLMode   ( FALSE ),
+    bHTMLMode   ( sal_False ),
     pVDev       ( NULL )
 {
     SetColCount( 4 );
@@ -441,7 +441,7 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nTy
     SetStyle( GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER );
     if(NUM_PAGETYPE_BULLET == nType)
     {
-        for ( USHORT i = 0; i < 8; i++ )
+        for ( sal_uInt16 i = 0; i < 8; i++ )
         {
             InsertItem( i + 1, i );
             SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) );
@@ -470,7 +470,7 @@ void SvxNumValueSet::SetNumberingSettings(
     aLocale = rLocale;
     if(aNum.getLength() > 8)
             SetStyle( GetStyle()|WB_VSCROLL);
-    for ( USHORT i = 0; i < aNum.getLength(); i++ )
+    for ( sal_uInt16 i = 0; i < aNum.getLength(); i++ )
     {
             InsertItem( i + 1, i );
             if( i < 8 )
@@ -502,7 +502,7 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, co
 
     SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ),
 //    rStrList    ( rStrNames ),
-    bGrfNotFound( FALSE )
+    bGrfNotFound( sal_False )
 
 {
     GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
@@ -531,7 +531,7 @@ void    SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 
     Rectangle aRect = rUDEvt.GetRect();
     OutputDevice*  pDev = rUDEvt.GetDevice();
-    USHORT  nItemId = rUDEvt.GetItemId();
+    sal_uInt16  nItemId = rUDEvt.GetItemId();
     Point aBLPos = aRect.TopLeft();
 
     int nRectHeight = aRect.GetHeight();
@@ -541,14 +541,14 @@ void    SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1,
                         &aGraphic, NULL))
     {
-        bGrfNotFound = TRUE;
+        bGrfNotFound = sal_True;
     }
     else
     {
         Point aPos(aBLPos.X() + 5, 0);
-        for( USHORT i = 0; i < 3; i++ )
+        for( sal_uInt16 i = 0; i < 3; i++ )
         {
-            USHORT nY = 11 + i * 33;
+            sal_uInt16 nY = 11 + i * 33;
             aPos.Y() = aBLPos.Y() + nRectHeight  * nY / 100;
             aGraphic.Draw( pDev, aPos, aSize );
         }
@@ -564,7 +564,7 @@ IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG)
     // nur, wenn eine Grafik nicht da war, muss formatiert werden
     if(bGrfNotFound)
     {
-        bGrfNotFound = FALSE;
+        bGrfNotFound = sal_False;
         Format();
     }
     Invalidate();
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index 6d6d2cb126db..8a77fcfc6ef3 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 #include "svx/svxgrahicitem.hxx"
 TYPEINIT1(SvxGraphicItem,SfxPoolItem);
-SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic )
+SvxGraphicItem::SvxGraphicItem( sal_uInt16 _nWhich, const Graphic& rGraphic )
     : SfxPoolItem( _nWhich ), aGraphic( rGraphic )
 {
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 0e79ff530e7c..4fbd1f3c288e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -56,7 +56,7 @@
 #include <vcl/svapp.hxx>
 #endif
 #ifndef RULER_TAB_RTL
-#define RULER_TAB_RTL           ((USHORT)0x0010)
+#define RULER_TAB_RTL           ((sal_uInt16)0x0010)
 #endif
 
 #include <comphelper/uieventslogger.hxx>
@@ -112,7 +112,7 @@ void Debug_Impl(Window *pWin, SvxColumnItem& rColItem)
     aTmp +=  String(ToMM(pWin, rColItem.GetLeft()));
     aTmp += "   ColRight: ";
     aTmp +=  String(ToMM(pWin, rColItem.GetRight()));
-    for(USHORT i = 0; i < rColItem.Count(); ++i) {
+    for(sal_uInt16 i = 0; i < rColItem.Count(); ++i) {
         aTmp += " Start: ";
         aTmp += String(ToMM(pWin, rColItem[i].nStart));
         aTmp += " End: ";
@@ -146,7 +146,7 @@ void DebugTabStops_Impl(const SvxTabStopItem& rTabs)
     String aTmp("Tabs: ");
 
     // Def Tabs loeschen
-    for(USHORT i = 0; i < rTabs.Count(); ++i)
+    for(sal_uInt16 i = 0; i < rTabs.Count(); ++i)
     {
         aTmp += String(rTabs[i].GetTabPos() / 56);
         aTmp += " : ";
@@ -210,7 +210,7 @@ void     RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri
     }
     String sContent(String::CreateFromAscii(pDescription));
     sContent += rText;
-    USHORT nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
+    sal_uInt16 nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
     pDebugWindow->GetLBox().SelectEntryPos(nPos);
     pDebugWindow->GrabFocus();
 }
@@ -228,9 +228,9 @@ void     RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri
 #endif
 
 struct SvxRuler_Impl  {
-    USHORT *pPercBuf;
-    USHORT *pBlockBuf;
-    USHORT nPercSize;
+    sal_uInt16 *pPercBuf;
+    sal_uInt16 *pBlockBuf;
+    sal_uInt16 nPercSize;
     long   nTotalDist;
     long   lOldWinPos;
     long   lMaxLeftLogic;
@@ -239,16 +239,16 @@ struct SvxRuler_Impl  {
     long   lLastRMargin;
     SvxProtectItem aProtectItem;
     SfxBoolItem* pTextRTLItem;
-    USHORT nControlerItems;
-    USHORT nIdx;
-    USHORT nColLeftPix, nColRightPix; // Pixelwerte fuer linken / rechten Rand
+    sal_uInt16 nControlerItems;
+    sal_uInt16 nIdx;
+    sal_uInt16 nColLeftPix, nColRightPix; // Pixelwerte fuer linken / rechten Rand
                                       // bei Spalten; gepuffert, um Umrechenfehler
                                       // zu vermeiden.
                                       // Muesste vielleicht fuer weitere Werte
                                       // aufgebohrt werden
-    BOOL bIsTableRows : 1;      // pColumnItem contains table rows instead of columns
+    sal_Bool bIsTableRows : 1;      // pColumnItem contains table rows instead of columns
     //#i24363# tab stops relative to indent
-    BOOL bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent?
+    sal_Bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent?
     SvxRuler_Impl() :
     pPercBuf(0), pBlockBuf(0),
     nPercSize(0), nTotalDist(0),
@@ -260,8 +260,8 @@ struct SvxRuler_Impl  {
     nIdx(0),
     nColLeftPix(0), nColRightPix(0),
 
-    bIsTableRows(FALSE),
-    bIsTabsRelativeToIndent(TRUE)
+    bIsTableRows(sal_False),
+    bIsTabsRelativeToIndent(sal_True)
     {
     }
     ~SvxRuler_Impl()
@@ -270,22 +270,22 @@ struct SvxRuler_Impl  {
         delete[] pPercBuf; delete[] pBlockBuf; pPercBuf = 0;
         delete pTextRTLItem;
     }
-    void SetPercSize(USHORT nSize);
+    void SetPercSize(sal_uInt16 nSize);
 
 };
 
 
 
-void SvxRuler_Impl::SetPercSize(USHORT nSize)
+void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize)
 {
     if(nSize > nPercSize)
     {
         delete[] pPercBuf;
         delete[] pBlockBuf;
-        pPercBuf = new USHORT[nPercSize = nSize];
-        pBlockBuf = new USHORT[nPercSize = nSize];
+        pPercBuf = new sal_uInt16[nPercSize = nSize];
+        pBlockBuf = new sal_uInt16[nPercSize = nSize];
     }
-    size_t nSize2 = sizeof(USHORT) * nPercSize;
+    size_t nSize2 = sizeof(sal_uInt16) * nPercSize;
     memset(pPercBuf, 0, nSize2);
     memset(pBlockBuf, 0, nSize2);
 }
@@ -321,7 +321,7 @@ SvxRuler::SvxRuler
  Window* pParent,                               // StarView Parent
  Window* pWin,                                  // Ausgabefenster; wird fuer Umrechnung logische
                 // Einheiten <-> Pixel verwendet
- USHORT  flags,                                 // Anzeige Flags, siehe ruler.hxx
+ sal_uInt16  flags,                                 // Anzeige Flags, siehe ruler.hxx
  SfxBindings &rBindings,                // zugeordnete Bindings
  WinBits nWinStyle                              // StarView WinBits
 )
@@ -338,7 +338,7 @@ SvxRuler::SvxRuler
   pObjectItem(0),
   pEditWin(pWin),
   pRuler_Imp(new SvxRuler_Impl),
-  bAppSetNullOffset(FALSE),  //Wird der 0-Offset des Lineals
+  bAppSetNullOffset(sal_False),  //Wird der 0-Offset des Lineals
                              //durch die appl. gesetzt?
   lLogicNullOffset(0),
   lAppNullOffset(LONG_MAX),
@@ -360,9 +360,9 @@ SvxRuler::SvxRuler
   nDragOffset(0),
   nMaxLeft(0),
   nMaxRight(0),
-  bValid(FALSE),
-  bListening(FALSE),
-  bActive(TRUE)
+  bValid(sal_False),
+  bListening(sal_False),
+  bActive(sal_True)
 
 /*
    [Beschreibung]
@@ -377,18 +377,18 @@ SvxRuler::SvxRuler
     rBindings.EnterRegistrations();
 
     // Unterstuetzte Items anlegen
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     // Seitenraender
 
     pCtrlItem[i++] = new SvxRulerItem(SID_RULER_LR_MIN_MAX, *this, rBindings);
     if((nWinStyle & WB_VSCROLL) == WB_VSCROLL)
     {
-        bHorz = FALSE;
+        bHorz = sal_False;
         pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_ULSPACE, *this, rBindings);
     }
     else
     {
-        bHorz = TRUE;
+        bHorz = sal_True;
         pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_LRSPACE, *this, rBindings);
     }
 
@@ -397,7 +397,7 @@ SvxRuler::SvxRuler
 
     if((nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS)
     {
-        USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+        sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
         pCtrlItem[i++] = new SvxRulerItem(nTabStopId, *this, rBindings);
         SetExtraType(RULER_EXTRA_TAB, nDefTabType);
     }
@@ -418,7 +418,7 @@ SvxRuler::SvxRuler
         pIndents[INDENT_RIGHT_MARGIN].nStyle = RULER_INDENT_BOTTOM;
         pIndents[INDENT_LEFT_BORDER].nStyle = RULER_INDENT_BORDER;
         pIndents[INDENT_RIGHT_BORDER].nStyle = RULER_INDENT_BORDER;
-        for(USHORT nIn = 0; nIn < 7; nIn++)
+        for(sal_uInt16 nIn = 0; nIn < 7; nIn++)
             pIndents[nIn].nPos = 0;
     }
 
@@ -436,7 +436,7 @@ SvxRuler::SvxRuler
         pObjectBorders = new RulerBorder[OBJECT_BORDER_COUNT];
         size_t nSize = sizeof( RulerBorder ) * OBJECT_BORDER_COUNT;
         memset(pObjectBorders, 0, nSize);
-        for(USHORT nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder)
+        for(sal_uInt16 nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder)
         {
             pObjectBorders[nBorder].nPos   = 0;
             pObjectBorders[nBorder].nWidth = 0;
@@ -472,7 +472,7 @@ __EXPORT SvxRuler::~SvxRuler()
 
     pBindings->EnterRegistrations();
 
-    for(USHORT i = 0; i < CTRL_ITEM_COUNT  && pCtrlItem[i]; ++i)
+    for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT  && pCtrlItem[i]; ++i)
         delete pCtrlItem[i];
     delete[] pCtrlItem;
 
@@ -588,7 +588,7 @@ long SvxRuler::PixelAdjust(long nVal, long nValOld) const
 }
 
 
-inline USHORT SvxRuler::GetObjectBordersOff(USHORT nIdx) const
+inline sal_uInt16 SvxRuler::GetObjectBordersOff(sal_uInt16 nIdx) const
 {
     return bHorz? nIdx: nIdx + 2;
 }
@@ -606,7 +606,7 @@ void SvxRuler::UpdateFrame()
 */
 
 {
-    const USHORT nMarginStyle =
+    const sal_uInt16 nMarginStyle =
         ( pRuler_Imp->aProtectItem.IsSizeProtected() ||
           pRuler_Imp->aProtectItem.IsPosProtected() ) ?
         0 : RULER_MARGIN_SIZEABLE;
@@ -634,7 +634,7 @@ void SvxRuler::UpdateFrame()
         else
             lRight = pLRSpaceItem->GetRight();
 
-        ULONG aWidth=
+        sal_uIntPtr aWidth=
             ConvertHPosPixel(pPagePosItem->GetWidth() - lRight -
                                     lLogicNullOffset + lAppNullOffset);
         SetMargin2( aWidth, nMarginStyle );
@@ -671,8 +671,8 @@ void SvxRuler::UpdateFrame()
     }
     if(pColumnItem)
     {
-        pRuler_Imp->nColLeftPix = (USHORT) ConvertSizePixel(pColumnItem->GetLeft());
-        pRuler_Imp->nColRightPix = (USHORT) ConvertSizePixel(pColumnItem->GetRight());
+        pRuler_Imp->nColLeftPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetLeft());
+        pRuler_Imp->nColRightPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetRight());
     }
 
 }
@@ -698,9 +698,9 @@ void SvxRuler::StartListening_Impl()
 {
     if(!bListening)
     {
-        bValid = FALSE;
+        bValid = sal_False;
         StartListening(*pBindings);
-        bListening = TRUE;
+        bListening = sal_True;
     }
 }
 
@@ -794,7 +794,7 @@ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem)
 void SvxRuler::Update
 (
  const SvxColumnItem *pItem,             // neuer Wert
- USHORT nSID //Slot Id to identify NULL items
+ sal_uInt16 nSID //Slot Id to identify NULL items
 )
 
 /*
@@ -824,7 +824,7 @@ void SvxRuler::Update
         //must not delete it
         {
             delete pColumnItem; pColumnItem = 0;
-            pRuler_Imp->bIsTableRows = FALSE;
+            pRuler_Imp->bIsTableRows = sal_False;
         }
         StartListening_Impl();
     }
@@ -847,8 +847,8 @@ void SvxRuler::UpdateColumns()
             nBorderCount = pColumnItem->Count();
             pBorders = new RulerBorder[nBorderCount];
         }
-        USHORT _nFlags = RULER_BORDER_VARIABLE;
-        BOOL bProtectColumns =
+        sal_uInt16 _nFlags = RULER_BORDER_VARIABLE;
+        sal_Bool bProtectColumns =
             pRuler_Imp->aProtectItem.IsSizeProtected() ||
             pRuler_Imp->aProtectItem.IsPosProtected();
         if( !bProtectColumns )
@@ -859,10 +859,10 @@ void SvxRuler::UpdateColumns()
             if ( !bProtectColumns )
                 _nFlags |= RULER_BORDER_SIZEABLE;
 
-        USHORT nBorders = pColumnItem->Count();
+        sal_uInt16 nBorders = pColumnItem->Count();
         if(!pRuler_Imp->bIsTableRows)
             --nBorders;
-        for(USHORT i = 0; i < nBorders; ++i)
+        for(sal_uInt16 i = 0; i < nBorders; ++i)
         {
             pBorders[i].nStyle = _nFlags;
             if(!(*pColumnItem)[i].bVisible)
@@ -922,7 +922,7 @@ void SvxRuler::UpdateObject()
         pObjectBorders[3].nPos =
             ConvertPosPixel(pObjectItem->GetEndY() - nMargin + lAppNullOffset);
 
-        const USHORT nOff = GetObjectBordersOff(0);
+        const sal_uInt16 nOff = GetObjectBordersOff(0);
         SetBorders(2, pObjectBorders + nOff);
     }
     else
@@ -953,7 +953,7 @@ void SvxRuler::UpdatePara()
     // Abhaengigkeit zu PagePosItem
     if(pParaItem && pPagePosItem && !pObjectItem)
     {
-        BOOL bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+        sal_Bool bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
         // Erstzeileneinzug, ist negativ zum linken Absatzrand
         long nLeftFrameMargin = GetLeftFrameMargin();
         long nRightFrameMargin = GetRightFrameMargin();
@@ -1180,7 +1180,7 @@ long SvxRuler::GetDefTabDist() const
 }
 
 
-USHORT ToSvTab_Impl(SvxTabAdjust eAdj)
+sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj)
 
 /*
    [Beschreibung]
@@ -1202,7 +1202,7 @@ USHORT ToSvTab_Impl(SvxTabAdjust eAdj)
 }
 
 
-SvxTabAdjust ToAttrTab_Impl(USHORT eAdj)
+SvxTabAdjust ToAttrTab_Impl(sal_uInt16 eAdj)
 {
     switch(eAdj) {
     case RULER_TAB_LEFT:    return SVX_TAB_ADJUST_LEFT    ;
@@ -1231,7 +1231,7 @@ void SvxRuler::UpdateTabs()
     {
         // Puffer fuer DefaultTabStop
         // Abstand letzter Tab <-> Rechter Absatzrand / DefaultTabDist
-        BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+        sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
         long nLeftFrameMargin = GetLeftFrameMargin();
         long nRightFrameMargin = GetRightFrameMargin();
 
@@ -1250,10 +1250,10 @@ void SvxRuler::UpdateTabs()
         long nDefTabDist = ConvertHPosPixel(lDefTabDist);
         if( !nDefTabDist )
             nDefTabDist = 1;
-        const USHORT nDefTabBuf = lPosPixel > lRightIndent ||
+        const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent ||
             lLastTab > lRightIndent
                 ? 0
-                : (USHORT)( (lRightIndent - lPosPixel) / nDefTabDist );
+                : (sal_uInt16)( (lRightIndent - lPosPixel) / nDefTabDist );
 
         if(pTabStopItem->Count() + TAB_GAP + nDefTabBuf > nTabBufSize)
         {
@@ -1264,7 +1264,7 @@ void SvxRuler::UpdateTabs()
         }
 
         nTabCount = 0;
-        USHORT j;
+        sal_uInt16 j;
         //#i24363# tab stops relative to indent
         const long lRightPixMargin = ConvertSizePixel(nRightFrameMargin - nParaItemTxtLeft );
         const long lParaIndentPix = ConvertSizePixel(lParaIndent);
@@ -1409,7 +1409,7 @@ void SvxRuler::SetNullOffsetLogic
 )
 {
     lAppNullOffset = lLogicNullOffset - lVal;
-    bAppSetNullOffset = TRUE;
+    bAppSetNullOffset = sal_True;
     Ruler::SetNullOffset(ConvertSizePixel(lVal));
     Update();
 }
@@ -1474,7 +1474,7 @@ inline void SvxRuler::SetFrameLeft(long l)
 */
 
 {
-    BOOL bProtectColumns =
+    sal_Bool bProtectColumns =
         pRuler_Imp->aProtectItem.IsSizeProtected() ||
         pRuler_Imp->aProtectItem.IsPosProtected();
     if(bAppSetNullOffset)
@@ -1583,9 +1583,9 @@ long SvxRuler::GetRightFrameMargin() const
 {
     if(pColumnItem)
     {
-        if(!IsActLastColumn( TRUE ))
+        if(!IsActLastColumn( sal_True ))
         {
-            long nRet = (*pColumnItem)[GetActRightColumn( TRUE )].nEnd;
+            long nRet = (*pColumnItem)[GetActRightColumn( sal_True )].nEnd;
             if(pColumnItem->IsTable() && pParaBorderItem)
                 nRet -= pParaBorderItem->GetRight();
             return nRet;
@@ -1603,7 +1603,7 @@ long SvxRuler::GetRightFrameMargin() const
         l += pULSpaceItem->GetLower();
 
     if(pParaBorderItem &&
-        (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( TRUE )))
+        (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( sal_True )))
         l += pParaBorderItem->GetRight();
 
     if(bHorz)
@@ -1617,7 +1617,7 @@ long SvxRuler::GetRightFrameMargin() const
                    SVXRULER_SUPPORT_NEGATIVE_MARGINS )
 #define TAB_FLAG ( pColumnItem && pColumnItem->IsTable() )
 
-long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight )
+long SvxRuler::GetCorrectedDragPos( sal_Bool bLeft, sal_Bool bRight )
 
 /*
    [Beschreibung]
@@ -1631,7 +1631,7 @@ long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight )
     const long lNullPix = Ruler::GetNullOffset();
     long lDragPos = GetDragPos() + lNullPix;
 ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos))
-     BOOL bHoriRows = bHorz && pRuler_Imp->bIsTableRows;
+     sal_Bool bHoriRows = bHorz && pRuler_Imp->bIsTableRows;
     if((bLeft || (bHoriRows)) && lDragPos < nMaxLeft)
         lDragPos = nMaxLeft;
     else if((bRight||bHoriRows) && lDragPos > nMaxRight)
@@ -1643,7 +1643,7 @@ ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos))
 
 void ModifyTabs_Impl
 (
- USHORT nCount,                                 // Anzahl Tabs
+ sal_uInt16 nCount,                                 // Anzahl Tabs
  RulerTab *pTabs,                               // Tab-Puffer
  long lDiff                                     // zu addierende Differenz
  )
@@ -1656,7 +1656,7 @@ void ModifyTabs_Impl
 */
 {
     if( pTabs )
-        for(USHORT i = 0; i < nCount; ++i)  pTabs[i].nPos += lDiff;
+        for(sal_uInt16 i = 0; i < nCount; ++i)  pTabs[i].nPos += lDiff;
 }
 
 
@@ -1670,7 +1670,7 @@ void SvxRuler::DragMargin1()
 
 */
 {
-    const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, TRUE );
+    const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, sal_True );
     DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 3 : 7, bHorz);
     if(pColumnItem&&
        (//nDragType & DRAG_OBJECT_SIZE_LINEAR ||
@@ -1682,11 +1682,11 @@ void SvxRuler::AdjustMargin1(long lDiff)
 {
     const long nOld = bAppSetNullOffset? GetMargin1(): GetNullOffset();
     const long lDragPos = lDiff;
-    BOOL bProtectColumns =
+    sal_Bool bProtectColumns =
         pRuler_Imp->aProtectItem.IsSizeProtected() ||
         pRuler_Imp->aProtectItem.IsPosProtected();
 
-    const USHORT nMarginStyle =
+    const sal_uInt16 nMarginStyle =
         bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE;
 
     if(!bAppSetNullOffset)
@@ -1711,7 +1711,7 @@ void SvxRuler::AdjustMargin1(long lDiff)
             }
             if(pColumnItem)
             {
-                for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+                for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
                     pBorders[i].nPos -= _lDiff;
                 SetBorders(pColumnItem->Count()-1, pBorders);
                 if(pColumnItem->IsFirstAct())
@@ -1760,7 +1760,7 @@ void SvxRuler::AdjustMargin1(long lDiff)
 
             if(pColumnItem)
             {
-                for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+                for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
                     pBorders[i].nPos += _lDiff;
                 SetBorders(pColumnItem->Count()-1, pBorders);
                 if(pColumnItem->IsFirstAct())
@@ -1802,7 +1802,7 @@ void SvxRuler::DragMargin2()
 
 */
 {
-    const long lDragPos = GetCorrectedDragPos( TRUE, !TAB_FLAG || !NEG_FLAG);
+    const long lDragPos = GetCorrectedDragPos( sal_True, !TAB_FLAG || !NEG_FLAG);
     DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 5 : 7, bHorz);
     long lDiff = lDragPos - GetMargin2();
 
@@ -1811,10 +1811,10 @@ void SvxRuler::DragMargin2()
         nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL))
         DragBorders();
 
-    BOOL bProtectColumns =
+    sal_Bool bProtectColumns =
         pRuler_Imp->aProtectItem.IsSizeProtected() ||
         pRuler_Imp->aProtectItem.IsPosProtected();
-    const USHORT nMarginStyle =
+    const sal_uInt16 nMarginStyle =
         bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE;
     SetMargin2( lDragPos, nMarginStyle );
 
@@ -1836,7 +1836,7 @@ void SvxRuler::DragIndents()
 */
 {
     const long lDragPos = NEG_FLAG ? GetDragPos() : GetCorrectedDragPos();
-    const USHORT nIdx = GetDragAryPos()+INDENT_GAP;
+    const sal_uInt16 nIdx = GetDragAryPos()+INDENT_GAP;
     const long lDiff = pIndents[nIdx].nPos - lDragPos;
 
     if((nIdx == INDENT_FIRST_LINE ||
@@ -1852,7 +1852,7 @@ void SvxRuler::DragIndents()
 }
 
 
-void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, BOOL Hori)
+void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, sal_Bool Hori)
 /*
    [Beschreibung]
 
@@ -1922,9 +1922,9 @@ void SvxRuler::DragTabs()
 */
 {
 
-    long lDragPos = GetCorrectedDragPos(TRUE, FALSE);
+    long lDragPos = GetCorrectedDragPos(sal_True, sal_False);
 
-    USHORT nIdx = GetDragAryPos()+TAB_GAP;
+    sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP;
     DrawLine_Impl(lTabPos, 7, bHorz);
 
     long nDiff = lDragPos - pTabs[nIdx].nPos;
@@ -1932,7 +1932,7 @@ void SvxRuler::DragTabs()
     if(nDragType & DRAG_OBJECT_SIZE_LINEAR)
     {
 
-        for(USHORT i = nIdx; i < nTabCount; ++i)
+        for(sal_uInt16 i = nIdx; i < nTabCount; ++i)
         {
             pTabs[i].nPos += nDiff;
             // auf Maximum begrenzen
@@ -1946,7 +1946,7 @@ void SvxRuler::DragTabs()
     {
         pRuler_Imp->nTotalDist -= nDiff;
         pTabs[nIdx].nPos = lDragPos;
-        for(USHORT i = nIdx+1; i < nTabCount; ++i)
+        for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i)
         {
             if(pTabs[i].nStyle & RULER_TAB_DEFAULT)
                 // bei den DefaultTabs kann abgebrochen werden
@@ -1972,28 +1972,28 @@ void SvxRuler::DragTabs()
 
 
 
-void SvxRuler::SetActive(BOOL bOn)
+void SvxRuler::SetActive(sal_Bool bOn)
 {
     if(bOn)
     {
         Activate();
-/*      pBindings->Invalidate( SID_RULER_LR_MIN_MAX, TRUE, TRUE );
+/*      pBindings->Invalidate( SID_RULER_LR_MIN_MAX, sal_True, sal_True );
         pBindings->Update( SID_RULER_LR_MIN_MAX );
-        pBindings->Invalidate( SID_ATTR_LONG_ULSPACE, TRUE, TRUE );
+        pBindings->Invalidate( SID_ATTR_LONG_ULSPACE, sal_True, sal_True );
         pBindings->Update( SID_ATTR_LONG_ULSPACE );
-        pBindings->Invalidate( SID_ATTR_LONG_LRSPACE, TRUE, TRUE );
+        pBindings->Invalidate( SID_ATTR_LONG_LRSPACE, sal_True, sal_True );
         pBindings->Update( SID_ATTR_LONG_LRSPACE );
-        pBindings->Invalidate( SID_RULER_PAGE_POS, TRUE, TRUE );
+        pBindings->Invalidate( SID_RULER_PAGE_POS, sal_True, sal_True );
         pBindings->Update( SID_RULER_PAGE_POS );
-        pBindings->Invalidate( SID_ATTR_TABSTOP, TRUE, TRUE );
+        pBindings->Invalidate( SID_ATTR_TABSTOP, sal_True, sal_True );
         pBindings->Update( SID_ATTR_TABSTOP );
-        pBindings->Invalidate( SID_ATTR_PARA_LRSPACE, TRUE, TRUE );
+        pBindings->Invalidate( SID_ATTR_PARA_LRSPACE, sal_True, sal_True );
         pBindings->Update( SID_ATTR_PARA_LRSPACE );
-        pBindings->Invalidate( SID_RULER_BORDERS, TRUE, TRUE );
+        pBindings->Invalidate( SID_RULER_BORDERS, sal_True, sal_True );
         pBindings->Update( SID_RULER_BORDERS );
-        pBindings->Invalidate( SID_RULER_OBJECT, TRUE, TRUE );
+        pBindings->Invalidate( SID_RULER_OBJECT, sal_True, sal_True );
         pBindings->Update( SID_RULER_OBJECT );
-        pBindings->Invalidate( SID_RULER_PROTECT, TRUE, TRUE );
+        pBindings->Invalidate( SID_RULER_PROTECT, sal_True, sal_True );
         pBindings->Update( SID_RULER_PROTECT );*/
     }
     else
@@ -2002,10 +2002,10 @@ void SvxRuler::SetActive(BOOL bOn)
     {
         pBindings->EnterRegistrations();
         if(bOn)
-            for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++)
+            for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++)
                 pCtrlItem[i]->ReBind();
         else
-            for(USHORT j=0;j<pRuler_Imp->nControlerItems;j++)
+            for(sal_uInt16 j=0;j<pRuler_Imp->nControlerItems;j++)
                 pCtrlItem[j]->UnBind();
         pBindings->LeaveRegistrations();
     }
@@ -2041,7 +2041,7 @@ void SvxRuler::UpdateParaContents_Impl
             pIndents[INDENT_LEFT_MARGIN].nPos += l;
             if ( pTabs )
             {
-                for(USHORT i = 0; i < nTabCount+TAB_GAP;++i)
+                for(sal_uInt16 i = 0; i < nTabCount+TAB_GAP;++i)
                     pTabs[i].nPos += l;
                 SetTabs(nTabCount, pTabs+TAB_GAP);
             }
@@ -2062,7 +2062,7 @@ void SvxRuler::DragBorders()
 
 */
 {
-    BOOL bLeftIndentsCorrected = FALSE, bRightIndentsCorrected = FALSE;
+    sal_Bool bLeftIndentsCorrected = sal_False, bRightIndentsCorrected = sal_False;
     int nIdx;
 
     if(GetDragType()==RULER_TYPE_BORDER)
@@ -2073,7 +2073,7 @@ void SvxRuler::DragBorders()
     else
         nIdx=0;
 
-    USHORT nDragSize = GetDragSize();
+    sal_uInt16 nDragSize = GetDragSize();
     long lDiff = 0;
 
     // the drag position has to be corrected to be able to prevent borders from passing each other
@@ -2104,13 +2104,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi
                     if(i == GetActRightColumn())
                     {
                         UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT);
-                        bRightIndentsCorrected = TRUE;
+                        bRightIndentsCorrected = sal_True;
                     }
                     // LAR, EZE der Spalte aktualisieren
                     else if(i == GetActLeftColumn())
                     {
                         UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT);
-                        bLeftIndentsCorrected = TRUE;
+                        bLeftIndentsCorrected = sal_True;
                     }
                 }
             }
@@ -2176,13 +2176,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi
                         if(i == GetActRightColumn())
                         {
                             UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT);
-                            bRightIndentsCorrected = TRUE;
+                            bRightIndentsCorrected = sal_True;
                         }
                         // LAR, EZE der Spalte aktualisieren
                         else if(i == GetActLeftColumn())
                         {
                             UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT);
-                            bLeftIndentsCorrected = TRUE;
+                            bLeftIndentsCorrected = sal_True;
                         }
                     }
                 }
@@ -2289,7 +2289,7 @@ void SvxRuler::DragObjectBorder()
     if(RULER_DRAGSIZE_MOVE == GetDragSize())
     {
         const long lPos = GetCorrectedDragPos();
-        const USHORT nIdx = GetDragAryPos();
+        const sal_uInt16 nIdx = GetDragAryPos();
         pObjectBorders[GetObjectBordersOff(nIdx)].nPos = lPos;
         SetBorders(2, pObjectBorders + GetObjectBordersOff(0));
         DrawLine_Impl(lTabPos, 7, bHorz);
@@ -2307,7 +2307,7 @@ void SvxRuler::ApplyMargins()
 */
 {
     const SfxPoolItem *pItem = 0;
-    USHORT nId = SID_ATTR_LONG_LRSPACE;
+    sal_uInt16 nId = SID_ATTR_LONG_LRSPACE;
     if(bHorz)
     {
         const long lOldNull = lLogicNullOffset;
@@ -2372,9 +2372,9 @@ void SvxRuler::ApplyIndents()
 */
 {
     long nNewTxtLeft;
-    if(pColumnItem&&!IsActFirstColumn( TRUE ))
+    if(pColumnItem&&!IsActFirstColumn( sal_True ))
     {
-        long nLeftCol=GetActLeftColumn( TRUE );
+        long nLeftCol=GetActLeftColumn( sal_True );
         nNewTxtLeft =
             PixelHAdjust(
                 ConvertHPosLogic(
@@ -2389,7 +2389,7 @@ void SvxRuler::ApplyIndents()
                 ConvertHPosLogic(pIndents[INDENT_LEFT_MARGIN].nPos),
                 pParaItem->GetTxtLeft());
 
-    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
 
     long nNewFirstLineOffset;
     if(bRTL)
@@ -2427,11 +2427,11 @@ void SvxRuler::ApplyIndents()
         sal::static_int_cast< short >(nNewFirstLineOffset));
     pParaItem->SetTxtLeft(nNewTxtLeft);
 
-    if(pColumnItem && ((!bRTL && !IsActLastColumn( TRUE ))|| (bRTL && !IsActFirstColumn())))
+    if(pColumnItem && ((!bRTL && !IsActLastColumn( sal_True ))|| (bRTL && !IsActFirstColumn())))
     {
         if(bRTL)
         {
-            long nActBorder = pBorders[GetActLeftColumn( TRUE )].nPos;
+            long nActBorder = pBorders[GetActLeftColumn( sal_True )].nPos;
             long nRightMargin = pIndents[INDENT_RIGHT_MARGIN].nPos;
             long nConvert = ConvertHPosLogic( nRightMargin - nActBorder );
             pParaItem->SetRight( PixelHAdjust( nConvert - lAppNullOffset, pParaItem->GetRight() ) );
@@ -2441,7 +2441,7 @@ void SvxRuler::ApplyIndents()
             pParaItem->SetRight(
                 PixelHAdjust(
                     ConvertHPosLogic(
-                        pBorders[GetActRightColumn( TRUE )].nPos -
+                        pBorders[GetActRightColumn( sal_True )].nPos -
                         pIndents[INDENT_RIGHT_MARGIN].nPos) -
                     lAppNullOffset,
                     pParaItem->GetRight()));
@@ -2466,7 +2466,7 @@ void SvxRuler::ApplyIndents()
                 lAppNullOffset, pParaItem->GetRight()));
         }
     }
-    USHORT nParaId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
+    sal_uInt16 nParaId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
     pBindings->GetDispatcher()->Execute( nParaId, SFX_CALLMODE_RECORD, pParaItem, 0L );
     UpdateTabs();
 }
@@ -2480,8 +2480,8 @@ void SvxRuler::ApplyTabs()
 
 */
 {
-    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
-    const USHORT nCoreIdx = GetDragAryPos();
+    sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    const sal_uInt16 nCoreIdx = GetDragAryPos();
     if(IsDragDelete())
     {
         pTabStopItem->Remove(nCoreIdx);
@@ -2491,7 +2491,7 @@ void SvxRuler::ApplyTabs()
     {
         SvxTabStopItem *pItem = new SvxTabStopItem(pTabStopItem->Which());
         //remove default tab stops
-        for ( USHORT i = 0; i < pItem->Count(); )
+        for ( sal_uInt16 i = 0; i < pItem->Count(); )
         {
             if ( SVX_TAB_ADJUST_DEFAULT == (*pItem)[i].GetAdjustment() )
             {
@@ -2501,7 +2501,7 @@ void SvxRuler::ApplyTabs()
             ++i;
         }
 
-        USHORT j;
+        sal_uInt16 j;
         for(j = 0; j < nCoreIdx; ++j)
         {
             pItem->Insert((*pTabStopItem)[j]);
@@ -2555,7 +2555,7 @@ void SvxRuler::ApplyTabs()
         pTabStopItem->Remove(nCoreIdx);
         pTabStopItem->Insert(aTabStop);
     }
-    USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+    sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
     pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L );
     UpdateTabs();
 }
@@ -2584,7 +2584,7 @@ void SvxRuler::ApplyBorders()
                     lAppNullOffset, pColumnItem->GetRight() ) );
         }
     }
-    for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+    for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
     {
         long& nEnd = (*pColumnItem)[i].nEnd;
         nEnd = PIXEL_H_ADJUST(
@@ -2605,8 +2605,8 @@ void SvxRuler::ApplyBorders()
         Debug_Impl(pEditWin,*pColumnItem);
 #endif // DEBUGLIN
     SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY,
-                      nDragType & DRAG_OBJECT_ACTLINE_ONLY? TRUE: FALSE);
-    USHORT nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
+                      nDragType & DRAG_OBJECT_ACTLINE_ONLY? sal_True : sal_False);
+    sal_uInt16 nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
                             (bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL);
     pBindings->GetDispatcher()->Execute( nColId, SFX_CALLMODE_RECORD, pColumnItem, &aFlag, 0L );
 }
@@ -2663,8 +2663,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
 
             long lPos;
             long lWidth=0;
-            USHORT nStart;
-            USHORT nIdx=GetDragAryPos();
+            sal_uInt16 nStart;
+            sal_uInt16 nIdx=GetDragAryPos();
             lWidth=0;
             long lActWidth=0;
             long lActBorderSum;
@@ -2696,8 +2696,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
             //because the height of the table changes while dragging
             if(pRuler_Imp->bIsTableRows && RULER_TYPE_BORDER == eType)
             {
-                USHORT nStartBorder;
-                USHORT nEndBorder;
+                sal_uInt16 nStartBorder;
+                sal_uInt16 nEndBorder;
                 if(bHorz)
                 {
                     nStartBorder = nIdx + 1;
@@ -2715,7 +2715,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
                 pRuler_Imp->nTotalDist = lWidth;
                 lPos = lOrigLPos = pBorders[nIdx].nPos;
 
-                for(USHORT i = nStartBorder; i < nEndBorder; ++i)
+                for(sal_uInt16 i = nStartBorder; i < nEndBorder; ++i)
                 {
                     if(bHorz)
                     {
@@ -2724,16 +2724,16 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
                     }
                     else
                         lActWidth = pBorders[i].nPos;
-                    pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000)
+                    pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000)
                                                     / pRuler_Imp->nTotalDist);
-                    pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum;
+                    pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum;
                     lActBorderSum += pBorders[i].nWidth;
                 }
             }
             else
             {
                 lPos = lOrigLPos;
-                for(USHORT ii = nStart; ii < pColumnItem->Count() - 1; ++ii)
+                for(sal_uInt16 ii = nStart; ii < pColumnItem->Count() - 1; ++ii)
                 {
                     lWidth += pBorders[ii].nPos - lPos;
                     lPos = pBorders[ii].nPos + pBorders[ii].nWidth;
@@ -2743,13 +2743,13 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
                 pRuler_Imp->nTotalDist = lWidth;
                 lPos = lOrigLPos;
 
-                for(USHORT i = nStart; i < pColumnItem->Count() - 1; ++i)
+                for(sal_uInt16 i = nStart; i < pColumnItem->Count() - 1; ++i)
                 {
                     lActWidth += pBorders[i].nPos - lPos;
                     lPos = pBorders[i].nPos + pBorders[i].nWidth;
-                    pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000)
+                    pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000)
                                                     / pRuler_Imp->nTotalDist);
-                    pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum;
+                    pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum;
                     lActBorderSum += pBorders[i].nWidth;
                 }
             }
@@ -2757,14 +2757,14 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
         break;
         case RULER_TYPE_TAB:
         {
-            const USHORT nIdx = GetDragAryPos()+TAB_GAP;
+            const sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP;
             pRuler_Imp->nTotalDist -= pTabs[nIdx].nPos;
             pRuler_Imp->SetPercSize(nTabCount);
-            for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ;
-            for(USHORT i = nIdx+1; i < nTabCount; ++i)
+            for(sal_uInt16 n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ;
+            for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i)
             {
                 const long nDelta = pTabs[i].nPos - pTabs[nIdx].nPos;
-                pRuler_Imp->pPercBuf[i] = (USHORT)((nDelta * 1000) / pRuler_Imp->nTotalDist);
+                pRuler_Imp->pPercBuf[i] = (sal_uInt16)((nDelta * 1000) / pRuler_Imp->nTotalDist);
             }
             break;
         }
@@ -2787,7 +2787,7 @@ void SvxRuler::EvalModifier()
 */
 
 {
-    USHORT nModifier = GetDragModifier();
+    sal_uInt16 nModifier = GetDragModifier();
     if(pRuler_Imp->bIsTableRows)
     {
         //rows can only be moved in one way, additionally current column is possible
@@ -2844,11 +2844,11 @@ void __EXPORT SvxRuler::Click()
         pBindings->Update( SID_RULER_PROTECT );
         pBindings->Update( SID_ATTR_PARA_LRSPACE_VERTICAL );
     }
-    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
     if(pTabStopItem &&
        (nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS)
     {
-        BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
+        sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
         if( bContentProtected ) return;
         const long lPos = GetClickPos();
         if((bRTL && lPos < Min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
@@ -2877,11 +2877,11 @@ void __EXPORT SvxRuler::Click()
 }
 
 
-BOOL SvxRuler::CalcLimits
+sal_Bool SvxRuler::CalcLimits
 (
  long &nMax1,                                   // zu setzenden Minimalwert
  long &nMax2,                                   // zu setzenden Maximalwert
- BOOL
+ sal_Bool
 ) const
 /*
    [Beschreibung]
@@ -2893,7 +2893,7 @@ BOOL SvxRuler::CalcLimits
 {
     nMax1 = LONG_MIN;
     nMax2 = LONG_MAX;
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -2908,7 +2908,7 @@ void SvxRuler::CalcMinMax()
 */
 
 {
-    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
     const long lNullPix = ConvertPosPixel(lLogicNullOffset);
     pRuler_Imp->lMaxLeftLogic=pRuler_Imp->lMaxRightLogic=-1;
     switch(GetDragType())
@@ -3081,7 +3081,7 @@ void SvxRuler::CalcMinMax()
     }
     case RULER_TYPE_BORDER:
     {                // Tabelle, Spalten (Modifier)
-        const USHORT nIdx = GetDragAryPos();
+        const sal_uInt16 nIdx = GetDragAryPos();
         switch(GetDragSize())
         {
           case RULER_DRAGSIZE_1 :
@@ -3122,13 +3122,13 @@ void SvxRuler::CalcMinMax()
                 {
                     //nIdx contains the position of the currently moved item
                     //next visible separator on the left
-                    USHORT nLeftCol=GetActLeftColumn(FALSE, nIdx);
+                    sal_uInt16 nLeftCol=GetActLeftColumn(sal_False, nIdx);
                     //next visible separator on the right
-                    USHORT nRightCol=GetActRightColumn(FALSE, nIdx);
+                    sal_uInt16 nRightCol=GetActRightColumn(sal_False, nIdx);
                     //next separator on the left - regardless if visible or not
-                    USHORT nActLeftCol=GetActLeftColumn();
+                    sal_uInt16 nActLeftCol=GetActLeftColumn();
                     //next separator on the right - regardless if visible or not
-                    USHORT nActRightCol=GetActRightColumn();
+                    sal_uInt16 nActRightCol=GetActRightColumn();
                     if(pColumnItem->IsTable())
                     {
                         if(nDragType & DRAG_OBJECT_ACTLINE_ONLY)
@@ -3248,8 +3248,8 @@ void SvxRuler::CalcMinMax()
                             else
                             {
                                 nMaxRight = lNullPix + pBorders[nRightCol].nPos;
-                                USHORT nNotHiddenRightCol =
-                                    GetActRightColumn(TRUE, nIdx);
+                                sal_uInt16 nNotHiddenRightCol =
+                                    GetActRightColumn(sal_True, nIdx);
 
                                 if( nActLeftCol == nIdx )
                                 {
@@ -3283,7 +3283,7 @@ void SvxRuler::CalcMinMax()
                 {
                     if(pObjectItem->HasLimits())
                     {
-                        if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? FALSE: TRUE))
+                        if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? sal_False : sal_True))
                         {
                             nMaxLeft = ConvertPosPixel(nMaxLeft);
                             nMaxRight = ConvertPosPixel(nMaxRight);
@@ -3331,7 +3331,7 @@ void SvxRuler::CalcMinMax()
     }
       case RULER_TYPE_INDENT:
         {
-        const USHORT nIdx = GetDragAryPos();
+        const sal_uInt16 nIdx = GetDragAryPos();
         switch(nIdx) {
         case INDENT_FIRST_LINE - INDENT_GAP:
         case INDENT_LEFT_MARGIN - INDENT_GAP:
@@ -3386,8 +3386,8 @@ void SvxRuler::CalcMinMax()
                     nMaxRight = lNullPix + Min(GetFirstLineIndent(), GetLeftIndent()) - lMinFrame;
                     if(pColumnItem)
                     {
-                        USHORT nRightCol=GetActRightColumn( TRUE );
-                        if(!IsActLastColumn( TRUE ))
+                        sal_uInt16 nRightCol=GetActRightColumn( sal_True );
+                        if(!IsActLastColumn( sal_True ))
                             nMaxRight += pBorders[nRightCol].nPos;
                         else
                             nMaxRight += GetMargin2();
@@ -3403,8 +3403,8 @@ void SvxRuler::CalcMinMax()
                     nMaxRight = lNullPix;
                     if(pColumnItem)
                     {
-                        USHORT nRightCol=GetActRightColumn( TRUE );
-                        if(!IsActLastColumn( TRUE ))
+                        sal_uInt16 nRightCol=GetActRightColumn( sal_True );
+                        if(!IsActLastColumn( sal_True ))
                             nMaxRight += pBorders[nRightCol].nPos;
                         else
                             nMaxRight += GetMargin2();
@@ -3464,9 +3464,9 @@ long __EXPORT SvxRuler::StartDrag()
 
 {
     lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/StartDrag"));
-    BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
+    sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
     if(!bValid)
-        return FALSE;
+        return sal_False;
 
     pRuler_Imp->lLastLMargin=GetMargin1();
     pRuler_Imp->lLastRMargin=GetMargin2();
@@ -3486,7 +3486,7 @@ long __EXPORT SvxRuler::StartDrag()
                     nDragType = DRAG_OBJECT;
             }
             else
-                bOk = FALSE;
+                bOk = sal_False;
             break;
         case RULER_TYPE_BORDER:                // Tabelle, Spalten (Modifier)
             if(pColumnItem)
@@ -3501,8 +3501,8 @@ long __EXPORT SvxRuler::StartDrag()
             break;
         case RULER_TYPE_INDENT: {                // Absatzeinzuege (Modifier)
             if( bContentProtected )
-                return FALSE;
-            USHORT nIndent = INDENT_LEFT_MARGIN;
+                return sal_False;
+            sal_uInt16 nIndent = INDENT_LEFT_MARGIN;
             if((nIndent) == GetDragAryPos() + INDENT_GAP) {        // Linker Absatzeinzug
                 pIndents[0] = pIndents[INDENT_FIRST_LINE];
                 pIndents[0].nStyle |= RULER_STYLE_DONTKNOW;
@@ -3515,7 +3515,7 @@ long __EXPORT SvxRuler::StartDrag()
             break;
         }
         case RULER_TYPE_TAB:                // Tabs (Modifier)
-            if( bContentProtected ) return FALSE;
+            if( bContentProtected ) return sal_False;
             EvalModifier();
             pTabs[0] = pTabs[GetDragAryPos()+1];
             pTabs[0].nStyle |= RULER_STYLE_DONTKNOW;
@@ -3584,7 +3584,7 @@ void __EXPORT SvxRuler::EndDrag()
 */
 {
     lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/EndDrag"));
-    const BOOL bUndo = IsDragCanceled();
+    const sal_Bool bUndo = IsDragCanceled();
     const long lPos = GetDragPos();
     DrawLine_Impl(lTabPos, 6, bHorz);
     lTabPos=-1;
@@ -3635,7 +3635,7 @@ void __EXPORT SvxRuler::EndDrag()
     nDragType = NONE;
     Ruler::EndDrag();
     if(bUndo)
-        for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++)
+        for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++)
         {
             pCtrlItem[i]->ClearCache();
             pCtrlItem[i]->GetBindings().Invalidate(pCtrlItem[i]->GetId());
@@ -3685,8 +3685,8 @@ void __EXPORT SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
      ((SfxSimpleHint&) rHint ).GetId() == SFX_HINT_UPDATEDONE ) {
         Update();
         EndListening(*pBindings);
-        bValid = TRUE;
-        bListening = FALSE;
+        bValid = sal_True;
+        bListening = sal_False;
     }
 }
 
@@ -3723,7 +3723,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
         aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId()-1);
         pTabStopItem->Remove(pRuler_Imp->nIdx);
         pTabStopItem->Insert(aTabStop);
-        USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+        sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
         pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L );
         UpdateTabs();
         pRuler_Imp->nIdx = 0;
@@ -3745,7 +3745,7 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
     if ( COMMAND_CONTEXTMENU == rCEvt.GetCommand() )
     {
         CancelDrag();
-        BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+        sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
         if ( pTabs &&
              RULER_TYPE_TAB ==
              GetType( rCEvt.GetMousePosPixel(), &pRuler_Imp->nIdx ) &&
@@ -3759,10 +3759,10 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
             aDev.SetBackground(Wallpaper(Color(COL_WHITE)));
             const Point aPt(aSz.Width() / 2, aSz.Height() / 2);
 
-            for ( USHORT i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i )
+            for ( sal_uInt16 i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i )
             {
-                USHORT nStyle = bRTL ? i|RULER_TAB_RTL : i;
-                nStyle |= (USHORT)(bHorz ? WB_HORZ : WB_VERT);
+                sal_uInt16 nStyle = bRTL ? i|RULER_TAB_RTL : i;
+                nStyle |= (sal_uInt16)(bHorz ? WB_HORZ : WB_VERT);
                 DrawTab(&aDev, aPt, nStyle);
                 aMenu.InsertItem(i+1,
                                  String(ResId(RID_SVXSTR_RULER_START+i, DIALOG_MGR())),
@@ -3777,13 +3777,13 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
             PopupMenu aMenu(ResId(RID_SVXMN_RULER, DIALOG_MGR()));
             aMenu.SetSelectHdl(LINK(this, SvxRuler, MenuSelect));
             FieldUnit eUnit = GetUnit();
-            const USHORT nCount = aMenu.GetItemCount();
+            const sal_uInt16 nCount = aMenu.GetItemCount();
 
-            BOOL bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC);
-            for ( USHORT i = nCount; i; --i )
+            sal_Bool bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC);
+            for ( sal_uInt16 i = nCount; i; --i )
             {
-                const USHORT nId = aMenu.GetItemId(i - 1);
-                aMenu.CheckItem(nId, nId == (USHORT)eUnit);
+                const sal_uInt16 nId = aMenu.GetItemId(i - 1);
+                aMenu.CheckItem(nId, nId == (sal_uInt16)eUnit);
                 if(bReduceMetric &&
                         (nId == FUNIT_M ||
                          nId == FUNIT_KM ||
@@ -3799,14 +3799,14 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
 }
 
 
-USHORT SvxRuler::GetActRightColumn(
-    BOOL bForceDontConsiderHidden, USHORT nAct ) const
+sal_uInt16 SvxRuler::GetActRightColumn(
+    sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const
 {
     if( nAct == USHRT_MAX )
         nAct = pColumnItem->GetActColumn();
     else nAct++; //Damit man die ActDrag uebergeben kann
 
-    BOOL bConsiderHidden = !bForceDontConsiderHidden &&
+    sal_Bool bConsiderHidden = !bForceDontConsiderHidden &&
         !( nDragType & DRAG_OBJECT_ACTLINE_ONLY );
 
     while( nAct < pColumnItem->Count() - 1 )
@@ -3821,15 +3821,15 @@ USHORT SvxRuler::GetActRightColumn(
 
 
 
-USHORT SvxRuler::GetActLeftColumn(
-    BOOL bForceDontConsiderHidden, USHORT nAct ) const
+sal_uInt16 SvxRuler::GetActLeftColumn(
+    sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const
 {
     if(nAct==USHRT_MAX)
         nAct=pColumnItem->GetActColumn();
 
-    USHORT nLOffs=1;
+    sal_uInt16 nLOffs=1;
 
-    BOOL bConsiderHidden = !bForceDontConsiderHidden &&
+    sal_Bool bConsiderHidden = !bForceDontConsiderHidden &&
         !( nDragType & DRAG_OBJECT_ACTLINE_ONLY );
 
     while(nAct>=nLOffs)
@@ -3843,19 +3843,19 @@ USHORT SvxRuler::GetActLeftColumn(
 }
 
 
-BOOL SvxRuler::IsActLastColumn(
-    BOOL bForceDontConsiderHidden, USHORT nAct) const
+sal_Bool SvxRuler::IsActLastColumn(
+    sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const
 {
     return GetActRightColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX;
 }
 
-BOOL SvxRuler::IsActFirstColumn(
-    BOOL bForceDontConsiderHidden, USHORT nAct) const
+sal_Bool SvxRuler::IsActFirstColumn(
+    sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const
 {
     return GetActLeftColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX;
 }
 
-long SvxRuler::CalcPropMaxRight(USHORT nCol) const
+long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
 {
 
     if(!(nDragType & DRAG_OBJECT_SIZE_LINEAR))
@@ -3869,7 +3869,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
         long lMinSpace=USHRT_MAX;
         long lOldPos;
         long lColumns=0;
-        USHORT nStart;
+        sal_uInt16 nStart;
         if(!pColumnItem->IsTable())
         {
             if(nCol==USHRT_MAX)
@@ -3884,7 +3884,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
                 lFences=pBorders[nCol].nWidth;
             }
 
-            for(USHORT i = nStart; i < nBorderCount-1; ++i)
+            for(sal_uInt16 i = nStart; i < nBorderCount-1; ++i)
             {
                 long lWidth=pBorders[i].nPos-lOldPos;
                 lColumns+=lWidth;
@@ -3900,7 +3900,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
         }
         else
         {
-            USHORT nActCol;
+            sal_uInt16 nActCol;
             if(nCol==USHRT_MAX) //CalcMinMax fuer LeftMargin
             {
                 lOldPos=GetMargin1();
@@ -3914,7 +3914,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
             lFences=0;
             while(nActCol<nBorderCount||nActCol==USHRT_MAX)
             {
-                USHORT nRight;
+                sal_uInt16 nRight;
                 if(nActCol==USHRT_MAX)
                 {
                     nRight=0;
@@ -3922,7 +3922,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
                         nRight++;
                 }
                 else
-                    nRight=GetActRightColumn(FALSE, nActCol);
+                    nRight=GetActRightColumn(sal_False, nActCol);
                 long lWidth;
                 if(nRight!=USHRT_MAX)
                 {
@@ -3946,19 +3946,19 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
     {
         if(pColumnItem->IsTable())
         {
-            USHORT nVisCols=0;
-            for(USHORT i=GetActRightColumn(FALSE, nCol);i<nBorderCount;)
+            sal_uInt16 nVisCols=0;
+            for(sal_uInt16 i=GetActRightColumn(sal_False, nCol);i<nBorderCount;)
             {
                 if((*pColumnItem)[i].bVisible)
                     nVisCols++;
-                i=GetActRightColumn(FALSE, i);
+                i=GetActRightColumn(sal_False, i);
             }
             return GetMargin2()-GetMargin1()-(nVisCols+1)*lMinFrame;
         }
         else
         {
             long lWidth=0;
-            for(USHORT i=nCol;i<nBorderCount-1;i++)
+            for(sal_uInt16 i=nCol;i<nBorderCount-1;i++)
             {
                 lWidth+=lMinFrame+pBorders[i].nWidth;
             }
@@ -3969,7 +3969,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
 /*-- 29.11.2007 08:24:23---------------------------------------------------
     //#i24363# tab stops relative to indent
   -----------------------------------------------------------------------*/
-void SvxRuler::SetTabsRelativeToIndent( BOOL bRel )
+void SvxRuler::SetTabsRelativeToIndent( sal_Bool bRel )
 {
     pRuler_Imp->bIsTabsRelativeToIndent = bRel;
 }
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 8ba911fb90c0..b030a27c952a 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -57,7 +57,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, const ResId& rResID ) :
     nVRel       (RelOrientation::PRINT_AREA),
     nWrap       (WrapTextMode_NONE),
     nAnchor     (TextContentAnchorType_AT_PAGE),
-    bTrans      (FALSE),
+    bTrans      (sal_False),
     aRelPos     (Point(0,0))
 {
     InitColors_Impl();
@@ -73,7 +73,7 @@ void SvxSwFrameExample::InitColors_Impl( void )
     const StyleSettings& rSettings = GetSettings().GetStyleSettings();
     m_aBgCol = Color( rSettings.GetWindowColor() );                             // old: COL_WHITE
 
-    BOOL bHC = rSettings.GetHighContrastMode();
+    sal_Bool bHC = rSettings.GetHighContrastMode();
 
     m_aFrameColor = Color( COL_LIGHTGREEN );
     m_aAlignColor = Color( COL_LIGHTRED );
@@ -104,19 +104,19 @@ void SvxSwFrameExample::InitAllRects_Impl()
 //    aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3));
     aPage.SetSize( GetOutputSizePixel() );
 
-    ULONG nOutWPix = aPage.GetWidth();
-    ULONG nOutHPix = aPage.GetHeight();
+    sal_uIntPtr nOutWPix = aPage.GetWidth();
+    sal_uIntPtr nOutHPix = aPage.GetHeight();
 
     // PrintArea
-    ULONG nLBorder;
-    ULONG nRBorder;
-    ULONG nTBorder;
-    ULONG nBBorder;
+    sal_uIntPtr nLBorder;
+    sal_uIntPtr nRBorder;
+    sal_uIntPtr nTBorder;
+    sal_uIntPtr nBBorder;
 
-    ULONG nLTxtBorder;
-    ULONG nRTxtBorder;
-    ULONG nTTxtBorder;
-    ULONG nBTxtBorder;
+    sal_uIntPtr nLTxtBorder;
+    sal_uIntPtr nRTxtBorder;
+    sal_uIntPtr nTTxtBorder;
+    sal_uIntPtr nBTxtBorder;
 
     if (nAnchor != TextContentAnchorType_AS_CHARACTER)
     {
@@ -153,7 +153,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
     aTextLine.Move(0, nTTxtBorder);
 
     // Rechteck um Absatz incl. Raender
-    USHORT nLines = (USHORT)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder)
+    sal_uInt16 nLines = (sal_uInt16)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder)
              / (aTextLine.GetHeight() + 2));
     aPara = aPagePrtArea;
     aPara.SetSize(Size(aPara.GetWidth(),
@@ -201,8 +201,8 @@ void SvxSwFrameExample::InitAllRects_Impl()
     // Groesse des zu positionierenden Rahmens
     if (nAnchor != TextContentAnchorType_AS_CHARACTER)
     {
-        ULONG nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder;
-        ULONG nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder;
+        sal_uIntPtr nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder;
+        sal_uIntPtr nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder;
 
         switch (nHRel)
         {
@@ -225,7 +225,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
     }
     else
     {
-        ULONG nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT));
+        sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT));
 
         aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3);
         aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L)));
@@ -459,9 +459,9 @@ Rectangle SvxSwFrameExample::DrawInnerFrame_Impl(const Rectangle &rRect, const C
         // Testabsatz zeichnen
         Rectangle aTxt(aTextLine);
         sal_Int32 nStep = aTxt.GetHeight() + 2;
-        USHORT nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
+        sal_uInt16 nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
 
-        for (USHORT i = 0; i < nLines; i++)
+        for (sal_uInt16 i = 0; i < nLines; i++)
         {
             if (i == nLines - 1)
                 aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight()));
@@ -619,7 +619,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
     const long nTxtLineHeight = aTextLine.GetHeight();
     Rectangle aTxt(aTextLine);
     sal_Int32 nStep;
-    USHORT nLines;
+    sal_uInt16 nLines;
 
     if (nAnchor == TextContentAnchorType_AT_FRAME)
     {
@@ -629,13 +629,13 @@ void SvxSwFrameExample::Paint(const Rectangle&)
         aTxt.Bottom() = aTxt.Top() + aTextLine.GetHeight() - 1;
 
         nStep = aTxt.GetHeight() + 2;
-        nLines = (USHORT)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3)
+        nLines = (sal_uInt16)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3)
                  / (aTxt.GetHeight() + 2));
     }
     else
     {
         nStep = aTxt.GetHeight() + 2;
-        nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
+        nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
     }
 
     if (nAnchor != TextContentAnchorType_AS_CHARACTER)
@@ -650,7 +650,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
                            ( nHRel == RelOrientation::CHAR || nVRel == RelOrientation::CHAR ||
                              nVRel == RelOrientation::TEXT_LINE );
 
-        for (USHORT i = 0; i < nLines; ++i)
+        for (sal_uInt16 i = 0; i < nLines; ++i)
         {
             if (i == (nLines - 1))
                 aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight()));
@@ -685,7 +685,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
         if (nAnchor != TextContentAnchorType_AT_FRAME && aTxt.Bottom() > aParaPrtArea.Bottom())
         {
             // Text wurde durch Rahmen verdraengt, daher Para-Hoehe anpassen
-            ULONG nDiff = aTxt.Bottom() - aParaPrtArea.Bottom();
+            sal_uIntPtr nDiff = aTxt.Bottom() - aParaPrtArea.Bottom();
             aParaPrtArea.Bottom() += nDiff;
             aPara.Bottom() += nDiff;
 
@@ -707,7 +707,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
     DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor);
 
     // Frame anzeigen
-    BOOL bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? TRUE : bTrans;
+    sal_Bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans;
     DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor );
 }
 
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 03b2746ae3fd..5da8843489be 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -43,7 +43,7 @@ public:
 SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() :
     Resource(SVX_RES(RID_SVXSW_FRAMEPOSITIONS))
 {
-    for(USHORT i = 0; i < SvxSwFramePosString::STR_MAX; i++)
+    for(sal_uInt16 i = 0; i < SvxSwFramePosString::STR_MAX; i++)
     {
         //string ids have to start at 1
         aStrings[i] = String(SVX_RES(i + 1));
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 751184e929c7..132ca585a87f 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -57,12 +57,12 @@ SvxTextEncodingBox::~SvxTextEncodingBox()
 
 //------------------------------------------------------------------------
 
-USHORT SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
+sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
 {
-    USHORT nCount = GetEntryCount();
-    for ( USHORT i=0; i<nCount; i++ )
+    sal_uInt16 nCount = GetEntryCount();
+    for ( sal_uInt16 i=0; i<nCount; i++ )
     {
-        if ( nEnc == rtl_TextEncoding( (ULONG)GetEntryData(i) ) )
+        if ( nEnc == rtl_TextEncoding( (sal_uIntPtr)GetEntryData(i) ) )
             return i;
     }
     return LISTBOX_ENTRY_NOTFOUND;
@@ -79,12 +79,12 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
     sal_uInt32 nCount = m_pEncTable->Count();
     for ( sal_uInt32 j=0; j<nCount; j++ )
     {
-        BOOL bInsert = TRUE;
+        sal_Bool bInsert = sal_True;
         rtl_TextEncoding nEnc = rtl_TextEncoding( m_pEncTable->GetValue( j ) );
         if ( nExcludeInfoFlags )
         {
             if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
-                bInsert = FALSE;
+                bInsert = sal_False;
             else
             {
                 if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
@@ -92,10 +92,10 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
                     if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
                             ((nEnc == RTL_TEXTENCODING_UCS2) ||
                             nEnc == RTL_TEXTENCODING_UCS4) )
-                        bInsert = FALSE;    // InfoFlags don't work for Unicode :-(
+                        bInsert = sal_False;    // InfoFlags don't work for Unicode :-(
                 }
                 else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
-                    bInsert = FALSE;
+                    bInsert = sal_False;
             }
         }
         if ( bInsert )
@@ -108,7 +108,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
                     case RTL_TEXTENCODING_GB_2312 :
                     case RTL_TEXTENCODING_GBK :
                     case RTL_TEXTENCODING_MS_936 :
-                        bInsert = FALSE;
+                        bInsert = sal_False;
                     break;
                 }
             }
@@ -129,14 +129,14 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
     svxform::ODataAccessCharsetHelper aCSH;
     ::std::vector< rtl_TextEncoding > aEncs;
     sal_Int32 nCount = aCSH.getSupportedTextEncodings( aEncs );
-    for ( USHORT j=0; j<nCount; j++ )
+    for ( sal_uInt16 j=0; j<nCount; j++ )
     {
-        BOOL bInsert = TRUE;
+        sal_Bool bInsert = sal_True;
         rtl_TextEncoding nEnc = rtl_TextEncoding( aEncs[j] );
         if ( nExcludeInfoFlags )
         {
             if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
-                bInsert = FALSE;
+                bInsert = sal_False;
             else
             {
                 if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
@@ -144,10 +144,10 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
                     if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
                             ((nEnc == RTL_TEXTENCODING_UCS2) ||
                             nEnc == RTL_TEXTENCODING_UCS4) )
-                        bInsert = FALSE;    // InfoFlags don't work for Unicode :-(
+                        bInsert = sal_False;    // InfoFlags don't work for Unicode :-(
                 }
                 else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
-                    bInsert = FALSE;
+                    bInsert = sal_False;
             }
         }
         if ( bInsert )
@@ -160,7 +160,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
                     case RTL_TEXTENCODING_GB_2312 :
                     case RTL_TEXTENCODING_GBK :
                     case RTL_TEXTENCODING_MS_936 :
-                        bInsert = FALSE;
+                        bInsert = sal_False;
                     break;
                 }
             }
@@ -185,15 +185,15 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest()
 //------------------------------------------------------------------------
 
 void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
-            const String& rEntry, USHORT nPos )
+            const String& rEntry, sal_uInt16 nPos )
 {
-    USHORT nAt = InsertEntry( rEntry, nPos );
-    SetEntryData( nAt, (void*)(ULONG)nEnc );
+    sal_uInt16 nAt = InsertEntry( rEntry, nPos );
+    SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc );
 }
 
 //------------------------------------------------------------------------
 
-void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT nPos )
+void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos )
 {
     const String& rEntry = m_pEncTable->GetTextString( nEnc );
     if ( rEntry.Len() )
@@ -212,7 +212,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT
 
 void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc )
 {
-    USHORT nAt = EncodingToPos_Impl( nEnc );
+    sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         RemoveEntry( nAt );
@@ -222,19 +222,19 @@ void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc )
 
 rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
 {
-    USHORT nPos = GetSelectEntryPos();
+    sal_uInt16 nPos = GetSelectEntryPos();
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-        return rtl_TextEncoding( (ULONG)GetEntryData(nPos) );
+        return rtl_TextEncoding( (sal_uIntPtr)GetEntryData(nPos) );
     else
         return RTL_TEXTENCODING_DONTKNOW;
 }
 
 //------------------------------------------------------------------------
 
-void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL bSelect )
+void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect )
 {
-    USHORT nAt = EncodingToPos_Impl( nEnc );
+    sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         SelectEntryPos( nAt, bSelect );
@@ -242,13 +242,13 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL b
 
 //------------------------------------------------------------------------
 
-BOOL SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const
+sal_Bool SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const
 {
-    USHORT nAt = EncodingToPos_Impl( nEnc );
+    sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         return IsEntryPosSelected( nAt );
     else
-        return FALSE;
+        return sal_False;
 }
 
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 813f25c1f75b..d64f7aeaa3a0 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -43,7 +43,7 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook
     fResetFocalLength(fFocalLen),
     fResetBankAngle(fBankAng),
     fBankAngle(fBankAng),
-    bAutoAdjustProjection(TRUE)
+    bAutoAdjustProjection(sal_True)
 {
     SetVPD(0);
     SetPosition(rPos);
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index b78d464d4897..6329ca2a3203 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -87,7 +87,7 @@ void E3dCubeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dCubeObj::GetObjIdentifier() const
+sal_uInt16 E3dCubeObj::GetObjIdentifier() const
 {
     return E3D_CUBEOBJ_ID;
 }
@@ -98,7 +98,7 @@ UINT16 E3dCubeObj::GetObjIdentifier() const
 |*
 \************************************************************************/
 
-SdrObject *E3dCubeObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -147,7 +147,7 @@ void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew)
     }
 }
 
-void E3dCubeObj::SetPosIsCenter(BOOL bNew)
+void E3dCubeObj::SetPosIsCenter(sal_Bool bNew)
 {
     if(bPosIsCenter != bNew)
     {
@@ -156,7 +156,7 @@ void E3dCubeObj::SetPosIsCenter(BOOL bNew)
     }
 }
 
-void E3dCubeObj::SetSideFlags(UINT16 nNew)
+void E3dCubeObj::SetSideFlags(sal_uInt16 nNew)
 {
     if(nSideFlags != nNew)
     {
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index 9e703abd7d0b..e8473033ccf3 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -49,14 +49,14 @@ E3dDefaultAttributes::E3dDefaultAttributes()
 void E3dDefaultAttributes::Reset()
 {
     // Compound-Objekt
-    bDefaultCreateNormals = TRUE;
-    bDefaultCreateTexture = TRUE;
+    bDefaultCreateNormals = sal_True;
+    bDefaultCreateTexture = sal_True;
 
     // Cube-Objekt
     aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0);
     aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0);
     nDefaultCubeSideFlags = CUBE_FULL;
-    bDefaultCubePosIsCenter = FALSE;
+    bDefaultCubePosIsCenter = sal_False;
 
     // Sphere-Objekt
     aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0);
@@ -64,18 +64,18 @@ void E3dDefaultAttributes::Reset()
 
     // Lathe-Objekt
     nDefaultLatheEndAngle = 3600;
-    bDefaultLatheSmoothed = TRUE;
-    bDefaultLatheSmoothFrontBack = FALSE;
-    bDefaultLatheCharacterMode = FALSE;
-    bDefaultLatheCloseFront = TRUE;
-    bDefaultLatheCloseBack = TRUE;
+    bDefaultLatheSmoothed = sal_True;
+    bDefaultLatheSmoothFrontBack = sal_False;
+    bDefaultLatheCharacterMode = sal_False;
+    bDefaultLatheCloseFront = sal_True;
+    bDefaultLatheCloseBack = sal_True;
 
     // Extrude-Objekt
-    bDefaultExtrudeSmoothed = TRUE;
-    bDefaultExtrudeSmoothFrontBack = FALSE;
-    bDefaultExtrudeCharacterMode = FALSE;
-    bDefaultExtrudeCloseFront = TRUE;
-    bDefaultExtrudeCloseBack = TRUE;
+    bDefaultExtrudeSmoothed = sal_True;
+    bDefaultExtrudeSmoothFrontBack = sal_False;
+    bDefaultExtrudeCharacterMode = sal_False;
+    bDefaultExtrudeCloseFront = sal_True;
+    bDefaultExtrudeCloseBack = sal_True;
 }
 
 // eof
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index fd44db7b02d9..6fadec8cc9dc 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -57,11 +57,11 @@ E3dDragMethod::E3dDragMethod (
     SdrDragView &_rView,
     const SdrMarkList& rMark,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :   SdrDragMethod(_rView),
     meConstraint(eConstr),
     mbMoveFull(bFull),
-    mbMovedAtAll(FALSE)
+    mbMovedAtAll(sal_False)
 {
     // Fuer alle in der selektion befindlichen 3D-Objekte
     // eine Unit anlegen
@@ -175,7 +175,7 @@ bool E3dDragMethod::BeginSdrDrag()
         Show();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -218,7 +218,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
             getSdrDragView().EndUndo();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -321,7 +321,7 @@ TYPEINIT1(E3dDragRotate, E3dDragMethod);
 E3dDragRotate::E3dDragRotate(SdrDragView &_rView,
     const SdrMarkList& rMark,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :   E3dDragMethod(_rView, rMark, eConstr, bFull)
 {
     // Zentrum aller selektierten Objekte in Augkoordinaten holen
@@ -421,7 +421,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
             }
             long nSnap = 0;
 
-            if(!getSdrDragView().IsRotateAllowed(FALSE))
+            if(!getSdrDragView().IsRotateAllowed(sal_False))
                 nSnap = 90;
 
             if(nSnap != 0)
@@ -514,7 +514,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView,
     const SdrMarkList& rMark,
     SdrHdlKind eDrgHdl,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :   E3dDragMethod(_rView, rMark, eConstr, bFull),
     meWhatDragHdl(eDrgHdl)
 {
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index 6c9a541b8c7c..97658f4dcd68 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -52,9 +52,9 @@ E3dUndoAction::~E3dUndoAction ()
 |* Repeat gibt es nicht
 |*
 \************************************************************************/
-BOOL E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
+sal_Bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 /************************************************************************/
@@ -116,7 +116,7 @@ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel,
     E3dObject*  pInObject,
     const SfxItemSet& rNewSet,
     const SfxItemSet& rOldSet,
-    BOOL bUseSubObj)
+    sal_Bool bUseSubObj)
 :   SdrUndoAction( rModel ),
     pObject      ( pInObject ),
     pView        ( p3dView ),
@@ -164,9 +164,9 @@ void E3dAttributesUndoAction::Redo()
 |* Mehrfaches Undo nicht moeglich
 |*
 \************************************************************************/
-BOOL E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const
+sal_Bool E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 423a846d86a1..b3fdd6fd9b00 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -116,7 +116,7 @@ void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dExtrudeObj::GetObjIdentifier() const
+sal_uInt16 E3dExtrudeObj::GetObjIdentifier() const
 {
     return E3D_EXTRUDEOBJ_ID;
 }
@@ -190,9 +190,9 @@ void E3dExtrudeObj::TakeObjNamePlural(XubString& rName) const
 |*
 \************************************************************************/
 
-BOOL E3dExtrudeObj::IsBreakObjPossible()
+sal_Bool E3dExtrudeObj::IsBreakObjPossible()
 {
-    return TRUE;
+    return sal_True;
 }
 
 SdrAttrObj* E3dExtrudeObj::GetBreakObj()
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index e1e90d88c22f..ea33f2089ed0 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -236,7 +236,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aImgLightOn         ( SVX_RES( RID_SVXIMAGE_LIGHT_ON ) ),
         aImgLightOff        ( SVX_RES( RID_SVXIMAGE_LIGHT_OFF ) ),
 
-        bUpdate             ( FALSE ),
+        bUpdate             ( sal_False ),
         eViewType           ( VIEWTYPE_GEO ),
 
         pModel              ( NULL ),
@@ -253,7 +253,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
 //      pPool               ( NULL ),
         mpImpl              ( new Svx3DWinImpl() ),
         mpRemember2DAttributes(NULL),
-        bOnly3DChanged      ( FALSE )
+        bOnly3DChanged      ( sal_False )
 {
     SETHCIMAGE( aBtnGeo, BMP_GEO_H );
     SETHCIMAGE( aBtnRepresentation, BMP_REPRESENTATION_H );
@@ -410,7 +410,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
     if (pDispatcher != NULL)
     {
-        SfxBoolItem aItem( SID_3D_INIT, TRUE );
+        SfxBoolItem aItem( SID_3D_INIT, sal_True );
         pDispatcher->Execute(
             SID_3D_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     }
@@ -487,18 +487,18 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
     while(nWhich)
     {
-        SfxItemState eState = rAttrs.GetItemState(nWhich, FALSE);
+        SfxItemState eState = rAttrs.GetItemState(nWhich, sal_False);
         if(SFX_ITEM_DONTCARE == eState)
             mpRemember2DAttributes->InvalidateItem(nWhich);
         else if(SFX_ITEM_SET == eState)
-            mpRemember2DAttributes->Put(rAttrs.Get(nWhich, FALSE));
+            mpRemember2DAttributes->Put(rAttrs.Get(nWhich, sal_False));
 
         nWhich = aIter.NextWhich();
     }
 
     // construct field values
     const SfxPoolItem* pItem;
-    //BOOL bUpdate = FALSE;
+    //sal_Bool bUpdate = sal_False;
 
     // evtl. PoolUnit ermitteln
     if( !mpImpl->pPool )
@@ -511,16 +511,16 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
 
 // Segmentanzahl aenderbar ? und andere Stati
-    SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, FALSE, &pItem );
+    SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, sal_False, &pItem );
     if( SFX_ITEM_SET == eState )
     {
-        UINT32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
-        //BOOL bLathe   = (BOOL) ( nState & 1 );
-        BOOL bExtrude = (BOOL) ( nState & 2 );
-        BOOL bSphere  = (BOOL) ( nState & 4 );
-        BOOL bCube    = (BOOL) ( nState & 8 );
+        sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
+        //sal_Bool bLathe   = (sal_Bool) ( nState & 1 );
+        sal_Bool bExtrude = (sal_Bool) ( nState & 2 );
+        sal_Bool bSphere  = (sal_Bool) ( nState & 4 );
+        sal_Bool bCube    = (sal_Bool) ( nState & 8 );
 
-        BOOL bChart = (BOOL) ( nState & 32 ); // Chart
+        sal_Bool bChart = (sal_Bool) ( nState & 32 ); // Chart
 
         if( !bChart )
         {
@@ -558,41 +558,41 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         else
         {
             // Geometrie
-            aFtHorizontal.Enable( FALSE );
-            aNumHorizontal.Enable( FALSE );
+            aFtHorizontal.Enable( sal_False );
+            aNumHorizontal.Enable( sal_False );
             aNumHorizontal.SetEmptyFieldValue();
-            aFtVertical.Enable( FALSE );
-            aNumVertical.Enable( FALSE );
+            aFtVertical.Enable( sal_False );
+            aNumVertical.Enable( sal_False );
             aNumVertical.SetEmptyFieldValue();
-            aFLSegments.Enable( FALSE );
-            aFtEndAngle.Enable( FALSE );
-            aMtrEndAngle.Enable( FALSE );
+            aFLSegments.Enable( sal_False );
+            aFtEndAngle.Enable( sal_False );
+            aMtrEndAngle.Enable( sal_False );
             aMtrEndAngle.SetEmptyFieldValue();
-            aFtDepth.Enable( FALSE );
-            aMtrDepth.Enable( FALSE );
+            aFtDepth.Enable( sal_False );
+            aMtrDepth.Enable( sal_False );
             aMtrDepth.SetEmptyFieldValue();
 
             // Darstellung
-            aBtnShadow3d.Enable( FALSE );
-            aFtSlant.Enable( FALSE );
-            aMtrSlant.Enable( FALSE );
-            aFLShadow.Enable( FALSE );
+            aBtnShadow3d.Enable( sal_False );
+            aFtSlant.Enable( sal_False );
+            aMtrSlant.Enable( sal_False );
+            aFLShadow.Enable( sal_False );
 
-            aFtDistance.Enable( FALSE );
-            aMtrDistance.Enable( FALSE );
+            aFtDistance.Enable( sal_False );
+            aMtrDistance.Enable( sal_False );
             aMtrDistance.SetEmptyFieldValue();
-            aFtFocalLeng.Enable( FALSE );
-            aMtrFocalLength.Enable( FALSE );
+            aFtFocalLeng.Enable( sal_False );
+            aMtrFocalLength.Enable( sal_False );
             aMtrFocalLength.SetEmptyFieldValue();
-            aFLCamera.Enable( FALSE );
+            aFLCamera.Enable( sal_False );
 
             // Unterer Bereich
-            aBtnConvertTo3D.Enable( FALSE );
-            aBtnLatheObject.Enable( FALSE );
+            aBtnConvertTo3D.Enable( sal_False );
+            aBtnLatheObject.Enable( sal_False );
         }
     }
 // Bitmapfuellung ? -> Status
-    BOOL bBitmap(FALSE);
+    sal_Bool bBitmap(sal_False);
     eState = rAttrs.GetItemState(XATTR_FILLSTYLE);
     if(eState != SFX_ITEM_DONTCARE)
     {
@@ -632,8 +632,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             {
                 aNumHorizontal.SetValue( nValue );
                 // evtl. am Ende...
-                // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (UINT16)nValue );
-                bUpdate = TRUE;
+                // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (sal_uInt16)nValue );
+                bUpdate = sal_True;
             }
             else if( aNumHorizontal.IsEmptyFieldValue() )
                 aNumHorizontal.SetValue( nValue );
@@ -643,7 +643,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aNumHorizontal.IsEmptyFieldValue() )
             {
                 aNumHorizontal.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -654,13 +654,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
-            if( nValue != (UINT32) aNumVertical.GetValue() )
+            sal_uInt32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
+            if( nValue != (sal_uInt32) aNumVertical.GetValue() )
             {
                 aNumVertical.SetValue( nValue );
                 // evtl. am Ende...
-                //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (UINT16)nValue );
-                bUpdate = TRUE;
+                //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (sal_uInt16)nValue );
+                bUpdate = sal_True;
             }
             else if( aNumVertical.IsEmptyFieldValue() )
                 aNumVertical.SetValue( nValue );
@@ -670,7 +670,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aNumVertical.IsEmptyFieldValue() )
             {
                 aNumVertical.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -681,15 +681,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
-            UINT32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
+            sal_uInt32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
+            sal_uInt32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
             if( nValue != nValue2 )
             {
                 if( eFUnit != aMtrDepth.GetUnit() )
                     SetFieldUnit( aMtrDepth, eFUnit );
 
                 SetMetricValue( aMtrDepth, nValue, ePoolUnit );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrDepth.IsEmptyFieldValue() )
                 aMtrDepth.SetValue( aMtrDepth.GetValue() );
@@ -699,7 +699,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrDepth.IsEmptyFieldValue() )
             {
                 aMtrDepth.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -708,11 +708,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
+        sal_Bool bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
         if( bValue != aBtnDoubleSided.IsChecked() )
         {
             aBtnDoubleSided.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnDoubleSided.GetState() == STATE_DONTKNOW )
             aBtnDoubleSided.Check( bValue );
@@ -722,7 +722,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnDoubleSided.GetState() != STATE_DONTKNOW )
         {
             aBtnDoubleSided.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -732,11 +732,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
             if( nValue != aMtrPercentDiagonal.GetValue() )
             {
                 aMtrPercentDiagonal.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrPercentDiagonal.IsEmptyFieldValue() )
                 aMtrPercentDiagonal.SetValue( nValue );
@@ -746,7 +746,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
             {
                 aMtrPercentDiagonal.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -757,11 +757,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
             if( nValue != aMtrBackscale.GetValue() )
             {
                 aMtrBackscale.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrBackscale.IsEmptyFieldValue() )
                 aMtrBackscale.SetValue( nValue );
@@ -771,7 +771,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrBackscale.IsEmptyFieldValue() )
             {
                 aMtrBackscale.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -782,11 +782,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            INT32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
+            sal_Int32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
             if( nValue != aMtrEndAngle.GetValue() )
             {
                 aMtrEndAngle.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -794,7 +794,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrEndAngle.IsEmptyFieldValue() )
             {
                 aMtrEndAngle.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -803,7 +803,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
 
         if( ( !aBtnNormalsObj.IsChecked() && nValue == 0 ) ||
             ( !aBtnNormalsFlat.IsChecked() && nValue == 1 ) ||
@@ -812,7 +812,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             aBtnNormalsObj.Check( nValue == 0 );
             aBtnNormalsFlat.Check( nValue == 1 );
             aBtnNormalsSphere.Check( nValue == 2 );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -821,10 +821,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             aBtnNormalsFlat.IsChecked() ||
             aBtnNormalsSphere.IsChecked() )
         {
-            aBtnNormalsObj.Check( FALSE );
-            aBtnNormalsFlat.Check( FALSE );
-            aBtnNormalsSphere.Check( FALSE );
-            bUpdate = TRUE;
+            aBtnNormalsObj.Check( sal_False );
+            aBtnNormalsFlat.Check( sal_False );
+            aBtnNormalsSphere.Check( sal_False );
+            bUpdate = sal_True;
         }
     }
 
@@ -832,11 +832,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
+        sal_Bool bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
         if( bValue != aBtnNormalsInvert.IsChecked() )
         {
             aBtnNormalsInvert.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnNormalsInvert.GetState() == STATE_DONTKNOW )
             aBtnNormalsInvert.Check( bValue );
@@ -846,7 +846,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnNormalsInvert.GetState() != STATE_DONTKNOW )
         {
             aBtnNormalsInvert.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -854,11 +854,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
+        sal_Bool bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
         if( bValue != aBtnTwoSidedLighting.IsChecked() )
         {
             aBtnTwoSidedLighting.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnTwoSidedLighting.GetState() == STATE_DONTKNOW )
             aBtnTwoSidedLighting.Check( bValue );
@@ -868,7 +868,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnTwoSidedLighting.GetState() != STATE_DONTKNOW )
         {
             aBtnTwoSidedLighting.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -877,11 +877,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
         if( nValue != aLbShademode.GetSelectEntryPos() )
         {
             aLbShademode.SelectEntryPos( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -889,7 +889,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbShademode.GetSelectEntryCount() != 0 )
         {
             aLbShademode.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -897,13 +897,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
+        sal_Bool bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
         if( bValue != aBtnShadow3d.IsChecked() )
         {
             aBtnShadow3d.Check( bValue );
             aFtSlant.Enable( bValue );
             aMtrSlant.Enable( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnShadow3d.GetState() == STATE_DONTKNOW )
             aBtnShadow3d.Check( bValue );
@@ -913,7 +913,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnShadow3d.GetState() != STATE_DONTKNOW )
         {
             aBtnShadow3d.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -921,11 +921,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
         if( nValue != aMtrSlant.GetValue() )
         {
             aMtrSlant.SetValue( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -933,7 +933,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrSlant.IsEmptyFieldValue() )
         {
             aMtrSlant.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -941,15 +941,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
-        UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
+        sal_uInt32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
+        sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
         if( nValue != nValue2 )
         {
             if( eFUnit != aMtrDistance.GetUnit() )
                 SetFieldUnit( aMtrDistance, eFUnit );
 
             SetMetricValue( aMtrDistance, nValue, ePoolUnit );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -957,7 +957,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrDepth.IsEmptyFieldValue() )
         {
             aMtrDepth.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -965,15 +965,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
-        UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
+        sal_uInt32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
+        sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
         if( nValue != nValue2 )
         {
             if( eFUnit != aMtrFocalLength.GetUnit() )
                 SetFieldUnit( aMtrFocalLength, eFUnit );
 
             SetMetricValue( aMtrFocalLength, nValue, ePoolUnit );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -981,7 +981,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrFocalLength.IsEmptyFieldValue() )
         {
             aMtrFocalLength.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -997,7 +997,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1005,7 +1005,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight1.GetSelectEntryCount() != 0 )
         {
             aLbLight1.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 1 (an/aus)
@@ -1017,7 +1017,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight1 )) )
         {
             SetUILightState( aBtnLight1, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight1.GetState() == STATE_DONTKNOW )
             aBtnLight1.Check( aBtnLight1.IsChecked() );
@@ -1027,14 +1027,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight1.GetState() != STATE_DONTKNOW )
         {
             aBtnLight1.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 1 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 2 (Farbe)
@@ -1046,7 +1046,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1054,7 +1054,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight2.GetSelectEntryCount() != 0 )
         {
             aLbLight2.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 2 (an/aus)
@@ -1066,7 +1066,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight2 )) )
         {
             SetUILightState( aBtnLight2, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight2.GetState() == STATE_DONTKNOW )
             aBtnLight2.Check( aBtnLight2.IsChecked() );
@@ -1076,14 +1076,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight2.GetState() != STATE_DONTKNOW )
         {
             aBtnLight2.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 2 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 3 (Farbe)
@@ -1095,7 +1095,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1103,7 +1103,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight3.GetSelectEntryCount() != 0 )
         {
             aLbLight3.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 3 (an/aus)
@@ -1115,7 +1115,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight3)) )
         {
             SetUILightState( aBtnLight3, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight3.GetState() == STATE_DONTKNOW )
             aBtnLight3.Check( aBtnLight3.IsChecked() );
@@ -1125,14 +1125,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight3.GetState() != STATE_DONTKNOW )
         {
             aBtnLight3.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 3 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 4 (Farbe)
@@ -1144,7 +1144,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1152,7 +1152,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight4.GetSelectEntryCount() != 0 )
         {
             aLbLight4.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 4 (an/aus)
@@ -1164,7 +1164,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight4 )) )
         {
             SetUILightState( aBtnLight4, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight4.GetState() == STATE_DONTKNOW )
             aBtnLight4.Check( aBtnLight4.IsChecked() );
@@ -1174,14 +1174,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight4.GetState() != STATE_DONTKNOW )
         {
             aBtnLight4.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 4 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 5 (Farbe)
@@ -1193,7 +1193,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1201,7 +1201,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight5.GetSelectEntryCount() != 0 )
         {
             aLbLight5.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 5 (an/aus)
@@ -1213,7 +1213,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight5 )) )
         {
             SetUILightState( aBtnLight5, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight5.GetState() == STATE_DONTKNOW )
             aBtnLight5.Check( aBtnLight5.IsChecked() );
@@ -1223,14 +1223,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight5.GetState() != STATE_DONTKNOW )
         {
             aBtnLight5.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 5 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 6 (Farbe)
@@ -1242,7 +1242,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1250,7 +1250,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight6.GetSelectEntryCount() != 0 )
         {
             aLbLight6.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 6 (an/aus)
@@ -1262,7 +1262,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight6 )) )
         {
             SetUILightState( aBtnLight6, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight6.GetState() == STATE_DONTKNOW )
             aBtnLight6.Check( aBtnLight6.IsChecked() );
@@ -1272,14 +1272,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight6.GetState() != STATE_DONTKNOW )
         {
             aBtnLight6.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 6 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 7 (Farbe)
@@ -1291,7 +1291,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1299,7 +1299,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight7.GetSelectEntryCount() != 0 )
         {
             aLbLight7.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 7 (an/aus)
@@ -1311,7 +1311,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight7 )) )
         {
             SetUILightState( aBtnLight7 , bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight7.GetState() == STATE_DONTKNOW )
             aBtnLight7.Check( aBtnLight7.IsChecked() );
@@ -1321,14 +1321,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight7.GetState() != STATE_DONTKNOW )
         {
             aBtnLight7.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 7 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 8 (Farbe)
@@ -1340,7 +1340,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1348,7 +1348,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight8.GetSelectEntryCount() != 0 )
         {
             aLbLight8.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 8 (an/aus)
@@ -1360,7 +1360,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight8 )) )
         {
             SetUILightState( aBtnLight8, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight8.GetState() == STATE_DONTKNOW )
             aBtnLight8.Check( aBtnLight8.IsChecked() );
@@ -1370,14 +1370,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight8.GetState() != STATE_DONTKNOW )
         {
             aBtnLight8.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 8 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Umgebungslicht
@@ -1389,7 +1389,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1397,7 +1397,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbAmbientlight.GetSelectEntryCount() != 0 )
         {
             aLbAmbientlight.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1409,14 +1409,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_KIND);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
 
             if( ( !aBtnTexLuminance.IsChecked() && nValue == 1 ) ||
                 ( !aBtnTexColor.IsChecked() && nValue == 3 ) )
             {
                 aBtnTexLuminance.Check( nValue == 1 );
                 aBtnTexColor.Check( nValue == 3 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1424,9 +1424,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexLuminance.IsChecked() ||
                 aBtnTexColor.IsChecked() )
             {
-                aBtnTexLuminance.Check( FALSE );
-                aBtnTexColor.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexLuminance.Check( sal_False );
+                aBtnTexColor.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1434,7 +1434,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
 
             if( ( !aBtnTexReplace.IsChecked() && nValue == 1 ) ||
                 ( !aBtnTexModulate.IsChecked() && nValue == 2 ) )
@@ -1442,7 +1442,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexReplace.Check( nValue == 1 );
                 aBtnTexModulate.Check( nValue == 2 );
                 //aBtnTexBlend.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1450,10 +1450,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexReplace.IsChecked() ||
                 aBtnTexModulate.IsChecked() )
             {
-                aBtnTexReplace.Check( FALSE );
-                aBtnTexModulate.Check( FALSE );
-                //aBtnTexBlend.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexReplace.Check( sal_False );
+                aBtnTexModulate.Check( sal_False );
+                //aBtnTexBlend.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1461,7 +1461,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
 
             if( ( !aBtnTexObjectX.IsChecked() && nValue == 0 ) ||
                 ( !aBtnTexParallelX.IsChecked() && nValue == 1 ) ||
@@ -1470,7 +1470,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexObjectX.Check( nValue == 0 );
                 aBtnTexParallelX.Check( nValue == 1 );
                 aBtnTexCircleX.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1479,10 +1479,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexParallelX.IsChecked() ||
                 aBtnTexCircleX.IsChecked() )
             {
-                aBtnTexObjectX.Check( FALSE );
-                aBtnTexParallelX.Check( FALSE );
-                aBtnTexCircleX.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexObjectX.Check( sal_False );
+                aBtnTexParallelX.Check( sal_False );
+                aBtnTexCircleX.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1490,7 +1490,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
 
             if( ( !aBtnTexObjectY.IsChecked() && nValue == 0 ) ||
                 ( !aBtnTexParallelY.IsChecked() && nValue == 1 ) ||
@@ -1499,7 +1499,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexObjectY.Check( nValue == 0 );
                 aBtnTexParallelY.Check( nValue == 1 );
                 aBtnTexCircleY.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1508,10 +1508,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexParallelY.IsChecked() ||
                 aBtnTexCircleY.IsChecked() )
             {
-                aBtnTexObjectY.Check( FALSE );
-                aBtnTexParallelY.Check( FALSE );
-                aBtnTexCircleY.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexObjectY.Check( sal_False );
+                aBtnTexParallelY.Check( sal_False );
+                aBtnTexCircleY.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1519,11 +1519,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            BOOL bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
+            sal_Bool bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
             if( bValue != aBtnTexFilter.IsChecked() )
             {
                 aBtnTexFilter.Check( bValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             if( aBtnTexFilter.GetState() == STATE_DONTKNOW )
                 aBtnTexFilter.Check( bValue );
@@ -1533,7 +1533,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexFilter.GetState() != STATE_DONTKNOW )
             {
                 aBtnTexFilter.SetState( STATE_DONTKNOW );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -1551,7 +1551,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1559,7 +1559,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatColor.GetSelectEntryCount() != 0 )
         {
             aLbMatColor.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1572,7 +1572,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1580,7 +1580,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatEmission.GetSelectEntryCount() != 0 )
         {
             aLbMatEmission.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1593,7 +1593,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1601,7 +1601,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatSpecular.GetSelectEntryCount() != 0 )
         {
             aLbMatSpecular.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1609,11 +1609,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
         if( nValue != aMtrMatSpecularIntensity.GetValue() )
         {
             aMtrMatSpecularIntensity.SetValue( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1621,7 +1621,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
         {
             aMtrMatSpecularIntensity.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1636,7 +1636,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( aBtnPerspective.IsChecked() && ePT == PR_PARALLEL ) )
         {
             aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnPerspective.GetState() == STATE_DONTKNOW )
             aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
@@ -1646,7 +1646,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnPerspective.GetState() != STATE_DONTKNOW )
         {
             aBtnPerspective.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1656,7 +1656,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         // diese und entscheide
 
 
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     if( bUpdate || bOnly3DChanged )
@@ -1666,12 +1666,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
         // set LineStyle hard to XLINE_NONE when it's not set so that
         // the default (XLINE_SOLID) is not used for 3d preview
-        if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, FALSE))
+        if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, sal_False))
             aSet.Put(XLineStyleItem(XLINE_NONE));
 
         // set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that
         // the default (Blue7) is not used for 3d preview
-        if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, FALSE))
+        if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, sal_False))
             aSet.Put(XFillColorItem(String(), Color(COL_WHITE)));
 
         aCtlPreview.Set3DAttributes(aSet);
@@ -1719,11 +1719,11 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
 
         while(nWhich)
         {
-            SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, FALSE);
+            SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, sal_False);
             if(SFX_ITEM_DONTCARE == eState)
                 rAttrs.InvalidateItem(nWhich);
             else if(SFX_ITEM_SET == eState)
-                rAttrs.Put(mpRemember2DAttributes->Get(nWhich, FALSE));
+                rAttrs.Put(mpRemember2DAttributes->Get(nWhich, sal_False));
 
             nWhich = aIter.NextWhich();
         }
@@ -1733,7 +1733,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Perspektive
     if( aBtnPerspective.GetState() != STATE_DONTKNOW )
     {
-        UINT16 nValue;
+        sal_uInt16 nValue;
         if( aBtnPerspective.IsChecked() )
             nValue = PR_PERSPECTIVE;
         else
@@ -1767,7 +1767,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Anzahl Segmente (vertikal)
     if( !aNumVertical.IsEmptyFieldValue() )
     {
-        UINT32 nValue = static_cast<UINT32>(aNumVertical.GetValue());
+        sal_uInt32 nValue = static_cast<sal_uInt32>(aNumVertical.GetValue());
         rAttrs.Put(Svx3DVerticalSegmentsItem(nValue));
     }
     else
@@ -1776,7 +1776,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Tiefe
     if( !aMtrDepth.IsEmptyFieldValue() )
     {
-        UINT32 nValue = GetCoreValue( aMtrDepth, ePoolUnit );
+        sal_uInt32 nValue = GetCoreValue( aMtrDepth, ePoolUnit );
         rAttrs.Put(Svx3DDepthItem(nValue));
     }
     else
@@ -1786,7 +1786,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     TriState eState = aBtnDoubleSided.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DDoubleSidedItem(bValue));
     }
     else
@@ -1795,7 +1795,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Kantenrundung
     if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16) aMtrPercentDiagonal.GetValue();
+        sal_uInt16 nValue = (sal_uInt16) aMtrPercentDiagonal.GetValue();
         rAttrs.Put(Svx3DPercentDiagonalItem(nValue));
     }
     else
@@ -1804,7 +1804,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Tiefenskalierung
     if( !aMtrBackscale.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16)aMtrBackscale.GetValue();
+        sal_uInt16 nValue = (sal_uInt16)aMtrBackscale.GetValue();
         rAttrs.Put(Svx3DBackscaleItem(nValue));
     }
     else
@@ -1813,14 +1813,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Endwinkel
     if( !aMtrEndAngle.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16)aMtrEndAngle.GetValue();
+        sal_uInt16 nValue = (sal_uInt16)aMtrEndAngle.GetValue();
         rAttrs.Put(Svx3DEndAngleItem(nValue));
     }
     else
         rAttrs.InvalidateItem(SDRATTR_3DOBJ_END_ANGLE);
 
     // Normalentyp
-    UINT16 nValue = 99;
+    sal_uInt16 nValue = 99;
     if( aBtnNormalsObj.IsChecked() )
         nValue = 0;
     else if( aBtnNormalsFlat.IsChecked() )
@@ -1837,7 +1837,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnNormalsInvert.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DNormalsInvertItem(bValue));
     }
     else
@@ -1847,7 +1847,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnTwoSidedLighting.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DTwoSidedLightingItem(bValue));
     }
     else
@@ -1867,7 +1867,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnShadow3d.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DShadow3DItem(bValue));
         rAttrs.Put(SdrShadowItem(bValue));
     }
@@ -1880,7 +1880,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Neigung (Schatten)
     if( !aMtrSlant.IsEmptyFieldValue() )
     {
-        UINT16 nValue2 = (UINT16) aMtrSlant.GetValue();
+        sal_uInt16 nValue2 = (sal_uInt16) aMtrSlant.GetValue();
         rAttrs.Put(Svx3DShadowSlantItem(nValue2));
     }
     else
@@ -1889,7 +1889,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Distanz
     if( !aMtrDistance.IsEmptyFieldValue() )
     {
-        UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
+        sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
         rAttrs.Put(Svx3DDistanceItem(nValue2));
     }
     else
@@ -1898,7 +1898,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Brennweite
     if( !aMtrFocalLength.IsEmptyFieldValue() )
     {
-        UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
+        sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
         rAttrs.Put(Svx3DFocalLengthItem(nValue2));
     }
     else
@@ -1922,7 +1922,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight1.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight1 );
+        sal_Bool bValue = GetUILightState( aBtnLight1 );
         rAttrs.Put(Svx3DLightOnOff1Item(bValue));
 
         // Licht 1 (Richtung)
@@ -1947,7 +1947,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight2.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight2 );
+        sal_Bool bValue = GetUILightState( aBtnLight2 );
         rAttrs.Put(Svx3DLightOnOff2Item(bValue));
 
         // Licht 2 (Richtung)
@@ -1971,7 +1971,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight3.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight3 );
+        sal_Bool bValue = GetUILightState( aBtnLight3 );
         rAttrs.Put(Svx3DLightOnOff3Item(bValue));
 
         // Licht 3 (Richtung)
@@ -1995,7 +1995,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight4.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight4 );
+        sal_Bool bValue = GetUILightState( aBtnLight4 );
         rAttrs.Put(Svx3DLightOnOff4Item(bValue));
 
         // Licht 4 (Richtung)
@@ -2019,7 +2019,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight5.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight5 );
+        sal_Bool bValue = GetUILightState( aBtnLight5 );
         rAttrs.Put(Svx3DLightOnOff5Item(bValue));
 
         // Licht 5 (Richtung)
@@ -2043,7 +2043,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight6.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight6 );
+        sal_Bool bValue = GetUILightState( aBtnLight6 );
         rAttrs.Put(Svx3DLightOnOff6Item(bValue));
 
         // Licht 6 (Richtung)
@@ -2067,7 +2067,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight7.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight7 );
+        sal_Bool bValue = GetUILightState( aBtnLight7 );
         rAttrs.Put(Svx3DLightOnOff7Item(bValue));
 
         // Licht 7 (Richtung)
@@ -2091,7 +2091,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight8.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight8 );
+        sal_Bool bValue = GetUILightState( aBtnLight8 );
         rAttrs.Put(Svx3DLightOnOff8Item(bValue));
 
         // Licht 8 (Richtung)
@@ -2173,7 +2173,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnTexFilter.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DTextureFilterItem(bValue));
     }
     else
@@ -2213,7 +2213,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Glanzpunkt Intensitaet
     if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
     {
-        UINT16 nValue2 = (UINT16) aMtrMatSpecularIntensity.GetValue();
+        sal_uInt16 nValue2 = (sal_uInt16) aMtrMatSpecularIntensity.GetValue();
         rAttrs.Put(Svx3DMaterialSpecularIntensityItem(nValue2));
     }
     else
@@ -2324,7 +2324,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG )
         SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
         }
@@ -2343,7 +2343,7 @@ IMPL_LINK( Svx3DWin, ClickAssignHdl, void *, EMPTYARG )
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
     if (pDispatcher != NULL)
     {
-        SfxBoolItem aItem( SID_3D_ASSIGN, TRUE );
+        SfxBoolItem aItem( SID_3D_ASSIGN, sal_True );
         pDispatcher->Execute(
             SID_3D_ASSIGN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     }
@@ -2359,7 +2359,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
     if( pBtn )
     {
         // Da das permanente Updaten der Preview zu teuer waere
-        BOOL bUpdatePreview = aBtnLight.IsChecked();
+        sal_Bool bUpdatePreview = aBtnLight.IsChecked();
 
         aBtnGeo.Check( &aBtnGeo == pBtn );
         aBtnRepresentation.Check( &aBtnRepresentation == pBtn );
@@ -2623,11 +2623,11 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
 // -----------------------------------------------------------------------
 IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
 {
-    BOOL bUpdatePreview = FALSE;
+    sal_Bool bUpdatePreview = sal_False;
 
     if( pBtn )
     {
-        USHORT nSId = 0;
+        sal_uInt16 nSId = 0;
 
         if( pBtn == &aBtnConvertTo3D )
         {
@@ -2645,7 +2645,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnNormalsObj.Check( pBtn == &aBtnNormalsObj );
             aBtnNormalsFlat.Check( pBtn == &aBtnNormalsFlat );
             aBtnNormalsSphere.Check( pBtn == &aBtnNormalsSphere );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnLight1 ||
                  pBtn == &aBtnLight2 ||
@@ -2670,51 +2670,51 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
 
                 if( pBtn != &aBtnLight1 && aBtnLight1.IsChecked() )
                 {
-                    aBtnLight1.Check( FALSE );
+                    aBtnLight1.Check( sal_False );
                     aLbLight1.Hide();
                 }
                 if( pBtn != &aBtnLight2 && aBtnLight2.IsChecked() )
                 {
-                    aBtnLight2.Check( FALSE );
+                    aBtnLight2.Check( sal_False );
                     aLbLight2.Hide();
                 }
                 if( pBtn != &aBtnLight3 && aBtnLight3.IsChecked() )
                 {
-                    aBtnLight3.Check( FALSE );
+                    aBtnLight3.Check( sal_False );
                     aLbLight3.Hide();
                 }
                 if( pBtn != &aBtnLight4 && aBtnLight4.IsChecked() )
                 {
-                    aBtnLight4.Check( FALSE );
+                    aBtnLight4.Check( sal_False );
                     aLbLight4.Hide();
                 }
                 if( pBtn != &aBtnLight5 && aBtnLight5.IsChecked() )
                 {
-                    aBtnLight5.Check( FALSE );
+                    aBtnLight5.Check( sal_False );
                     aLbLight5.Hide();
                 }
                 if( pBtn != &aBtnLight6 && aBtnLight6.IsChecked() )
                 {
-                    aBtnLight6.Check( FALSE );
+                    aBtnLight6.Check( sal_False );
                     aLbLight6.Hide();
                 }
                 if( pBtn != &aBtnLight7 && aBtnLight7.IsChecked() )
                 {
-                    aBtnLight7.Check( FALSE );
+                    aBtnLight7.Check( sal_False );
                     aLbLight7.Hide();
                 }
                 if( pBtn != &aBtnLight8 && aBtnLight8.IsChecked() )
                 {
-                    aBtnLight8.Check( FALSE );
+                    aBtnLight8.Check( sal_False );
                     aLbLight8.Hide();
                 }
             }
-            BOOL bEnable = GetUILightState( *(ImageButton*)pBtn );
+            sal_Bool bEnable = GetUILightState( *(ImageButton*)pBtn );
             aBtnLightColor.Enable( bEnable );
             pLb->Enable( bEnable );
 
             ClickLightHdl( pBtn );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Texturen
         else if( pBtn == &aBtnTexLuminance ||
@@ -2722,7 +2722,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
         {
             aBtnTexLuminance.Check( pBtn == &aBtnTexLuminance );
             aBtnTexColor.Check( pBtn == &aBtnTexColor );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexReplace ||
                  pBtn == &aBtnTexModulate )// ||
@@ -2731,7 +2731,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexReplace.Check( pBtn == &aBtnTexReplace );
             aBtnTexModulate.Check( pBtn == &aBtnTexModulate );
             //aBtnTexBlend.Check( pBtn == &aBtnTexBlend );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexParallelX ||
                  pBtn == &aBtnTexCircleX ||
@@ -2740,7 +2740,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexParallelX.Check( pBtn == &aBtnTexParallelX );
             aBtnTexCircleX.Check( pBtn == &aBtnTexCircleX );
             aBtnTexObjectX.Check( pBtn == &aBtnTexObjectX );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexParallelY ||
                  pBtn == &aBtnTexCircleY ||
@@ -2749,20 +2749,20 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexParallelY.Check( pBtn == &aBtnTexParallelY );
             aBtnTexCircleY.Check( pBtn == &aBtnTexCircleY );
             aBtnTexObjectY.Check( pBtn == &aBtnTexObjectY );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnShadow3d  )
         {
             pBtn->Check( !pBtn->IsChecked() );
             aFtSlant.Enable( pBtn->IsChecked() );
             aMtrSlant.Enable( pBtn->IsChecked() );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Sonstige (keine Gruppen)
         else if( pBtn != NULL )
         {
             pBtn->Check( !pBtn->IsChecked() );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
 
         if( nSId > 0 )
@@ -2770,12 +2770,12 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
             if (pDispatcher != NULL)
             {
-                SfxBoolItem aItem( nSId, TRUE );
+                SfxBoolItem aItem( nSId, sal_True );
                 pDispatcher->Execute(
                     nSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
             }
         }
-        else if( bUpdatePreview == TRUE )
+        else if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -2817,7 +2817,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
     if( p )
     {
         Color aColor;
-        BOOL bUpdatePreview = FALSE;
+        sal_Bool bUpdatePreview = sal_False;
 
         // Material
         if( p == &aLbMatFavorites )
@@ -2825,9 +2825,9 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
             Color aColObj( COL_WHITE );
             Color aColEmis( COL_BLACK );
             Color aColSpec( COL_WHITE );
-            USHORT nSpecIntens = 20;
+            sal_uInt16 nSpecIntens = 20;
 
-            USHORT nPos = aLbMatFavorites.GetSelectEntryPos();
+            sal_uInt16 nPos = aLbMatFavorites.GetSelectEntryPos();
             switch( nPos )
             {
                 case 1: // Metall
@@ -2880,19 +2880,19 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
             LBSelectColor( &aLbMatSpecular, aColSpec );
             aMtrMatSpecularIntensity.SetValue( nSpecIntens );
 
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbMatColor ||
                  p == &aLbMatEmission ||
                  p == &aLbMatSpecular )
         {
             aLbMatFavorites.SelectEntryPos( 0 );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Beleuchtung
         else if( p == &aLbAmbientlight )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbLight1 ||
                  p == &aLbLight2 ||
@@ -2903,12 +2903,12 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
                  p == &aLbLight7 ||
                  p == &aLbLight8 )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbShademode )
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
 
-        if( bUpdatePreview == TRUE )
+        if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -2919,27 +2919,27 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField )
 {
     if( pField )
     {
-        BOOL bUpdatePreview = FALSE;
+        sal_Bool bUpdatePreview = sal_False;
 
         // Material
         if( pField == &aMtrMatSpecularIntensity )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aNumHorizontal )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aNumVertical )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aMtrSlant )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
 
-        if( bUpdatePreview == TRUE )
+        if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -2952,7 +2952,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
 
     if( pBtn )
     {
-        USHORT nLightSource = GetLightSource( pBtn );
+        sal_uInt16 nLightSource = GetLightSource( pBtn );
         ColorLB* pLb = GetLbByButton( pBtn );
         Color aColor( pLb->GetSelectEntryColor() );
         SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes());
@@ -2982,7 +2982,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
 // -----------------------------------------------------------------------
 IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG )
 {
-    //USHORT nItemId = aCtlFavorites.GetSelectItemId();
+    //sal_uInt16 nItemId = aCtlFavorites.GetSelectItemId();
 
     //SfxItemSet* pSet = (SfxItemSet*) pFavorSetList->GetObject( nItemId - 1 );
     //Update( *pSet );
@@ -3028,45 +3028,45 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
         // Zustand: Keine Lampe selektiert
         if( aBtnLight1.IsChecked() )
         {
-            aBtnLight1.Check( FALSE );
-            aLbLight1.Enable( FALSE );
+            aBtnLight1.Check( sal_False );
+            aLbLight1.Enable( sal_False );
         }
         else if( aBtnLight2.IsChecked() )
         {
-            aBtnLight2.Check( FALSE );
-            aLbLight2.Enable( FALSE );
+            aBtnLight2.Check( sal_False );
+            aLbLight2.Enable( sal_False );
         }
         else if( aBtnLight3.IsChecked() )
         {
-            aBtnLight3.Check( FALSE );
-            aLbLight3.Enable( FALSE );
+            aBtnLight3.Check( sal_False );
+            aLbLight3.Enable( sal_False );
         }
         else if( aBtnLight4.IsChecked() )
         {
-            aBtnLight4.Check( FALSE );
-            aLbLight4.Enable( FALSE );
+            aBtnLight4.Check( sal_False );
+            aLbLight4.Enable( sal_False );
         }
         else if( aBtnLight5.IsChecked() )
         {
-            aBtnLight5.Check( FALSE );
-            aLbLight5.Enable( FALSE );
+            aBtnLight5.Check( sal_False );
+            aLbLight5.Enable( sal_False );
         }
         else if( aBtnLight6.IsChecked() )
         {
-            aBtnLight6.Check( FALSE );
-            aLbLight6.Enable( FALSE );
+            aBtnLight6.Check( sal_False );
+            aLbLight6.Enable( sal_False );
         }
         else if( aBtnLight7.IsChecked() )
         {
-            aBtnLight7.Check( FALSE );
-            aLbLight7.Enable( FALSE );
+            aBtnLight7.Check( sal_False );
+            aLbLight7.Enable( sal_False );
         }
         else if( aBtnLight8.IsChecked() )
         {
-            aBtnLight8.Check( FALSE );
-            aLbLight8.Enable( FALSE );
+            aBtnLight8.Check( sal_False );
+            aLbLight8.Enable( sal_False );
         }
-        aBtnLightColor.Enable( FALSE );
+        aBtnLightColor.Enable( sal_False );
     }
 
     return( 0L );
@@ -3074,11 +3074,11 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 // Methode um sicherzustellen, dass die LB auch mit einer Farbe gesetzt ist
-// Liefert TRUE zurueck, falls Farbe hinzugefuegt wurde
+// Liefert sal_True zurueck, falls Farbe hinzugefuegt wurde
 // -----------------------------------------------------------------------
-BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
+sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     pLb->SetNoSelection();
     pLb->SelectEntry( rColor );
@@ -3086,17 +3086,17 @@ BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
     {
         String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R));
 
-        aStr += String::CreateFromInt32((INT32)rColor.GetRed());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetRed());
         aStr += sal_Unicode(' ');
         aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G));
-        aStr += String::CreateFromInt32((INT32)rColor.GetGreen());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetGreen());
         aStr += sal_Unicode(' ');
         aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B));
-        aStr += String::CreateFromInt32((INT32)rColor.GetBlue());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetBlue());
 
-        USHORT nPos = pLb->InsertEntry( rColor, aStr );
+        sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr );
         pLb->SelectEntryPos( nPos );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return( bRet );
 }
@@ -3113,12 +3113,12 @@ void Svx3DWin::UpdatePreview()
         SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
         }
         // Flag zuruecksetzen
-        bOnly3DChanged = FALSE;
+        bOnly3DChanged = sal_False;
     }
 
     // ItemSet besorgen
@@ -3173,9 +3173,9 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc )
 }
 
 // -----------------------------------------------------------------------
-USHORT Svx3DWin::GetLightSource( const PushButton* pBtn )
+sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn )
 {
-    USHORT nLight = 8;
+    sal_uInt16 nLight = 8;
 
     if( pBtn == NULL )
     {
@@ -3270,7 +3270,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn )
 |*
 \************************************************************************/
 __EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
-                                                         USHORT nId,
+                                                         sal_uInt16 nId,
                                                          SfxBindings* pBindings,
                                                          SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
@@ -3288,7 +3288,7 @@ __EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
 |* ControllerItem fuer 3DStatus
 |*
 \************************************************************************/
-Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
+Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId,
                                 Svx3DWin* pWin,
                                 SfxBindings* _pBindings) :
     SfxControllerItem( _nId, *_pBindings ),
@@ -3297,7 +3297,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
 }
 
 // -----------------------------------------------------------------------
-void __EXPORT Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
+void __EXPORT Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/,
                         SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ )
 {
 }
@@ -3308,22 +3308,22 @@ void __EXPORT Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
 |*
 \************************************************************************/
 
-SvxConvertTo3DItem::SvxConvertTo3DItem(UINT16 _nId, SfxBindings* _pBindings)
+SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings)
 :   SfxControllerItem(_nId, *_pBindings),
-    bState(FALSE)
+    bState(sal_False)
 {
 }
 
-void SvxConvertTo3DItem::StateChanged(UINT16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
+void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
 {
-    BOOL bNewState = (eState != SFX_ITEM_DISABLED);
+    sal_Bool bNewState = (eState != SFX_ITEM_DISABLED);
     if(bNewState != bState)
     {
         bState = bNewState;
         SfxDispatcher* pDispatcher = LocalGetDispatcher(&GetBindings());
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, &aItem, 0L);
         }
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 4d88dce0fb4d..284394cc202c 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -130,7 +130,7 @@ void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dLatheObj::GetObjIdentifier() const
+sal_uInt16 E3dLatheObj::GetObjIdentifier() const
 {
     return E3D_LATHEOBJ_ID;
 }
@@ -158,7 +158,7 @@ void E3dLatheObj::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-SdrObject *E3dLatheObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -248,9 +248,9 @@ void E3dLatheObj::TakeObjNamePlural(XubString& rName) const
 |*
 \************************************************************************/
 
-BOOL E3dLatheObj::IsBreakObjPossible()
+sal_Bool E3dLatheObj::IsBreakObjPossible()
 {
-    return TRUE;
+    return sal_True;
 }
 
 SdrAttrObj* E3dLatheObj::GetBreakObj()
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index c9ceb1ef78a6..64f43790513d 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -117,7 +117,7 @@ E3dObjList::~E3dObjList()
 {
 }
 
-void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void E3dObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
 {
     // Owner holen
     DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Einfuegen 3DObject in Parent != 3DObject");
@@ -136,7 +136,7 @@ void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea
     }
 }
 
-void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
 {
     OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3DObject in non-3D Parent");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -151,7 +151,7 @@ void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason
     }
 }
 
-SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum)
+SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum)
 {
     DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus Parent != 3DObject");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -168,7 +168,7 @@ SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum)
     return pRetval;
 }
 
-SdrObject* E3dObjList::RemoveObject(ULONG nObjNum)
+SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum)
 {
     OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3DObject is removed from non-3D Parent");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -256,9 +256,9 @@ void E3dObject::SetSelected(bool bNew)
 |*
 \************************************************************************/
 
-BOOL E3dObject::IsBreakObjPossible()
+sal_Bool E3dObject::IsBreakObjPossible()
 {
-    return FALSE;
+    return sal_False;
 }
 
 SdrAttrObj* E3dObject::GetBreakObj()
@@ -294,7 +294,7 @@ void E3dObject::SetRectsDirty(sal_Bool bNotMyself)
 |*
 \************************************************************************/
 
-UINT32 E3dObject::GetObjInventor() const
+sal_uInt32 E3dObject::GetObjInventor() const
 {
     return E3dInventor;
 }
@@ -305,7 +305,7 @@ UINT32 E3dObject::GetObjInventor() const
 |*
 \************************************************************************/
 
-UINT16 E3dObject::GetObjIdentifier() const
+sal_uInt16 E3dObject::GetObjIdentifier() const
 {
     return E3D_OBJECT_ID;
 }
@@ -318,19 +318,19 @@ UINT16 E3dObject::GetObjIdentifier() const
 
 void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bResizeFreeAllowed    = TRUE;
-    rInfo.bResizePropAllowed    = TRUE;
-    rInfo.bRotateFreeAllowed    = TRUE;
-    rInfo.bRotate90Allowed      = TRUE;
-    rInfo.bMirrorFreeAllowed    = FALSE;
-    rInfo.bMirror45Allowed      = FALSE;
-    rInfo.bMirror90Allowed      = FALSE;
-    rInfo.bShearAllowed         = FALSE;
-    rInfo.bEdgeRadiusAllowed    = FALSE;
-    rInfo.bCanConvToPath        = FALSE;
+    rInfo.bResizeFreeAllowed    = sal_True;
+    rInfo.bResizePropAllowed    = sal_True;
+    rInfo.bRotateFreeAllowed    = sal_True;
+    rInfo.bRotate90Allowed      = sal_True;
+    rInfo.bMirrorFreeAllowed    = sal_False;
+    rInfo.bMirror45Allowed      = sal_False;
+    rInfo.bMirror90Allowed      = sal_False;
+    rInfo.bShearAllowed         = sal_False;
+    rInfo.bEdgeRadiusAllowed    = sal_False;
+    rInfo.bCanConvToPath        = sal_False;
 
     // no transparence for 3d objects
-    rInfo.bTransparenceAllowed = FALSE;
+    rInfo.bTransparenceAllowed = sal_False;
 
     // gradient depends on fillstyle
     // BM *** check if SetItem is NULL ***
@@ -344,10 +344,10 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     // also bei Durchdringugnen auch gegeneinander geschnitten werden
     // muessten. Auch die Texturkoorinaten waeren ein ungeloestes
     // Problem.
-    rInfo.bCanConvToPoly = FALSE;
-    rInfo.bCanConvToContour = FALSE;
-    rInfo.bCanConvToPathLineToArea = FALSE;
-    rInfo.bCanConvToPolyLineToArea = FALSE;
+    rInfo.bCanConvToPoly = sal_False;
+    rInfo.bCanConvToContour = sal_False;
+    rInfo.bCanConvToPathLineToArea = sal_False;
+    rInfo.bCanConvToPolyLineToArea = sal_False;
 }
 
 /*************************************************************************
@@ -951,7 +951,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen
     // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil
     // dafuer gibt es den
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
 
     // SendRepaintBroadcast();
     double fWinkelInRad = nWink/100 * F_PI180;
@@ -963,7 +963,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     SetRectsDirty();    // Veranlasst eine Neuberechnung aller BoundRects
     NbcRotateGluePoints(rRef,nWink,sn,cs);  // Rotiert die Klebepunkte (die haben noch Koordinaten relativ
                                             // zum Urpsung des Blattes
-    SetGlueReallyAbsolute(FALSE);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
+    SetGlueReallyAbsolute(sal_False);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
 }
 
 /*************************************************************************/
@@ -1127,7 +1127,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const
 |*
 \************************************************************************/
 
-UINT16 E3dCompoundObject::GetObjIdentifier() const
+sal_uInt16 E3dCompoundObject::GetObjIdentifier() const
 {
     return E3D_COMPOUNDOBJ_ID;
 }
@@ -1207,7 +1207,7 @@ void E3dCompoundObject::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-void E3dCompoundObject::SetCreateNormals(BOOL bNew)
+void E3dCompoundObject::SetCreateNormals(sal_Bool bNew)
 {
     if(bCreateNormals != bNew)
     {
@@ -1216,7 +1216,7 @@ void E3dCompoundObject::SetCreateNormals(BOOL bNew)
     }
 }
 
-void E3dCompoundObject::SetCreateTexture(BOOL bNew)
+void E3dCompoundObject::SetCreateTexture(sal_Bool bNew)
 {
     if(bCreateTexture != bNew)
     {
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 493e5260cd7e..be9edd9bf60f 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -44,14 +44,14 @@
 |*
 \************************************************************************/
 
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
 
 E3dObjFactory::E3dObjFactory()
 {
     if ( !bInit )
     {
         SdrObjFactory::InsertMakeObjectHdl(LINK(this, E3dObjFactory, MakeObject));
-        bInit = TRUE;
+        bInit = sal_True;
     }
 }
 
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 0ec26903d2c0..7086aace6659 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -54,7 +54,7 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact()
 E3dPolygonObj::E3dPolygonObj(
     E3dDefaultAttributes& rDefault,
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :   E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -78,7 +78,7 @@ E3dPolygonObj::E3dPolygonObj(
     E3dDefaultAttributes& rDefault,
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
     const basegfx::B3DPolyPolygon& rPolyNormals3D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :   E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -101,7 +101,7 @@ E3dPolygonObj::E3dPolygonObj(
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
     const basegfx::B3DPolyPolygon& rPolyNormals3D,
     const basegfx::B2DPolyPolygon& rPolyTexture2D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :   E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -188,7 +188,7 @@ void E3dPolygonObj::CreateDefaultTexture()
 
         // Entscheiden, welche Koordinaten als Source fuer das
         // Mapping benutzt werden sollen
-        UINT16 nSourceMode = 0;
+        sal_uInt16 nSourceMode = 0;
 
         // Groessten Freiheitsgrad ermitteln
         if(!(aNormal.getX() > aNormal.getY() && aNormal.getX() > aNormal.getZ()))
@@ -265,7 +265,7 @@ E3dPolygonObj::~E3dPolygonObj()
 |*
 \************************************************************************/
 
-UINT16 E3dPolygonObj::GetObjIdentifier() const
+sal_uInt16 E3dPolygonObj::GetObjIdentifier() const
 {
     return E3D_POLYGONOBJ_ID;
 }
@@ -318,7 +318,7 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText
 |*
 \************************************************************************/
 
-SdrObject *E3dPolygonObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -349,7 +349,7 @@ void E3dPolygonObj::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-void E3dPolygonObj::SetLineOnly(BOOL bNew)
+void E3dPolygonObj::SetLineOnly(sal_Bool bNew)
 {
     if(bNew != bLineOnly)
     {
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index 212f5ccae44a..2ee7f795afc2 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -66,7 +66,7 @@ E3dPolyScene::E3dPolyScene(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dPolyScene::GetObjIdentifier() const
+sal_uInt16 E3dPolyScene::GetObjIdentifier() const
 {
     return E3D_POLYSCENE_ID;
 }
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index f209ee93487a..7fc40f1abc60 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -329,7 +329,7 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const
 |*
 \************************************************************************/
 
-UINT16 E3dScene::GetObjIdentifier() const
+sal_uInt16 E3dScene::GetObjIdentifier() const
 {
     return E3D_SCENE_ID;
 }
@@ -751,7 +751,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen
     // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil
     // dafuer gibt es den
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
 
     // So dass war die Szene, ab jetzt kommen die Objekte in der Szene
     // 3D-Objekte gibt es nur ein einziges das kann zwar mehrere Flaechen haben aber die Flaechen
@@ -770,7 +770,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     SetRectsDirty();    // Veranlasst eine Neuberechnung aller BoundRects
     NbcRotateGluePoints(rRef,nWink,sn,cs);  // Rotiert die Klebepunkte (die haben noch Koordinaten relativ
                                             // zum Urpsung des Blattes
-    SetGlueReallyAbsolute(FALSE);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
+    SetGlueReallyAbsolute(sal_False);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
     SetRectsDirty();
 }
 
@@ -805,7 +805,7 @@ void E3dScene::RecalcSnapRect()
 |*
 \************************************************************************/
 
-BOOL E3dScene::IsBreakObjPossible()
+sal_Bool E3dScene::IsBreakObjPossible()
 {
     // Szene ist aufzubrechen, wenn alle Mitglieder aufzubrechen sind
     SdrObjListIter a3DIterator(maSubList, IM_DEEPWITHGROUPS);
@@ -815,10 +815,10 @@ BOOL E3dScene::IsBreakObjPossible()
         E3dObject* pObj = (E3dObject*) a3DIterator.Next();
         DBG_ASSERT(pObj->ISA(E3dObject), "AW: In Szenen sind nur 3D-Objekte erlaubt!");
         if(!pObj->IsBreakObjPossible())
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
@@ -831,7 +831,7 @@ basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
 
 void E3dScene::SetShadowPlaneDirection(const basegfx::B3DVector& rVec)
 {
-    UINT16 nSceneShadowSlant = (UINT16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
+    sal_uInt16 nSceneShadowSlant = (sal_uInt16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
     GetProperties().SetObjectItemDirect(Svx3DShadowSlantItem(nSceneShadowSlant));
 }
 
@@ -847,7 +847,7 @@ FASTBOOL E3dScene::BegCreate(SdrDragStat& rStat)
     aRect1.Justify();
     rStat.SetActionRect(aRect1);
     NbcSetSnapRect(aRect1);
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL E3dScene::MovCreate(SdrDragStat& rStat)
@@ -858,8 +858,8 @@ FASTBOOL E3dScene::MovCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     NbcSetSnapRect(aRect1);
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    return TRUE;
+    bSnapRectDirty=sal_True;
+    return sal_True;
 }
 
 FASTBOOL E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -874,7 +874,7 @@ FASTBOOL E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 
 FASTBOOL E3dScene::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void E3dScene::BrkCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 316c353ad7bb..2c1d4ea0480f 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -117,7 +117,7 @@ void E3dSphereObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dSphereObj::GetObjIdentifier() const
+sal_uInt16 E3dSphereObj::GetObjIdentifier() const
 {
     return E3D_SPHEREOBJ_ID;
 }
@@ -128,7 +128,7 @@ UINT16 E3dSphereObj::GetObjIdentifier() const
 |*
 \************************************************************************/
 
-SdrObject *E3dSphereObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 68ce67febc25..ef108bb902ae 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -66,7 +66,7 @@ Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal)
 :   SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal)
 {}
 
-Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
+Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal)
 {}
 
@@ -74,7 +74,7 @@ Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
 // #i28528#
 // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
 
-Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(BOOL bVal)
+Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal)
 {}
 
@@ -102,7 +102,7 @@ Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal)
 :   SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal)
 {}
 
-Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(BOOL bVal)
+Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal)
 {}
 
@@ -114,7 +114,7 @@ Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal)
 :   SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal)
 {}
 
-Svx3DShadow3DItem::Svx3DShadow3DItem(BOOL bVal)
+Svx3DShadow3DItem::Svx3DShadow3DItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal)
 {}
 
@@ -142,7 +142,7 @@ Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal)
 :   SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal)
 {}
 
-Svx3DTextureFilterItem::Svx3DTextureFilterItem(BOOL bVal)
+Svx3DTextureFilterItem::Svx3DTextureFilterItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal)
 {}
 
@@ -158,7 +158,7 @@ Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal)
 :   SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal)
 {}
 
-Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(BOOL bVal)
+Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal)
 {}
 
@@ -198,35 +198,35 @@ Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol)
 :   SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR)
 {}
 
-Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(BOOL bVal)
+Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal)
 {}
 
-Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(BOOL bVal)
+Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal)
 {}
 
-Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(BOOL bVal)
+Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal)
 {}
 
-Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(BOOL bVal)
+Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal)
 {}
 
-Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(BOOL bVal)
+Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal)
 {}
 
-Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(BOOL bVal)
+Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal)
 {}
 
-Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(BOOL bVal)
+Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal)
 {}
 
-Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(BOOL bVal)
+Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal)
 {}
 
@@ -273,7 +273,7 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(BOOL bVal)
+Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
 {}
 
@@ -298,7 +298,7 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(BOOL bVal)
+Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
 {}
 
@@ -323,7 +323,7 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCharacterModeItem::Svx3DCharacterModeItem(BOOL bVal)
+Svx3DCharacterModeItem::Svx3DCharacterModeItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
 {}
 
@@ -348,7 +348,7 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCloseFrontItem::Svx3DCloseFrontItem(BOOL bVal)
+Svx3DCloseFrontItem::Svx3DCloseFrontItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
 {}
 
@@ -373,7 +373,7 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCloseBackItem::Svx3DCloseBackItem(BOOL bVal)
+Svx3DCloseBackItem::Svx3DCloseBackItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
 {}
 
@@ -398,13 +398,13 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 
 // Svx3DNormalsKindItem: use drawing::NormalsKind
-sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::NormalsKind)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::NormalsKind eVar;
     if(!(rVal >>= eVar))
@@ -419,13 +419,13 @@ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode
-sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureProjectionMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -440,13 +440,13 @@ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode
-sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureProjectionMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -461,13 +461,13 @@ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureKindItem: use drawing::TextureKind
-sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureKind)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureKind eVar;
     if(!(rVal >>= eVar))
@@ -482,13 +482,13 @@ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureModeItem: use drawing:TextureMode
-sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureMode eVar;
     if(!(rVal >>= eVar))
@@ -503,13 +503,13 @@ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DPerspectiveItem: use drawing::ProjectionMode
-sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::ProjectionMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::ProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -524,13 +524,13 @@ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DShadeModeItem: use drawing::ShadeMode
-sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::ShadeMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::ShadeMode eVar;
     if(!(rVal >>= eVar))
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index c69abb362754..9d54fe3882e3 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -254,7 +254,7 @@ E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) :
 void E3dView::DrawMarkedObj(OutputDevice& rOut) const
 {
     // Existieren 3D-Objekte, deren Szenen nicht selektiert sind?
-    BOOL bSpecialHandling = FALSE;
+    sal_Bool bSpecialHandling = sal_False;
     E3dScene *pScene = NULL;
 
     long nCnt = GetMarkedObjectCount();
@@ -266,14 +266,14 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             // zugehoerige Szene
             pScene = ((E3dCompoundObject*)pObj)->GetScene();
             if(pScene && !IsObjMarked(pScene))
-                bSpecialHandling = TRUE;
+                bSpecialHandling = sal_True;
         }
         // Alle SelectionFlags zuruecksetzen
         if(pObj && pObj->ISA(E3dObject))
         {
             pScene = ((E3dObject*)pObj)->GetScene();
             if(pScene)
-                pScene->SetSelected(FALSE);
+                pScene->SetSelected(sal_False);
         }
     }
 
@@ -290,7 +290,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
                 // zugehoerige Szene
                 pScene = ((E3dCompoundObject*)pObj)->GetScene();
                 if(pScene)
-                    pScene->SetSelected(FALSE);
+                    pScene->SetSelected(sal_False);
             }
         }
 
@@ -304,7 +304,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             {
                 // Objekt markieren
                 E3dObject* p3DObj = (E3dObject*)pObj;
-                p3DObj->SetSelected(TRUE);
+                p3DObj->SetSelected(sal_True);
                 pScene = p3DObj->GetScene();
                 pM = GetSdrMarkByIndex(nObjs);
             }
@@ -315,9 +315,9 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             // code from parent
             SortMarkedObjects();
 
-            pScene->SetDrawOnlySelected(TRUE);
+            pScene->SetDrawOnlySelected(sal_True);
             pScene->SingleObjectPainter(rOut); // #110094#-17
-            pScene->SetDrawOnlySelected(FALSE);
+            pScene->SetDrawOnlySelected(sal_False);
         }
 
         // SelectionFlag zuruecksetzen
@@ -329,7 +329,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
                 // zugehoerige Szene
                 pScene = ((E3dCompoundObject*)pObj)->GetScene();
                 if(pScene)
-                    pScene->SetSelected(FALSE);
+                    pScene->SetSelected(sal_False);
             }
         }
     }
@@ -424,7 +424,7 @@ SdrModel* E3dView::GetMarkedObjModel() const
 
             if(pScene && !IsObjMarked(pScene) && GetSdrPageView())
             {
-                ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), FALSE, TRUE);
+                ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), sal_False, sal_True);
             }
         }
     }
@@ -473,9 +473,9 @@ SdrModel* E3dView::GetMarkedObjModel() const
 |*
 \************************************************************************/
 
-BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
-    BOOL bRetval = FALSE;
+    sal_Bool bRetval = sal_False;
 
     // Liste holen
     Point aPos(rPos);
@@ -483,7 +483,7 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U
     ImpGetPasteObjList(aPos, pDstList);
 
     if(!pDstList)
-        return FALSE;
+        return sal_False;
 
     // Owner der Liste holen
     SdrObject* pOwner = pDstList->GetOwnerObj();
@@ -526,9 +526,9 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U
 }
 
 // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
-BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/)
+sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/)
 {
-    BOOL bRetval(FALSE);
+    sal_Bool bRetval(sal_False);
 
     if(pSrcScene && pDstScene)
     {
@@ -623,7 +623,7 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
                     pNewCompoundObj->NbcSetLayer(pCompoundObj->GetLayer());
                     pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), sal_True);
                     pDstScene->Insert3DObj(pNewCompoundObj);
-                    bRetval = TRUE;
+                    bRetval = sal_True;
 
                     // Undo anlegen
                     if( GetModel()->IsUndoEnabled() )
@@ -642,11 +642,11 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
 |*
 \************************************************************************/
 
-BOOL E3dView::IsConvertTo3DObjPossible() const
+sal_Bool E3dView::IsConvertTo3DObjPossible() const
 {
-    BOOL bAny3D(FALSE);
-    BOOL bGroupSelected(FALSE);
-    BOOL bRetval(TRUE);
+    sal_Bool bAny3D(sal_False);
+    sal_Bool bGroupSelected(sal_False);
+    sal_Bool bRetval(sal_True);
 
     for(sal_uInt32 a=0;!bAny3D && a<GetMarkedObjectCount();a++)
     {
@@ -659,20 +659,20 @@ BOOL E3dView::IsConvertTo3DObjPossible() const
 
     bRetval = !bAny3D
         && (
-           IsConvertToPolyObjPossible(FALSE)
-        || IsConvertToPathObjPossible(FALSE)
+           IsConvertToPolyObjPossible(sal_False)
+        || IsConvertToPathObjPossible(sal_False)
         || IsImportMtfPossible());
     return bRetval;
 }
 
-void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
-    BOOL& rGroupSelected) const
+void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D,
+    sal_Bool& rGroupSelected) const
 {
     if(pObj)
     {
         if(pObj->ISA(E3dObject))
         {
-            rAny3D = TRUE;
+            rAny3D = sal_True;
         }
         else
         {
@@ -684,7 +684,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
                     SdrObject* pNewObj = aIter.Next();
                     ImpIsConvertTo3DPossible(pNewObj, rAny3D, rGroupSelected);
                 }
-                rGroupSelected = TRUE;
+                rGroupSelected = sal_True;
             }
         }
     }
@@ -744,7 +744,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj)
     }
 }
 
-void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
 {
     // Einzelnes PathObject, dieses umwanden
     SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj);
@@ -753,9 +753,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
     {
         E3dDefaultAttributes aDefault = Get3DDefaultAttributes();
         if(bExtrude)
-            aDefault.SetDefaultExtrudeCharacterMode(TRUE);
+            aDefault.SetDefaultExtrudeCharacterMode(sal_True);
         else
-            aDefault.SetDefaultLatheCharacterMode(TRUE);
+            aDefault.SetDefaultLatheCharacterMode(sal_True);
 
         // ItemSet des Ursprungsobjektes holen
         SfxItemSet aSet(pObj->GetMergedItemSet());
@@ -771,10 +771,10 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
             // Das SdrPathObj ist nicht gefuellt, lasse die
             // vordere und hintere Flaeche weg. Ausserdem ist
             // eine beidseitige Darstellung notwendig.
-            aDefault.SetDefaultExtrudeCloseFront(FALSE);
-            aDefault.SetDefaultExtrudeCloseBack(FALSE);
+            aDefault.SetDefaultExtrudeCloseFront(sal_False);
+            aDefault.SetDefaultExtrudeCloseBack(sal_False);
 
-            aSet.Put(Svx3DDoubleSidedItem(TRUE));
+            aSet.Put(Svx3DDoubleSidedItem(sal_True));
 
             // Fuellattribut setzen
             aSet.Put(XFillStyleItem(XFILL_SOLID));
@@ -813,7 +813,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
     }
 }
 
-void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
 {
     if(pObj)
     {
@@ -831,7 +831,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
             ImpChangeSomeAttributesFor3DConversion(pObj);
 
         // convert completely to path objects
-        SdrObject* pNewObj1 = pObj->ConvertToPolyObj(FALSE, FALSE);
+        SdrObject* pNewObj1 = pObj->ConvertToPolyObj(sal_False, sal_False);
 
         if(pNewObj1)
         {
@@ -849,7 +849,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
                 ImpChangeSomeAttributesFor3DConversion2(pNewObj1);
 
             // convert completely to path objects
-            SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, TRUE);
+            SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, sal_True);
 
             if(pNewObj2)
             {
@@ -884,7 +884,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
 |*
 \************************************************************************/
 
-void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
+void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
 {
     if(AreObjectsMarked())
     {
@@ -951,7 +951,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
 
             // SnapRect Ausdehnung mittels Spiegelung an der Rotationsachse
             // erweitern
-            for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+            for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
             {
                 SdrMark* pMark = GetSdrMarkByIndex(a);
                 SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -991,7 +991,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
 
         // Ueber die Selektion gehen und in 3D wandeln, komplett mit
         // Umwandeln in SdrPathObject, auch Schriften
-        for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+        for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
         {
             SdrMark* pMark = GetSdrMarkByIndex(a);
             SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1021,8 +1021,8 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
             // und alle alten Objekte weghauen
             SdrObject* pRepObj = GetMarkedObjectByIndex(0);
             SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0);
-            MarkObj(pRepObj, pPV, TRUE);
-            ReplaceObjectAtView(pRepObj, *pPV, pScene, FALSE);
+            MarkObj(pRepObj, pPV, sal_True);
+            ReplaceObjectAtView(pRepObj, *pPV, pScene, sal_False);
             DeleteMarked();
             MarkObj(pScene, pPV);
 
@@ -1109,7 +1109,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
         SdrObjListIter aIter(*pSubList, IM_FLAT);
         E3dDepthLayer* pBaseLayer = NULL;
         E3dDepthLayer* pLayer = NULL;
-        INT32 nNumLayers = 0;
+        sal_Int32 nNumLayers = 0;
 
         while(aIter.IsMore())
         {
@@ -1156,12 +1156,12 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
 
                                     if(aCompareColor == aLocalColor)
                                     {
-                                        bOverlap = FALSE;
+                                        bOverlap = sal_False;
                                     }
                                 }
                                 else if(eLocalFillStyle == XFILL_NONE)
                                 {
-                                    bOverlap = FALSE;
+                                    bOverlap = sal_False;
                                 }
                             }
                         }
@@ -1246,7 +1246,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
 |*
 \************************************************************************/
 
-BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
+sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
     SdrHdl* pHdl, short nMinMov,
     SdrDragMethod* pForcedMeth)
 {
@@ -1257,25 +1257,25 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
     }
     else
     {
-        BOOL bOwnActionNecessary;
+        sal_Bool bOwnActionNecessary;
         if (pHdl == NULL)
         {
-           bOwnActionNecessary = TRUE;
+           bOwnActionNecessary = sal_True;
         }
         else if (pHdl->IsVertexHdl() || pHdl->IsCornerHdl())
         {
-           bOwnActionNecessary = TRUE;
+           bOwnActionNecessary = sal_True;
         }
         else
         {
-           bOwnActionNecessary = FALSE;
+           bOwnActionNecessary = sal_False;
         }
 
         if(bOwnActionNecessary && GetMarkedObjectCount() >= 1)
         {
             E3dDragConstraint eConstraint = E3DDRAG_CONSTR_XYZ;
-            BOOL bThereAreRootScenes = FALSE;
-            BOOL bThereAre3DObjects = FALSE;
+            sal_Bool bThereAreRootScenes = sal_False;
+            sal_Bool bThereAre3DObjects = sal_False;
             long nCnt = GetMarkedObjectCount();
             for(long nObjs = 0;nObjs < nCnt;nObjs++)
             {
@@ -1283,9 +1283,9 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
                 if(pObj)
                 {
                     if(pObj->ISA(E3dScene) && ((E3dScene*)pObj)->GetScene() == pObj)
-                        bThereAreRootScenes = TRUE;
+                        bThereAreRootScenes = sal_True;
                     if(pObj->ISA(E3dObject))
-                        bThereAre3DObjects = TRUE;
+                        bThereAre3DObjects = sal_True;
                 }
             }
             if( bThereAre3DObjects )
@@ -1361,7 +1361,7 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
 |*
 \************************************************************************/
 
-BOOL E3dView::HasMarkedScene()
+sal_Bool E3dView::HasMarkedScene()
 {
     return (GetMarkedScene() != NULL);
 }
@@ -1374,9 +1374,9 @@ BOOL E3dView::HasMarkedScene()
 
 E3dScene* E3dView::GetMarkedScene()
 {
-    ULONG nCnt = GetMarkedObjectCount();
+    sal_uIntPtr nCnt = GetMarkedObjectCount();
 
-    for ( ULONG i = 0; i < nCnt; i++ )
+    for ( sal_uIntPtr i = 0; i < nCnt; i++ )
         if ( GetMarkedObjectByIndex(i)->ISA(E3dScene) )
             return (E3dScene*) GetMarkedObjectByIndex(i);
 
@@ -1422,7 +1422,7 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ)
 {
     Camera3D aCam(pScene->GetCamera());
 
-    aCam.SetAutoAdjustProjection(FALSE);
+    aCam.SetAutoAdjustProjection(sal_False);
     aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
     basegfx::B3DPoint aLookAt;
 
@@ -1586,14 +1586,14 @@ void E3dView::MovAction(const Point& rPnt)
 /*************************************************************************
 |*
 |* Schluss. Objekt und evtl. Unterobjekte ueber ImpCreate3DLathe erstellen
-|*          [FG] Mit dem Parameterwert TRUE (SDefault: FALSE) wird einfach ein
+|*          [FG] Mit dem Parameterwert sal_True (SDefault: sal_False) wird einfach ein
 |*               Rotationskoerper erzeugt, ohne den Benutzer die Lage der
 |*               Achse fetlegen zu lassen. Es reicht dieser Aufruf, falls
 |*               ein Objekt selektiert ist. (keine Initialisierung noetig)
 |*
 \************************************************************************/
 
-void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
+void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes)
 {
     ResetCreationActive();
 
@@ -1610,7 +1610,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
             basegfx::B2DPoint aPnt1(aRect.Left(), -aRect.Top());
             basegfx::B2DPoint aPnt2(aRect.Left(), -aRect.Bottom());
 
-            ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2);
+            ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
         }
         else
         {
@@ -1623,7 +1623,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
             basegfx::B2DPoint aPnt1(aMirrorRef1.X(), -aMirrorRef1.Y());
             basegfx::B2DPoint aPnt2(aMirrorRef2.X(), -aMirrorRef2.Y());
 
-            ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2);
+            ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
         }
     }
 }
@@ -1675,7 +1675,7 @@ void E3dView::InitView ()
     nVDefaultSegments        = 12;
     aDefaultLightColor       = RGB_Color(COL_WHITE);
     aDefaultAmbientColor     = RGB_Color(COL_BLACK);
-    bDoubleSided             = FALSE;
+    bDoubleSided             = sal_False;
     mpMirrorOverlay = 0L;
 }
 
@@ -1685,13 +1685,13 @@ void E3dView::InitView ()
 |*
 \************************************************************************/
 
-BOOL E3dView::IsBreak3DObjPossible() const
+sal_Bool E3dView::IsBreak3DObjPossible() const
 {
-    ULONG nCount = GetMarkedObjectCount();
+    sal_uIntPtr nCount = GetMarkedObjectCount();
 
     if (nCount > 0)
     {
-        ULONG i = 0;
+        sal_uIntPtr i = 0;
 
         while (i < nCount)
         {
@@ -1700,11 +1700,11 @@ BOOL E3dView::IsBreak3DObjPossible() const
             if (pObj && pObj->ISA(E3dObject))
             {
                 if(!(((E3dObject*)pObj)->IsBreakObjPossible()))
-                    return FALSE;
+                    return sal_False;
             }
             else
             {
-                return FALSE;
+                return sal_False;
             }
 
             i++;
@@ -1712,10 +1712,10 @@ BOOL E3dView::IsBreak3DObjPossible() const
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -1729,10 +1729,10 @@ void E3dView::Break3DObj()
     if(IsBreak3DObjPossible())
     {
         // ALLE selektierten Objekte werden gewandelt
-        UINT32 nCount = GetMarkedObjectCount();
+        sal_uInt32 nCount = GetMarkedObjectCount();
 
         BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE)));
-        for(UINT32 a=0;a<nCount;a++)
+        for(sal_uInt32 a=0;a<nCount;a++)
         {
             E3dObject* pObj = (E3dObject*)GetMarkedObjectByIndex(a);
             BreakSingle3DObj(pObj);
@@ -1775,11 +1775,11 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj)
 
 void E3dView::MergeScenes ()
 {
-    ULONG nCount = GetMarkedObjectCount();
+    sal_uIntPtr nCount = GetMarkedObjectCount();
 
     if (nCount > 0)
     {
-        ULONG     nObj    = 0;
+        sal_uIntPtr     nObj    = 0;
         SdrObject *pObj   = GetMarkedObjectByIndex(nObj);
         E3dScene  *pScene = new E3dPolyScene(Get3DDefaultAttributes());
         basegfx::B3DRange aBoundVol;
@@ -1898,29 +1898,29 @@ void E3dView::CheckPossibilities()
     // Weitere Flags bewerten
     if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible)
     {
-        INT32 nMarkCnt = GetMarkedObjectCount();
-        BOOL bCoumpound = FALSE;
-        BOOL b3DObject = FALSE;
-        for(INT32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++)
+        sal_Int32 nMarkCnt = GetMarkedObjectCount();
+        sal_Bool bCoumpound = sal_False;
+        sal_Bool b3DObject = sal_False;
+        for(sal_Int32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++)
         {
             SdrObject *pObj = GetMarkedObjectByIndex(nObjs);
             if(pObj && pObj->ISA(E3dCompoundObject))
-                bCoumpound = TRUE;
+                bCoumpound = sal_True;
             if(pObj && pObj->ISA(E3dObject))
-                b3DObject = TRUE;
+                b3DObject = sal_True;
         }
 
         // Bisher: Es sind ZWEI oder mehr beliebiger Objekte selektiert.
         // Nachsehen, ob CompoundObjects beteiligt sind. Falls ja,
         // das Gruppieren verbieten.
         if(bGroupPossible && bCoumpound)
-            bGroupPossible = FALSE;
+            bGroupPossible = sal_False;
 
         if(bUnGroupPossible && b3DObject)
-            bUnGroupPossible = FALSE;
+            bUnGroupPossible = sal_False;
 
         if(bGrpEnterPossible && bCoumpound)
-            bGrpEnterPossible = FALSE;
+            bGrpEnterPossible = sal_False;
     }
 }
 
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 121696d8ed6b..6dd4dd816450 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -58,7 +58,7 @@
 |*
 \************************************************************************/
 
-void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea)
+void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea)
 {
     SdrObject* pNewObj = NULL;
 
@@ -68,7 +68,7 @@ void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea)
 
         if (pObj && pObj->ISA(E3dPolyScene))
         {
-            BOOL bBezier = FALSE;
+            sal_Bool bBezier = sal_False;
             pNewObj = ((E3dPolyScene*) pObj)->ConvertToPolyObj(bBezier, bLineToArea);
 
             if (pNewObj)
@@ -118,7 +118,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask)
     }
 }
 
-SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) const
+SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/) const
 {
     // ItemSet mit entspr. Bereich anlegen
     SfxItemSet aSet(
@@ -137,7 +137,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) co
     else
     {
         // get attributes from all selected objects
-        MergeAttrFromMarked(aSet, FALSE);
+        MergeAttrFromMarked(aSet, sal_False);
 
         // calc flags for SID_ATTR_3D_INTERN
         const SdrMarkList& rMarkList = GetMarkedObjectList();
@@ -179,7 +179,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) co
 |*
 \************************************************************************/
 
-void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, BOOL bReplaceAll)
+void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_Bool bReplaceAll)
 {
     sal_uInt32 nSelectedItems(0L);
 
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index ce5ffd7ba90e..bbfe84fafbf2 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -185,7 +185,7 @@ void Viewport3D::MakeTransform(void)
             aViewTf *= aTemp;
         }
 
-        bTfValid = TRUE;
+        bTfValid = sal_True;
     }
 }
 
@@ -313,7 +313,7 @@ basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const
 void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP)
 {
     aVRP = rNewVRP;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -326,7 +326,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
 {
     aVPN = rNewVPN;
     aVPN.normalize();
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -338,7 +338,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
 void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV)
 {
     aVUV = rNewVUV;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -352,7 +352,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
     aPRP = rNewPRP;
     aPRP.setX(0.0);
     aPRP.setY(0.0);
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -364,7 +364,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
 void Viewport3D::SetVPD(double fNewVPD)
 {
     fVPD = fNewVPD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -376,7 +376,7 @@ void Viewport3D::SetVPD(double fNewVPD)
 void Viewport3D::SetNearClipDist(double fNewNCD)
 {
     fNearClipDist = fNewNCD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -388,7 +388,7 @@ void Viewport3D::SetNearClipDist(double fNewNCD)
 void Viewport3D::SetFarClipDist(double fNewFCD)
 {
     fFarClipDist = fNewFCD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 // eof
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 0a6e36219ed3..9b5b6eae07f4 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -391,7 +391,7 @@ namespace svx
             {
                 Any aContent = makeAny( m_aDescriptor.createPropertyValueSequence() );
                 _pContainer->CopyAny(
-                    sal::static_int_cast< USHORT >( getDescriptorFormatId() ),
+                    sal::static_int_cast< sal_uInt16 >( getDescriptorFormatId() ),
                     aContent );
             }
         }
@@ -497,7 +497,7 @@ namespace svx
     // -----------------------------------------------------------------------------
     sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor )
     {
-        ULONG nFormat = SotExchange::GetFormat(rFlavor);
+        sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor);
         switch (nFormat)
         {
             case SOT_FORMATSTR_ID_DBACCESS_TABLE:
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 618c2135652a..b974fe3ff5f3 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -988,7 +988,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
         if ( eInspectorAction != eNone )
         {
             FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
-            SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? FALSE : TRUE );
+            SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True );
 
             pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON,
                                       &aIFaceItem, &aShowItem, 0L );
@@ -1061,7 +1061,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt)
             if  ( 1 == GetSelectColumnCount() || IsDesignMode() )
             {
                 sal_uInt16 nSelId = GetColumnId(
-                    sal::static_int_cast< USHORT >( FirstSelectedColumn() ) );
+                    sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) );
                 ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) );
 
                 Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) );
@@ -1273,7 +1273,7 @@ void FmGridControl::DeleteSelectedRows()
 
         // now delete the row
         Sequence <sal_Int32> aDeletedRows;
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
         try
         {
             aDeletedRows = xDeleteThem->deleteRows(aBookmarks);
@@ -1281,7 +1281,7 @@ void FmGridControl::DeleteSelectedRows()
         catch(SQLException&)
         {
         }
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 
         // how many rows are deleted?
         sal_Int32 nDeletedRows = 0;
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 783e07c3a2ed..47aeceda995b 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2111,7 +2111,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
     Window* pGrid = GetWindow();
     if ( pGrid )
     {
-        Reference< XAccessible > xAcc( pGrid->GetAccessible( TRUE ) );
+        Reference< XAccessible > xAcc( pGrid->GetAccessible( sal_True ) );
         if ( xAcc.is() )
             xContext = xAcc->getAccessibleContext();
         // TODO: this has a slight conceptual problem:
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 33a7dde794b4..b0ee4fe13a66 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -898,7 +898,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
             {
                 sal_Int16 nWheelBehavior = MouseWheelBehavior::SCROLL_FOCUS_ONLY;
                 OSL_VERIFY( xModel->getPropertyValue( FM_PROP_MOUSE_WHEEL_BEHAVIOR ) >>= nWheelBehavior );
-                USHORT nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
+                sal_uInt16 nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
                 switch ( nWheelBehavior )
                 {
                 case MouseWheelBehavior::SCROLL_DISABLED:   nVclSetting = MOUSE_WHEEL_DISABLE; break;
@@ -913,7 +913,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
                 MouseSettings aMouseSettings = aSettings.GetMouseSettings();
                 aMouseSettings.SetWheelBehavior( nVclSetting );
                 aSettings.SetMouseSettings( aMouseSettings );
-                m_pWindow->SetSettings( aSettings, TRUE );
+                m_pWindow->SetSettings( aSettings, sal_True );
             }
         }
         catch( const Exception& )
@@ -986,7 +986,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
         m_pPainter->SetTextFillColor( _rDev.GetTextColor() );
 
         Font aFont( _rDev.GetFont() );
-        aFont.SetTransparent( TRUE );
+        aFont.SetTransparent( sal_True );
         m_pPainter->SetFont( aFont );
 
         m_pPainter->SetPosSizePixel( _rRect.TopLeft(), _rRect.GetSize() );
@@ -2274,13 +2274,13 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
         static_cast< DateField* >( m_pWindow )->SetMin( nMin );
         static_cast< DateField* >( m_pWindow )->SetMax( nMax );
         static_cast< DateField* >( m_pWindow )->SetStrictFormat( bStrict );
-        static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+        static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
 
         static_cast< DateField* >( m_pPainter )->SetExtDateFormat( (ExtDateFieldFormat)nFormat );
         static_cast< DateField* >( m_pPainter )->SetMin( nMin );
         static_cast< DateField* >( m_pPainter )->SetMax( nMax );
         static_cast< DateField* >( m_pPainter )->SetStrictFormat( bStrict );
-        static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+        static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
     }
 }
 
@@ -2384,13 +2384,13 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
         static_cast< TimeField* >( m_pWindow )->SetMin( nMin );
         static_cast< TimeField* >( m_pWindow )->SetMax( nMax );
         static_cast< TimeField* >( m_pWindow )->SetStrictFormat( bStrict );
-        static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+        static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
 
         static_cast< TimeField* >( m_pPainter )->SetExtFormat( (ExtTimeFieldFormat)nFormat );
         static_cast< TimeField* >( m_pPainter )->SetMin( nMin );
         static_cast< TimeField* >( m_pPainter )->SetMax( nMax );
         static_cast< TimeField* >( m_pPainter )->SetStrictFormat( bStrict );
-        static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+        static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
     }
 }
 
@@ -3499,7 +3499,7 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent )
 }
 
 //------------------------------------------------------------------------------
-void FmXGridCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -3908,7 +3908,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent )
 }
 
 //------------------------------------------------------------------------------
-void FmXEditCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -4066,7 +4066,7 @@ Window* FmXCheckBoxCell::getEventWindow() const
 }
 
 //------------------------------------------------------------------
-void FmXCheckBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -4403,7 +4403,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept
 }
 
 //------------------------------------------------------------------
-void FmXListBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     if  (   ( &_rWindow == m_pBox )
         &&  ( _nEventId == VCLEVENT_LISTBOX_SELECT )
@@ -4617,7 +4617,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run
 }
 
 //------------------------------------------------------------------------------
-void FmXComboBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
 
     switch ( _nEventId )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index d54b091c6bd2..38342bf355ea 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -784,7 +784,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
     {
         case STATE_CHANGE_MIRRORING:
         {
-            BOOL bIsRTLEnabled = IsRTLEnabled();
+            sal_Bool bIsRTLEnabled = IsRTLEnabled();
             for ( size_t i=0; i < sizeof( pWindows ) / sizeof( pWindows[0] ); ++i )
                 pWindows[i]->EnableRTL( bIsRTLEnabled );
         }
@@ -945,7 +945,7 @@ DbGridControl::DbGridControl(
             ,m_nDeleteEvent(0)
             ,m_nOptions(OPT_READONLY)
             ,m_nOptionMask(OPT_INSERT | OPT_UPDATE | OPT_DELETE)
-            ,m_nLastColId((USHORT)-1)
+            ,m_nLastColId((sal_uInt16)-1)
             ,m_nLastRowId(-1)
             ,m_bDesignMode(sal_False)
             ,m_bRecordCountFinal(sal_False)
@@ -2323,7 +2323,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
     if (nNewPos < 0)    // keine Position gefunden
         return;
 
-    m_bInAdjustDataSource = TRUE;
+    m_bInAdjustDataSource = sal_True;
     if (nNewPos != m_nCurrentPos)
     {
         if (m_bSynchDisplay)
@@ -2341,7 +2341,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
         SetCurrent(nNewPos);
         RowModified(nNewPos);
     }
-    m_bInAdjustDataSource = FALSE;
+    m_bInAdjustDataSource = sal_False;
 
     // Wird der DatenCursor von aussen bewegt, wird die selektion aufgehoben
     SetNoSelection();
@@ -2734,7 +2734,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode)
     }
 }
 // -----------------------------------------------------------------------------
-String DbGridControl::GetCellText(long _nRow, USHORT _nColId) const
+String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
 {
     DbGridColumn* pColumn = m_aColumns.GetObject( GetModelColumnPos( _nColId ) );
     String sRet;
@@ -3630,7 +3630,7 @@ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const
 }
 
 //------------------------------------------------------------------------------
-void DbGridControl::implAdjustInSolarThread(BOOL _bRows)
+void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows)
 {
     TRACE_RANGE("DbGridControl::implAdjustInSolarThread");
     ::osl::MutexGuard aGuard(m_aAdjustSafety);
@@ -3862,7 +3862,7 @@ Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nInde
 // -----------------------------------------------------------------------------
 Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos )
 {
-    USHORT nColumnId = GetColumnId( _nColumnPos );
+    sal_uInt16 nColumnId = GetColumnId( _nColumnPos );
     DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColumnId));
     if ( pColumn )
     {
@@ -3883,7 +3883,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s
                     eValue = STATE_DONTKNOW;
                     break;
             }
-            return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,TRUE );
+            return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,sal_True );
         }
     }
     return DbGridControl_Base::CreateAccessibleCell( _nRow, _nColumnPos );
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index f855111c0bc1..a8ab835548ac 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -36,7 +36,7 @@
 
 //------------------------------------------------------------------------------
 ::vos::OMutex Tracer::s_aMapSafety;
-::std::map< ::vos::OThread::TThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > >
+::std::map< ::vos::OThread::TThreadIdentifier, sal_Int32, ::std::less< ::vos::OThread::TThreadIdentifier > >
         Tracer::s_aThreadIndents;
 
 //------------------------------------------------------------------------------
@@ -44,13 +44,13 @@ Tracer::Tracer(const char* _pBlockDescription)
     :m_sBlockDescription(_pBlockDescription)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++;
+    sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++;
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -64,13 +64,13 @@ Tracer::Tracer(const char* _pBlockDescription)
 Tracer::~Tracer()
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -84,13 +84,13 @@ Tracer::~Tracer()
 void Tracer::TraceString(const char* _pMessage)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -105,13 +105,13 @@ void Tracer::TraceString(const char* _pMessage)
 void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index aecb4f295efa..de429ca75c57 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -265,7 +265,7 @@ namespace svxform
         return pMenu;
     }
 
-    void DataTreeListBox::ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry )
+    void DataTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
     {
         m_pXFormsPage->DoMenuAction( _nSelectedPopupEntry );
     }
@@ -281,7 +281,7 @@ namespace svxform
 
     void DataTreeListBox::DeleteAndClear()
     {
-        ULONG i, nCount = GetEntryCount();
+        sal_uIntPtr i, nCount = GetEntryCount();
         for ( i = 0; i < nCount; ++i )
         {
             SvLBoxEntry* pEntry = GetEntry(i);
@@ -411,7 +411,7 @@ namespace svxform
                     {
                         ItemNode* pNode = new ItemNode( xChild );
                         SvLBoxEntry* pEntry = m_aItemList.InsertEntry(
-                            sName, aExpImg, aCollImg, _pParent, FALSE, LIST_APPEND, pNode );
+                            sName, aExpImg, aCollImg, _pParent, sal_False, LIST_APPEND, pNode );
                         if ( xChild->hasAttributes() )
                         {
                             Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes();
@@ -427,7 +427,7 @@ namespace svxform
                                         m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails );
                                     m_aItemList.InsertEntry(
                                         sAttrName, aExpImg, aCollImg,
-                                        pEntry, FALSE, LIST_APPEND, pNode );
+                                        pEntry, sal_False, LIST_APPEND, pNode );
                                 }
                             }
                         }
@@ -443,7 +443,7 @@ namespace svxform
         }
     }
     //------------------------------------------------------------------------
-    bool XFormsPage::DoToolBoxAction( USHORT _nToolBoxID ) {
+    bool XFormsPage::DoToolBoxAction( sal_uInt16 _nToolBoxID ) {
 
         bool bHandled = false;
         bool bIsDocModified = false;
@@ -470,7 +470,7 @@ namespace svxform
                         xSubmissions->insert( makeAny( xNewSubmission ) );
                         Reference< XPropertySet > xNewPropSet( xNewSubmission, UNO_QUERY );
                         SvLBoxEntry* pEntry = AddEntry( xNewPropSet );
-                        m_aItemList.Select( pEntry, TRUE );
+                        m_aItemList.Select( pEntry, sal_True );
                         bIsDocModified = true;
                     }
                     catch ( Exception& )
@@ -486,7 +486,7 @@ namespace svxform
                 ItemNode* pNode = NULL;
                 Reference< css::xml::dom::XNode > xParentNode;
                 Reference< XPropertySet > xNewBinding;
-                USHORT nResId = 0;
+                sal_uInt16 nResId = 0;
                 bool bIsElement = true;
                 if ( DGTInstance == m_eGroup )
                 {
@@ -597,7 +597,7 @@ namespace svxform
                     {
                         SvLBoxEntry* pNewEntry = AddEntry( pNode, bIsElement );
                         m_aItemList.MakeVisible( pNewEntry );
-                        m_aItemList.Select( pNewEntry, TRUE );
+                        m_aItemList.Select( pNewEntry, sal_True );
                         bIsDocModified = true;
                     }
                     else
@@ -623,7 +623,7 @@ namespace svxform
                     if ( RET_OK == nReturn )
                     {
                         SvLBoxEntry* pNewEntry = AddEntry( xNewBinding );
-                        m_aItemList.Select( pNewEntry, TRUE );
+                        m_aItemList.Select( pNewEntry, sal_True );
                         bIsDocModified = true;
                     }
                     else
@@ -664,7 +664,7 @@ namespace svxform
 
                     AddDataItemDialog aDlg( this, pNode, m_xUIHelper );
                     DataItemType eType = DITElement;
-                    USHORT nResId = RID_STR_DATANAV_EDIT_ELEMENT;
+                    sal_uInt16 nResId = RID_STR_DATANAV_EDIT_ELEMENT;
                     if ( pNode && pNode->m_xNode.is() )
                     {
                         try
@@ -778,7 +778,7 @@ namespace svxform
         const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
             ? m_pNaviWin->GetItemHCImageList()
             : m_pNaviWin->GetItemImageList();
-        USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
+        sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
         Image aImage = rImageList.GetImage( nImageID );
         ::rtl::OUString sName;
         try
@@ -791,7 +791,7 @@ namespace svxform
             DBG_UNHANDLED_EXCEPTION();
         }
         return m_aItemList.InsertEntry(
-            sName, aImage, aImage, pParent, FALSE, LIST_APPEND, _pNewNode );
+            sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode );
     }
     //------------------------------------------------------------------------
     class lcl_ResourceString
@@ -999,7 +999,7 @@ namespace svxform
             {
                 // ID
                 _rEntry->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp;
-                pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode );
+                pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode );
                 // Action
                 _rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp;
                 String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION );
@@ -1043,7 +1043,7 @@ namespace svxform
                 _rEntry->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp;
                 sName += String( sTemp );
                 pEntry = m_aItemList.InsertEntry(
-                    sName, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode );
+                    sName, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode );
             }
             catch ( Exception& )
             {
@@ -1080,7 +1080,7 @@ namespace svxform
                 _rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp;
                 String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND );
                 sEntry += String( sTemp );
-                ULONG nPos = 0;
+                sal_uIntPtr nPos = 0;
                 SvLBoxEntry* pChild = m_aItemList.GetEntry( pEntry, nPos++ );
                 m_aItemList.SetEntryText( pChild, sEntry );
                 _rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
@@ -1131,7 +1131,7 @@ namespace svxform
                     DBG_ASSERT( pNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no XNode" );
                     css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                     bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
-                    USHORT nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
+                    sal_uInt16 nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
                     String sVar = bIsElement ? ELEMENTNAME : ATTRIBUTENAME;
                     QueryBox aQBox( this, SVX_RES( nResId ) );
                     String sMessText = aQBox.GetMessText();
@@ -1163,7 +1163,7 @@ namespace svxform
             {
                 DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" );
                 bool bSubmission = ( DGTSubmission == m_eGroup );
-                USHORT nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
+                sal_uInt16 nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
                 rtl::OUString sProperty = bSubmission ? PN_SUBMISSION_ID : PN_BINDING_ID;
                 String sSearch = bSubmission ? SUBMISSIONNAME : BINDINGNAME;
                 rtl::OUString sName;
@@ -1210,7 +1210,7 @@ namespace svxform
 
         if ( rNEvt.GetType() == EVENT_KEYINPUT )
         {
-            USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+            sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
             switch ( nCode )
             {
@@ -1234,7 +1234,7 @@ namespace svxform
         m_aItemList.SetPosSizePixel( Point( 2, 2 + aTbxSize.Height() ), aSize );
     }
     //------------------------------------------------------------------------
-    String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, USHORT _nPagePos )
+    String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, sal_uInt16 _nPagePos )
     {
         DBG_ASSERT( _xModel.is(), "XFormsPage::SetModel(): invalid model" );
 
@@ -1256,7 +1256,7 @@ namespace svxform
                     if ( xContainer.is() )
                         m_pNaviWin->AddContainerBroadcaster( xContainer );
 
-                    USHORT nIter = 0;
+                    sal_uInt16 nIter = 0;
                     Reference< XEnumerationAccess > xNumAccess( _xModel->getInstances(), UNO_QUERY );
                     if ( xNumAccess.is() )
                     {
@@ -1359,7 +1359,7 @@ namespace svxform
 
                                     ItemNode* pNode = new ItemNode( xPropSet );
                                     m_aItemList.InsertEntry(
-                                        sEntry, aImage1, aImage2, NULL, FALSE, LIST_APPEND, pNode );
+                                        sEntry, aImage1, aImage2, NULL, sal_False, LIST_APPEND, pNode );
                                 }
                             }
                         }
@@ -1436,7 +1436,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    bool XFormsPage::DoMenuAction( USHORT _nMenuID )
+    bool XFormsPage::DoMenuAction( sal_uInt16 _nMenuID )
     {
         return DoToolBoxAction( _nMenuID );
     }
@@ -1444,14 +1444,14 @@ namespace svxform
     //------------------------------------------------------------------------
     void XFormsPage::EnableMenuItems( Menu* _pMenu )
     {
-        BOOL bEnableAdd = FALSE;
-        BOOL bEnableEdit = FALSE;
-        BOOL bEnableRemove = FALSE;
+        sal_Bool bEnableAdd = sal_False;
+        sal_Bool bEnableEdit = sal_False;
+        sal_Bool bEnableRemove = sal_False;
 
         SvLBoxEntry* pEntry = m_aItemList.FirstSelected();
         if ( pEntry )
         {
-            bEnableAdd = TRUE;
+            bEnableAdd = sal_True;
             bool bSubmitChild = false;
             if ( DGTSubmission == m_eGroup && m_aItemList.GetParent( pEntry ) )
             {
@@ -1461,10 +1461,10 @@ namespace svxform
             ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
             if ( pNode && ( pNode->m_xNode.is() || pNode->m_xPropSet.is() ) )
             {
-                bEnableEdit = TRUE;
+                bEnableEdit = sal_True;
                 bEnableRemove = ( bSubmitChild != true );
                 if ( DGTInstance == m_eGroup && !m_aItemList.GetParent( pEntry ) )
-                    bEnableRemove = FALSE;
+                    bEnableRemove = sal_False;
                 if ( pNode->m_xNode.is() )
                 {
                     try
@@ -1473,7 +1473,7 @@ namespace svxform
                         if ( eChildType != css::xml::dom::NodeType_ELEMENT_NODE
                             && eChildType != css::xml::dom::NodeType_DOCUMENT_NODE )
                         {
-                            bEnableAdd = FALSE;
+                            bEnableAdd = sal_False;
                         }
                     }
                     catch ( Exception& )
@@ -1484,7 +1484,7 @@ namespace svxform
             }
         }
         else if ( m_eGroup != DGTInstance )
-            bEnableAdd = TRUE;
+            bEnableAdd = sal_True;
 
         m_aToolBox.EnableItem( TBI_ITEM_ADD, bEnableAdd );
         m_aToolBox.EnableItem( TBI_ITEM_ADD_ELEMENT, bEnableAdd );
@@ -1502,8 +1502,8 @@ namespace svxform
         }
         if ( DGTInstance == m_eGroup )
         {
-            USHORT nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
-            USHORT nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
+            sal_uInt16 nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
+            sal_uInt16 nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
             if ( pEntry )
             {
                 ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
@@ -1601,7 +1601,7 @@ namespace svxform
         pMenu->SetItemBits( MID_SHOW_DETAILS, MIB_CHECKABLE );
         pMenu->CheckItem( MID_SHOW_DETAILS, m_bShowDetails );
 
-        m_aTabCtrl.SetCurPageId( static_cast< USHORT >( nPageId ) );
+        m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nPageId ) );
         ActivatePageHdl( &m_aTabCtrl );
 
         // get our frame
@@ -1645,7 +1645,7 @@ namespace svxform
     // -----------------------------------------------------------------------
     IMPL_LINK( DataNavigatorWindow, ModelSelectHdl, ListBox *, pBox )
     {
-        USHORT nPos = m_aModelsBox.GetSelectEntryPos();
+        sal_uInt16 nPos = m_aModelsBox.GetSelectEntryPos();
         // pBox == NULL, if you want to force a new fill.
         if ( nPos != m_nLastSelectedPos || !pBox )
         {
@@ -1662,7 +1662,7 @@ namespace svxform
     {
         bool bIsDocModified = false;
         Reference< css::xforms::XFormsUIHelper1 > xUIHelper;
-        USHORT nSelectedPos = m_aModelsBox.GetSelectEntryPos();
+        sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos();
         ::rtl::OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) );
         Reference< css::xforms::XModel > xModel;
         try
@@ -1718,7 +1718,7 @@ namespace svxform
                                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ),
                                         makeAny( sal_Bool( !bDocumentData ) ) );
 
-                                    USHORT nNewPos = m_aModelsBox.InsertEntry( sNewName );
+                                    sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName );
                                     m_aModelsBox.SelectEntryPos( nNewPos );
                                     ModelSelectHdl( &m_aModelsBox );
                                     bIsDocModified = true;
@@ -1835,7 +1835,7 @@ namespace svxform
                     AddInstanceDialog aDlg( this, false );
                     if ( aDlg.Execute() == RET_OK )
                     {
-                        USHORT nInst = GetNewPageId();
+                        sal_uInt16 nInst = GetNewPageId();
                         ::rtl::OUString sName = aDlg.GetName();
                         ::rtl::OUString sURL = aDlg.GetURL();
                         bool bLinkOnce = aDlg.IsLinkInstance();
@@ -1861,7 +1861,7 @@ namespace svxform
                 }
                 case MID_INSTANCES_EDIT :
                 {
-                    USHORT nId = 0;
+                    sal_uInt16 nId = 0;
                     XFormsPage* pPage = GetCurrentPage( nId );
                     if ( pPage )
                     {
@@ -1897,7 +1897,7 @@ namespace svxform
                 }
                 case MID_INSTANCES_REMOVE :
                 {
-                    USHORT nId = 0;
+                    sal_uInt16 nId = 0;
                     XFormsPage* pPage = GetCurrentPage( nId );
                     if ( pPage )
                     {
@@ -1997,7 +1997,7 @@ namespace svxform
     // -----------------------------------------------------------------------
     IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG )
     {
-        USHORT nId = 0;
+        sal_uInt16 nId = 0;
         XFormsPage* pPage = GetCurrentPage( nId );
         if ( pPage )
         {
@@ -2015,7 +2015,7 @@ namespace svxform
         return 0;
     }
     // -----------------------------------------------------------------------
-    XFormsPage* DataNavigatorWindow::GetCurrentPage( USHORT& rCurId )
+    XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId )
     {
         rCurId = m_aTabCtrl.GetCurPageId();
         XFormsPage* pPage = NULL;
@@ -2048,7 +2048,7 @@ namespace svxform
 
         if ( rCurId > TID_INSTANCE )
         {
-            USHORT nPos = m_aTabCtrl.GetPagePos( rCurId );
+            sal_uInt16 nPos = m_aTabCtrl.GetPagePos( rCurId );
             if ( HasFirstInstancePage() && nPos > 0 )
                 nPos--;
             if ( m_aPageList.size() > nPos )
@@ -2129,8 +2129,8 @@ namespace svxform
             Reference< css::xforms::XModel > xFormsModel;
             if ( aAny >>= xFormsModel )
             {
-                USHORT nPagePos = TAB_PAGE_NOTFOUND;
-                USHORT nId = 0;
+                sal_uInt16 nPagePos = TAB_PAGE_NOTFOUND;
+                sal_uInt16 nId = 0;
                 XFormsPage* pPage = GetCurrentPage( nId );
                 DBG_ASSERT( pPage, "DataNavigatorWindow::SetPageModel(): no page" );
                 if ( nId >= TID_INSTANCE )
@@ -2243,7 +2243,7 @@ namespace svxform
             }
         }
 
-        USHORT nPageId = GetNewPageId();
+        sal_uInt16 nPageId = GetNewPageId();
         if ( sInstName.getLength() == 0 )
         {
             DBG_ERRORFILE( "DataNavigatorWindow::CreateInstancePage(): instance without name" );
@@ -2261,9 +2261,9 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    USHORT DataNavigatorWindow::GetNewPageId() const
+    sal_uInt16 DataNavigatorWindow::GetNewPageId() const
     {
-        USHORT i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
+        sal_uInt16 i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
         for ( i = 0; i < nCount; ++i )
         {
             if ( nMax < m_aTabCtrl.GetPageId(i) )
@@ -2599,7 +2599,7 @@ namespace svxform
                 sPropName = PN_READONLY_EXPR;
             else if ( &m_aCalculateCB == pBox )
                 sPropName = PN_CALCULATE_EXPR;
-            bool bIsChecked = ( pBox->IsChecked() != FALSE );
+            bool bIsChecked = ( pBox->IsChecked() != sal_False );
             m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp;
             if ( bIsChecked && sTemp.getLength() == 0 )
                 sTemp = TRUE_VALUE;
@@ -2891,19 +2891,19 @@ namespace svxform
                 {
                     if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aRequiredCB.Check( TRUE );
+                        m_aRequiredCB.Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_RELEVANT_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aRelevantCB.Check( TRUE );
+                        m_aRelevantCB.Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_CONSTRAINT_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aConstraintCB.Check( TRUE );
+                        m_aConstraintCB.Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_READONLY_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aReadonlyCB.Check( TRUE );
+                        m_aReadonlyCB.Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_CALCULATE_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aCalculateCB.Check( TRUE );
+                        m_aCalculateCB.Check( sal_True );
                 }
                 catch ( Exception& )
                 {
@@ -2973,7 +2973,7 @@ namespace svxform
                         rtl::OUString sTemp;
                         if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp )
                         {
-                            USHORT nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
+                            sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
                             if ( LISTBOX_ENTRY_NOTFOUND == nPos )
                                 nPos = m_aDataTypeLB.InsertEntry( sTemp );
                             m_aDataTypeLB.SelectEntryPos( nPos );
@@ -3208,7 +3208,7 @@ namespace svxform
     //------------------------------------------------------------------------
     IMPL_LINK( NamespaceItemDialog, SelectHdl, SvxSimpleTable *,  EMPTYARG )
     {
-        BOOL bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
+        sal_Bool bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
         m_aEditNamespaceBtn.Enable( bEnable );
         m_aDeleteNamespaceBtn.Enable( bEnable );
 
@@ -3597,7 +3597,7 @@ namespace svxform
 
                 m_xSubmission->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
                 sTemp = lcl_MethodString::get().toUI( sTemp );
-                USHORT nPos = m_aMethodLB.GetEntryPos( String( sTemp ) );
+                sal_uInt16 nPos = m_aMethodLB.GetEntryPos( String( sTemp ) );
                 if ( LISTBOX_ENTRY_NOTFOUND == nPos )
                     nPos = m_aMethodLB.InsertEntry( sTemp );
                 m_aMethodLB.SelectEntryPos( nPos );
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 3c59ac47912f..6cc874112e94 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -61,7 +61,7 @@ namespace svxform
     //--------------------------------------------------------------------
     ODbtoolsClient::ODbtoolsClient()
     {
-        m_bCreateAlready = FALSE;
+        m_bCreateAlready = sal_False;
     }
 
     //--------------------------------------------------------------------
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 3b910652a96b..d9f64d068cbb 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1268,7 +1268,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& r
     if (aText.Len() == 0)
     {
         // deleting the entry asynchron
-        ULONG nEvent;
+        sal_uLong nEvent;
         PostUserEvent(nEvent, LINK(this, FmFilterNavigator, OnRemove), pEntry);
     }
     else
@@ -1922,7 +1922,7 @@ void FmFilterNavigator::DeleteSelection()
     }
 
     // Remove the selection
-    SelectAll(FALSE);
+    SelectAll(sal_False);
 
     for (::std::vector<SvLBoxEntry*>::reverse_iterator i = aEntryList.rbegin();
         // link problems with operator ==
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 039c3361491d..dc6a141e45e9 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -286,7 +286,7 @@ void FmEntryData::Clear()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmEntryData::Clear" );
     for (;;)
     {
-        FmEntryData* pEntryData = GetChildList()->Remove(ULONG(0));
+        FmEntryData* pEntryData = GetChildList()->Remove(sal_uLong(0));
         if (pEntryData == NULL)
             break;
         delete pEntryData;
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index a10f7a40da84..3c4c3debcc82 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -199,7 +199,7 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
 |* MovePage
 |*
 \************************************************************************/
-void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos )
+void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos )
 {
 #ifndef SVX_LIGHT
     m_pImpl->bMovingPage = sal_True;
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 1c7da93dfd95..2b13f2a90bf0 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::svxform;
 
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
 
 /*************************************************************************
 |*
@@ -111,7 +111,7 @@ FmFormObjFactory::FmFormObjFactory()
         FmFormShell::RegisterInterface(0);
 
         ImplSmartRegisterUnoServices();
-        bInit = TRUE;
+        bInit = sal_True;
     }
 }
 
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 2c2999ee34ea..480bc5678eaf 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -171,7 +171,7 @@ SdrPage* FmFormPage::Clone() const
 }
 
 //------------------------------------------------------------------
-void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
+void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos,
                               const SdrInsertReason* pReason)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::InsertObject" );
@@ -270,7 +270,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
 }
 
 //------------------------------------------------------------------
-SdrObject* FmFormPage::RemoveObject(ULONG nObjNum)
+SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RemoveObject" );
     SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index e767f7c0b112..112b47b1107e 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -868,7 +868,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
             rReq.Done();
 
             // initially open the filter navigator, the whole form based filter is pretty useless without it
-            SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, TRUE );
+            SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, sal_True );
             GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON,
                 &aIdentifierItem, NULL );
         }   break;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 7a705dfa4aa5..2ff40610fa77 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1030,7 +1030,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
     if (m_nLockSlotInvalidation)
     {
         m_arrInvalidSlots.Insert(nId, m_arrInvalidSlots.Count());
-        BYTE nFlags = ( bWithId ? 0x01 : 0 );
+        sal_uInt8 nFlags = ( bWithId ? 0x01 : 0 );
         m_arrInvalidSlots_Flags.push_back(nFlags);
     }
     else
@@ -1070,7 +1070,7 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG)
 
     DBG_ASSERT(m_arrInvalidSlots.Count() == m_arrInvalidSlots_Flags.size(),
         "FmXFormShell::OnInvalidateSlots : inconsistent slot arrays !");
-    BYTE nFlags;
+    sal_uInt8 nFlags;
     for (sal_Int16 i=0; i<m_arrInvalidSlots.Count(); ++i)
     {
         nFlags = m_arrInvalidSlots_Flags[i];
@@ -1111,7 +1111,7 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
 PopupMenu* FmXFormShell::GetConversionMenu()
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    BOOL bIsHiContrastMode  = rSettings.GetHighContrastMode();
+    sal_Bool bIsHiContrastMode  = rSettings.GetHighContrastMode();
 
     PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU ));
 
@@ -4226,10 +4226,10 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
             // We can't simply re-insert the item because we have a clear order for all the our items.
             // So first we have to determine the position of the item to insert.
             PopupMenu* pSource = FmXFormShell::GetConversionMenu();
-            USHORT nSourcePos = pSource->GetItemPos(nSID);
+            sal_uInt16 nSourcePos = pSource->GetItemPos(nSID);
             DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND, "ControlConversionMenuController::StateChanged : FmXFormShell supplied an invalid menu !");
-            USHORT nPrevInSource = nSourcePos;
-            USHORT nPrevInConversion = MENU_ITEM_NOTFOUND;
+            sal_uInt16 nPrevInSource = nSourcePos;
+            sal_uInt16 nPrevInConversion = MENU_ITEM_NOTFOUND;
             while (nPrevInSource>0)
             {
                 sal_Int16 nPrevId = pSource->GetItemId(--nPrevInSource);
@@ -4241,7 +4241,7 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
             }
             if (MENU_ITEM_NOTFOUND == nPrevInConversion)
                 // none of the items which precede the nSID-slot in the source menu are present in our conversion menu
-                nPrevInConversion = sal::static_int_cast< USHORT >(-1); // put the item at the first position
+                nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position
             m_pConversionMenu->InsertItem(nSID, pSource->GetItemText(nSID), pSource->GetItemBits(nSID), ++nPrevInConversion);
             m_pConversionMenu->SetItemImage(nSID, pSource->GetItemImage(nSID));
             m_pConversionMenu->SetHelpId(nSID, pSource->GetHelpId(nSID));
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index d758b5622e0b..9be7d4881f61 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -76,7 +76,7 @@ namespace svx
     }
 
     //--------------------------------------------------------------------
-    void TextControlCharAttribDialog::PageCreated( USHORT _nId, SfxTabPage& _rPage )
+    void TextControlCharAttribDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage )
     {
         SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 19ca20dd7983..e2b959d013eb 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -94,7 +94,7 @@ namespace svx
     using namespace ::com::sun::star::container;
 
     //====================================================================
-    typedef USHORT WhichId;
+    typedef sal_uInt16 WhichId;
 
     //====================================================================
     static SfxSlotId pTextControlSlots[] =
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index ed0d57b96f97..eee61c5c2dee 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -180,8 +180,8 @@ private:
 //------------------------------------------------------------------------------
 struct PropertyInfo
 {
-    BOOL    bIsTransientOrReadOnly  : 1;    // the property is transient or read-only, thus we need no undo action for it
-    BOOL    bIsValueProperty        : 1;    // the property is the special value property, thus it may be handled
+    sal_Bool    bIsTransientOrReadOnly  : 1;    // the property is transient or read-only, thus we need no undo action for it
+    sal_Bool    bIsValueProperty        : 1;    // the property is the special value property, thus it may be handled
                                             // as if it's transient or persistent
 };
 
@@ -190,11 +190,11 @@ struct PropertySetInfo
     DECLARE_STL_USTRINGACCESS_MAP(PropertyInfo, AllProperties);
 
     AllProperties   aProps;                 // all properties of this set which we know so far
-    BOOL            bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
+    sal_Bool            bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
                                             // sal_False -> the set has _no_ such property or it's value isn't empty
 };
 
-BOOL operator < (const Reference< XPropertySet >& lhs,
+sal_Bool operator < (const Reference< XPropertySet >& lhs,
                  const Reference< XPropertySet >& rhs)
 {
     return lhs.get() < rhs.get();
@@ -671,7 +671,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
             PropertyInfo aNewEntry;
 
             // the attributes
-            INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes;
+            sal_Int32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes;
             aNewEntry.bIsTransientOrReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0);
 
             // check if it is the special "DataFieldProperty"
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 1147e71b0731..3ab15471e4fd 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -186,7 +186,7 @@ void FmFormView::MarkListHasChanged()
                 pImpl->m_xWindow->removeFocusListener(pImpl);
                 pImpl->m_xWindow = NULL;
             }
-            SetMoveOutside(FALSE);
+            SetMoveOutside(sal_False);
             //OLMRefreshAllIAOManagers();
         }
 
@@ -503,9 +503,9 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor
 }
 
 // -----------------------------------------------------------------------------
-BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     const KeyCode& rKeyCode = rKEvt.GetKeyCode();
     if  (   IsDesignMode()
         &&  rKeyCode.GetCode() == KEY_RETURN
@@ -528,10 +528,10 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
                     pImpl->m_xWindow = xWindow;
                     // add as listener to get notified when ESC will be pressed inside the grid
                     pImpl->m_xWindow->addFocusListener(pImpl);
-                    SetMoveOutside(TRUE);
+                    SetMoveOutside(sal_True);
                     //OLMRefreshAllIAOManagers();
                     xWindow->setFocus();
-                    bDone = TRUE;
+                    bDone = sal_True;
                 }
             }
         }
@@ -564,9 +564,9 @@ sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
 }
 
 // -----------------------------------------------------------------------------
-BOOL FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
+sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
 {
-    BOOL bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
+    sal_Bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
 
     if ( pFormShell && pFormShell->GetImpl() )
     {
@@ -603,7 +603,7 @@ FmFormObj* FmFormView::getMarkedGrid() const
 // -----------------------------------------------------------------------------
 void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
     const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
-    sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
+    sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
     SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl )
 {
     FmXFormView::createControlLabelPair(
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8e0f6b2a261a..d2b6d6cbded4 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -768,7 +768,7 @@ void FmXFormView::Activate(sal_Bool bSync)
 }
 
 //------------------------------------------------------------------------------
-void FmXFormView::Deactivate(BOOL bDeactivateController)
+void FmXFormView::Deactivate(sal_Bool bDeactivateController)
 {
     if (m_nActivationEvent)
     {
@@ -1518,7 +1518,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
 bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& _rContext,
     OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField,
     const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID,
-    const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
+    const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
     SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl)
 {
     sal_Int32 nDataType = 0;
@@ -1690,8 +1690,8 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
     // muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen
     // (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen)
 
-    ULONG nCount = m_aMark.GetMarkCount();
-    for (ULONG i = 0; i < nCount; ++i)
+    sal_uIntPtr nCount = m_aMark.GetMarkCount();
+    for (sal_uIntPtr i = 0; i < nCount; ++i)
     {
         SdrMark* pMark = m_aMark.GetMark(i);
         SdrObject* pCurrent = pMark->GetMarkedSdrObj();
@@ -1740,8 +1740,8 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
         m_aMark = m_pView->GetMarkedObjectList();
         if ( _bSmartUnmark )
         {
-            ULONG nCount = m_aMark.GetMarkCount( );
-            for ( ULONG i = 0; i < nCount; ++i )
+            sal_uIntPtr nCount = m_aMark.GetMarkCount( );
+            for ( sal_uIntPtr i = 0; i < nCount; ++i )
             {
                 SdrMark*   pMark = m_aMark.GetMark(i);
                 SdrObject* pObj  = pMark->GetMarkedSdrObj();
@@ -1807,15 +1807,15 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
             sal_Bool bMisMatch = sal_False;
 
             // loop through all current marks
-            ULONG nCurrentCount = rCurrentList.GetMarkCount();
-            for ( ULONG i=0; i<nCurrentCount&& !bMisMatch; ++i )
+            sal_uIntPtr nCurrentCount = rCurrentList.GetMarkCount();
+            for ( sal_uIntPtr i=0; i<nCurrentCount&& !bMisMatch; ++i )
             {
                 const SdrObject* pCurrentMarked = rCurrentList.GetMark( i )->GetMarkedSdrObj();
 
                 // loop through all saved marks, check for equality
                 sal_Bool bFound = sal_False;
-                ULONG nSavedCount = m_aMark.GetMarkCount();
-                for ( ULONG j=0; j<nSavedCount && !bFound; ++j )
+                sal_uIntPtr nSavedCount = m_aMark.GetMarkCount();
+                for ( sal_uIntPtr j=0; j<nSavedCount && !bFound; ++j )
                 {
                     if ( m_aMark.GetMark( j )->GetMarkedSdrObj() == pCurrentMarked )
                         bFound = sal_True;
@@ -1840,8 +1840,8 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
         sal_Bool bFound = sal_True;
 
         // gibt es noch alle Objecte
-        ULONG nCount = m_aMark.GetMarkCount();
-        for (ULONG i = 0; i < nCount && bFound; i++)
+        sal_uIntPtr nCount = m_aMark.GetMarkCount();
+        for (sal_uIntPtr i = 0; i < nCount && bFound; i++)
         {
             SdrMark*   pMark = m_aMark.GetMark(i);
             SdrObject* pObj  = pMark->GetMarkedSdrObj();
@@ -1862,7 +1862,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
             // Das LastObject auswerten
             if (nCount) // Objecte jetzt Markieren
             {
-                for (ULONG i = 0; i < nCount; i++)
+                for (sal_uIntPtr i = 0; i < nCount; i++)
                 {
                     SdrMark* pMark = m_aMark.GetMark(i);
                     SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1882,7 +1882,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime
 {
     if ( m_xWindow.is() && m_pView )
     {
-        m_pView->SetMoveOutside( TRUE, FmFormView::ImplAccess() );
+        m_pView->SetMoveOutside( sal_True, FmFormView::ImplAccess() );
     }
 }
 // -----------------------------------------------------------------------------
@@ -1892,7 +1892,7 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx
     // so we can not remove us as focus listener
     if ( m_xWindow.is() && m_pView )
     {
-        m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() );
+        m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
     }
 }
 // -----------------------------------------------------------------------------
@@ -1903,7 +1903,7 @@ void FmXFormView::removeGridWindowListening()
         m_xWindow->removeFocusListener(this);
         if ( m_pView )
         {
-            m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() );
+            m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
         }
         m_xWindow = NULL;
     }
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index b98e63fb2bd1..739e9788c64b 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -60,7 +60,7 @@ namespace svxform
     }
 
     //--------------------------------------------------------------------
-    void FormToolboxes::toggleToolbox( USHORT _nSlotId ) const
+    void FormToolboxes::toggleToolbox( sal_uInt16 _nSlotId ) const
     {
         try
         {
@@ -88,14 +88,14 @@ namespace svxform
     }
 
     //--------------------------------------------------------------------
-    bool FormToolboxes::isToolboxVisible( USHORT _nSlotId ) const
+    bool FormToolboxes::isToolboxVisible( sal_uInt16 _nSlotId ) const
     {
         return m_xLayouter.is() && m_xLayouter->isElementVisible(
             getToolboxResourceName( _nSlotId ) );
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString FormToolboxes::getToolboxResourceName( USHORT _nSlotId ) const
+    ::rtl::OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const
     {
         OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ),
             "FormToolboxes::getToolboxResourceName: unsupported slot!" );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 78bbc7a533d9..362b4bba0faf 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -714,7 +714,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, ULONG nRelPos )
+    SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos )
     {
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Insert" );
         //////////////////////////////////////////////////////////////////////
@@ -782,7 +782,7 @@ namespace svxform
 
         // beim eigentlichen Entfernen kann die Selection geaendert werden, da ich aber das SelectionHandling abgeschaltet
         // habe, muss ich mich hinterher darum kuemmern
-        ULONG nExpectedSelectionCount = GetSelectionCount();
+        sal_uIntPtr nExpectedSelectionCount = GetSelectionCount();
 
         if( pEntry )
             GetModel()->Remove( pEntry );
@@ -1760,7 +1760,7 @@ namespace svxform
                     // erstmal die PropertySet-Interfaces der Forms einsammeln
                     for ( sal_Int32 i = 0; i < m_nFormsSelected; ++i )
                     {
-                        FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
+                        FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData();
                         aSelection.insert( pFormData->GetPropertySet().get() );
                     }
                 }
@@ -1770,7 +1770,7 @@ namespace svxform
                     {   // ein MultiSet fuer die Properties der hidden controls
                         for ( sal_Int32 i = 0; i < m_nHiddenControls; ++i )
                         {
-                            FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
+                            FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData();
                             aSelection.insert( pEntryData->GetPropertySet().get() );
                         }
                     }
@@ -1802,7 +1802,7 @@ namespace svxform
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::DeleteSelection" );
         // die Root darf ich natuerlich nicht mitloeschen
         sal_Bool bRootSelected = IsSelected(m_pRootEntry);
-        ULONG nSelectedEntries = GetSelectionCount();
+        sal_uIntPtr nSelectedEntries = GetSelectionCount();
         if (bRootSelected && (nSelectedEntries > 1))     // die Root plus andere Elemente ?
             Select(m_pRootEntry, sal_False);                // ja -> die Root raus
 
@@ -1843,7 +1843,7 @@ namespace svxform
         // then go on to the strucure. This means I have to delete the forms *after* the normal controls, so
         // that during UNDO, they're restored in the proper order.
         pFormShell->GetImpl()->EnableTrackProperties(sal_False);
-        USHORT i;
+        sal_uInt16 i;
         for (i = m_arrCurrentSelection.Count(); i>0; --i)
         {
             FmEntryData* pCurrent = (FmEntryData*)(m_arrCurrentSelection.GetObject(i - 1)->GetUserData());
@@ -2103,7 +2103,7 @@ namespace svxform
 
         for (sal_uInt32 i=0; i<m_arrCurrentSelection.Count(); ++i)
         {
-            SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((USHORT)i);
+            SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((sal_uInt16)i);
             // Bei Formselektion alle Controls dieser Form markieren
             if (IsFormEntry(pSelectionLoop) && (pSelectionLoop != m_pRootEntry))
                 MarkViewObj((FmFormData*)pSelectionLoop->GetUserData(), sal_True, sal_False);
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 2065295006e9..bd788b731280 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -298,7 +298,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    void NavigatorTreeModel::Insert(FmEntryData* pEntry, ULONG nRelPos, sal_Bool bAlterModel)
+    void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel)
     {
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Insert" );
         if (IsListening(*m_pFormModel))
@@ -872,7 +872,7 @@ namespace svxform
         FmNavRequestSelectHint rshRequestSelection;
         sal_Bool bIsMixedSelection = sal_False;
 
-        for (ULONG i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++)
+        for (sal_uLong i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++)
         {
             SdrObject* pobjCurrent = mlMarked.GetMark(i)->GetMarkedSdrObj();
             bIsMixedSelection |= !InsertFormComponent(rshRequestSelection, pobjCurrent);
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index eb799e2b2927..06f8814a9721 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -50,7 +50,7 @@ namespace svx
     StringListResource::StringListResource( const ResId& _rResId )
         :Resource( _rResId )
     {
-        USHORT nLocalID = 1;
+        sal_uInt16 nLocalID = 1;
         ResId aLocalID( nLocalID, *_rResId.GetResMgr() );
         while ( IsAvailableRes( aLocalID.SetRT( RSC_STRING ) ) )
         {
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 37c102cb1954..d8bff05bf599 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -126,9 +126,9 @@ void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::X
         if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
             xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
         if ( sLabel.getLength() )
-            _rListBox.InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+            _rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
         else
-            _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+            _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
     }
 }
 //==================================================================
@@ -165,7 +165,7 @@ sal_Int8 FmFieldWinListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
 }
 
 //------------------------------------------------------------------------------
-BOOL FmFieldWinListBox::DoubleClickHdl()
+sal_Bool FmFieldWinListBox::DoubleClickHdl()
 {
     if ( pTabWin->createSelectionControls() )
         return sal_True;
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index fb13eddd15f0..0bad14631355 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -81,7 +81,7 @@ SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pControlle
     SetSizePixel( Size(70,19) );
 
     SetDecimalDigits(0);
-    SetStrictFormat(TRUE);
+    SetStrictFormat(sal_True);
 }
 
 // -----------------------------------------------------------------------
@@ -101,7 +101,7 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
             return;
         }
 
-        SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<INT32>(nRecord) );
+        SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<sal_Int32>(nRecord) );
 
         Any a;
         Sequence< PropertyValue > aArgs( 1 );
@@ -137,7 +137,7 @@ void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent )
 
 struct MapSlotToCmd
 {
-    USHORT      nSlotId;
+    sal_uInt16      nSlotId;
     const char* pCommand;
 };
 
@@ -170,7 +170,7 @@ static MapSlotToCmd SlotToCommands[] =
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlConfig, SfxUInt16Item );
 
 //-----------------------------------------------------------------------
-SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     : SfxToolBoxControl( nSlotId, nId, rTbx )
     ,nLastSlot( 0 )
 {
@@ -178,11 +178,11 @@ SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx
 }
 
 //-----------------------------------------------------------------------
-void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if (nSID == SID_FM_CONFIG)
     {
-        UINT16 nSlot   = 0;
+        sal_uInt16 nSlot   = 0;
         if (eState >= SFX_ITEM_AVAILABLE)
             nSlot = ((SfxUInt16Item*)pState)->GetValue();
 
@@ -245,13 +245,13 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow()
 }
 
 //-----------------------------------------------------------------------
-void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ )
+void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
 {
     //////////////////////////////////////////////////////////////////////
     // Click auf den Button SID_FM_CONFIG in der ObjectBar
     if ( nLastSlot )
     {
-        USHORT n = 0;
+        sal_uInt16 n = 0;
         while( SlotToCommands[n].nSlotId > 0 )
         {
             if ( SlotToCommands[n].nSlotId == nLastSlot )
@@ -276,7 +276,7 @@ void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ )
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item );
 DBG_NAME(SvxFmTbxCtlAbsRec);
 //-----------------------------------------------------------------------
-SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlAbsRec,NULL);
@@ -289,9 +289,9 @@ SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec()
 }
 
 //-----------------------------------------------------------------------
-void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
-    USHORT              nId = GetId();
+    sal_uInt16              nId = GetId();
     ToolBox*            pToolBox = &GetToolBox();
     SvxFmAbsRecWin*     pWin = (SvxFmAbsRecWin*)( pToolBox->GetItemWindow(nId) );
 
@@ -304,7 +304,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf
         pWin->SetValue( pItem ? pItem->GetValue() : -1 );
     }
 
-    BOOL bEnable = SFX_ITEM_DISABLED != eState && pState;
+    sal_Bool bEnable = SFX_ITEM_DISABLED != eState && pState;
     if (!bEnable)
         pWin->SetText(String());
 
@@ -330,7 +330,7 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem );
 DBG_NAME(SvxFmTbxCtlRecText);
 //-----------------------------------------------------------------------
-SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlRecText,NULL);
@@ -364,7 +364,7 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem );
 DBG_NAME(SvxFmTbxCtlRecFromText);
 //-----------------------------------------------------------------------
-SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlRecFromText,NULL);
@@ -397,7 +397,7 @@ DBG_NAME(SvxFmTbxCtlRecTotal);
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem );
 
 //-----------------------------------------------------------------------
-SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
     ,pFixedText( NULL )
 {
@@ -419,12 +419,12 @@ Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent )
     aSize.Width() += 12;
     pFixedText->SetSizePixel( aSize );
     pFixedText->SetBackground();
-    pFixedText->SetPaintTransparent(TRUE);
+    pFixedText->SetPaintTransparent(sal_True);
     return pFixedText;
 }
 
 //-----------------------------------------------------------------------
-void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     //////////////////////////////////////////////////////////////////////
     // Setzen des FixedTextes
@@ -450,7 +450,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem );
 
 //-----------------------------------------------------------------------
-SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT);
@@ -459,7 +459,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
     MouseSettings aMouseSettings = aSettings.GetMouseSettings();
     aMouseSettings.SetButtonRepeat(aMouseSettings.GetButtonRepeat() / 4);
     aSettings.SetMouseSettings(aMouseSettings);
-    rTbx.SetSettings(aSettings, TRUE);
+    rTbx.SetSettings(aSettings, sal_True);
 }
 
 //========================================================================
@@ -468,7 +468,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem );
 
 //-----------------------------------------------------------------------
-SvxFmTbxPrevRec::SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxPrevRec::SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT);
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 7249df9c121f..3306e7896c5d 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -49,23 +49,23 @@ GalleryCodec::~GalleryCodec()
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryCodec::IsCoded( SvStream& rStm, UINT32& rVersion )
+sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
 {
-    const ULONG nPos = rStm.Tell();
-    BOOL        bRet;
-    BYTE        cByte1, cByte2, cByte3, cByte4, cByte5, cByte6;
+    const sal_uIntPtr   nPos = rStm.Tell();
+    sal_Bool        bRet;
+    sal_uInt8       cByte1, cByte2, cByte3, cByte4, cByte5, cByte6;
 
     rStm >> cByte1 >> cByte2 >> cByte3 >> cByte4 >> cByte5 >> cByte6;
 
     if ( cByte1 == 'S' && cByte2 == 'V' && cByte3 == 'R' && cByte4 == 'L' && cByte5 == 'E' && ( cByte6 == '1' || cByte6 == '2' ) )
     {
         rVersion = ( ( cByte6 == '1' ) ? 1 : 2 );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     else
     {
         rVersion = 0;
-        bRet = FALSE;
+        bRet = sal_False;
     }
 
     rStm.Seek( nPos );
@@ -77,10 +77,10 @@ BOOL GalleryCodec::IsCoded( SvStream& rStm, UINT32& rVersion )
 
 void GalleryCodec::Write( SvStream& rStmToWrite )
 {
-    UINT32 nPos, nCompSize;
+    sal_uInt32 nPos, nCompSize;
 
     rStmToWrite.Seek( STREAM_SEEK_TO_END );
-    const UINT32 nSize = rStmToWrite.Tell();
+    const sal_uInt32 nSize = rStmToWrite.Tell();
     rStmToWrite.Seek( 0UL );
 
     rStm << 'S' << 'V' << 'R' << 'L' << 'E' << '2';
@@ -104,11 +104,11 @@ void GalleryCodec::Write( SvStream& rStmToWrite )
 
 void GalleryCodec::Read( SvStream& rStmToRead )
 {
-    UINT32 nVersion = 0;
+    sal_uInt32 nVersion = 0;
 
     if( IsCoded( rStm, nVersion ) )
     {
-        UINT32  nCompressedSize, nUnCompressedSize;
+        sal_uInt32  nCompressedSize, nUnCompressedSize;
 
         rStm.SeekRel( 6 );
         rStm >> nUnCompressedSize >> nCompressedSize;
@@ -116,13 +116,13 @@ void GalleryCodec::Read( SvStream& rStmToRead )
         // decompress
         if( 1 == nVersion )
         {
-            BYTE*   pCompressedBuffer = new BYTE[ nCompressedSize ]; rStm.Read( pCompressedBuffer, nCompressedSize );
-            BYTE*   pInBuf = pCompressedBuffer;
-            BYTE*   pOutBuf = new BYTE[ nUnCompressedSize ];
-            BYTE*   pTmpBuf = pOutBuf;
-            BYTE*   pLast = pOutBuf + nUnCompressedSize - 1;
-            ULONG   nIndex = 0UL, nCountByte, nRunByte;
-            BOOL    bEndDecoding = FALSE;
+            sal_uInt8*   pCompressedBuffer = new sal_uInt8[ nCompressedSize ]; rStm.Read( pCompressedBuffer, nCompressedSize );
+            sal_uInt8*  pInBuf = pCompressedBuffer;
+            sal_uInt8*  pOutBuf = new sal_uInt8[ nUnCompressedSize ];
+            sal_uInt8*  pTmpBuf = pOutBuf;
+            sal_uInt8*  pLast = pOutBuf + nUnCompressedSize - 1;
+            sal_uIntPtr   nIndex = 0UL, nCountByte, nRunByte;
+            sal_Bool    bEndDecoding = sal_False;
 
             do
             {
@@ -144,11 +144,11 @@ void GalleryCodec::Read( SvStream& rStmToRead )
                             pInBuf++;
                     }
                     else if ( nRunByte == 1 )   // Ende des Bildes
-                        bEndDecoding = TRUE;
+                        bEndDecoding = sal_True;
                 }
                 else
                 {
-                    const BYTE cVal = *pInBuf++;
+                    const sal_uInt8 cVal = *pInBuf++;
 
                     memset( &pTmpBuf[ nIndex ], cVal, nCountByte );
                     nIndex += nCountByte;
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index 7a13cad3fd46..ca7ee5d3adbf 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -47,5 +47,5 @@ public:
     void        Write( SvStream& rStmToWrite );
     void        Read( SvStream& rStmToRead );
 
-    static BOOL IsCoded( SvStream& rStm, UINT32& rVersion );
+    static sal_Bool IsCoded( SvStream& rStm, sal_uInt32& rVersion );
 };
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index b972dccd9ab7..5d4e4297f0a4 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -81,7 +81,7 @@ void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt )
 // - SvxGalleryChildWindow -
 // -------------------------
 
-GalleryChildWindow::GalleryChildWindow( Window* _pParent, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
+GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
 {
     pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RESID( RID_SVXDLG_GALLERYBROWSER ) );
@@ -116,11 +116,11 @@ GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW,
     SetMinOutputSizePixel( maLastSize = GetOutputSizePixel() );
 
     mpBrowser1->SelectTheme( 0 );
-    mpBrowser1->Show( TRUE );
-    mpBrowser2->Show( TRUE );
+    mpBrowser1->Show( sal_True );
+    mpBrowser2->Show( sal_True );
 
     mpSplitter->SetSplitHdl( LINK( this, GalleryBrowser, SplitHdl ) );
-    mpSplitter->Show( TRUE );
+    mpSplitter->Show( sal_True );
 
     InitSettings();
 }
@@ -182,17 +182,17 @@ void GalleryBrowser::Resize()
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
+sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
 {
-    const USHORT    nCode = rKEvt.GetKeyCode().GetCode();
-    BOOL            bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
+    const sal_uInt16    nCode = rKEvt.GetKeyCode().GetCode();
+    sal_Bool            bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
                            ( ( KEY_TAB == nCode ) || ( KEY_F6 == nCode && rKEvt.GetKeyCode().IsMod2() ) ) );
 
     if( bRet )
     {
         if( !rKEvt.GetKeyCode().IsShift() )
         {
-            if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) )
+            if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) )
                 mpBrowser2->GetViewWindow()->GrabFocus();
             else if( mpBrowser2->GetViewWindow()->HasFocus() )
                 mpBrowser2->maViewBox.GrabFocus();
@@ -203,7 +203,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
         }
         else
         {
-            if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) )
+            if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) )
                 mpBrowser1->maNewTheme.GrabFocus();
             else if( mpBrowser1->maNewTheme.HasFocus() )
                 mpBrowser2->maViewBox.GrabFocus();
@@ -219,7 +219,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser::Close()
+sal_Bool GalleryBrowser::Close()
 {
     return SfxDockingWindow::Close();
 }
@@ -262,14 +262,14 @@ Graphic GalleryBrowser::GetGraphic() const
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const
 {
     return mpBrowser2->GetVCDrawModel( rModel );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser::IsLinkage() const
+sal_Bool GalleryBrowser::IsLinkage() const
 {
     return mpBrowser2->IsLinkage();
 }
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 04f402804b0c..dfa4eaad4a9d 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -163,12 +163,12 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
     mpThemes->SetHelpId( HID_GALLERY_THEMELIST );
     mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) );
 
-    for( ULONG i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ )
+    for( sal_uIntPtr i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ )
         ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) );
 
     ImplAdjustControls();
-    maNewTheme.Show( TRUE );
-    mpThemes->Show( TRUE );
+    maNewTheme.Show( sal_True );
+    mpThemes->Show( sal_True );
 }
 
 // -----------------------------------------------------------------------------
@@ -184,11 +184,11 @@ GalleryBrowser1::~GalleryBrowser1()
 
 // -----------------------------------------------------------------------------
 
-ULONG GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
+sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
 {
-    static const BOOL bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
+    static const sal_Bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
 
-    ULONG nRet = LISTBOX_ENTRY_NOTFOUND;
+    sal_uIntPtr nRet = LISTBOX_ENTRY_NOTFOUND;
 
     if( pEntry && ( !pEntry->IsHidden() || bShowHiddenThemes ) )
     {
@@ -255,30 +255,30 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
 
 // -----------------------------------------------------------------------------
 
-::std::vector< USHORT > GalleryBrowser1::ImplGetExecuteVector()
+::std::vector< sal_uInt16 > GalleryBrowser1::ImplGetExecuteVector()
 {
-    ::std::vector< USHORT > aExecVector;
+    ::std::vector< sal_uInt16 > aExecVector;
     GalleryTheme*           pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
 
     if( pTheme )
     {
-        BOOL                bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
-        static const BOOL   bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
+        sal_Bool                bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
+        static const sal_Bool   bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
 
         if( pTheme->IsReadOnly() )
-            bUpdateAllowed = bRenameAllowed = bRemoveAllowed = FALSE;
+            bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_False;
         else if( pTheme->IsImported() )
         {
-            bUpdateAllowed = FALSE;
-            bRenameAllowed = bRemoveAllowed = TRUE;
+            bUpdateAllowed = sal_False;
+            bRenameAllowed = bRemoveAllowed = sal_True;
         }
         else if( pTheme->IsDefault() )
         {
-            bUpdateAllowed = bRenameAllowed = TRUE;
-            bRemoveAllowed = FALSE;
+            bUpdateAllowed = bRenameAllowed = sal_True;
+            bRemoveAllowed = sal_False;
         }
         else
-            bUpdateAllowed = bRenameAllowed = bRemoveAllowed = TRUE;
+            bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_True;
 
         if( bUpdateAllowed && pTheme->GetObjectCount() )
             aExecVector.push_back( MN_ACTUALIZE );
@@ -341,7 +341,7 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog
         {
             const String    aOldName( aName );
             String          aTitle( mpExchangeData->aEditedTitle );
-            USHORT          nCount = 0;
+            sal_uInt16          nCount = 0;
 
             while( mpGallery->HasTheme( aTitle ) && ( nCount++ < 16000 ) )
             {
@@ -400,7 +400,7 @@ IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, VclAbstractDialog2*, p
 
 // -----------------------------------------------------------------------------
 
-void GalleryBrowser1::ImplExecute( USHORT nId )
+void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
 {
     switch( nId )
     {
@@ -446,7 +446,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
                 if( aNewName.Len() && ( aNewName != aOldName ) )
                 {
                     String  aName( aNewName );
-                    USHORT  nCount = 0;
+                    sal_uInt16  nCount = 0;
 
                     while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) )
                     {
@@ -477,7 +477,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
                     DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
 
                     if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
-                        pTheme->SetId( aDlg->GetId(), TRUE ); //CHINA001 pTheme->SetId( aDlg.GetId(), TRUE );
+                        pTheme->SetId( aDlg->GetId(), sal_True ); //CHINA001 pTheme->SetId( aDlg.GetId(), sal_True );
                     delete aDlg; //add CHINA001
                 }
             }
@@ -525,8 +525,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
         case( GALLERY_HINT_THEME_RENAMED ):
         {
-            const USHORT nCurSelectPos = mpThemes->GetSelectEntryPos();
-            const USHORT nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
+            const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos();
+            const sal_uInt16 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
 
             mpThemes->RemoveEntry( rGalleryHint.GetThemeName() );
             ImplInsertThemeEntry( mpGallery->GetThemeInfo( rGalleryHint.GetStringData() ) );
@@ -547,8 +547,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
         case( GALLERY_HINT_CLOSE_THEME ):
         {
-            const USHORT nCurSelectPos = mpThemes->GetSelectEntryPos();
-            const USHORT nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
+            const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos();
+            const sal_uInt16 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
 
             if( nCurSelectPos == nCloseEntryPos )
             {
@@ -578,15 +578,15 @@ void GalleryBrowser1::ShowContextMenu()
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
+sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
 {
-    BOOL bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
+    sal_Bool bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
 
     if( !bRet )
     {
-        ::std::vector< USHORT > aExecVector( ImplGetExecuteVector() );
-        USHORT                  nExecuteId = 0;
-        BOOL                    bMod1 = rKEvt.GetKeyCode().IsMod1();
+        ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() );
+        sal_uInt16                  nExecuteId = 0;
+        sal_Bool                    bMod1 = rKEvt.GetKeyCode().IsMod1();
 
         switch( rKEvt.GetKeyCode().GetCode() )
         {
@@ -637,7 +637,7 @@ BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
         if( nExecuteId && ( ::std::find( aExecVector.begin(), aExecVector.end(), nExecuteId ) != aExecVector.end() ) )
         {
             ImplExecute( nExecuteId );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -648,7 +648,7 @@ BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
 
 IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, EMPTYARG )
 {
-    ::std::vector< USHORT > aExecVector( ImplGetExecuteVector() );
+    ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() );
 
     if( aExecVector.size() )
     {
@@ -696,7 +696,7 @@ IMPL_LINK( GalleryBrowser1, ClickNewThemeHdl, void*, EMPTYARG )
 {
     String  aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) );
     String  aName( aNewTheme );
-    ULONG   nCount = 0;
+    sal_uIntPtr nCount = 0;
 
     while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) )
     {
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 2903dcabef59..d05187d4c856 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -99,10 +99,10 @@ private:
     Image                   aImgImported;
 
     void                    ImplAdjustControls();
-    ULONG                   ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
+    sal_uIntPtr                 ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
     void                    ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData );
-    ::std::vector< USHORT > ImplGetExecuteVector();
-    void                    ImplExecute( USHORT nId );
+    ::std::vector< sal_uInt16 > ImplGetExecuteVector();
+    void                    ImplExecute( sal_uInt16 nId );
     void                    ImplGalleryThemeProperties( const String & rThemeName, bool bCreateNew );
     void                    ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog, bool bCreateNew );
 
@@ -127,9 +127,9 @@ public:
                             ~GalleryBrowser1();
 
     void                    SelectTheme( const String& rThemeName ) { mpThemes->SelectEntry( rThemeName ); SelectThemeHdl( NULL ); }
-    void                    SelectTheme( ULONG nThemePos ) { mpThemes->SelectEntryPos( (USHORT) nThemePos ); SelectThemeHdl( NULL ); }
+    void                    SelectTheme( sal_uIntPtr nThemePos ) { mpThemes->SelectEntryPos( (sal_uInt16) nThemePos ); SelectThemeHdl( NULL ); }
     String                  GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetEntry( mpThemes->GetSelectEntryPos() ) : String(); }
 
     void                    ShowContextMenu();
-    BOOL                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
+    sal_Bool                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
 };
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 045b52aa2e53..98e4d69ee84e 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -79,20 +79,20 @@ GalleryBrowserMode GalleryBrowser2::meInitMode = GALLERYBROWSERMODE_ICON;
 class GalleryBackgroundPopup : public PopupMenu, public SfxControllerItem
 {
     const GalleryTheme* mpTheme;
-    ULONG               mnObjectPos;
+    sal_uIntPtr             mnObjectPos;
 
     virtual void        Select();
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
 public:
 
-                    GalleryBackgroundPopup( const GalleryTheme* pTheme, ULONG nObjectPos );
+                    GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos );
                     ~GalleryBackgroundPopup();
 };
 
 // ------------------------------------------------------------------------
 
-GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, ULONG nObjectPos ) :
+GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos ) :
             SfxControllerItem   ( SID_GALLERY_BG_BRUSH, SfxViewFrame::Current()->GetBindings() ),
             mpTheme             ( pTheme ),
             mnObjectPos         ( nObjectPos )
@@ -109,7 +109,7 @@ GalleryBackgroundPopup::~GalleryBackgroundPopup()
 
 // ------------------------------------------------------------------------
 
-void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem )
+void GalleryBackgroundPopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem )
 {
     if ( ( nSID == SID_GALLERY_BG_BRUSH ) && pItem && ( eState != SFX_ITEM_DISABLED ) )
     {
@@ -123,8 +123,8 @@ void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, con
             List* pList = pStrLstItem->GetList();
 
             if( pList )
-                for ( ULONG i = 0, nCount = pList->Count(); i < nCount; i++ )
-                    InsertItem( (USHORT) i + 1, *(String*) pList->GetObject( i ) );
+                for ( sal_uIntPtr i = 0, nCount = pList->Count(); i < nCount; i++ )
+                    InsertItem( (sal_uInt16) i + 1, *(String*) pList->GetObject( i ) );
         }
         else if( ( pStrItem = PTR_CAST( SfxStringItem, pItem ) ) != NULL )
             InsertItem( 1, pStrItem->GetValue() );
@@ -159,20 +159,20 @@ class GalleryThemePopup : public PopupMenu, public SfxControllerItem
 {
     GalleryBackgroundPopup  maBackgroundPopup;
     const GalleryTheme*     mpTheme;
-    ULONG                   mnObjectPos;
-    BOOL                    mbPreview;
+    sal_uIntPtr                 mnObjectPos;
+    sal_Bool                    mbPreview;
 
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
 public:
 
-                            GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectPos, BOOL bPreview );
+                            GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview );
                             ~GalleryThemePopup();
 };
 
 // ------------------------------------------------------------------------
 
-GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectPos, BOOL bPreview ) :
+GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ) :
     PopupMenu           ( GAL_RESID( RID_SVXMN_GALLERY2 ) ),
     SfxControllerItem   ( SID_GALLERY_ENABLE_ADDCOPY, SfxViewFrame::Current()->GetBindings() ),
     maBackgroundPopup   ( pTheme, nObjectPos ),
@@ -186,7 +186,7 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
     INetURLObject       aURL;
 
     const_cast< GalleryTheme* >( mpTheme )->GetURL( mnObjectPos, aURL );
-    const BOOL bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+    const sal_Bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
 
     pAddMenu->EnableItem( MN_ADD, bValidURL && SGA_OBJ_SOUND != eObjKind );
     pAddMenu->EnableItem( MN_ADD_LINK, bValidURL && SGA_OBJ_SVDRAW != eObjKind );
@@ -198,28 +198,28 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
 
     if( mpTheme->IsReadOnly() || !mpTheme->GetObjectCount() )
     {
-        EnableItem( MN_DELETE, FALSE );
-        EnableItem( MN_TITLE, FALSE );
+        EnableItem( MN_DELETE, sal_False );
+        EnableItem( MN_TITLE, sal_False );
 
         if( mpTheme->IsReadOnly() )
-            EnableItem( MN_PASTECLIPBOARD, FALSE );
+            EnableItem( MN_PASTECLIPBOARD, sal_False );
 
         if( !mpTheme->GetObjectCount() )
-            EnableItem( MN_COPYCLIPBOARD, FALSE );
+            EnableItem( MN_COPYCLIPBOARD, sal_False );
     }
     else
     {
         EnableItem( MN_DELETE, !bPreview );
-        EnableItem( MN_TITLE, TRUE );
-        EnableItem( MN_COPYCLIPBOARD, TRUE );
-        EnableItem( MN_PASTECLIPBOARD, TRUE );
+        EnableItem( MN_TITLE, sal_True );
+        EnableItem( MN_COPYCLIPBOARD, sal_True );
+        EnableItem( MN_PASTECLIPBOARD, sal_True );
     }
 
 #ifdef GALLERY_USE_CLIPBOARD
     if( IsItemEnabled( MN_PASTECLIPBOARD ) )
     {
         TransferableDataHelper  aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( this ) );
-        BOOL                    bEnable = FALSE;
+        sal_Bool                    bEnable = sal_False;
 
         if( aDataHelper.GetFormatCount() )
         {
@@ -230,23 +230,23 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
                 aDataHelper.HasFormat( FORMAT_GDIMETAFILE ) ||
                 aDataHelper.HasFormat( FORMAT_BITMAP ) )
             {
-                bEnable = TRUE;
+                bEnable = sal_True;
             }
         }
 
         if( !bEnable )
-            EnableItem( MN_PASTECLIPBOARD, FALSE );
+            EnableItem( MN_PASTECLIPBOARD, sal_False );
     }
 #else
-    EnableItem( MN_COPYCLIPBOARD, FALSE );
-    EnableItem( MN_PASTECLIPBOARD, FALSE );
+    EnableItem( MN_COPYCLIPBOARD, sal_False );
+    EnableItem( MN_PASTECLIPBOARD, sal_False );
 #endif
 
     if( !maBackgroundPopup.GetItemCount() || ( eObjKind == SGA_OBJ_SVDRAW ) || ( eObjKind == SGA_OBJ_SOUND ) )
-        pAddMenu->EnableItem( MN_BACKGROUND, FALSE );
+        pAddMenu->EnableItem( MN_BACKGROUND, sal_False );
     else
     {
-        pAddMenu->EnableItem( MN_BACKGROUND, TRUE );
+        pAddMenu->EnableItem( MN_BACKGROUND, sal_True );
         pAddMenu->SetPopupMenu( MN_BACKGROUND, &maBackgroundPopup );
     }
 
@@ -262,7 +262,7 @@ GalleryThemePopup::~GalleryThemePopup()
 
 // ------------------------------------------------------------------------
 
-void GalleryThemePopup::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem )
+void GalleryThemePopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem )
 {
     if( ( nSID == SID_GALLERY_ENABLE_ADDCOPY ) && pItem && ( eState != SFX_ITEM_DISABLED ) )
     {
@@ -315,7 +315,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
     mnCurActionPos      ( 0xffffffff ),
     meMode              ( GALLERYBROWSERMODE_NONE ),
     meLastMode          ( GALLERYBROWSERMODE_NONE ),
-    mbCurActionIsLinkage( FALSE )
+    mbCurActionIsLinkage( sal_False )
 {
     Image       aDummyImage;
     const Link  aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
@@ -439,7 +439,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint )
             if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
                 SetMode( meLastMode );
 
-            ImplUpdateViews( (USHORT) rGalleryHint.GetData1() + 1 );
+            ImplUpdateViews( (sal_uInt16) rGalleryHint.GetData1() + 1 );
         }
         break;
 
@@ -484,8 +484,8 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent
     if( mpCurTheme )
     {
         Point       aSelPos;
-        const ULONG nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel, aSelPos );
-        const ULONG nInsertPos = ( nItemId ? ( nItemId - 1 ) : LIST_APPEND );
+        const sal_uIntPtr nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel, aSelPos );
+        const sal_uIntPtr   nInsertPos = ( nItemId ? ( nItemId - 1 ) : LIST_APPEND );
 
         if( mpCurTheme->IsDragging() )
             mpCurTheme->ChangeObjectPos( mpCurTheme->GetDragPos(), nInsertPos );
@@ -503,7 +503,7 @@ void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint )
     if( mpCurTheme )
     {
         Point       aSelPos;
-        const ULONG nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos );
+        const sal_uIntPtr nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos );
 
         if( nItemId )
             mpCurTheme->StartDrag( this, nItemId - 1 );
@@ -523,7 +523,7 @@ void GalleryBrowser2::TogglePreview( Window*, const Point* )
 void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint )
 {
     Point       aSelPos;
-    const ULONG nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos );
+    const sal_uIntPtr nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos );
 
     if( mpCurTheme && nItemId && ( nItemId <= mpCurTheme->GetObjectCount() ) )
     {
@@ -544,31 +544,31 @@ void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
+sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
 {
     Point       aSelPos;
-    const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
-    BOOL        bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
+    const sal_uIntPtr   nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+    sal_Bool        bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
 
     if( !bRet && !maViewBox.HasFocus() && nItemId && mpCurTheme )
     {
-        USHORT              nExecuteId = 0;
+        sal_uInt16              nExecuteId = 0;
         const SgaObjKind    eObjKind = mpCurTheme->GetObjectKind( nItemId - 1 );
         INetURLObject       aURL;
 
         const_cast< GalleryTheme* >( mpCurTheme )->GetURL( nItemId - 1, aURL );
 
-        const BOOL  bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
-        BOOL        bPreview = bValidURL;
-        BOOL        bAdd = bValidURL;
-        BOOL        bAddLink = ( bValidURL && SGA_OBJ_SVDRAW != eObjKind );
-        BOOL        bDelete = FALSE;
-        BOOL        bTitle = FALSE;
+        const sal_Bool  bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+        sal_Bool        bPreview = bValidURL;
+        sal_Bool        bAdd = bValidURL;
+        sal_Bool        bAddLink = ( bValidURL && SGA_OBJ_SVDRAW != eObjKind );
+        sal_Bool        bDelete = sal_False;
+        sal_Bool        bTitle = sal_False;
 
         if( !mpCurTheme->IsReadOnly() && mpCurTheme->GetObjectCount() )
         {
             bDelete = ( GALLERYBROWSERMODE_PREVIEW != GetMode() );
-            bTitle = TRUE;
+            bTitle = sal_True;
         }
 
         switch( rKEvt.GetKeyCode().GetCode() )
@@ -580,7 +580,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
                 if( bPreview )
                 {
                     TogglePreview( pWindow );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
             break;
@@ -617,7 +617,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
         if( nExecuteId )
         {
             ImplExecute( nExecuteId );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -652,9 +652,9 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName )
     Resize();
     ImplUpdateViews( 1 );
 
-    maViewBox.EnableItem( TBX_ID_ICON, TRUE );
-    maViewBox.EnableItem( TBX_ID_LIST, TRUE );
-    maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, TRUE );
+    maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+    maViewBox.EnableItem( TBX_ID_LIST, sal_True );
+    maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, sal_True );
 }
 
 // -----------------------------------------------------------------------------
@@ -677,11 +677,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
 
                 mpIconView->Show();
 
-                maViewBox.EnableItem( TBX_ID_ICON, TRUE );
-                maViewBox.EnableItem( TBX_ID_LIST, TRUE );
+                maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+                maViewBox.EnableItem( TBX_ID_LIST, sal_True );
 
-                maViewBox.CheckItem( TBX_ID_ICON, TRUE );
-                maViewBox.CheckItem( TBX_ID_LIST, FALSE );
+                maViewBox.CheckItem( TBX_ID_ICON, sal_True );
+                maViewBox.CheckItem( TBX_ID_LIST, sal_False );
             }
             break;
 
@@ -695,11 +695,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
 
                 mpListView->Show();
 
-                maViewBox.EnableItem( TBX_ID_ICON, TRUE );
-                maViewBox.EnableItem( TBX_ID_LIST, TRUE );
+                maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+                maViewBox.EnableItem( TBX_ID_LIST, sal_True );
 
-                maViewBox.CheckItem( TBX_ID_ICON, FALSE );
-                maViewBox.CheckItem( TBX_ID_LIST, TRUE );
+                maViewBox.CheckItem( TBX_ID_ICON, sal_False );
+                maViewBox.CheckItem( TBX_ID_LIST, sal_True );
             }
             break;
 
@@ -707,11 +707,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
             {
                 Graphic     aGraphic;
                 Point       aSelPos;
-                const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+                const sal_uIntPtr   nItemId = ImplGetSelectedItemId( NULL, aSelPos );
 
                 if( nItemId )
                 {
-                    const ULONG nPos = nItemId - 1;
+                    const sal_uIntPtr nPos = nItemId - 1;
 
                        mpIconView->Hide();
                     mpListView->Hide();
@@ -725,8 +725,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
                     if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND )
                         mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
 
-                    maViewBox.EnableItem( TBX_ID_ICON, FALSE );
-                    maViewBox.EnableItem( TBX_ID_LIST, FALSE );
+                    maViewBox.EnableItem( TBX_ID_ICON, sal_False );
+                    maViewBox.EnableItem( TBX_ID_LIST, sal_False );
                 }
             }
             break;
@@ -765,11 +765,11 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
     if( mpCurTheme )
     {
         Point       aSelPos;
-        const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+        const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
 
         if( nItemId )
         {
-            ULONG nNewItemId = nItemId;
+            sal_uIntPtr nNewItemId = nItemId;
 
             switch( eTravel )
             {
@@ -794,7 +794,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
                 if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
                 {
                     Graphic     aGraphic;
-                    const ULONG nPos = nNewItemId - 1;
+                    const sal_uIntPtr nPos = nNewItemId - 1;
 
                     mpCurTheme->GetGraphic( nPos, aGraphic );
                     mpPreview->SetGraphic( aGraphic );
@@ -811,7 +811,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
 
 // -----------------------------------------------------------------------------
 
-void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId )
+void GalleryBrowser2::ImplUpdateViews( sal_uInt16 nSelectionId )
 {
     mpIconView->Hide();
     mpListView->Hide();
@@ -822,10 +822,10 @@ void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId )
 
     if( mpCurTheme )
     {
-        for( ULONG i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; )
+        for( sal_uIntPtr i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; )
         {
             mpListView->RowInserted( i++ );
-            mpIconView->InsertItem( (USHORT) i );
+            mpIconView->InsertItem( (sal_uInt16) i );
         }
 
         ImplSelectItemId( ( ( nSelectionId > mpCurTheme->GetObjectCount() ) ? mpCurTheme->GetObjectCount() : nSelectionId ) );
@@ -853,11 +853,11 @@ void GalleryBrowser2::ImplUpdateInfoBar()
     if( mpCurTheme )
     {
         Point       aSelPos;
-        const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+        const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
 
         if( nItemId )
         {
-            const ULONG nPos = nItemId - 1;
+            const sal_uIntPtr nPos = nItemId - 1;
 
             aInfoText = mpCurTheme->GetName();
 
@@ -879,10 +879,10 @@ void GalleryBrowser2::ImplUpdateInfoBar()
 
 // -----------------------------------------------------------------------------
 
-ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos )
+sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos )
 {
     const Size  aOutputSizePixel( GetOutputSizePixel() );
-    ULONG       nRet = 0;
+    sal_uIntPtr       nRet = 0;
 
     if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
     {
@@ -903,7 +903,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
         else
         {
             nRet = mpIconView->GetSelectItemId();
-            rSelPos = mpIconView->GetItemRect( (USHORT) nRet ).Center();
+            rSelPos = mpIconView->GetItemRect( (sal_uInt16) nRet ).Center();
         }
     }
     else
@@ -916,7 +916,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
         else
         {
             nRet = mpListView->FirstSelectedRow() + 1;
-            rSelPos = mpListView->GetFieldRectPixel( (USHORT) nRet, 1 ).Center();
+            rSelPos = mpListView->GetFieldRectPixel( (sal_uInt16) nRet, 1 ).Center();
         }
     }
 
@@ -933,22 +933,22 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
 
 // -----------------------------------------------------------------------------
 
-void GalleryBrowser2::ImplSelectItemId( ULONG nItemId )
+void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId )
 {
     if( nItemId )
     {
 
-        mpIconView->SelectItem( (USHORT) nItemId );
+        mpIconView->SelectItem( (sal_uInt16) nItemId );
         mpListView->SelectRow( nItemId - 1 );
     }
 }
 
 // -----------------------------------------------------------------------------
 
-void GalleryBrowser2::ImplExecute( USHORT nId )
+void GalleryBrowser2::ImplExecute( sal_uInt16 nId )
 {
     Point       aSelPos;
-    const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+    const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
 
     if( mpCurTheme && nItemId )
     {
@@ -1074,7 +1074,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
 
 // -----------------------------------------------------------------------------
 
-String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags )
+String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags )
 {
     INetURLObject   aURL;
     String          aRet;
@@ -1177,9 +1177,9 @@ Graphic GalleryBrowser2::GetGraphic() const
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( mpCurTheme && mnCurActionPos != 0xffffffff )
         bRet = mpCurTheme->GetModel( mnCurActionPos, rModel );
@@ -1189,7 +1189,7 @@ BOOL GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser2::IsLinkage() const
+sal_Bool GalleryBrowser2::IsLinkage() const
 {
     return mbCurActionIsLinkage;
 }
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index d6817134fefb..6dca7b050e01 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -126,11 +126,11 @@ void GalleryPreview::DataChanged( const DataChangedEvent& rDCEvt )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
+sal_Bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
 {
     const Size  aWinSize( GetOutputSizePixel() );
     Size        aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) );
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( aNewSize.Width() && aNewSize.Height() )
     {
@@ -153,7 +153,7 @@ BOOL GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl
                              ( aWinSize.Height() - aNewSize.Height() ) >> 1 );
 
         rResultRect = Rectangle( aNewPos, aNewSize );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -307,7 +307,7 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme
         DragSourceHelper( this ),
         mpTheme ( pTheme )
 {
-    EnableFullItemMode( FALSE );
+    EnableFullItemMode( sal_False );
 
     SetHelpId( HID_GALLERY_WINDOW );
     InitSettings();
@@ -346,7 +346,7 @@ void GalleryIconView::DataChanged( const DataChangedEvent& rDCEvt )
 
 void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt )
 {
-    const USHORT nId = rUDEvt.GetItemId();
+    const sal_uInt16 nId = rUDEvt.GetItemId();
 
     if( nId && mpTheme )
     {
@@ -457,7 +457,7 @@ sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt )
 
 void GalleryIconView::StartDrag( sal_Int8, const Point& )
 {
-    const CommandEvent  aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, TRUE );
+    const CommandEvent  aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, sal_True );
     Region              aRegion;
 
     // call this to initiate dragging for ValueSet
@@ -473,7 +473,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
     BrowseBox( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER ),
     mpTheme( pTheme ),
     mnCurRow( 0 ),
-    mbInit( FALSE )
+    mbInit( sal_False )
 {
     SetHelpId( HID_GALLERY_WINDOW );
 
@@ -512,15 +512,15 @@ void GalleryListView::DataChanged( const DataChangedEvent& rDCEvt )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryListView::SeekRow( long nRow )
+sal_Bool GalleryListView::SeekRow( long nRow )
 {
     mnCurRow = nRow;
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------------
 
-String GalleryListView::GetCellText(long _nRow, USHORT nColumnId) const
+String GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const
 {
     String sRet;
     if( mpTheme && ( _nRow < static_cast< long >( mpTheme->GetObjectCount() ) ) )
@@ -548,7 +548,7 @@ Rectangle GalleryListView::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nC
     if ( SeekRow(_nRow) )
     {
         SvxFont aFont( GetFont() );
-        AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<USHORT>( GetColumnId( sal::static_int_cast<USHORT>(_nColumnPos) ) ) ) );
+        AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<sal_uInt16>( GetColumnId( sal::static_int_cast<sal_uInt16>(_nColumnPos) ) ) ) );
 
         // get the bounds inside the string
         aStringWrap.GetCharacterBounds(nIndex, aRect);
@@ -567,7 +567,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu
     if ( SeekRow(_nRow) )
     {
         SvxFont aFont( GetFont() );
-        AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<USHORT>(GetColumnId(sal::static_int_cast<USHORT>(_nColumnPos)))) );
+        AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<sal_uInt16>(GetColumnId(sal::static_int_cast<sal_uInt16>(_nColumnPos)))) );
         nRet = aStringWrap.GetIndexAtPoint(_rPoint);
     }
     return nRet;
@@ -575,7 +575,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu
 
 // ------------------------------------------------------------------------
 
-void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const
+void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
 {
     rDev.Push( PUSH_CLIPREGION );
     rDev.IntersectClipRegion( rRect );
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index cad6780f11f7..84f62fc795e7 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -94,27 +94,27 @@ Graphic GalleryExplorer::GetGraphic() const
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
 {
     return GALLERYBROWSER()->GetVCDrawModel( rModel );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::IsLinkage() const
+sal_Bool GalleryExplorer::IsLinkage() const
 {
     return GALLERYBROWSER()->IsLinkage();
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::FillThemeList( List& rThemeList )
+sal_Bool GalleryExplorer::FillThemeList( List& rThemeList )
 {
     Gallery* pGal = ImplGetGallery();
 
     if( pGal )
     {
-        for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
+        for( sal_uIntPtr i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
         {
             const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i );
 
@@ -128,7 +128,7 @@ BOOL GalleryExplorer::FillThemeList( List& rThemeList )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
+sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
 {
     Gallery* pGal = ImplGetGallery();
 
@@ -139,7 +139,7 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
 
         if( pTheme )
         {
-            for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+            for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
                 rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND );
 
             pGal->ReleaseTheme( pTheme, aListener );
@@ -151,10 +151,10 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::FillObjList( ULONG nThemeId, List& rObjList )
+sal_Bool GalleryExplorer::FillObjList( sal_uIntPtr nThemeId, List& rObjList )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : FALSE );
+    return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
@@ -169,7 +169,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
 
         if( pTheme )
         {
-            for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+            for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
             {
                 SgaObject*  pObj = pTheme->AcquireObject( i );
                 if ( pObj )
@@ -187,24 +187,24 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL )
+sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL )
 {
     return InsertURL( rThemeName, rURL, SGA_FORMAT_ALL );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL )
+sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL )
 {
     return InsertURL( nThemeId, rURL, SGA_FORMAT_ALL );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const ULONG )
+sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const sal_uIntPtr )
 {
     Gallery*    pGal = ImplGetGallery();
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pGal )
     {
@@ -225,18 +225,18 @@ BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, c
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL, const ULONG nSgaFormat )
+sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL, const sal_uIntPtr nSgaFormat )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : FALSE );
+    return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-ULONG GalleryExplorer::GetObjCount( const String& rThemeName )
+sal_uIntPtr GalleryExplorer::GetObjCount( const String& rThemeName )
 {
     Gallery*    pGal = ImplGetGallery();
-    ULONG       nRet = 0;
+    sal_uIntPtr     nRet = 0;
 
     if( pGal )
     {
@@ -255,20 +255,20 @@ ULONG GalleryExplorer::GetObjCount( const String& rThemeName )
 
 // ------------------------------------------------------------------------
 
-ULONG GalleryExplorer::GetObjCount( ULONG nThemeId )
+sal_uIntPtr GalleryExplorer::GetObjCount( sal_uIntPtr nThemeId )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE );
+    return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos,
+sal_Bool GalleryExplorer::GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
                                      Graphic* pGraphic, Bitmap* pThumb,
-                                     BOOL bProgress )
+                                     sal_Bool bProgress )
 {
     Gallery*    pGal = ImplGetGallery();
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pGal )
     {
@@ -292,20 +292,20 @@ BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos,
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetGraphicObj( ULONG nThemeId, ULONG nPos,
+sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
                                      Graphic* pGraphic, Bitmap* pThumb,
-                                     BOOL bProgress )
+                                     sal_Bool bProgress )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : FALSE );
+    return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
+sal_Bool GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
 {
     Gallery*    pGal = ImplGetGallery();
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pGal )
     {
@@ -324,18 +324,18 @@ BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic&
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic )
+sal_Bool GalleryExplorer::InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : FALSE );
+    return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
+sal_uIntPtr GalleryExplorer::GetSdrObjCount( const String& rThemeName )
 {
     Gallery*    pGal = ImplGetGallery();
-    ULONG       nRet = 0;
+    sal_uIntPtr     nRet = 0;
 
     if( pGal )
     {
@@ -344,7 +344,7 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
 
         if( pTheme )
         {
-            for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+            for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
                 if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
                     nRet++;
 
@@ -357,19 +357,19 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
 
 // ------------------------------------------------------------------------
 
-ULONG GalleryExplorer::GetSdrObjCount( ULONG nThemeId  )
+sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId  )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE );
+    return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
+sal_Bool GalleryExplorer::GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos,
                                  SdrModel* pModel, Bitmap* pThumb )
 {
     Gallery*    pGal = ImplGetGallery();
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pGal )
     {
@@ -378,14 +378,14 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
 
         if( pTheme )
         {
-            for( ULONG i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
+            for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
             {
                 if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
                 {
                     if( nActPos++ == nSdrModelPos )
                     {
                         if( pModel )
-                            bRet = bRet || pTheme->GetModel( i, *pModel, FALSE );
+                            bRet = bRet || pTheme->GetModel( i, *pModel, sal_False );
 
                         if( pThumb )
                             bRet = bRet || pTheme->GetThumb( i, *pThumb );
@@ -402,19 +402,19 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos,
+sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
                                  SdrModel* pModel, Bitmap* pThumb )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : FALSE );
+    return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
+sal_Bool GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
 {
     Gallery*    pGal = ImplGetGallery();
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pGal )
     {
@@ -433,18 +433,18 @@ BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rMode
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertSdrObj( ULONG nThemeId, FmFormModel& rModel )
+sal_Bool GalleryExplorer::InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : FALSE );
+    return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : sal_False );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
+sal_Bool GalleryExplorer::BeginLocking( const String& rThemeName )
 {
     Gallery*    pGal = ImplGetGallery();
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pGal )
     {
@@ -453,7 +453,7 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
         if( pTheme )
         {
             pTheme->LockTheme();
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -462,18 +462,18 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::BeginLocking( ULONG nThemeId )
+sal_Bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : FALSE );
+    return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::EndLocking( const String& rThemeName )
+sal_Bool GalleryExplorer::EndLocking( const String& rThemeName )
 {
     Gallery*    pGal = ImplGetGallery();
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pGal )
     {
@@ -482,7 +482,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
 
         if( pTheme )
         {
-            const BOOL bReleaseLockedTheme = pTheme->UnlockTheme();
+            const sal_Bool bReleaseLockedTheme = pTheme->UnlockTheme();
 
             // release acquired theme
             pGal->ReleaseTheme( pTheme, aListener );
@@ -491,7 +491,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
             {
                 // release locked theme
                 pGal->ReleaseTheme( pTheme, aLockListener );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -501,15 +501,15 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::EndLocking( ULONG nThemeId )
+sal_Bool GalleryExplorer::EndLocking( sal_uIntPtr nThemeId )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : FALSE );
+    return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
+sal_Bool GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
 {
     return SgaObjectSvDraw::DrawCentered( pOut, rModel );
 }
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 9198f02278bb..eee9f46953c4 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -57,8 +57,8 @@ using namespace ::com::sun::star;
 // ---------------------
 
 GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
-                                      UINT32 _nFileNumber, BOOL _bReadOnly, BOOL _bImported,
-                                      BOOL _bNewFile, UINT32 _nId, BOOL _bThemeNameFromResource ) :
+                                      sal_uInt32 _nFileNumber, sal_Bool _bReadOnly, sal_Bool _bImported,
+                                      sal_Bool _bNewFile, sal_uInt32 _nId, sal_Bool _bThemeNameFromResource ) :
         nFileNumber                             ( _nFileNumber ),
         nId                                     ( _nId ),
         bReadOnly                               ( _bReadOnly || _bImported ),
@@ -81,7 +81,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin
     SetModified( _bNewFile );
 
     if( nId && bThemeNameFromResource )
-        aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (USHORT) nId ) );
+        aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) );
 
     if( !aName.Len() )
         aName = rName;
@@ -93,25 +93,25 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL
 {
     INetURLObject   aURL( rURL );
     String          aFileName;
-    BOOL            bExists = FALSE;
+    sal_Bool            bExists = sal_False;
 
     // check original file name
     if( FileExists( aURL ) )
-        bExists = TRUE;
+        bExists = sal_True;
     else
     {
         // check upper case file name
         aURL.setName( aURL.getName().toAsciiUpperCase() );
 
         if( FileExists( aURL ) )
-            bExists = TRUE;
+            bExists = sal_True;
         else
         {
             // check lower case file name
             aURL.setName( aURL.getName().toAsciiLowerCase() );
 
             if( FileExists( aURL ) )
-                bExists = TRUE;
+                bExists = sal_True;
         }
     }
 
@@ -125,17 +125,17 @@ void GalleryThemeEntry::SetName( const String& rNewName )
     if( aName != rNewName )
     {
         aName = rNewName;
-        SetModified( TRUE );
-        bThemeNameFromResource = FALSE;
+        SetModified( sal_True );
+        bThemeNameFromResource = sal_False;
     }
 }
 
 // -----------------------------------------------------------------------------
 
-void GalleryThemeEntry::SetId( UINT32 nNewId, BOOL bResetThemeName )
+void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName )
 {
     nId = nNewId;
-    SetModified( TRUE );
+    SetModified( sal_True );
     bThemeNameFromResource = ( nId && bResetThemeName );
 }
 
@@ -199,7 +199,7 @@ public:
 Gallery::Gallery( const String& rMultiPath )
 :       nReadTextEncoding   ( gsl_getSystemTextEncoding() )
 ,       nLastFileNumber     ( 0 )
-,       bMultiPath          ( FALSE )
+,       bMultiPath          ( sal_False )
 {
     ImplLoad( rMultiPath );
 }
@@ -239,7 +239,7 @@ Gallery* Gallery::GetGalleryInstance()
 
 void Gallery::ImplLoad( const String& rMultiPath )
 {
-    const USHORT    nTokenCount = rMultiPath.GetTokenCount( ';' );
+    const sal_uInt16    nTokenCount = rMultiPath.GetTokenCount( ';' );
     sal_Bool        bIsReadOnlyDir;
 
     bMultiPath = ( nTokenCount > 0 );
@@ -254,7 +254,7 @@ void Gallery::ImplLoad( const String& rMultiPath )
     {
         aRelURL = INetURLObject( rMultiPath.GetToken( 0, ';' ) );
 
-        for( USHORT i = 0UL; i < nTokenCount; i++ )
+        for( sal_uInt16 i = 0UL; i < nTokenCount; i++ )
         {
             aCurURL = INetURLObject(rMultiPath.GetToken( i, ';' ));
 
@@ -430,7 +430,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
 
                                 if( pEntry )
                                 {
-                                    const ULONG nFileNumber = (ULONG) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32();
+                                    const sal_uIntPtr nFileNumber = (sal_uIntPtr) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32();
 
                                     aThemeList.Insert( pEntry, LIST_APPEND );
 
@@ -481,11 +481,11 @@ void Gallery::ImplLoadImports()
             GalleryThemeEntry*          pThemeEntry;
             GalleryImportThemeEntry*    pImportEntry;
             INetURLObject               aFile;
-            UINT32                      nInventor;
-            UINT32                      nCount;
-            UINT16                      nId;
-            UINT16                      i;
-            UINT16                      nTempCharSet;
+            sal_uInt32                      nInventor;
+            sal_uInt32                      nCount;
+            sal_uInt16                      nId;
+            sal_uInt16                      i;
+            sal_uInt16                      nTempCharSet;
 
             for( pImportEntry = aImportList.First(); pImportEntry; pImportEntry = aImportList.Next() )
                 delete pImportEntry;
@@ -507,7 +507,7 @@ void Gallery::ImplLoadImports()
                     pThemeEntry = new GalleryThemeEntry( aFile,
                                                          pImportEntry->aUIName,
                                                          String(aFile.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(),
-                                                         TRUE, TRUE, FALSE, 0, FALSE );
+                                                         sal_True, sal_True, sal_False, 0, sal_False );
 
                     aThemeList.Insert( pThemeEntry, LIST_APPEND );
                 }
@@ -528,10 +528,10 @@ void Gallery::ImplWriteImportList()
 
     if( pOStm )
     {
-        const UINT32 nInventor = (UINT32) COMPAT_FORMAT( 'S', 'G', 'A', '3' );
-        const UINT16 nId = 0x0004;
+        const sal_uInt32 nInventor = (sal_uInt32) COMPAT_FORMAT( 'S', 'G', 'A', '3' );
+        const sal_uInt16 nId = 0x0004;
 
-        *pOStm << nInventor << nId << (UINT32) aImportList.Count() << (UINT16) gsl_getSystemTextEncoding();
+        *pOStm << nInventor << nId << (sal_uInt32) aImportList.Count() << (sal_uInt16) gsl_getSystemTextEncoding();
 
         for( GalleryImportThemeEntry* pImportEntry = aImportList.First(); pImportEntry; pImportEntry = aImportList.Next() )
             *pOStm << *pImportEntry;
@@ -572,11 +572,11 @@ GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImport
 
 // ------------------------------------------------------------------------
 
-String Gallery::GetThemeName( ULONG nThemeId ) const
+String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
 {
     GalleryThemeEntry* pFound = NULL;
 
-    for( ULONG n = 0, nCount = aThemeList.Count(); n < nCount; n++ )
+    for( sal_uIntPtr n = 0, nCount = aThemeList.Count(); n < nCount; n++ )
     {
         GalleryThemeEntry* pEntry = aThemeList.GetObject( n );
 
@@ -613,28 +613,28 @@ String Gallery::GetThemeName( ULONG nThemeId ) const
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::HasTheme( const String& rThemeName )
+sal_Bool Gallery::HasTheme( const String& rThemeName )
 {
     return( ImplGetThemeEntry( rThemeName ) != NULL );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom )
+sal_Bool Gallery::CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) )
     {
         nLastFileNumber = nNumFrom > nLastFileNumber ? nNumFrom : nLastFileNumber + 1;
         GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName,
                                                               nLastFileNumber,
-                                                              FALSE, FALSE, TRUE, 0, FALSE );
+                                                              sal_False, sal_False, sal_True, 0, sal_False );
 
         aThemeList.Insert( pNewEntry, LIST_APPEND );
         delete( new GalleryTheme( this, pNewEntry ) );
         Broadcast( GalleryHint( GALLERY_HINT_THEME_CREATED, rThemeName ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -642,10 +642,10 @@ BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom )
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName )
+sal_Bool Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName )
 {
     INetURLObject   aURL( rURL );
-    BOOL            bRet = FALSE;
+    sal_Bool            bRet = sal_False;
 
     DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
@@ -655,8 +655,8 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
 
         if( pIStm )
         {
-            ULONG   nStmErr;
-            UINT16  nId;
+            sal_uIntPtr   nStmErr;
+            sal_uInt16  nId;
 
             *pIStm >> nId;
 
@@ -668,7 +668,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
                 String                  aThemeName; *pIStm >> aTmpStr; aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 );
                 GalleryThemeEntry*      pThemeEntry = new GalleryThemeEntry( aURL, rImportName,
                                                                              String(aURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(),
-                                                                             TRUE, TRUE, TRUE, 0, FALSE );
+                                                                             sal_True, sal_True, sal_True, 0, sal_False );
                 GalleryTheme*           pImportTheme = new GalleryTheme( this, pThemeEntry );
 
                 pIStm->Seek( STREAM_SEEK_TO_BEGIN );
@@ -684,7 +684,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
                 {
                     String  aName( rImportName );
                     String  aNewName( aName );
-                    ULONG   nCount = 0;
+                    sal_uIntPtr   nCount = 0;
 
                     aName += ' ';
 
@@ -704,7 +704,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
                     pImportEntry->aImportName = rImportName;
                     aImportList.Insert( pImportEntry, LIST_APPEND );
                     ImplWriteImportList();
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
 
                 delete pImportTheme;
@@ -719,10 +719,10 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
+sal_Bool Gallery::RenameTheme( const String& rOldName, const String& rNewName )
 {
     GalleryThemeEntry*      pThemeEntry = ImplGetThemeEntry( rOldName );
-    BOOL                            bRet = FALSE;
+    sal_Bool                            bRet = sal_False;
 
     // Ueberpruefen, ob neuer Themenname schon vorhanden ist
     if( pThemeEntry && !HasTheme( rNewName ) && ( !pThemeEntry->IsReadOnly() || pThemeEntry->IsImported() ) )
@@ -752,7 +752,7 @@ BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
 
             Broadcast( GalleryHint( GALLERY_HINT_THEME_RENAMED, aOldName, pThm->GetName() ) );
             ReleaseTheme( pThm, aListener );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -761,10 +761,10 @@ BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::RemoveTheme( const String& rThemeName )
+sal_Bool Gallery::RemoveTheme( const String& rThemeName )
 {
     GalleryThemeEntry*  pThemeEntry = ImplGetThemeEntry( rThemeName );
-    BOOL                bRet = FALSE;
+    sal_Bool                bRet = sal_False;
 
     if( pThemeEntry && ( !pThemeEntry->IsReadOnly() || pThemeEntry->IsImported() ) )
     {
@@ -802,7 +802,7 @@ BOOL Gallery::RemoveTheme( const String& rThemeName )
         delete aThemeList.Remove( pThemeEntry );
         Broadcast( GalleryHint( GALLERY_HINT_THEME_REMOVED, rThemeName ) );
 
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -880,14 +880,14 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry
 void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme )
 {
     GalleryThemeCacheEntry* pEntry;
-    BOOL                                    bDone = FALSE;
+    sal_Bool                                    bDone = sal_False;
 
     for( pEntry = (GalleryThemeCacheEntry*) aThemeCache.First(); pEntry && !bDone; pEntry = (GalleryThemeCacheEntry*) aThemeCache.Next() )
     {
         if( pTheme == pEntry->GetTheme() )
         {
             delete (GalleryThemeCacheEntry*) aThemeCache.Remove( pEntry );
-            bDone = TRUE;
+            bDone = sal_True;
         }
     }
 }
@@ -918,6 +918,6 @@ void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener )
     }
 }
 
-BOOL GalleryThemeEntry::IsDefault() const
+sal_Bool GalleryThemeEntry::IsDefault() const
 { return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); }
 
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 835c7dc3e731..da5375423b56 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -113,11 +113,11 @@ IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory )
 // - GalleryGraphicImport -
 // ------------------------
 
-USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
-                             String& rFilterName, BOOL bShowProgress )
+sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
+                             String& rFilterName, sal_Bool bShowProgress )
 {
-    USHORT      nRet = SGA_IMPORT_NONE;
-    SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, TRUE );
+    sal_uInt16      nRet = SGA_IMPORT_NONE;
+    SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, sal_True );
     String      aFilterName;
 
     aMedium.DownLoad();
@@ -128,7 +128,7 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
     {
         GraphicFilter*      pGraphicFilter = GraphicFilter::GetGraphicFilter();
         GalleryProgress*    pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL;
-        USHORT              nFormat;
+        sal_uInt16              nFormat;
 
         if( !pGraphicFilter->ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) )
         {
@@ -146,10 +146,10 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
 // - GallerySvDrawImport -
 // -----------------------
 
-BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
+sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
 {
-    UINT32  nVersion;
-    BOOL    bRet = FALSE;
+    sal_uInt32  nVersion;
+    sal_Bool    bRet = sal_False;
 
     if( GalleryCodec::IsCoded( rIStm, nVersion ) )
     {
@@ -194,9 +194,9 @@ BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
 // - CreateIMapGraphic -
 // ---------------------
 
-BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap )
+sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if ( rModel.GetPageCount() )
     {
@@ -205,10 +205,10 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
 
         if ( pPage->GetObjCount() == 1 && pObj->ISA( SdrGrafObj ) )
         {
-            const USHORT nCount = pObj->GetUserDataCount();
+            const sal_uInt16 nCount = pObj->GetUserDataCount();
 
             // gibt es in den User-Daten eine IMap-Information?
-            for ( USHORT i = 0; i < nCount; i++ )
+            for ( sal_uInt16 i = 0; i < nCount; i++ )
             {
                 const SdrObjUserData* pUserData = pObj->GetUserData( i );
 
@@ -216,7 +216,7 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
                 {
                     rGraphic = ( (SdrGrafObj*) pObj )->GetGraphic();
                     rImageMap = ( (SgaIMapInfo*) pUserData )->GetImageMap();
-                    bRet = TRUE;
+                    bRet = sal_True;
                     break;
                 }
             }
@@ -230,7 +230,7 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
 // - GetReducedString -
 // --------------------
 
-String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen )
+String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen )
 {
     String aReduced( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
 
@@ -244,7 +244,7 @@ String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen )
 
         if( aPath.Len() > nMaxLen )
         {
-            aReduced = aPath.Copy( 0, (USHORT)( nMaxLen - aName.Len() - 4 ) );
+            aReduced = aPath.Copy( 0, (sal_uInt16)( nMaxLen - aName.Len() - 4 ) );
             aReduced += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
             aReduced += aDelimiter;
             aReduced += aName;
@@ -273,9 +273,9 @@ String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
 
 // -----------------------------------------------------------------------------
 
-BOOL FileExists( const INetURLObject& rURL )
+sal_Bool FileExists( const INetURLObject& rURL )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rURL.GetProtocol() != INET_PROT_NOT_VALID )
     {
@@ -303,9 +303,9 @@ BOOL FileExists( const INetURLObject& rURL )
 
 // -----------------------------------------------------------------------------
 
-BOOL CreateDir( const INetURLObject& rURL )
+sal_Bool CreateDir( const INetURLObject& rURL )
 {
-    BOOL bRet = FileExists( rURL );
+    sal_Bool bRet = FileExists( rURL );
 
     if( !bRet )
     {
@@ -340,9 +340,9 @@ BOOL CreateDir( const INetURLObject& rURL )
 
 // -----------------------------------------------------------------------------
 
-BOOL CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
+sal_Bool CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     try
     {
@@ -351,7 +351,7 @@ BOOL CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
         aDestPath.executeCommand( OUString::createFromAscii( "transfer" ),
                                   uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ),
                                                 rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     catch( const ucb::ContentCreationException& )
     {
@@ -368,9 +368,9 @@ BOOL CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
 
 // -----------------------------------------------------------------------------
 
-BOOL KillFile( const INetURLObject& rURL )
+sal_Bool KillFile( const INetURLObject& rURL )
 {
-    BOOL bRet = FileExists( rURL );
+    sal_Bool bRet = FileExists( rURL );
 
     if( bRet )
     {
@@ -381,15 +381,15 @@ BOOL KillFile( const INetURLObject& rURL )
         }
         catch( const ucb::ContentCreationException& )
         {
-            bRet = FALSE;
+            bRet = sal_False;
         }
         catch( const uno::RuntimeException& )
         {
-            bRet = FALSE;
+            bRet = sal_False;
         }
         catch( const uno::Exception& )
         {
-            bRet = FALSE;
+            bRet = sal_False;
         }
     }
 
@@ -446,17 +446,17 @@ GalleryProgress::~GalleryProgress()
 
 // ------------------------------------------------------------------------
 
-void GalleryProgress::Update( ULONG nVal, ULONG nMaxVal )
+void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
 {
     if( mxProgressBar.is() && nMaxVal )
-        mxProgressBar->setValue( Min( (ULONG)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (ULONG) GALLERY_PROGRESS_RANGE ) );
+        mxProgressBar->setValue( Min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
 }
 
 // -----------------------
 // - GalleryTransferable -
 // -----------------------
 
-GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy ) :
+GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ) :
     mpTheme( pTheme ),
     meObjectKind( mpTheme->GetObjectKind( nObjectPos ) ),
     mnObjectPos( nObjectPos ),
@@ -626,7 +626,7 @@ sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pU
 
 void GalleryTransferable::DragFinished( sal_Int8 nDropAction )
 {
-    mpTheme->SetDragging( FALSE );
+    mpTheme->SetDragging( sal_False );
     mpTheme->SetDragPos( 0 );
     if ( nDropAction )
     {
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 39aceac564ad..9ba9cff068a3 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -59,16 +59,16 @@ using namespace ::com::sun::star;
 // -------------
 
 SgaObject::SgaObject() :
-        bIsValid    ( FALSE ),
-        bIsThumbBmp ( TRUE )
+        bIsValid    ( sal_False ),
+        bIsThumbBmp ( sal_True )
 {
 }
 
 // ------------------------------------------------------------------------
 
-BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
+sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rGraphic.GetType() == GRAPHIC_BITMAP )
     {
@@ -104,7 +104,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
             if( ( aBmpSize.Width() <= S_THUMB ) && ( aBmpSize.Height() <= S_THUMB ) )
             {
                 aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-                bRet = TRUE;
+                bRet = sal_True;
             }
             else
             {
@@ -116,7 +116,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
                                      (double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_INTERPOLATE ) )
                 {
                     aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
         }
@@ -137,7 +137,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
         if( !aThumbBmp.IsEmpty() )
         {
             aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -148,15 +148,15 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
 
 void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const
 {
-    static const UINT32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
+    static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
 
-    rOut << nInventor << (UINT16) 0x0004 << GetVersion() << (UINT16) GetObjKind();
+    rOut << nInventor << (sal_uInt16) 0x0004 << GetVersion() << (sal_uInt16) GetObjKind();
     rOut << bIsThumbBmp;
 
     if( bIsThumbBmp )
     {
-        const USHORT    nOldCompressMode = rOut.GetCompressMode();
-        const ULONG     nOldVersion = rOut.GetVersion();
+        const sal_uInt16    nOldCompressMode = rOut.GetCompressMode();
+        const sal_uIntPtr       nOldVersion = rOut.GetVersion();
 
         rOut.SetCompressMode( COMPRESSMODE_ZBITMAP );
         rOut.SetVersion( SOFFICE_FILEFORMAT_50 );
@@ -176,11 +176,11 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const
 
 // ------------------------------------------------------------------------
 
-void SgaObject::ReadData(SvStream& rIn, UINT16& rReadVersion )
+void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
 {
     ByteString  aTmpStr;
-    UINT32      nTmp32;
-    UINT16      nTmp16;
+    sal_uInt32      nTmp32;
+    sal_uInt16      nTmp16;
 
     rIn >> nTmp32 >> nTmp16 >> rReadVersion >> nTmp16 >> bIsThumbBmp;
 
@@ -245,7 +245,7 @@ SvStream& operator<<( SvStream& rOut, const SgaObject& rObj )
 
 SvStream& operator>>( SvStream& rIn, SgaObject& rObj )
 {
-    UINT16 nReadVersion;
+    sal_uInt16 nReadVersion;
 
     rObj.ReadData( rIn, nReadVersion );
     rObj.bIsValid = ( rIn.GetError() == ERRCODE_NONE );
@@ -303,7 +303,7 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const
 
 // ------------------------------------------------------------------------
 
-void SgaObjectBmp::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
 {
     ByteString aTmpStr;
 
@@ -335,10 +335,10 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
     {
         aURL = rURL;
         aThumbBmp = Bitmap( Size( 1, 1 ), 1 );
-        bIsValid = TRUE;
+        bIsValid = sal_True;
     }
     else
-        bIsValid = FALSE;
+        bIsValid = sal_False;
 }
 
 // ------------------------------------------------------------------------
@@ -351,7 +351,7 @@ SgaObjectSound::~SgaObjectSound()
 
 Bitmap SgaObjectSound::GetThumbBmp() const
 {
-    USHORT nId;
+    sal_uInt16 nId;
 
     switch( eSoundType )
     {
@@ -380,19 +380,19 @@ Bitmap SgaObjectSound::GetThumbBmp() const
 void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const
 {
     SgaObject::WriteData( rOut, rDestDir );
-    rOut << (UINT16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 );
+    rOut << (sal_uInt16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 );
 }
 
 // ------------------------------------------------------------------------
 
-void SgaObjectSound::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
 {
     SgaObject::ReadData( rIn, rReadVersion );
 
     if( rReadVersion >= 5 )
     {
         ByteString  aTmpStr;
-        UINT16      nTmp16;
+        sal_uInt16      nTmp16;
 
         rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16;
 
@@ -504,11 +504,11 @@ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL )
 
 // ------------------------------------------------------------------------
 
-BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
+sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
 {
     Graphic     aGraphic;
     ImageMap    aImageMap;
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if ( CreateIMapGraphic( rModel, aGraphic, aImageMap ) )
         bRet = SgaObject::CreateThumb( aGraphic );
@@ -537,10 +537,10 @@ BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
 
 // ------------------------------------------------------------------------
 
-BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
+sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
 {
     const FmFormPage*   pPage = static_cast< const FmFormPage* >( rModel.GetPage( 0 ) );
-    BOOL                bRet = FALSE;
+    sal_Bool                bRet = sal_False;
 
     if( pOut && pPage )
     {
@@ -566,11 +566,11 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode
             aOrigin.Y() += ( ( aDrawSize.Height() - aObjRect.GetHeight() ) >> 1 ) - aObjRect.Top();
             aMap.SetOrigin( aOrigin );
 
-            aView.SetPageVisible( FALSE );
-            aView.SetBordVisible( FALSE );
-            aView.SetGridVisible( FALSE );
-            aView.SetHlplVisible( FALSE );
-            aView.SetGlueVisible( FALSE );
+            aView.SetPageVisible( sal_False );
+            aView.SetBordVisible( sal_False );
+            aView.SetGridVisible( sal_False );
+            aView.SetHlplVisible( sal_False );
+            aView.SetGlueVisible( sal_False );
 
             pOut->Push();
             pOut->SetMapMode( aMap );
@@ -578,7 +578,7 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode
             aView.CompleteRedraw( pOut, Rectangle( pOut->PixelToLogic( Point() ), pOut->GetOutputSize() ) );
             pOut->Pop();
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -595,7 +595,7 @@ void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const
 
 // ------------------------------------------------------------------------
 
-void SgaObjectSvDraw::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
 {
     SgaObject::ReadData( rIn, rReadVersion );
 
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 730c1179a07e..bd1ae10cd746 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -79,7 +79,7 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
         mnThemeLockCount      ( 0 ),
         mnBroadcasterLockCount( 0 ),
         nDragPos              ( 0 ),
-        bDragging             ( FALSE )
+        bDragging             ( sal_False )
 {
     ImplCreateSvDrawStorage();
 
@@ -95,9 +95,9 @@ GalleryTheme::~GalleryTheme()
 
     for( GalleryObject* pEntry = aObjectList.First(); pEntry; pEntry = aObjectList.Next() )
     {
-        Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+        Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
         delete pEntry;
-        Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+        Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
     }
 }
 
@@ -107,10 +107,10 @@ void GalleryTheme::ImplCreateSvDrawStorage()
 {
     if( !pThm->IsImported() )
     {
-        aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
+        aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
         // #i50423# ReadOnly may not been set though the file can't be written (because of security reasons)
         if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() )
-            aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
+            aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
     }
     else
         aSvDrawStorageRef.Clear();
@@ -118,10 +118,10 @@ void GalleryTheme::ImplCreateSvDrawStorage()
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry )
+sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry )
 {
     SvStream*   pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE );
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pOStm )
     {
@@ -144,7 +144,7 @@ BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, Galler
             pEntry->aURL = rObj.GetURL();
             pEntry->nOffset = nOffset;
             pEntry->eObjKind = rObj.GetObjKind();
-            bRet = TRUE;
+            bRet = sal_True;
         }
 
         delete pOStm;
@@ -241,7 +241,7 @@ void GalleryTheme::ImplWrite()
                 delete pOStm;
             }
 
-            ImplSetModified( FALSE );
+            ImplSetModified( sal_False );
         }
     }
 }
@@ -286,14 +286,14 @@ INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const
 
 // ------------------------------------------------------------------------
 
-INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat )
+INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat )
 {
     INetURLObject   aDir( GetParent()->GetUserURL() );
     INetURLObject   aInfoFileURL( GetParent()->GetUserURL() );
     INetURLObject   aNewURL;
     sal_uInt32      nNextNumber = 1999;
     sal_Char const* pExt = NULL;
-    BOOL            bExists;
+    sal_Bool            bExists;
 
     aDir.Append( String( RTL_CONSTASCII_USTRINGPARAM( "dragdrop" ) ) );
     CreateDir( aDir );
@@ -342,11 +342,11 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor
             String aFileName( RTL_CONSTASCII_USTRINGPARAM( "gallery/svdraw/dd" ) );
             aNewURL = INetURLObject( aFileName += String::CreateFromInt32( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE );
 
-            bExists = FALSE;
+            bExists = sal_False;
 
             for( GalleryObject* pEntry = aObjectList.First(); pEntry && !bExists; pEntry = aObjectList.Next() )
                 if( pEntry->aURL == aNewURL )
-                    bExists = TRUE;
+                    bExists = sal_True;
         }
         else
         {
@@ -377,7 +377,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor
 
 // ------------------------------------------------------------------------
 
-void GalleryTheme::ImplBroadcast( ULONG nUpdatePos )
+void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos )
 {
     if( !IsBroadcasterLocked() )
     {
@@ -390,16 +390,16 @@ void GalleryTheme::ImplBroadcast( ULONG nUpdatePos )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::UnlockTheme()
+sal_Bool GalleryTheme::UnlockTheme()
 {
     DBG_ASSERT( mnThemeLockCount, "Theme is not locked" );
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( mnThemeLockCount )
     {
         --mnThemeLockCount;
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -407,7 +407,7 @@ BOOL GalleryTheme::UnlockTheme()
 
 // ------------------------------------------------------------------------
 
-void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos )
+void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos )
 {
     DBG_ASSERT( mnBroadcasterLockCount, "Broadcaster is not locked" );
 
@@ -417,9 +417,9 @@ void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rObj.IsValid() )
     {
@@ -454,7 +454,7 @@ BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos )
         else
             ImplWriteSgaObject( rObj, nInsertPos, NULL );
 
-        ImplSetModified( bRet = TRUE );
+        ImplSetModified( bRet = sal_True );
         ImplBroadcast( pFoundEntry ? aObjectList.GetPos( pFoundEntry ) : nInsertPos );
     }
 
@@ -463,7 +463,7 @@ BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos )
 
 // ------------------------------------------------------------------------
 
-SgaObject* GalleryTheme::AcquireObject( ULONG nPos )
+SgaObject* GalleryTheme::AcquireObject( sal_uIntPtr nPos )
 {
     return ImplReadSgaObject( aObjectList.GetObject( nPos ) );
 }
@@ -477,7 +477,7 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::RemoveObject( ULONG nPos )
+sal_Bool GalleryTheme::RemoveObject( sal_uIntPtr nPos )
 {
     GalleryObject* pEntry = aObjectList.Remove( nPos );
 
@@ -489,11 +489,11 @@ BOOL GalleryTheme::RemoveObject( ULONG nPos )
         if( SGA_OBJ_SVDRAW == pEntry->eObjKind )
             aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
-        Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+        Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
         delete pEntry;
-        Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+        Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
 
-        ImplSetModified( TRUE );
+        ImplSetModified( sal_True );
         ImplBroadcast( nPos );
     }
 
@@ -502,9 +502,9 @@ BOOL GalleryTheme::RemoveObject( ULONG nPos )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::ChangeObjectPos( ULONG nOldPos, ULONG nNewPos )
+sal_Bool GalleryTheme::ChangeObjectPos( sal_uIntPtr nOldPos, sal_uIntPtr nNewPos )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( nOldPos != nNewPos )
     {
@@ -518,7 +518,7 @@ BOOL GalleryTheme::ChangeObjectPos( ULONG nOldPos, ULONG nNewPos )
                 nOldPos++;
 
             aObjectList.Remove( nOldPos );
-            ImplSetModified( bRet = TRUE );
+            ImplSetModified( bRet = sal_True );
             ImplBroadcast( ( nNewPos < nOldPos ) ? nNewPos : ( nNewPos - 1 ) );
         }
     }
@@ -535,15 +535,15 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
         Graphic         aGraphic;
         String          aFormat;
         GalleryObject*  pEntry;
-        const ULONG     nCount = aObjectList.Count();
-        ULONG           i;
+        const sal_uIntPtr       nCount = aObjectList.Count();
+        sal_uIntPtr         i;
 
         LockBroadcaster();
-        bAbortActualize = FALSE;
+        bAbortActualize = sal_False;
 
         // LoeschFlag zuruecksetzen
         for ( i = 0; i < nCount; i++ )
-            aObjectList.GetObject( i )->bDummy = FALSE;
+            aObjectList.GetObject( i )->bDummy = sal_False;
 
         for( i = 0; ( i < nCount ) && !bAbortActualize; i++ )
         {
@@ -566,7 +566,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
                 {
                     SgaObjectSound aObjSound( aURL );
                     if( !InsertObject( aObjSound ) )
-                        pEntry->bDummy = TRUE;
+                        pEntry->bDummy = sal_True;
                 }
                 else
                 {
@@ -584,12 +584,12 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
                             pNewObj = (SgaObject*) new SgaObjectBmp( aGraphic, aURL, aFormat );
 
                         if( !InsertObject( *pNewObj ) )
-                            pEntry->bDummy = TRUE;
+                            pEntry->bDummy = sal_True;
 
                         delete pNewObj;
                     }
                     else
-                        pEntry->bDummy = TRUE; // Loesch-Flag setzen
+                        pEntry->bDummy = sal_True; // Loesch-Flag setzen
                 }
             }
             else
@@ -606,7 +606,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
                         SgaObjectSvDraw aNewObj( *pIStm, pEntry->aURL );
 
                         if( !InsertObject( aNewObj ) )
-                            pEntry->bDummy = TRUE;
+                            pEntry->bDummy = sal_True;
 
                         pIStm->SetBufferSize( 0L );
                     }
@@ -620,9 +620,9 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
         {
             if( pEntry->bDummy )
             {
-                Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+                Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
                 delete aObjectList.Remove( pEntry );
-                Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+                Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
 
                 pEntry = aObjectList.GetCurObject();
             }
@@ -685,10 +685,10 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
         CopyFile( aTmpURL, aInURL );
         KillFile( aTmpURL );
 
-        ULONG nStorErr = 0;
+        sal_uIntPtr nStorErr = 0;
 
         {
-            SvStorageRef aTempStorageRef( new SvStorage( FALSE, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
+            SvStorageRef aTempStorageRef( new SvStorage( sal_False, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
             aSvDrawStorageRef->CopyTo( aTempStorageRef );
             nStorErr = aSvDrawStorageRef->GetError();
         }
@@ -701,7 +701,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
         }
 
         KillFile( aTmpURL );
-        ImplSetModified( TRUE );
+        ImplSetModified( sal_True );
         ImplWrite();
         UnlockBroadcaster();
     }
@@ -709,7 +709,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
 
 // ------------------------------------------------------------------------
 
-GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly )
+GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly )
 {
     DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
@@ -724,7 +724,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
             String          aThemeName;
             sal_uInt32      nThemeId = 0;
             sal_uInt16      nVersion;
-            BOOL            bThemeNameFromResource = FALSE;
+            sal_Bool            bThemeNameFromResource = sal_False;
 
             *pIStm >> nVersion;
 
@@ -776,7 +776,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
                 aPathURL.removeFinalSlash();
                 pRet = new GalleryThemeEntry( aPathURL, aThemeName,
                                               String(rURL.GetBase()).Copy( 2, 6 ).ToInt32(),
-                                              bReadOnly, FALSE, FALSE, nThemeId,
+                                              bReadOnly, sal_False, sal_False, nThemeId,
                                               bThemeNameFromResource );
             }
 
@@ -789,16 +789,16 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL )
+sal_Bool GalleryTheme::GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool )
 {
     SgaObject*  pObj = AcquireObject( nPos );
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( pObj )
     {
         rBmp = pObj->GetThumbBmp();
         ReleaseObject( pObj );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -806,10 +806,10 @@ BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
+sal_Bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress )
 {
     const GalleryObject*    pObject = ImplGetGalleryObject( nPos );
-    BOOL                    bRet = FALSE;
+    sal_Bool                    bRet = sal_False;
 
     if( pObject )
     {
@@ -837,7 +837,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
                         ImageMap aIMap;
 
                         if( CreateIMapGraphic( *aModel.GetModel(), rGraphic, aIMap ) )
-                            bRet = TRUE;
+                            bRet = sal_True;
                         else
                         {
                             VirtualDevice aVDev;
@@ -848,7 +848,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
                             aView.ShowSdrPage(aView.GetModel()->GetPage(0));
                             aView.MarkAll();
                             rGraphic = aView.GetAllMarkedGraphic();
-                            bRet = TRUE;
+                            bRet = sal_True;
                         }
                     }
                 }
@@ -865,7 +865,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
                     aBmp.Replace( COL_LIGHTMAGENTA, COL_WHITE );
                     rGraphic = aBmp;
                     ReleaseObject( pObj );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
             break;
@@ -880,13 +880,13 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rGraphic.GetType() != GRAPHIC_NONE )
     {
-        ULONG           nExportFormat = CVT_UNKNOWN;
+        sal_uIntPtr           nExportFormat = CVT_UNKNOWN;
         const GfxLink   aGfxLink( ( (Graphic&) rGraphic ).GetLink() );
 
         if( aGfxLink.GetDataSize() )
@@ -958,10 +958,10 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL )
+sal_Bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool )
 {
     const GalleryObject*    pObject = ImplGetGalleryObject( nPos );
-    BOOL                    bRet = FALSE;
+    sal_Bool                    bRet = sal_False;
 
     if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) )
     {
@@ -987,11 +987,11 @@ BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos )
 {
     INetURLObject   aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) );
     SvStorageRef    xStor( GetSvDrawStorage() );
-    BOOL            bRet = FALSE;
+    sal_Bool            bRet = sal_False;
 
     if( xStor.Is() )
     {
@@ -1034,10 +1034,10 @@ BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStream, BOOL )
+sal_Bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxModelStream, sal_Bool )
 {
     const GalleryObject*    pObject = ImplGetGalleryObject( nPos );
-    BOOL                    bRet = FALSE;
+    sal_Bool                    bRet = sal_False;
 
     if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) )
     {
@@ -1051,7 +1051,7 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea
 
             if( xIStm.Is() && !xIStm->GetError() )
             {
-                UINT32 nVersion = 0;
+                sal_uInt32 nVersion = 0;
 
                 xIStm->SetBufferSize( 16348 );
 
@@ -1087,11 +1087,11 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, sal_uIntPtr nInsertPos )
 {
     INetURLObject   aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) );
     SvStorageRef    xStor( GetSvDrawStorage() );
-    BOOL            bRet = FALSE;
+    sal_Bool            bRet = sal_False;
 
     if( xStor.Is() )
     {
@@ -1123,15 +1123,15 @@ BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream,
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL )
+sal_Bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool )
 {
     const GalleryObject*    pObject = ImplGetGalleryObject( nPos );
-    BOOL                    bRet = FALSE;
+    sal_Bool                    bRet = sal_False;
 
     if( pObject )
     {
         rURL = INetURLObject( ImplGetURL( pObject ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -1139,13 +1139,13 @@ BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos )
 {
     Graphic         aGraphic;
     String          aFormat;
     SgaObject*      pNewObj = NULL;
-    const USHORT    nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
-    BOOL            bRet = FALSE;
+    const sal_uInt16    nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
+    sal_Bool            bRet = sal_False;
 
     if( nImportRet != SGA_IMPORT_NONE )
     {
@@ -1160,7 +1160,7 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
         pNewObj = (SgaObject*) new SgaObjectSound( rURL );
 
     if( pNewObj && InsertObject( *pNewObj, nInsertPos ) )
-        bRet = TRUE;
+        bRet = sal_True;
 
     delete pNewObj;
 
@@ -1169,11 +1169,11 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos )
 {
     INetURLObject                   aURL;
     ::std::vector< INetURLObject >  aURLVector;
-    BOOL                            bRet = FALSE;
+    sal_Bool                            bRet = sal_False;
 
     try
     {
@@ -1225,9 +1225,9 @@ BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rxTransferable.is() )
     {
@@ -1278,7 +1278,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
         else
         {
             Graphic aGraphic;
-            ULONG   nFormat = 0;
+            sal_uIntPtr nFormat = 0;
 
             if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ) )
                 nFormat = SOT_FORMATSTR_ID_SVXB;
@@ -1293,7 +1293,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
 
         if( pGraphic )
         {
-            bRet = FALSE;
+            bRet = sal_False;
 
             if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVIM ) )
             {
@@ -1331,7 +1331,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
 
 // -----------------------------------------------------------------------------
 
-void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos )
+void GalleryTheme::CopyToClipboard( Window* pWindow, sal_uIntPtr nPos )
 {
     GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false );
     pTransferable->CopyToClipboard( pWindow );
@@ -1339,7 +1339,7 @@ void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos )
 
 // -----------------------------------------------------------------------------
 
-void GalleryTheme::StartDrag( Window* pWindow, ULONG nPos )
+void GalleryTheme::StartDrag( Window* pWindow, sal_uIntPtr nPos )
 {
     GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true );
     pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK );
@@ -1353,7 +1353,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
     const INetURLObject aRelURL2( GetParent()->GetUserURL() );
     INetURLObject       aNewURL, aTempURL;
     sal_uInt32          nCount = GetObjectCount();
-    BOOL                bRel;
+    sal_Bool                bRel;
 
     rOStm << (sal_uInt16) 0x0004;
     rOStm << ByteString( GetRealName(), RTL_TEXTENCODING_UTF8 );
@@ -1367,7 +1367,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
         if( SGA_OBJ_SVDRAW == pObj->eObjKind )
         {
             aPath = GetSvDrawStreamNameFromURL( pObj->aURL );
-            bRel = FALSE;
+            bRel = sal_False;
         }
         else
         {
@@ -1399,7 +1399,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
     }
 
     // neuerdings wird ein 512-Byte-Reservepuffer gechrieben;
-    // um diesen zu erkennen werden zwei ULONG-Ids geschrieben
+    // um diesen zu erkennen werden zwei sal_uIntPtr-Ids geschrieben
     rOStm << COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) << COMPAT_FORMAT( 'E', 'S', 'R', 'V' );
 
     const long      nReservePos = rOStm.Tell();
@@ -1438,7 +1438,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
 
     if( nVersion >= 0x0004 )
     {
-        UINT16 nTmp16;
+        sal_uInt16 nTmp16;
         rIStm >> nTmp16;
         nTextEncoding = (rtl_TextEncoding) nTmp16;
     }
@@ -1453,13 +1453,13 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
         INetURLObject   aRelURL1( GetParent()->GetRelativeURL() );
         INetURLObject   aRelURL2( GetParent()->GetUserURL() );
         sal_uInt32      nId1, nId2;
-        BOOL            bRel;
+        sal_Bool            bRel;
 
         for( pObj = aObjectList.First(); pObj; pObj = aObjectList.Next() )
         {
-            Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pObj ) ) );
+            Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) );
             delete pObj;
-            Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pObj ) ) );
+            Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) );
         }
 
         aObjectList.Clear();
@@ -1540,7 +1540,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
         {
             VersionCompat*  pCompat = new VersionCompat( rIStm, STREAM_READ );
             sal_uInt32      nTemp32;
-            BOOL            bThemeNameFromResource = FALSE;
+            sal_Bool            bThemeNameFromResource = sal_False;
 
             rIStm >> nTemp32;
 
@@ -1556,7 +1556,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
     else
         rIStm.SetError( SVSTREAM_READ_ERROR );
 
-    ImplSetModified( FALSE );
+    ImplSetModified( sal_False );
 
     return rIStm;
 }
@@ -1575,25 +1575,25 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme )
     return rTheme.ReadData( rIn );
 }
 
-void GalleryTheme::ImplSetModified( BOOL bModified )
+void GalleryTheme::ImplSetModified( sal_Bool bModified )
 { pThm->SetModified( bModified ); }
 
 const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); }
 const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); }
 const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); }
 const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); }
-UINT32 GalleryTheme::GetId() const { return pThm->GetId(); }
-void GalleryTheme::SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
-BOOL GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
-BOOL GalleryTheme::IsImported() const { return pThm->IsImported(); }
-BOOL GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
-BOOL GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
-BOOL GalleryTheme::IsModified() const { return pThm->IsModified(); }
+sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); }
+void GalleryTheme::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
+sal_Bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
+sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); }
+sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
+sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
+sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
 const String& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); }
 
 void GalleryTheme::InsertAllThemes( ListBox& rListBox )
 {
-    for( USHORT i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
+    for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
         rListBox.InsertEntry( String( GAL_RESID( i ) ) );
 }
 
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 395d3d511841..1d29cba30c8c 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -184,7 +184,7 @@ public:
 
     //=====  IAccessibleViewforwarder  ========================================
 
-    virtual BOOL IsValid (void) const;
+    virtual sal_Bool IsValid (void) const;
     virtual Rectangle GetVisibleArea() const;
     virtual Point LogicToPixel (const Point& rPoint) const;
     virtual Size LogicToPixel (const Size& rSize) const;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index f7eba57bd8fb..5bd5714b8039 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -109,14 +109,14 @@ namespace svx
     struct SvxShowCharSetItem
     {
         SvxShowCharSet&             mrParent;
-        USHORT                      mnId;
+        sal_uInt16                      mnId;
         XubString                   maText;
         Rectangle                   maRect;
         SvxShowCharSetItemAcc*      m_pItem;
         SvxShowCharSetAcc*          m_pParent;
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAcc;
 
-        SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*  _pParent,USHORT _nPos );
+        SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*  _pParent,sal_uInt16 _nPos );
         ~SvxShowCharSetItem();
 
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >    GetAccessible();
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index ab8bda588c5a..a8bfad89090b 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -129,7 +129,7 @@ namespace svxform
         ~DataTreeListBox();
 
         virtual PopupMenu*      CreateContextMenu( void );
-        virtual void            ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry );
+        virtual void            ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry );
         virtual sal_Int8        AcceptDrop( const AcceptDropEvent& rEvt );
         virtual sal_Int8        ExecuteDrop( const ExecuteDropEvent& rEvt );
         virtual void            StartDrag( sal_Int8 nAction, const Point& rPosPixel );
@@ -166,7 +166,7 @@ namespace svxform
         void                        AddChildren( SvLBoxEntry* _pParent,
                                                  const ImageList& _rImgLst,
                                                  const XNode_ref& _xNode );
-        bool                        DoToolBoxAction( USHORT _nToolBoxID );
+        bool                        DoToolBoxAction( sal_uInt16 _nToolBoxID );
         SvLBoxEntry*                AddEntry( ItemNode* _pNewNode, bool _bIsElement );
         SvLBoxEntry*                AddEntry( const XPropertySet_ref& _rPropSet );
         void                        EditEntry( const XPropertySet_ref& _rPropSet );
@@ -182,12 +182,12 @@ namespace svxform
         virtual void                Resize();
 
         inline bool                 HasModel() const { return m_bHasModel; }
-        String                      SetModel( const XModel_ref& _xModel, USHORT _nPagePos );
+        String                      SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos );
         void                        ClearModel();
         String                      LoadInstance( const PropertyValue_seq& _xPropSeq,
                                                   const ImageList& _rImgLst );
 
-        bool                        DoMenuAction( USHORT _nMenuID );
+        bool                        DoMenuAction( sal_uInt16 _nMenuID );
         void                        EnableMenuItems( Menu* _pMenu );
 
         inline SvLBoxEntry*         GetSelectedItem() const { return m_aItemList.FirstSelected(); }
@@ -227,7 +227,7 @@ namespace svxform
         long                        m_nMinWidth;
         long                        m_nMinHeight;
         long                        m_nBorderHeight;
-        USHORT                      m_nLastSelectedPos;
+        sal_uInt16                      m_nLastSelectedPos;
         bool                        m_bShowDetails;
         bool                        m_bIsNotifyDisabled;
         Size                        m_a2Size;
@@ -250,14 +250,14 @@ namespace svxform
         DECL_LINK(                  ActivatePageHdl, TabControl* );
         DECL_LINK(                  UpdateHdl, Timer* );
 
-        XFormsPage*                 GetCurrentPage( USHORT& rCurId );
+        XFormsPage*                 GetCurrentPage( sal_uInt16& rCurId );
         void                        LoadModels();
         void                        SetPageModel();
         void                        ClearAllPageModels( bool bClearPages );
         void                        InitPages();
         void                        CreateInstancePage( const PropertyValue_seq& _xPropSeq );
         bool                        HasFirstInstancePage() const;
-        USHORT                      GetNewPageId() const;
+        sal_uInt16                      GetNewPageId() const;
 
     protected:
         virtual void                Resize();
@@ -574,7 +574,7 @@ namespace svxform
         inline void             SetName( const String& _rName ) { m_aNameED.SetText( _rName );}
         inline String           GetURL() const { return m_aURLED.GetText(); }
         inline void             SetURL( const String& _rURL ) { m_aURLED.SetText( _rURL );}
-        inline bool             IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != FALSE ); }
+        inline bool             IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != sal_False ); }
         inline void             SetLinkInstance( bool _bLink ) { m_aLinkInstanceCB.Check( _bLink != false ); }
     };
 
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index d2a928bffb63..5dd531de8090 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -69,7 +69,7 @@ namespace svxform
 
     private:
         Link    m_aHandler;
-        ULONG   m_nEventId;
+        sal_uLong   m_nEventId;
 
     private:
         DECL_LINK( OnCall, void* );
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index b35b46a941aa..ebe104058509 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -591,14 +591,14 @@ class RecovDocListEntry : public SvLBoxString
         //---------------------------------------
         /** @short TODO */
         RecovDocListEntry(      SvLBoxEntry* pEntry,
-                                USHORT       nFlags,
+                                sal_uInt16       nFlags,
                           const String&      sText );
 
         //---------------------------------------
         /** @short TODO */
         virtual void Paint(const Point&       aPos   ,
                                  SvLBox&      aDevice,
-                                 USHORT       nFlags ,
+                                 sal_uInt16       nFlags ,
                                  SvLBoxEntry* pEntry );
 };
 
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 487c9287c972..598e9d61196a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -390,7 +390,7 @@ namespace svxform
         void ClearBranch( FmFormData* pParentData );
         void UpdateContent( FmFormShell* pNewShell );
 
-        void Insert( FmEntryData* pEntryData, ULONG nRelPos = LIST_APPEND,
+        void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = LIST_APPEND,
                                               sal_Bool bAlterModel = sal_False );
         void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False );
 
@@ -440,7 +440,7 @@ namespace svxform
         SvLBoxEntry*        m_pRootEntry;
         SvLBoxEntry*        m_pEditEntry;
 
-        ULONG               nEditEvent;
+        sal_uLong               nEditEvent;
 
         SELDATA_ITEMS       m_sdiState;
         Point               m_aTimerTriggered;      // die Position, an der der DropTimer angeschaltet wurde
@@ -465,7 +465,7 @@ namespace svxform
         sal_Bool        IsDeleteAllowed();
         FmControlData*  NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True );
         void            NewForm( SvLBoxEntry* pParentEntry );
-        SvLBoxEntry*    Insert( FmEntryData* pEntryData, ULONG nRelPos=LIST_APPEND );
+        SvLBoxEntry*    Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND );
         void            Remove( FmEntryData* pEntryData );
 
 
diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx
index 109a445dca70..5cad571dee7b 100644
--- a/svx/source/inc/fmgroup.hxx
+++ b/svx/source/inc/fmgroup.hxx
@@ -63,9 +63,9 @@ public:
     virtual XIdlClassRef    getIdlClass();
 
     // XGroup
-    virtual INT32 getFormControlCount();
+    virtual sal_Int32 getFormControlCount();
     virtual XFormControlRef getFormControlByName( const XubString& sName ) const;
-    virtual XFormControlRef getFormControlByIndex( INT32 Index ) const;
+    virtual XFormControlRef getFormControlByIndex( sal_Int32 Index ) const;
     virtual void appendFormControl( const XFormControlRef& FormControl );
     virtual XFormControlRef removeFormControl( const XFormControlRef& FormControl );
 
@@ -93,11 +93,11 @@ public:
 
     // PropertySetInterface
     virtual FmXPropertySetInfo* createPropertySetInfo() const;
-    virtual BOOL setPropertyValue( UINT16 nId, const XubString& aPropertyName,
+    virtual sal_Bool setPropertyValue( sal_uInt16 nId, const XubString& aPropertyName,
                                    const UsrAny& aValue,
                                    PropertyChangeEventSequence* pSeq,
-                                   INT32 nIndex );
-    virtual UsrAny getPropertyValue( UINT16 nId, const XubString& aPropertyName ) const;
+                                   sal_Int32 nIndex );
+    virtual UsrAny getPropertyValue( sal_uInt16 nId, const XubString& aPropertyName ) const;
     virtual void addPropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
     virtual void removePropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
 };
@@ -112,7 +112,7 @@ class FmXGroupModelInfo : public FmXControlModelInfo
 
 protected:
     FmXGroupModelInfo( const FmXGroupModel* pCp );
-    virtual void fillProperties( UINT32& nIndex, PropertySequence& aSeq ) const;
+    virtual void fillProperties( sal_uInt32& nIndex, PropertySequence& aSeq ) const;
 };
 
 
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 5398973cb6b3..fae15aeb18df 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -45,7 +45,7 @@ class FmFormObj: public SdrUnoObj
                 // m_pEnvironmentHistory was created
 
     FmFormView*     m_pControlCreationView;
-    ULONG       m_nControlCreationEvent;
+    sal_uLong       m_nControlCreationEvent;
 
     // Informationen fuer die Controlumgebung
     // werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index e56f9fd64a36..73fe666c3528 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -123,11 +123,11 @@ class FmFormPage;
 struct SAL_DLLPRIVATE FmLoadAction
 {
     FmFormPage* pPage;
-    ULONG       nEventId;
+    sal_uLong       nEventId;
     sal_uInt16  nFlags;
 
     FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { }
-    FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ULONG _nEventId )
+    FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uLong _nEventId )
         :pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags )
     {
     }
@@ -200,8 +200,8 @@ class SAL_DLLPRIVATE FmXFormShell   :public FmXFormShell_BASE
     SvLongs             m_arrRelativeGridColumn;
 
     ::osl::Mutex    m_aMutex;
-    ULONG           m_nInvalidationEvent;
-    ULONG           m_nActivationEvent;
+    sal_uLong           m_nInvalidationEvent;
+    sal_uLong           m_nActivationEvent;
     ::std::queue< FmLoadAction >
                     m_aLoadingPages;
 
diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx
index 7baa4f451a3f..d37099f40cf4 100644
--- a/svx/source/inc/fmslotinvalidator.hxx
+++ b/svx/source/inc/fmslotinvalidator.hxx
@@ -35,7 +35,7 @@ namespace svx
 {
 //........................................................................
 
-    typedef USHORT SfxSlotId;
+    typedef sal_uInt16 SfxSlotId;
 
     //====================================================================
     //= ISlotInvalidator
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index afb737864bd8..2b6ccb09d89d 100644
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -50,7 +50,7 @@ namespace svx
         ~TextControlCharAttribDialog();
 
     protected:
-        virtual void PageCreated( USHORT _nId, SfxTabPage& _rPage );
+        virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage );
     };
 
     //====================================================================
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 8bb682690b36..9641db8c8a19 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -252,7 +252,7 @@ private:
     void addWindow(const SdrPageWindow&);
     void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC );
     void Activate(sal_Bool bSync = sal_False);
-    void Deactivate(BOOL bDeactivateController = TRUE);
+    void Deactivate(sal_Bool bDeactivateController = sal_True);
 
     SdrObject*  implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor );
     SdrObject*  implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc );
@@ -266,8 +266,8 @@ private:
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats,
         sal_uInt16 _nControlObjectID,
         const ::rtl::OUString& _rFieldPostfix,
-        UINT32 _nInventor,
-        UINT16 _nLabelObjectID,
+        sal_uInt32 _nInventor,
+        sal_uInt16 _nLabelObjectID,
         SdrPage* _pLabelPage,
         SdrPage* _pControlPage,
         SdrModel* _pModel,
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 96da1c9aa5af..db21979ab756 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -63,19 +63,19 @@ namespace svxform
             on the type of our document
         */
         SVX_DLLPUBLIC ::rtl::OUString
-                getToolboxResourceName( USHORT _nSlotId ) const;
+                getToolboxResourceName( sal_uInt16 _nSlotId ) const;
 
         /** toggles the toolbox associated with the given slot
         */
-        SVX_DLLPUBLIC void    toggleToolbox( USHORT _nSlotId ) const;
+        SVX_DLLPUBLIC void    toggleToolbox( sal_uInt16 _nSlotId ) const;
 
         /** determines whether the toolbox associated with the given slot is currently visible
         */
-        SVX_DLLPUBLIC bool    isToolboxVisible( USHORT _nSlotId ) const;
+        SVX_DLLPUBLIC bool    isToolboxVisible( sal_uInt16 _nSlotId ) const;
 
         /** ensures that a given toolbox is visible
         */
-        inline void showToolbox( USHORT _SlotId ) const
+        inline void showToolbox( sal_uInt16 _SlotId ) const
         {
             if ( !isToolboxVisible( _SlotId ) )
                 toggleToolbox( _SlotId );
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index f9e3727988af..77554da2587e 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -75,7 +75,7 @@ public:
     void                SetKeyboardNeighbors(
                             FrameBorderType eLeft, FrameBorderType eRight,
                             FrameBorderType eTop, FrameBorderType eBottom );
-    FrameBorderType     GetKeyboardNeighbor( USHORT nKeyCode ) const;
+    FrameBorderType     GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const;
 
 private:
     const FrameBorderType meType;       /// Frame border type (position in control).
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index acead19ba9ee..cde1533eca46 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -831,7 +831,7 @@ public:
 
 protected:
     virtual Window* getEventWindow() const;
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 
     // default implementations call our focus listeners, don't forget to call them if you override this
     virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent );
@@ -947,7 +947,7 @@ public:
     virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
 protected:
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 
     virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent );
     virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent );
@@ -999,7 +999,7 @@ public:
 
 protected:
     virtual Window* getEventWindow() const;
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 };
 
 //==================================================================
@@ -1051,7 +1051,7 @@ public:
     virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException);
 
 protected:
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 
     DECL_LINK( OnDoubleClick, void* );
 };
@@ -1096,7 +1096,7 @@ public:
     virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException);
 
 protected:
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 };
 
 //==================================================================
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 2f7b60073200..5fdcfb320443 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -65,7 +65,7 @@ namespace svx
             @return String
                 The string.
         */
-        String getString( USHORT _nResId )
+        String getString( sal_uInt16 _nResId )
         {
             return String( ResId( _nResId, *m_pResMgr ) );
         }
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
index 3014b42d4721..91add6aaa48e 100644
--- a/svx/source/inc/svdoimp.hxx
+++ b/svx/source/inc/svdoimp.hxx
@@ -98,9 +98,9 @@ void ImpCalcBmpFillSizes( Size&            rStartOffset,
                           const Size&      rBmpSize,
                           const Size&      rBmpPerCent,
                           const Size&      rBmpOffPerCent,
-                          BOOL             bBmpLogSize,
-                          BOOL             bBmpTile,
-                          BOOL             bBmpStretch,
+                          sal_Bool             bBmpLogSize,
+                          sal_Bool             bBmpTile,
+                          sal_Bool             bBmpStretch,
                           RECT_POINT       eBmpRectPoint );
 
 
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index b62a71e56525..bbb5cb261b46 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -60,7 +60,7 @@ protected:
     virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
 
     // SvLBox
-    virtual BOOL DoubleClickHdl();
+    virtual sal_Bool DoubleClickHdl();
 
     using SvLBox::ExecuteDrop;
 };
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 79fee9082999..774e786b80f7 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -59,7 +59,7 @@ private:
     DECL_LINK( TbxSelectHdl, ToolBox* );
 
 public:
-    SvxFmConfigWin( USHORT nId, ResId aRIdWin, ResId aRIdTbx );
+    SvxFmConfigWin( sal_uInt16 nId, ResId aRIdWin, ResId aRIdTbx );
     ~SvxFmConfigWin();
 
     void            Update();
@@ -71,7 +71,7 @@ public:
 class SvxFmTbxCtlConfig : public SfxToolBoxControl
 {
 private:
-    UINT16 nLastSlot;
+    sal_uInt16 nLastSlot;
 
 protected:
     using SfxToolBoxControl::Select;
@@ -79,11 +79,11 @@ protected:
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlConfig() {}
 
-    virtual void                Select( USHORT nModifier );
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                Select( sal_uInt16 nModifier );
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
@@ -96,12 +96,12 @@ class SvxFmTbxCtlAbsRec : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlAbsRec();
 
     virtual Window* CreateItemWindow( Window* pParent );
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 };
 
@@ -111,7 +111,7 @@ class SvxFmTbxCtlRecText : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlRecText();
 
     virtual Window* CreateItemWindow( Window* pParent );
@@ -123,7 +123,7 @@ class SvxFmTbxCtlRecFromText : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlRecFromText();
 
     virtual Window* CreateItemWindow( Window* pParent );
@@ -137,11 +137,11 @@ class SvxFmTbxCtlRecTotal : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlRecTotal();
 
     virtual Window* CreateItemWindow( Window* pParent );
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 };
 
@@ -150,7 +150,7 @@ class SvxFmTbxNextRec : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 //========================================================================
@@ -158,7 +158,7 @@ class SvxFmTbxPrevRec : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 7089da42860b..ba100a2e2ab0 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -47,7 +47,7 @@ TYPEINIT1(SvxSmartTagItem, SfxPoolItem);
 
 // class SvxFontItem -----------------------------------------------------
 
-SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
+SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId,
                                   const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
                                   const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence,
                                   const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
@@ -72,12 +72,12 @@ SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
+sal_Bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, sal_uInt8 /* nMemberId */ ) const
 {
     return sal_False;
 }
 // -----------------------------------------------------------------------
-sal_Bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
+sal_Bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId */)
 {
     return sal_False;
 }
@@ -110,14 +110,14 @@ SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxSmartTagItem::Store( SvStream& rStream, USHORT /*nItemVersion*/ ) const
+SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ ) const
 {
     return rStream;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxSmartTagItem::Create(SvStream& , USHORT) const
+SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const
 {
     return 0;
 }
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 183db0e3a722..b5f399f2b88f 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -71,14 +71,14 @@ TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) );
 // class SvxHorJustifyItem -----------------------------------------------
 
 
-SvxHorJustifyItem::SvxHorJustifyItem( const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)SVX_HOR_JUSTIFY_STANDARD )
+SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)SVX_HOR_JUSTIFY_STANDARD )
 {
 }
 
 SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify,
-                                      const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)eJustify )
+                                      const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)eJustify )
 {
 }
 
@@ -107,7 +107,7 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -151,7 +151,7 @@ sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 
-sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -178,7 +178,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                     case table::CellHoriJustify_REPEAT:   eSvx = SVX_HOR_JUSTIFY_REPEAT;   break;
                     default: ; //prevent warning
                 }
-                SetValue( (USHORT)eSvx );
+                SetValue( (sal_uInt16)eSvx );
             }
             break;
         case MID_HORJUST_ADJUST:
@@ -198,7 +198,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                     case style::ParagraphAdjust_BLOCK:   eSvx = SVX_HOR_JUSTIFY_BLOCK;  break;
                     case style::ParagraphAdjust_CENTER:  eSvx = SVX_HOR_JUSTIFY_CENTER; break;
                 }
-                SetValue( (USHORT)eSvx );
+                SetValue( (sal_uInt16)eSvx );
             }
     }
     return sal_True;
@@ -206,7 +206,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 //------------------------------------------------------------------------
 
-XubString SvxHorJustifyItem::GetValueText( USHORT nVal ) const
+XubString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) const
 {
     DBG_ASSERT( nVal <= SVX_HOR_JUSTIFY_REPEAT, "enum overflow!" );
     return SVX_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal);
@@ -221,29 +221,29 @@ SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
-    USHORT nVal;
+    sal_uInt16 nVal;
     rStream >> nVal;
     return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() );
 }
 //------------------------------------------------------------------------
 
-USHORT SvxHorJustifyItem::GetValueCount() const
+sal_uInt16 SvxHorJustifyItem::GetValueCount() const
 {
     return SVX_HOR_JUSTIFY_REPEAT + 1;  // letzter Enum-Wert + 1
 }
 
 // class SvxVerJustifyItem -----------------------------------------------
 
-SvxVerJustifyItem::SvxVerJustifyItem( const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)SVX_VER_JUSTIFY_STANDARD )
+SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)SVX_VER_JUSTIFY_STANDARD )
 {
 }
 
 SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify,
-                                      const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)eJustify )
+                                      const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)eJustify )
 {
 }
 
@@ -273,7 +273,7 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -309,7 +309,7 @@ sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 
-sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -329,7 +329,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                     case style::VerticalAlignment_BOTTOM:   eSvx = SVX_VER_JUSTIFY_BOTTOM;  break;
                     default:;
                 }
-                SetValue( (USHORT)eSvx );
+                SetValue( (sal_uInt16)eSvx );
                 break;
             }
         default:
@@ -352,7 +352,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                     case table::CellVertJustify_BOTTOM:   eSvx = SVX_VER_JUSTIFY_BOTTOM;    break;
                     default: ; //prevent warning
                 }
-                SetValue( (USHORT)eSvx );
+                SetValue( (sal_uInt16)eSvx );
                 break;
             }
     }
@@ -362,7 +362,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 //------------------------------------------------------------------------
 
-XubString SvxVerJustifyItem::GetValueText( USHORT nVal ) const
+XubString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) const
 {
     DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" );
     return SVX_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal);
@@ -377,16 +377,16 @@ SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
-    USHORT nVal;
+    sal_uInt16 nVal;
     rStream >> nVal;
     return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() );
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxVerJustifyItem::GetValueCount() const
+sal_uInt16 SvxVerJustifyItem::GetValueCount() const
 {
     return SVX_VER_JUSTIFY_BOTTOM + 1;  // letzter Enum-Wert + 1
 }
@@ -394,12 +394,12 @@ USHORT SvxVerJustifyItem::GetValueCount() const
 // class SvxOrientationItem ----------------------------------------------
 
 SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
-                                        const USHORT nId):
-    SfxEnumItem( nId, (USHORT)eOrientation )
+                                        const sal_uInt16 nId):
+    SfxEnumItem( nId, (sal_uInt16)eOrientation )
 {
 }
 
-SvxOrientationItem::SvxOrientationItem( INT32 nRotation, BOOL bStacked, const USHORT nId ) :
+SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, sal_Bool bStacked, const sal_uInt16 nId ) :
     SfxEnumItem( nId )
 {
     SetFromRotation( nRotation, bStacked );
@@ -430,7 +430,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     table::CellOrientation eUno = table::CellOrientation_STANDARD;
     switch ( (SvxCellOrientation)GetValue() )
@@ -444,7 +444,7 @@ sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) co
     return sal_True;
 }
 
-sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     table::CellOrientation eOrient;
     if(!(rVal >>= eOrient))
@@ -463,13 +463,13 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/
         case table::CellOrientation_STACKED:    eSvx = SVX_ORIENTATION_STACKED;   break;
         default: ; //prevent warning
     }
-    SetValue( (USHORT)eSvx );
+    SetValue( (sal_uInt16)eSvx );
     return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-XubString SvxOrientationItem::GetValueText( USHORT nVal ) const
+XubString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const
 {
     DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" );
     return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal);
@@ -484,30 +484,30 @@ SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
-    USHORT nVal;
+    sal_uInt16 nVal;
     rStream >> nVal;
     return new SvxOrientationItem( (SvxCellOrientation)nVal, Which() );
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxOrientationItem::GetValueCount() const
+sal_uInt16 SvxOrientationItem::GetValueCount() const
 {
     return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1
 }
 
 //------------------------------------------------------------------------
 
-BOOL SvxOrientationItem::IsStacked() const
+sal_Bool SvxOrientationItem::IsStacked() const
 {
     return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED;
 }
 
-INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const
+sal_Int32 SvxOrientationItem::GetRotation( sal_Int32 nStdAngle ) const
 {
-    INT32 nAngle = nStdAngle;
+    sal_Int32 nAngle = nStdAngle;
     switch( static_cast< SvxCellOrientation >( GetValue() ) )
     {
         case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;
@@ -517,7 +517,7 @@ INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const
     return nAngle;
 }
 
-void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked )
+void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked )
 {
     if( bStacked )
     {
@@ -533,7 +533,7 @@ void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked )
 
 // class SvxMarginItem ---------------------------------------------------
 
-SvxMarginItem::SvxMarginItem( const USHORT nId ) :
+SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) :
 
     SfxPoolItem( nId ),
 
@@ -550,7 +550,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft,
                               sal_Int16 nTop,
                               sal_Int16 nRight,
                               sal_Int16 nBottom,
-                              const USHORT nId ) :
+                              const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
 
     nLeftMargin  ( nLeft ),
@@ -646,7 +646,7 @@ SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
     sal_Int16   nLeft;
     sal_Int16   nTop;
@@ -661,7 +661,7 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const
 
 //------------------------------------------------------------------------
 
-SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) const
+SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
 {
     rStream << nLeftMargin;
     rStream << nTopMargin;
@@ -673,7 +673,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) cons
 
 //------------------------------------------------------------------------
 
-sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -701,7 +701,7 @@ sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 
 //------------------------------------------------------------------------
 
-sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
     long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX;   // Members sind sal_Int16
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 474bf19f7bd6..114ce405bb69 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -66,14 +66,14 @@ TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0));
 |*
 *************************************************************************/
 
-SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eStyle)
+SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eStyle)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, USHORT nId) :
+SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -87,7 +87,7 @@ SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartStyleItem(rIn, Which());
 }
@@ -99,14 +99,14 @@ SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 *************************************************************************/
 
 SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr eDataDescr,
-                                             USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eDataDescr)
+                                             sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eDataDescr)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, USHORT nId) :
+SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -120,7 +120,7 @@ SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartDataDescrItem(rIn, Which());
 }
@@ -132,14 +132,14 @@ SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 *************************************************************************/
 
 SvxChartLegendPosItem::SvxChartLegendPosItem(SvxChartLegendPos eLegendPos,
-                                             USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eLegendPos)
+                                             sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eLegendPos)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, USHORT nId) :
+SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -153,7 +153,7 @@ SfxPoolItem* SvxChartLegendPosItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartLegendPosItem(rIn, Which());
 }
@@ -165,14 +165,14 @@ SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 *************************************************************************/
 
 SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder,
-                                             USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrder)
+                                             sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrder)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, USHORT nId) :
+SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -186,14 +186,14 @@ SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartTextOrderItem(rIn, Which());
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // the order of the two enums is not equal, so a mapping is required
     ::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -218,7 +218,7 @@ sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BY
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // the order of the two enums is not equal, so a mapping is required
     ::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -247,7 +247,7 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
             return sal_False;
     }
 
-    SetValue( (USHORT)eOrder );
+    SetValue( (sal_uInt16)eOrder );
 
     return sal_True;
 }
@@ -259,14 +259,14 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
 *************************************************************************/
 
 SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient eOrient,
-                                               USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrient)
+                                               sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrient)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, USHORT nId) :
+SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -280,7 +280,7 @@ SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartTextOrientItem(rIn, Which());
 }
@@ -291,7 +291,7 @@ SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) cons
 |*
 *************************************************************************/
 
-SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) :
     SfxPoolItem(nId),
     fVal(fValue)
 {
@@ -299,7 +299,7 @@ SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
 
 // -----------------------------------------------------------------------
 
-SvxDoubleItem::SvxDoubleItem(SvStream& rIn, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(SvStream& rIn, sal_uInt16 nId) :
     SfxPoolItem(nId)
 {
     rIn >> fVal;
@@ -355,7 +355,7 @@ SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
+SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const
 {
     double _fVal;
     rIn >> _fVal;
@@ -364,7 +364,7 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT /*nItemVersion*/) const
+SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const
 {
     rOut << fVal;
     return rOut;
@@ -395,14 +395,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
 
 
 // -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= fVal;
     return sal_True;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     return rVal >>= fVal;
 }
@@ -416,14 +416,14 @@ sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
 *************************************************************************/
 
 SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient,
-                                               USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrient)
+                                               sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrient)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, USHORT nId) :
+SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -437,14 +437,14 @@ SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartKindErrorItem(rIn, Which());
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
     return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
                ? USHRT_MAX
@@ -458,14 +458,14 @@ USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const
 *************************************************************************/
 
 SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient,
-                                               USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrient)
+                                               sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrient)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, USHORT nId) :
+SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -479,14 +479,14 @@ SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartIndicateItem(rIn, Which());
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
     return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
                ? USHRT_MAX
@@ -500,14 +500,14 @@ USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const
 *************************************************************************/
 
 SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient,
-                                               USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrient)
+                                               sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrient)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, USHORT nId) :
+SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -521,14 +521,14 @@ SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartRegressItem(rIn, Which());
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxChartRegressItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
     return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
                ? USHRT_MAX
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index bc3ca621635b..f65c9bbf6df4 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -53,7 +53,7 @@ SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
                             const SvxClipboardFmtItem_Impl& rCpy )
 {
     aFmtIds.Insert( &rCpy.aFmtIds, 0 );
-    for( USHORT n = 0, nEnd = rCpy.aFmtNms.Count(); n < nEnd; ++n )
+    for( sal_uInt16 n = 0, nEnd = rCpy.aFmtNms.Count(); n < nEnd; ++n )
     {
         String* pStr = rCpy.aFmtNms[ n ];
         if( pStr )
@@ -62,7 +62,7 @@ SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
     }
 }
 
-SvxClipboardFmtItem::SvxClipboardFmtItem( USHORT nId )
+SvxClipboardFmtItem::SvxClipboardFmtItem( sal_uInt16 nId )
     : SfxPoolItem( nId ), pImpl( new SvxClipboardFmtItem_Impl )
 {
 }
@@ -78,35 +78,35 @@ SvxClipboardFmtItem::~SvxClipboardFmtItem()
     delete pImpl;
 }
 
-BOOL SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
-    USHORT nCount = Count();
+    sal_uInt16 nCount = Count();
 
     ::com::sun::star::frame::status::ClipboardFormats aClipFormats;
 
     aClipFormats.Identifiers.realloc( nCount );
     aClipFormats.Names.realloc( nCount );
-    for ( USHORT n=0; n < nCount; n++ )
+    for ( sal_uInt16 n=0; n < nCount; n++ )
     {
         aClipFormats.Identifiers[n] = (sal_Int64)GetClipbrdFormatId( n );
         aClipFormats.Names[n] = GetClipbrdFormatName( n );
     }
 
     rVal <<= aClipFormats;
-    return TRUE;
+    return sal_True;
 }
 
-sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     ::com::sun::star::frame::status::ClipboardFormats aClipFormats;
     if ( rVal >>= aClipFormats )
     {
-        USHORT nCount = USHORT( aClipFormats.Identifiers.getLength() );
+        sal_uInt16 nCount = sal_uInt16( aClipFormats.Identifiers.getLength() );
 
         pImpl->aFmtIds.Remove( 0, pImpl->aFmtIds.Count() );
         pImpl->aFmtNms.Remove( 0, pImpl->aFmtNms.Count() );
-        for ( USHORT n=0; n < nCount; n++ )
-            AddClipbrdFormat( ULONG( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
+        for ( sal_uInt16 n=0; n < nCount; n++ )
+            AddClipbrdFormat( sal_uIntPtr( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
 
         return sal_True;
     }
@@ -122,7 +122,7 @@ int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
     {
         nRet = 1;
         const String* pStr1, *pStr2;
-        for( USHORT n = 0, nEnd = rCmp.pImpl->aFmtNms.Count(); n < nEnd; ++n )
+        for( sal_uInt16 n = 0, nEnd = rCmp.pImpl->aFmtNms.Count(); n < nEnd; ++n )
         {
             if( pImpl->aFmtIds[ n ] != rCmp.pImpl->aFmtIds[ n ] ||
                 ( (0 == ( pStr1 = pImpl->aFmtNms[ n ] )) ^
@@ -142,7 +142,7 @@ SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool * /*pPool*/ ) const
     return new SvxClipboardFmtItem( *this );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, USHORT nPos )
+void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.Count() )
         nPos = pImpl->aFmtNms.Count();
@@ -151,8 +151,8 @@ void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, USHORT nPos )
     pImpl->aFmtIds.Insert( nId, nPos );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, const String& rName,
-                            USHORT nPos )
+void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const String& rName,
+                            sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.Count() )
         nPos = pImpl->aFmtNms.Count();
@@ -161,17 +161,17 @@ void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, const String& rName,
     pImpl->aFmtIds.Insert( nId, nPos );
 }
 
-USHORT SvxClipboardFmtItem::Count() const
+sal_uInt16 SvxClipboardFmtItem::Count() const
 {
     return pImpl->aFmtIds.Count();
 }
 
-ULONG SvxClipboardFmtItem::GetClipbrdFormatId( USHORT nPos ) const
+sal_uIntPtr SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
 {
     return pImpl->aFmtIds[ nPos ];
 }
 
-const String& SvxClipboardFmtItem::GetClipbrdFormatName( USHORT nPos ) const
+const String& SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
 {
     const String* pS = pImpl->aFmtNms[ nPos ];
     return pS ? *pS : SvxClipboardFmtItem_Impl::sEmptyStr;
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 08eebe99b3df..b6d24a16ee55 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -347,7 +347,7 @@ SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrCustomShapeGeometryItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -355,12 +355,12 @@ sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersi
 {
     return 1;
 }
-sal_Bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= aPropSeq;
     return sal_True;
 }
-sal_Bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     if ( ! ( rVal >>= aPropSeq ) )
         return sal_False;
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index f02848835ffd..d2048a0f2644 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -104,19 +104,19 @@ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     // Please ask CD if you want to change this.
-    sal_Int64 aValue = sal_Int64( (ULONG)pColorTable );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pColorTable );
     rVal = uno::makeAny( aValue );
     return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
@@ -124,7 +124,7 @@ sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pColorTable = (XColorTable *)(ULONG)aValue;
+        pColorTable = (XColorTable *)(sal_uLong)aValue;
         return sal_True;
     }
 
@@ -188,19 +188,19 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     // Please ask CD if you want to change this.
-    sal_Int64 aValue = sal_Int64( (ULONG)pGradientList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pGradientList );
     rVal = uno::makeAny( aValue );
     return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
@@ -208,7 +208,7 @@ sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BY
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pGradientList = (XGradientList *)(ULONG)aValue;
+        pGradientList = (XGradientList *)(sal_uLong)aValue;
         return sal_True;
     }
 
@@ -272,19 +272,19 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     // Please ask CD if you want to change this.
-    sal_Int64 aValue = sal_Int64( (ULONG)pHatchList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pHatchList );
     rVal = uno::makeAny( aValue );
     return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
@@ -292,7 +292,7 @@ sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pHatchList = (XHatchList *)(ULONG)aValue;
+        pHatchList = (XHatchList *)(sal_uLong)aValue;
         return sal_True;
     }
 
@@ -356,19 +356,19 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     // Please ask CD if you want to change this.
-    sal_Int64 aValue = sal_Int64( (ULONG)pBitmapList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pBitmapList );
     rVal = uno::makeAny( aValue );
     return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
@@ -376,7 +376,7 @@ sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pBitmapList = (XBitmapList *)(ULONG)aValue;
+        pBitmapList = (XBitmapList *)(sal_uLong)aValue;
         return sal_True;
     }
 
@@ -442,25 +442,25 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
-    sal_Int64 aValue = sal_Int64( (ULONG)pDashList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pDashList );
     rVal = uno::makeAny( aValue );
     return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pDashList = (XDashList *)(ULONG)aValue;
+        pDashList = (XDashList *)(sal_uLong)aValue;
         return sal_True;
     }
 
@@ -531,25 +531,25 @@ SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
-    sal_Int64 aValue = sal_Int64( (ULONG)pLineEndList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pLineEndList );
     rVal = uno::makeAny( aValue );
     return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pLineEndList = (XLineEndList *)(ULONG)aValue;
+        pLineEndList = (XLineEndList *)(sal_uLong)aValue;
         return sal_True;
     }
 
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 846c422ae03a..67c87606e04e 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -58,7 +58,7 @@ SvxB3DVectorItem::~SvxB3DVectorItem()
 
 // -----------------------------------------------------------------------
 
-SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, const basegfx::B3DVector& rVal ) :
+SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) :
     SfxPoolItem( _nWhich ),
     aVal( rVal )
 {
@@ -67,7 +67,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, const basegfx::B3DVector& rV
 
 // -----------------------------------------------------------------------
 
-SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, SvStream& rStream ) :
+SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, SvStream& rStream ) :
     SfxPoolItem( _nWhich )
 {
     DBG_CTOR(SvxB3DVectorItem, 0);
@@ -105,7 +105,7 @@ SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, USHORT /*nVersion*/) const
+SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const
 {
     DBG_CHKTHIS(SvxB3DVectorItem, 0);
     basegfx::B3DVector aStr;
@@ -118,7 +118,7 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, USHORT /*nVersion*/) co
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) const
+SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
 {
     DBG_CHKTHIS(SvxB3DVectorItem, 0);
 
@@ -133,7 +133,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) co
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     drawing::Direction3D aDirection;
 
@@ -148,7 +148,7 @@ sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) cons
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     drawing::Direction3D aDirection;
     if(!(rVal >>= aDirection))
@@ -162,7 +162,7 @@ sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
 
 // -----------------------------------------------------------------------
 
-USHORT SvxB3DVectorItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
     return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX : 0;
 }
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index ce28ee300cbb..50af1f8f9609 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -44,13 +44,13 @@ using namespace ::com::sun::star;
  *  Implementierung     class SwCropGrf
  ******************************************************************************/
 
-SvxGrfCrop::SvxGrfCrop( USHORT nItemId )
+SvxGrfCrop::SvxGrfCrop( sal_uInt16 nItemId )
     : SfxPoolItem( nItemId ),
     nLeft( 0 ), nRight( 0 ), nTop( 0 ), nBottom( 0 )
 {}
 
 SvxGrfCrop::SvxGrfCrop( sal_Int32 nL, sal_Int32 nR,
-                        sal_Int32 nT, sal_Int32 nB, USHORT nItemId )
+                        sal_Int32 nT, sal_Int32 nB, sal_uInt16 nItemId )
     : SfxPoolItem( nItemId ),
     nLeft( nL ), nRight( nR ), nTop( nT ), nBottom( nB )
 {}
@@ -76,7 +76,7 @@ SfxPoolItem* SvxGrfCrop::Clone( SfxItemPool* ) const
 */
 
 /*
-USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxGrfCrop::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
                 SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -86,9 +86,9 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
 }
 */
 
-SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const
+SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
-    INT32 top, left, right, bottom;
+    sal_Int32 top, left, right, bottom;
     rStrm >> top >> left >> right >> bottom;
 
     if( GRFCROP_VERSION_SWDEFAULT == nVersion )
@@ -103,9 +103,9 @@ SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const
 }
 
 
-SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
+SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
-    INT32 left = GetLeft(), right = GetRight(),
+    sal_Int32 left = GetLeft(), right = GetRight(),
             top = GetTop(), bottom = GetBottom();
     if( GRFCROP_VERSION_SWDEFAULT == nVersion )
         top = -top, bottom = -bottom, left = -left, right = -right;
@@ -117,7 +117,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
 
 
 
-BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -140,7 +140,7 @@ BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return   sal_True;
 }
 
-BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 987f5aa6df08..8b4c36ab5eac 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -360,7 +360,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl )
     pMacroTable = new SvxMacroTableDtor ( rTbl );
 }
 
-BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -382,13 +382,13 @@ BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
             rVal <<= (sal_Int32) eType;
         break;
         default:
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -422,9 +422,9 @@ BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMem
             eType = (SvxLinkInsertMode) (sal_uInt16) nVal;
         break;
         default:
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 7f4505e37866..95722e3144c9 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -452,7 +452,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr,
 {
     rpFontColor = NULL;
 
-    ULONG nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage );
+    sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage );
     if ( nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
     {
         //  real preview - not implemented in NumberFormatter for text formats
@@ -465,7 +465,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr,
         //  format exists
 
         //  #50441# if a string was set in addition to the value, use it for text formats
-        BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
+        sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
                             ( aValStr.Len() && ( pFormatter->GetType(nExistingFormat) & NUMBERFORMAT_TEXT ) ) );
         if ( bUseText )
             pFormatter->GetOutputString( aValStr, nExistingFormat,
@@ -1027,7 +1027,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
             aWSStringsDtor, *pTmpCurrencyEntry, bTmpBanking );
         if ( !bTmpBanking )
             pFormatter->GetCurrencyFormatStrings(
-                aWSStringsDtor, *pTmpCurrencyEntry, TRUE );
+                aWSStringsDtor, *pTmpCurrencyEntry, sal_True );
     }
     else
         nDefault = 0;
@@ -1041,8 +1041,8 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
             const NfCurrencyEntry* pCurr = rCurrencyTable[i];
             if ( pCurr->GetLanguage() == eLang && pTmpCurrencyEntry != pCurr )
             {
-                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, FALSE );
-                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, TRUE );
+                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_False );
+                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_True );
             }
         }
     }
@@ -1171,7 +1171,7 @@ void SvxNumberFormatShell::GetPreviewString_Impl( String& rString, Color*& rpCol
     rpColor = NULL;
 
     //  #50441# if a string was set in addition to the value, use it for text formats
-    BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
+    sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
                         ( aValStr.Len() && ( pFormatter->GetType(nCurFormatKey) & NUMBERFORMAT_TEXT ) ) );
 
     if ( bUseText )
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index e996373eb48e..75fc574be3b7 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -30,7 +30,7 @@
 
 #include "svx/ofaitem.hxx"
 
-OfaPtrItem::OfaPtrItem( USHORT _nWhich, void *_pPtr )
+OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr )
     : SfxPoolItem( _nWhich ), pPtr( _pPtr )
 {
 
@@ -54,7 +54,7 @@ SfxPoolItem* OfaPtrItem::Clone( SfxItemPool * ) const
 /*
 TYPEINIT1_FACTORY(DashListPtrItem, SvxDashListPtrItem, new DashListPtrItem(0));
 
-DashListPtrItem::DashListPtrItem( USHORT nWhich, SvxDashListItem* pPtr )
+DashListPtrItem::DashListPtrItem( sal_uInt16 nWhich, SvxDashListItem* pPtr )
     : OfaPtrItem( nWhich ), pPtr( pPtr )
 {
 }
@@ -74,11 +74,11 @@ SfxPoolItem* DashListPtrItem::Clone( SfxItemPool *pPool ) const
     return new DashListPtrItem( *this );
 }
 
-sal_Bool DashListPtrItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const
+sal_Bool DashListPtrItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const
 {
 }
 
-sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 )
+sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 )
 {
     sal_Int64 nHyper;
     if ( rVal >>= nHyper )
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 49aa566f867d..e05fee56ad52 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -52,7 +52,7 @@ TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new  SvxPageItem(0));
     Beschreibung: Konstruktor
  --------------------------------------------------------------------*/
 
-SvxPageItem::SvxPageItem( const USHORT nId ) : SfxPoolItem( nId ),
+SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
 
     eNumType    ( SVX_ARABIC ),
     bLandscape  ( sal_False ),
@@ -94,7 +94,7 @@ int SvxPageItem::operator==( const SfxPoolItem& rAttr ) const
              eUse       == rItem.eUse );
 }
 
-inline XubString GetUsageText( const USHORT eU )
+inline XubString GetUsageText( const sal_uInt16 eU )
 {
     if ( eU & SVX_PAGE_LEFT )
         return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_LEFT);
@@ -164,7 +164,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
 }
 
 //------------------------------------------------------------------------
-sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -201,7 +201,7 @@ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 //------------------------------------------------------------------------
-sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     switch( nMemberId )
     {
@@ -244,12 +244,12 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
     XubString sStr;
-    BYTE eType;
+    sal_uInt8 eType;
     sal_Bool bLand;
-    USHORT nUse;
+    sal_uInt16 nUse;
 
     // UNICODE: rStream >> sStr;
     rStream.ReadByteString( sStr );
@@ -268,12 +268,12 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const
 
 //------------------------------------------------------------------------
 
-SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     // UNICODE: rStrm << aDescName;
     rStrm.WriteByteString(aDescName);
 
-    rStrm << (BYTE)eNumType << bLandscape << eUse;
+    rStrm << (sal_uInt8)eNumType << bLandscape << eUse;
     return rStrm;
 }
 
@@ -281,7 +281,7 @@ SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const
     Beschreibung:   HeaderFooterSet
  --------------------------------------------------------------------*/
 
-SvxSetItem::SvxSetItem( const USHORT nId, const SfxItemSet& rSet ) :
+SvxSetItem::SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet ) :
 
     SfxSetItem( nId, rSet )
 {
@@ -293,7 +293,7 @@ SvxSetItem::SvxSetItem( const SvxSetItem& rItem ) :
 {
 }
 
-SvxSetItem::SvxSetItem( const USHORT nId, SfxItemSet* _pSet ) :
+SvxSetItem::SvxSetItem( const sal_uInt16 nId, SfxItemSet* _pSet ) :
 
     SfxSetItem( nId, _pSet )
 {
@@ -318,7 +318,7 @@ SfxItemPresentation SvxSetItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, USHORT /*nVersion*/) const
+SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, sal_uInt16 /*nVersion*/) const
 {
     SfxItemSet* _pSet = new SfxItemSet( *GetItemSet().GetPool(),
                                        GetItemSet().GetRanges() );
@@ -328,7 +328,7 @@ SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, USHORT /*nVersion*/) const
     return new SvxSetItem( Which(), *_pSet );
 }
 
-SvStream& SvxSetItem::Store(SvStream &rStrm, USHORT nItemVersion) const
+SvStream& SvxSetItem::Store(SvStream &rStrm, sal_uInt16 nItemVersion) const
 {
     GetItemSet().Store( rStrm, nItemVersion );
 
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 6e6f46cdc373..84f2853d9196 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -56,8 +56,8 @@ TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTA
 //  SvxRotateModeItem - Ausrichtung bei gedrehtem Text
 //-----------------------------------------------------------------------
 
-SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, USHORT _nWhich )
-    : SfxEnumItem( _nWhich, (USHORT)eMode )
+SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, sal_uInt16 _nWhich )
+    : SfxEnumItem( _nWhich, (sal_uInt16)eMode )
 {
 }
 
@@ -70,9 +70,9 @@ __EXPORT SvxRotateModeItem::~SvxRotateModeItem()
 {
 }
 
-SfxPoolItem* __EXPORT SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* __EXPORT SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
-    USHORT nVal;
+    sal_uInt16 nVal;
     rStream >> nVal;
     return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() );
 }
@@ -100,7 +100,7 @@ SfxItemPresentation __EXPORT SvxRotateModeItem::GetPresentation(
     return ePres;
 }
 
-String __EXPORT SvxRotateModeItem::GetValueText( USHORT nVal ) const
+String __EXPORT SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const
 {
     String aText;
 
@@ -119,7 +119,7 @@ String __EXPORT SvxRotateModeItem::GetValueText( USHORT nVal ) const
     return aText;
 }
 
-USHORT __EXPORT SvxRotateModeItem::GetValueCount() const
+sal_uInt16 __EXPORT SvxRotateModeItem::GetValueCount() const
 {
     return 4;       // STANDARD, TOP, CENTER, BOTTOM
 }
@@ -129,14 +129,14 @@ SfxPoolItem* __EXPORT SvxRotateModeItem::Clone( SfxItemPool* ) const
     return new SvxRotateModeItem( *this );
 }
 
-USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
+sal_uInt16 __EXPORT SvxRotateModeItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
 {
     return 0;
 }
 
 //  QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt...
 
-sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
     switch ( (SvxRotateMode)GetValue() )
@@ -150,7 +150,7 @@ sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) con
     return sal_True;
 }
 
-sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     table::CellVertJustify eUno;
     if(!(rVal >>= eUno))
@@ -170,7 +170,7 @@ sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
         case table::CellVertJustify_BOTTOM:   eSvx = SVX_ROTATE_MODE_BOTTOM;    break;
         default: ;//prevent warning
     }
-    SetValue( (USHORT)eSvx );
+    SetValue( (sal_uInt16)eSvx );
     return sal_True;
 }
 
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index 47775bb7a2ce..7f8dd5854e3b 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -45,7 +45,7 @@ TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem);
 
 SvxViewLayoutItem::SvxViewLayoutItem
 (
-    USHORT      nColumns,
+    sal_uInt16      nColumns,
     bool        bBookMode,
     sal_uInt16  _nWhich
 )
@@ -111,7 +111,7 @@ int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const
              mbBookMode == rItem.IsBookMode() );
 }
 
-sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -137,7 +137,7 @@ sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
     return sal_True;
 }
 
-sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -168,7 +168,7 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
 
                 if ( bAllConverted && nConvertedCount == VIEWLAYOUT_PARAMS )
                 {
-                    SetValue( (UINT16)nColumns );
+                    SetValue( (sal_uInt16)nColumns );
                     mbBookMode = bBookMode;
                     return sal_True;
                 }
@@ -182,7 +182,7 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
             sal_Int32 nVal = 0;
             if ( rVal >>= nVal )
             {
-                SetValue( (UINT16)nVal );
+                SetValue( (sal_uInt16)nVal );
                 return sal_True;
             }
             else
diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
index bc5438d23686..38ad3f6d9e7b 100644
--- a/svx/source/items/zoomitem.cxx
+++ b/svx/source/items/zoomitem.cxx
@@ -117,7 +117,7 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const
              eType      == rItem.GetType()          );
 }
 
-sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -147,7 +147,7 @@ sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId
     return sal_True;
 }
 
-sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -184,7 +184,7 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
 
                 if ( bAllConverted && nConvertedCount == ZOOM_PARAMS )
                 {
-                    SetValue( (UINT16)nValueTmp );
+                    SetValue( (sal_uInt16)nValueTmp );
                     nValueSet = nValueSetTmp;
                     eType = SvxZoomType( nTypeTmp );
                     return sal_True;
@@ -199,7 +199,7 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
             sal_Int32 nVal = 0;
             if ( rVal >>= nVal )
             {
-                SetValue( (UINT16)nVal );
+                SetValue( (sal_uInt16)nVal );
                 return sal_True;
             }
             else
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 555e0ad07f94..c66432c5b0d4 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -44,7 +44,7 @@ TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem);
 
 // -----------------------------------------------------------------------
 
-SvxZoomSliderItem::SvxZoomSliderItem( USHORT nCurrentZoom, USHORT nMinZoom, USHORT nMaxZoom, USHORT _nWhich )
+SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich )
 :   SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom )
 {
 }
@@ -108,7 +108,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const
              mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom );
 }
 
-sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -156,7 +156,7 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
     return sal_True;
 }
 
-sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -200,10 +200,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
 
                     if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS )
                     {
-                        SetValue( (UINT16)nCurrentZoom );
+                        SetValue( (sal_uInt16)nCurrentZoom );
                         maValues = aValues;
-                        mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom );
-                        mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom );
+                        mnMinZoom = sal::static_int_cast< sal_uInt16 >( nMinZoom );
+                        mnMaxZoom = sal::static_int_cast< sal_uInt16 >( nMaxZoom );
 
                         return sal_True;
                     }
@@ -217,7 +217,7 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
                 sal_Int32 nVal = 0;
                 if ( rVal >>= nVal )
                 {
-                    SetValue( (UINT16)nVal );
+                    SetValue( (sal_uInt16)nVal );
                     return sal_True;
                 }
                 else
@@ -240,7 +240,7 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
                 sal_Int32 nVal = 0;
                 if( rVal >>= nVal )
                 {
-                    mnMinZoom = (UINT16)nVal;
+                    mnMinZoom = (sal_uInt16)nVal;
                     return sal_True;
                 }
                 else
@@ -251,7 +251,7 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
                 sal_Int32 nVal = 0;
                 if( rVal >>= nVal )
                 {
-                    mnMaxZoom = (UINT16)nVal;
+                    mnMaxZoom = (sal_uInt16)nVal;
                     return sal_True;
                 }
                 else
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 6833117a1335..471146daf00b 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -55,7 +55,7 @@ SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem);
 
 SvxSmartTagsControl::SvxSmartTagsControl
 (
-    USHORT          _nId,
+    sal_uInt16          _nId,
     Menu&           rMenu,
     SfxBindings&    /*rBindings*/
 ) :
@@ -68,17 +68,17 @@ SvxSmartTagsControl::SvxSmartTagsControl
 
 //--------------------------------------------------------------------
 
-const USHORT MN_ST_INSERT_START = 500;
+const sal_uInt16 MN_ST_INSERT_START = 500;
 
 void SvxSmartTagsControl::FillMenu()
 {
     if ( !mpSmartTagItem )
         return;
 
-    USHORT nMenuPos = 0;
-    USHORT nSubMenuPos = 0;
-    USHORT nMenuId = 1;
-    USHORT nSubMenuId = MN_ST_INSERT_START;
+    sal_uInt16 nMenuPos = 0;
+    sal_uInt16 nSubMenuPos = 0;
+    sal_uInt16 nMenuId = 1;
+    sal_uInt16 nSubMenuId = MN_ST_INSERT_START;
 
     const Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >& rActionComponentsSequence = mpSmartTagItem->GetActionComponentsSequence();
     const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence = mpSmartTagItem->GetActionIndicesSequence();
@@ -89,7 +89,7 @@ void SvxSmartTagsControl::FillMenu()
     const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange();
     const Reference<frame::XController>& xController = mpSmartTagItem->GetController();
 
-    for ( USHORT j = 0; j < rActionComponentsSequence.getLength(); ++j )
+    for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j )
     {
         Reference< container::XStringKeyMap > xSmartTagProperties = rStringKeyMaps[j];
 
@@ -127,7 +127,7 @@ void SvxSmartTagsControl::FillMenu()
         pSbMenu->InsertSeparator( nSubMenuPos++ );
 
         // Add subitem for every action reference for the current smart tag type:
-        for ( USHORT i = 0; i < rActionComponents.getLength(); ++i )
+        for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
         {
             xAction = rActionComponents[i];
 
@@ -153,7 +153,7 @@ void SvxSmartTagsControl::FillMenu()
 
 //--------------------------------------------------------------------
 
-void SvxSmartTagsControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     mrParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
@@ -200,7 +200,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
 
     // ohne dispatcher!!!
     // GetBindings().Execute( GetId(), SFX_CALLMODE_RECORD,meine beiden items, 0L );*/
-    //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, TRUE);
+    //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
     //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SFX_CALLMODE_ASYNCHRON, &aBool, 0L );
 
     return 0;
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index db92fd66d425..52c468d0bda5 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -51,13 +51,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxClipBoardControl, SfxVoidItem /*SfxUInt16Item*/ );
 
 
 SvxClipBoardControl::SvxClipBoardControl(
-        USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+        sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     pClipboardFmtItem( 0 ),
      pPopup     (0),
     nItemId     (nId),
-    bDisabled( FALSE )
+    bDisabled( sal_False )
 {
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" )));
     ToolBox& rBox = GetToolBox();
@@ -83,25 +83,25 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow()
         else
             pPopup = new PopupMenu;
 
-        USHORT nCount = pFmtItem->Count();
-        for (USHORT i = 0;  i < nCount;  ++i)
+        sal_uInt16 nCount = pFmtItem->Count();
+        for (sal_uInt16 i = 0;  i < nCount;  ++i)
         {
-            ULONG nFmtID =  pFmtItem->GetClipbrdFormatId( i );
+            sal_uIntPtr nFmtID =  pFmtItem->GetClipbrdFormatId( i );
             String aFmtStr( pFmtItem->GetClipbrdFormatName( i ) );
             if (!aFmtStr.Len())
               aFmtStr = SvPasteObjectHelper::GetSotFormatUIName( nFmtID );
-            pPopup->InsertItem( (USHORT)nFmtID, aFmtStr );
+            pPopup->InsertItem( (sal_uInt16)nFmtID, aFmtStr );
         }
 
         ToolBox& rBox = GetToolBox();
-        USHORT nId = GetId();
-        rBox.SetItemDown( nId, TRUE );
+        sal_uInt16 nId = GetId();
+        rBox.SetItemDown( nId, sal_True );
 
         pPopup->Execute( &rBox, rBox.GetItemRect( nId ),
             (rBox.GetAlign() == WINDOWALIGN_TOP || rBox.GetAlign() == WINDOWALIGN_BOTTOM) ?
                 POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT );
 
-        rBox.SetItemDown( nId, FALSE );
+        rBox.SetItemDown( nId, sal_False );
 
         SfxUInt32Item aItem( SID_CLIPBOARD_FORMAT_ITEMS, pPopup->GetCurItemId() );
 
@@ -126,7 +126,7 @@ SfxPopupWindowType SvxClipBoardControl::GetPopupWindowType() const
 }
 
 
-void SvxClipBoardControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID )
     {
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 0cd5dfa335da..4f51e111c2c3 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -53,7 +53,7 @@ SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem);
 
 SvxFontMenuControl::SvxFontMenuControl
 (
-    USHORT          _nId,
+    sal_uInt16          _nId,
     Menu&           rMenu,
     SfxBindings&    rBindings
 ) :
@@ -102,7 +102,7 @@ void SvxFontMenuControl::FillMenu()
 
 void SvxFontMenuControl::StateChanged(
 
-    USHORT, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 48c1a1158c4c..32933ae8b716 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -67,7 +67,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
         return 0;
 
     const SfxItemPool& rPool = pSh->GetPool();
-    USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
+    sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
     const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
     long nH = LOGIC( pMen->GetCurHeight(), MAP_POINT, (MapUnit)eUnit ) / 10;
     SvxFontHeightItem aItem( nH, 100, GetId() );
@@ -87,7 +87,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
 
 void SvxFontSizeMenuControl::StateChanged(
 
-    USHORT, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
@@ -110,7 +110,7 @@ void SvxFontSizeMenuControl::StateChanged(
                     return;
 
                 const SfxItemPool& rPool = pSh->GetPool();
-                USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
+                sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
                 const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
                 long nH = pItem->GetHeight() * 10;
                 nVal = LOGIC( nH, (MapUnit)eUnit, MAP_POINT );
@@ -169,7 +169,7 @@ void SvxFontSizeMenuControl::StateChanged(
 
 SvxFontSizeMenuControl::SvxFontSizeMenuControl
 (
-    USHORT          _nId,
+    sal_uInt16          _nId,
     Menu&           rMenu,
     SfxBindings&    rBindings
 ) :
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 845f1c813325..1ba774ba378f 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -326,7 +326,7 @@ namespace sdr
             aLocalGrafInfo.SetChannelG(((SdrGrafGreenItem&)rItemSet.Get(SDRATTR_GRAFGREEN)).GetValue());
             aLocalGrafInfo.SetChannelB(((SdrGrafBlueItem&)rItemSet.Get(SDRATTR_GRAFBLUE)).GetValue());
             aLocalGrafInfo.SetGamma(((SdrGrafGamma100Item&)rItemSet.Get(SDRATTR_GRAFGAMMA)).GetValue() * 0.01);
-            aLocalGrafInfo.SetTransparency((BYTE)::basegfx::fround(Min(nTrans, (USHORT)100) * 2.55));
+            aLocalGrafInfo.SetTransparency((sal_uInt8)::basegfx::fround(Min(nTrans, (sal_uInt16)100) * 2.55));
             aLocalGrafInfo.SetInvert(((SdrGrafInvertItem&)rItemSet.Get(SDRATTR_GRAFINVERT)).GetValue());
             aLocalGrafInfo.SetDrawMode(((SdrGrafModeItem&)rItemSet.Get(SDRATTR_GRAFMODE)).GetValue());
             aLocalGrafInfo.SetCrop(rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom());
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 4ff335a04125..8b86f9dec9ce 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -560,7 +560,7 @@ namespace drawinglayer
         {
             const SfxPoolItem* pGradientItem;
 
-            if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, TRUE, &pGradientItem)
+            if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem)
                 && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled())
             {
                 // test if float transparence is completely transparent
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 0f3325a0027e..39b78849ad7e 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -277,7 +277,7 @@ namespace sdr
                         ImpRemoveStyleSheet();
                     }
 
-                    mpItemSet = mpItemSet->Clone(FALSE, pDestPool);
+                    mpItemSet = mpItemSet->Clone(sal_False, pDestPool);
                     GetSdrObject().GetModel()->MigrateItemSet(pOldSet, mpItemSet, pNewModel);
 
                     // set stylesheet (if used)
@@ -380,7 +380,7 @@ namespace sdr
                             while(pSheet)
                             {
                                 pNewSheet = &pNewPool->Make(pSheet->GetName(), pSheet->GetFamily(), pSheet->GetMask());
-                                pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), FALSE);
+                                pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), sal_False);
 
                                 if(bScaleUnitChanged)
                                 {
@@ -451,7 +451,7 @@ namespace sdr
 
                                 while(nWhich)
                                 {
-                                    if(mpItemSet->GetItemState(nWhich, FALSE) == SFX_ITEM_SET)
+                                    if(mpItemSet->GetItemState(nWhich, sal_False) == SFX_ITEM_SET)
                                     {
                                         pNewSet->Put(mpItemSet->Get(nWhich));
                                     }
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 005ba0b19789..7d51b26a0051 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -62,7 +62,7 @@ namespace sdr
         {
             if(rProps.mpItemSet)
             {
-                mpItemSet = rProps.mpItemSet->Clone(TRUE);
+                mpItemSet = rProps.mpItemSet->Clone(sal_True);
 
                 // do not keep parent info, this may be changed by later construrtors.
                 // This class just copies the ItemSet, ignore parent.
@@ -162,7 +162,7 @@ namespace sdr
 
             while(nWhich)
             {
-                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pPoolItem))
+                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pPoolItem))
                 {
                     if(AllowItemChange(nWhich, pPoolItem))
                     {
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 3ee3189ac4a8..6fbf34968f3c 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -102,13 +102,13 @@ namespace sdr
                         // and always equal.
                         if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST)
                         {
-                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                             {
                                 mpItemSet->InvalidateItem(nWhich);
                             }
                             else
                             {
-                                mpItemSet->MergeValue(rSet.Get(nWhich), TRUE);
+                                mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
                             }
                         }
 
@@ -131,7 +131,7 @@ namespace sdr
             {
                 // Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items.
                 // #i50808# Leak fix, Clone produces a new instance and we get ownership here
-                SfxItemSet* pNewSet = rSet.Clone(TRUE);
+                SfxItemSet* pNewSet = rSet.Clone(sal_True);
                 DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)");
 
                 for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++)
@@ -319,13 +319,13 @@ namespace sdr
             Camera3D aSceneCam(rObj.GetCamera());
 
             // ProjectionType
-            mpItemSet->Put(Svx3DPerspectiveItem((UINT16)aSceneCam.GetProjection()));
+            mpItemSet->Put(Svx3DPerspectiveItem((sal_uInt16)aSceneCam.GetProjection()));
 
             // CamPos
-            mpItemSet->Put(Svx3DDistanceItem((UINT32)(aSceneCam.GetPosition().getZ() + 0.5)));
+            mpItemSet->Put(Svx3DDistanceItem((sal_uInt32)(aSceneCam.GetPosition().getZ() + 0.5)));
 
             // FocalLength
-            mpItemSet->Put(Svx3DFocalLengthItem((UINT32)((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
+            mpItemSet->Put(Svx3DFocalLengthItem((sal_uInt32)((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
         }
     } // end of namespace properties
 } // end of namespace sdr
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 76eacd537c27..3afdb66c6daf 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -128,7 +128,7 @@ namespace sdr
             mpItemSet->Put( SdrGrafBlueItem( 0 ) );
             mpItemSet->Put( SdrGrafGamma100Item( 100 ) );
             mpItemSet->Put( SdrGrafTransparenceItem( 0 ) );
-            mpItemSet->Put( SdrGrafInvertItem( FALSE ) );
+            mpItemSet->Put( SdrGrafInvertItem( sal_False ) );
             mpItemSet->Put( SdrGrafModeItem( GRAPHICDRAWMODE_STANDARD ) );
             mpItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) );
 
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 9761946d15b3..d55d8dcb1a16 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -102,13 +102,13 @@ namespace sdr
 
                 while(nWhich)
                 {
-                    if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                    if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                     {
                         mpItemSet->InvalidateItem(nWhich);
                     }
                     else
                     {
-                        mpItemSet->MergeValue(rSet.Get(nWhich), TRUE);
+                        mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
                     }
 
                     nWhich = aIter.NextWhich();
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index 37678966bc07..1e804b9716df 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -127,7 +127,7 @@ namespace sdr
 
             while(nWhich)
             {
-                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pItem))
+                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pItem))
                 {
                     if(pItem->HasMetrics())
                     {
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 8c935c2700f0..522f3e44e686 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -117,9 +117,9 @@ namespace sdr
             GetObjectItemSet();
 
             //#71958# by default, the show units Bool-Item is set as hard
-            // attribute to TRUE to aviod confusion when copying SdrMeasureObj's
+            // attribute to sal_True to aviod confusion when copying SdrMeasureObj's
             // from one application to another
-            mpItemSet->Put(SdrMeasureShowUnitItem(TRUE));
+            mpItemSet->Put(SdrMeasureShowUnitItem(sal_True));
 
             basegfx::B2DPolygon aNewPolygon;
             aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0));
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 091656e1f261..b7f2cc5474e6 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -488,7 +488,7 @@ namespace sdr
                                     if(bHasURL)
                                     {
                                         SfxItemSet aColorSet(*aSet.GetPool(), EE_CHAR_COLOR, EE_CHAR_COLOR );
-                                        aColorSet.Put(aSet, FALSE);
+                                        aColorSet.Put(aSet, sal_False);
 
                                         ESelection aSel((sal_uInt16)nPara, 0);
 
@@ -519,7 +519,7 @@ namespace sdr
 
                                 }
 
-                                aSet.Put(aParaSet, FALSE);
+                                aSet.Put(aParaSet, sal_False);
 
                                 if(bHasURL)
                                 {
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 0070646b3330..dabb4e21231e 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -145,7 +145,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes
     rActionComponentsSequence.realloc( rSmartTagTypes.getLength() );
     rActionIndicesSequence.realloc( rSmartTagTypes.getLength() );
 
-    for ( USHORT j = 0; j < rSmartTagTypes.getLength(); ++j )
+    for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j )
     {
         const rtl::OUString& rSmartTagType = rSmartTagTypes[j];
 
@@ -154,7 +154,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes
         Sequence< Reference< smarttags::XSmartTagAction > > aActions( nNumberOfActionRefs );
         Sequence< sal_Int32 > aIndices( nNumberOfActionRefs );
 
-        USHORT i = 0;
+        sal_uInt16 i = 0;
         SmartTagMapIter aActionsIter;
         SmartTagMapIter aEnd = maSmartTagMap.upper_bound( rSmartTagType );
 
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 157a9bd06f7e..34952b1deea9 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -50,12 +50,12 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxInsertStatusBarControl, SfxBoolItem);
 
 // class SvxInsertStatusBarControl ---------------------------------------
 
-SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId,
-                                                      USHORT _nId,
+SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId,
+                                                      sal_uInt16 _nId,
                                                       StatusBar& rStb ) :
 
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
-    bInsert( TRUE )
+    bInsert( sal_True )
 {
 }
 
@@ -67,7 +67,7 @@ SvxInsertStatusBarControl::~SvxInsertStatusBarControl()
 
 // -----------------------------------------------------------------------
 
-void SvxInsertStatusBarControl::StateChanged( USHORT , SfxItemState eState,
+void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState,
                                               const SfxPoolItem* pState )
 {
     if ( SFX_ITEM_AVAILABLE != eState )
@@ -110,14 +110,14 @@ void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
 
 void SvxInsertStatusBarControl::DrawItemText_Impl()
 {
-    USHORT _nId = RID_SVXSTR_OVERWRITE_TEXT;
+    sal_uInt16 _nId = RID_SVXSTR_OVERWRITE_TEXT;
 
     if ( bInsert )
         _nId = RID_SVXSTR_INSERT_TEXT;
     GetStatusBar().SetItemText( GetId(), SVX_RESSTR( _nId ) );
 }
 
-ULONG SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
 {
     long nWidth1 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_OVERWRITE_TEXT));
     long nWidth2 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_INSERT_TEXT));
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 986b84f7b8dc..87dce0e942df 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -47,18 +47,18 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem);
 
 // class SvxModifyControl ------------------------------------------------
 
-SvxModifyControl::SvxModifyControl( USHORT _nSlotId,
-                                    USHORT _nId,
+SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId,
+                                    sal_uInt16 _nId,
                                     StatusBar& rStb ) :
 
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
-    bState( TRUE )
+    bState( sal_True )
 {
 }
 
 // -----------------------------------------------------------------------
 
-void SvxModifyControl::StateChanged( USHORT, SfxItemState eState,
+void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
                                      const SfxPoolItem* pState )
 {
     if ( SFX_ITEM_AVAILABLE != eState )
@@ -90,7 +90,7 @@ void SvxModifyControl::DrawItemText_Impl()
     GetStatusBar().SetItemText( GetId(), sMode );
 }
 
-ULONG SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
 {
     return rStb.GetTextWidth(String::CreateFromAscii("XX"));
 }
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 43b563f78411..094cfbd96ee5 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -113,19 +113,19 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem);
 class FunctionPopup_Impl : public PopupMenu
 {
 public:
-    FunctionPopup_Impl( USHORT nCheck );
+    FunctionPopup_Impl( sal_uInt16 nCheck );
 
-    USHORT          GetSelected() const { return nSelected; }
+    sal_uInt16          GetSelected() const { return nSelected; }
 
 private:
-    USHORT          nSelected;
+    sal_uInt16          nSelected;
 
     virtual void    Select();
 };
 
 // -----------------------------------------------------------------------
 
-FunctionPopup_Impl::FunctionPopup_Impl( USHORT nCheck ) :
+FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) :
     PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ),
     nSelected( 0 )
 {
@@ -158,11 +158,11 @@ struct SvxPosSizeStatusBarControl_Impl
     Point   aPos;       // g"ultig, wenn eine Position angezeigt wird
     Size    aSize;      // g"ultig, wenn eine Gr"o/se angezeigt wird
     String  aStr;       // g"ultig, wenn ein Text angezeigt wird
-    BOOL    bPos;       // show position
-    BOOL    bSize;      // Gr"o/se anzeigen?
-    BOOL    bTable;     // Tabellenindex anzeigen?
-    BOOL    bHasMenu;   // StarCalc Popup-Menue anzeigen?
-    USHORT  nFunction;  // selektierte StarCalc Funktion
+    sal_Bool    bPos;       // show position
+    sal_Bool    bSize;      // Gr"o/se anzeigen?
+    sal_Bool    bTable;     // Tabellenindex anzeigen?
+    sal_Bool    bHasMenu;   // StarCalc Popup-Menue anzeigen?
+    sal_uInt16  nFunction;  // selektierte StarCalc Funktion
     Image   aPosImage;  // Image f"ur die Positionsanzeige
     Image   aSizeImage; // Image f"ur die Gr"o/senanzeige
 };
@@ -180,16 +180,16 @@ struct SvxPosSizeStatusBarControl_Impl
 #define STR_TABLECELL ".uno:StateTableCell"
 #define STR_FUNC ".uno:StatusBarFunc"
 
-SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId,
-                                                        USHORT _nId,
+SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
+                                                        sal_uInt16 _nId,
                                                         StatusBar& rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
     pImp( new SvxPosSizeStatusBarControl_Impl )
 {
-    pImp->bPos = FALSE;
-    pImp->bSize = FALSE;
-    pImp->bTable = FALSE;
-    pImp->bHasMenu = FALSE;
+    pImp->bPos = sal_False;
+    pImp->bSize = sal_False;
+    pImp->bTable = sal_False;
+    pImp->bHasMenu = sal_False;
     pImp->nFunction = 0;
     pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
     pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
@@ -223,15 +223,15 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
 
                 NULL/Void   SfxPointItem    SvxSizeItem     SfxStringItem
     ------------------------------------------------------------------------
-    Zeit        TRUE        FALSE           FALSE           FALSE
-    Position    FALSE                                       FALSE
+    Zeit        sal_True        sal_False           sal_False           FALSE
+    Position    sal_False                                       FALSE
     Gro"sse     FALSE                       TRUE            FALSE
-    Text        FALSE                       FALSE           TRUE
+    Text        sal_False                       sal_False           TRUE
 
     Ein anderes Item bewirkt einen Assert, die Zeitanzeige wird enabled.
 */
 
-void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                                const SfxPoolItem* pState )
 {
     // da Kombi-Controller, immer die aktuelle Id als HelpId setzen
@@ -250,12 +250,12 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
     {
         if ( eState == SFX_ITEM_AVAILABLE )
         {
-            pImp->bHasMenu = TRUE;
+            pImp->bHasMenu = sal_True;
             if ( pState && pState->ISA(SfxUInt16Item) )
                 pImp->nFunction = ((const SfxUInt16Item*)pState)->GetValue();
         }
         else
-            pImp->bHasMenu = FALSE;
+            pImp->bHasMenu = sal_False;
     }
     else if ( SFX_ITEM_AVAILABLE != eState )
     {
@@ -263,11 +263,11 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
         // notified for all display types
 
         if ( nSID == SID_TABLE_CELL )
-            pImp->bTable = FALSE;
+            pImp->bTable = sal_False;
         else if ( nSID == SID_ATTR_POSITION )
-            pImp->bPos = FALSE;
+            pImp->bPos = sal_False;
         else if ( nSID == GetSlotId() )     // controller is registered for SID_ATTR_SIZE
-            pImp->bSize = FALSE;
+            pImp->bSize = sal_False;
         else
         {
             DBG_ERRORFILE("unknown slot id");
@@ -277,31 +277,31 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
     {
         // Position anzeigen
         pImp->aPos = ( (SfxPointItem*)pState )->GetValue();
-        pImp->bPos = TRUE;
-        pImp->bTable = FALSE;
+        pImp->bPos = sal_True;
+        pImp->bTable = sal_False;
     }
     else if ( pState->ISA( SvxSizeItem ) )
     {
         // Groesse anzeigen
         pImp->aSize = ( (SvxSizeItem*)pState )->GetSize();
-        pImp->bSize = TRUE;
-        pImp->bTable = FALSE;
+        pImp->bSize = sal_True;
+        pImp->bTable = sal_False;
     }
     else if ( pState->ISA( SfxStringItem ) )
     {
         // String anzeigen (Tabellen-Zelle oder anderes)
         pImp->aStr = ( (SfxStringItem*)pState )->GetValue();
-        pImp->bTable = TRUE;
-        pImp->bPos = FALSE;
-        pImp->bSize = FALSE;
+        pImp->bTable = sal_True;
+        pImp->bPos = sal_False;
+        pImp->bSize = sal_False;
     }
     else
     {
         DBG_ERRORFILE( "invalid item type" );
         // trotzdem Datum und Zeit anzeigen
-        pImp->bPos = FALSE;
-        pImp->bSize = FALSE;
-        pImp->bTable = FALSE;
+        pImp->bPos = sal_False;
+        pImp->bSize = sal_False;
+        pImp->bTable = sal_False;
     }
 
     if ( GetStatusBar().AreItemsVisible() )
@@ -326,7 +326,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt )
 {
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && pImp->bHasMenu )
     {
-        USHORT nSelect = pImp->nFunction;
+        sal_uInt16 nSelect = pImp->nFunction;
         if (!nSelect)
             nSelect = PSZ_FUNC_NONE;
         FunctionPopup_Impl aMenu( nSelect );
@@ -432,12 +432,12 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
 
 // -----------------------------------------------------------------------
 
-ULONG SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
 {
     Image aTmpPosImage( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
     Image aTmpSizeImage( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
 
-    ULONG nWidth=PAINT_OFFSET+aTmpPosImage.GetSizePixel().Width();
+    sal_uIntPtr nWidth=PAINT_OFFSET+aTmpPosImage.GetSizePixel().Width();
     nWidth+=PAINT_OFFSET+aTmpSizeImage.GetSizePixel().Width();
     nWidth+=2*(PAINT_OFFSET+rStb.GetTextWidth(String::CreateFromAscii("XXXX,XX / XXXX,XX")));
 
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index e56ba9aeaef9..e216a4c204ba 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -50,8 +50,8 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
 
 // class SvxSelectionModeControl -----------------------------------------
 
-SvxSelectionModeControl::SvxSelectionModeControl( USHORT _nSlotId,
-                                                  USHORT _nId,
+SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
+                                                  sal_uInt16 _nId,
                                                   StatusBar& rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
     nState( 0 )
@@ -60,7 +60,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( USHORT _nSlotId,
 
 // -----------------------------------------------------------------------
 
-void SvxSelectionModeControl::StateChanged( USHORT, SfxItemState eState,
+void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
                                             const SfxPoolItem* pState )
 {
     if ( SFX_ITEM_AVAILABLE != eState )
@@ -108,7 +108,7 @@ void SvxSelectionModeControl::Paint( const UserDrawEvent& )
 void SvxSelectionModeControl::DrawItemText_Impl()
 {
     String sTxt;
-    USHORT _nId = 0;
+    sal_uInt16 _nId = 0;
 
     switch ( nState )
     {
@@ -132,7 +132,7 @@ void SvxSelectionModeControl::DrawItemText_Impl()
     GetStatusBar().SetItemText( GetId(), sTxt );
 }
 
-ULONG SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
 {
     long nWidth1 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_STD));
     long nWidth2 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ER));
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 26daed799c6e..4a5062cc6645 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -80,19 +80,19 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
 {
     Point       maPos;
     Size        maSize;
-    UINT16      mnState;
+    sal_uInt16      mnState;
     Image       maImage;
     Image       maImageBroken;
     Image       maImageNotValidated;
 };
 
 
-XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId,  USHORT _nId, StatusBar& _rStb )
+XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId,  sal_uInt16 _nId, StatusBar& _rStb )
     :SfxStatusBarControl( _nSlotId, _nId, _rStb )
 
     ,mpImpl( new XmlSecStatusBarControl_Impl )
 {
-    mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+    mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
 
     sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
     mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H : RID_SVXBMP_SIGNET ) );
@@ -107,11 +107,11 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
     delete mpImpl;
 }
 
-void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
     if( SFX_ITEM_AVAILABLE != eState )
     {
-        mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+        mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
     }
     else if( pState->ISA( SfxUInt16Item ) )
     {
@@ -121,7 +121,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const Sf
     else
     {
         DBG_ERRORFILE( "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
-        mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+        mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
     }
 
     if( GetStatusBar().AreItemsVisible() )              // necessary ?
@@ -129,7 +129,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const Sf
 
     GetStatusBar().SetItemText( GetId(), String() );    // necessary ?
 
-    USHORT nResId = RID_SVXSTR_XMLSEC_NO_SIG;
+    sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG;
     if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK )
         nResId = RID_SVXSTR_XMLSEC_SIG_OK;
     else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN )
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index fb9fc65583e3..9439df87d8b9 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -52,27 +52,27 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem);
 class ZoomPopup_Impl : public PopupMenu
 {
 public:
-    ZoomPopup_Impl( USHORT nZ, USHORT nValueSet );
+    ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet );
 
-    USHORT          GetZoom() const { return nZoom; }
-    USHORT          GetCurId() const { return nCurId; }
+    sal_uInt16          GetZoom() const { return nZoom; }
+    sal_uInt16          GetCurId() const { return nCurId; }
 
 private:
-    USHORT          nZoom;
-    USHORT          nCurId;
+    sal_uInt16          nZoom;
+    sal_uInt16          nCurId;
 
     virtual void    Select();
 };
 
 // -----------------------------------------------------------------------
 
-ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet )
+ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet )
 
 :   PopupMenu( ResId( RID_SVXMNU_ZOOM, DIALOG_MGR() ) ),
 
     nZoom( nZ )
 {
-    static USHORT aTable[] =
+    static sal_uInt16 aTable[] =
     {
         SVX_ZOOM_ENABLE_50,         ZOOM_50,
         SVX_ZOOM_ENABLE_100,        ZOOM_100,
@@ -83,9 +83,9 @@ ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet )
         SVX_ZOOM_ENABLE_PAGEWIDTH,  ZOOM_PAGE_WIDTH
     };
 
-    for ( USHORT nPos = 0; nPos < sizeof(aTable) / sizeof(USHORT); nPos += 2 )
+    for ( sal_uInt16 nPos = 0; nPos < sizeof(aTable) / sizeof(sal_uInt16); nPos += 2 )
         if ( ( aTable[nPos] != ( aTable[nPos] & nValueSet ) ) )
-            EnableItem( aTable[nPos+1], FALSE );
+            EnableItem( aTable[nPos+1], sal_False );
 }
 
 // -----------------------------------------------------------------------
@@ -111,8 +111,8 @@ void ZoomPopup_Impl::Select()
 
 // class SvxZoomStatusBarControl ------------------------------------------
 
-SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId,
-                                                  USHORT _nId,
+SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
+                                                  sal_uInt16 _nId,
                                                   StatusBar& rStb ) :
 
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
@@ -123,7 +123,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId,
 
 // -----------------------------------------------------------------------
 
-void SvxZoomStatusBarControl::StateChanged( USHORT, SfxItemState eState,
+void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
                                             const SfxPoolItem* pState )
 {
     if( SFX_ITEM_AVAILABLE != eState )
@@ -214,7 +214,7 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
         SfxStatusBarControl::Command( rCEvt );
 }
 
-ULONG SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
 {
     long nWidth1 =  rStb.GetTextWidth(String::CreateFromAscii("XXXXX%"));
     return nWidth1;
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 729538f707c7..a957482405c4 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -51,12 +51,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SvxZoomSliderControl, SvxZoomSliderItem );
 
 struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
 {
-    USHORT                   mnCurrentZoom;
-    USHORT                   mnMinZoom;
-    USHORT                   mnMaxZoom;
-    USHORT                   mnSliderCenter;
+    sal_uInt16                   mnCurrentZoom;
+    sal_uInt16                   mnMinZoom;
+    sal_uInt16                   mnMaxZoom;
+    sal_uInt16                   mnSliderCenter;
     std::vector< long >      maSnappingPointOffsets;
-    std::vector< USHORT >    maSnappingPointZooms;
+    std::vector< sal_uInt16 >    maSnappingPointZooms;
     Image                    maSliderButton;
     Image                    maIncreaseButton;
     Image                    maDecreaseButton;
@@ -93,10 +93,10 @@ const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two
 
 // nOffset referes to the origin of the control:
 // + ----------- -
-USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
+sal_uInt16 SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
 {
     const long nControlWidth = getControlRect().GetWidth();
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
 
     if ( nOffset < nSliderXOffset )
         return mpImpl->mnMinZoom;;
@@ -105,7 +105,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
         return mpImpl->mnMaxZoom;
 
     // check for snapping points:
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     std::vector< long >::iterator aSnappingPointIter;
     for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin();
           aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
@@ -130,7 +130,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
             const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
             const long nZoomPerSliderPixel = (1000 * nFirstHalfRange) / nHalfSliderWidth;
             const long nOffsetToSliderLeft = nOffset - nSliderXOffset;
-            nRet = mpImpl->mnMinZoom + USHORT( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
+            nRet = mpImpl->mnMinZoom + sal_uInt16( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
         }
         else
         {
@@ -139,7 +139,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
             const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
             const long nZoomPerSliderPixel = 1000 * nSecondHalfRange / nHalfSliderWidth;
             const long nOffsetToSliderCenter = nOffset - nControlWidth/2;
-            nRet = mpImpl->mnSliderCenter + USHORT( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
+            nRet = mpImpl->mnSliderCenter + sal_uInt16( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
         }
     }
 
@@ -152,7 +152,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
 }
 
 // returns the offset to the left control border
-long SvxZoomSliderControl::Zoom2Offset( USHORT nCurrentZoom ) const
+long SvxZoomSliderControl::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
 {
     const long nControlWidth = getControlRect().GetWidth();
     long nRet = nSliderXOffset;
@@ -181,7 +181,7 @@ long SvxZoomSliderControl::Zoom2Offset( USHORT nCurrentZoom ) const
 
 // -----------------------------------------------------------------------
 
-SvxZoomSliderControl::SvxZoomSliderControl( USHORT _nSlotId,  USHORT _nId, StatusBar& _rStb ) :
+SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId,  sal_uInt16 _nId, StatusBar& _rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, _rStb ),
     mpImpl( new SvxZoomSliderControl_Impl )
 {
@@ -200,7 +200,7 @@ SvxZoomSliderControl::~SvxZoomSliderControl()
 
 // -----------------------------------------------------------------------
 
-void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
+void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( (SFX_ITEM_AVAILABLE != eState) || pState->ISA( SfxVoidItem ) )
     {
@@ -217,7 +217,7 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c
         mpImpl->mbValuesSet   = true;
 
         if ( mpImpl->mnSliderCenter == mpImpl->mnMaxZoom )
-            mpImpl->mnSliderCenter = mpImpl->mnMinZoom + (USHORT)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5);
+            mpImpl->mnSliderCenter = mpImpl->mnMinZoom + (sal_uInt16)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5);
 
 
         DBG_ASSERT( mpImpl->mnMinZoom <= mpImpl->mnCurrentZoom &&
@@ -231,20 +231,20 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c
         mpImpl->maSnappingPointZooms.clear();
 
         // get all snapping points:
-        std::set< USHORT > aTmpSnappingPoints;
-        for ( USHORT j = 0; j < rSnappingPoints.getLength(); ++j )
+        std::set< sal_uInt16 > aTmpSnappingPoints;
+        for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
         {
             const sal_Int32 nSnappingPoint = rSnappingPoints[j];
-            aTmpSnappingPoints.insert( (USHORT)nSnappingPoint );
+            aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
         }
 
         // remove snapping points that are to close to each other:
-        std::set< USHORT >::iterator aSnappingPointIter;
+        std::set< sal_uInt16 >::iterator aSnappingPointIter;
         long nLastOffset = 0;
 
         for ( aSnappingPointIter = aTmpSnappingPoints.begin(); aSnappingPointIter != aTmpSnappingPoints.end(); ++aSnappingPointIter )
         {
-            const USHORT nCurrent = *aSnappingPointIter;
+            const sal_uInt16 nCurrent = *aSnappingPointIter;
             const long nCurrentOffset = Zoom2Offset( nCurrent );
 
             if ( nCurrentOffset - nLastOffset >= nSnappingPointsMinDist )
@@ -347,10 +347,10 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
 
 // -----------------------------------------------------------------------
 
-BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
+sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
 {
     if ( !mpImpl->mbValuesSet )
-        return TRUE;;
+        return sal_True;;
 
     const Rectangle aControlRect = getControlRect();
     const Point aPoint = rEvt.GetPosPixel();
@@ -378,7 +378,7 @@ BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
         mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom;
 
     if ( nOldZoom == mpImpl->mnCurrentZoom )
-        return TRUE;
+        return sal_True;
 
     if ( GetStatusBar().AreItemsVisible() )
         GetStatusBar().SetItemData( GetId(), 0 );    // force repaint
@@ -399,15 +399,15 @@ BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
 
     mpImpl->mbOmitPaint = false;
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
+sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
 {
     if ( !mpImpl->mbValuesSet )
-        return TRUE;;
+        return sal_True;;
 
     const short nButtons = rEvt.GetButtons();
 
@@ -444,5 +444,5 @@ BOOL SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index ffc753e61276..d6805fb24ee3 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -35,7 +35,7 @@
 ::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType
                         , const ::rtl::OUString& rObjectName )
 {
-    USHORT nResID=0;
+    sal_uInt16 nResID=0;
     switch( eActionType )
     {
     case INSERT:
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index bae8ca9c188c..b09b7de83c18 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -104,7 +104,7 @@ void CloneList::CopyConnections() const
 
             if(pOriginalNode1)
             {
-                ULONG nPos(maOriginalList.GetPos(pOriginalNode1));
+                sal_uLong nPos(maOriginalList.GetPos(pOriginalNode1));
 
                 if(LIST_ENTRY_NOTFOUND != nPos)
                 {
@@ -117,7 +117,7 @@ void CloneList::CopyConnections() const
 
             if(pOriginalNode2)
             {
-                ULONG nPos(maOriginalList.GetPos(pOriginalNode2));
+                sal_uLong nPos(maOriginalList.GetPos(pOriginalNode2));
 
                 if(LIST_ENTRY_NOTFOUND != nPos)
                 {
diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx
index be2fc907d173..a649977b744c 100644
--- a/svx/source/svdraw/impgrfll.cxx
+++ b/svx/source/svdraw/impgrfll.cxx
@@ -42,12 +42,12 @@ void ImpCalcBmpFillSizes( Size&            rStartOffset,
                           const Size&      rBmpSize,
                           const Size&      rBmpPerCent,
                           const Size&      rBmpOffPerCent,
-                          BOOL             bBmpLogSize,
-                          BOOL             bBmpTile,
-                          BOOL             bBmpStretch,
+                          sal_Bool             bBmpLogSize,
+                          sal_Bool             bBmpTile,
+                          sal_Bool             bBmpStretch,
                           RECT_POINT       eBmpRectPoint )
 {
-    BOOL    bOriginalSize = FALSE, bScaleSize = FALSE;
+    sal_Bool    bOriginalSize = sal_False, bScaleSize = sal_False;
 
     // Falls keine Groessen gegeben sind ( z.B. alte Dokumente )
     // berechnen wir uns die Groesse selber aus der Bitmap
@@ -57,16 +57,16 @@ void ImpCalcBmpFillSizes( Size&            rStartOffset,
     if( bBmpLogSize )
     {
         if( !rBmpSize.Width() && !rBmpSize.Height() )
-            bOriginalSize = TRUE;
+            bOriginalSize = sal_True;
         else if( !rBmpSize.Width() || !rBmpSize.Height() )
-            bScaleSize = TRUE;
+            bScaleSize = sal_True;
     }
     else
     {
         if( !rBmpPerCent.Width() && !rBmpPerCent.Height() )
-            bOriginalSize = TRUE;
+            bOriginalSize = sal_True;
         else if( !rBmpPerCent.Width() || !rBmpPerCent.Height() )
-            bScaleSize = TRUE;
+            bScaleSize = sal_True;
     }
 
     // entweder Originalgroesse oder angepasste Groesse
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index b564421f6d0e..79c09eea0179 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -79,8 +79,8 @@ using namespace ::com::sun::star;
             // , thus it seems not necessary to make
             // it visible her at all.
             // #58917# Das Show darf nicht am VCL-Fenster landen, weil dann Assertion vom SFX
-            // BOOL bVis = pWindow->IsVisible();
-            // xC->setVisible(TRUE);
+            // sal_Bool bVis = pWindow->IsVisible();
+            // xC->setVisible(sal_True);
             // if ( !bVis )
             //  pWindow->Hide();
             //  if( !mxContext.is() && bVisible )
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 1adddfc29b2b..9b73f0caaab7 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -299,11 +299,11 @@ SdrItemPool::SdrItemPool(
 
     SvxBoxInfoItem* pBoxInfoItem = new SvxBoxInfoItem( SDRATTR_TABLE_BORDER_INNER );
 
-    pBoxInfoItem->SetTable( TRUE );
-    pBoxInfoItem->SetDist( TRUE);        // Abstandsfeld immer anzeigen
-//  pBoxInfoItem->SetMinDist( TRUE );// Minimalgroesse in Tabellen und Absaetzen setzen
+    pBoxInfoItem->SetTable( sal_True );
+    pBoxInfoItem->SetDist( sal_True);        // Abstandsfeld immer anzeigen
+//  pBoxInfoItem->SetMinDist( sal_True );// Minimalgroesse in Tabellen und Absaetzen setzen
 //  pBoxInfoItem->SetDefDist( MIN_BORDER_DIST );// Default-Abstand immer setzen
-    pBoxInfoItem->SetValid( VALID_DISABLE, TRUE ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben
+    pBoxInfoItem->SetValid( VALID_DISABLE, sal_True ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben
 
     mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ] =  pBoxInfoItem;
 //  mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_SHADOW - SDRATTR_START ] = new SvxShadowItem( SDRATTR_TABLE_BORDER_SHADOW );
@@ -329,7 +329,7 @@ SdrItemPool::SdrItemPool(
 /*************************************************************************
 |*
 |* copy ctor, sorgt dafuer, dass die static defaults gecloned werden
-|*            (Parameter 2 = TRUE)
+|*            (Parameter 2 = sal_True)
 |*
 \************************************************************************/
 
@@ -384,7 +384,7 @@ SfxItemPresentation __EXPORT SdrItemPool::GetPresentation(
               const IntlWrapper * pIntlWrapper) const
 {
     if (!IsInvalidItem(&rItem)) {
-        USHORT nWhich=rItem.Which();
+        sal_uInt16 nWhich=rItem.Which();
         if (nWhich>=SDRATTR_SHADOW_FIRST && nWhich<=SDRATTR_END) {
             rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS,
                         GetMetric(nWhich),ePresentationMetric,rText,
@@ -404,7 +404,7 @@ SfxItemPresentation __EXPORT SdrItemPool::GetPresentation(
 void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName)
 {
     ResMgr* pResMgr = ImpGetResMgr();
-    USHORT  nResId = SIP_UNKNOWN_ATTR;
+    sal_uInt16  nResId = SIP_UNKNOWN_ATTR;
 
     switch (nWhich)
     {
@@ -632,10 +632,10 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName)
 
 TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem);
 
-SdrFractionItem::SdrFractionItem(USHORT nId, SvStream& rIn):
+SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn):
     SfxPoolItem(nId)
 {
-    INT32 nMul,nDiv;
+    sal_Int32 nMul,nDiv;
     rIn>>nMul;
     rIn>>nDiv;
     nValue=Fraction(nMul,nDiv);
@@ -653,7 +653,7 @@ SfxItemPresentation __EXPORT SdrFractionItem::GetPresentation(
 {
     if(nValue.IsValid())
     {
-        INT32 nDiv = nValue.GetDenominator();
+        sal_Int32 nDiv = nValue.GetDenominator();
         rText = UniString::CreateFromInt32(nValue.GetNumerator());
 
         if(nDiv != 1)
@@ -680,15 +680,15 @@ SfxItemPresentation __EXPORT SdrFractionItem::GetPresentation(
     return ePresentation;
 }
 
-SfxPoolItem* __EXPORT SdrFractionItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrFractionItem(Which(),rIn);
 }
 
-SvStream& __EXPORT SdrFractionItem::Store(SvStream& rOut, USHORT /*nItemVers*/) const
+SvStream& __EXPORT SdrFractionItem::Store(SvStream& rOut, sal_uInt16 /*nItemVers*/) const
 {
-    rOut<<INT32(nValue.GetNumerator());
-    rOut<<INT32(nValue.GetDenominator());
+    rOut<<sal_Int32(nValue.GetNumerator());
+    rOut<<sal_Int32(nValue.GetDenominator());
     return rOut;
 }
 
@@ -700,7 +700,7 @@ SfxPoolItem* __EXPORT SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrFractionItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -717,7 +717,7 @@ SfxItemPresentation __EXPORT SdrScaleItem::GetPresentation(
 {
     if(GetValue().IsValid())
     {
-        INT32 nDiv = GetValue().GetDenominator();
+        sal_Int32 nDiv = GetValue().GetDenominator();
 
         rText = UniString::CreateFromInt32(GetValue().GetNumerator());
         rText += sal_Unicode(':');
@@ -741,7 +741,7 @@ SfxItemPresentation __EXPORT SdrScaleItem::GetPresentation(
     return ePresentation;
 }
 
-SfxPoolItem* __EXPORT SdrScaleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrScaleItem(Which(),rIn);
 }
@@ -762,12 +762,12 @@ SfxPoolItem* __EXPORT SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrOnOffItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrOnOffItem(Which(),rIn);
 }
 
-XubString __EXPORT SdrOnOffItem::GetValueTextByVal(BOOL bVal) const
+XubString __EXPORT SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const
 {
     if (bVal) return ImpGetResStr(STR_ItemValON);
     else return ImpGetResStr(STR_ItemValOFF);
@@ -790,7 +790,7 @@ SfxItemPresentation __EXPORT SdrOnOffItem::GetPresentation(SfxItemPresentation e
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrOnOffItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -802,12 +802,12 @@ SfxPoolItem* __EXPORT SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrYesNoItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrYesNoItem(Which(),rIn);
 }
 
-XubString __EXPORT SdrYesNoItem::GetValueTextByVal(BOOL bVal) const
+XubString __EXPORT SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const
 {
     if (bVal) return ImpGetResStr(STR_ItemValYES);
     else return ImpGetResStr(STR_ItemValNO);
@@ -830,7 +830,7 @@ SfxItemPresentation __EXPORT SdrYesNoItem::GetPresentation(SfxItemPresentation e
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrYesNoItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -846,7 +846,7 @@ SfxPoolItem* __EXPORT SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrPercentItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrPercentItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrPercentItem(Which(),rIn);
 }
@@ -873,7 +873,7 @@ SfxItemPresentation __EXPORT SdrPercentItem::GetPresentation(
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrPercentItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -889,7 +889,7 @@ SfxPoolItem* __EXPORT SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrAngleItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrAngleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrAngleItem(Which(),rIn);
 }
@@ -898,8 +898,8 @@ SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper * pIntlWrapper) const
 {
-    INT32 nValue(GetValue());
-    BOOL bNeg(nValue < 0);
+    sal_Int32 nValue(GetValue());
+    sal_Bool bNeg(nValue < 0);
 
     if(bNeg)
         nValue = -nValue;
@@ -925,8 +925,8 @@ SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation(
             rText.Insert(aUnicodeNull, 0);
 
         xub_StrLen nLen = rText.Len();
-        BOOL bNull1(rText.GetChar(nLen-1) == aUnicodeNull);
-        BOOL bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull);
+        sal_Bool bNull1(rText.GetChar(nLen-1) == aUnicodeNull);
+        sal_Bool bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull);
 
         if(bNull2)
         {
@@ -970,7 +970,7 @@ SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation(
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrAngleItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -986,14 +986,14 @@ SfxPoolItem* __EXPORT SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrMetricItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrMetricItem(Which(),rIn);
 }
 
 FASTBOOL __EXPORT SdrMetricItem::HasMetrics() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
@@ -1005,7 +1005,7 @@ FASTBOOL __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
         aVal/=nDiv;
         SetValue(long(aVal));
     }
-    return TRUE;
+    return sal_True;
 }
 
 SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
@@ -1030,7 +1030,7 @@ SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrMetricItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -1043,11 +1043,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const                { return new SdrCaptionTypeItem(*this); }
 
-SfxPoolItem* __EXPORT SdrCaptionTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const       { return new SdrCaptionTypeItem(rIn); }
+SfxPoolItem* __EXPORT SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const       { return new SdrCaptionTypeItem(rIn); }
 
-USHORT __EXPORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
 
-XubString __EXPORT SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos);
 }
@@ -1055,7 +1055,7 @@ XubString __EXPORT SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1070,11 +1070,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const              { return new SdrCaptionEscDirItem(*this); }
 
-SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT /*nVer*/) const     { return new SdrCaptionEscDirItem(rIn); }
+SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const     { return new SdrCaptionEscDirItem(rIn); }
 
-USHORT __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
+sal_uInt16 __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
 
-XubString __EXPORT SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos);
 }
@@ -1082,7 +1082,7 @@ XubString __EXPORT SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1102,11 +1102,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const         { return new SdrTextFitToSizeTypeItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); }
 
-USHORT __EXPORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
 
-XubString __EXPORT SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos);
 }
@@ -1114,7 +1114,7 @@ XubString __EXPORT SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) cons
 SfxItemPresentation __EXPORT SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1125,13 +1125,13 @@ SfxItemPresentation __EXPORT SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPr
     return ePres;
 }
 
-int  __EXPORT SdrTextFitToSizeTypeItem::HasBoolValue() const { return TRUE; }
+int  __EXPORT SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; }
 
-BOOL __EXPORT SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
+sal_Bool __EXPORT SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
 
-void __EXPORT SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
+void __EXPORT SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
 
-sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
     rVal <<= eFS;
@@ -1139,7 +1139,7 @@ sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*
     return sal_True;
 }
 
-sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextFitToSizeType eFS;
     if(!(rVal >>= eFS))
@@ -1151,7 +1151,7 @@ sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMembe
         eFS = (drawing::TextFitToSizeType) nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrFitToSizeType)eFS ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrFitToSizeType)eFS ) );
 
     return sal_True;
 }
@@ -1160,11 +1160,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextVertAdjustItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextVertAdjustItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextVertAdjustItem(rIn); }
 
-USHORT __EXPORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
+sal_uInt16 __EXPORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
 
-XubString __EXPORT SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos);
 }
@@ -1172,7 +1172,7 @@ XubString __EXPORT SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1183,13 +1183,13 @@ SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPrese
     return ePres;
 }
 
-sal_Bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextVerticalAdjust)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextVerticalAdjust eAdj;
     if(!(rVal >>= eAdj))
@@ -1201,7 +1201,7 @@ sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId
         eAdj = (drawing::TextVerticalAdjust)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrTextVertAdjust)eAdj ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextVertAdjust)eAdj ) );
 
     return sal_True;
 }
@@ -1210,11 +1210,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextHorzAdjustItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextHorzAdjustItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextHorzAdjustItem(rIn); }
 
-USHORT __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
+sal_uInt16 __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
 
-XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos);
 }
@@ -1222,7 +1222,7 @@ XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1233,13 +1233,13 @@ SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPrese
     return ePres;
 }
 
-sal_Bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextHorizontalAdjust)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextHorizontalAdjust eAdj;
     if(!(rVal >>= eAdj))
@@ -1251,7 +1251,7 @@ sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId
         eAdj = (drawing::TextHorizontalAdjust)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrTextHorzAdjust)eAdj ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextHorzAdjust)eAdj ) );
 
     return sal_True;
 }
@@ -1260,11 +1260,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextAniKindItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextAniKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextAniKindItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniKindItem(rIn); }
 
-USHORT __EXPORT SdrTextAniKindItem::GetValueCount() const { return 5; }
+sal_uInt16 __EXPORT SdrTextAniKindItem::GetValueCount() const { return 5; }
 
-XubString __EXPORT SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos);
 }
@@ -1272,7 +1272,7 @@ XubString __EXPORT SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1283,13 +1283,13 @@ SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresenta
     return ePres;
 }
 
-sal_Bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextAnimationKind)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextAnimationKind eKind;
     if(!(rVal >>= eKind))
@@ -1300,7 +1300,7 @@ sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         eKind = (drawing::TextAnimationKind)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrTextAniKind)eKind ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniKind)eKind ) );
 
     return sal_True;
 }
@@ -1309,11 +1309,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextAniDirectionItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextAniDirectionItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniDirectionItem(rIn); }
 
-USHORT __EXPORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
 
-XubString __EXPORT SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos);
 }
@@ -1321,7 +1321,7 @@ XubString __EXPORT SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1332,13 +1332,13 @@ SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPre
     return ePres;
 }
 
-sal_Bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextAnimationDirection)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextAnimationDirection eDir;
     if(!(rVal >>= eDir))
@@ -1350,7 +1350,7 @@ sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMember
         eDir = (drawing::TextAnimationDirection)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrTextAniDirection)eDir ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniDirection)eDir ) );
 
     return sal_True;
 }
@@ -1359,7 +1359,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
 
 SfxPoolItem* __EXPORT SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextAniDelayItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextAniDelayItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextAniDelayItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniDelayItem(rIn); }
 
 SfxItemPresentation __EXPORT SdrTextAniDelayItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
@@ -1385,7 +1385,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
 
 SfxPoolItem* __EXPORT SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextAniAmountItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextAniAmountItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniAmountItem(rIn); }
 
 FASTBOOL __EXPORT SdrTextAniAmountItem::HasMetrics() const
 {
@@ -1400,15 +1400,15 @@ FASTBOOL __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
         aVal+=nDiv/2; // fuer korrektes Runden
         aVal/=nDiv;
         SetValue(short(aVal));
-        return TRUE;
-    } else return FALSE;
+        return sal_True;
+    } else return sal_False;
 }
 
 SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
     XubString& rText, const IntlWrapper *) const
 {
-    INT32 nValue(GetValue());
+    sal_Int32 nValue(GetValue());
 
     if(!nValue)
         nValue = -1L;
@@ -1443,12 +1443,12 @@ SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation(
 }
 
 TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem );
-SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight )
+SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight )
     : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight )
 {
 }
 SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion )
-    : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, FALSE )
+    : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, sal_False )
 {
     if ( nVersion )
     {
@@ -1492,13 +1492,13 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi
 {
     return 1;
 }
-sal_Bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_Bool bValue = (sal_Bool)GetValue();
     rVal <<= bValue;
     return sal_True;
 }
-sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Bool bValue = sal_Bool();
     if( !( rVal >>= bValue ) )
@@ -1509,7 +1509,7 @@ sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMem
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrTextFixedCellHeightItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -1619,7 +1619,7 @@ SfxPoolItem* __EXPORT SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrCustomShapeAdjustmentItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -1650,7 +1650,7 @@ sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVer
     return 1;
 }
 
-sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_uInt32 i, nCount = GetCount();
     uno::Sequence< sal_Int32 > aSequence( nCount );
@@ -1664,7 +1664,7 @@ sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMembe
     return sal_True;
 }
 
-sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     uno::Sequence< sal_Int32 > aSequence;
     if( !( rVal >>= aSequence ) )
@@ -1698,11 +1698,11 @@ TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrEdgeKindItem(*this); }
 
-SfxPoolItem* __EXPORT SdrEdgeKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrEdgeKindItem(rIn); }
+SfxPoolItem* __EXPORT SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrEdgeKindItem(rIn); }
 
-USHORT __EXPORT SdrEdgeKindItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrEdgeKindItem::GetValueCount() const { return 4; }
 
-XubString __EXPORT SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos);
 }
@@ -1710,7 +1710,7 @@ XubString __EXPORT SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1721,7 +1721,7 @@ SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentatio
     return ePres;
 }
 
-sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD;
 
@@ -1741,7 +1741,7 @@ sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
     return sal_True;
 }
 
-sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::ConnectorType eCT;
     if(!(rVal >>= eCT))
@@ -1763,18 +1763,18 @@ sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         default:
             DBG_ERROR( "SdrEdgeKindItem::PuValue : unknown enum" );
     }
-    SetValue( sal::static_int_cast< USHORT >( eEK ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( eEK ) );
 
     return sal_True;
 }
 
-sal_Bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1784,13 +1784,13 @@ sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMembe
     return sal_True;
 }
 
-BOOL SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-BOOL SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1800,13 +1800,13 @@ BOOL SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
     return sal_True;
 }
 
-BOOL SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-BOOL SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1816,13 +1816,13 @@ BOOL SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
     return sal_True;
 }
 
-BOOL SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-BOOL SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1832,13 +1832,13 @@ BOOL SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
     return sal_True;
 }
 
-BOOL SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-BOOL SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1848,13 +1848,13 @@ BOOL SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
     return sal_True;
 }
 
-BOOL SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-BOOL SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1864,13 +1864,13 @@ BOOL SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
     return sal_True;
 }
 
-BOOL SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-BOOL SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1889,11 +1889,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrMeasureKindItem(*this); }
 
-SfxPoolItem* __EXPORT SdrMeasureKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrMeasureKindItem(rIn); }
+SfxPoolItem* __EXPORT SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrMeasureKindItem(rIn); }
 
-USHORT __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; }
+sal_uInt16 __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; }
 
-XubString __EXPORT SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_STD+nPos);
 }
@@ -1901,7 +1901,7 @@ XubString __EXPORT SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1912,13 +1912,13 @@ SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresenta
     return ePres;
 }
 
-sal_Bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureKind)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::MeasureKind eKind;
     if(!(rVal >>= eKind))
@@ -1930,7 +1930,7 @@ sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         eKind = (drawing::MeasureKind)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrMeasureKind)eKind ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureKind)eKind ) );
     return sal_True;
 }
 
@@ -1938,11 +1938,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrMeasureTextHPosItem(*this); }
 
-SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrMeasureTextHPosItem(rIn); }
+SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrMeasureTextHPosItem(rIn); }
 
-USHORT __EXPORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
 
-XubString __EXPORT SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos);
 }
@@ -1950,7 +1950,7 @@ XubString __EXPORT SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1961,13 +1961,13 @@ SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPres
     return ePres;
 }
 
-sal_Bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureTextHorzPos)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::MeasureTextHorzPos ePos;
     if(!(rVal >>= ePos))
@@ -1979,7 +1979,7 @@ sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberI
         ePos = (drawing::MeasureTextHorzPos)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) );
     return sal_True;
 }
 
@@ -1987,11 +1987,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrMeasureTextVPosItem(*this); }
 
-SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrMeasureTextVPosItem(rIn); }
+SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrMeasureTextVPosItem(rIn); }
 
-USHORT __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
+sal_uInt16 __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
 
-XubString __EXPORT SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos);
 }
@@ -1999,7 +1999,7 @@ XubString __EXPORT SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -2010,13 +2010,13 @@ SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPres
     return ePres;
 }
 
-sal_Bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureTextVertPos)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::MeasureTextVertPos ePos;
     if(!(rVal >>= ePos))
@@ -2028,7 +2028,7 @@ sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberI
         ePos = (drawing::MeasureTextVertPos)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) );
     return sal_True;
 }
 
@@ -2036,11 +2036,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrMeasureUnitItem(*this); }
 
-SfxPoolItem* __EXPORT SdrMeasureUnitItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrMeasureUnitItem(rIn); }
+SfxPoolItem* __EXPORT SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrMeasureUnitItem(rIn); }
 
-USHORT __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
+sal_uInt16 __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
 
-XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     XubString aRetval;
 
@@ -2060,7 +2060,7 @@ XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -2071,19 +2071,19 @@ SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresenta
     return ePres;
 }
 
-sal_Bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nMeasure = 0;
     if(!(rVal >>= nMeasure))
         return sal_False;
 
-    SetValue( sal::static_int_cast< USHORT >( (FieldUnit)nMeasure ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (FieldUnit)nMeasure ) );
     return sal_True;
 }
 
@@ -2096,11 +2096,11 @@ TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem);
 
 SfxPoolItem* __EXPORT SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const          { return new SdrCircKindItem(*this); }
 
-SfxPoolItem* __EXPORT SdrCircKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCircKindItem(rIn); }
+SfxPoolItem* __EXPORT SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCircKindItem(rIn); }
 
-USHORT __EXPORT SdrCircKindItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrCircKindItem::GetValueCount() const { return 4; }
 
-XubString __EXPORT SdrCircKindItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValCIRC_FULL+nPos);
 }
@@ -2108,7 +2108,7 @@ XubString __EXPORT SdrCircKindItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -2119,13 +2119,13 @@ SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentatio
     return ePres;
 }
 
-sal_Bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::CircleKind)GetValue();
     return sal_True;
 }
 
-sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::CircleKind eKind;
     if(!(rVal >>= eKind))
@@ -2137,7 +2137,7 @@ sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         eKind = (drawing::CircleKind)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrCircKind)eKind ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrCircKind)eKind ) );
     return sal_True;
 }
 
@@ -2153,7 +2153,7 @@ SfxPoolItem* __EXPORT SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrSignedPercentItem( Which(), GetValue() );
 }
 
-SfxPoolItem* __EXPORT SdrSignedPercentItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrSignedPercentItem( Which(), rIn );
 }
@@ -2181,7 +2181,7 @@ SfxItemPresentation __EXPORT SdrSignedPercentItem::GetPresentation(
 
 int __EXPORT SdrSignedPercentItem::IsPoolable() const
 {
-    USHORT nId=Which();
+    sal_uInt16 nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
 }
 #endif
@@ -2197,7 +2197,7 @@ SfxPoolItem* __EXPORT SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafRedItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafRedItem( rIn );
 }
@@ -2213,7 +2213,7 @@ SfxPoolItem* __EXPORT SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafGreenItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafGreenItem( rIn );
 }
@@ -2229,7 +2229,7 @@ SfxPoolItem* __EXPORT SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafBlueItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafBlueItem( rIn );
 }
@@ -2245,7 +2245,7 @@ SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafLuminanceItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafLuminanceItem( rIn );
 }
@@ -2261,7 +2261,7 @@ SfxPoolItem* __EXPORT SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafContrastItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafContrastItem( rIn );
 }
@@ -2277,24 +2277,24 @@ SfxPoolItem* __EXPORT SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const
     return new SdrGrafGamma100Item( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafGamma100Item( rIn );
 }
 
-sal_Bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= ((double)GetValue()) / 100.0;
     return sal_True;
 }
 
-sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     double nGamma = 0;
     if(!(rVal >>= nGamma))
         return sal_False;
 
-    SetValue( (UINT32)(nGamma * 100.0  ) );
+    SetValue( (sal_uInt32)(nGamma * 100.0  ) );
     return sal_True;
 }
 
@@ -2309,7 +2309,7 @@ SfxPoolItem* __EXPORT SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafInvertItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafInvertItem( rIn );
 }
@@ -2325,7 +2325,7 @@ SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) co
     return new SdrGrafTransparenceItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafTransparenceItem( rIn );
 }
@@ -2341,17 +2341,17 @@ SfxPoolItem* __EXPORT SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrGrafModeItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafModeItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafModeItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafModeItem( rIn );
 }
 
-USHORT __EXPORT SdrGrafModeItem::GetValueCount() const
+sal_uInt16 __EXPORT SdrGrafModeItem::GetValueCount() const
 {
     return 4;
 }
 
-XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const
+XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     XubString aStr;
 
@@ -2390,7 +2390,7 @@ SfxItemPresentation __EXPORT SdrGrafModeItem::GetPresentation( SfxItemPresentati
                                                                SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
                                                                XubString& rText, const IntlWrapper *) const
 {
-    rText = GetValueTextByPos( sal::static_int_cast< USHORT >( GetValue() ) );
+    rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) );
 
     if( ePres == SFX_ITEM_PRESENTATION_COMPLETE )
     {
@@ -2415,12 +2415,12 @@ SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafCropItem( *this );
 }
 
-SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
 {
     return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) );
 }
 
-USHORT SdrGrafCropItem::GetVersion( USHORT /*nFileVersion*/) const
+sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const
 {
     // GRFCROP_VERSION_MOVETOSVX is 1
     return GRFCROP_VERSION_MOVETOSVX;
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 7980668c0b9a..6fa8b0552f35 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -214,11 +214,11 @@ void SdrCreateView::ImpClearVars()
     nAktIdent=OBJ_NONE;
     pAktCreate=NULL;
     pCreatePV=NULL;
-    bAutoTextEdit=FALSE;
-    b1stPointAsCenter=FALSE;
+    bAutoTextEdit=sal_False;
+    b1stPointAsCenter=sal_False;
     aAktCreatePointer=Pointer(POINTER_CROSS);
-    bUseIncompatiblePathCreateInterface=FALSE;
-    bAutoClosePolys=TRUE;
+    bUseIncompatiblePathCreateInterface=sal_False;
+    bAutoClosePolys=sal_True;
     nAutoCloseDistPix=5;
     nFreeHandMinDistPix=10;
 
@@ -249,7 +249,7 @@ void SdrCreateView::ImpDelCreateAttr()
 {
 }
 
-BOOL SdrCreateView::IsAction() const
+sal_Bool SdrCreateView::IsAction() const
 {
     return SdrDragView::IsAction() || pAktCreate!=NULL;
 }
@@ -296,26 +296,26 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const
     }
 }
 
-BOOL SdrCreateView::CheckEdgeMode()
+sal_Bool SdrCreateView::CheckEdgeMode()
 {
-    UINT32 nInv=nAktInvent;
-    UINT16 nIdn=nAktIdent;
+    sal_uInt32 nInv=nAktInvent;
+    sal_uInt16 nIdn=nAktIdent;
     if (pAktCreate!=NULL)
     {
         nInv=pAktCreate->GetObjInventor();
         nIdn=pAktCreate->GetObjIdentifier();
         // wird vom EdgeObj gemanaged
-        if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE;
+        if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False;
     }
 
     if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE)
     {
         ImpClearConnectMarker();
-        return FALSE;
+        return sal_False;
     }
     else
     {
-        // TRUE heisst: MouseMove soll Connect checken
+        // sal_True heisst: MouseMove soll Connect checken
         return !IsAction();
     }
 }
@@ -348,7 +348,7 @@ void SdrCreateView::HideConnectMarker()
     ImpClearConnectMarker();
 }
 
-BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     if(CheckEdgeMode() && pWin)
     {
@@ -358,7 +358,7 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
         {
             // Defaultete Hit-Toleranz bei IsMarkedHit() mal aendern !!!!
             Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel()));
-            BOOL bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
+            sal_Bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
             SdrObjConnection aCon;
             if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin);
             SetConnectMarker(aCon,*pPV);
@@ -367,22 +367,22 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
     return SdrDragView::MouseMove(rMEvt,pWin);
 }
 
-BOOL SdrCreateView::IsTextTool() const
+sal_Bool SdrCreateView::IsTextTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
 }
 
-BOOL SdrCreateView::IsEdgeTool() const
+sal_Bool SdrCreateView::IsEdgeTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
 }
 
-BOOL SdrCreateView::IsMeasureTool() const
+sal_Bool SdrCreateView::IsMeasureTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
 }
 
-void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
+void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
 {
     if (nAktInvent!=nInvent || nAktIdent!=nIdent)
     {
@@ -416,10 +416,10 @@ void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
     ImpSetGlueVisible3(IsEdgeTool());
 }
 
-BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& rPnt, OutputDevice* pOut,
+sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
     short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     UnmarkAllObj();
     BrkAction();
 
@@ -442,7 +442,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
             aLay = aMeasureLayer;
         }
 
-        SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,TRUE);
+        SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,sal_True);
         if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
         if (!pCreatePV->GetLockedLayers().IsSet(nLayer) && pCreatePV->GetVisibleLayers().IsSet(nLayer))
         {
@@ -465,14 +465,14 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
             }
 
             Point aPnt(rPnt);
-            if (nAktInvent!=SdrInventor || (nAktIdent!=USHORT(OBJ_EDGE) &&
-                                            nAktIdent!=USHORT(OBJ_FREELINE) &&
-                                            nAktIdent!=USHORT(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
+            if (nAktInvent!=SdrInventor || (nAktIdent!=sal_uInt16(OBJ_EDGE) &&
+                                            nAktIdent!=sal_uInt16(OBJ_FREELINE) &&
+                                            nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
                 aPnt=GetSnapPos(aPnt,pCreatePV);
             }
             if (pAktCreate!=NULL)
             {
-                BOOL bStartEdit=FALSE; // nach Ende von Create automatisch TextEdit starten
+                sal_Bool bStartEdit=sal_False; // nach Ende von Create automatisch TextEdit starten
                 if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, sal_False);
 
                 // #101618# SW uses a naked SdrObject for frame construction. Normally, such an
@@ -492,7 +492,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
 
                     pAktCreate->SetMergedItemSet(aSet);
 
-                    bStartEdit=TRUE;
+                    bStartEdit=sal_True;
                 }
                 if (nInvent==SdrInventor && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT ||
                     nIdent==OBJ_TITLETEXT || nIdent==OBJ_OUTLINETEXT))
@@ -506,7 +506,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
 
                     pAktCreate->SetMergedItemSet(aSet);
 
-                    bStartEdit=TRUE;
+                    bStartEdit=sal_True;
                 }
                 if (!rLogRect.IsEmpty()) pAktCreate->NbcSetLogicRect(rLogRect);
 
@@ -543,8 +543,8 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
                 pDragWin=pOut;
                 if (pAktCreate->BegCreate(aDragStat))
                 {
-                    ShowCreateObj(/*pOut,TRUE*/);
-                    bRet=TRUE;
+                    ShowCreateObj(/*pOut,sal_True*/);
+                    bRet=sal_True;
                 }
                 else
                 {
@@ -558,7 +558,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
     return bRet;
 }
 
-BOOL SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
+sal_Bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
 {
     return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L);
 }
@@ -577,7 +577,7 @@ sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMi
     return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject);
 }
 
-BOOL SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
+sal_Bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
     OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
 {
     return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV,
@@ -604,9 +604,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
         if(bDidLimit && IsOrtho())
         {
             if(aDragStat.IsOrtho8Possible())
-                OrthoDistance8(aDragStat.GetPrev(), aPnt, FALSE);
+                OrthoDistance8(aDragStat.GetPrev(), aPnt, sal_False);
             else if(aDragStat.IsOrtho4Possible())
-                OrthoDistance4(aDragStat.GetPrev(), aPnt, FALSE);
+                OrthoDistance4(aDragStat.GetPrev(), aPnt, sal_False);
         }
 
         if (aPnt==aDragStat.GetNow()) return;
@@ -628,24 +628,24 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
     }
 }
 
-BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
+sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     SdrObject* pObjMerk=pAktCreate;
     SdrPageView* pPVMerk=pCreatePV;
 
     if (pAktCreate!=NULL)
     {
-        ULONG nAnz=aDragStat.GetPointAnz();
+        sal_uIntPtr nAnz=aDragStat.GetPointAnz();
 
         if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND)
         {
             BrkCreateObj(); // Objekte mit nur einem Punkt gibt's nicht (zumindest noch nicht)
-            return FALSE; // FALSE=Event nicht ausgewertet
+            return sal_False; // sal_False=Event nicht ausgewertet
         }
 
-        BOOL bPntsEq=nAnz>1;
-        ULONG i=1;
+        sal_Bool bPntsEq=nAnz>1;
+        sal_uIntPtr i=1;
         Point aP0=aDragStat.GetPoint(0);
         while (bPntsEq && i<nAnz) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; }
 
@@ -670,7 +670,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 }
                 else
                 {
-                    nLayer = rAd.GetLayerID(aAktLayer, TRUE);
+                    nLayer = rAd.GetLayerID(aAktLayer, sal_True);
                 }
 
                 if(SDRLAYER_NOTFOUND == nLayer)
@@ -681,7 +681,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 pObj->SetLayer(nLayer);
 
                 // #83403# recognize creation of a new 3D object inside a 3D scene
-                BOOL bSceneIntoScene(FALSE);
+                sal_Bool bSceneIntoScene(sal_False);
 
                 if(pObjMerk
                     && pObjMerk->ISA(E3dScene)
@@ -689,7 +689,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                     && pCreatePV->GetAktGroup()
                     && pCreatePV->GetAktGroup()->ISA(E3dScene))
                 {
-                    BOOL bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene(
+                    sal_Bool bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene(
                         (E3dScene*)pObjMerk, (E3dScene*)pCreatePV->GetAktGroup(), Point(0, 0));
 
                     if(bDidInsert)
@@ -697,8 +697,8 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                         // delete object, it's content is cloned and inserted
                         SdrObject::Free( pObjMerk );
                         pObjMerk = 0L;
-                        bRet = FALSE;
-                        bSceneIntoScene = TRUE;
+                        bRet = sal_False;
+                        bSceneIntoScene = sal_True;
                     }
                 }
 
@@ -709,7 +709,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 }
 
                 pCreatePV=NULL;
-                bRet=TRUE; // TRUE=Event ausgewertet
+                bRet=sal_True; // sal_True=Event ausgewertet
             }
             else
             {
@@ -729,7 +729,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 HideCreateObj();
                 ShowCreateObj();
                 aDragStat.ResetMinMoved(); // NextPoint gibt's bei MovCreateObj()
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
         if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate())
@@ -780,7 +780,7 @@ void SdrCreateView::BrkCreateObj()
     }
 }
 
-void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/)
+void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
 {
     if(IsCreateObj() && !aDragStat.IsShown())
     {
@@ -889,7 +889,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/)
             }
         }
 
-        aDragStat.SetShown(TRUE);
+        aDragStat.SetShown(sal_True);
     }
 }
 
@@ -902,19 +902,19 @@ void SdrCreateView::HideCreateObj()
         mpCreateViewExtraData->HideOverlay();
 
         //DrawCreateObj(pOut,bFull);
-        aDragStat.SetShown(FALSE);
+        aDragStat.SetShown(sal_False);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /* new interface src537 */
-BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if(pAktCreate)
     {
         rTargetSet.Put(pAktCreate->GetMergedItemSet());
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -922,13 +922,13 @@ BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) co
     }
 }
 
-BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
     if(pAktCreate)
     {
         pAktCreate->SetMergedItemSetAndBroadcast(rSet, bReplaceAll);
 
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -936,11 +936,11 @@ BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
     }
 }
 
-SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(sal_Bool& rOk) const
 {
     if (pAktCreate!=NULL)
     {
-        //rOk=TRUE;
+        //rOk=sal_True;
         return pAktCreate->GetStyleSheet();
     }
     else
@@ -949,12 +949,12 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateV
     }
 }
 
-BOOL SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (pAktCreate!=NULL)
     {
         pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
-        return TRUE;
+        return sal_True;
     }
     else
     {
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index 74d8fd10a402..c21d0e7bc631 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -49,20 +49,20 @@ void SdrDragStat::Reset()
 {
     pView=NULL;
     pPageView=NULL;
-    bShown=FALSE;
+    bShown=sal_False;
     nMinMov=1;
-    bMinMoved=FALSE;
-    bHorFixed=FALSE;
-    bVerFixed=FALSE;
-    bWantNoSnap=FALSE;
+    bMinMoved=sal_False;
+    bHorFixed=sal_False;
+    bVerFixed=sal_False;
+    bWantNoSnap=sal_False;
     pHdl=NULL;
-    bOrtho4=FALSE;
-    bOrtho8=FALSE;
+    bOrtho4=sal_False;
+    bOrtho8=sal_False;
     pDragMethod=NULL;
-    bEndDragChangesAttributes=FALSE;
-    bEndDragChangesGeoAndAttributes=FALSE;
-    bMouseIsUp=FALSE;
-    Clear(TRUE);
+    bEndDragChangesAttributes=sal_False;
+    bEndDragChangesGeoAndAttributes=sal_False;
+    bMouseIsUp=sal_False;
+    Clear(sal_True);
     aActionRect=Rectangle();
 }
 
@@ -114,7 +114,7 @@ FASTBOOL SdrDragStat::CheckMinMoved(const Point& rPnt)
         long dx=rPnt.X()-GetPrev().X(); if (dx<0) dx=-dx;
         long dy=rPnt.Y()-GetPrev().Y(); if (dy<0) dy=-dy;
         if (dx>=long(nMinMov) || dy>=long(nMinMov))
-            bMinMoved=TRUE;
+            bMinMoved=sal_True;
     }
     return bMinMoved;
 }
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 058ba94cf3a6..afbb6d0b4066 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1585,13 +1585,13 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
         { // Klebepunkte aufs BoundRect des Obj limitieren
             aPt1-=DragStat().GetStart();
             const SdrMarkList& rML=GetMarkedObjectList();
-            ULONG nMarkAnz=rML.GetMarkCount();
+            sal_uLong nMarkAnz=rML.GetMarkCount();
 
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
+            for (sal_uLong nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
             {
                 const SdrMark* pM=rML.GetMark(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-                ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+                sal_uLong nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
 
                 if (nPtAnz!=0)
                 {
@@ -1599,7 +1599,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
                     const SdrGluePointList* pGPL=pObj->GetGluePointList();
                     Rectangle aBound(pObj->GetCurrentBoundRect());
 
-                    for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+                    for (sal_uLong nPtNum=0; nPtNum<nPtAnz; nPtNum++)
                     {
                         sal_uInt16 nId=pPts->GetObject(nPtNum);
                         sal_uInt16 nGlueNum=pGPL->FindGluePoint(nId);
@@ -1688,12 +1688,12 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const
     Fraction aFact1(1,1);
     Point aStart(DragStat().GetStart());
     Point aRef(DragStat().GetRef1());
-    INT32 nXDiv(aStart.X() - aRef.X());
+    sal_Int32 nXDiv(aStart.X() - aRef.X());
 
     if(!nXDiv)
         nXDiv = 1;
 
-    INT32 nYDiv(aStart.Y() - aRef.Y());
+    sal_Int32 nYDiv(aStart.Y() - aRef.Y());
 
     if(!nYDiv)
         nYDiv = 1;
@@ -2030,7 +2030,7 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const
     ImpTakeDescriptionStr(STR_DragMethRotate, rStr);
     rStr.AppendAscii(" (");
     XubString aStr;
-    INT32 nTmpWink(NormAngle360(nWink));
+    sal_Int32 nTmpWink(NormAngle360(nWink));
 
     if(bRight && nWink)
     {
@@ -2166,7 +2166,7 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const
     ImpTakeDescriptionStr(STR_DragMethShear, rStr);
     rStr.AppendAscii(" (");
 
-    INT32 nTmpWink(nWink);
+    sal_Int32 nTmpWink(nWink);
 
     if(bUpSideDown)
         nTmpWink += 18000;
@@ -2758,7 +2758,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const
         rStr.AppendAscii(" (");
 
         XubString aStr;
-        INT32 nVal(nWink);
+        sal_Int32 nVal(nWink);
 
         if(bAtCenter)
             nVal *= 2;
@@ -3353,9 +3353,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy)
                 if (bCopy)
                     getSdrDragView().CopyMarkedObj();
 
-                ULONG nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount();
+                sal_uLong nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount();
 
-                for (ULONG nm=0; nm<nMarkAnz; nm++)
+                for (sal_uLong nm=0; nm<nMarkAnz; nm++)
                 {
                     SdrMark* pM=getSdrDragView().GetMarkedObjectList().GetMark(nm);
                     SdrObject* pO=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index f47d30fb3bdd..ea2b67ca12f6 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -68,34 +68,34 @@ using namespace sdr;
 
 void SdrDragView::ImpClearVars()
 {
-    bFramDrag=FALSE;
+    bFramDrag=sal_False;
     eDragMode=SDRDRAG_MOVE;
-    bDragLimit=FALSE;
-    bMarkedHitMovesAlways=FALSE;
+    bDragLimit=sal_False;
+    bMarkedHitMovesAlways=sal_False;
     eDragHdl=HDL_MOVE;
     pDragHdl=NULL;
-    bDragHdl=FALSE;
-    bDragSpecial=FALSE;
+    bDragHdl=sal_False;
+    bDragSpecial=sal_False;
     mpCurrentSdrDragMethod=NULL;
-    bDragStripes=FALSE;
-    bMirrRefDragObj=TRUE;
-    bDragWithCopy=FALSE;
+    bDragStripes=sal_False;
+    bMirrRefDragObj=sal_True;
+    bDragWithCopy=sal_False;
     pInsPointUndo=NULL;
-    bInsGluePoint=FALSE;
-    bInsObjPointMode=FALSE;
-    bInsGluePointMode=FALSE;
+    bInsGluePoint=sal_False;
+    bInsObjPointMode=sal_False;
+    bInsGluePointMode=sal_False;
     nDragXorPolyLimit=100;
     nDragXorPointLimit=500;
-    bNoDragXorPolys=FALSE;
-    bAutoVertexCon=TRUE;
-    bAutoCornerCon=FALSE;
-    bRubberEdgeDragging=TRUE;
+    bNoDragXorPolys=sal_False;
+    bAutoVertexCon=sal_True;
+    bAutoCornerCon=sal_False;
+    bRubberEdgeDragging=sal_True;
     nRubberEdgeDraggingLimit=100;
-    bDetailedEdgeDragging=TRUE;
+    bDetailedEdgeDragging=sal_True;
     nDetailedEdgeDraggingLimit=10;
-    bResizeAtCenter=FALSE;
-    bCrookAtCenter=FALSE;
-    bMouseHideWhileDraggingPoints=FALSE;
+    bResizeAtCenter=sal_False;
+    bCrookAtCenter=sal_False;
+    bMouseHideWhileDraggingPoints=sal_False;
 
     // init using default
     mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate();
@@ -122,7 +122,7 @@ void SdrDragView::ImpDelDragAttr()
 {
 }
 
-BOOL SdrDragView::IsAction() const
+sal_Bool SdrDragView::IsAction() const
 {
     return (mpCurrentSdrDragMethod || SdrExchangeView::IsAction());
 }
@@ -140,7 +140,7 @@ void SdrDragView::EndAction()
 {
     if (mpCurrentSdrDragMethod)
     {
-        EndDragObj(FALSE);
+        EndDragObj(sal_False);
     }
     SdrExchangeView::EndAction();
 }
@@ -186,7 +186,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const
     }
 }
 
-BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
+sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const
 {
     Rectangle aR;
     TakeActionRect(aR);
@@ -199,8 +199,8 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
         if (pObj->ISA(SdrCaptionObj))
         {
             Point aPt(((SdrCaptionObj*)pObj)->GetTailPos());
-            BOOL bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier)
-            BOOL bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch
+            sal_Bool bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier)
+            sal_Bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch
             if (!bTail)
             { // bei bTail liefert TakeActionRect schon das richtige
                 if (bOwn)
@@ -216,30 +216,30 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
                 }
             }
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
+sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
+sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
 {
     BrkAction();
 
     bool bRet=false;
     {
-        SetDragWithCopy(FALSE);
+        SetDragWithCopy(sal_False);
         //ForceEdgesOfMarkedNodes();
         //TODO: aAni.Reset();
         mpCurrentSdrDragMethod=NULL;
-        bDragSpecial=FALSE;
-        bDragLimit=FALSE;
+        bDragSpecial=sal_False;
+        bDragLimit=sal_False;
         SdrDragMode eTmpMode=eDragMode;
         if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) {
             eTmpMode=SDRDRAG_RESIZE;
@@ -249,7 +249,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
         if (!bFramDrag &&
             (pMarkedObj==NULL || !pMarkedObj->hasSpecialDrag()) &&
             (pHdl==NULL || pHdl->GetObj()==NULL)) {
-            bFramDrag=TRUE;
+            bFramDrag=sal_True;
         }
 
         Point aPnt(rPnt);
@@ -277,7 +277,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
         bDragHdl=eDragHdl==HDL_REF1 || eDragHdl==HDL_REF2 || eDragHdl==HDL_MIRX;
 
         // #103894# Expand test for HDL_ANCHOR_TR
-        BOOL bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
+        sal_Bool bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
 
         if(pHdl && (pHdl->GetKind() == HDL_SMARTTAG) && pForcedMeth )
         {
@@ -299,18 +299,18 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                         case HDL_UPPER: case HDL_LOWER:
                         {
                             // Sind 3D-Objekte selektiert?
-                            BOOL b3DObjSelected = FALSE;
-                            for(UINT32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++)
+                            sal_Bool b3DObjSelected = sal_False;
+                            for(sal_uInt32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++)
                             {
                                 SdrObject* pObj = GetMarkedObjectByIndex(a);
                                 if(pObj && pObj->ISA(E3dObject))
-                                    b3DObjSelected = TRUE;
+                                    b3DObjSelected = sal_True;
                             }
                             // Falls ja, Shear auch bei !IsShearAllowed zulassen,
                             // da es sich bei 3D-Objekten um eingeschraenkte
                             // Rotationen handelt
                             if (!b3DObjSelected && !IsShearAllowed())
-                                return FALSE;
+                                return sal_False;
                             mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE);
                         } break;
                         case HDL_UPLFT: case HDL_UPRGT:
@@ -318,12 +318,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                         {
                             if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT)
                             {
-                                if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return FALSE;
+                                if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return sal_False;
                                 mpCurrentSdrDragMethod = new SdrDragDistort(*this);
                             }
                             else
                             {
-                                if (!IsRotateAllowed(TRUE)) return FALSE;
+                                if (!IsRotateAllowed(sal_True)) return sal_False;
                                 mpCurrentSdrDragMethod = new SdrDragRotate(*this);
                             }
                         } break;
@@ -331,12 +331,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                         {
                             if (IsMarkedHitMovesAlways() && eDragHdl==HDL_MOVE)
                             { // HDL_MOVE ist auch wenn Obj direkt getroffen
-                                if (!IsMoveAllowed()) return FALSE;
+                                if (!IsMoveAllowed()) return sal_False;
                                 mpCurrentSdrDragMethod = new SdrDragMove(*this);
                             }
                             else
                             {
-                                if (!IsRotateAllowed(TRUE)) return FALSE;
+                                if (!IsRotateAllowed(sal_True)) return sal_False;
                                 mpCurrentSdrDragMethod = new SdrDragRotate(*this);
                             }
                         }
@@ -346,12 +346,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                 {
                     if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
                     {
-                        if (!IsMoveAllowed()) return FALSE;
+                        if (!IsMoveAllowed()) return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     }
                     else
                     {
-                        if (!IsMirrorAllowed(TRUE,TRUE)) return FALSE;
+                        if (!IsMirrorAllowed(sal_True,sal_True)) return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMirror(*this);
                     }
                 } break;
@@ -361,13 +361,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
                     {
                         if (!IsMoveAllowed())
-                            return FALSE;
+                            return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     }
                     else
                     {
-                        if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE))
-                            return FALSE;
+                        if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False))
+                            return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragCrop(*this);
                     }
                 }
@@ -378,15 +378,15 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways())
                     {
                         if(!IsMoveAllowed())
-                            return FALSE;
+                            return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     }
                     else
                     {
                         if(!IsTransparenceAllowed())
-                            return FALSE;
+                            return sal_False;
 
-                        mpCurrentSdrDragMethod = new SdrDragGradient(*this, FALSE);
+                        mpCurrentSdrDragMethod = new SdrDragGradient(*this, sal_False);
                     }
                     break;
                 }
@@ -395,13 +395,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways())
                     {
                         if(!IsMoveAllowed())
-                            return FALSE;
+                            return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     }
                     else
                     {
                         if(!IsGradientAllowed())
-                            return FALSE;
+                            return sal_False;
 
                         mpCurrentSdrDragMethod = new SdrDragGradient(*this);
                     }
@@ -412,12 +412,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                 {
                     if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
                     {
-                        if (!IsMoveAllowed()) return FALSE;
+                        if (!IsMoveAllowed()) return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     }
                     else
                     {
-                        if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return FALSE;
+                        if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragCrook(*this);
                     }
                 } break;
@@ -427,7 +427,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     // SDRDRAG_MOVE
                     if((eDragHdl == HDL_MOVE) && !IsMoveAllowed())
                     {
-                        return FALSE;
+                        return sal_False;
                     }
                     else if(eDragHdl == HDL_GLUE)
                     {
@@ -443,9 +443,9 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                             }
                             else
                             {
-                                if(!IsResizeAllowed(TRUE))
+                                if(!IsResizeAllowed(sal_True))
                                 {
-                                    return FALSE;
+                                    return sal_False;
                                 }
 
                                 sal_Bool bSingleTextObjMark = sal_False;    // SJ: #i100490#
@@ -488,14 +488,14 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                                 {
                                     // #i77187#
                                     // do not allow move of polygon points if object is move or size protected
-                                    return FALSE;
+                                    return sal_False;
                                 }
                             }
 
                             if(!mpCurrentSdrDragMethod)
                             {
                                 // fallback to DragSpecial if no interaction defined
-                                bDragSpecial = TRUE;
+                                bDragSpecial = sal_True;
                                 mpCurrentSdrDragMethod = new SdrDragObjOwn(*this);
                             }
                         }
@@ -519,12 +519,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     // Aha, Obj kann nicht Move SpecialDrag, also MoveFrameDrag versuchen
                     delete mpCurrentSdrDragMethod;
                     mpCurrentSdrDragMethod = 0;
-                    bDragSpecial=FALSE;
+                    bDragSpecial=sal_False;
 
                     if (!IsMoveAllowed())
-                        return FALSE;
+                        return sal_False;
 
-                    bFramDrag=TRUE;
+                    bFramDrag=sal_True;
                     mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     aDragStat.SetDragMethod(mpCurrentSdrDragMethod);
                     bRet = mpCurrentSdrDragMethod->BeginSdrDrag();
@@ -552,14 +552,14 @@ void SdrDragView::MovDragObj(const Point& rPnt)
     }
 }
 
-BOOL SdrDragView::EndDragObj(BOOL bCopy)
+sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy)
 {
     bool bRet(false);
 
     // #i73341# If insert GluePoint, do not insist on last points being different
     if(mpCurrentSdrDragMethod && aDragStat.IsMinMoved() && (IsInsertGluePoint() || aDragStat.GetNow() != aDragStat.GetPrev()))
     {
-        ULONG nHdlAnzMerk=0;
+        sal_uIntPtr nHdlAnzMerk=0;
 
         if (bEliminatePolyPoints)
         { // IBM Special
@@ -592,7 +592,7 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy)
         if (bInsPolyPoint)
         {
             SetMarkHandles();
-            bInsPolyPoint=FALSE;
+            bInsPolyPoint=sal_False;
             if( bUndo )
             {
                 BegUndo(aInsPointUndoStr);
@@ -618,8 +618,8 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy)
         BrkDragObj();
     }
 
-    bInsPolyPoint=FALSE;
-    SetInsertGluePoint(FALSE);
+    bInsPolyPoint=sal_False;
+    SetInsertGluePoint(sal_False);
 
     return bRet;
 }
@@ -639,7 +639,7 @@ void SdrDragView::BrkDragObj()
             delete pInsPointUndo;
             pInsPointUndo=NULL;
             SetMarkHandles();
-            bInsPolyPoint=FALSE;
+            bInsPolyPoint=sal_False;
         }
 
         if (IsInsertGluePoint())
@@ -647,7 +647,7 @@ void SdrDragView::BrkDragObj()
             pInsPointUndo->Undo(); // Den eingefuegten Klebepunkt wieder raus
             delete pInsPointUndo;
             pInsPointUndo=NULL;
-            SetInsertGluePoint(FALSE);
+            SetInsertGluePoint(sal_False);
         }
 
         eDragHdl=HDL_MOVE;
@@ -655,7 +655,7 @@ void SdrDragView::BrkDragObj()
     }
 }
 
-BOOL SdrDragView::IsInsObjPointPossible() const
+sal_Bool SdrDragView::IsInsObjPointPossible() const
 {
     return pMarkedObj!=NULL && pMarkedObj->IsPolyObj();
 }
@@ -731,51 +731,51 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
     return bRet;
 }
 
-BOOL SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
+sal_Bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
 {
     if(IsInsObjPoint())
     {
         sal_uInt32 nNextPnt(mnInsPointNum);
         Point aPnt(aDragStat.GetNow());
-        BOOL bOk=EndDragObj(FALSE);
-        if (bOk==TRUE && eCmd!=SDRCREATE_FORCEEND)
+        sal_Bool bOk=EndDragObj(sal_False);
+        if (bOk==sal_True && eCmd!=SDRCREATE_FORCEEND)
         {
             // Ret=True bedeutet: Action ist vorbei.
             bOk=!(ImpBegInsObjPoint(sal_True, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin));
         }
 
         return bOk;
-    } else return FALSE;
+    } else return sal_False;
 }
 
-BOOL SdrDragView::IsInsGluePointPossible() const
+sal_Bool SdrDragView::IsInsGluePointPossible() const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     if (IsInsGluePointMode() && AreObjectsMarked())
     {
         if (GetMarkedObjectCount()==1)
         {
-            // FALSE liefern, wenn 1 Objekt und dieses ein Verbinder ist.
+            // sal_False liefern, wenn 1 Objekt und dieses ein Verbinder ist.
             const SdrObject* pObj=GetMarkedObjectByIndex(0);
             if (!HAS_BASE(SdrEdgeObj,pObj))
             {
-               bRet=TRUE;
+               bRet=sal_True;
             }
         }
         else
         {
-            bRet=TRUE;
+            bRet=sal_True;
         }
     }
     return bRet;
 }
 
-BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
+sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     SdrObject* pObj;
     SdrPageView* pPV;
-    ULONG nMarkNum;
+    sal_uIntPtr nMarkNum;
     if (PickMarkedObj(rPnt,pObj,pPV,&nMarkNum,SDRSEARCH_PASS2BOUND))
     {
         BrkAction();
@@ -791,9 +791,9 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
         SdrGluePointList* pGPL=pObj->ForceGluePointList();
         if (pGPL!=NULL)
         {
-            USHORT nGlueIdx=pGPL->Insert(SdrGluePoint());
+            sal_uInt16 nGlueIdx=pGPL->Insert(SdrGluePoint());
             SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
-            USHORT nGlueId=rGP.GetId();
+            sal_uInt16 nGlueId=rGP.GetId();
             rGP.SetAbsolutePos(rPnt,*pObj);
 
             SdrHdl* pHdl=NULL;
@@ -803,7 +803,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
             }
             if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId)
             {
-                SetInsertGluePoint(TRUE);
+                SetInsertGluePoint(sal_True);
                 bRet=BegDragObj(rPnt,NULL,pHdl,0);
                 if (bRet)
                 {
@@ -812,7 +812,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
                 }
                 else
                 {
-                    SetInsertGluePoint(FALSE);
+                    SetInsertGluePoint(sal_False);
                     delete pInsPointUndo;
                     pInsPointUndo=NULL;
                 }
@@ -825,7 +825,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
         else
         {
             // Keine Klebepunkte moeglich bei diesem Objekt (z.B. Edge)
-            SetInsertGluePoint(FALSE);
+            SetInsertGluePoint(sal_False);
             delete pInsPointUndo;
             pInsPointUndo=NULL;
         }
@@ -852,7 +852,7 @@ void SdrDragView::ShowDragObj()
             }
         }
 
-        aDragStat.SetShown(TRUE);
+        aDragStat.SetShown(sal_True);
     }
 }
 
@@ -861,13 +861,13 @@ void SdrDragView::HideDragObj()
     if(mpCurrentSdrDragMethod && aDragStat.IsShown())
     {
         mpCurrentSdrDragMethod->destroyOverlayGeometry();
-        aDragStat.SetShown(FALSE);
+        aDragStat.SetShown(sal_False);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrDragView::SetNoDragXorPolys(BOOL bOn)
+void SdrDragView::SetNoDragXorPolys(sal_Bool bOn)
 {
     if (IsNoDragXorPolys()!=bOn)
     {
@@ -894,7 +894,7 @@ void SdrDragView::SetNoDragXorPolys(BOOL bOn)
     }
 }
 
-void SdrDragView::SetDragStripes(BOOL bOn)
+void SdrDragView::SetDragStripes(sal_Bool bOn)
 {
     if (mpCurrentSdrDragMethod && aDragStat.IsShown())
     {
@@ -908,24 +908,24 @@ void SdrDragView::SetDragStripes(BOOL bOn)
     }
 }
 
-BOOL SdrDragView::IsOrthoDesired() const
+sal_Bool SdrDragView::IsOrthoDesired() const
 {
     if(mpCurrentSdrDragMethod && (IS_TYPE(SdrDragObjOwn, mpCurrentSdrDragMethod) || IS_TYPE(SdrDragResize, mpCurrentSdrDragMethod)))
     {
         return bOrthoDesiredOnMarked;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrDragView::SetRubberEdgeDragging(BOOL bOn)
+void SdrDragView::SetRubberEdgeDragging(sal_Bool bOn)
 {
     if (bOn!=IsRubberEdgeDragging())
     {
-        ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-        BOOL bShowHide=nAnz!=0 && IsDragObj() &&
+        sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+        sal_Bool bShowHide=nAnz!=0 && IsDragObj() &&
                  (nRubberEdgeDraggingLimit>=nAnz);
         if (bShowHide)
             HideDragObj();
@@ -935,12 +935,12 @@ void SdrDragView::SetRubberEdgeDragging(BOOL bOn)
     }
 }
 
-void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz)
+void SdrDragView::SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz)
 {
     if (nEdgeObjAnz!=nRubberEdgeDraggingLimit)
     {
-        ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-        BOOL bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() &&
+        sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+        sal_Bool bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() &&
                  (nEdgeObjAnz>=nAnz)!=(nRubberEdgeDraggingLimit>=nAnz);
         if (bShowHide)
             HideDragObj();
@@ -950,12 +950,12 @@ void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz)
     }
 }
 
-void SdrDragView::SetDetailedEdgeDragging(BOOL bOn)
+void SdrDragView::SetDetailedEdgeDragging(sal_Bool bOn)
 {
     if (bOn!=IsDetailedEdgeDragging())
     {
-        ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-        BOOL bShowHide=nAnz!=0 && IsDragObj() &&
+        sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+        sal_Bool bShowHide=nAnz!=0 && IsDragObj() &&
                  (nDetailedEdgeDraggingLimit>=nAnz);
         if (bShowHide)
             HideDragObj();
@@ -965,12 +965,12 @@ void SdrDragView::SetDetailedEdgeDragging(BOOL bOn)
     }
 }
 
-void SdrDragView::SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz)
+void SdrDragView::SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz)
 {
     if (nEdgeObjAnz!=nDetailedEdgeDraggingLimit)
     {
-        ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-        BOOL bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() &&
+        sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+        sal_Bool bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() &&
                  (nEdgeObjAnz>=nAnz)!=(nDetailedEdgeDraggingLimit>=nAnz);
         if (bShowHide)
             HideDragObj();
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index d2c1e7bc52ef..ec9fece55649 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -63,55 +63,55 @@
 
 void SdrEditView::ImpResetPossibilityFlags()
 {
-    bReadOnly               =FALSE;
-
-    bGroupPossible          =FALSE;
-    bUnGroupPossible        =FALSE;
-    bGrpEnterPossible       =FALSE;
-    bDeletePossible         =FALSE;
-    bToTopPossible          =FALSE;
-    bToBtmPossible          =FALSE;
-    bReverseOrderPossible   =FALSE;
-
-    bImportMtfPossible      =FALSE;
-    bCombinePossible        =FALSE;
-    bDismantlePossible      =FALSE;
-    bCombineNoPolyPolyPossible =FALSE;
-    bDismantleMakeLinesPossible=FALSE;
-    bOrthoDesiredOnMarked   =FALSE;
-
-    bMoreThanOneNotMovable  =FALSE;
-    bOneOrMoreMovable       =FALSE;
-    bMoreThanOneNoMovRot    =FALSE;
-    bContortionPossible     =FALSE;
-    bAllPolys               =FALSE;
-    bOneOrMorePolys         =FALSE;
-    bMoveAllowed            =FALSE;
-    bResizeFreeAllowed      =FALSE;
-    bResizePropAllowed      =FALSE;
-    bRotateFreeAllowed      =FALSE;
-    bRotate90Allowed        =FALSE;
-    bMirrorFreeAllowed      =FALSE;
-    bMirror45Allowed        =FALSE;
-    bMirror90Allowed        =FALSE;
-    bTransparenceAllowed    =FALSE;
-    bGradientAllowed        =FALSE;
-    bShearAllowed           =FALSE;
-    bEdgeRadiusAllowed      =FALSE;
-    bCanConvToPath          =FALSE;
-    bCanConvToPoly          =FALSE;
-    bCanConvToContour       =FALSE;
-    bCanConvToPathLineToArea=FALSE;
-    bCanConvToPolyLineToArea=FALSE;
-    bMoveProtect            =FALSE;
-    bResizeProtect          =FALSE;
+    bReadOnly               =sal_False;
+
+    bGroupPossible          =sal_False;
+    bUnGroupPossible        =sal_False;
+    bGrpEnterPossible       =sal_False;
+    bDeletePossible         =sal_False;
+    bToTopPossible          =sal_False;
+    bToBtmPossible          =sal_False;
+    bReverseOrderPossible   =sal_False;
+
+    bImportMtfPossible      =sal_False;
+    bCombinePossible        =sal_False;
+    bDismantlePossible      =sal_False;
+    bCombineNoPolyPolyPossible =sal_False;
+    bDismantleMakeLinesPossible=sal_False;
+    bOrthoDesiredOnMarked   =sal_False;
+
+    bMoreThanOneNotMovable  =sal_False;
+    bOneOrMoreMovable       =sal_False;
+    bMoreThanOneNoMovRot    =sal_False;
+    bContortionPossible     =sal_False;
+    bAllPolys               =sal_False;
+    bOneOrMorePolys         =sal_False;
+    bMoveAllowed            =sal_False;
+    bResizeFreeAllowed      =sal_False;
+    bResizePropAllowed      =sal_False;
+    bRotateFreeAllowed      =sal_False;
+    bRotate90Allowed        =sal_False;
+    bMirrorFreeAllowed      =sal_False;
+    bMirror45Allowed        =sal_False;
+    bMirror90Allowed        =sal_False;
+    bTransparenceAllowed    =sal_False;
+    bGradientAllowed        =sal_False;
+    bShearAllowed           =sal_False;
+    bEdgeRadiusAllowed      =sal_False;
+    bCanConvToPath          =sal_False;
+    bCanConvToPoly          =sal_False;
+    bCanConvToContour       =sal_False;
+    bCanConvToPathLineToArea=sal_False;
+    bCanConvToPolyLineToArea=sal_False;
+    bMoveProtect            =sal_False;
+    bResizeProtect          =sal_False;
 }
 
 void SdrEditView::ImpClearVars()
 {
     ImpResetPossibilityFlags();
-    bPossibilitiesDirty=TRUE;   // << war von Purify angemeckert
-    bBundleVirtObj=FALSE;
+    bPossibilitiesDirty=sal_True;   // << war von Purify angemeckert
+    bBundleVirtObj=sal_False;
 }
 
 SdrEditView::SdrEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -126,10 +126,10 @@ SdrEditView::~SdrEditView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos)
+SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, sal_uInt16 nPos)
 {
     SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
-    USHORT nMax=rLA.GetLayerCount();
+    sal_uInt16 nMax=rLA.GetLayerCount();
     if (nPos>nMax) nPos=nMax;
     SdrLayer* pNewLayer=rLA.NewLayer(rName,nPos);
 
@@ -143,7 +143,7 @@ SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos)
 #include <svx/svdogrp.hxx>
 #include <svx/scene3d.hxx>
 
-BOOL SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
+sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
 {
     sal_Bool bDelAll(sal_True);
     sal_uInt32 nObjAnz(pOL->GetObjCount());
@@ -224,7 +224,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
 void SdrEditView::DeleteLayer(const XubString& rName)
 {
     SdrLayerAdmin& rLA = pMod->GetLayerAdmin();
-    SdrLayer* pLayer = rLA.GetLayer(rName, TRUE);
+    SdrLayer* pLayer = rLA.GetLayer(rName, sal_True);
     sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer));
 
     if(SDRLAYER_NOTFOUND != nLayerNum)
@@ -306,11 +306,11 @@ void SdrEditView::DeleteLayer(const XubString& rName)
     }
 }
 
-void SdrEditView::MoveLayer(const XubString& rName, USHORT nNewPos)
+void SdrEditView::MoveLayer(const XubString& rName, sal_uInt16 nNewPos)
 {
     SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
-    SdrLayer* pLayer=rLA.GetLayer(rName,TRUE);
-    USHORT nLayerNum=rLA.GetLayerPos(pLayer);
+    SdrLayer* pLayer=rLA.GetLayer(rName,sal_True);
+    sal_uInt16 nLayerNum=rLA.GetLayerPos(pLayer);
     if (nLayerNum!=SDRLAYER_NOTFOUND)
     {
         if( IsUndoEnabled() )
@@ -375,8 +375,8 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
         }
     }
 
-    ULONG nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount();
-    USHORT i;
+    sal_uIntPtr nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount();
+    sal_uInt16 i;
 
     for (i=0; i<nMarkedEdgeAnz; i++) {
         SdrMark* pEM = GetMarkedEdgesOfMarkedNodes().GetMark(i);
@@ -401,95 +401,95 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
 void SdrEditView::MarkListHasChanged()
 {
     SdrMarkView::MarkListHasChanged();
-    bPossibilitiesDirty=TRUE;
+    bPossibilitiesDirty=sal_True;
 }
 
 void SdrEditView::ModelHasChanged()
 {
     SdrMarkView::ModelHasChanged();
-    bPossibilitiesDirty=TRUE;
+    bPossibilitiesDirty=sal_True;
 }
 
-BOOL SdrEditView::IsResizeAllowed(BOOL bProp) const
+sal_Bool SdrEditView::IsResizeAllowed(sal_Bool bProp) const
 {
     ForcePossibilities();
-    if (bResizeProtect) return FALSE;
+    if (bResizeProtect) return sal_False;
     if (bProp) return bResizePropAllowed;
     return bResizeFreeAllowed;
 }
 
-BOOL SdrEditView::IsRotateAllowed(BOOL b90Deg) const
+sal_Bool SdrEditView::IsRotateAllowed(sal_Bool b90Deg) const
 {
     ForcePossibilities();
-    if (bMoveProtect) return FALSE;
+    if (bMoveProtect) return sal_False;
     if (b90Deg) return bRotate90Allowed;
     return bRotateFreeAllowed;
 }
 
-BOOL SdrEditView::IsMirrorAllowed(BOOL b45Deg, BOOL b90Deg) const
+sal_Bool SdrEditView::IsMirrorAllowed(sal_Bool b45Deg, sal_Bool b90Deg) const
 {
     ForcePossibilities();
-    if (bMoveProtect) return FALSE;
+    if (bMoveProtect) return sal_False;
     if (b90Deg) return bMirror90Allowed;
     if (b45Deg) return bMirror45Allowed;
     return bMirrorFreeAllowed && !bMoveProtect;
 }
 
-BOOL SdrEditView::IsTransparenceAllowed() const
+sal_Bool SdrEditView::IsTransparenceAllowed() const
 {
     ForcePossibilities();
     return bTransparenceAllowed;
 }
 
-BOOL SdrEditView::IsGradientAllowed() const
+sal_Bool SdrEditView::IsGradientAllowed() const
 {
     ForcePossibilities();
     return bGradientAllowed;
 }
 
-BOOL SdrEditView::IsShearAllowed() const
+sal_Bool SdrEditView::IsShearAllowed() const
 {
     ForcePossibilities();
-    if (bResizeProtect) return FALSE;
+    if (bResizeProtect) return sal_False;
     return bShearAllowed;
 }
 
-BOOL SdrEditView::IsEdgeRadiusAllowed() const
+sal_Bool SdrEditView::IsEdgeRadiusAllowed() const
 {
     ForcePossibilities();
     return bEdgeRadiusAllowed;
 }
 
-BOOL SdrEditView::IsCrookAllowed(BOOL bNoContortion) const
+sal_Bool SdrEditView::IsCrookAllowed(sal_Bool bNoContortion) const
 {
     // CrookMode fehlt hier (weil kein Rotate bei Shear ...)
     ForcePossibilities();
     if (bNoContortion) {
-        if (!bRotateFreeAllowed) return FALSE; // Crook is nich
+        if (!bRotateFreeAllowed) return sal_False; // Crook is nich
         return !bMoveProtect && bMoveAllowed;
     } else {
         return !bResizeProtect && bContortionPossible;
     }
 }
 
-BOOL SdrEditView::IsDistortAllowed(BOOL bNoContortion) const
+sal_Bool SdrEditView::IsDistortAllowed(sal_Bool bNoContortion) const
 {
     ForcePossibilities();
     if (bNoContortion) {
-        return FALSE;
+        return sal_False;
     } else {
         return !bResizeProtect && bContortionPossible;
     }
 }
 
-BOOL SdrEditView::IsCombinePossible(BOOL bNoPolyPoly) const
+sal_Bool SdrEditView::IsCombinePossible(sal_Bool bNoPolyPoly) const
 {
     ForcePossibilities();
     if (bNoPolyPoly) return bCombineNoPolyPolyPossible;
     else return bCombinePossible;
 }
 
-BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const
+sal_Bool SdrEditView::IsDismantlePossible(sal_Bool bMakeLines) const
 {
     ForcePossibilities();
     if (bMakeLines) return bDismantleMakeLinesPossible;
@@ -498,7 +498,7 @@ BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const
 
 void SdrEditView::CheckPossibilities()
 {
-    if (bSomeObjChgdFlag) bPossibilitiesDirty=TRUE;
+    if (bSomeObjChgdFlag) bPossibilitiesDirty=sal_True;
 
     if(bSomeObjChgdFlag)
     {
@@ -511,11 +511,11 @@ void SdrEditView::CheckPossibilities()
     if (bPossibilitiesDirty) {
         ImpResetPossibilityFlags();
         SortMarkedObjects();
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz!=0) {
             bReverseOrderPossible=nMarkAnz>=2;
 
-            ULONG nMovableCount=0;
+            sal_uIntPtr nMovableCount=0;
             bGroupPossible=nMarkAnz>=2;
             bCombinePossible=nMarkAnz>=2;
             if (nMarkAnz==1) {
@@ -523,27 +523,27 @@ void SdrEditView::CheckPossibilities()
                 // fehlt noch ...
                 const SdrObject* pObj=GetMarkedObjectByIndex(0);
                 //const SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
-                BOOL bGroup=pObj->GetSubList()!=NULL;
-                BOOL bHasText=pObj->GetOutlinerParaObject()!=NULL;
+                sal_Bool bGroup=pObj->GetSubList()!=NULL;
+                sal_Bool bHasText=pObj->GetOutlinerParaObject()!=NULL;
                 if (bGroup || bHasText) {
-                    bCombinePossible=TRUE;
+                    bCombinePossible=sal_True;
                 }
             }
             bCombineNoPolyPolyPossible=bCombinePossible;
-            bDeletePossible=TRUE;
+            bDeletePossible=sal_True;
             // Zu den Transformationen erstmal ja sagen
-            bMoveAllowed      =TRUE;
-            bResizeFreeAllowed=TRUE;
-            bResizePropAllowed=TRUE;
-            bRotateFreeAllowed=TRUE;
-            bRotate90Allowed  =TRUE;
-            bMirrorFreeAllowed=TRUE;
-            bMirror45Allowed  =TRUE;
-            bMirror90Allowed  =TRUE;
-            bShearAllowed     =TRUE;
-            bEdgeRadiusAllowed=FALSE;
-            bContortionPossible=TRUE;
-            bCanConvToContour = TRUE;
+            bMoveAllowed      =sal_True;
+            bResizeFreeAllowed=sal_True;
+            bResizePropAllowed=sal_True;
+            bRotateFreeAllowed=sal_True;
+            bRotate90Allowed  =sal_True;
+            bMirrorFreeAllowed=sal_True;
+            bMirror45Allowed  =sal_True;
+            bMirror90Allowed  =sal_True;
+            bShearAllowed     =sal_True;
+            bEdgeRadiusAllowed=sal_False;
+            bContortionPossible=sal_True;
+            bCanConvToContour = sal_True;
 
             // these ones are only allowed when single object is selected
             bTransparenceAllowed = (nMarkAnz == 1);
@@ -556,7 +556,7 @@ void SdrEditView::CheckPossibilities()
 
                 // maybe group object, so get merged ItemSet
                 const SfxItemSet& rSet = pObj->GetMergedItemSet();
-                SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, FALSE);
+                SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, sal_False);
 
                 if(SFX_ITEM_DONTCARE != eState)
                 {
@@ -565,67 +565,67 @@ void SdrEditView::CheckPossibilities()
 
                     if(eFillStyle != XFILL_GRADIENT)
                     {
-                        bGradientAllowed = FALSE;
+                        bGradientAllowed = sal_False;
                     }
                 }
             }
 
-            BOOL bNoMovRotFound=FALSE;
+            sal_Bool bNoMovRotFound=sal_False;
             const SdrPageView* pPV0=NULL;
 
-            for (ULONG nm=0; nm<nMarkAnz; nm++) {
+            for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nm);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 const SdrPageView* pPV=pM->GetPageView();
                 if (pPV!=pPV0) {
-                    if (pPV->IsReadOnly()) bReadOnly=TRUE;
+                    if (pPV->IsReadOnly()) bReadOnly=sal_True;
                     pPV0=pPV;
                 }
 
                 SdrObjTransformInfoRec aInfo;
                 pObj->TakeObjInfo(aInfo);
-                BOOL bMovPrt=pObj->IsMoveProtect();
-                BOOL bSizPrt=pObj->IsResizeProtect();
+                sal_Bool bMovPrt=pObj->IsMoveProtect();
+                sal_Bool bSizPrt=pObj->IsResizeProtect();
                 if (!bMovPrt && aInfo.bMoveAllowed) nMovableCount++; // Menge der MovableObjs zaehlen
-                if (bMovPrt) bMoveProtect=TRUE;
-                if (bSizPrt) bResizeProtect=TRUE;
+                if (bMovPrt) bMoveProtect=sal_True;
+                if (bSizPrt) bResizeProtect=sal_True;
 
                 // not allowed when not allowed at one object
                 if(!aInfo.bTransparenceAllowed)
-                    bTransparenceAllowed = FALSE;
+                    bTransparenceAllowed = sal_False;
 
                 // Wenn einer was nicht kann, duerfen's alle nicht
-                if (!aInfo.bMoveAllowed      ) bMoveAllowed      =FALSE;
-                if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=FALSE;
-                if (!aInfo.bResizePropAllowed) bResizePropAllowed=FALSE;
-                if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=FALSE;
-                if (!aInfo.bRotate90Allowed  ) bRotate90Allowed  =FALSE;
-                if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=FALSE;
-                if (!aInfo.bMirror45Allowed  ) bMirror45Allowed  =FALSE;
-                if (!aInfo.bMirror90Allowed  ) bMirror90Allowed  =FALSE;
-                if (!aInfo.bShearAllowed     ) bShearAllowed     =FALSE;
-                if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=TRUE;
-                if (aInfo.bNoContortion      ) bContortionPossible=FALSE;
+                if (!aInfo.bMoveAllowed      ) bMoveAllowed      =sal_False;
+                if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=sal_False;
+                if (!aInfo.bResizePropAllowed) bResizePropAllowed=sal_False;
+                if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=sal_False;
+                if (!aInfo.bRotate90Allowed  ) bRotate90Allowed  =sal_False;
+                if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=sal_False;
+                if (!aInfo.bMirror45Allowed  ) bMirror45Allowed  =sal_False;
+                if (!aInfo.bMirror90Allowed  ) bMirror90Allowed  =sal_False;
+                if (!aInfo.bShearAllowed     ) bShearAllowed     =sal_False;
+                if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=sal_True;
+                if (aInfo.bNoContortion      ) bContortionPossible=sal_False;
                 // Fuer Crook mit Contortion: Alle Objekte muessen
                 // Movable und Rotatable sein, ausser maximal 1
                 if (!bMoreThanOneNoMovRot) {
                     if (!aInfo.bMoveAllowed || !aInfo.bResizeFreeAllowed) {
                         bMoreThanOneNoMovRot=bNoMovRotFound;
-                        bNoMovRotFound=TRUE;
+                        bNoMovRotFound=sal_True;
                     }
                 }
 
                 // when one member cannot be converted, no conversion is possible
                 if(!aInfo.bCanConvToContour)
-                    bCanConvToContour = FALSE;
+                    bCanConvToContour = sal_False;
 
                 // Ungroup
                 if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=NULL;
                 // ConvertToCurve: Wenn mind. einer konvertiert werden kann ist das ok.
-                if (aInfo.bCanConvToPath          ) bCanConvToPath          =TRUE;
-                if (aInfo.bCanConvToPoly          ) bCanConvToPoly          =TRUE;
-                if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=TRUE;
-                if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=TRUE;
+                if (aInfo.bCanConvToPath          ) bCanConvToPath          =sal_True;
+                if (aInfo.bCanConvToPoly          ) bCanConvToPoly          =sal_True;
+                if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=sal_True;
+                if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=sal_True;
 
                 // Combine/Dismantle
                 if(bCombinePossible)
@@ -637,15 +637,15 @@ void SdrEditView::CheckPossibilities()
                 if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False);
                 if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True);
                 // OrthoDesiredOnMarked checken
-                if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=TRUE;
+                if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=sal_True;
                 // ImportMtf checken
 
                 if (!bImportMtfPossible) {
-                    BOOL bGraf=HAS_BASE(SdrGrafObj,pObj);
-                    BOOL bOle2=HAS_BASE(SdrOle2Obj,pObj);
+                    sal_Bool bGraf=HAS_BASE(SdrGrafObj,pObj);
+                    sal_Bool bOle2=HAS_BASE(SdrOle2Obj,pObj);
 
                     if( bGraf && ((SdrGrafObj*)pObj)->HasGDIMetaFile() && !((SdrGrafObj*)pObj)->IsEPS() )
-                        bImportMtfPossible = TRUE;
+                        bImportMtfPossible = sal_True;
 
                     if (bOle2)
                         bImportMtfPossible=((SdrOle2Obj*)pObj)->GetObjRef().is();
@@ -658,12 +658,12 @@ void SdrEditView::CheckPossibilities()
         }
         ImpCheckToTopBtmPossible();
         ((SdrPolyEditView*)this)->ImpCheckPolyPossibilities();
-        bPossibilitiesDirty=FALSE;
+        bPossibilitiesDirty=sal_False;
 
         if (bReadOnly) {
-            BOOL bMerker1=bGrpEnterPossible;
+            sal_Bool bMerker1=bGrpEnterPossible;
             ImpResetPossibilityFlags();
-            bReadOnly=TRUE;
+            bReadOnly=sal_True;
             bGrpEnterPossible=bMerker1;
         }
         if (bMoveAllowed) {
@@ -673,9 +673,9 @@ void SdrEditView::CheckPossibilities()
                 SdrObject* pObj=GetMarkedObjectByIndex(0);
                 SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
                 if (pEdge!=NULL) {
-                    SdrObject* pNode1=pEdge->GetConnectedNode(TRUE);
-                    SdrObject* pNode2=pEdge->GetConnectedNode(FALSE);
-                    if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=FALSE;
+                    SdrObject* pNode1=pEdge->GetConnectedNode(sal_True);
+                    SdrObject* pNode2=pEdge->GetConnectedNode(sal_False);
+                    if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=sal_False;
                 }
             }
         }
@@ -686,14 +686,14 @@ void SdrEditView::CheckPossibilities()
 
 void SdrEditView::ForceMarkedObjToAnotherPage()
 {
-    BOOL bFlg=FALSE;
-    for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+    sal_Bool bFlg=sal_False;
+    for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         Rectangle aObjRect(pObj->GetCurrentBoundRect());
         Rectangle aPgRect(pM->GetPageView()->GetPageRect());
         if (!aObjRect.IsOver(aPgRect)) {
-            BOOL bFnd=FALSE;
+            sal_Bool bFnd=sal_False;
             SdrPageView* pPV = GetSdrPageView();
 
             if(pPV)
@@ -708,7 +708,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage()
                 pPV->GetObjList()->InsertObject(pObj,CONTAINER_APPEND,&aReason);
                 pM->SetPageView(pPV);
                 InvalidateAllWin(aObjRect);
-                bFlg=TRUE;
+                bFlg=sal_True;
             }
         }
     }
@@ -915,8 +915,8 @@ void SdrEditView::CopyMarkedObj()
     SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList());
     // Folgende Schleife Anstatt MarkList::Merge(), damit
     // ich jeweils mein Flag an die MarkEntries setzen kann.
-    ULONG nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-    for (ULONG nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) {
+    sal_uIntPtr nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+    for (sal_uIntPtr nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) {
         SdrMark aM(*GetEdgesOfMarkedNodes().GetMark(nEdgeNum));
         aM.SetUser(1);
         aSourceObjectsForCopy.InsertEntry(aM);
@@ -930,9 +930,9 @@ void SdrEditView::CopyMarkedObj()
     const bool bUndo = IsUndoEnabled();
 
     GetMarkedObjectListWriteAccess().Clear();
-    ULONG nCloneErrCnt=0;
-    ULONG nMarkAnz=aSourceObjectsForCopy.GetMarkCount();
-    ULONG nm;
+    sal_uIntPtr nCloneErrCnt=0;
+    sal_uIntPtr nMarkAnz=aSourceObjectsForCopy.GetMarkCount();
+    sal_uIntPtr nm;
     for (nm=0; nm<nMarkAnz; nm++) {
         SdrMark* pM=aSourceObjectsForCopy.GetMark(nm);
         SdrObject* pO=pM->GetMarkedSdrObj()->Clone();
@@ -986,14 +986,14 @@ void SdrEditView::CopyMarkedObj()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions)
+sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions)
 {
     if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) {
-        SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,TRUE);
+        SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,sal_True);
         if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
         if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) {
             SdrObject::Free( pObj ); // Layer gesperrt oder nicht sichtbar
-            return FALSE;
+            return sal_False;
         }
         pObj->NbcSetLayer(nLayer);
     }
@@ -1016,10 +1016,10 @@ BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nO
         if ((nOptions & SDRINSERT_ADDMARK)==0) UnmarkAllObj();
         MarkObj(pObj,&rPV);
     }
-    return TRUE;
+    return sal_True;
 }
 
-void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark)
+void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark)
 {
     SdrObjList* pOL=pOldObj->GetObjList();
     const bool bUndo = IsUndoEnabled();
@@ -1027,7 +1027,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO
         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj));
 
     if( IsObjMarked( pOldObj ) )
-        MarkObj( pOldObj, &rPV, TRUE /*unmark!*/ );
+        MarkObj( pOldObj, &rPV, sal_True /*unmark!*/ );
 
     pOL->ReplaceObject(pNewObj,pOldObj->GetOrdNum());
 
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 9e149bd8e42d..3502db48e4e9 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -76,11 +76,11 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy)
+void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy)
 {
     DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() mit leerem Rect mach keinen Sinn");
     if (rRect.IsEmpty()) return;
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz==0) return;
     Rectangle aR0(GetMarkedObjRect());
     DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() ist leer");
@@ -105,7 +105,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy)
     if (bCopy)
         CopyMarkedObj();
 
-    for (ULONG nm=0; nm<nAnz; nm++)
+    for (sal_uIntPtr nm=0; nm<nAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -203,8 +203,8 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy)
     if (bCopy)
         CopyMarkedObj();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -236,8 +236,8 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
     if (bCopy)
         CopyMarkedObj();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -256,17 +256,17 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
 
 long SdrEditView::GetMarkedObjRotate() const
 {
-    BOOL b1st=TRUE;
-    BOOL bOk=TRUE;
+    sal_Bool b1st=sal_True;
+    sal_Bool bOk=sal_True;
     long nWink=0;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
         long nWink2=pO->GetRotateAngle();
         if (b1st) nWink=nWink2;
-        else if (nWink2!=nWink) bOk=FALSE;
-        b1st=FALSE;
+        else if (nWink2!=nWink) bOk=sal_False;
+        b1st=sal_False;
     }
     if (!bOk) nWink=0;
     return nWink;
@@ -389,7 +389,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
         EndUndo();
 }
 
-void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy)
+void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy)
 {
     Point aCenter(GetMarkedObjRect().Center());
     Point aPt2(aCenter);
@@ -397,7 +397,7 @@ void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy)
     MirrorMarkedObj(aCenter,aPt2,bCopy);
 }
 
-void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy)
+void SdrEditView::MirrorMarkedObjVertical(sal_Bool bCopy)
 {
     Point aCenter(GetMarkedObjRect().Center());
     Point aPt2(aCenter);
@@ -407,17 +407,17 @@ void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy)
 
 long SdrEditView::GetMarkedObjShear() const
 {
-    BOOL b1st=TRUE;
-    BOOL bOk=TRUE;
+    sal_Bool b1st=sal_True;
+    sal_Bool bOk=sal_True;
     long nWink=0;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
         long nWink2=pO->GetShearAngle();
         if (b1st) nWink=nWink2;
-        else if (nWink2!=nWink) bOk=FALSE;
-        b1st=FALSE;
+        else if (nWink2!=nWink) bOk=sal_False;
+        b1st=sal_False;
     }
     if (nWink>SDRMAXSHEAR) nWink=SDRMAXSHEAR;
     if (nWink<-SDRMAXSHEAR) nWink=-SDRMAXSHEAR;
@@ -442,8 +442,8 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
         CopyMarkedObj();
 
     double nTan=tan(nWink*nPi180);
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -461,10 +461,10 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
 }
 
 void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad,
-    SdrCrookMode eMode, BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect)
+    SdrCrookMode eMode, sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect)
 {
     SdrPathObj* pPath=PTR_CAST(SdrPathObj,pO);
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     if(pPath!=NULL && !bNoContortion)
     {
@@ -475,7 +475,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
             case SDRCROOK_STRETCH: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break;
         } // switch
         pPath->SetPathPoly(aXPP.getB2DPolyPolygon());
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
     if(!bDone && !pPath && pO->IsPolyObj() && 0L != pO->GetPointCount())
@@ -505,7 +505,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
             pO->SetPoint(aXP[(sal_uInt16)nPtNum],nPtNum);
         }
 
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
     if(!bDone)
@@ -544,7 +544,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
     Rectangle aMarkRect(GetMarkedObjRect());
     const bool bUndo = IsUndoEnabled();
 
-    bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(FALSE);
+    bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(sal_False);
 
     if( bUndo )
     {
@@ -558,8 +558,8 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
     if (bCopy)
         CopyMarkedObj();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -582,7 +582,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
         EndUndo();
 }
 
-void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion)
+void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion)
 {
     SdrPathObj* pPath = PTR_CAST(SdrPathObj, pO);
 
@@ -632,8 +632,8 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
     if (bCopy)
         CopyMarkedObj();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -659,47 +659,47 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/)
+void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
 {
     // bReplaceAll hat hier keinerlei Wirkung
     Rectangle aAllSnapRect(GetMarkedObjRect());
     const SfxPoolItem *pPoolItem=NULL;
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrTransformRef1XItem*)pPoolItem)->GetValue();
         SetRef1(Point(n,GetRef1().Y()));
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrTransformRef1YItem*)pPoolItem)->GetValue();
         SetRef1(Point(GetRef1().X(),n));
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrTransformRef2XItem*)pPoolItem)->GetValue();
         SetRef2(Point(n,GetRef2().Y()));
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue();
         SetRef2(Point(GetRef2().X(),n));
     }
-    long nAllPosX=0; BOOL bAllPosX=FALSE;
-    long nAllPosY=0; BOOL bAllPosY=FALSE;
-    long nAllWdt=0;  BOOL bAllWdt=FALSE;
-    long nAllHgt=0;  BOOL bAllHgt=FALSE;
-    BOOL bDoIt=FALSE;
-    if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    long nAllPosX=0; sal_Bool bAllPosX=sal_False;
+    long nAllPosY=0; sal_Bool bAllPosY=sal_False;
+    long nAllWdt=0;  sal_Bool bAllWdt=sal_False;
+    long nAllHgt=0;  sal_Bool bAllHgt=sal_False;
+    sal_Bool bDoIt=sal_False;
+    if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue();
-        bAllPosX=TRUE; bDoIt=TRUE;
+        bAllPosX=sal_True; bDoIt=sal_True;
     }
-    if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nAllPosY=((const SdrAllPositionYItem*)pPoolItem)->GetValue();
-        bAllPosY=TRUE; bDoIt=TRUE;
+        bAllPosY=sal_True; bDoIt=sal_True;
     }
-    if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nAllWdt=((const SdrAllSizeWidthItem*)pPoolItem)->GetValue();
-        bAllWdt=TRUE; bDoIt=TRUE;
+        bAllWdt=sal_True; bDoIt=sal_True;
     }
-    if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nAllHgt=((const SdrAllSizeHeightItem*)pPoolItem)->GetValue();
-        bAllHgt=TRUE; bDoIt=TRUE;
+        bAllHgt=sal_True; bDoIt=sal_True;
     }
     if (bDoIt) {
         Rectangle aRect(aAllSnapRect); // !!! fuer PolyPt's und GluePt's aber bitte noch aendern !!!
@@ -709,32 +709,32 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep
         if (bAllHgt)  aRect.Bottom()=aAllSnapRect.Top()+nAllHgt;
         SetMarkedObjRect(aRect);
     }
-    if (rAttr.GetItemState(SDRATTR_RESIZEXALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_RESIZEXALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         Fraction aXFact=((const SdrResizeXAllItem*)pPoolItem)->GetValue();
         ResizeMarkedObj(aAllSnapRect.TopLeft(),aXFact,Fraction(1,1));
     }
-    if (rAttr.GetItemState(SDRATTR_RESIZEYALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_RESIZEYALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         Fraction aYFact=((const SdrResizeYAllItem*)pPoolItem)->GetValue();
         ResizeMarkedObj(aAllSnapRect.TopLeft(),Fraction(1,1),aYFact);
     }
-    if (rAttr.GetItemState(SDRATTR_ROTATEALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ROTATEALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long nAngle=((const SdrRotateAllItem*)pPoolItem)->GetValue();
         RotateMarkedObj(aAllSnapRect.Center(),nAngle);
     }
-    if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long nAngle=((const SdrHorzShearAllItem*)pPoolItem)->GetValue();
-        ShearMarkedObj(aAllSnapRect.Center(),nAngle,FALSE);
+        ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_False);
     }
-    if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long nAngle=((const SdrVertShearAllItem*)pPoolItem)->GetValue();
-        ShearMarkedObj(aAllSnapRect.Center(),nAngle,TRUE);
+        ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_True);
     }
 
     const bool bUndo = IsUndoEnabled();
 
     // Todo: WhichRange nach Notwendigkeit ueberpruefen.
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         const SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -746,7 +746,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep
     }
 }
 
-void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const
+void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
 {
     // bOnlyHardAttr hat hier keinerlei Wirkung
     // Hier muss ausserdem noch der Nullpunkt und
@@ -757,24 +757,24 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
     long nAllSnapWdt=aAllSnapRect.GetWidth()-1;
     long nAllSnapHgt=aAllSnapRect.GetHeight()-1;
     // koennte mal zu CheckPossibilities mit rein
-    BOOL bMovProtect=FALSE,bMovProtectDC=FALSE;
-    BOOL bSizProtect=FALSE,bSizProtectDC=FALSE;
-    BOOL bPrintable =TRUE ,bPrintableDC=FALSE;
-    BOOL bVisible = TRUE, bVisibleDC=FALSE;
-    SdrLayerID nLayerId=0; BOOL bLayerDC=FALSE;
-    XubString aObjName;     BOOL bObjNameDC=FALSE,bObjNameSet=FALSE;
-    long nSnapPosX=0;      BOOL bSnapPosXDC=FALSE;
-    long nSnapPosY=0;      BOOL bSnapPosYDC=FALSE;
-    long nSnapWdt=0;       BOOL bSnapWdtDC=FALSE;
-    long nSnapHgt=0;       BOOL bSnapHgtDC=FALSE;
-    long nLogicWdt=0;      BOOL bLogicWdtDC=FALSE,bLogicWdtDiff=FALSE;
-    long nLogicHgt=0;      BOOL bLogicHgtDC=FALSE,bLogicHgtDiff=FALSE;
-    long nRotAngle=0;      BOOL bRotAngleDC=FALSE;
-    long nShrAngle=0;      BOOL bShrAngleDC=FALSE;
+    sal_Bool bMovProtect=sal_False,bMovProtectDC=sal_False;
+    sal_Bool bSizProtect=sal_False,bSizProtectDC=sal_False;
+    sal_Bool bPrintable =sal_True ,bPrintableDC=sal_False;
+    sal_Bool bVisible = sal_True, bVisibleDC=sal_False;
+    SdrLayerID nLayerId=0; sal_Bool bLayerDC=sal_False;
+    XubString aObjName;     sal_Bool bObjNameDC=sal_False,bObjNameSet=sal_False;
+    long nSnapPosX=0;      sal_Bool bSnapPosXDC=sal_False;
+    long nSnapPosY=0;      sal_Bool bSnapPosYDC=sal_False;
+    long nSnapWdt=0;       sal_Bool bSnapWdtDC=sal_False;
+    long nSnapHgt=0;       sal_Bool bSnapHgtDC=sal_False;
+    long nLogicWdt=0;      sal_Bool bLogicWdtDC=sal_False,bLogicWdtDiff=sal_False;
+    long nLogicHgt=0;      sal_Bool bLogicHgtDC=sal_False,bLogicHgtDiff=sal_False;
+    long nRotAngle=0;      sal_Bool bRotAngleDC=sal_False;
+    long nShrAngle=0;      sal_Bool bShrAngleDC=sal_False;
     Rectangle aSnapRect;
     Rectangle aLogicRect;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
         const SdrMark* pM=GetSdrMarkByIndex(nm);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         if (nm==0) {
@@ -796,33 +796,33 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
             nRotAngle=pObj->GetRotateAngle();
             nShrAngle=pObj->GetShearAngle();
         } else {
-            if (!bLayerDC      && nLayerId   !=pObj->GetLayer())        bLayerDC=TRUE;
-            if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect())   bMovProtectDC=TRUE;
-            if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=TRUE;
-            if (!bPrintableDC  && bPrintable !=pObj->IsPrintable())     bPrintableDC=TRUE;
-            if (!bVisibleDC    && bVisible !=pObj->IsVisible())         bVisibleDC=TRUE;
-            if (!bRotAngleDC   && nRotAngle  !=pObj->GetRotateAngle())  bRotAngleDC=TRUE;
-            if (!bShrAngleDC   && nShrAngle  !=pObj->GetShearAngle())   bShrAngleDC=TRUE;
+            if (!bLayerDC      && nLayerId   !=pObj->GetLayer())        bLayerDC=sal_True;
+            if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect())   bMovProtectDC=sal_True;
+            if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=sal_True;
+            if (!bPrintableDC  && bPrintable !=pObj->IsPrintable())     bPrintableDC=sal_True;
+            if (!bVisibleDC    && bVisible !=pObj->IsVisible())         bVisibleDC=sal_True;
+            if (!bRotAngleDC   && nRotAngle  !=pObj->GetRotateAngle())  bRotAngleDC=sal_True;
+            if (!bShrAngleDC   && nShrAngle  !=pObj->GetShearAngle())   bShrAngleDC=sal_True;
             if (!bSnapWdtDC || !bSnapHgtDC || !bSnapPosXDC || !bSnapPosYDC || !bLogicWdtDiff || !bLogicHgtDiff) {
                 aSnapRect=pObj->GetSnapRect();
-                if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=TRUE;
-                if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=TRUE;
-                if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=TRUE;
-                if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=TRUE;
+                if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=sal_True;
+                if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=sal_True;
+                if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=sal_True;
+                if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=sal_True;
             }
             if (!bLogicWdtDC || !bLogicHgtDC || !bLogicWdtDiff || !bLogicHgtDiff) {
                 aLogicRect=pObj->GetLogicRect();
-                if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=TRUE;
-                if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=TRUE;
-                if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=TRUE;
-                if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=TRUE;
+                if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=sal_True;
+                if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=sal_True;
+                if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=sal_True;
+                if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=sal_True;
             }
         }
         if (!bObjNameDC ) {
             if (!bObjNameSet) {
                 aObjName=pObj->GetName();
             } else {
-                if (aObjName!=pObj->GetName()) bObjNameDC=TRUE;
+                if (aObjName!=pObj->GetName()) bObjNameDC=sal_True;
             }
         }
     }
@@ -862,7 +862,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
     }
 }
 
-SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const
+SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const
 {
     SfxItemSet aSet(pMod->GetItemPool());
     MergeAttrFromMarked(aSet,bOnlyHardAttr);
@@ -877,7 +877,7 @@ SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const
     return aSet;
 }
 
-void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const
+void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const
 {
     sal_uInt32 nMarkAnz(GetMarkedObjectCount());
 
@@ -893,15 +893,15 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con
         {
             if(!bOnlyHardAttr)
             {
-                if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                     rAttr.InvalidateItem(nWhich);
                 else
-                    rAttr.MergeValue(rSet.Get(nWhich), TRUE);
+                    rAttr.MergeValue(rSet.Get(nWhich), sal_True);
             }
-            else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE))
+            else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False))
             {
                 const SfxPoolItem& rItem = rSet.Get(nWhich);
-                rAttr.MergeValue(rItem, TRUE);
+                rAttr.MergeValue(rItem, sal_True);
             }
 
             nWhich = aIter.NextWhich();
@@ -909,19 +909,19 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con
     }
 }
 
-void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
+void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
 {
     if (AreObjectsMarked())
     {
 #ifdef DBG_UTIL
         {
-            BOOL bHasEEFeatureItems=FALSE;
+            sal_Bool bHasEEFeatureItems=sal_False;
             SfxItemIter aIter(rAttr);
             const SfxPoolItem* pItem=aIter.FirstItem();
             while (!bHasEEFeatureItems && pItem!=NULL) {
                 if (!IsInvalidItem(pItem)) {
-                    USHORT nW=pItem->Which();
-                    if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE;
+                    sal_uInt16 nW=pItem->Which();
+                    if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True;
                 }
                 pItem=aIter.NextItem();
             }
@@ -955,13 +955,13 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
         }
 
         // Joe, 2.7.98: Damit Undo nach Format.Standard auch die Textattribute korrekt restauriert
-        BOOL bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll);
+        sal_Bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll);
 
         // AW 030100: save additional geom info when para or char attributes
         // are changed and the geom form of the text object might be changed
-        BOOL bPossibleGeomChange(FALSE);
+        sal_Bool bPossibleGeomChange(sal_False);
         SfxWhichIter aIter(rAttr);
-        UINT16 nWhich = aIter.FirstWhich();
+        sal_uInt16 nWhich = aIter.FirstWhich();
         while(!bPossibleGeomChange && nWhich)
         {
             SfxItemState eState = rAttr.GetItemState(nWhich);
@@ -974,7 +974,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
                     || nWhich == SDRATTR_3DOBJ_END_ANGLE
                     || nWhich == SDRATTR_3DSCENE_DISTANCE)
                 {
-                    bPossibleGeomChange = TRUE;
+                    bPossibleGeomChange = sal_True;
                 }
             }
             nWhich = aIter.NextWhich();
@@ -995,12 +995,12 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
         // uses it's second parameter (bInvalidAsDefault) to
         // remove all such items to set them to default.
         SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges());
-        aAttr.Put(rAttr, TRUE);
+        aAttr.Put(rAttr, sal_True);
 
         // #i38135#
         bool bResetAnimationTimer(false);
 
-        for (ULONG nm=0; nm<nMarkAnz; nm++)
+        for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -1010,7 +1010,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
                 std::vector< SdrUndoAction* > vConnectorUndoActions;
                 SdrEdgeObj* pEdgeObj = dynamic_cast< SdrEdgeObj* >( pObj );
                 if ( pEdgeObj )
-                    bPossibleGeomChange = TRUE;
+                    bPossibleGeomChange = sal_True;
                 else if( bUndo )
                     vConnectorUndoActions = CreateConnectorUndo( *pObj );
 
@@ -1035,7 +1035,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
                 const bool bRescueText = dynamic_cast< SdrTextObj* >(pObj) != 0;
 
                 // add attribute undo
-                AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,bHasEEItems || bPossibleGeomChange || bRescueText));
+                AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,bHasEEItems || bPossibleGeomChange || bRescueText));
             }
 
             // set up a scxene updater if object is a 3d object
@@ -1104,19 +1104,19 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
 SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const
 {
     SfxStyleSheet* pRet=NULL;
-    BOOL b1st=TRUE;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++) {
+    sal_Bool b1st=sal_True;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet();
         if (b1st) pRet=pSS;
         else if (pRet!=pSS) return NULL; // verschiedene StyleSheets
-        b1st=FALSE;
+        b1st=sal_False;
     }
     return pRet;
 }
 
-void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (AreObjectsMarked())
     {
@@ -1132,8 +1132,8 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe
             BegUndo(aStr);
         }
 
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        for (ULONG nm=0; nm<nMarkAnz; nm++)
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             if( bUndo )
@@ -1152,12 +1152,12 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /* new interface src537 */
-BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if(GetMarkedObjectCount())
     {
-        rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), FALSE);
-        return TRUE;
+        rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), sal_False);
+        return sal_True;
     }
     else
     {
@@ -1165,31 +1165,31 @@ BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) cons
     }
 }
 
-BOOL SdrEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
     if (GetMarkedObjectCount()!=0) {
         SetAttrToMarked(rSet,bReplaceAll);
-        return TRUE;
+        return sal_True;
     } else {
         return SdrMarkView::SetAttributes(rSet,bReplaceAll);
     }
 }
 
-SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(sal_Bool& rOk) const
 {
     if (GetMarkedObjectCount()!=0) {
-        //rOk=TRUE;
+        //rOk=sal_True;
         return GetStyleSheetFromMarked();
     } else {
         return SdrMarkView::GetStyleSheet(); // SdrMarkView::GetStyleSheet(rOk);
     }
 }
 
-BOOL SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (GetMarkedObjectCount()!=0) {
         SetStyleSheetToMarked(pStyleSheet,bDontRemoveHardAttr);
-        return TRUE;
+        return sal_True;
     } else {
         return SdrMarkView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
     }
@@ -1205,7 +1205,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
                        SDRATTR_ECKENRADIUS,SDRATTR_ECKENRADIUS,
                        0);
     if (AreObjectsMarked()) {
-        SfxItemSet aMarkAttr(GetAttrFromMarked(FALSE)); // wg. AutoGrowHeight und Eckenradius
+        SfxItemSet aMarkAttr(GetAttrFromMarked(sal_False)); // wg. AutoGrowHeight und Eckenradius
         Rectangle aRect(GetMarkedObjRect());
 
         if(GetSdrPageView())
@@ -1260,16 +1260,16 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
 
         // Pruefen der einzelnen Objekte, ob Objekte geschuetzt sind
         const SdrMarkList& rMarkList=GetMarkedObjectList();
-        ULONG nMarkCount=rMarkList.GetMarkCount();
+        sal_uIntPtr nMarkCount=rMarkList.GetMarkCount();
         SdrObject* pObj=rMarkList.GetMark(0)->GetMarkedSdrObj();
-        BOOL bPosProt=pObj->IsMoveProtect();
-        BOOL bSizProt=pObj->IsResizeProtect();
-        BOOL bPosProtDontCare=FALSE;
-        BOOL bSizProtDontCare=FALSE;
-        for (ULONG i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) {
+        sal_Bool bPosProt=pObj->IsMoveProtect();
+        sal_Bool bSizProt=pObj->IsResizeProtect();
+        sal_Bool bPosProtDontCare=sal_False;
+        sal_Bool bSizProtDontCare=sal_False;
+        for (sal_uIntPtr i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) {
             pObj=rMarkList.GetMark(i)->GetMarkedSdrObj();
-            if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=TRUE;
-            if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=TRUE;
+            if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=sal_True;
+            if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=sal_True;
         }
 
         // InvalidateItem setzt das Item auf DONT_CARE
@@ -1285,7 +1285,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
         }
 
         SfxItemState eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWWIDTH);
-        BOOL bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
+        sal_Bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
         if (eState==SFX_ITEM_DONTCARE) {
             aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOWIDTH);
         } else if (eState==SFX_ITEM_SET) {
@@ -1340,7 +1340,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     long nOldRotateAngle=GetMarkedObjRotate();
     long nOldShearAngle=GetMarkedObjShear();
     const SdrMarkList& rMarkList=GetMarkedObjectList();
-    ULONG nMarkCount=rMarkList.GetMarkCount();
+    sal_uIntPtr nMarkCount=rMarkList.GetMarkCount();
     SdrObject* pObj=NULL;
 
     RECT_POINT eSizePoint=RP_MM;
@@ -1373,58 +1373,58 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     long nShearAngle=0;
     long nShearX=0;
     long nShearY=0;
-    BOOL bShearVert=FALSE;
+    sal_Bool bShearVert=sal_False;
 
-    BOOL bChgPos=FALSE;
-    BOOL bChgSiz=FALSE;
-    BOOL bChgHgt=FALSE;
-    BOOL bRotate=FALSE;
-    BOOL bShear =FALSE;
+    sal_Bool bChgPos=sal_False;
+    sal_Bool bChgSiz=sal_False;
+    sal_Bool bChgHgt=sal_False;
+    sal_Bool bRotate=sal_False;
+    sal_Bool bShear =sal_False;
 
-    BOOL bSetAttr=FALSE;
+    sal_Bool bSetAttr=sal_False;
     SfxItemSet aSetAttr(pMod->GetItemPool());
 
     const SfxPoolItem* pPoolItem=NULL;
 
     // Position
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,sal_True,&pPoolItem)) {
         nPosDX=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Left();
-        bChgPos=TRUE;
+        bChgPos=sal_True;
     }
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,TRUE,&pPoolItem)){
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,sal_True,&pPoolItem)){
         nPosDY=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Top();
-        bChgPos=TRUE;
+        bChgPos=sal_True;
     }
     // Groesse
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,sal_True,&pPoolItem)) {
         nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue();
-        bChgSiz=TRUE;
+        bChgSiz=sal_True;
     }
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem)) {
         nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue();
-        bChgSiz=TRUE;
-        bChgHgt=TRUE;
+        bChgSiz=sal_True;
+        bChgHgt=sal_True;
     }
     if (bChgSiz) {
         eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
     }
 
     // Rotation
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,sal_True,&pPoolItem)) {
         nRotateAngle=((const SfxInt32Item*)pPoolItem)->GetValue()-nOldRotateAngle;
         bRotate = (nRotateAngle != 0);
     }
 
     // #86909# pos rot point x
-    if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, TRUE ,&pPoolItem))
+    if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, sal_True ,&pPoolItem))
         nRotateX = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_X)).GetValue();
 
     // #86909# pos rot point y
-    if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, TRUE ,&pPoolItem))
+    if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, sal_True ,&pPoolItem))
         nRotateY = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y)).GetValue();
 
     // Shear
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,sal_True,&pPoolItem)) {
         nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue();
         if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR;
         if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR;
@@ -1453,23 +1453,23 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     }
 
     // AutoGrow
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,TRUE,&pPoolItem)) {
-        BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,sal_True,&pPoolItem)) {
+        sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
         aSetAttr.Put(SdrTextAutoGrowWidthItem(bAutoGrow));
-        bSetAttr=TRUE;
+        bSetAttr=sal_True;
     }
 
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,TRUE,&pPoolItem)) {
-        BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,sal_True,&pPoolItem)) {
+        sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
         aSetAttr.Put(SdrTextAutoGrowHeightItem(bAutoGrow));
-        bSetAttr=TRUE;
+        bSetAttr=sal_True;
     }
 
     // Eckenradius
-    if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,TRUE,&pPoolItem)) {
+    if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,sal_True,&pPoolItem)) {
         long nRadius=((SdrEckenradiusItem*)pPoolItem)->GetValue();
         aSetAttr.Put(SdrEckenradiusItem(nRadius));
-        bSetAttr=TRUE;
+        bSetAttr=sal_True;
     }
 
     ForcePossibilities();
@@ -1477,7 +1477,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     BegUndo(ImpGetResStr(STR_EditTransform),GetDescriptionOfMarkedObjects());
 
     if (bSetAttr) {
-        SetAttrToMarked(aSetAttr,FALSE);
+        SetAttrToMarked(aSetAttr,sal_False);
     }
 
     // Groesse und Hoehe aendern
@@ -1558,7 +1558,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     }
 
     // protect position
-    if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, TRUE, &pPoolItem))
+    if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, sal_True, &pPoolItem))
     {
         const sal_Bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue());
         bool bChanged(false);
@@ -1599,7 +1599,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     if(!bMoveProtect)
     {
         // protect size
-        if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, TRUE, &pPoolItem))
+        if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True, &pPoolItem))
         {
             const sal_Bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue());
             bool bChanged(false);
@@ -1630,16 +1630,16 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrEditView::IsAlignPossible() const
+sal_Bool SdrEditView::IsAlignPossible() const
 {  // Mindestens 2 markierte Objekte, davon mind. 1 beweglich
     ForcePossibilities();
-    ULONG nAnz=GetMarkedObjectCount();
-    if (nAnz==0) return FALSE;         // Nix markiert!
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
+    if (nAnz==0) return sal_False;         // Nix markiert!
     if (nAnz==1) return bMoveAllowed;  // einzelnes Obj an der Seite ausrichten
     return bOneOrMoreMovable;          // ansonsten ist MarkCount>=2
 }
 
-void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects)
+void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects)
 {
     if (eHor==SDRHALIGN_NONE && eVert==SDRVALIGN_NONE)
         return;
@@ -1684,9 +1684,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL
     }
 
     Rectangle aBound;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    ULONG nm;
-    BOOL bHasFixed=FALSE;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nm;
+    sal_Bool bHasFixed=sal_False;
     for (nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -1697,7 +1697,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL
         {
             Rectangle aObjRect(bBoundRects?pObj->GetCurrentBoundRect():pObj->GetSnapRect());
             aBound.Union(aObjRect);
-            bHasFixed=TRUE;
+            bHasFixed=sal_True;
         }
     }
     if (!bHasFixed)
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index afb81b5bc6c2..7af96024cb5e 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -88,13 +88,13 @@ SdrObject* SdrEditView::GetMaxToBtmObj(SdrObject* /*pObj*/) const
   return NULL;
 }
 
-void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, ULONG /*nOldPos*/, ULONG /*nNewPos*/)
+void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, sal_uIntPtr /*nOldPos*/, sal_uIntPtr /*nNewPos*/)
 {
 }
 
 void SdrEditView::MovMarkedToTop()
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
@@ -103,14 +103,14 @@ void SdrEditView::MovMarkedToTop()
             BegUndo(ImpGetResStr(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOTOP);
 
         SortMarkedObjects();
-        ULONG nm;
+        sal_uIntPtr nm;
         for (nm=0; nm<nAnz; nm++)
         { // Ordnums muessen alle stimmen!
             GetMarkedObjectByIndex(nm)->GetOrdNum();
         }
-        BOOL bChg=FALSE;
+        sal_Bool bChg=sal_False;
         SdrObjList* pOL0=NULL;
-        ULONG nNewPos=0;
+        sal_uIntPtr nNewPos=0;
         for (nm=nAnz; nm>0;)
         {
             nm--;
@@ -119,16 +119,16 @@ void SdrEditView::MovMarkedToTop()
             SdrObjList* pOL=pObj->GetObjList();
             if (pOL!=pOL0)
             {
-                nNewPos=ULONG(pOL->GetObjCount()-1);
+                nNewPos=sal_uIntPtr(pOL->GetObjCount()-1);
                 pOL0=pOL;
             }
-            ULONG nNowPos=pObj->GetOrdNumDirect();
+            sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
             const Rectangle& rBR=pObj->GetCurrentBoundRect();
-            ULONG nCmpPos=nNowPos+1;
+            sal_uIntPtr nCmpPos=nNowPos+1;
             SdrObject* pMaxObj=GetMaxToTopObj(pObj);
             if (pMaxObj!=NULL)
             {
-                ULONG nMaxPos=pMaxObj->GetOrdNum();
+                sal_uIntPtr nMaxPos=pMaxObj->GetOrdNum();
                 if (nMaxPos!=0)
                     nMaxPos--;
                 if (nNewPos>nMaxPos)
@@ -136,25 +136,25 @@ void SdrEditView::MovMarkedToTop()
                 if (nNewPos<nNowPos)
                     nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
             }
-            BOOL bEnd=FALSE;
+            sal_Bool bEnd=sal_False;
             while (nCmpPos<nNewPos && !bEnd)
             {
                 SdrObject* pCmpObj=pOL->GetObj(nCmpPos);
                 if (pCmpObj==NULL)
                 {
                     DBG_ERROR("MovMarkedToTop(): Vergleichsobjekt nicht gefunden");
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else if (pCmpObj==pMaxObj)
                 {
                     nNewPos=nCmpPos;
                     nNewPos--;
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect()))
                 {
                     nNewPos=nCmpPos;
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else
                 {
@@ -163,7 +163,7 @@ void SdrEditView::MovMarkedToTop()
             }
             if (nNowPos!=nNewPos)
             {
-                bChg=TRUE;
+                bChg=sal_True;
                 pOL->SetObjectOrdNum(nNowPos,nNewPos);
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -182,7 +182,7 @@ void SdrEditView::MovMarkedToTop()
 
 void SdrEditView::MovMarkedToBtm()
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
@@ -191,15 +191,15 @@ void SdrEditView::MovMarkedToBtm()
             BegUndo(ImpGetResStr(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOBTM);
 
         SortMarkedObjects();
-        ULONG nm;
+        sal_uIntPtr nm;
         for (nm=0; nm<nAnz; nm++)
         { // Ordnums muessen alle stimmen!
             GetMarkedObjectByIndex(nm)->GetOrdNum();
         }
 
-        BOOL bChg=FALSE;
+        sal_Bool bChg=sal_False;
         SdrObjList* pOL0=NULL;
-        ULONG nNewPos=0;
+        sal_uIntPtr nNewPos=0;
         for (nm=0; nm<nAnz; nm++)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -210,19 +210,19 @@ void SdrEditView::MovMarkedToBtm()
                 nNewPos=0;
                 pOL0=pOL;
             }
-            ULONG nNowPos=pObj->GetOrdNumDirect();
+            sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
             const Rectangle& rBR=pObj->GetCurrentBoundRect();
-            ULONG nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--;
+            sal_uIntPtr nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--;
             SdrObject* pMaxObj=GetMaxToBtmObj(pObj);
             if (pMaxObj!=NULL)
             {
-                ULONG nMinPos=pMaxObj->GetOrdNum()+1;
+                sal_uIntPtr nMinPos=pMaxObj->GetOrdNum()+1;
                 if (nNewPos<nMinPos)
                     nNewPos=nMinPos; // diesen nicht ueberholen.
                 if (nNewPos>nNowPos)
                     nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
             }
-            BOOL bEnd=FALSE;
+            sal_Bool bEnd=sal_False;
             // nNewPos ist an dieser Stelle noch die maximale Position,
             // an der das Obj hinruecken darf, ohne seinen Vorgaenger
             // (Mehrfachselektion) zu ueberholen.
@@ -232,18 +232,18 @@ void SdrEditView::MovMarkedToBtm()
                 if (pCmpObj==NULL)
                 {
                     DBG_ERROR("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden");
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else if (pCmpObj==pMaxObj)
                 {
                     nNewPos=nCmpPos;
                     nNewPos++;
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect()))
                 {
                     nNewPos=nCmpPos;
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else
                 {
@@ -252,7 +252,7 @@ void SdrEditView::MovMarkedToBtm()
             }
             if (nNowPos!=nNewPos)
             {
-                bChg=TRUE;
+                bChg=sal_True;
                 pOL->SetObjectOrdNum(nNowPos,nNewPos);
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -276,7 +276,7 @@ void SdrEditView::PutMarkedToTop()
 
 void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
@@ -289,7 +289,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
         {
             // Damit "Vor das Objekt" auch funktioniert wenn die
             // markierten Objekte bereits vor dem Objekt stehen
-            ULONG nRefMark=TryToFindMarkedObject(pRefObj);
+            sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj);
             SdrMark aRefMark;
             if (nRefMark!=CONTAINER_ENTRY_NOTFOUND)
             {
@@ -303,14 +303,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
                 SortMarkedObjects();
             }
         }
-        ULONG nm;
+        sal_uIntPtr nm;
         for (nm=0; nm<nAnz; nm++)
         { // Ordnums muessen alle stimmen!
             GetMarkedObjectByIndex(nm)->GetOrdNum();
         }
-        BOOL bChg=FALSE;
+        sal_Bool bChg=sal_False;
         SdrObjList* pOL0=NULL;
-        ULONG nNewPos=0;
+        sal_uIntPtr nNewPos=0;
         for (nm=nAnz; nm>0;)
         {
             nm--;
@@ -321,14 +321,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
                 SdrObjList* pOL=pObj->GetObjList();
                 if (pOL!=pOL0)
                 {
-                    nNewPos=ULONG(pOL->GetObjCount()-1);
+                    nNewPos=sal_uIntPtr(pOL->GetObjCount()-1);
                     pOL0=pOL;
                 }
-                ULONG nNowPos=pObj->GetOrdNumDirect();
+                sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
                 SdrObject* pMaxObj=GetMaxToTopObj(pObj);
                 if (pMaxObj!=NULL)
                 {
-                    ULONG nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders
+                    sal_uIntPtr nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders
                     if (nMaxOrd>0)
                         nMaxOrd--;
                     if (nNewPos>nMaxOrd)
@@ -340,7 +340,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
                 {
                     if (pRefObj->GetObjList()==pObj->GetObjList())
                     {
-                        ULONG nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
+                        sal_uIntPtr nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
                         if (nNewPos>nMaxOrd)
                             nNewPos=nMaxOrd; // nicht ueberholen.
                         if (nNewPos<nNowPos)
@@ -353,7 +353,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
                 }
                 if (nNowPos!=nNewPos)
                 {
-                    bChg=TRUE;
+                    bChg=sal_True;
                     pOL->SetObjectOrdNum(nNowPos,nNewPos);
                     if( bUndo )
                         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -378,7 +378,7 @@ void SdrEditView::PutMarkedToBtm()
 
 void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
@@ -391,7 +391,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
         {
             // Damit "Hinter das Objekt" auch funktioniert wenn die
             // markierten Objekte bereits hinter dem Objekt stehen
-            ULONG nRefMark=TryToFindMarkedObject(pRefObj);
+            sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj);
             SdrMark aRefMark;
             if (nRefMark!=CONTAINER_ENTRY_NOTFOUND)
             {
@@ -405,13 +405,13 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
                 SortMarkedObjects();
             }
         }
-        ULONG nm;
+        sal_uIntPtr nm;
         for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen!
             GetMarkedObjectByIndex(nm)->GetOrdNum();
         }
-        BOOL bChg=FALSE;
+        sal_Bool bChg=sal_False;
         SdrObjList* pOL0=NULL;
-        ULONG nNewPos=0;
+        sal_uIntPtr nNewPos=0;
         for (nm=0; nm<nAnz; nm++) {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -421,16 +421,16 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
                     nNewPos=0;
                     pOL0=pOL;
                 }
-                ULONG nNowPos=pObj->GetOrdNumDirect();
+                sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
                 SdrObject* pMinObj=GetMaxToBtmObj(pObj);
                 if (pMinObj!=NULL) {
-                    ULONG nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders
+                    sal_uIntPtr nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders
                     if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen.
                     if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
                 }
                 if (pRefObj!=NULL) {
                     if (pRefObj->GetObjList()==pObj->GetObjList()) {
-                        ULONG nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
+                        sal_uIntPtr nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
                         if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen.
                         if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
                     } else {
@@ -438,7 +438,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
                     }
                 }
                 if (nNowPos!=nNewPos) {
-                    bChg=TRUE;
+                    bChg=sal_True;
                     pOL->SetObjectOrdNum(nNowPos,nNewPos);
                     if( bUndo )
                         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -459,32 +459,32 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
 void SdrEditView::ReverseOrderOfMarked()
 {
     SortMarkedObjects();
-    ULONG nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
     if (nMarkAnz>0)
     {
-        //BOOL bNeedBundle=FALSE;
-        BOOL bChg=FALSE;
+        //sal_Bool bNeedBundle=sal_False;
+        sal_Bool bChg=sal_False;
 
         bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_REVORDER);
 
-        ULONG a=0;
+        sal_uIntPtr a=0;
         do {
             // Markierung ueber mehrere PageViews berueksichtigen
-            ULONG b=a+1;
+            sal_uIntPtr b=a+1;
             while (b<nMarkAnz && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) b++;
             b--;
             SdrObjList* pOL=GetSdrPageViewOfMarkedByIndex(a)->GetObjList();
-            ULONG c=b;
+            sal_uIntPtr c=b;
             if (a<c) { // Sicherstellen, dass die OrdNums nicht Dirty sind
                 GetMarkedObjectByIndex(a)->GetOrdNum();
             }
             while (a<c) {
                 SdrObject* pObj1=GetMarkedObjectByIndex(a);
                 SdrObject* pObj2=GetMarkedObjectByIndex(c);
-                ULONG nOrd1=pObj1->GetOrdNumDirect();
-                ULONG nOrd2=pObj2->GetOrdNumDirect();
+                sal_uIntPtr nOrd1=pObj1->GetOrdNumDirect();
+                sal_uIntPtr nOrd2=pObj2->GetOrdNumDirect();
                 if( bUndo )
                 {
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj1,nOrd1,nOrd2));
@@ -495,7 +495,7 @@ void SdrEditView::ReverseOrderOfMarked()
                 pOL->SetObjectOrdNum(nOrd2-1,nOrd1);
                 // Verwendung von Replace statt SetOrdNum wg. Performance (Neuberechnung der Ordnums)
                 a++; c--;
-                bChg=TRUE;
+                bChg=sal_True;
             }
             a=b+1;
         } while (a<nMarkAnz);
@@ -510,30 +510,30 @@ void SdrEditView::ReverseOrderOfMarked()
 
 void SdrEditView::ImpCheckToTopBtmPossible()
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz==0)
         return;
     if (nAnz==1)
     { // Sonderbehandlung fuer Einzelmarkierung
         SdrObject* pObj=GetMarkedObjectByIndex(0);
         SdrObjList* pOL=pObj->GetObjList();
-        ULONG nMax=pOL->GetObjCount();
-        ULONG nMin=0;
-        ULONG nObjNum=pObj->GetOrdNum();
+        sal_uIntPtr nMax=pOL->GetObjCount();
+        sal_uIntPtr nMin=0;
+        sal_uIntPtr nObjNum=pObj->GetOrdNum();
         SdrObject* pRestrict=GetMaxToTopObj(pObj);
         if (pRestrict!=NULL) {
-            ULONG nRestrict=pRestrict->GetOrdNum();
+            sal_uIntPtr nRestrict=pRestrict->GetOrdNum();
             if (nRestrict<nMax) nMax=nRestrict;
         }
         pRestrict=GetMaxToBtmObj(pObj);
         if (pRestrict!=NULL) {
-            ULONG nRestrict=pRestrict->GetOrdNum();
+            sal_uIntPtr nRestrict=pRestrict->GetOrdNum();
             if (nRestrict>nMin) nMin=nRestrict;
         }
-        bToTopPossible=nObjNum<ULONG(nMax-1);
+        bToTopPossible=nObjNum<sal_uIntPtr(nMax-1);
         bToBtmPossible=nObjNum>nMin;
     } else { // Mehrfachselektion
-        ULONG nm=0;
+        sal_uIntPtr nm=0;
         SdrObjList* pOL0=NULL;
         long nPos0=-1;
         while (!bToBtmPossible && nm<nAnz) { // 'nach hinten' checken
@@ -543,8 +543,8 @@ void SdrEditView::ImpCheckToTopBtmPossible()
                 nPos0=-1;
                 pOL0=pOL;
             }
-            ULONG nPos=pObj->GetOrdNum();
-            bToBtmPossible=nPos>ULONG(nPos0+1);
+            sal_uIntPtr nPos=pObj->GetOrdNum();
+            bToBtmPossible=nPos>sal_uIntPtr(nPos0+1);
             nPos0=long(nPos);
             nm++;
         }
@@ -559,8 +559,8 @@ void SdrEditView::ImpCheckToTopBtmPossible()
                 nPos0=pOL->GetObjCount();
                 pOL0=pOL;
             }
-            ULONG nPos=pObj->GetOrdNum();
-            bToTopPossible=nPos+1<ULONG(nPos0);
+            sal_uIntPtr nPos=pObj->GetOrdNum();
+            bToTopPossible=nPos+1<sal_uIntPtr(nPos0);
             nPos0=nPos;
         }
     }
@@ -796,15 +796,15 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol
 struct ImpDistributeEntry
 {
     SdrObject*                  mpObj;
-    INT32                       mnPos;
-    INT32                       mnLength;
+    sal_Int32                       mnPos;
+    sal_Int32                       mnLength;
 };
 
 DECLARE_LIST(ImpDistributeEntryList, ImpDistributeEntry*)
 
 void SdrEditView::DistributeMarkedObjects()
 {
-    UINT32 nMark(GetMarkedObjectCount());
+    sal_uInt32 nMark(GetMarkedObjectCount());
 
     if(nMark > 2)
     {
@@ -816,14 +816,14 @@ void SdrEditView::DistributeMarkedObjects()
             AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr);
             DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
 
-            UINT16 nResult = pDlg->Execute();
+            sal_uInt16 nResult = pDlg->Execute();
 
             if(nResult == RET_OK)
             {
                 SvxDistributeHorizontal eHor = pDlg->GetDistributeHor();
                 SvxDistributeVertical eVer = pDlg->GetDistributeVer();
                 ImpDistributeEntryList aEntryList;
-                UINT32 a, nInsPos, nFullLength;
+                sal_uInt32 a, nInsPos, nFullLength;
 
                 const bool bUndo = IsUndoEnabled();
                 if( bUndo )
@@ -878,7 +878,7 @@ void SdrEditView::DistributeMarkedObjects()
                     if(eHor == SvxDistributeHorizontalDistance)
                     {
                         // calc room in-between
-                        INT32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1;
+                        sal_Int32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1;
                         double fStepWidth = ((double)nWidth - (double)nFullLength) / (double)(aEntryList.Count() - 1);
                         double fStepStart = (double)aEntryList.GetObject(0)->mnPos;
                         fStepStart += fStepWidth + (double)((aEntryList.GetObject(0)->mnLength + aEntryList.GetObject(1)->mnLength) / 2);
@@ -888,7 +888,7 @@ void SdrEditView::DistributeMarkedObjects()
                         {
                             ImpDistributeEntry* pCurr = aEntryList.GetObject(a);
                             ImpDistributeEntry* pNext = aEntryList.GetObject(a+1);
-                            INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+                            sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
                             if( bUndo )
                                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
                             pCurr->mpObj->Move(Size(nDelta, 0));
@@ -898,7 +898,7 @@ void SdrEditView::DistributeMarkedObjects()
                     else
                     {
                         // calc distances
-                        INT32 nWidth = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos;
+                        sal_Int32 nWidth = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos;
                         double fStepWidth = (double)nWidth / (double)(aEntryList.Count() - 1);
                         double fStepStart = (double)aEntryList.GetObject(0)->mnPos;
                         fStepStart += fStepWidth;
@@ -907,7 +907,7 @@ void SdrEditView::DistributeMarkedObjects()
                         for(a=1;a<aEntryList.Count()-1;a++)
                         {
                             ImpDistributeEntry* pCurr = aEntryList.GetObject(a);
-                            INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+                            sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
                             if( bUndo )
                                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
                             pCurr->mpObj->Move(Size(nDelta, 0));
@@ -917,7 +917,7 @@ void SdrEditView::DistributeMarkedObjects()
 
                     // clear list
                     while(aEntryList.Count())
-                        delete aEntryList.Remove((ULONG)0L);
+                        delete aEntryList.Remove((sal_uIntPtr)0L);
                 }
 
                 if(eVer != SvxDistributeVerticalNone)
@@ -969,7 +969,7 @@ void SdrEditView::DistributeMarkedObjects()
                     if(eVer == SvxDistributeVerticalDistance)
                     {
                         // calc room in-between
-                        INT32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1;
+                        sal_Int32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1;
                         double fStepWidth = ((double)nHeight - (double)nFullLength) / (double)(aEntryList.Count() - 1);
                         double fStepStart = (double)aEntryList.GetObject(0)->mnPos;
                         fStepStart += fStepWidth + (double)((aEntryList.GetObject(0)->mnLength + aEntryList.GetObject(1)->mnLength) / 2);
@@ -979,7 +979,7 @@ void SdrEditView::DistributeMarkedObjects()
                         {
                             ImpDistributeEntry* pCurr = aEntryList.GetObject(a);
                             ImpDistributeEntry* pNext = aEntryList.GetObject(a+1);
-                            INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+                            sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
                             if( bUndo )
                                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
                             pCurr->mpObj->Move(Size(0, nDelta));
@@ -989,7 +989,7 @@ void SdrEditView::DistributeMarkedObjects()
                     else
                     {
                         // calc distances
-                        INT32 nHeight = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos;
+                        sal_Int32 nHeight = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos;
                         double fStepWidth = (double)nHeight / (double)(aEntryList.Count() - 1);
                         double fStepStart = (double)aEntryList.GetObject(0)->mnPos;
                         fStepStart += fStepWidth;
@@ -998,7 +998,7 @@ void SdrEditView::DistributeMarkedObjects()
                         for(a=1;a<aEntryList.Count()-1;a++)
                         {
                             ImpDistributeEntry* pCurr = aEntryList.GetObject(a);
-                            INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+                            sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
                             if( bUndo )
                                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
                             pCurr->mpObj->Move(Size(0, nDelta));
@@ -1008,7 +1008,7 @@ void SdrEditView::DistributeMarkedObjects()
 
                     // clear list
                     while(aEntryList.Count())
-                        delete aEntryList.Remove((ULONG)0L);
+                        delete aEntryList.Remove((sal_uIntPtr)0L);
                 }
 
                 // UNDO-Comment and end of UNDO
@@ -1036,24 +1036,24 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
         if( bUndo )
             BegUndo();
 
-        UINT32 nInsPos=0xFFFFFFFF;
+        sal_uInt32 nInsPos=0xFFFFFFFF;
         const SdrObject* pAttrObj = NULL;
         basegfx::B2DPolyPolygon aMergePolyPolygonA;
         basegfx::B2DPolyPolygon aMergePolyPolygonB;
 
         SdrObjList* pInsOL = NULL;
         SdrPageView* pInsPV = NULL;
-        BOOL bFirstObjectComplete(FALSE);
+        sal_Bool bFirstObjectComplete(sal_False);
 
         // make sure selected objects are contour objects
         // since now basegfx::tools::adaptiveSubdivide() is used, it is no longer
         // necessary to use ConvertMarkedToPolyObj which will subdivide curves using the old
         // mechanisms. In a next step the polygon clipper will even be able to clip curves...
-        // ConvertMarkedToPolyObj(TRUE);
+        // ConvertMarkedToPolyObj(sal_True);
         ConvertMarkedToPathObj(sal_True);
         OSL_ENSURE(AreObjectsMarked(), "no more objects selected after preparations (!)");
 
-        for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+        for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
         {
             SdrMark* pM = GetSdrMarkByIndex(a);
             SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -1121,7 +1121,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
                 // was there something added to the first poly?
                 if(!bFirstObjectComplete && aMergePolyPolygonA.count())
                 {
-                    bFirstObjectComplete = TRUE;
+                    bFirstObjectComplete = sal_True;
                 }
 
                 // move object to temporary delete list
@@ -1168,7 +1168,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
             pInsOL->InsertObject(pPath, nInsPos, &aReason);
             if( bUndo )
                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath));
-            MarkObj(pPath, pInsPV, FALSE, TRUE);
+            MarkObj(pPath, pInsPV, sal_False, sal_True);
         }
 
         aRemove.ForceSort();
@@ -1364,7 +1364,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
         // in the UNDO there is no problem, but as soon as they get deleted, the
         // MarkList will contain deleted objects -> GPF.
         UnmarkAllObj(pInsPV);
-        MarkObj(pPath, pInsPV, FALSE, TRUE);
+        MarkObj(pPath, pInsPV, sal_False, sal_True);
     }
 
     // UndoComment aus den tatsaechlich verwendeten Objekten zusammenbauen
@@ -1417,8 +1417,8 @@ sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolyg
 
 sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const
 {
-    sal_Bool bOtherObjs(sal_False);    // TRUE=andere Objekte ausser PathObj's vorhanden
-    sal_Bool bMin1PolyPoly(sal_False); // TRUE=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden
+    sal_Bool bOtherObjs(sal_False);    // sal_True=andere Objekte ausser PathObj's vorhanden
+    sal_Bool bMin1PolyPoly(sal_False); // sal_True=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden
     SdrObjList* pOL = pObj->GetSubList();
 
     if(pOL)
@@ -1493,7 +1493,7 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines
     return bMin1PolyPoly && !bOtherObjs;
 }
 
-void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines)
+void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines)
 {
     const SdrPathObj* pSrcPath = PTR_CAST(SdrPathObj, pObj);
     const SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj);
@@ -1520,8 +1520,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                 SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath);
                 rOL.InsertObject(pPath, rPos, &aReason);
                 if( bUndo )
-                    AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE));
-                MarkObj(pPath, pPV, FALSE, TRUE);
+                    AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True));
+                MarkObj(pPath, pPV, sal_False, sal_True);
                 rPos++;
             }
             else
@@ -1555,8 +1555,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                     SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath);
                     rOL.InsertObject(pPath, rPos, &aReason);
                     if( bUndo )
-                        AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE));
-                    MarkObj(pPath, pPV, FALSE, TRUE);
+                        AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True));
+                    MarkObj(pPath, pPV, sal_False, sal_True);
                     rPos++;
                 }
             }
@@ -1592,7 +1592,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                 rOL.InsertObject(pCandidate, rPos, &aReason);
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true));
-                MarkObj(pCandidate, pPV, FALSE, TRUE);
+                MarkObj(pCandidate, pPV, sal_False, sal_True);
 
                 if(pCustomShape->HasText() && !pCustomShape->IsTextPath())
                 {
@@ -1637,16 +1637,16 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                     rOL.InsertObject(pTextObj, rPos + 1, &aReason);
                     if( bUndo )
                         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pTextObj, true));
-                    MarkObj(pTextObj, pPV, FALSE, TRUE);
+                    MarkObj(pTextObj, pPV, sal_False, sal_True);
                 }
             }
         }
     }
 }
 
-void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
+void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines)
 {
-    //UINT32 nCnt(0);
+    //sal_uInt32 nCnt(0);
     // Temporaere Marklist
     SdrMarkList aRemoveMerker;
 
@@ -1661,8 +1661,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
             bMakeLines ? SDRREPFUNC_OBJ_DISMANTLE_LINES : SDRREPFUNC_OBJ_DISMANTLE_POLYS);
     }
 
-    ULONG nm;
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nm;
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     SdrObjList* pOL0=NULL;
     for (nm=nAnz; nm>0;) {
         nm--;
@@ -1673,8 +1673,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
         if (pOL!=pOL0) { pOL0=pOL; pObj->GetOrdNum(); } // sicherstellen, dass OrdNums stimmen!
         if (ImpCanDismantle(pObj,bMakeLines)) {
             aRemoveMerker.InsertEntry(SdrMark(pObj,pM->GetPageView()));
-            ULONG nPos0=pObj->GetOrdNumDirect();
-            ULONG nPos=nPos0+1;
+            sal_uIntPtr nPos0=pObj->GetOrdNumDirect();
+            sal_uIntPtr nPos=nPos0+1;
             SdrObjList* pSubList=pObj->GetSubList();
             if (pSubList!=NULL && !pObj->Is3DObj()) {
                 SdrObjListIter aIter(*pSubList,IM_DEEPNOGROUPS);
@@ -1686,7 +1686,7 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
                 ImpDismantleOneObject(pObj,*pOL,nPos,pPV,bMakeLines);
             }
             if( bUndo )
-                AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,TRUE));
+                AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,sal_True));
             pOL->RemoveObject(nPos0);
 
             if( !bUndo )
@@ -1724,8 +1724,8 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
         {
             BegUndo(ImpGetResStr(STR_EditGroup),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_GROUP);
 
-            const ULONG nAnz = GetMarkedObjectCount();
-            for(ULONG nm = nAnz; nm>0; )
+            const sal_uIntPtr nAnz = GetMarkedObjectCount();
+            for(sal_uIntPtr nm = nAnz; nm>0; )
             {
                 // UndoActions fuer alle betroffenen Objekte anlegen
                 nm--;
@@ -1755,9 +1755,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
             SdrObjList* pDstLst=NULL;
             // Falls alle markierten Objekte aus Fremden Obj-Listen
             // kommen, kommt das Gruppenobjekt an das Ende der Liste.
-            ULONG       nInsPos=pSrcLst->GetObjCount();
-            BOOL    bNeedInsPos=TRUE;
-            for (ULONG nm=GetMarkedObjectCount(); nm>0;)
+            sal_uIntPtr       nInsPos=pSrcLst->GetObjCount();
+            sal_Bool    bNeedInsPos=sal_True;
+            for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;)
             {
                 nm--;
                 SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -1779,13 +1779,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
                         if (pSrcLst->IsObjOrdNumsDirty())
                             pSrcLst->RecalcObjOrdNums();
                     }
-                    BOOL bForeignList=pSrcLst!=pAktLst;
-                    BOOL bGrouped=pSrcLst!=pPage;
+                    sal_Bool bForeignList=pSrcLst!=pAktLst;
+                    sal_Bool bGrouped=pSrcLst!=pPage;
                     if (!bForeignList && bNeedInsPos)
                     {
                         nInsPos=pObj->GetOrdNum(); // ua, damit sind alle ObjOrdNum der Page gesetzt
                         nInsPos++;
-                        bNeedInsPos=FALSE;
+                        bNeedInsPos=sal_False;
                     }
                     pSrcLst->RemoveObject(pObj->GetOrdNumDirect());
                     if (!bForeignList)
@@ -1808,13 +1808,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
             if (pGrp!=NULL)
             {
                 aNewMark.InsertEntry(SdrMark(pGrp,pPV));
-                ULONG nAnz=pDstLst->GetObjCount();
+                sal_uIntPtr nAnz=pDstLst->GetObjCount();
                 SdrInsertReason aReason(SDRREASON_VIEWCALL,pRefObj);
                 pAktLst->InsertObject(pGrp,nInsPos,&aReason);
                 if( bUndo )
                 {
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pGrp,true)); // Kein Recalc!
-                    for (ULONG no=0; no<nAnz; no++)
+                    for (sal_uIntPtr no=0; no<nAnz; no++)
                     {
                         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoInsertObject(*pDstLst->GetObj(no)));
                     }
@@ -1847,11 +1847,11 @@ void SdrEditView::UnGroupMarked()
     if( bUndo )
         BegUndo(String(), String(), SDRREPFUNC_OBJ_UNGROUP);
 
-    ULONG nCount=0;
+    sal_uIntPtr nCount=0;
     XubString aName1;
     XubString aName;
-    BOOL bNameOk=FALSE;
-    for (ULONG nm=GetMarkedObjectCount(); nm>0;) {
+    sal_Bool bNameOk=sal_False;
+    for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) {
         nm--;
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pGrp=pM->GetMarkedSdrObj();
@@ -1861,7 +1861,7 @@ void SdrEditView::UnGroupMarked()
             if (nCount==1) {
                 pGrp->TakeObjNameSingul(aName);  // Bezeichnung der Gruppe holen
                 pGrp->TakeObjNamePlural(aName1); // Bezeichnung der Gruppe holen
-                bNameOk=TRUE;
+                bNameOk=sal_True;
             } else {
                 if (nCount==2) aName=aName1; // Pluralname setzen
                 if (bNameOk) {
@@ -1869,17 +1869,17 @@ void SdrEditView::UnGroupMarked()
                     pGrp->TakeObjNamePlural(aStr); // Bezeichnung der Gruppe holen
 
                     if(!aStr.Equals(aName))
-                        bNameOk = FALSE;
+                        bNameOk = sal_False;
                 }
             }
-            ULONG nDstCnt=pGrp->GetOrdNum();
+            sal_uIntPtr nDstCnt=pGrp->GetOrdNum();
             SdrObjList* pDstLst=pM->GetPageView()->GetObjList();
 
             // FIRST move contained objects to parent of group, so that
             // the contained objects are NOT migrated to the UNDO-ItemPool
             // when AddUndo(new SdrUndoDelObj(*pGrp)) is called.
-            ULONG nAnz=pSrcLst->GetObjCount();
-            ULONG no;
+            sal_uIntPtr nAnz=pSrcLst->GetObjCount();
+            sal_uIntPtr no;
 
             if( bUndo )
             {
@@ -1901,7 +1901,7 @@ void SdrEditView::UnGroupMarked()
                 // Kein SortCheck beim einfuegen in die MarkList, denn das
                 // wuerde wg. pObj->GetOrdNum() jedesmal ein RecalcOrdNums()
                 // provozieren:
-                aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),FALSE);
+                aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),sal_False);
             }
 
             if( bUndo )
@@ -1932,7 +1932,7 @@ void SdrEditView::UnGroupMarked()
 
     if (nCount!=0)
     {
-        GetMarkedObjectListWriteAccess().Merge(aNewMark,TRUE); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum
+        GetMarkedObjectListWriteAccess().Merge(aNewMark,sal_True); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum
         MarkListHasChanged();
     }
 }
@@ -1947,7 +1947,7 @@ void SdrEditView::UnGroupMarked()
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea)
+SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea)
 {
     SdrObject* pNewObj = pObj->ConvertToPolyObj(bPath, bLineToArea);
     if (pNewObj!=NULL)
@@ -1969,13 +1969,13 @@ SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLine
     return pNewObj;
 }
 
-void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
+void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea)
 {
-    BOOL bMrkChg=FALSE;
-    BOOL bModChg=FALSE;
+    sal_Bool bMrkChg=sal_False;
+    sal_Bool bModChg=sal_False;
     if (AreObjectsMarked()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        USHORT nDscrID=0;
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        sal_uInt16 nDscrID=0;
         if(bLineToArea)
         {
             if(nMarkAnz == 1)
@@ -1997,7 +1997,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
                 BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_CONVERTTOPOLY);
             }
         }
-        for (ULONG nm=nMarkAnz; nm>0;) {
+        for (sal_uIntPtr nm=nMarkAnz; nm>0;) {
             nm--;
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -2007,13 +2007,13 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
                 SdrObjListIter aIter(*pGrp,IM_DEEPNOGROUPS);
                 while (aIter.IsMore()) {
                     pObj=aIter.Next();
-                    if (ImpConvertOneObj(pObj,bPath,bLineToArea)) bModChg=TRUE;
+                    if (ImpConvertOneObj(pObj,bPath,bLineToArea)) bModChg=sal_True;
                 }
             } else {
                 SdrObject* pNewObj=ImpConvertOneObj(pObj,bPath,bLineToArea);
                 if (pNewObj!=NULL) {
-                    bModChg=TRUE;
-                    bMrkChg=TRUE;
+                    bModChg=sal_True;
+                    bMrkChg=sal_True;
                     GetMarkedObjectListWriteAccess().ReplaceMark(SdrMark(pNewObj,pPV),nm);
                 }
             }
@@ -2024,14 +2024,14 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
     }
 }
 
-void SdrEditView::ConvertMarkedToPathObj(BOOL bLineToArea)
+void SdrEditView::ConvertMarkedToPathObj(sal_Bool bLineToArea)
 {
-    ImpConvertTo(TRUE, bLineToArea);
+    ImpConvertTo(sal_True, bLineToArea);
 }
 
-void SdrEditView::ConvertMarkedToPolyObj(BOOL bLineToArea)
+void SdrEditView::ConvertMarkedToPolyObj(sal_Bool bLineToArea)
 {
-    ImpConvertTo(FALSE, bLineToArea);
+    ImpConvertTo(sal_False, bLineToArea);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2054,9 +2054,9 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
     SortMarkedObjects();
     SdrMarkList aForTheDescription;
     SdrMarkList aNewMarked;
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
 
-    for (ULONG nm=nAnz; nm>0;)
+    for (sal_uIntPtr nm=nAnz; nm>0;)
     { // Undo Objekte fuer alle neuen Objekte erzeugen
         // zwischen den Metafiles auf Abbruch testen
         if( pProgrInfo != NULL )
@@ -2071,10 +2071,10 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
         SdrObject*   pObj=pM->GetMarkedSdrObj();
         SdrPageView* pPV=pM->GetPageView();
         SdrObjList*  pOL=pObj->GetObjList();
-        ULONG        nInsPos=pObj->GetOrdNum()+1;
+        sal_uIntPtr        nInsPos=pObj->GetOrdNum()+1;
         SdrGrafObj*  pGraf=PTR_CAST(SdrGrafObj,pObj);
         SdrOle2Obj*  pOle2=PTR_CAST(SdrOle2Obj,pObj);
-        ULONG        nInsAnz=0;
+        sal_uIntPtr        nInsAnz=0;
         if (pGraf!=NULL && pGraf->HasGDIMetaFile())
         {
             ImpSdrGDIMetaFileImport aFilter(*pMod);
@@ -2092,8 +2092,8 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
         }
         if (nInsAnz!=0)
         {
-            ULONG nObj=nInsPos;
-            for (ULONG i=0; i<nInsAnz; i++)
+            sal_uIntPtr nObj=nInsPos;
+            for (sal_uIntPtr i=0; i<nInsAnz; i++)
             {
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pOL->GetObj(nObj)));
@@ -2122,7 +2122,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
     if(aNewMarked.GetMarkCount())
     {
         // Neue Selektion bilden
-        for(ULONG a(0); a < aNewMarked.GetMarkCount(); a++)
+        for(sal_uIntPtr a(0); a < aNewMarked.GetMarkCount(); a++)
         {
             GetMarkedObjectListWriteAccess().InsertEntry(*aNewMarked.GetMark(a));
         }
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 961c860567f9..a8a0663a4b04 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -82,22 +82,22 @@
 
 void SdrObjEditView::ImpClearVars()
 {
-    bQuickTextEditMode=TRUE;
-    bMacroMode=TRUE;
+    bQuickTextEditMode=sal_True;
+    bMacroMode=sal_True;
     pTextEditOutliner=NULL;
     pTextEditOutlinerView=NULL;
     pTextEditPV=NULL;
     pTextEditWin=NULL;
     pTextEditCursorMerker=NULL;
     pEditPara=NULL;
-    bTextEditNewObj=FALSE;
-    bMacroDown=FALSE;
+    bTextEditNewObj=sal_False;
+    bMacroDown=sal_False;
     pMacroObj=NULL;
     pMacroPV=NULL;
     pMacroWin=NULL;
     nMacroTol=0;
-    bTextEditDontDelete=FALSE;
-    bTextEditOnlyOneView=FALSE;
+    bTextEditDontDelete=sal_False;
+    bTextEditOnlyOneView=sal_False;
 }
 
 SdrObjEditView::SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -117,7 +117,7 @@ SdrObjEditView::~SdrObjEditView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrObjEditView::IsAction() const
+sal_Bool SdrObjEditView::IsAction() const
 {
     return IsMacroObj() || SdrGlueEditView::IsAction();
 }
@@ -185,10 +185,10 @@ void SdrObjEditView::ModelHasChanged()
     if (IsTextEdit()) {
         SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( mxTextEditObj.get() );
         if (pTextObj!=NULL) {
-            ULONG nOutlViewAnz=pTextEditOutliner->GetViewCount();
-            BOOL bAreaChg=FALSE;
-            BOOL bAnchorChg=FALSE;
-            BOOL bColorChg=FALSE;
+            sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount();
+            sal_Bool bAreaChg=sal_False;
+            sal_Bool bAnchorChg=sal_False;
+            sal_Bool bColorChg=sal_False;
             bool bContourFrame=pTextObj->IsContourTextFrame();
             EVAnchorMode eNewAnchor(ANCHOR_VCENTER_HCENTER);
             Rectangle aOldArea(aMinTextEditArea);
@@ -212,34 +212,34 @@ void SdrObjEditView::ModelHasChanged()
                     pTextEditOutliner->GetMinAutoPaperSize()!=aPaperMin1 || pTextEditOutliner->GetMaxAutoPaperSize()!=aPaperMax1) {
                     aTextEditArea=aEditArea1;
                     aMinTextEditArea=aMinArea1;
-                    pTextEditOutliner->SetUpdateMode(FALSE);
+                    pTextEditOutliner->SetUpdateMode(sal_False);
                     pTextEditOutliner->SetMinAutoPaperSize(aPaperMin1);
                     pTextEditOutliner->SetMaxAutoPaperSize(aPaperMax1);
                     pTextEditOutliner->SetPaperSize(Size(0,0)); // Damit der Outliner neu formatiert
                     if (!bContourFrame) {
                         pTextEditOutliner->ClearPolygon();
-                        ULONG nStat=pTextEditOutliner->GetControlWord();
+                        sal_uIntPtr nStat=pTextEditOutliner->GetControlWord();
                         nStat|=EE_CNTRL_AUTOPAGESIZE;
                         pTextEditOutliner->SetControlWord(nStat);
                     } else {
-                        ULONG nStat=pTextEditOutliner->GetControlWord();
+                        sal_uIntPtr nStat=pTextEditOutliner->GetControlWord();
                         nStat&=~EE_CNTRL_AUTOPAGESIZE;
                         pTextEditOutliner->SetControlWord(nStat);
                         Rectangle aAnchorRect;
                         pTextObj->TakeTextAnchorRect(aAnchorRect);
-                        pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, TRUE);
+                        pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, sal_True);
                     }
-                    for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++) {
+                    for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) {
                         OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
-                        ULONG nStat0=pOLV->GetControlWord();
-                        ULONG nStat=nStat0;
+                        sal_uIntPtr nStat0=pOLV->GetControlWord();
+                        sal_uIntPtr nStat=nStat0;
                         // AutoViewSize nur wenn nicht KontourFrame.
                         if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE;
                         else nStat&=~EV_CNTRL_AUTOSIZE;
                         if (nStat!=nStat0) pOLV->SetControlWord(nStat);
                     }
-                    pTextEditOutliner->SetUpdateMode(TRUE);
-                    bAreaChg=TRUE;
+                    pTextEditOutliner->SetUpdateMode(sal_True);
+                    bAreaChg=sal_True;
                 }
             }
             if (pTextEditOutlinerView!=NULL) { // Fuellfarbe und Anker checken
@@ -267,13 +267,13 @@ void SdrObjEditView::ModelHasChanged()
             // again on ModelHasChanged().
             if (bContourFrame || bAreaChg || bAnchorChg || bColorChg)
             {
-                for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++)
+                for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++)
                 {
                     OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
                     { // Alten OutlinerView-Bereich invalidieren
                         Window* pWin=pOLV->GetWindow();
                         Rectangle aTmpRect(aOldArea);
-                        USHORT nPixSiz=pOLV->GetInvalidateMore()+1;
+                        sal_uInt16 nPixSiz=pOLV->GetInvalidateMore()+1;
                         Size aMore(pWin->PixelToLogic(Size(nPixSiz,nPixSiz)));
                         aTmpRect.Left()-=aMore.Width();
                         aTmpRect.Right()+=aMore.Width();
@@ -322,7 +322,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
         aBlankRect.Union(aMinTextEditArea);
         Rectangle aPixRect(pWin->LogicToPixel(aBlankRect));
         aBlankRect.Intersection(rRect);
-        rOutlView.GetOutliner()->SetUpdateMode(TRUE); // Bugfix #22596#
+        rOutlView.GetOutliner()->SetUpdateMode(sal_True); // Bugfix #22596#
         rOutlView.Paint(aBlankRect);
 
         if(!bModifyMerk)
@@ -359,7 +359,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
             aOuterPix.Bottom()+=nPixSiz;
 
             bool bMerk(pWin->IsMapModeEnabled());
-            pWin->EnableMapMode(FALSE);
+            pWin->EnableMapMode(sal_False);
             PolyPolygon aPolyPoly( 2 );
 
             svtools::ColorConfig aColorConfig;
@@ -419,32 +419,32 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const
             aOuterPix.Bottom()+=nPixSiz;
 
             bool bMerk(pWin->IsMapModeEnabled());
-            pWin->EnableMapMode(FALSE);
+            pWin->EnableMapMode(sal_False);
             pWin->Invalidate(aOuterPix);
             pWin->EnableMapMode(bMerk);
         }
     }
 }
 
-OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*/, OutlinerView* pGivenView) const
+OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPaint*/, OutlinerView* pGivenView) const
 {
     // Hintergrund
     Color aBackground(GetTextEditBackgroundColor(*this));
     SdrTextObj* pText = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() );
-    BOOL bTextFrame=pText!=NULL && pText->IsTextFrame();
-    BOOL bContourFrame=pText!=NULL && pText->IsContourTextFrame();
+    sal_Bool bTextFrame=pText!=NULL && pText->IsTextFrame();
+    sal_Bool bContourFrame=pText!=NULL && pText->IsContourTextFrame();
     // OutlinerView erzeugen
     OutlinerView* pOutlView=pGivenView;
-    pTextEditOutliner->SetUpdateMode(FALSE);
+    pTextEditOutliner->SetUpdateMode(sal_False);
     if (pOutlView==NULL) pOutlView=new OutlinerView(pTextEditOutliner,pWin);
     else pOutlView->SetWindow(pWin);
     // Scrollen verbieten
-    ULONG nStat=pOutlView->GetControlWord();
+    sal_uIntPtr nStat=pOutlView->GetControlWord();
     nStat&=~EV_CNTRL_AUTOSCROLL;
     // AutoViewSize nur wenn nicht KontourFrame.
     if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE;
     if (bTextFrame) {
-        USHORT nPixSiz=aHdl.GetHdlSize()*2+1;
+        sal_uInt16 nPixSiz=aHdl.GetHdlSize()*2+1;
         nStat|=EV_CNTRL_INVONEMORE;
         pOutlView->SetInvalidateMore(nPixSiz);
     }
@@ -456,12 +456,12 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*
         pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
     }
     pOutlView->SetOutputArea(aTextEditArea);
-    pTextEditOutliner->SetUpdateMode(TRUE);
+    pTextEditOutliner->SetUpdateMode(sal_True);
     ImpInvalidateOutlinerView(*pOutlView);
     return pOutlView;
 }
 
-BOOL SdrObjEditView::IsTextEditFrame() const
+sal_Bool SdrObjEditView::IsTextEditFrame() const
 {
     SdrTextObj* pText = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
     return pText!=NULL && pText->IsTextFrame();
@@ -489,7 +489,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
     if (pTextObj!=NULL) {
         Color* pTxtCol=NULL;
         Color* pFldCol=NULL;
-        bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),TRUE,pTxtCol,pFldCol,rStr);
+        bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),sal_True,pTxtCol,pFldCol,rStr);
         if (bOk) {
             if (pTxtCol!=NULL) {
                 pFI->SetTxtColor(*pTxtCol);
@@ -507,7 +507,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
     Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
     if (!bOk && aDrawOutlLink.IsSet()) {
         aDrawOutlLink.Call(pFI);
-        bOk = (BOOL)rStr.Len();
+        bOk = (sal_Bool)rStr.Len();
     }
     if (!bOk && aOldCalcFieldValueLink.IsSet()) {
         return aOldCalcFieldValueLink.Call(pFI);
@@ -525,7 +525,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
     SdrEndTextEdit();
 
     if( dynamic_cast< SdrTextObj* >( pObj ) == 0 )
-        return FALSE; // currently only possible with text objects
+        return sal_False; // currently only possible with text objects
 
     if(bGrabFocus && pWin)
     {
@@ -606,7 +606,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             pTextEditOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
         }
 
-        BOOL bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
+        sal_Bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
 
         aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl();
         // Der FieldHdl muss von SdrBeginTextEdit gesetzt sein, da dor ein UpdateFields gerufen wird.
@@ -624,7 +624,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
             DBG_ASSERT( pTextObj, "svx::SdrObjEditView::BegTextEdit(), no text object?" );
             if( !pTextObj )
-                return FALSE;
+                return sal_False;
 
             // #111096# Switch off evtl. running TextAnimation
             pTextObj->SetTextAnimationAllowed(sal_False);
@@ -632,7 +632,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             // alten Cursor merken
             if (pTextEditOutliner->GetViewCount()!=0)
             {
-                OutlinerView* pTmpOLV=pTextEditOutliner->RemoveView(ULONG(0));
+                OutlinerView* pTmpOLV=pTextEditOutliner->RemoveView(sal_uIntPtr(0));
                 if(pTmpOLV!=NULL && pTmpOLV!=pGivenOutlinerView)
                     delete pTmpOLV;
             }
@@ -644,8 +644,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
 
             Rectangle aTextRect;
             Rectangle aAnchorRect;
-            pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, TRUE,
-                &aAnchorRect /* #97097# Give TRUE here, not FALSE */);
+            pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, sal_True,
+                &aAnchorRect /* #97097# Give sal_True here, not sal_False */);
 
             if ( !pTextObj->IsContourTextFrame() )
             {
@@ -664,7 +664,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y());
             pTextEditCursorMerker=pWin->GetCursor();
 
-            aHdl.SetMoveOutside(TRUE);
+            aHdl.SetMoveOutside(sal_True);
 
             // #i72757#
             // Since IsMarkHdlWhenTextEdit() is ignored, it is necessary
@@ -674,7 +674,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             pTextEditOutlinerView=ImpMakeOutlinerView(pWin,!bEmpty,pGivenOutlinerView);
 
             // check if this view is already inserted
-            ULONG i2,nCount = pTextEditOutliner->GetViewCount();
+            sal_uIntPtr i2,nCount = pTextEditOutliner->GetViewCount();
             for( i2 = 0; i2 < nCount; i2++ )
             {
                 if( pTextEditOutliner->GetView(i2) == pTextEditOutlinerView )
@@ -684,8 +684,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             if( i2 == nCount )
                 pTextEditOutliner->InsertView(pTextEditOutlinerView,0);
 
-            aHdl.SetMoveOutside(FALSE);
-            aHdl.SetMoveOutside(TRUE);
+            aHdl.SetMoveOutside(sal_False);
+            aHdl.SetMoveOutside(sal_True);
             //OLMRefreshAllIAOManagers();
 
             // alle Wins als OutlinerView beim Outliner anmelden
@@ -786,7 +786,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
     //HMHif (bMarkHdlWhenTextEdit) {
     //HMH    HideMarkHdl();
     //HMH}
-    aHdl.SetMoveOutside(FALSE);
+    aHdl.SetMoveOutside(sal_False);
     //HMHShowMarkHdl();
 
     return sal_False;
@@ -819,7 +819,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
 
     if (pTEOutliner!=NULL)
     {
-        BOOL bModified=pTEOutliner->IsModified();
+        sal_Bool bModified=pTEOutliner->IsModified();
         if (pTEOutlinerView!=NULL)
         {
             pTEOutlinerView->HideCursor();
@@ -873,7 +873,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
             }
             // Loeschung des gesamten TextObj checken
             SdrUndoAction* pDelUndo=NULL;
-            BOOL bDelObj=FALSE;
+            sal_Bool bDelObj=sal_False;
             SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pTEObj);
             if (pTextObj!=NULL && bTextEditNewObj)
             {
@@ -937,11 +937,11 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
             AdjustMarkHdl();
         }
         // alle OutlinerViews loeschen
-        for (ULONG i=pTEOutliner->GetViewCount(); i>0;)
+        for (sal_uIntPtr i=pTEOutliner->GetViewCount(); i>0;)
         {
             i--;
             OutlinerView* pOLV=pTEOutliner->GetView(i);
-            USHORT nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i#
+            sal_uInt16 nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i#
             Window* pWin=pOLV->GetWindow();
             Rectangle aRect(pOLV->GetOutputArea());
             pTEOutliner->RemoveView(i);
@@ -980,7 +980,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
 //HMH        if (bMarkHdlWhenTextEdit) {
 //HMH            HideMarkHdl();
 //HMH        }
-        aHdl.SetMoveOutside(FALSE);
+        aHdl.SetMoveOutside(sal_False);
         if (eRet!=SDRENDTEXTEDIT_UNCHANGED)
 //HMH       {
 //HMH            ShowMarkHdl(); // Handles kommen ansonsten via Broadcast
@@ -1032,8 +1032,8 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const
     if (pWin==NULL) return NULL;
     if (pTextEditOutliner==NULL) return NULL;
     OutlinerView* pNewView=NULL;
-    ULONG nWinAnz=pTextEditOutliner->GetViewCount();
-    for (ULONG i=0; i<nWinAnz && pNewView==NULL; i++) {
+    sal_uIntPtr nWinAnz=pTextEditOutliner->GetViewCount();
+    for (sal_uIntPtr i=0; i<nWinAnz && pNewView==NULL; i++) {
         OutlinerView* pView=pTextEditOutliner->GetView(i);
         if (pView->GetWindow()==pWin) pNewView=pView;
     }
@@ -1060,9 +1060,9 @@ void SdrObjEditView::SetTextEditWin(Window* pWin)
     }
 }
 
-BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
+sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
 {
-    BOOL bOk=FALSE;
+    sal_Bool bOk=sal_False;
     if(mxTextEditObj.is())
     {
         nTol=ImpGetHitTolLogic(nTol,NULL);
@@ -1098,9 +1098,9 @@ BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
     return bOk;
 }
 
-BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
+sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
 {
-    BOOL bOk=FALSE;
+    sal_Bool bOk=sal_False;
     if(mxTextEditObj.is())
     {
         SdrTextObj* pText= dynamic_cast<SdrTextObj*>(mxTextEditObj.get());
@@ -1109,7 +1109,7 @@ BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
         {
             Window* pWin=pOLV->GetWindow();
             if (pText!=NULL && pText->IsTextFrame() && pOLV!=NULL && pWin!=NULL) {
-                USHORT nPixSiz=pOLV->GetInvalidateMore();
+                sal_uInt16 nPixSiz=pOLV->GetInvalidateMore();
                 Rectangle aEditArea(aMinTextEditArea);
                 aEditArea.Union(pOLV->GetOutputArea());
                 if (!aEditArea.IsInside(rHit)) {
@@ -1146,7 +1146,7 @@ void SdrObjEditView::AddTextEditOfs(MouseEvent& rMEvt) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
 {
     if(pTextEditOutlinerView)
     {
@@ -1175,16 +1175,16 @@ BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
             if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
             ImpMakeTextCursorAreaVisible();
-            return TRUE;
+            return sal_True;
         }
     }
     return SdrGlueEditView::KeyInput(rKEvt,pWin);
 }
 
-BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
 {
     if (pTextEditOutlinerView!=NULL) {
-        BOOL bPostIt=pTextEditOutliner->IsInSelectionMode();
+        sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode();
         if (!bPostIt) {
             Point aPt(rMEvt.GetPosPixel());
             if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1206,17 +1206,17 @@ BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
                 if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
                 ImpMakeTextCursorAreaVisible();
-                return TRUE;
+                return sal_True;
             }
         }
     }
     return SdrGlueEditView::MouseButtonDown(rMEvt,pWin);
 }
 
-BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
 {
     if (pTextEditOutlinerView!=NULL) {
-        BOOL bPostIt=pTextEditOutliner->IsInSelectionMode();
+        sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode();
         if (!bPostIt) {
             Point aPt(rMEvt.GetPosPixel());
             if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1237,18 +1237,18 @@ BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
                 if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
                 ImpMakeTextCursorAreaVisible();
-                return TRUE;
+                return sal_True;
             }
         }
     }
     return SdrGlueEditView::MouseButtonUp(rMEvt,pWin);
 }
 
-BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     if (pTextEditOutlinerView!=NULL) {
-        BOOL bSelMode=pTextEditOutliner->IsInSelectionMode();
-        BOOL bPostIt=bSelMode;
+        sal_Bool bSelMode=pTextEditOutliner->IsInSelectionMode();
+        sal_Bool bPostIt=bSelMode;
         if (!bPostIt) {
             Point aPt(rMEvt.GetPosPixel());
             if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1269,21 +1269,21 @@ BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
                 if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
                 ImpMakeTextCursorAreaVisible();
-                return TRUE;
+                return sal_True;
             }
         }
     }
     return SdrGlueEditView::MouseMove(rMEvt,pWin);
 }
 
-BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
+sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
 {
-    // solange bis die OutlinerView einen BOOL zurueckliefert
+    // solange bis die OutlinerView einen sal_Bool zurueckliefert
     // bekommt sie nur COMMAND_STARTDRAG
     if (pTextEditOutlinerView!=NULL)
     {
         if (rCEvt.GetCommand()==COMMAND_STARTDRAG) {
-            BOOL bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
+            sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
             if (!bPostIt && rCEvt.IsMouseEvent()) {
                 Point aPt(rCEvt.GetMousePosPixel());
                 if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1307,19 +1307,19 @@ BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
                 if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
                 ImpMakeTextCursorAreaVisible();
-                return TRUE;
+                return sal_True;
             }
         }
         else // if (rCEvt.GetCommand() == COMMAND_VOICE )
         {
             pTextEditOutlinerView->Command(rCEvt);
-            return TRUE;
+            return sal_True;
         }
     }
     return SdrGlueEditView::Command(rCEvt,pWin);
 }
 
-BOOL SdrObjEditView::Cut(ULONG nFormat)
+sal_Bool SdrObjEditView::Cut(sal_uIntPtr nFormat)
 {
     if (pTextEditOutliner!=NULL) {
         pTextEditOutlinerView->Cut();
@@ -1327,23 +1327,23 @@ BOOL SdrObjEditView::Cut(ULONG nFormat)
         if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
         ImpMakeTextCursorAreaVisible();
-        return TRUE;
+        return sal_True;
     } else {
         return SdrGlueEditView::Cut(nFormat);
     }
 }
 
-BOOL SdrObjEditView::Yank(ULONG nFormat)
+sal_Bool SdrObjEditView::Yank(sal_uIntPtr nFormat)
 {
     if (pTextEditOutliner!=NULL) {
         pTextEditOutlinerView->Copy();
-        return TRUE;
+        return sal_True;
     } else {
         return SdrGlueEditView::Yank(nFormat);
     }
 }
 
-BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
+sal_Bool SdrObjEditView::Paste(Window* pWin, sal_uIntPtr nFormat)
 {
     if (pTextEditOutliner!=NULL) {
         if (pWin!=NULL) {
@@ -1358,7 +1358,7 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
         if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
         ImpMakeTextCursorAreaVisible();
-        return TRUE;
+        return sal_True;
     } else {
         return SdrGlueEditView::Paste(pWin,nFormat);
     }
@@ -1366,9 +1366,9 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrObjEditView::ImpIsTextEditAllSelected() const
+sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     if (pTextEditOutliner!=NULL && pTextEditOutlinerView!=NULL)
     {
         if(SdrTextObj::HasTextImpl( pTextEditOutliner ) )
@@ -1377,25 +1377,25 @@ BOOL SdrObjEditView::ImpIsTextEditAllSelected() const
             Paragraph* pLastPara=pTextEditOutliner->GetParagraph( nParaAnz > 1 ? nParaAnz - 1 : 0 );
 
             ESelection aESel(pTextEditOutlinerView->GetSelection());
-            if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==USHORT(nParaAnz-1))
+            if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==sal_uInt16(nParaAnz-1))
             {
                 XubString aStr(pTextEditOutliner->GetText(pLastPara));
 
                 if(aStr.Len() == aESel.nEndPos)
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
             // und nun auch noch fuer den Fall, das rueckwaerts selektiert wurde
-            if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==USHORT(nParaAnz-1))
+            if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==sal_uInt16(nParaAnz-1))
             {
                 XubString aStr(pTextEditOutliner->GetText(pLastPara));
 
                 if(aStr.Len() == aESel.nStartPos)
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
         }
         else
         {
-            bRet=TRUE;
+            bRet=sal_True;
         }
     }
     return bRet;
@@ -1414,9 +1414,9 @@ void SdrObjEditView::ImpMakeTextCursorAreaVisible()
     }
 }
 
-USHORT SdrObjEditView::GetScriptType() const
+sal_uInt16 SdrObjEditView::GetScriptType() const
 {
-    USHORT nScriptType = 0;
+    sal_uInt16 nScriptType = 0;
 
     if( IsTextEdit() )
     {
@@ -1448,11 +1448,11 @@ USHORT SdrObjEditView::GetScriptType() const
 }
 
 /* new interface src537 */
-BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if( mxSelectionController.is() )
         if( mxSelectionController->GetAttributes( rTargetSet, bOnlyHardAttr ) )
-            return TRUE;
+            return sal_True;
 
     if(IsTextEdit())
     {
@@ -1472,8 +1472,8 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
         if(pTextEditOutlinerView)
         {
             // FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten
-            rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE);
-            rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE );
+            rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
+            rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
         }
 
         if(GetMarkedObjectCount()==1 && GetMarkedObjectByIndex(0)==mxTextEditObj.get())
@@ -1481,7 +1481,7 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
             MergeNotPersistAttrFromMarked(rTargetSet, bOnlyHardAttr);
         }
 
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -1489,11 +1489,11 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
     }
 }
 
-BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
-    BOOL bRet=FALSE;
-    BOOL bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
-    BOOL bAllTextSelected=ImpIsTextEditAllSelected();
+    sal_Bool bRet=sal_False;
+    sal_Bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
+    sal_Bool bAllTextSelected=ImpIsTextEditAllSelected();
     SfxItemSet* pModifiedSet=NULL;
     const SfxItemSet* pSet=&rSet;
     //const SvxAdjustItem* pParaJust=NULL;
@@ -1513,16 +1513,16 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
     {
 #ifdef DBG_UTIL
         {
-            BOOL bHasEEFeatureItems=FALSE;
+            sal_Bool bHasEEFeatureItems=sal_False;
             SfxItemIter aIter(rSet);
             const SfxPoolItem* pItem=aIter.FirstItem();
             while (!bHasEEFeatureItems && pItem!=NULL)
             {
                 if (!IsInvalidItem(pItem))
                 {
-                    USHORT nW=pItem->Which();
+                    sal_uInt16 nW=pItem->Which();
                     if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END)
-                        bHasEEFeatureItems=TRUE;
+                        bHasEEFeatureItems=sal_True;
                 }
 
                 pItem=aIter.NextItem();
@@ -1537,8 +1537,8 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
         }
 #endif
 
-        BOOL bOnlyEEItems;
-        BOOL bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
+        sal_Bool bOnlyEEItems;
+        sal_Bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
         // alles selektiert? -> Attrs auch an den Rahmen
         // und falls keine EEItems, dann Attrs nur an den Rahmen
         if (bAllTextSelected || bNoEEItems)
@@ -1572,7 +1572,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
                 mxTextEditObj->SetMergedItemSetAndBroadcast(*pSet, bReplaceAll);
 
                 FlushComeBackTimer(); // Damit ModeHasChanged sofort kommt
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
         else if (!bOnlyEEItems)
@@ -1580,15 +1580,15 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
             // sonst Set ggf. splitten
             // Es wird nun ein ItemSet aSet gemacht, in den die EE_Items von
             // *pSet nicht enhalten ist (ansonsten ist es eine Kopie).
-            USHORT* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END);
+            sal_uInt16* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END);
             SfxItemSet aSet(pMod->GetItemPool(),pNewWhichTable);
             /*90353*/ delete[] pNewWhichTable;
             SfxWhichIter aIter(aSet);
-            USHORT nWhich=aIter.FirstWhich();
+            sal_uInt16 nWhich=aIter.FirstWhich();
             while (nWhich!=0)
             {
                 const SfxPoolItem* pItem;
-                SfxItemState eState=pSet->GetItemState(nWhich,FALSE,&pItem);
+                SfxItemState eState=pSet->GetItemState(nWhich,sal_False,&pItem);
                 if (eState==SFX_ITEM_SET) aSet.Put(*pItem);
                 nWhich=aIter.NextWhich();
             }
@@ -1617,14 +1617,14 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
                 }
             }
             FlushComeBackTimer();
-            bRet=TRUE;
+            bRet=sal_True;
         }
         if(!bNoEEItems)
         {
             // und nun die Attribute auch noch an die EditEngine
             if (bReplaceAll) {
                 // Am Outliner kann man leider nur alle Attribute platthauen
-                pTextEditOutlinerView->RemoveAttribs( TRUE );
+                pTextEditOutlinerView->RemoveAttribs( sal_True );
             }
             pTextEditOutlinerView->SetAttribs(rSet);
 
@@ -1635,7 +1635,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
 
             ImpMakeTextCursorAreaVisible();
         }
-        bRet=TRUE;
+        bRet=sal_True;
     }
     if (pModifiedSet!=NULL)
         delete pModifiedSet;
@@ -1663,12 +1663,12 @@ SfxStyleSheet* SdrObjEditView::GetStyleSheet() const
     return pSheet;
 }
 
-BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if( mxSelectionController.is() )
     {
         if( mxSelectionController->SetStyleSheet( pStyleSheet, bDontRemoveHardAttr ) )
-            return TRUE;
+            return sal_True;
     }
 
     // if we are currently in edit mode we must also set the stylesheet
@@ -1678,8 +1678,8 @@ BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveH
     {
         Outliner* pOutliner = pTextEditOutlinerView->GetOutliner();
 
-        const ULONG nParaCount = pOutliner->GetParagraphCount();
-        ULONG nPara;
+        const sal_uIntPtr nParaCount = pOutliner->GetParagraphCount();
+        sal_uIntPtr nPara;
         for( nPara = 0; nPara < nParaCount; nPara++ )
         {
             pOutliner->SetStyleSheet( nPara, pStyleSheet );
@@ -1697,7 +1697,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin)
 
     if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW)
     {
-        OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,FALSE,NULL);
+        OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,sal_False,NULL);
         pTextEditOutliner->InsertView(pOutlView);
     }
 }
@@ -1708,7 +1708,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
 
     if(mxTextEditObj.is() && !bTextEditOnlyOneView && pOldWin->GetOutDevType()==OUTDEV_WINDOW)
     {
-        for (ULONG i=pTextEditOutliner->GetViewCount(); i>0;) {
+        for (sal_uIntPtr i=pTextEditOutliner->GetViewCount(); i>0;) {
             i--;
             OutlinerView* pOLV=pTextEditOutliner->GetView(i);
             if (pOLV && pOLV->GetWindow()==(Window*)pOldWin) {
@@ -1718,7 +1718,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
     }
 }
 
-BOOL SdrObjEditView::IsTextEditInSelectionMode() const
+sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const
 {
     return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode();
 }
@@ -1735,17 +1735,17 @@ BOOL SdrObjEditView::IsTextEditInSelectionMode() const
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin)
+sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     BrkMacroObj();
     if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) {
         nTol=ImpGetHitTolLogic(nTol,NULL);
         pMacroObj=pObj;
         pMacroPV=pPV;
         pMacroWin=pWin;
-        bMacroDown=FALSE;
-        nMacroTol=USHORT(nTol);
+        bMacroDown=sal_False;
+        nMacroTol=sal_uInt16(nTol);
         aMacroDownPos=rPnt;
         MovMacroObj(rPnt);
     }
@@ -1764,7 +1764,7 @@ void SdrObjEditView::ImpMacroUp(const Point& rUpPos)
         aHitRec.pPageView=pMacroPV;
         aHitRec.pOut=pMacroWin;
         pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec);
-        bMacroDown=FALSE;
+        bMacroDown=sal_False;
     }
 }
 
@@ -1778,10 +1778,10 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos)
         aHitRec.nTol=nMacroTol;
         aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
         aHitRec.pPageView=pMacroPV;
-        aHitRec.bDown=TRUE;
+        aHitRec.bDown=sal_True;
         aHitRec.pOut=pMacroWin;
         pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec);
-        bMacroDown=TRUE;
+        bMacroDown=sal_True;
     }
 }
 
@@ -1796,7 +1796,7 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt)
         aHitRec.pPageView=pMacroPV;
         aHitRec.bDown=bMacroDown;
         aHitRec.pOut=pMacroWin;
-        BOOL bDown=pMacroObj->IsMacroHit(aHitRec);
+        sal_Bool bDown=pMacroObj->IsMacroHit(aHitRec);
         if (bDown) ImpMacroDown(rPnt);
         else ImpMacroUp(rPnt);
     }
@@ -1812,7 +1812,7 @@ void SdrObjEditView::BrkMacroObj()
     }
 }
 
-BOOL SdrObjEditView::EndMacroObj()
+sal_Bool SdrObjEditView::EndMacroObj()
 {
     if (pMacroObj!=NULL && bMacroDown) {
         ImpMacroUp(aMacroDownPos);
@@ -1822,7 +1822,7 @@ BOOL SdrObjEditView::EndMacroObj()
         aHitRec.nTol=nMacroTol;
         aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
         aHitRec.pPageView=pMacroPV;
-        aHitRec.bDown=TRUE;
+        aHitRec.bDown=sal_True;
         aHitRec.pOut=pMacroWin;
         bool bRet=pMacroObj->DoMacro(aHitRec);
         pMacroObj=NULL;
@@ -1831,7 +1831,7 @@ BOOL SdrObjEditView::EndMacroObj()
         return bRet;
     } else {
         BrkMacroObj();
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -1924,7 +1924,7 @@ void SdrObjEditView::OnEndPasteOrDrop( PasteOrDropInfos* )
     // applications can derive from these virtual methods to do something before a drop or paste operation
 }
 
-bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const
+bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const
 {
     if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor )
         return false;
@@ -1974,9 +1974,9 @@ bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nO
     }
 }
 
-static const USHORT* GetFormatRangeImpl( bool bTextOnly )
+static const sal_uInt16* GetFormatRangeImpl( bool bTextOnly )
 {
-    static const USHORT gRanges[] = {
+    static const sal_uInt16 gRanges[] = {
         SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,
         SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST,
         SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST,
@@ -2006,7 +2006,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor
         }
         else
         {
-            const BOOL bOnlyHardAttr = FALSE;
+            const sal_Bool bOnlyHardAttr = sal_False;
             rFormatSet->Put( GetAttrFromMarked(bOnlyHardAttr) );
         }
         return true;
@@ -2015,14 +2015,14 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor
     return false;
 }
 
-static SfxItemSet CreatePaintSet( const USHORT *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats )
+static SfxItemSet CreatePaintSet( const sal_uInt16 *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats )
 {
     SfxItemSet aPaintSet( rPool, pRanges );
 
     while( *pRanges )
     {
-        USHORT nWhich = *pRanges++;
-        const USHORT nLastWhich = *pRanges++;
+        sal_uInt16 nWhich = *pRanges++;
+        const sal_uInt16 nLastWhich = *pRanges++;
 
         if( bNoCharacterFormats && (nWhich == EE_CHAR_START) )
             continue;
@@ -2091,7 +2091,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
             // All formating items (see ranges above) that are unequal in selected shape and
             // the format paintbrush are hard set on the selected shape.
 
-            const USHORT* pRanges = rFormatSet.GetRanges();
+            const sal_uInt16* pRanges = rFormatSet.GetRanges();
             bool bTextOnly = true;
 
             while( *pRanges )
@@ -2107,7 +2107,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
             if( !bTextOnly )
             {
                 SfxItemSet aPaintSet( CreatePaintSet( GetFormatRangeImpl(false), *rShapeSet.GetPool(), rFormatSet, rShapeSet, bNoCharacterFormats, bNoParagraphFormats ) );
-                const BOOL bReplaceAll = FALSE;
+                const sal_Bool bReplaceAll = sal_False;
                 SetAttrToMarked(aPaintSet, bReplaceAll);
             }
 
@@ -2135,7 +2135,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
                 if( !aSel.HasRange() )
                     pOLV->SetSelection( rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ) );
 
-                const BOOL bRemoveParaAttribs = !bNoParagraphFormats;
+                const sal_Bool bRemoveParaAttribs = !bNoParagraphFormats;
                 pOLV->RemoveAttribsKeepLanguages( bRemoveParaAttribs );
                 SfxItemSet aSet( pOLV->GetAttribs() );
                 SfxItemSet aPaintSet( CreatePaintSet(GetFormatRangeImpl(true), *aSet.GetPool(), rFormatSet, aSet, bNoCharacterFormats, bNoParagraphFormats ) );
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 74d0cf6046da..b68909ffa99a 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -151,8 +151,8 @@ void OLEObjCache::UnloadOnDemand()
     {
         // more objects than configured cache size try to remove objects
         // of course not the freshly inserted one at nIndex=0
-        ULONG nCount2 = Count();
-        ULONG nIndex = nCount2-1;
+        sal_uIntPtr nCount2 = Count();
+        sal_uIntPtr nIndex = nCount2-1;
         while( nIndex && nCount2 > nSize )
         {
             SdrOle2Obj* pUnloadObj = (SdrOle2Obj*) GetObject(nIndex--);
@@ -171,7 +171,7 @@ void OLEObjCache::UnloadOnDemand()
                         uno::Reference< frame::XModel > xUnloadModel( xUnloadObj->getComponent(), uno::UNO_QUERY );
                         if ( xUnloadModel.is() )
                         {
-                            for ( ULONG nCheckInd = 0; nCheckInd < Count(); nCheckInd++ )
+                            for ( sal_uIntPtr nCheckInd = 0; nCheckInd < Count(); nCheckInd++ )
                             {
                                 SdrOle2Obj* pCacheObj = (SdrOle2Obj*) GetObject(nCheckInd);
                                 if ( pCacheObj && pCacheObj != pUnloadObj )
@@ -195,7 +195,7 @@ void OLEObjCache::UnloadOnDemand()
     }
 }
 
-void OLEObjCache::SetSize(ULONG nNewSize)
+void OLEObjCache::SetSize(sal_uIntPtr nNewSize)
 {
     nSize = nNewSize;
 }
@@ -211,11 +211,11 @@ void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
     }
 
     // get the old position of the object to know whether it is already in container
-    ULONG nOldPos = GetPos( pObj );
+    sal_uIntPtr nOldPos = GetPos( pObj );
 
     // insert object into first position
     Remove( nOldPos );
-    Insert(pObj, (ULONG) 0L);
+    Insert(pObj, (sal_uIntPtr) 0L);
 
     if ( nOldPos == CONTAINER_ENTRY_NOTFOUND )
     {
@@ -229,9 +229,9 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj)
     Remove(pObj);
 }
 
-BOOL OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
+sal_Bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
 {
-    BOOL bUnloaded = FALSE;
+    sal_Bool bUnloaded = sal_False;
     if (pObj)
     {
         //#i80528# The old mechanism is completely useless, only taking into account if
@@ -259,9 +259,9 @@ IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, /*pTim*/)
     return 0;
 }
 
-void ContainerSorter::DoSort(ULONG a, ULONG b) const
+void ContainerSorter::DoSort(sal_uIntPtr a, sal_uIntPtr b) const
 {
-    ULONG nAnz=rCont.Count();
+    sal_uIntPtr nAnz=rCont.Count();
     if (b>nAnz) b=nAnz;
     if (b>0) b--;
     if (a<b) ImpSubSort(a,b);
@@ -306,8 +306,8 @@ public:
 
 int ImpUShortContainerSorter::Compare(const void* pElem1, const void* pElem2) const
 {
-    USHORT n1=USHORT(ULONG(pElem1));
-    USHORT n2=USHORT(ULONG(pElem2));
+    sal_uInt16 n1=sal_uInt16(sal_uIntPtr(pElem1));
+    sal_uInt16 n2=sal_uInt16(sal_uIntPtr(pElem2));
     return n1<n2 ? -1 : n1>n2 ? 1 : 0;
 }
 
@@ -329,10 +329,10 @@ public:
         // Kein Clipping in die Metafileaufzeichnung
         GDIMetaFile* pMtf=rOut.GetConnectMetaFile();
         if (pMtf!=NULL && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf=NULL;
-        if (pMtf!=NULL) pMtf->Pause(TRUE);
+        if (pMtf!=NULL) pMtf->Pause(sal_True);
         if (bClip) rOut.SetClipRegion(aClip);
         else rOut.SetClipRegion();
-        if (pMtf!=NULL) pMtf->Pause(FALSE);
+        if (pMtf!=NULL) pMtf->Pause(sal_False);
     }
 };
 
@@ -348,7 +348,7 @@ public:
         aBckgrdColor( rOut.GetBackground().GetColor() ),
         aFont (rOut.GetFont()) {}
 
-    ImpColorMerk(const OutputDevice& rOut, USHORT nMode)
+    ImpColorMerk(const OutputDevice& rOut, sal_uInt16 nMode)
     {
         if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN )
             aLineColor = rOut.GetLineColor();
@@ -363,7 +363,7 @@ public:
             aFont=rOut.GetFont();
     }
 
-    void Restore(OutputDevice& rOut, USHORT nMode=SDRHDC_SAVEPENANDBRUSHANDFONT)
+    void Restore(OutputDevice& rOut, sal_uInt16 nMode=SDRHDC_SAVEPENANDBRUSHANDFONT)
     {
         if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN)
             rOut.SetLineColor( aLineColor );
@@ -385,7 +385,7 @@ public:
     const Color& GetLineColor() const { return aLineColor; }
 };
 
-ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode, FASTBOOL bAutoMerk):
+ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, FASTBOOL bAutoMerk):
     pFarbMerk(NULL),
     pClipMerk(NULL),
     pLineColorMerk(NULL),
@@ -421,7 +421,7 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut)
     if ((nMode & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING)
         pClipMerk=new ImpClipMerk(rOut);
 
-    USHORT nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
+    sal_uInt16 nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
 
     if (nCol==SDRHDC_SAVEPEN)
         pLineColorMerk=new Color( rOut.GetLineColor() );
@@ -431,14 +431,14 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut)
         pFarbMerk=new ImpColorMerk(rOut,nCol);
 }
 
-void ImpSdrHdcMerk::Restore(OutputDevice& rOut, USHORT nMask) const
+void ImpSdrHdcMerk::Restore(OutputDevice& rOut, sal_uInt16 nMask) const
 {
     nMask&=nMode; // nur restaurieren, was auch gesichert wurde
 
     if ((nMask & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING && pClipMerk!=NULL)
         pClipMerk->Restore(rOut);
 
-    USHORT nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT;
+    sal_uInt16 nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT;
 
     if (nCol==SDRHDC_SAVEPEN)
     {
@@ -501,14 +501,14 @@ void SdrLinkList::RemoveLink(const Link& rLink)
 FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
 {
     XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue();
-    FASTBOOL bRetval(FALSE);
+    FASTBOOL bRetval(sal_False);
 
     switch(eFill)
     {
         case XFILL_SOLID:
         {
             rCol = ((XFillColorItem&)rSet.Get(XATTR_FILLCOLOR)).GetColorValue();
-            bRetval = TRUE;
+            bRetval = sal_True;
 
             break;
         }
@@ -526,7 +526,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
 
             const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor()));
             rCol = Color(aAverageColor);
-            bRetval = TRUE;
+            bRetval = sal_True;
 
             break;
         }
@@ -536,7 +536,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
             Color aCol2(rGrad.GetEndColor());
             const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor()));
             rCol = Color(aAverageColor);
-            bRetval = TRUE;
+            bRetval = sal_True;
 
             break;
         }
@@ -564,7 +564,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
                     for(sal_uInt32 nX(0L); nX < nWidth; nX += nXStep)
                     {
                         const BitmapColor& rCol2 = (pAccess->HasPalette())
-                            ? pAccess->GetPaletteColor((BYTE)pAccess->GetPixel(nY, nX))
+                            ? pAccess->GetPaletteColor((sal_uInt8)pAccess->GetPixel(nY, nX))
                             : pAccess->GetPixel(nY, nX);
 
                         nRt += rCol2.GetRed();
@@ -578,9 +578,9 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
                 nGn /= nAnz;
                 nBl /= nAnz;
 
-                rCol = Color(UINT8(nRt), UINT8(nGn), UINT8(nBl));
+                rCol = Color(sal_uInt8(nRt), sal_uInt8(nGn), sal_uInt8(nBl));
 
-                bRetval = TRUE;
+                bRetval = sal_True;
             }
 
             if(pAccess)
@@ -630,7 +630,7 @@ void SdrEngineDefaults::LanguageHasChanged()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel )
+SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel )
 {
     //SdrEngineDefaults& rDefaults = SdrEngineDefaults::GetDefaults();
 
@@ -697,47 +697,47 @@ String GetResourceString(sal_uInt16 nResID)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE)
+sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE)
 {
-    BOOL bHas=FALSE;
-    BOOL bOnly=TRUE;
-    BOOL bLookOnly=pbOnlyEE!=NULL;
+    sal_Bool bHas=sal_False;
+    sal_Bool bOnly=sal_True;
+    sal_Bool bLookOnly=pbOnlyEE!=NULL;
     SfxWhichIter aIter(rSet);
-    USHORT nWhich=aIter.FirstWhich();
+    sal_uInt16 nWhich=aIter.FirstWhich();
     while (((bLookOnly && bOnly) || !bHas) && nWhich!=0) {
         // bei bInklDefaults ist der gesamte Which-Range
         // ausschlaggebend, ansonsten nur die gesetzten Items
         // Disabled und DontCare wird als Loch im Which-Range betrachtet
         SfxItemState eState=rSet.GetItemState(nWhich);
         if ((eState==SFX_ITEM_DEFAULT && bInklDefaults) || eState==SFX_ITEM_SET) {
-            if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=FALSE;
-            else bHas=TRUE;
+            if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=sal_False;
+            else bHas=sal_True;
         }
         nWhich=aIter.NextWhich();
     }
-    if (!bHas) bOnly=FALSE;
+    if (!bHas) bOnly=sal_False;
     if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly;
     return bHas;
 }
 
-USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd)
+sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd)
 {
     // insgesamt sind 6 Faelle moeglich (je Range):
     //         [Beg..End]          zu entfernender Range
     // [b..e]    [b..e]    [b..e]  Fall 1,3,2: egal, ganz weg, egal  + Ranges
     // [b........e]  [b........e]  Fall 4,5  : Bereich verkleinern   | in
     // [b......................e]  Fall 6    : Splitting             + pOldWhichTable
-    USHORT nAnz=0;
+    sal_uInt16 nAnz=0;
     while (pOldWhichTable[nAnz]!=0) nAnz++;
     nAnz++; // nAnz muesste nun in jedem Fall eine ungerade Zahl sein (0 am Ende des Arrays)
     DBG_ASSERT((nAnz&1)==1,"Joe: RemoveWhichRange: WhichTable hat keine ungerade Anzahl von Eintraegen");
-    USHORT nAlloc=nAnz;
+    sal_uInt16 nAlloc=nAnz;
     // benoetigte Groesse des neuen Arrays ermitteln
-    USHORT nNum=nAnz-1;
+    sal_uInt16 nNum=nAnz-1;
     while (nNum!=0) {
         nNum-=2;
-        USHORT nBeg=pOldWhichTable[nNum];
-        USHORT nEnd=pOldWhichTable[nNum+1];
+        sal_uInt16 nBeg=pOldWhichTable[nNum];
+        sal_uInt16 nEnd=pOldWhichTable[nNum+1];
         if (nEnd<nRangeBeg)  /*nCase=1*/ ;
         else if (nBeg>nRangeEnd) /* nCase=2 */ ;
         else if (nBeg>=nRangeBeg && nEnd<=nRangeEnd) /* nCase=3 */ nAlloc-=2;
@@ -746,15 +746,15 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT
         else /* nCase=6 */ nAlloc+=2;
     }
 
-    USHORT* pNewWhichTable=new USHORT[nAlloc];
-    memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(USHORT));
+    sal_uInt16* pNewWhichTable=new sal_uInt16[nAlloc];
+    memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(sal_uInt16));
     pNewWhichTable[nAlloc-1]=0; // im Falle 3 fehlt die 0 am Ende
     // nun die unerwuenschten Ranges entfernen
     nNum=nAlloc-1;
     while (nNum!=0) {
         nNum-=2;
-        USHORT nBeg=pNewWhichTable[nNum];
-        USHORT nEnd=pNewWhichTable[nNum+1];
+        sal_uInt16 nBeg=pNewWhichTable[nNum];
+        sal_uInt16 nEnd=pNewWhichTable[nNum+1];
         unsigned nCase=0;
         if (nEnd<nRangeBeg) nCase=1;
         else if (nBeg>nRangeEnd) nCase=2;
@@ -764,14 +764,14 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT
         else nCase=6;
         switch (nCase) {
             case 3: {
-                unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT);
+                unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16);
                 memcpy(&pNewWhichTable[nNum],&pNewWhichTable[nNum+2],nTailBytes);
                 nAnz-=2; // Merken: Array hat sich verkleinert
             } break;
             case 4: pNewWhichTable[nNum+1]=nRangeBeg-1; break;
             case 5: pNewWhichTable[nNum]=nRangeEnd+1;     break;
             case 6: {
-                unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT);
+                unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16);
                 memcpy(&pNewWhichTable[nNum+4],&pNewWhichTable[nNum+2],nTailBytes);
                 nAnz+=2; // Merken: Array hat sich vergroessert
                 pNewWhichTable[nNum+2]=nRangeEnd+1;
@@ -803,13 +803,13 @@ SvdProgressInfo::SvdProgressInfo( Link *_pLink )
     nCurInsert   = 0;
 }
 
-void SvdProgressInfo::Init( ULONG _nSumActionCount, ULONG _nObjCount )
+void SvdProgressInfo::Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount )
 {
     nSumActionCount = _nSumActionCount;
     nObjCount = _nObjCount;
 }
 
-BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions )
+sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions )
 {
     nSumCurAction += nAnzActions;
     nCurAction += nAnzActions;
@@ -819,7 +819,7 @@ BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions )
     return pLink->Call(NULL) == 1L;
 }
 
-BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts )
+sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
 {
     nSumCurAction += nAnzInserts;
     nCurInsert += nAnzInserts;
@@ -827,23 +827,23 @@ BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts )
     return pLink->Call(NULL) == 1L;
 }
 
-BOOL SvdProgressInfo::ReportRescales( ULONG nAnzRescales )
+sal_Bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales )
 {
     nSumCurAction += nAnzRescales;
     return pLink->Call(NULL) == 1L;
 }
 
-void SvdProgressInfo::SetActionCount( ULONG _nActionCount )
+void SvdProgressInfo::SetActionCount( sal_uIntPtr _nActionCount )
 {
     nActionCount = _nActionCount;
 }
 
-void SvdProgressInfo::SetInsertCount( ULONG _nInsertCount )
+void SvdProgressInfo::SetInsertCount( sal_uIntPtr _nInsertCount )
 {
     nInsertCount = _nInsertCount;
 }
 
-BOOL SvdProgressInfo::SetNextObject()
+sal_Bool SvdProgressInfo::SetNextObject()
 {
     nActionCount = 0;
     nCurAction   = 0;
@@ -879,7 +879,7 @@ namespace
         bool bRet(false);
         bool bMaster(rList.GetPage() ? rList.GetPage()->IsMasterPage() : false);
 
-        for(ULONG no(rList.GetObjCount()); !bRet && no > 0; )
+        for(sal_uIntPtr no(rList.GetObjCount()); !bRet && no > 0; )
         {
             no--;
             SdrObject* pObj = rList.GetObj(no);
@@ -963,17 +963,17 @@ namespace
         if(!rStyleSettings.GetHighContrastMode())
         {
             // search in page
-            const USHORT SPOTCOUNT(5);
+            const sal_uInt16 SPOTCOUNT(5);
             Point aSpotPos[SPOTCOUNT];
             Color aSpotColor[SPOTCOUNT];
-            ULONG nHeight( rArea.GetSize().Height() );
-            ULONG nWidth( rArea.GetSize().Width() );
-            ULONG nWidth14  = nWidth / 4;
-            ULONG nHeight14 = nHeight / 4;
-            ULONG nWidth34  = ( 3 * nWidth ) / 4;
-            ULONG nHeight34 = ( 3 * nHeight ) / 4;
-
-            USHORT i;
+            sal_uIntPtr nHeight( rArea.GetSize().Height() );
+            sal_uIntPtr nWidth( rArea.GetSize().Width() );
+            sal_uIntPtr nWidth14  = nWidth / 4;
+            sal_uIntPtr nHeight14 = nHeight / 4;
+            sal_uIntPtr nWidth34  = ( 3 * nWidth ) / 4;
+            sal_uIntPtr nHeight34 = ( 3 * nHeight ) / 4;
+
+            sal_uInt16 i;
             for ( i = 0; i < SPOTCOUNT; i++ )
             {
                 // five spots are used
@@ -1028,14 +1028,14 @@ namespace
                 impGetSdrPageFillColor(rPage, aSpotPos[i], rTextEditPV, rTextEditPV.GetVisibleLayers(), aSpotColor[i], false);
             }
 
-            USHORT aMatch[SPOTCOUNT];
+            sal_uInt16 aMatch[SPOTCOUNT];
 
             for ( i = 0; i < SPOTCOUNT; i++ )
             {
                 // were same spot colors found?
                 aMatch[i] = 0;
 
-                for ( USHORT j = 0; j < SPOTCOUNT; j++ )
+                for ( sal_uInt16 j = 0; j < SPOTCOUNT; j++ )
                 {
                     if( j != i )
                     {
@@ -1050,7 +1050,7 @@ namespace
             // highest weight to center spot
             aBackground = aSpotColor[0];
 
-            for ( USHORT nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- )
+            for ( sal_uInt16 nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- )
             {
                 // which spot color was found most?
                 for ( i = 0; i < SPOTCOUNT; i++ )
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index f10610317578..6a207ca4cba4 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -81,10 +81,10 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel):
     nLineWidth(0),
     maLineJoin(basegfx::B2DLINEJOIN_NONE),
     maDash(XDASH_RECT, 0, 0, 0, 0, 0),
-    bFntDirty(TRUE),
-    bLastObjWasPolyWithoutLine(FALSE),bNoLine(FALSE),bNoFill(FALSE),bLastObjWasLine(FALSE)
+    bFntDirty(sal_True),
+    bLastObjWasPolyWithoutLine(sal_False),bNoLine(sal_False),bNoFill(sal_False),bLastObjWasLine(sal_False)
 {
-    aVD.EnableOutput(FALSE);
+    aVD.EnableOutput(sal_False);
 
     // #i111954# init to no fill and no line initially
     aVD.SetLineColor();
@@ -104,15 +104,15 @@ ImpSdrGDIMetaFileImport::~ImpSdrGDIMetaFileImport()
     delete pTextAttr;
 }
 
-ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
+sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
     SdrObjList& rOL,
-    ULONG nInsPos,
+    sal_uIntPtr nInsPos,
     SvdProgressInfo *pProgrInfo)
 {
     pPage = rOL.GetPage();
     GDIMetaFile* pTmpMtf=NULL;
     GDIMetaFile* pMtf = (GDIMetaFile*) &rMtf;
-    ULONG nActionAnz=pMtf->GetActionCount();
+    sal_uIntPtr nActionAnz=pMtf->GetActionCount();
     sal_Bool bError = sal_False;
 
 
@@ -148,13 +148,13 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
     if(65000 < nActionAnz)
     {
         nActionAnz = 65000;
-        bError = TRUE;
+        bError = sal_True;
     }
 
     if(pProgrInfo)
         pProgrInfo->SetActionCount(nActionAnz);
 
-    ULONG nActionsToReport = 0;
+    sal_uIntPtr nActionsToReport = 0;
 
     for( MetaAction* pAct = pMtf->FirstAction(); pAct; pAct = pMtf->NextAction() )
     {
@@ -219,7 +219,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
     // MapMode-Scaling  vornehmen
     MapScaling();
     // Objekte in vorgegebenes Rechteck hineinskalieren
-    ULONG nAnz=aTmpList.GetObjCount();
+    sal_uIntPtr nAnz=aTmpList.GetObjCount();
 
     // Beim berechnen der Fortschrittsanzeige wird GetActionCount()*3 benutzt.
     // Da in aTmpList allerdings weniger eintraege als GetActionCount()
@@ -239,7 +239,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
     // alle in aTmpList zwischengespeicherten Objekte nun in rOL ab der Position nInsPos einfuegen
     if (nInsPos>rOL.GetObjCount()) nInsPos=rOL.GetObjCount();
     SdrInsertReason aReason(SDRREASON_VIEWCALL);
-    for (ULONG i=0; i<nAnz; i++)
+    for (sal_uIntPtr i=0; i<nAnz; i++)
     {
          SdrObject* pObj=aTmpList.GetObj(i);
          rOL.NbcInsertObject(pObj,nInsPos,&aReason);
@@ -270,8 +270,8 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
 
 void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr)
 {
-    bNoLine = FALSE; bNoFill = FALSE;
-    FASTBOOL bLine=TRUE && !bForceTextAttr;
+    bNoLine = sal_False; bNoFill = sal_False;
+    FASTBOOL bLine=sal_True && !bForceTextAttr;
     FASTBOOL bFill=pObj==NULL || pObj->IsClosedObj() && !bForceTextAttr;
     FASTBOOL bText=bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL);
 
@@ -320,7 +320,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
         }
     }
     else
-        bNoLine = TRUE;
+        bNoLine = sal_True;
 
     if ( bFill )
     {
@@ -333,7 +333,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
             pFillAttr->Put(XFillStyleItem(XFILL_NONE));
     }
     else
-        bNoFill = TRUE;
+        bNoFill = sal_True;
 
     if ( bText && bFntDirty )
     {
@@ -360,7 +360,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
         pTextAttr->Put(SvxContourItem(aFnt.IsOutline(), EE_CHAR_OUTLINE));
         pTextAttr->Put(SvxColorItem(aFnt.GetColor(), EE_CHAR_COLOR));
         //... svxfont textitem svditext
-        bFntDirty=FALSE;
+        bFntDirty=sal_False;
     }
     if (pObj!=NULL)
     {
@@ -437,8 +437,8 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale )
         }
         else
         {
-            bLastObjWasPolyWithoutLine = FALSE;
-            bLastObjWasLine = FALSE;
+            bLastObjWasPolyWithoutLine = sal_False;
+            bLastObjWasLine = sal_False;
         }
     }
 }
@@ -772,7 +772,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
     if ( aFnt.GetWidth() || ( rAct.GetType() == META_STRETCHTEXT_ACTION ) )
     {
         pText->ClearMergedItem( SDRATTR_TEXT_AUTOGROWWIDTH );
-        pText->SetMergedItem( SdrTextAutoGrowHeightItem( FALSE ) );
+        pText->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) );
         // don't let the margins eat the space needed for the text
         pText->SetMergedItem ( SdrTextUpperDistItem (0));
         pText->SetMergedItem ( SdrTextLowerDistItem (0));
@@ -786,7 +786,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
     pText->SetModel( pModel );
     pText->SetLayer( nLayer );
     pText->NbcSetText( rStr );
-    SetAttributes( pText, TRUE );
+    SetAttributes( pText, sal_True );
     pText->SetSnapRect( aTextRect );
 
     if (!aFnt.IsTransparent())
@@ -927,8 +927,8 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMapModeAction& rAct)
 {
     MapScaling();
     rAct.Execute(&aVD);
-    bLastObjWasPolyWithoutLine=FALSE;
-    bLastObjWasLine=FALSE;
+    bLastObjWasPolyWithoutLine=sal_False;
+    bLastObjWasLine=sal_False;
 }
 
 void ImpSdrGDIMetaFileImport::MapScaling()
@@ -978,7 +978,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
                     aXGradient.SetGradientStyle((XGradientStyle)rGrad.GetStyle());
                     aXGradient.SetStartColor(rGrad.GetStartColor());
                     aXGradient.SetEndColor(rGrad.GetEndColor());
-                    aXGradient.SetAngle((USHORT)rGrad.GetAngle());
+                    aXGradient.SetAngle((sal_uInt16)rGrad.GetAngle());
                     aXGradient.SetBorder(rGrad.GetBorder());
                     aXGradient.SetXOffset(rGrad.GetOfsX());
                     aXGradient.SetYOffset(rGrad.GetOfsY());
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 2562b81efa8d..abe434aa215b 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -57,11 +57,11 @@ public:
     {}
 
     void Clear() { aList.Clear(); }
-    ULONG GetObjCount() const { return aList.Count(); }
-    SdrObject* GetObj(ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); }
-    SdrObject* operator[](ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); }
-    void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); }
-    void RemoveObject(ULONG nPos) { aList.Remove(nPos); }
+    sal_uLong GetObjCount() const { return aList.Count(); }
+    SdrObject* GetObj(sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); }
+    SdrObject* operator[](sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); }
+    void InsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); }
+    void RemoveObject(sal_uLong nPos) { aList.Remove(nPos); }
 };
 
 //************************************************************
@@ -74,7 +74,7 @@ protected:
     SdrObjRefList               aTmpList;
     VirtualDevice               aVD;
     Rectangle                   aScaleRect;
-    ULONG                       nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet
+    sal_uLong                       nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet
     SfxItemSet*                 pLineAttr;
     SfxItemSet*                 pFillAttr;
     SfxItemSet*                 pTextAttr;
@@ -130,19 +130,19 @@ protected:
     void DoAction(MetaFillColorAction       & rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaTextColorAction       & rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaTextFillColorAction   & rAct) { rAct.Execute(&aVD); }
-    void DoAction(MetaFontAction            & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
-    void DoAction(MetaTextAlignAction       & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
+    void DoAction(MetaFontAction            & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
+    void DoAction(MetaTextAlignAction       & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
     void DoAction(MetaClipRegionAction      & rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaRasterOpAction        & rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaPushAction            & rAct) { rAct.Execute(&aVD); }
-    void DoAction(MetaPopAction             & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
+    void DoAction(MetaPopAction             & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
     void DoAction(MetaMoveClipRegionAction  & rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaISectRectClipRegionAction& rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaISectRegionClipRegionAction& rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaCommentAction& rAct, GDIMetaFile* pMtf);
 
     void ImportText( const Point& rPos, const XubString& rStr, const MetaAction& rAct );
-    void SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr=FALSE);
+    void SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr=sal_False);
     void InsertObj( SdrObject* pObj, sal_Bool bScale = sal_True );
     void MapScaling();
 
@@ -153,7 +153,7 @@ protected:
 public:
     ImpSdrGDIMetaFileImport(SdrModel& rModel);
     ~ImpSdrGDIMetaFileImport();
-    ULONG DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, ULONG nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL);
+    sal_uLong DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, sal_uLong nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL);
     void SetLayer(SdrLayerID nLay) { nLayer=nLay; }
     SdrLayerID GetLayer() const { return nLayer; }
     void SetScaleRect(const Rectangle& rRect) { aScaleRect=rRect; }
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index e90d1972a4cd..a9c1e387d46e 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -57,14 +57,14 @@ SdrGlueEditView::~SdrGlueEditView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
+void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
 {
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         if (nPtAnz!=0) {
             SdrGluePointList* pGPL=NULL;
             if (bConst) {
@@ -78,10 +78,10 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co
                 if(!bConst && IsUndoEnabled() )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
-                for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+                for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
                 {
-                    USHORT nPtId=pPts->GetObject(nPtNum);
-                    USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+                    sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+                    sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
                     if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
                     {
                         SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
@@ -103,38 +103,38 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co
 
 static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*)
 {
-    USHORT& nRet=*(USHORT*)pnRet;
-    BOOL& bFirst=*(BOOL*)pbFirst;
+    sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+    sal_Bool& bFirst=*(sal_Bool*)pbFirst;
     if (nRet!=FUZZY) {
-        USHORT nEsc=rGP.GetEscDir();
-        BOOL bOn=(nEsc & *(USHORT*)pnThisEsc)!=0;
-        if (bFirst) { nRet=bOn; bFirst=FALSE; }
+        sal_uInt16 nEsc=rGP.GetEscDir();
+        sal_Bool bOn=(nEsc & *(sal_uInt16*)pnThisEsc)!=0;
+        if (bFirst) { nRet=bOn; bFirst=sal_False; }
         else if (nRet!=bOn) nRet=FUZZY;
     }
 }
 
-TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(USHORT nThisEsc) const
+TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const
 {
     ForceUndirtyMrkPnt();
-    BOOL bFirst=TRUE;
-    USHORT nRet=FALSE;
-    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,TRUE,&bFirst,&nThisEsc,&nRet);
+    sal_Bool bFirst=sal_True;
+    sal_uInt16 nRet=sal_False;
+    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,sal_True,&bFirst,&nThisEsc,&nRet);
     return (TRISTATE)nRet;
 }
 
 static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*)
 {
-    USHORT nEsc=rGP.GetEscDir();
-    if (*(BOOL*)pbOn) nEsc|=*(USHORT*)pnThisEsc;
-    else nEsc&=~*(USHORT*)pnThisEsc;
+    sal_uInt16 nEsc=rGP.GetEscDir();
+    if (*(sal_Bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc;
+    else nEsc&=~*(sal_uInt16*)pnThisEsc;
     rGP.SetEscDir(nEsc);
 }
 
-void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn)
+void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn)
 {
     ForceUndirtyMrkPnt();
     BegUndo(ImpGetResStr(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints());
-    ImpDoMarkedGluePoints(ImpSetEscDir,FALSE,&nThisEsc,&bOn);
+    ImpDoMarkedGluePoints(ImpSetEscDir,sal_False,&nThisEsc,&bOn);
     EndUndo();
 }
 
@@ -142,11 +142,11 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn)
 
 static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*)
 {
-    USHORT& nRet=*(USHORT*)pnRet;
-    BOOL& bFirst=*(BOOL*)pbFirst;
+    sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+    sal_Bool& bFirst=*(sal_Bool*)pbFirst;
     if (nRet!=FUZZY) {
         bool bOn=rGP.IsPercent();
-        if (bFirst) { nRet=bOn; bFirst=FALSE; }
+        if (bFirst) { nRet=bOn; bFirst=sal_False; }
         else if ((nRet!=0)!=bOn) nRet=FUZZY;
     }
 }
@@ -154,24 +154,24 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo
 TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const
 {
     ForceUndirtyMrkPnt();
-    BOOL bFirst=TRUE;
-    USHORT nRet=TRUE;
-    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,TRUE,&bFirst,&nRet);
+    sal_Bool bFirst=sal_True;
+    sal_uInt16 nRet=sal_True;
+    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,sal_True,&bFirst,&nRet);
     return (TRISTATE)nRet;
 }
 
 static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*)
 {
     Point aPos(rGP.GetAbsolutePos(*pObj));
-    rGP.SetPercent(*(BOOL*)pbOn);
+    rGP.SetPercent(*(sal_Bool*)pbOn);
     rGP.SetAbsolutePos(aPos,*pObj);
 }
 
-void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn)
+void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn)
 {
     ForceUndirtyMrkPnt();
     BegUndo(ImpGetResStr(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints());
-    ImpDoMarkedGluePoints(ImpSetPercent,FALSE,&bOn);
+    ImpDoMarkedGluePoints(ImpSetPercent,sal_False,&bOn);
     EndUndo();
 }
 
@@ -179,61 +179,61 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn)
 
 static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*)
 {
-    USHORT& nRet=*(USHORT*)pnRet;
-    BOOL& bFirst=*(BOOL*)pbFirst;
-    BOOL& bDontCare=*(BOOL*)pbDontCare;
-    BOOL bVert=*(BOOL*)pbVert;
+    sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+    sal_Bool& bFirst=*(sal_Bool*)pbFirst;
+    sal_Bool& bDontCare=*(sal_Bool*)pbDontCare;
+    sal_Bool bVert=*(sal_Bool*)pbVert;
     if (!bDontCare) {
-        USHORT nAlg=0;
+        sal_uInt16 nAlg=0;
         if (bVert) {
             nAlg=rGP.GetVertAlign();
         } else {
             nAlg=rGP.GetHorzAlign();
         }
-        if (bFirst) { nRet=nAlg; bFirst=FALSE; }
+        if (bFirst) { nRet=nAlg; bFirst=sal_False; }
         else if (nRet!=nAlg) {
             if (bVert) {
                 nRet=SDRVERTALIGN_DONTCARE;
             } else {
                 nRet=SDRHORZALIGN_DONTCARE;
             }
-            bDontCare=TRUE;
+            bDontCare=sal_True;
         }
     }
 }
 
-USHORT SdrGlueEditView::GetMarkedGluePointsAlign(BOOL bVert) const
+sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(sal_Bool bVert) const
 {
     ForceUndirtyMrkPnt();
-    BOOL bFirst=TRUE;
-    BOOL bDontCare=FALSE;
-    USHORT nRet=0;
-    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,TRUE,&bFirst,&bDontCare,&bVert,&nRet);
+    sal_Bool bFirst=sal_True;
+    sal_Bool bDontCare=sal_False;
+    sal_uInt16 nRet=0;
+    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,sal_True,&bFirst,&bDontCare,&bVert,&nRet);
     return nRet;
 }
 
 static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*, const void*)
 {
     Point aPos(rGP.GetAbsolutePos(*pObj));
-    if (*(BOOL*)pbVert) { // bVert?
-        rGP.SetVertAlign(*(USHORT*)pnAlign);
+    if (*(sal_Bool*)pbVert) { // bVert?
+        rGP.SetVertAlign(*(sal_uInt16*)pnAlign);
     } else {
-        rGP.SetHorzAlign(*(USHORT*)pnAlign);
+        rGP.SetHorzAlign(*(sal_uInt16*)pnAlign);
     }
     rGP.SetAbsolutePos(aPos,*pObj);
 }
 
-void SdrGlueEditView::SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign)
+void SdrGlueEditView::SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign)
 {
     ForceUndirtyMrkPnt();
     BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints());
-    ImpDoMarkedGluePoints(ImpSetAlign,FALSE,&bVert,&nAlign);
+    ImpDoMarkedGluePoints(ImpSetAlign,sal_False,&bVert,&nAlign);
     EndUndo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
+sal_Bool SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
 {
     return HasMarkedGluePoints();
 }
@@ -246,13 +246,13 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
     if( bUndo )
         BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_DELETE);
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         if (nPtAnz!=0)
         {
             SdrGluePointList* pGPL=pObj->ForceGluePointList();
@@ -261,10 +261,10 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
-                for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+                for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
                 {
-                    USHORT nPtId=pPts->GetObject(nPtNum);
-                    USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+                    sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+                    sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
                     if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
                     {
                         pGPL->Delete(nGlueIdx);
@@ -291,28 +291,28 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
     if( bUndo )
         BegUndo();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         SdrUShortCont* pPts=pM->GetMarkedGluePoints();
         SdrGluePointList* pGPL=pObj->ForceGluePointList();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         if (nPtAnz!=0 && pGPL!=NULL)
         {
             if( bUndo )
                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
-            for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+            for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
             {
-                USHORT nPtId=pPts->GetObject(nPtNum);
-                USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+                sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+                sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
                 if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
                 {
                     SdrGluePoint aNewGP((*pGPL)[nGlueIdx]);  // GluePoint klonen
-                    USHORT nNewIdx=pGPL->Insert(aNewGP);     // und einfuegen
-                    USHORT nNewId=(*pGPL)[nNewIdx].GetId();  // Id des neuen GluePoints ermitteln
+                    sal_uInt16 nNewIdx=pGPL->Insert(aNewGP);     // und einfuegen
+                    sal_uInt16 nNewId=(*pGPL)[nNewIdx].GetId();  // Id des neuen GluePoints ermitteln
                     pPts->Replace(nNewId,nPtNum);            // und diesen markieren (anstelle des alten)
                 }
             }
@@ -329,12 +329,12 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
 
 void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
 {
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         if (nPtAnz!=0) {
             SdrGluePointList* pGPL=pObj->ForceGluePointList();
             if (pGPL!=NULL)
@@ -342,9 +342,9 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
                 if( IsUndoEnabled() )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
-                for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) {
-                    USHORT nPtId=pPts->GetObject(nPtNum);
-                    USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+                for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) {
+                    sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+                    sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
                     if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) {
                         SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
                         Point aPos(rGP.GetAbsolutePos(*pObj));
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 634d7060e735..f5df7171499f 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -159,7 +159,7 @@ void SdrGluePoint::SetAlignAngle(long nWink)
     else if (nWink<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM;
 }
 
-long SdrGluePoint::EscDirToAngle(USHORT nEsc) const
+long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const
 {
     switch (nEsc) {
         case SDRESC_RIGHT : return 0;
@@ -170,7 +170,7 @@ long SdrGluePoint::EscDirToAngle(USHORT nEsc) const
     return 0;
 }
 
-USHORT SdrGluePoint::EscAngleToDir(long nWink) const
+sal_uInt16 SdrGluePoint::EscAngleToDir(long nWink) const
 {
     nWink=NormAngle360(nWink);
     if (nWink>=31500 || nWink<4500) return SDRESC_RIGHT;
@@ -190,8 +190,8 @@ void SdrGluePoint::Rotate(const Point& rRef, long nWink, double sn, double cs, c
         SetAlignAngle(GetAlignAngle()+nWink);
     }
     // Austrittsrichtungen drehen
-    USHORT nEscDir0=nEscDir;
-    USHORT nEscDir1=0;
+    sal_uInt16 nEscDir0=nEscDir;
+    sal_uInt16 nEscDir1=0;
     if ((nEscDir0&SDRESC_LEFT  )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_LEFT  )+nWink);
     if ((nEscDir0&SDRESC_TOP   )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_TOP   )+nWink);
     if ((nEscDir0&SDRESC_RIGHT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_RIGHT )+nWink);
@@ -219,8 +219,8 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co
         SetAlignAngle(nAW);
     }
     // Austrittsrichtungen spiegeln
-    USHORT nEscDir0=nEscDir;
-    USHORT nEscDir1=0;
+    sal_uInt16 nEscDir0=nEscDir;
+    sal_uInt16 nEscDir1=0;
     if ((nEscDir0&SDRESC_LEFT)!=0) {
         long nEW=EscDirToAngle(SDRESC_LEFT);
         nEW+=2*(nWink-nEW);
@@ -260,7 +260,7 @@ void SdrGluePoint::Draw(OutputDevice& rOut, const SdrObject* pObj) const
     bool bMapMerk=rOut.IsMapModeEnabled();
     Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
     aPt=rOut.LogicToPixel(aPt);
-    rOut.EnableMapMode(FALSE);
+    rOut.EnableMapMode(sal_False);
     long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel
 
     rOut.SetLineColor( aBackPenColor );
@@ -295,7 +295,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const
     bool bMapMerk=rWin.IsMapModeEnabled();
     Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
     aPt=rWin.LogicToPixel(aPt);
-    rWin.EnableMapMode(FALSE);
+    rWin.EnableMapMode(sal_False);
     long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel
 
     // #111096#
@@ -317,8 +317,8 @@ FASTBOOL SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const
 
 void SdrGluePointList::Clear()
 {
-    USHORT nAnz=GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         delete GetObject(i);
     }
     aList.Clear();
@@ -327,8 +327,8 @@ void SdrGluePointList::Clear()
 void SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
 {
     if (GetCount()!=0) Clear();
-    USHORT nAnz=rSrcList.GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rSrcList.GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         Insert(rSrcList[i]);
     }
 }
@@ -336,30 +336,30 @@ void SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
 // Die Id's der Klebepunkte in der Liste sind stets streng monoton steigend!
 // Ggf. wird dem neuen Klebepunkt eine neue Id zugewiesen (wenn diese bereits
 // vergeben ist). Die Id 0 ist reserviert.
-USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP)
+sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP)
 {
     SdrGluePoint* pGP=new SdrGluePoint(rGP);
-    USHORT nId=pGP->GetId();
-    USHORT nAnz=GetCount();
-    USHORT nInsPos=nAnz;
-    USHORT nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0;
+    sal_uInt16 nId=pGP->GetId();
+    sal_uInt16 nAnz=GetCount();
+    sal_uInt16 nInsPos=nAnz;
+    sal_uInt16 nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0;
     DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastId<nAnz");
     FASTBOOL bHole=nLastId>nAnz;
     if (nId<=nLastId) {
         if (!bHole || nId==0) {
             nId=nLastId+1;
         } else {
-            FASTBOOL bBrk=FALSE;
-            for (USHORT nNum=0; nNum<nAnz && !bBrk; nNum++) {
+            FASTBOOL bBrk=sal_False;
+            for (sal_uInt16 nNum=0; nNum<nAnz && !bBrk; nNum++) {
                 const SdrGluePoint* pGP2=GetObject(nNum);
-                USHORT nTmpId=pGP2->GetId();
+                sal_uInt16 nTmpId=pGP2->GetId();
                 if (nTmpId==nId) {
                     nId=nLastId+1; // bereits vorhanden
-                    bBrk=TRUE;
+                    bBrk=sal_True;
                 }
                 if (nTmpId>nId) {
                     nInsPos=nNum; // Hier einfuegen (einsortieren)
-                    bBrk=TRUE;
+                    bBrk=sal_True;
                 }
             }
         }
@@ -371,35 +371,35 @@ USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP)
 
 void SdrGluePointList::Invalidate(Window& rWin, const SdrObject* pObj) const
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->Invalidate(rWin,pObj);
     }
 }
 
-USHORT SdrGluePointList::FindGluePoint(USHORT nId) const
+sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const
 {
     // Hier noch einen optimaleren Suchalgorithmus implementieren.
     // Die Liste sollte stets sortiert sein!!!!
-    USHORT nAnz=GetCount();
-    USHORT nRet=SDRGLUEPOINT_NOTFOUND;
-    for (USHORT nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND;
+    for (sal_uInt16 nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) {
         const SdrGluePoint* pGP=GetObject(nNum);
         if (pGP->GetId()==nId) nRet=nNum;
     }
     return nRet;
 }
 
-USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack, FASTBOOL bNext, USHORT nId0) const
+sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack, FASTBOOL bNext, sal_uInt16 nId0) const
 {
-    USHORT nAnz=GetCount();
-    USHORT nRet=SDRGLUEPOINT_NOTFOUND;
-    USHORT nNum=bBack ? 0 : nAnz;
+    sal_uInt16 nAnz=GetCount();
+    sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND;
+    sal_uInt16 nNum=bBack ? 0 : nAnz;
     while ((bBack ? nNum<nAnz : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) {
         if (!bBack) nNum--;
         const SdrGluePoint* pGP=GetObject(nNum);
         if (bNext) {
-            if (pGP->GetId()==nId0) bNext=FALSE;
+            if (pGP->GetId()==nId0) bNext=sal_False;
         } else {
             if (pGP->IsHit(rPnt,rOut,pObj)) nRet=nNum;
         }
@@ -410,16 +410,16 @@ USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, co
 
 void SdrGluePointList::SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj)
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->SetReallyAbsolute(bOn,rObj);
     }
 }
 
 void SdrGluePointList::Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj)
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->Rotate(rRef,nWink,sn,cs,pObj);
     }
 }
@@ -433,16 +433,16 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, const SdrO
 
 void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj)
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->Mirror(rRef1,rRef2,nWink,pObj);
     }
 }
 
 void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj)
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->Shear(rRef,nWink,tn,bVShear,pObj);
     }
 }
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 791d0f5ca8e7..b587945b183d 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -88,10 +88,10 @@ class SdrHdlBitmapSet
     BitmapEx& impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const Rectangle& rRectangle);
 
 public:
-    SdrHdlBitmapSet(UINT16 nResId);
+    SdrHdlBitmapSet(sal_uInt16 nResId);
     ~SdrHdlBitmapSet();
 
-    const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd=0);
+    const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd=0);
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,7 @@ public:
 #define INDEX_COUNT         (6)
 #define INDIVIDUAL_COUNT    (4)
 
-SdrHdlBitmapSet::SdrHdlBitmapSet(UINT16 nResId)
+SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
 :   maMarkersBitmap(),
     // 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
     maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
@@ -132,7 +132,7 @@ BitmapEx& SdrHdlBitmapSet::impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const R
 }
 
 // change getting of bitmap to use the big ressource bitmap
-const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd)
+const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd)
 {
     // fill in size and source position in maMarkersBitmap
     const sal_uInt16 nYPos(nInd * 11);
@@ -303,9 +303,9 @@ SdrHdl::SdrHdl():
     nPolyNum(0),
     nPPntNum(0),
     nSourceHdlNum(0),
-    bSelect(FALSE),
-    b1PixMore(FALSE),
-    bPlusHdl(FALSE),
+    bSelect(sal_False),
+    b1PixMore(sal_False),
+    bPlusHdl(sal_False),
     mbMoveOutside(false),
     mbMouseOver(false)
 {
@@ -322,9 +322,9 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind):
     nPolyNum(0),
     nPPntNum(0),
     nSourceHdlNum(0),
-    bSelect(FALSE),
-    b1PixMore(FALSE),
-    bPlusHdl(FALSE),
+    bSelect(sal_False),
+    b1PixMore(sal_False),
+    bPlusHdl(sal_False),
     mbMoveOutside(false),
     mbMouseOver(false)
 {
@@ -335,7 +335,7 @@ SdrHdl::~SdrHdl()
     GetRidOfIAObject();
 }
 
-void SdrHdl::Set1PixMore(BOOL bJa)
+void SdrHdl::Set1PixMore(sal_Bool bJa)
 {
     if(b1PixMore != bJa)
     {
@@ -380,7 +380,7 @@ void SdrHdl::SetPos(const Point& rPnt)
     }
 }
 
-void SdrHdl::SetSelected(BOOL bJa)
+void SdrHdl::SetSelected(sal_Bool bJa)
 {
     if(bSelect != bJa)
     {
@@ -440,7 +440,7 @@ void SdrHdl::CreateB2dIAObject()
         BitmapColorIndex eColIndex = LightGreen;
         BitmapMarkerKind eKindOfMarker = Rect_7x7;
 
-        BOOL bRot = pHdlList->IsRotateShear();
+        sal_Bool bRot = pHdlList->IsRotateShear();
         if(pObj)
             eColIndex = (bSelect) ? Cyan : LightCyan;
         if(bRot)
@@ -755,17 +755,17 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
         {
             // #101688# AnchorTR for SW, take top right as (0,0)
             pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
-                (UINT16)(aBmpEx1.GetSizePixel().Width() - 1), 0,
-                (UINT16)(aBmpEx2.GetSizePixel().Width() - 1), 0);
+                (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1), 0,
+                (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1), 0);
         }
         else
         {
             // create centered handle as default
             pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
-                (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
-                (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
-                (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
-                (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
+                (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
+                (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
+                (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
+                (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
         }
     }
     else
@@ -783,7 +783,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
         {
             // #101688# AnchorTR for SW, take top right as (0,0)
             pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx,
-                (UINT16)(aBmpEx.GetSizePixel().Width() - 1), 0);
+                (sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1), 0);
         }
         else
         {
@@ -826,9 +826,9 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const
 Pointer SdrHdl::GetPointer() const
 {
     PointerStyle ePtr=POINTER_MOVE;
-    const BOOL bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
-    const BOOL bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
-    const BOOL bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
+    const sal_Bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
+    const sal_Bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
+    const sal_Bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
     if (bSize && pHdlList!=NULL && (bRot || bDis)) {
         switch (eKind) {
             case HDL_UPLFT: case HDL_UPRGT:
@@ -858,7 +858,7 @@ Pointer SdrHdl::GetPointer() const
             while (nHdlWink<0) nHdlWink+=36000;
             while (nHdlWink>=36000) nHdlWink-=36000;
             nHdlWink/=4500;
-            switch ((BYTE)nHdlWink) {
+            switch ((sal_uInt8)nHdlWink) {
                 case 0: ePtr=POINTER_ESIZE;  break;
                 case 1: ePtr=POINTER_NESIZE; break;
                 case 2: ePtr=POINTER_NSIZE;  break;
@@ -894,7 +894,7 @@ Pointer SdrHdl::GetPointer() const
 }
 
 // #97016# II
-BOOL SdrHdl::IsFocusHdl() const
+sal_Bool SdrHdl::IsFocusHdl() const
 {
     switch(eKind)
     {
@@ -909,9 +909,9 @@ BOOL SdrHdl::IsFocusHdl() const
         {
             // if it's a activated TextEdit, it's moved to extended points
             if(pHdlList && pHdlList->IsMoveOutside())
-                return FALSE;
+                return sal_False;
             else
-                return TRUE;
+                return sal_True;
         }
 
         case HDL_MOVE:      // Handle zum Verschieben des Objekts
@@ -938,12 +938,12 @@ BOOL SdrHdl::IsFocusHdl() const
 
         case HDL_USER:
         {
-            return TRUE;
+            return sal_True;
         }
 
         default:
         {
-            return FALSE;
+            return sal_False;
         }
     }
 }
@@ -964,7 +964,7 @@ bool SdrHdl::isMouseOver() const
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // class SdrHdlColor
 
-SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, BOOL bLum)
+SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum)
 :   SdrHdl(rRef, HDL_COLR),
     aMarkerSize(rSize),
     bUseLuminance(bLum)
@@ -1010,8 +1010,8 @@ void SdrHdlColor::CreateB2dIAObject()
                                 ::sdr::overlay::OverlayBitmapEx(
                                     aPosition,
                                     BitmapEx(aBmpCol),
-                                    (UINT16)(aBmpCol.GetSizePixel().Width() - 1) >> 1,
-                                    (UINT16)(aBmpCol.GetSizePixel().Height() - 1) >> 1
+                                    (sal_uInt16)(aBmpCol.GetSizePixel().Width() - 1) >> 1,
+                                    (sal_uInt16)(aBmpCol.GetSizePixel().Height() - 1) >> 1
                                 );
                             DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
 
@@ -1042,8 +1042,8 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
     if(pWrite)
     {
         // draw outer border
-        INT32 nWidth = aMarkerSize.Width();
-        INT32 nHeight = aMarkerSize.Height();
+        sal_Int32 nWidth = aMarkerSize.Width();
+        sal_Int32 nHeight = aMarkerSize.Height();
 
         pWrite->SetLineColor(Color(COL_LIGHTGRAY));
         pWrite->DrawLine(Point(0, 0), Point(0, nHeight - 1));
@@ -1079,7 +1079,7 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
 
 Color SdrHdlColor::GetLuminance(const Color& rCol)
 {
-    UINT8 aLum = rCol.GetLuminance();
+    sal_uInt8 aLum = rCol.GetLuminance();
     Color aRetval(aLum, aLum, aLum);
     return aRetval;
 }
@@ -1089,7 +1089,7 @@ void SdrHdlColor::CallColorChangeLink()
     aColorChangeHdl.Call(this);
 }
 
-void SdrHdlColor::SetColor(Color aNew, BOOL bCallLink)
+void SdrHdlColor::SetColor(Color aNew, sal_Bool bCallLink)
 {
     if(IsUseLuminance())
         aNew = GetLuminance(aNew);
@@ -1123,7 +1123,7 @@ void SdrHdlColor::SetSize(const Size& rNew)
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // class SdrHdlGradient
 
-SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad)
+SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad)
 :   SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS),
     pColHdl1(NULL),
     pColHdl2(NULL),
@@ -1178,8 +1178,8 @@ void SdrHdlGradient::CreateB2dIAObject()
                             double fHalfArrowWidth = (0.05 * 0.5) * fVecLen;
                             aVec.normalize();
                             basegfx::B2DVector aPerpend(-aVec.getY(), aVec.getX());
-                            INT32 nMidX = (INT32)(aPos.X() + aVec.getX() * fLongPercentArrow);
-                            INT32 nMidY = (INT32)(aPos.Y() + aVec.getY() * fLongPercentArrow);
+                            sal_Int32 nMidX = (sal_Int32)(aPos.X() + aVec.getX() * fLongPercentArrow);
+                            sal_Int32 nMidY = (sal_Int32)(aPos.Y() + aVec.getY() * fLongPercentArrow);
                             Point aMidPoint(nMidX, nMidY);
 
                             basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
@@ -1196,10 +1196,10 @@ void SdrHdlGradient::CreateB2dIAObject()
                             maOverlayGroup.append(*pNewOverlayObject);
 
                             // arrowhead
-                            Point aLeft(aMidPoint.X() + (INT32)(aPerpend.getX() * fHalfArrowWidth),
-                                        aMidPoint.Y() + (INT32)(aPerpend.getY() * fHalfArrowWidth));
-                            Point aRight(aMidPoint.X() - (INT32)(aPerpend.getX() * fHalfArrowWidth),
-                                        aMidPoint.Y() - (INT32)(aPerpend.getY() * fHalfArrowWidth));
+                            Point aLeft(aMidPoint.X() + (sal_Int32)(aPerpend.getX() * fHalfArrowWidth),
+                                        aMidPoint.Y() + (sal_Int32)(aPerpend.getY() * fHalfArrowWidth));
+                            Point aRight(aMidPoint.X() - (sal_Int32)(aPerpend.getX() * fHalfArrowWidth),
+                                        aMidPoint.Y() - (sal_Int32)(aPerpend.getY() * fHalfArrowWidth));
 
                             basegfx::B2DPoint aPositionLeft(aLeft.X(), aLeft.Y());
                             basegfx::B2DPoint aPositionRight(aRight.X(), aRight.Y());
@@ -1227,11 +1227,11 @@ void SdrHdlGradient::CreateB2dIAObject()
 IMPL_LINK(SdrHdlGradient, ColorChangeHdl, SdrHdl*, /*pHdl*/)
 {
     if(GetObj())
-        FromIAOToItem(GetObj(), TRUE, TRUE);
+        FromIAOToItem(GetObj(), sal_True, sal_True);
     return 0;
 }
 
-void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL bUndo)
+void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo)
 {
     // from IAO positions and colors to gradient
     const SfxItemSet& rSet = _pObj->GetMergedItemSet();
@@ -1568,13 +1568,13 @@ Pointer ImpEdgeHdl::GetPointer() const
         return Pointer(POINTER_SSIZE);
 }
 
-BOOL ImpEdgeHdl::IsHorzDrag() const
+sal_Bool ImpEdgeHdl::IsHorzDrag() const
 {
     SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
     if (pEdge==NULL)
-        return FALSE;
+        return sal_False;
     if (nObjHdlNum<=1)
-        return FALSE;
+        return sal_False;
 
     SdrEdgeKind eEdgeKind = ((SdrEdgeKindItem&)(pEdge->GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
 
@@ -1587,11 +1587,11 @@ BOOL ImpEdgeHdl::IsHorzDrag() const
     {
         long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2;
         if (nWink==0 || nWink==18000)
-            return TRUE;
+            return sal_True;
         else
-            return FALSE;
+            return sal_False;
     }
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1774,7 +1774,7 @@ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const
                 { // #48763#
                     if (eKind1==eKind2)
                         return (long)pElem1<(long)pElem2 ? -1 : 1; // Notloesung, um immer die gleiche Sortierung zu haben
-                    return (USHORT)eKind1<(USHORT)eKind2 ? -1 : 1;
+                    return (sal_uInt16)eKind1<(sal_uInt16)eKind2 ? -1 : 1;
                 }
                 else
                     return nNum1<nNum2 ? -1 : 1;
@@ -1895,7 +1895,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
     if(aList.Count())
     {
         // take care of old handle
-        const ULONG nOldHdlNum(mnFocusIndex);
+        const sal_uIntPtr nOldHdlNum(mnFocusIndex);
         SdrHdl* pOld = GetHdl(nOldHdlNum);
         //SDOsal_Bool bRefresh(sal_False);
 
@@ -1922,7 +1922,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
         qsort(pHdlAndIndex, aList.Count(), sizeof(ImplHdlAndIndex), ImplSortHdlFunc);
 
         // #105678# look for old num in sorted array
-        ULONG nOldHdl(nOldHdlNum);
+        sal_uIntPtr nOldHdl(nOldHdlNum);
 
         if(nOldHdlNum != CONTAINER_ENTRY_NOTFOUND)
         {
@@ -1937,7 +1937,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
         }
 
         // #105678# build new HdlNum
-        ULONG nNewHdl(nOldHdl);
+        sal_uIntPtr nNewHdl(nOldHdl);
 
         // #105678# do the focus travel
         if(bForward)
@@ -2036,7 +2036,7 @@ void SdrHdlList::SetFocusHdl(SdrHdl* pNew)
 
         if(!pActual || pActual != pNew)
         {
-            ULONG nNewHdlNum = GetHdlNum(pNew);
+            sal_uIntPtr nNewHdlNum = GetHdlNum(pNew);
 
             if(nNewHdlNum != CONTAINER_ENTRY_NOTFOUND)
             {
@@ -2085,10 +2085,10 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV)
     aList(1024,32,32)
 {
     nHdlSize = 3;
-    bRotateShear = FALSE;
-    bMoveOutside = FALSE;
-    bDistortShear = FALSE;
-    bFineHandles = FALSE;
+    bRotateShear = sal_False;
+    bMoveOutside = sal_False;
+    bDistortShear = sal_False;
+    bFineHandles = sal_False;
 }
 
 SdrHdlList::~SdrHdlList()
@@ -2096,7 +2096,7 @@ SdrHdlList::~SdrHdlList()
     Clear();
 }
 
-void SdrHdlList::SetHdlSize(USHORT nSiz)
+void SdrHdlList::SetHdlSize(sal_uInt16 nSiz)
 {
     if(nHdlSize != nSiz)
     {
@@ -2104,7 +2104,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz)
         nHdlSize = nSiz;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++)
+        for(sal_uInt32 i=0; i<GetHdlCount(); i++)
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2112,7 +2112,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz)
     }
 }
 
-void SdrHdlList::SetMoveOutside(BOOL bOn)
+void SdrHdlList::SetMoveOutside(sal_Bool bOn)
 {
     if(bMoveOutside != bOn)
     {
@@ -2120,7 +2120,7 @@ void SdrHdlList::SetMoveOutside(BOOL bOn)
         bMoveOutside = bOn;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++)
+        for(sal_uInt32 i=0; i<GetHdlCount(); i++)
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2128,17 +2128,17 @@ void SdrHdlList::SetMoveOutside(BOOL bOn)
     }
 }
 
-void SdrHdlList::SetRotateShear(BOOL bOn)
+void SdrHdlList::SetRotateShear(sal_Bool bOn)
 {
     bRotateShear = bOn;
 }
 
-void SdrHdlList::SetDistortShear(BOOL bOn)
+void SdrHdlList::SetDistortShear(sal_Bool bOn)
 {
     bDistortShear = bOn;
 }
 
-void SdrHdlList::SetFineHdl(BOOL bOn)
+void SdrHdlList::SetFineHdl(sal_Bool bOn)
 {
     if(bFineHandles != bOn)
     {
@@ -2146,7 +2146,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn)
         bFineHandles = bOn;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++)
+        for(sal_uInt32 i=0; i<GetHdlCount(); i++)
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2154,7 +2154,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn)
     }
 }
 
-SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum)
+SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum)
 {
     SdrHdl* pRetval = (SdrHdl*)aList.Remove(nNum);
 
@@ -2163,15 +2163,15 @@ SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum)
 
 void SdrHdlList::Clear()
 {
-    for (ULONG i=0; i<GetHdlCount(); i++)
+    for (sal_uIntPtr i=0; i<GetHdlCount(); i++)
     {
         SdrHdl* pHdl=GetHdl(i);
         delete pHdl;
     }
     aList.Clear();
 
-    bRotateShear=FALSE;
-    bDistortShear=FALSE;
+    bRotateShear=sal_False;
+    bDistortShear=sal_False;
 }
 
 void SdrHdlList::Sort()
@@ -2203,21 +2203,21 @@ void SdrHdlList::Sort()
     }
 }
 
-ULONG SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
+sal_uIntPtr SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
 {
     if (pHdl==NULL)
         return CONTAINER_ENTRY_NOTFOUND;
-    ULONG nPos=aList.GetPos(pHdl);
+    sal_uIntPtr nPos=aList.GetPos(pHdl);
     return nPos;
 }
 
-void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin)
+void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin)
 {
     if (pHdl!=NULL)
     {
         if (bAtBegin)
         {
-            aList.Insert(pHdl,ULONG(0));
+            aList.Insert(pHdl,sal_uIntPtr(0));
         }
         else
         {
@@ -2227,11 +2227,11 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin)
     }
 }
 
-SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrHdl* pHdl0) const
+SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNext, SdrHdl* pHdl0) const
 {
    SdrHdl* pRet=NULL;
-   ULONG nAnz=GetHdlCount();
-   ULONG nNum=bBack ? 0 : nAnz;
+   sal_uIntPtr nAnz=GetHdlCount();
+   sal_uIntPtr nNum=bBack ? 0 : nAnz;
    while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL)
    {
        if (!bBack)
@@ -2240,7 +2240,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH
        if (bNext)
        {
            if (pHdl==pHdl0)
-               bNext=FALSE;
+               bNext=sal_False;
        }
        else
        {
@@ -2256,7 +2256,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH
 SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const
 {
    SdrHdl* pRet=NULL;
-   for (ULONG i=0; i<GetHdlCount() && pRet==NULL; i++)
+   for (sal_uIntPtr i=0; i<GetHdlCount() && pRet==NULL; i++)
    {
        SdrHdl* pHdl=GetHdl(i);
        if (pHdl->GetKind()==eKind1)
@@ -2389,17 +2389,17 @@ void SdrCropHdl::CreateB2dIAObject()
                         const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime());
 
                         pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBmpEx1, aBmpEx2, nBlinkTime,
-                            (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
-                            (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
-                            (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
-                            (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
+                            (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
+                            (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
+                            (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
+                            (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
                     }
                     else
                     {
                         // create centered handle as default
                         pOverlayObject = new ::sdr::overlay::OverlayBitmapEx(aPosition, aBmpEx1,
-                            (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
-                            (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1);
+                            (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
+                            (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1);
                     }
 
                     // OVERLAYMANAGER
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 2813b6f032f1..588c7a3d57f2 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -47,7 +47,7 @@ Pointer SdrHelpLine::GetPointer() const
     } // switch
 }
 
-FASTBOOL SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const
+FASTBOOL SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const
 {
     Size a1Pix(rOut.PixelToLogic(Size(1,1)));
     FASTBOOL bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width();
@@ -63,7 +63,7 @@ FASTBOOL SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevic
             }
         } break;
     } // switch
-    return FALSE;
+    return sal_False;
 }
 
 Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const
@@ -105,8 +105,8 @@ bool SdrHelpLine::IsVisibleEqual( const SdrHelpLine& rHelpLine, const OutputDevi
 
 void SdrHelpLineList::Clear()
 {
-    USHORT nAnz=GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         delete GetObject(i);
     }
     aList.Clear();
@@ -115,31 +115,31 @@ void SdrHelpLineList::Clear()
 void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList)
 {
     Clear();
-    USHORT nAnz=rSrcList.GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rSrcList.GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         Insert(rSrcList[i]);
     }
 }
 
 bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const
 {
-    FASTBOOL bEqual=FALSE;
-    USHORT nAnz=GetCount();
+    FASTBOOL bEqual=sal_False;
+    sal_uInt16 nAnz=GetCount();
     if (nAnz==rSrcList.GetCount()) {
-        bEqual=TRUE;
-        for (USHORT i=0; i<nAnz && bEqual; i++) {
+        bEqual=sal_True;
+        for (sal_uInt16 i=0; i<nAnz && bEqual; i++) {
             if (*GetObject(i)!=*rSrcList.GetObject(i)) {
-                bEqual=FALSE;
+                bEqual=sal_False;
             }
         }
     }
     return bEqual;
 }
 
-USHORT SdrHelpLineList::HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const
+sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const
 {
-    USHORT nAnz=GetCount();
-    for (USHORT i=nAnz; i>0;) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 i=nAnz; i>0;) {
         i--;
         if (GetObject(i)->IsHit(rPnt,nTolLog,rOut)) return i;
     }
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 3ded3a1f90c3..a951819104aa 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -91,18 +91,18 @@ public:
     XubString                   aName;
     XubString                   aValue;
     SfxItemState                eState;
-    UINT16                      nWhichId;
+    sal_uInt16                      nWhichId;
 
     TypeId                      pType;
     ItemType                    eItemType;
 
-    INT32                       nVal;
-    INT32                       nMin;
-    INT32                       nMax;
+    sal_Int32                       nVal;
+    sal_Int32                       nMin;
+    sal_Int32                       nMax;
 
-    BOOL                        bComment;
-    BOOL                        bIsNum;
-    BOOL                        bCanNum;
+    sal_Bool                        bComment;
+    sal_Bool                        bIsNum;
+    sal_Bool                        bCanNum;
 
 public:
     ImpItemListRow()
@@ -113,14 +113,14 @@ public:
         nVal(0),
         nMin(0),
         nMax(0),
-        bComment(FALSE),
-        bIsNum(FALSE),
-        bCanNum(FALSE)
+        bComment(sal_False),
+        bIsNum(sal_False),
+        bCanNum(sal_False)
     {}
 
     XubString GetItemTypeStr() const;
-    BOOL operator==(const ImpItemListRow& rEntry) const;
-    BOOL operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); }
+    sal_Bool operator==(const ImpItemListRow& rEntry) const;
+    sal_Bool operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); }
 };
 
 XubString ImpItemListRow::GetItemTypeStr() const
@@ -155,7 +155,7 @@ XubString ImpItemListRow::GetItemTypeStr() const
     return aStr;
 }
 
-BOOL ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
+sal_Bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
 {
     return (aName.Equals(rEntry.aName)
         && aValue.Equals(rEntry.aValue)
@@ -195,7 +195,7 @@ void __EXPORT ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
 {
     _SdrItemBrowserControl* pBrowseMerk = pBrowse;
 
-    UINT16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier());
+    sal_uInt16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier());
 
     if(nKeyCode == KEY_RETURN)
     {
@@ -247,13 +247,13 @@ void _SdrItemBrowserControl::ImpCtor()
     nLastWhich = 0;
     nLastWhichOben = 0;  // not implemented yet
     nLastWhichUnten = 0; // not implemented yet
-    bWhichesButNames = FALSE;
-    bDontHideIneffectiveItems = FALSE;
-    bDontSortItems = FALSE;
-    bShowWhichIds = FALSE;
-    bShowRealValues = FALSE;
-    bShowWhichIds = TRUE;   // not implemented yet
-    bShowRealValues = TRUE; // not implemented yet
+    bWhichesButNames = sal_False;
+    bDontHideIneffectiveItems = sal_False;
+    bDontSortItems = sal_False;
+    bShowWhichIds = sal_False;
+    bShowRealValues = sal_False;
+    bShowWhichIds = sal_True;   // not implemented yet
+    bShowRealValues = sal_True; // not implemented yet
 
     rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
 
@@ -294,8 +294,8 @@ void _SdrItemBrowserControl::ImpCtor()
 
 void _SdrItemBrowserControl::Clear()
 {
-    ULONG nAnz=aList.Count();
-    for (ULONG nNum=0; nNum<nAnz; nNum++) {
+    sal_uIntPtr nAnz=aList.Count();
+    for (sal_uIntPtr nNum=0; nNum<nAnz; nNum++) {
         delete ImpGetEntry(nNum);
     }
     aList.Clear();
@@ -307,13 +307,13 @@ long __EXPORT _SdrItemBrowserControl::GetRowCount() const
     return aList.Count();
 }
 
-BOOL __EXPORT _SdrItemBrowserControl::SeekRow(long nRow)
+sal_Bool __EXPORT _SdrItemBrowserControl::SeekRow(long nRow)
 {
     nAktPaintRow=nRow;
-    return TRUE;
+    return sal_True;
 }
 
-String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const
+String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
 {
     String sRet;
     if ( _nRow >= 0 && _nRow < (sal_Int32)aList.Count() )
@@ -356,9 +356,9 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const
     return sRet;
 }
 
-void __EXPORT _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const
+void __EXPORT _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
 {
-    if (nAktPaintRow<0 || (ULONG)nAktPaintRow>=aList.Count()) {
+    if (nAktPaintRow<0 || (sal_uIntPtr)nAktPaintRow>=aList.Count()) {
         return;
     }
     Rectangle aR(rRect);
@@ -382,22 +382,22 @@ void __EXPORT _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Recta
     }
 }
 
-ULONG _SdrItemBrowserControl::GetCurrentPos() const
+sal_uIntPtr _SdrItemBrowserControl::GetCurrentPos() const
 {
-    ULONG nRet=CONTAINER_ENTRY_NOTFOUND;
+    sal_uIntPtr nRet=CONTAINER_ENTRY_NOTFOUND;
     if (GetSelectRowCount()==1) {
         long nPos=((BrowseBox*)this)->FirstSelectedRow();
-        if (nPos>=0 && (ULONG)nPos<aList.Count()) {
-            nRet=(ULONG)nPos;
+        if (nPos>=0 && (sal_uIntPtr)nPos<aList.Count()) {
+            nRet=(sal_uIntPtr)nPos;
         }
     }
     return nRet;
 }
 
-USHORT _SdrItemBrowserControl::GetCurrentWhich() const
+sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const
 {
-    USHORT nRet=0;
-    ULONG nPos=GetCurrentPos();
+    sal_uInt16 nRet=0;
+    sal_uIntPtr nPos=GetCurrentPos();
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         nRet=ImpGetEntry(nPos)->nWhichId;
     }
@@ -406,7 +406,7 @@ USHORT _SdrItemBrowserControl::GetCurrentWhich() const
 
 void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
 {
-    ULONG nPos=GetCurrentPos();
+    sal_uIntPtr nPos=GetCurrentPos();
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         BegChangeEntry(nPos);
     }
@@ -414,12 +414,12 @@ void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
 
 void __EXPORT _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
 {
-    USHORT nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
-    FASTBOOL bAusgewertet=FALSE;
-    ULONG nPos=GetCurrentPos();
+    sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
+    FASTBOOL bAusgewertet=sal_False;
+    sal_uIntPtr nPos=GetCurrentPos();
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         if (nKeyCode==KEY_RETURN) {
-            if (BegChangeEntry(nPos)) bAusgewertet=TRUE;
+            if (BegChangeEntry(nPos)) bAusgewertet=sal_True;
         } else if (nKeyCode==KEY_ESCAPE) {
             // ...
         } else if (rKEvt.GetKeyCode().GetModifier()==KEY_SHIFT+KEY_MOD1+KEY_MOD2) { // Strg
@@ -466,7 +466,7 @@ void __EXPORT _SdrItemBrowserControl::Select()
 
 void _SdrItemBrowserControl::ImpSaveWhich()
 {
-    USHORT nWh=GetCurrentWhich();
+    sal_uInt16 nWh=GetCurrentWhich();
     if (nWh!=0) {
         long nPos=GetCurrentPos();
         long nTop=GetTopRow();
@@ -483,16 +483,16 @@ void _SdrItemBrowserControl::ImpSaveWhich()
 void _SdrItemBrowserControl::ImpRestoreWhich()
 {
     if (nLastWhich!=0) {
-        FASTBOOL bFnd=FALSE;
-        USHORT nBestMinWh=0,nBestMaxWh=0xFFFF;       // not implemented yet
-        ULONG nBestMinPos=0,nBestMaxPos=0xFFFFFFFF;  // not implemented yet
-        ULONG nAnz=aList.Count();
-        ULONG nNum;
+        FASTBOOL bFnd=sal_False;
+        sal_uInt16 nBestMinWh=0,nBestMaxWh=0xFFFF;       // not implemented yet
+        sal_uIntPtr nBestMinPos=0,nBestMaxPos=0xFFFFFFFF;  // not implemented yet
+        sal_uIntPtr nAnz=aList.Count();
+        sal_uIntPtr nNum;
         for (nNum=0; nNum<nAnz && !bFnd; nNum++) {
             ImpItemListRow* pEntry=ImpGetEntry(nNum);
             if (!pEntry->bComment) {
-                USHORT nWh=pEntry->nWhichId;
-                if (nWh==nLastWhich) bFnd=TRUE;
+                sal_uInt16 nWh=pEntry->nWhichId;
+                if (nWh==nLastWhich) bFnd=sal_True;
                 else if (nWh<nLastWhich && nWh>nBestMinWh) nBestMinPos=nNum;
                 else if (nWh>nLastWhich && nWh<nBestMaxWh) nBestMaxPos=nNum;
             }
@@ -508,15 +508,15 @@ void _SdrItemBrowserControl::ImpRestoreWhich()
     }
 }
 
-FASTBOOL _SdrItemBrowserControl::BegChangeEntry(ULONG nPos)
+FASTBOOL _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos)
 {
     BrkChangeEntry();
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     ImpItemListRow* pEntry=ImpGetEntry(nPos);
     if (pEntry!=NULL && !pEntry->bComment) {
         SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT);
         pEditControl=new ImpItemEdit(&GetDataWindow(),this,0/*|WB_BORDER|WB_3DLOOK*/);
-        Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,FALSE));
+        Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,sal_False));
         aRect.Left()+=2; // Kleiner Offset fuer's Edit, damit's pixelgenau stimmt
         aRect.Right()--;
         pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize());
@@ -542,14 +542,14 @@ FASTBOOL _SdrItemBrowserControl::BegChangeEntry(ULONG nPos)
         aNeuNam.AppendAscii(" - Type 'del' to reset to default.");
         pParent->SetText(aNeuNam);
         pAktChangeEntry=new ImpItemListRow(*pEntry);
-        bRet=TRUE;
+        bRet=sal_True;
     }
     return bRet;
 }
 
 FASTBOOL _SdrItemBrowserControl::EndChangeEntry()
 {
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     if (pEditControl!=NULL) {
         aEntryChangedHdl.Call(this);
         delete pEditControl;
@@ -559,7 +559,7 @@ FASTBOOL _SdrItemBrowserControl::EndChangeEntry()
         Window* pParent=GetParent();
         pParent->SetText(aWNamMerk);
         SetMode(MYBROWSEMODE);
-        bRet=TRUE;
+        bRet=sal_True;
     }
     return bRet;
 }
@@ -577,7 +577,7 @@ void _SdrItemBrowserControl::BrkChangeEntry()
     }
 }
 
-void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum)
+void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum)
 {
     ImpItemListRow* pAktEntry=ImpGetEntry(nEntryNum);
     if (pAktEntry==NULL) {
@@ -586,13 +586,13 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEn
     } else if (*pAktEntry!=rEntry) {
         FASTBOOL bStateDiff=rEntry.eState!=pAktEntry->eState;
         FASTBOOL bValueDiff=!rEntry.aValue.Equals(pAktEntry->aValue);
-        FASTBOOL bAllDiff=TRUE;
+        FASTBOOL bAllDiff=sal_True;
         if (bStateDiff || bValueDiff) {
             // Checken, ob nur State und/oder Value geaendert
             ImpItemListRow aTest(rEntry);
             aTest.eState=pAktEntry->eState;
             aTest.aValue=pAktEntry->aValue;
-            if (aTest==*pAktEntry) bAllDiff=FALSE;
+            if (aTest==*pAktEntry) bAllDiff=sal_False;
         }
         *pAktEntry=rEntry;
         if (bAllDiff) {
@@ -604,21 +604,21 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEn
     }
 }
 
-FASTBOOL ImpGetItem(const SfxItemSet& rSet, USHORT nWhich, const SfxPoolItem*& rpItem)
+FASTBOOL ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem)
 {
-    SfxItemState eState=rSet.GetItemState(nWhich,TRUE,&rpItem);
+    SfxItemState eState=rSet.GetItemState(nWhich,sal_True,&rpItem);
     if (eState==SFX_ITEM_DEFAULT) {
         rpItem=&rSet.Get(nWhich);
     }
     return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL;
 }
 
-FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
+FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent)
 {
     rIndent=0;
-    if (pSet==NULL) return FALSE;
+    if (pSet==NULL) return sal_False;
     const SfxPoolItem* pItem=NULL;
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     switch (nWhich) {
         case XATTR_LINEDASH         :
         case XATTR_LINEWIDTH        :
@@ -633,21 +633,21 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_LINESTYLE,pItem)) {
                 XLineStyle eLineStyle=((const XLineStyleItem*)pItem)->GetValue();
-                if (eLineStyle==XLINE_NONE) return TRUE;
-                if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return TRUE;
+                if (eLineStyle==XLINE_NONE) return sal_True;
+                if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return sal_True;
             }
             if (nWhich==XATTR_LINESTART || nWhich==XATTR_LINESTARTCENTER) {
                 rIndent=2;
                 if (ImpGetItem(*pSet,XATTR_LINESTARTWIDTH,pItem)) {
-                    INT32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue();
-                    if (nWdt==0) return TRUE;
+                    sal_Int32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue();
+                    if (nWdt==0) return sal_True;
                 }
             }
             if (nWhich==XATTR_LINEEND || nWhich==XATTR_LINEENDCENTER) {
                 rIndent=2;
                 if (ImpGetItem(*pSet,XATTR_LINEENDWIDTH,pItem)) {
-                    INT32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue();
-                    if (nWdt==0) return TRUE;
+                    sal_Int32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue();
+                    if (nWdt==0) return sal_True;
                 }
             }
         } break;
@@ -661,36 +661,36 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
                 XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
-                if (eFillStyle==XFILL_NONE) return TRUE;
+                if (eFillStyle==XFILL_NONE) return sal_True;
                 // Transparenz z.Zt. nur fuer SolidFill
-                if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return TRUE;
-                if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return TRUE;
-                if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return TRUE;
+                if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return sal_True;
+                if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return sal_True;
+                if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return sal_True;
             }
         } break;
         case XATTR_FILLBITMAP          :
         case XATTR_FILLBMP_TILE        :
-        case XATTR_FILLBMP_POS         : /* z.Zt. nur wenn TILE=TRUE */
+        case XATTR_FILLBMP_POS         : /* z.Zt. nur wenn TILE=sal_True */
         case XATTR_FILLBMP_SIZEX       : /* nur wenn nicht Stretch */
         case XATTR_FILLBMP_SIZEY       : /* nur wenn nicht Stretch */
-        case XATTR_FILLBMP_SIZELOG     : /* nur wenn SIZELOG=FALSE zum ruecksetzen auf TRUE (alt) -> doch noch in Gebrauch */
-        case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=TRUE */
-        case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=TRUE */
-        case XATTR_FILLBMP_STRETCH     : /* nur wenn TILE=FALSE */
-        case XATTR_FILLBMP_POSOFFSETX  : /* nur wenn TILE=TRUE*/
-        case XATTR_FILLBMP_POSOFFSETY  : { /* nur wenn TILE=TRUE*/
+        case XATTR_FILLBMP_SIZELOG     : /* nur wenn SIZELOG=sal_False zum ruecksetzen auf sal_True (alt) -> doch noch in Gebrauch */
+        case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=sal_True */
+        case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=sal_True */
+        case XATTR_FILLBMP_STRETCH     : /* nur wenn TILE=sal_False */
+        case XATTR_FILLBMP_POSOFFSETX  : /* nur wenn TILE=sal_True*/
+        case XATTR_FILLBMP_POSOFFSETY  : { /* nur wenn TILE=sal_True*/
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
                 XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
-                if (eFillStyle!=XFILL_BITMAP) return TRUE;
+                if (eFillStyle!=XFILL_BITMAP) return sal_True;
             }
             if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) {
-                return FALSE; // immer anwaehlbar
+                return sal_False; // immer anwaehlbar
             }
-            FASTBOOL bTileTRUE=FALSE;
-            FASTBOOL bTileFALSE=FALSE;
-            FASTBOOL bStretchTRUE=FALSE;
-            FASTBOOL bStretchFALSE=FALSE;
+            FASTBOOL bTileTRUE=sal_False;
+            FASTBOOL bTileFALSE=sal_False;
+            FASTBOOL bStretchTRUE=sal_False;
+            FASTBOOL bStretchFALSE=sal_False;
             if (ImpGetItem(*pSet,XATTR_FILLBMP_TILE,pItem)) {
                 bTileTRUE=((const XFillBmpTileItem*)pItem)->GetValue();
                 bTileFALSE=!bTileTRUE;
@@ -715,31 +715,31 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             }
             // Noch 2 Items speziell fuer Tile die sich jedoch gegenseitig ausschliessen
             if (nWhich==XATTR_FILLBMP_TILEOFFSETX || nWhich==XATTR_FILLBMP_TILEOFFSETY) {
-                if (bTileFALSE) return TRUE;
-                USHORT nX=0,nY=0;
-                FASTBOOL bX=FALSE,bY=FALSE;
+                if (bTileFALSE) return sal_True;
+                sal_uInt16 nX=0,nY=0;
+                FASTBOOL bX=sal_False,bY=sal_False;
                 if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETX,pItem)) {
                     nX=((const XFillBmpTileOffsetXItem*)pItem)->GetValue();
-                    bX=TRUE;
+                    bX=sal_True;
                 }
                 if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETY,pItem)) {
                     nY=((const XFillBmpTileOffsetYItem*)pItem)->GetValue();
-                    bY=TRUE;
+                    bY=sal_True;
                 }
                 if (nWhich==XATTR_FILLBMP_TILEOFFSETX) {
-                    if (nX!=0 || !bX) return FALSE;
-                    if (nY!=0) return TRUE;
+                    if (nX!=0 || !bX) return sal_False;
+                    if (nY!=0) return sal_True;
                 } else {
-                    if (nY!=0 || !bY) return FALSE;
-                    if (nX!=0) return TRUE;
+                    if (nY!=0 || !bY) return sal_False;
+                    if (nX!=0) return sal_True;
                 }
             }
             // SizeLog nicht anwaehlbar bei Stretch=TRUE
-            // und sonst auch nur wenn es auf SizeLog=FALSE gesetzt ist.
+            // und sonst auch nur wenn es auf SizeLog=sal_False gesetzt ist.
             // -> wohl doch noch in Gebrauch
-            // (TRUE ist der statische PoolDefault)
+            // (sal_True ist der statische PoolDefault)
             if (nWhich==XATTR_FILLBMP_SIZELOG) {
-                if (bTileFALSE && bStretchTRUE) return TRUE;
+                if (bTileFALSE && bStretchTRUE) return sal_True;
             }
         } break;
 
@@ -758,13 +758,13 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_FORMTXTSTYLE,pItem)) {
                 XFormTextStyle eStyle=((const XFormTextStyleItem*)pItem)->GetValue();
-                if (eStyle==XFT_NONE) return TRUE;
+                if (eStyle==XFT_NONE) return sal_True;
             }
             if ((nWhich>=XATTR_FORMTXTSHDWCOLOR && nWhich<=XATTR_FORMTXTSHDWYVAL) || nWhich>=XATTR_FORMTXTSHDWTRANSP) {
                 rIndent=2;
                 if (ImpGetItem(*pSet,XATTR_FORMTXTSHADOW,pItem)) {
                     XFormTextShadow eShadow=((const XFormTextShadowItem*)pItem)->GetValue();
-                    if (eShadow==XFTSHADOW_NONE) return TRUE;
+                    if (eShadow==XFTSHADOW_NONE) return sal_True;
                 }
             }
         } break;
@@ -778,7 +778,7 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) {
                 FASTBOOL bShadow=((const SdrShadowItem*)pItem)->GetValue();
-                if (!bShadow) return TRUE;
+                if (!bShadow) return sal_True;
             }
         } break;
 
@@ -786,7 +786,7 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) {
                 FASTBOOL bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue();
-                if (!bFixed) return TRUE;
+                if (!bFixed) return sal_True;
             }
         } break;
         case SDRATTR_CAPTIONESCREL:
@@ -794,15 +794,15 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_CAPTIONESCISREL,pItem)) {
                 FASTBOOL bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue();
-                if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return TRUE;
-                if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return TRUE;
+                if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return sal_True;
+                if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return sal_True;
             }
         } break;
         case SDRATTR_CAPTIONLINELEN: {
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_CAPTIONFITLINELEN,pItem)) {
                 FASTBOOL bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue();
-                if (bFit) return TRUE;
+                if (bFit) return sal_True;
             }
         } break;
 
@@ -811,7 +811,7 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWHEIGHT,pItem)) {
                 FASTBOOL bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue();
-                if (!bAutoGrow) return TRUE;
+                if (!bAutoGrow) return sal_True;
             }
         } break;
         case SDRATTR_TEXT_MINFRAMEWIDTH:
@@ -819,14 +819,14 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWWIDTH,pItem)) {
                 FASTBOOL bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue();
-                if (!bAutoGrow) return TRUE;
+                if (!bAutoGrow) return sal_True;
             }
         } break;
         case SDRATTR_TEXT_VERTADJUST:
         case SDRATTR_TEXT_HORZADJUST: {
             if (ImpGetItem(*pSet,SDRATTR_TEXT_FITTOSIZE,pItem)) {
                 SdrFitToSizeType eFit=((const SdrTextFitToSizeTypeItem*)pItem)->GetValue();
-                if (eFit!=SDRTEXTFIT_NONE) return TRUE;
+                if (eFit!=SDRTEXTFIT_NONE) return sal_True;
             }
         } break;
 
@@ -839,30 +839,30 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_TEXT_ANIKIND,pItem)) {
                 SdrTextAniKind eAniKind=((const SdrTextAniKindItem*)pItem)->GetValue();
-                if (eAniKind==SDRTEXTANI_NONE) return TRUE;
-                if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return TRUE;
-                if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return TRUE;
+                if (eAniKind==SDRTEXTANI_NONE) return sal_True;
+                if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return sal_True;
+                if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return sal_True;
             }
         } break;
 
-        case SDRATTR_EDGELINEDELTAANZ: return TRUE;
+        case SDRATTR_EDGELINEDELTAANZ: return sal_True;
         case SDRATTR_EDGELINE1DELTA:
         case SDRATTR_EDGELINE2DELTA:
         case SDRATTR_EDGELINE3DELTA: {
             if (ImpGetItem(*pSet,SDRATTR_EDGEKIND,pItem)) {
                 SdrEdgeKind eKind=((const SdrEdgeKindItem*)pItem)->GetValue();
                 if (eKind==SDREDGE_THREELINES) {
-                    if (nWhich>SDRATTR_EDGELINE2DELTA) return TRUE;
-                    else return FALSE;
+                    if (nWhich>SDRATTR_EDGELINE2DELTA) return sal_True;
+                    else return sal_False;
                 }
-                if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return TRUE;
+                if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return sal_True;
             }
             if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) {
-                UINT16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue();
-                if (nAnz==0) return TRUE;
-                if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return TRUE;
-                if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return TRUE;
-                if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return TRUE;
+                sal_uInt16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue();
+                if (nAnz==0) return sal_True;
+                if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return sal_True;
+                if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return sal_True;
+                if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return sal_True;
             }
         } break;
 
@@ -871,14 +871,14 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_CIRCKIND,pItem)) {
                 SdrCircKind eKind=((const SdrCircKindItem*)pItem)->GetValue();
-                if (eKind==SDRCIRC_FULL) return TRUE;
+                if (eKind==SDRCIRC_FULL) return sal_True;
             }
         } break;
     } // switch
     return bRet;
 }
 
-USHORT ImpSortWhich(USHORT nWhich)
+sal_uInt16 ImpSortWhich(sal_uInt16 nWhich)
 {
     switch (nWhich) {
         // Line
@@ -933,11 +933,11 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
     SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT);
     if (pSet!=NULL) {
         rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
-        USHORT nEntryNum=0;
+        sal_uInt16 nEntryNum=0;
         SfxWhichIter aIter(*pSet);
         const SfxItemPool* pPool=pSet->GetPool();
-        USHORT nWhich0=0;
-        USHORT nWhich=aIter.FirstWhich();
+        sal_uInt16 nWhich0=0;
+        sal_uInt16 nWhich=aIter.FirstWhich();
         while (nWhich!=0) {
             // Nun erstmal etwas umsortieren
             // Geht nur, solange keine InvalidItems, d.h. keine Luecken
@@ -951,7 +951,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
             }
             if (eState!=SFX_ITEM_DISABLED) {
                 const SfxPoolItem& rItem=pSet->Get(nWhich);
-                USHORT nIndent=0;
+                sal_uInt16 nIndent=0;
                 if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) {
                     XubString aCommentStr;
 
@@ -975,7 +975,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
                     if(aCommentStr.Len())
                     {
                         ImpItemListRow aEntry;
-                        aEntry.bComment=TRUE;
+                        aEntry.bComment=sal_True;
                         aEntry.aName=aCommentStr;
                         ImpSetEntry(aEntry,nEntryNum);
                         nEntryNum++;
@@ -1018,20 +1018,20 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
                         else if (HAS_BASE(SvxCharScaleWidthItem,&rItem)) aEntry.eItemType=ITEM_FONTWIDTH;
                         else if (HAS_BASE(SvxFieldItem    ,&rItem)) aEntry.eItemType=ITEM_FIELD;
                         switch (aEntry.eItemType) {
-                            case ITEM_BYTE      : aEntry.bIsNum=TRUE;  aEntry.nVal=((SfxByteItem  &)rItem).GetValue(); aEntry.nMin=0;      aEntry.nMax=255;   break;
-                            case ITEM_INT16     : aEntry.bIsNum=TRUE;  aEntry.nVal=((SfxInt16Item &)rItem).GetValue(); aEntry.nMin=-32767; aEntry.nMax=32767; break;
-                            case ITEM_UINT16    : aEntry.bIsNum=TRUE;  aEntry.nVal=((SfxUInt16Item&)rItem).GetValue(); aEntry.nMin=0;      aEntry.nMax=65535; break;
-                            case ITEM_INT32     : aEntry.bIsNum=TRUE;  aEntry.nVal=((SfxInt32Item &)rItem).GetValue();                                        break;
-                            case ITEM_UINT32    : aEntry.bIsNum=TRUE;  aEntry.nVal=((SfxUInt32Item&)rItem).GetValue(); aEntry.nMin=0; /*aEntry.nMax=0xFF...*/;break;
-                            case ITEM_ENUM      : aEntry.bCanNum=TRUE; aEntry.nVal=((SfxEnumItemInterface&)rItem).GetEnumValue(); aEntry.nMin=0; aEntry.nMax=((SfxEnumItemInterface&)rItem).GetValueCount()-1; break;
-                            case ITEM_BOOL      : aEntry.bCanNum=TRUE; aEntry.nVal=((SfxBoolItem  &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=1;          break;
-                            case ITEM_FLAG      : aEntry.bCanNum=TRUE; aEntry.nVal=((SfxFlagItem  &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF;     break;
-                            case ITEM_FONTHEIGHT: aEntry.bCanNum=TRUE; aEntry.nVal=((SvxFontHeightItem&)rItem).GetHeight(); aEntry.nMin=0;                    break;
-                            case ITEM_FONTWIDTH : aEntry.bCanNum=TRUE; aEntry.nVal=((SvxCharScaleWidthItem&)rItem).GetValue();    aEntry.nMin=0; aEntry.nMax=0xFFFF;break;
+                            case ITEM_BYTE      : aEntry.bIsNum=sal_True;  aEntry.nVal=((SfxByteItem  &)rItem).GetValue(); aEntry.nMin=0;      aEntry.nMax=255;   break;
+                            case ITEM_INT16     : aEntry.bIsNum=sal_True;  aEntry.nVal=((SfxInt16Item &)rItem).GetValue(); aEntry.nMin=-32767; aEntry.nMax=32767; break;
+                            case ITEM_UINT16    : aEntry.bIsNum=sal_True;  aEntry.nVal=((SfxUInt16Item&)rItem).GetValue(); aEntry.nMin=0;      aEntry.nMax=65535; break;
+                            case ITEM_INT32     : aEntry.bIsNum=sal_True;  aEntry.nVal=((SfxInt32Item &)rItem).GetValue();                                        break;
+                            case ITEM_UINT32    : aEntry.bIsNum=sal_True;  aEntry.nVal=((SfxUInt32Item&)rItem).GetValue(); aEntry.nMin=0; /*aEntry.nMax=0xFF...*/;break;
+                            case ITEM_ENUM      : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxEnumItemInterface&)rItem).GetEnumValue(); aEntry.nMin=0; aEntry.nMax=((SfxEnumItemInterface&)rItem).GetValueCount()-1; break;
+                            case ITEM_BOOL      : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxBoolItem  &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=1;          break;
+                            case ITEM_FLAG      : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxFlagItem  &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF;     break;
+                            case ITEM_FONTHEIGHT: aEntry.bCanNum=sal_True; aEntry.nVal=((SvxFontHeightItem&)rItem).GetHeight(); aEntry.nMin=0;                    break;
+                            case ITEM_FONTWIDTH : aEntry.bCanNum=sal_True; aEntry.nVal=((SvxCharScaleWidthItem&)rItem).GetValue();    aEntry.nMin=0; aEntry.nMax=0xFFFF;break;
                             default: break;
                         } // switch
-                        if (aEntry.bIsNum) aEntry.bCanNum=TRUE;
-                        FASTBOOL bGetPres=TRUE;
+                        if (aEntry.bIsNum) aEntry.bCanNum=sal_True;
+                        FASTBOOL bGetPres=sal_True;
                         if (bGetPres) {
                             rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS,
                                                   pPool->GetMetric(nWhich),
@@ -1044,7 +1044,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
                             if (aEntry.eItemType==ITEM_BOOL) aEntry.aValue.AppendAscii(aEntry.nVal!=0 ? "True" : "False");
                             else if (aEntry.bCanNum) aEntry.aValue = UniString::CreateFromInt32(aEntry.nVal);
                             else if (aEntry.eItemType==ITEM_STRING) aEntry.aValue=((SfxStringItem&)rItem).GetValue();
-                            else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((BOOL)aEntry.nVal);
+                            else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((sal_Bool)aEntry.nVal);
                             else aEntry.aValue = String("GPF", aTextEncoding);
                         }
                     } else {
@@ -1058,8 +1058,8 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
         } // while
 
         if (aList.Count()>nEntryNum) { // evtl. noch zuviele Eintraege
-            ULONG nTooMuch=aList.Count()-nEntryNum;
-            for (ULONG nNum=0; nNum<nTooMuch; nNum++) {
+            sal_uIntPtr nTooMuch=aList.Count()-nEntryNum;
+            for (sal_uIntPtr nNum=0; nNum<nTooMuch; nNum++) {
                 delete ImpGetEntry(nEntryNum);
                 aList.Remove(nEntryNum);
             }
@@ -1102,7 +1102,7 @@ void __EXPORT _SdrItemBrowserWindow::GetFocus()
 SdrItemBrowser::SdrItemBrowser(SdrView& rView):
     _SdrItemBrowserWindow(ImpGetViewWin(rView)),
     pView(&rView),
-    bDirty(FALSE)
+    bDirty(sal_False)
 {
     aIdleTimer.SetTimeoutHdl(LINK(this,SdrItemBrowser,IdleHdl));
     GetBrowserControl().SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
@@ -1136,7 +1136,7 @@ void SdrItemBrowser::ForceParent()
 void SdrItemBrowser::SetDirty()
 {
     if (!bDirty) {
-        bDirty=TRUE;
+        bDirty=sal_True;
         aIdleTimer.SetTimeout(1);
         aIdleTimer.Start();
     }
@@ -1145,7 +1145,7 @@ void SdrItemBrowser::SetDirty()
 void SdrItemBrowser::Undirty()
 {
     aIdleTimer.Stop();
-    bDirty = FALSE;
+    bDirty = sal_False;
 
 //  SfxItemSet aSet(pView->GetAttributes());
     SfxItemSet aSet(pView->GetModel()->GetItemPool());
@@ -1153,9 +1153,9 @@ void SdrItemBrowser::Undirty()
 
     if(pView->AreObjectsMarked())
     {
-        // SfxItemSet a2ndSet(pView->GetAttributes(TRUE));
+        // SfxItemSet a2ndSet(pView->GetAttributes(sal_True));
         SfxItemSet a2ndSet(pView->GetModel()->GetItemPool());
-        pView->GetAttributes(a2ndSet, TRUE);
+        pView->GetAttributes(a2ndSet, sal_True);
 
         SetAttributes(&aSet,&a2ndSet);
     }
@@ -1182,7 +1182,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
 
         SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId);
         XubString aNewText(pBrowse->GetNewEntryValue());
-        BOOL bDel( aNewText.EqualsAscii("del")
+        sal_Bool bDel( aNewText.EqualsAscii("del")
             || aNewText.EqualsAscii("Del")
             || aNewText.EqualsAscii("DEL")
             || aNewText.EqualsAscii("default")
@@ -1197,10 +1197,10 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
                 if (nLongVal>pEntry->nMax) nLongVal=pEntry->nMax;
                 if (nLongVal<pEntry->nMin) nLongVal=pEntry->nMin;
             }
-            FASTBOOL bPair=FALSE;
-            FASTBOOL bPairX=TRUE;
-            FASTBOOL bPairY=FALSE;
-            USHORT nSepLen=1;
+            FASTBOOL bPair=sal_False;
+            FASTBOOL bPairX=sal_True;
+            FASTBOOL bPairY=sal_False;
+            sal_uInt16 nSepLen=1;
             long nLongX = aNewText.ToInt32();
             long nLongY=0;
             xub_StrLen nPos = aNewText.Search(sal_Unicode('/'));
@@ -1208,17 +1208,17 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
             if (nPos==STRING_NOTFOUND) nPos=aNewText.Search(sal_Unicode(' '));
             if (nPos==STRING_NOTFOUND) { nPos=aNewText.SearchAscii(".."); if (nPos!=STRING_NOTFOUND) nSepLen=2; }
             if (nPos!=STRING_NOTFOUND) {
-                bPair=TRUE;
+                bPair=sal_True;
                 bPairX=nPos>0;
                 XubString s(aNewText);
                 s.Erase(0,nPos+nSepLen);
-                bPairY = (BOOL)aNewText.Len();
+                bPairY = (sal_Bool)aNewText.Len();
                 nLongY = s.ToInt32();
             }
             switch (pEntry->eItemType) {
-                case ITEM_BYTE  : ((SfxByteItem  *)pNewItem)->SetValue((BYTE  )nLongVal); break;
-                case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((INT16 )nLongVal); break;
-                case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((UINT16)nLongVal); break;
+                case ITEM_BYTE  : ((SfxByteItem  *)pNewItem)->SetValue((sal_uInt8  )nLongVal); break;
+                case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((sal_Int16 )nLongVal); break;
+                case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
                 case ITEM_INT32: {
                     if(HAS_BASE(SdrAngleItem, pNewItem))
                     {
@@ -1226,10 +1226,10 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
                         double nVal = aNewText.ToFloat();
                         nLongVal = (long)(nVal * 100 + 0.5);
                     }
-                    ((SfxInt32Item *)pNewItem)->SetValue((INT32)nLongVal);
+                    ((SfxInt32Item *)pNewItem)->SetValue((sal_Int32)nLongVal);
                 } break;
                 case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.ToInt32()); break;
-                case ITEM_ENUM  : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((USHORT)nLongVal); break;
+                case ITEM_ENUM  : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((sal_uInt16)nLongVal); break;
                 case ITEM_BOOL: {
                     aNewText.ToUpperAscii();
                     if (aNewText.EqualsAscii("TRUE")) nLongVal=1;
@@ -1238,15 +1238,15 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
                     if (aNewText.EqualsAscii("EIN")) nLongVal=1;
                     if (aNewText.EqualsAscii("ON")) nLongVal=1;
                     if (aNewText.EqualsAscii("YES")) nLongVal=1;
-                    ((SfxBoolItem*)pNewItem)->SetValue((BOOL)nLongVal);
+                    ((SfxBoolItem*)pNewItem)->SetValue((sal_Bool)nLongVal);
                 } break;
-                case ITEM_FLAG  : ((SfxFlagItem  *)pNewItem)->SetValue((USHORT)nLongVal); break;
+                case ITEM_FLAG  : ((SfxFlagItem  *)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
                 case ITEM_STRING: ((SfxStringItem*)pNewItem)->SetValue(aNewText); break;
                 case ITEM_POINT : ((SfxPointItem*)pNewItem)->SetValue(Point(nLongX,nLongY)); break;
                 case ITEM_RECT  : break;
                 case ITEM_RANGE : {
-                    ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongX;
-                    ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongY;
+                    ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongX;
+                    ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongY;
                 } break;
                 case ITEM_LRANGE : {
                 } break;
@@ -1263,19 +1263,19 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
                     ((SvxFontItem*)pNewItem)->GetStyleName().Erase();
                 } break;
                 case ITEM_FONTHEIGHT: {
-                    ULONG nHgt=0;
-                    USHORT nProp=100;
+                    sal_uIntPtr nHgt=0;
+                    sal_uInt16 nProp=100;
                     if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
-                        nProp=(USHORT)nLongVal;
+                        nProp=(sal_uInt16)nLongVal;
                     } else {
                         nHgt=nLongVal;
                     }
                     ((SvxFontHeightItem*)pNewItem)->SetHeight(nHgt,nProp);
                 } break;
                 case ITEM_FONTWIDTH: {
-                    USHORT nProp=100;
+                    sal_uInt16 nProp=100;
                     if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
-                        nProp=(USHORT)nLongVal;
+                        nProp=(sal_uInt16)nLongVal;
                     }
                     ((SvxCharScaleWidthItem*)pNewItem)->SetValue(nProp);
                 } break;
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 0e7bc872c5a6..7bc03d3a5957 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -36,16 +36,16 @@
 // #99190#
 #include <svx/scene3d.hxx>
 
-SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bReverse)
+SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bReverse)
 :   maObjList(1024, 64, 64),
     mnIndex(0L),
     mbReverse(bReverse)
 {
-    ImpProcessObjectList(rObjList, eMode, TRUE);
+    ImpProcessObjectList(rObjList, eMode, sal_True);
     Reset();
 }
 
-SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrIterMode eMode, BOOL bReverse)
+SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode, sal_Bool bReverse)
 :   maObjList(1024, 64, 64),
     mnIndex(0L),
     mbReverse(bReverse)
@@ -54,19 +54,19 @@ SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrI
     Reset();
 }
 
-SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, BOOL bReverse )
+SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, sal_Bool bReverse )
 :   maObjList(1024, 64, 64),
     mnIndex(0L),
     mbReverse(bReverse)
 {
     if ( rObj.ISA( SdrObjGroup ) )
-        ImpProcessObjectList(*rObj.GetSubList(), eMode, TRUE);
+        ImpProcessObjectList(*rObj.GetSubList(), eMode, sal_True);
     else
         maObjList.Insert( (void*)&rObj, LIST_APPEND );
     Reset();
 }
 
-SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, BOOL bReverse )
+SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, sal_Bool bReverse )
 :   maObjList(1024, 64, 64),
     mnIndex(0L),
     mbReverse(bReverse)
@@ -75,9 +75,9 @@ SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode,
     Reset();
 }
 
-void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bUseZOrder)
+void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder)
 {
-    for( ULONG nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx )
+    for( sal_uIntPtr nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx )
     {
         SdrObject* pObj = bUseZOrder ?
             rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx );
@@ -89,12 +89,12 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod
 
 void SdrObjListIter::ImpProcessMarkList( const SdrMarkList& rMarkList, SdrIterMode eMode )
 {
-    for( ULONG nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx )
+    for( sal_uIntPtr nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx )
         if( SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj() )
-            ImpProcessObj( pObj, eMode, FALSE );
+            ImpProcessObj( pObj, eMode, sal_False );
 }
 
-void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, BOOL bUseZOrder)
+void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder)
 {
     bool bIsGroup = pObj->IsGroupObject();
     // #99190# 3D objects are no group objects, IsGroupObject()
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 2c12a7b5d06c..f4df93fc843e 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -157,7 +157,7 @@ void SetOfByte::PutValue( const com::sun::star::uno::Any & rAny )
         sal_Int16 nIndex;
         for( nIndex = 0; nIndex < nCount; nIndex++ )
         {
-            aData[nIndex] = static_cast<BYTE>(aSeq[nIndex]);
+            aData[nIndex] = static_cast<sal_uInt8>(aSeq[nIndex]);
         }
 
         for( ; nIndex < 32; nIndex++ )
@@ -198,7 +198,7 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const
 
 void SdrLayer::SetStandardLayer(FASTBOOL bStd)
 {
-    nType=(UINT16)bStd;
+    nType=(sal_uInt16)bStd;
     if (bStd) {
         aName=ImpGetResStr(STR_StandardLayerName);
     }
@@ -278,8 +278,8 @@ const SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmi
 {
     ClearLayer();
     pParent=rSrcLayerAdmin.pParent;
-    USHORT i;
-    USHORT nAnz=rSrcLayerAdmin.GetLayerCount();
+    sal_uInt16 i;
+    sal_uInt16 nAnz=rSrcLayerAdmin.GetLayerCount();
     for (i=0; i<nAnz; i++) {
         aLayer.Insert(new SdrLayer(*rSrcLayerAdmin.GetLayer(i)),CONTAINER_APPEND);
     }
@@ -290,10 +290,10 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const
 {
     if (pParent!=rCmpLayerAdmin.pParent ||
         aLayer.Count()!=rCmpLayerAdmin.aLayer.Count() ||
-        aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return FALSE;
-    FASTBOOL bOk=TRUE;
-    USHORT nAnz=GetLayerCount();
-    USHORT i=0;
+        aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return sal_False;
+    FASTBOOL bOk=sal_True;
+    sal_uInt16 nAnz=GetLayerCount();
+    sal_uInt16 i=0;
     while (bOk && i<nAnz) {
         bOk=*GetLayer(i)==*rCmpLayerAdmin.GetLayer(i);
         i++;
@@ -305,8 +305,8 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel)
 {
     if (pNewModel!=pModel) {
         pModel=pNewModel;
-        USHORT nAnz=GetLayerCount();
-        USHORT i;
+        sal_uInt16 nAnz=GetLayerCount();
+        sal_uInt16 i;
         for (i=0; i<nAnz; i++) {
             GetLayer(i)->SetModel(pNewModel);
         }
@@ -322,14 +322,14 @@ void SdrLayerAdmin::Broadcast() const
     }
 }
 
-SdrLayer* SdrLayerAdmin::RemoveLayer(USHORT nPos)
+SdrLayer* SdrLayerAdmin::RemoveLayer(sal_uInt16 nPos)
 {
     SdrLayer* pRetLayer=(SdrLayer*)(aLayer.Remove(nPos));
     Broadcast();
     return pRetLayer;
 }
 
-SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos)
+SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, sal_uInt16 nPos)
 {
     SdrLayerID nID=GetUniqueLayerID();
     SdrLayer* pLay=new SdrLayer(nID,rName);
@@ -339,7 +339,7 @@ SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos)
     return pLay;
 }
 
-SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos)
+SdrLayer* SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos)
 {
     SdrLayerID nID=GetUniqueLayerID();
     SdrLayer* pLay=new SdrLayer(nID,String());
@@ -350,7 +350,7 @@ SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos)
     return pLay;
 }
 
-SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos)
+SdrLayer* SdrLayerAdmin::MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos)
 {
     SdrLayer* pLayer=(SdrLayer*)(aLayer.Remove(nPos));
     if (pLayer!=NULL) {
@@ -361,9 +361,9 @@ SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos)
     return pLayer;
 }
 
-void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos)
+void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos)
 {
-    ULONG nPos=aLayer.GetPos(pLayer);
+    sal_uIntPtr nPos=aLayer.GetPos(pLayer);
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         aLayer.Remove(nPos);
         aLayer.Insert(pLayer,nNewPos);
@@ -371,21 +371,21 @@ void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos)
     }
 }
 
-USHORT SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
+sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
 {
-    ULONG nRet=SDRLAYER_NOTFOUND;
+    sal_uIntPtr nRet=SDRLAYER_NOTFOUND;
     if (pLayer!=NULL) {
         nRet=aLayer.GetPos(pLayer);
         if (nRet==CONTAINER_ENTRY_NOTFOUND) {
             nRet=SDRLAYER_NOTFOUND;
         }
     }
-    return USHORT(nRet);
+    return sal_uInt16(nRet);
 }
 
 const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, FASTBOOL /*bInherited*/) const
 {
-    UINT16 i(0);
+    sal_uInt16 i(0);
     const SdrLayer* pLay = NULL;
 
     while(i < GetLayerCount() && !pLay)
@@ -398,7 +398,7 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, FASTBOOL /*bInhe
 
     if(!pLay && pParent)
     {
-        pLay = pParent->GetLayer(rName, TRUE);
+        pLay = pParent->GetLayer(rName, sal_True);
     }
 
     return pLay;
@@ -412,9 +412,9 @@ SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, FASTBOOL bInherited
     return nRet;
 }
 
-const SdrLayer* SdrLayerAdmin::GetLayerPerID(USHORT nID) const
+const SdrLayer* SdrLayerAdmin::GetLayerPerID(sal_uInt16 nID) const
 {
-    USHORT i=0;
+    sal_uInt16 i=0;
     const SdrLayer* pLay=NULL;
     while (i<GetLayerCount() && pLay==NULL) {
         if (nID==GetLayer(i)->GetID()) pLay=GetLayer(i);
@@ -431,7 +431,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
 {
     SetOfByte aSet;
     sal_Bool bDown = (pParent == NULL);
-    USHORT j;
+    sal_uInt16 j;
     for (j=0; j<GetLayerCount(); j++)
     {
         aSet.Set(GetLayer((sal_uInt16)j)->GetID());
@@ -440,7 +440,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
     if (!bDown)
     {
         i=254;
-        while (i && aSet.IsSet(BYTE(i)))
+        while (i && aSet.IsSet(sal_uInt8(i)))
             --i;
         if (i == 0)
             i=254;
@@ -448,7 +448,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
     else
     {
         i=0;
-        while (i<=254 && aSet.IsSet(BYTE(i)))
+        while (i<=254 && aSet.IsSet(sal_uInt8(i)))
             i++;
         if (i>254)
             i=0;
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index d61654e674ea..8949b1418f94 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -74,7 +74,7 @@ void SdrUShortCont::Sort() const
     aSort.DoSort();
     ((SdrUShortCont*)this)->mbSorted = sal_True;
 
-    ULONG nNum(GetCount());
+    sal_uLong nNum(GetCount());
 
     if(nNum > 1)
     {
@@ -96,9 +96,9 @@ void SdrUShortCont::Sort() const
     }
 }
 
-void SdrUShortCont::CheckSort(ULONG nPos)
+void SdrUShortCont::CheckSort(sal_uLong nPos)
 {
-    ULONG nAnz(maArray.Count());
+    sal_uLong nAnz(maArray.Count());
 
     if(nPos > nAnz)
         nPos = nAnz;
@@ -343,7 +343,7 @@ int ImpSdrMarkListSorter::Compare(const void* pElem1, const void* pElem2) const
 
     if (pOL1 == pOL2)
     {
-        // AF: Note that I reverted a change from sal_uInt32 to ULONG (made
+        // AF: Note that I reverted a change from sal_uInt32 to sal_uLong (made
         // for 64bit compliance, #i78198#) because internally in SdrObject
         // both nOrdNum and mnNavigationPosition are stored as sal_uInt32.
         sal_uInt32 nObjOrd1((pObj1) ? pObj1->GetNavigationPosition() : 0);
@@ -372,7 +372,7 @@ void SdrMarkList::ImpForceSort()
     if(!mbSorted)
     {
         mbSorted = sal_True;
-        ULONG nAnz = maList.Count();
+        sal_uLong nAnz = maList.Count();
 
         // remove invalid
         if(nAnz > 0 )
@@ -431,7 +431,7 @@ void SdrMarkList::ImpForceSort()
 
 void SdrMarkList::Clear()
 {
-    for(ULONG i(0L); i < GetMarkCount(); i++)
+    for(sal_uLong i(0L); i < GetMarkCount(); i++)
     {
         SdrMark* pMark = GetMark(i);
         delete pMark;
@@ -445,7 +445,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
 {
     Clear();
 
-    for(ULONG i(0L); i < rLst.GetMarkCount(); i++)
+    for(sal_uLong i(0L); i < rLst.GetMarkCount(); i++)
     {
         SdrMark* pMark = rLst.GetMark(i);
         SdrMark* pNeuMark = new SdrMark(*pMark);
@@ -461,7 +461,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
     mbSorted = rLst.mbSorted;
 }
 
-ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
+sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const
 {
     // #109658#
     //
@@ -476,7 +476,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
     // less dangerous to change this method then changing SdrObject::GetOrdNum().
     if(pObj && maList.Count())
     {
-        for(ULONG a(0L); a < maList.Count(); a++)
+        for(sal_uLong a(0L); a < maList.Count(); a++)
         {
             if(((SdrMark*)(maList.GetObject(a)))->GetMarkedSdrObj() == pObj)
             {
@@ -491,7 +491,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
 void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
 {
     SetNameDirty();
-    ULONG nAnz(maList.Count());
+    sal_uLong nAnz(maList.Count());
 
     if(!bChkSort || !mbSorted || nAnz == 0)
     {
@@ -502,7 +502,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
     }
     else
     {
-        SdrMark* pLast = GetMark(ULONG(nAnz - 1));
+        SdrMark* pLast = GetMark(sal_uLong(nAnz - 1));
         const SdrObject* pLastObj = pLast->GetMarkedSdrObj();
         const SdrObject* pNeuObj = rMark.GetMarkedSdrObj();
 
@@ -527,8 +527,8 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
 
             if(pLastOL == pNeuOL)
             {
-                const ULONG nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0);
-                const ULONG nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0);
+                const sal_uLong nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0);
+                const sal_uLong nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0);
 
                 if(nNeuNum < nLastNum)
                 {
@@ -547,7 +547,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
     return;
 }
 
-void SdrMarkList::DeleteMark(ULONG nNum)
+void SdrMarkList::DeleteMark(sal_uLong nNum)
 {
     SdrMark* pMark = GetMark(nNum);
     DBG_ASSERT(pMark!=0L,"DeleteMark: MarkEntry nicht gefunden");
@@ -560,7 +560,7 @@ void SdrMarkList::DeleteMark(ULONG nNum)
     }
 }
 
-void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum)
+void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum)
 {
     SdrMark* pMark = GetMark(nNum);
     DBG_ASSERT(pMark!=0L,"ReplaceMark: MarkEntry nicht gefunden");
@@ -577,7 +577,7 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum)
 
 void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
 {
-    ULONG nAnz(rSrcList.maList.Count());
+    sal_uLong nAnz(rSrcList.maList.Count());
 
     if(rSrcList.mbSorted)
     {
@@ -587,7 +587,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
 
     if(!bReverse)
     {
-        for(ULONG i(0L); i < nAnz; i++)
+        for(sal_uLong i(0L); i < nAnz; i++)
         {
             SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i));
             InsertEntry(*pM);
@@ -595,7 +595,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
     }
     else
     {
-        for(ULONG i(nAnz); i > 0;)
+        for(sal_uLong i(nAnz); i > 0;)
         {
             i--;
             SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i));
@@ -608,7 +608,7 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
 {
     sal_Bool bChgd(sal_False);
 
-    for(ULONG i(GetMarkCount()); i > 0; )
+    for(sal_uLong i(GetMarkCount()); i > 0; )
     {
         i--;
         SdrMark* pMark = GetMark(i);
@@ -631,9 +631,9 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
     DeletePageView(rPV); // erstmal alle raus, dann die ganze Seite hinten dran
     SdrObject* pObj;
     const SdrObjList* pOL = rPV.GetObjList();
-    ULONG nObjAnz(pOL->GetObjCount());
+    sal_uLong nObjAnz(pOL->GetObjCount());
 
-    for(ULONG nO(0L); nO < nObjAnz; nO++)
+    for(sal_uLong nO(0L); nO < nObjAnz; nO++)
     {
         pObj = pOL->GetObj(nO);
         sal_Bool bDoIt(rPV.IsObjMarkable(pObj));
@@ -652,7 +652,7 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
 
 const XubString& SdrMarkList::GetMarkDescription() const
 {
-    ULONG nAnz(GetMarkCount());
+    sal_uLong nAnz(GetMarkCount());
 
     if(mbNameOk && 1L == nAnz)
     {
@@ -690,7 +690,7 @@ const XubString& SdrMarkList::GetMarkDescription() const
                 XubString aStr1;
                 sal_Bool bEq(sal_True);
 
-                for(ULONG i = 1; i < GetMarkCount() && bEq; i++)
+                for(sal_uLong i = 1; i < GetMarkCount() && bEq; i++)
                 {
                     SdrMark* pMark2 = GetMark(i);
                     pMark2->GetMarkedSdrObj()->TakeObjNamePlural(aStr1);
@@ -718,16 +718,16 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
 {
     sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk);
     XubString& rName = (XubString&)(bGlue ? maGluePointName : maPointName);
-    ULONG nMarkAnz(GetMarkCount());
-    ULONG nMarkPtAnz(0L);
-    ULONG nMarkPtObjAnz(0L);
-    ULONG n1stMarkNum(ULONG_MAX);
+    sal_uLong nMarkAnz(GetMarkCount());
+    sal_uLong nMarkPtAnz(0L);
+    sal_uLong nMarkPtObjAnz(0L);
+    sal_uLong n1stMarkNum(ULONG_MAX);
 
-    for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
+    for(sal_uLong nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
     {
         const SdrMark* pMark = GetMark(nMarkNum);
         const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints();
-        ULONG nAnz(pPts ? pPts->GetCount() : 0);
+        sal_uLong nAnz(pPts ? pPts->GetCount() : 0);
 
         if(nAnz)
         {
@@ -786,7 +786,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
             XubString aStr1;
             sal_Bool bEq(sal_True);
 
-            for(ULONG i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++)
+            for(sal_uLong i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++)
             {
                 const SdrMark* pMark2 = GetMark(i);
                 const SdrUShortCont* pPts = bGlue ? pMark2->GetMarkedGluePoints() : pMark2->GetMarkedPoints();
@@ -832,7 +832,7 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
     sal_Bool bFnd(sal_False);
     Rectangle aR;
 
-    for(ULONG i(0L); i < GetMarkCount(); i++)
+    for(sal_uLong i(0L); i < GetMarkCount(); i++)
     {
         SdrMark* pMark = GetMark(i);
 
@@ -862,7 +862,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
 {
     sal_Bool bFnd(sal_False);
 
-    for(ULONG i(0L); i < GetMarkCount(); i++)
+    for(sal_uLong i(0L); i < GetMarkCount(); i++)
     {
         SdrMark* pMark = GetMark(i);
 
@@ -953,7 +953,7 @@ namespace sdr
             {
                 SdrObjList* pList = pObj->GetSubList();
 
-                for(ULONG a(0L); a < pList->GetObjCount(); a++)
+                for(sal_uLong a(0L); a < pList->GetObjCount(); a++)
                 {
                     SdrObject* pObj2 = pList->GetObj(a);
                     ImplCollectCompleteSelection(pObj2);
@@ -975,9 +975,9 @@ namespace sdr
             maAllMarkedObjects.Clear();
 
             // #126320# GetMarkCount after ForceSort
-            const ULONG nMarkAnz(maMarkedObjectList.GetMarkCount());
+            const sal_uLong nMarkAnz(maMarkedObjectList.GetMarkCount());
 
-            for(ULONG a(0L); a < nMarkAnz; a++)
+            for(sal_uLong a(0L); a < nMarkAnz; a++)
             {
                 SdrObject* pCandidate = maMarkedObjectList.GetMark(a)->GetMarkedSdrObj();
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 80b586c01600..5328e5f1a3d1 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -123,10 +123,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     eUIUnit=FUNIT_MM;
     aUIScale=Fraction(1,1);
     nUIUnitKomma=0;
-    bUIOnlyKomma=FALSE;
+    bUIOnlyKomma=sal_False;
     pLayerAdmin=NULL;
     pItemPool=pPool;
-    bMyPool=FALSE;
+    bMyPool=sal_False;
     m_pEmbeddedHelper=_pEmbeddedHelper;
     pDrawOutliner=NULL;
     pHitTestOutliner=NULL;
@@ -144,21 +144,21 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     mbUndoEnabled=true;
     nProgressPercent=0;
     nLoadVersion=0;
-    bExtColorTable=FALSE;
+    bExtColorTable=sal_False;
     mbChanged = sal_False;
-    bInfoChanged=FALSE;
-    bPagNumsDirty=FALSE;
-    bMPgNumsDirty=FALSE;
-    bPageNotValid=FALSE;
-    bSavePortable=FALSE;
-    bSaveCompressed=FALSE;
-    bSaveNative=FALSE;
-    bSwapGraphics=FALSE;
+    bInfoChanged=sal_False;
+    bPagNumsDirty=sal_False;
+    bMPgNumsDirty=sal_False;
+    bPageNotValid=sal_False;
+    bSavePortable=sal_False;
+    bSaveCompressed=sal_False;
+    bSaveNative=sal_False;
+    bSwapGraphics=sal_False;
     nSwapGraphicsMode=SDR_SWAPGRAPHICSMODE_DEFAULT;
-    bSaveOLEPreview=FALSE;
-    bPasteResize=FALSE;
-    bNoBitmapCaching=FALSE;
-    bReadOnly=FALSE;
+    bSaveOLEPreview=sal_False;
+    bPasteResize=sal_False;
+    bNoBitmapCaching=sal_False;
+    bReadOnly=sal_False;
     nStreamCompressMode=COMPRESSMODE_NONE;
     nStreamNumberFormat=NUMBERFORMAT_INT_BIGENDIAN;
     nDefaultTabulator=0;
@@ -169,12 +169,12 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     pGradientList=NULL;
     pBitmapList=NULL;
     mpNumberFormatter = NULL;
-    bTransparentTextFrames=FALSE;
-    bStarDrawPreviewMode = FALSE;
+    bTransparentTextFrames=sal_False;
+    bStarDrawPreviewMode = sal_False;
     nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND;
     pModelStorage = NULL;
     mpForbiddenCharactersTable = NULL;
-    mbModelLocked = FALSE;
+    mbModelLocked = sal_False;
     mpOutlinerCache = NULL;
     mbKernAsianPunctuation = sal_False;
     mbAddExtLeading = sal_False;
@@ -196,7 +196,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
         // OutlinerPool als SecondaryPool des SdrPool
         pItemPool->SetSecondaryPool(pOutlPool);
         // Merken, dass ich mir die beiden Pools selbst gemacht habe
-        bMyPool=TRUE;
+        bMyPool=sal_True;
     }
     pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit);
 
@@ -217,10 +217,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     // den DrawOutliner OnDemand erzeugen geht noch nicht, weil ich den Pool
     // sonst nicht kriege (erst ab 302!)
     pDrawOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
-    ImpSetOutlinerDefaults(pDrawOutliner, TRUE);
+    ImpSetOutlinerDefaults(pDrawOutliner, sal_True);
 
     pHitTestOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
-    ImpSetOutlinerDefaults(pHitTestOutliner, TRUE);
+    ImpSetOutlinerDefaults(pHitTestOutliner, sal_True);
 
     ImpCreateTables();
 }
@@ -234,7 +234,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal
 #endif
 
     DBG_CTOR(SdrModel,NULL);
-    ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
+    ImpCtor(pPool,pPers,sal_False, (FASTBOOL)bLoadRefCounts);
 }
 
 SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts):
@@ -247,7 +247,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed
 #endif
 
     DBG_CTOR(SdrModel,NULL);
-    ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
+    ImpCtor(pPool,pPers,sal_False, (FASTBOOL)bLoadRefCounts);
 }
 
 SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts):
@@ -401,7 +401,7 @@ void SdrModel::operator=(const SdrModel& /*rSrcModel*/)
 FASTBOOL SdrModel::operator==(const SdrModel& /*rCmpModel*/) const
 {
     DBG_ERROR("SdrModel::operator==() ist noch nicht implementiert");
-    return FALSE;
+    return sal_False;
 }
 
 void SdrModel::SetSwapGraphics( FASTBOOL bSwap )
@@ -421,7 +421,7 @@ void SdrModel::SetReadOnly(FASTBOOL bYes)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrModel::SetMaxUndoActionCount(ULONG nAnz)
+void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nAnz)
 {
     if (nAnz<1) nAnz=1;
     nMaxUndoCount=nAnz;
@@ -452,7 +452,7 @@ void SdrModel::ClearUndoBuffer()
 
 FASTBOOL SdrModel::Undo()
 {
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     if( mpImpl->mpUndoManager )
     {
         DBG_ERROR("svx::SdrModel::Undo(), method not supported with application undo manager!");
@@ -467,7 +467,7 @@ FASTBOOL SdrModel::Undo()
             pDo->Undo();
             if(pRedoStack==NULL)
                 pRedoStack=new Container(1024,16,16);
-            pRedoStack->Insert(pUndoStack->Remove((ULONG)0),(ULONG)0);
+            pRedoStack->Insert(pUndoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0);
             mbUndoEnabled = bWasUndoEnabled;
         }
     }
@@ -476,7 +476,7 @@ FASTBOOL SdrModel::Undo()
 
 FASTBOOL SdrModel::Redo()
 {
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     if( mpImpl->mpUndoManager )
     {
         DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!");
@@ -491,7 +491,7 @@ FASTBOOL SdrModel::Redo()
             pDo->Redo();
             if(pUndoStack==NULL)
                 pUndoStack=new Container(1024,16,16);
-            pUndoStack->Insert(pRedoStack->Remove((ULONG)0),(ULONG)0);
+            pUndoStack->Insert(pRedoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0);
             mbUndoEnabled = bWasUndoEnabled;
         }
     }
@@ -500,7 +500,7 @@ FASTBOOL SdrModel::Redo()
 
 FASTBOOL SdrModel::Repeat(SfxRepeatTarget& rView)
 {
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     if( mpImpl->mpUndoManager )
     {
         DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!");
@@ -513,7 +513,7 @@ FASTBOOL SdrModel::Repeat(SfxRepeatTarget& rView)
             if(pDo->CanRepeat(rView))
             {
                 pDo->Repeat(rView);
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
     }
@@ -533,7 +533,7 @@ void SdrModel::ImpPostUndoAction(SdrUndoAction* pUndo)
         {
             if (pUndoStack==NULL)
                 pUndoStack=new Container(1024,16,16);
-            pUndoStack->Insert(pUndo,(ULONG)0);
+            pUndoStack->Insert(pUndo,(sal_uIntPtr)0);
             while (pUndoStack->Count()>nMaxUndoCount)
             {
                 delete (SfxUndoAction*)pUndoStack->Remove(pUndoStack->Count()-1);
@@ -782,7 +782,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor)
     sal_Int32 nAnz=GetPageCount();
     for (i=nAnz-1; i>=0; i--)
     {
-        DeletePage( (USHORT)i );
+        DeletePage( (sal_uInt16)i );
     }
     maPages.Clear();
     // #109538#
@@ -792,7 +792,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor)
     nAnz=GetMasterPageCount();
     for(i=nAnz-1; i>=0; i--)
     {
-        DeleteMasterPage( (USHORT)i );
+        DeleteMasterPage( (sal_uInt16)i );
     }
     maMaPag.Clear();
     // #109538#
@@ -820,9 +820,9 @@ void SdrModel::SetTextDefaults() const
 
 void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex)
 {
-    const USHORT nItemCnt = 3;
+    const sal_uInt16 nItemCnt = 3;
     static struct {
-        USHORT nFntType, nLanguage;
+        sal_uInt16 nFntType, nLanguage;
     }  aOutTypeArr[ nItemCnt ] = {
         {  DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US },
         {  DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US },
@@ -830,7 +830,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo
     };
     SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
 
-    for( USHORT n = 0; n < nItemCnt; ++n )
+    for( sal_uInt16 n = 0; n < nItemCnt; ++n )
     {
         Font aFnt( OutputDevice::GetDefaultFont(
             aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage,
@@ -844,7 +844,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo
     }
 }
 
-void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt )
+void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt )
 {
     // #95114# set application-language specific dynamic pool language defaults
     SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ;
@@ -897,7 +897,7 @@ SdrOutliner& SdrModel::GetDrawOutliner(const SdrTextObj* pObj) const
 boost::shared_ptr< SdrOutliner > SdrModel::CreateDrawOutliner(const SdrTextObj* pObj)
 {
     boost::shared_ptr< SdrOutliner > xDrawOutliner( SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ) );
-    ImpSetOutlinerDefaults(xDrawOutliner.get(), TRUE);
+    ImpSetOutlinerDefaults(xDrawOutliner.get(), sal_True);
     xDrawOutliner->SetTextObj(pObj);
     return xDrawOutliner;
 }
@@ -910,7 +910,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const
     return NULL;
 }
 
-void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit )
+void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit )
 {
     /**************************************************************************
     * Initialisierung der Outliner fuer Textausgabe und HitTest
@@ -918,7 +918,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit )
     if( bInit )
     {
         pOutliner->EraseVirtualDevice();
-        pOutliner->SetUpdateMode(FALSE);
+        pOutliner->SetUpdateMode(sal_False);
         pOutliner->SetEditTextObjectPool(pItemPool);
         pOutliner->SetDefTab(nDefaultTabulator);
     }
@@ -949,8 +949,8 @@ void SdrModel::ImpReformatAllTextObjects()
     if( isLocked() )
         return;
 
-    USHORT nAnz=GetMasterPageCount();
-    USHORT nNum;
+    sal_uInt16 nAnz=GetMasterPageCount();
+    sal_uInt16 nNum;
     for (nNum=0; nNum<nAnz; nNum++) {
         GetMasterPage(nNum)->ReformatAllTextObjects();
     }
@@ -991,8 +991,8 @@ SvStream* SdrModel::GetDocumentStream(SdrDocumentStreamInfo& /*rStreamInfo*/) co
 // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln.
 void SdrModel::BurnInStyleSheetAttributes()
 {
-    USHORT nAnz=GetMasterPageCount();
-    USHORT nNum;
+    sal_uInt16 nAnz=GetMasterPageCount();
+    sal_uInt16 nNum;
     for (nNum=0; nNum<nAnz; nNum++) {
         GetMasterPage(nNum)->BurnInStyleSheetAttributes();
     }
@@ -1008,7 +1008,7 @@ void SdrModel::RefDeviceChanged()
     ImpReformatAllTextObjects();
 }
 
-void SdrModel::SetDefaultFontHeight(ULONG nVal)
+void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal)
 {
     if (nVal!=nDefTextHgt) {
         nDefTextHgt=nVal;
@@ -1017,7 +1017,7 @@ void SdrModel::SetDefaultFontHeight(ULONG nVal)
     }
 }
 
-void SdrModel::SetDefaultTabulator(USHORT nVal)
+void SdrModel::SetDefaultTabulator(sal_uInt16 nVal)
 {
     if (nDefaultTabulator!=nVal) {
         nDefaultTabulator=nVal;
@@ -1410,7 +1410,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars,
 
 void SdrModel::TakeWinkStr(long nWink, XubString& rStr, FASTBOOL bNoDegChar) const
 {
-    BOOL bNeg(nWink < 0);
+    sal_Bool bNeg(nWink < 0);
 
     if(bNeg)
         nWink = -nWink;
@@ -1438,9 +1438,9 @@ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, FASTBOOL bNoDegChar) con
 
 void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, FASTBOOL bNoPercentChar) const
 {
-    INT32 nMul(rVal.GetNumerator());
-    INT32 nDiv(rVal.GetDenominator());
-    BOOL bNeg(nMul < 0);
+    sal_Int32 nMul(rVal.GetNumerator());
+    sal_Int32 nDiv(rVal.GetDenominator());
+    sal_Bool bNeg(nMul < 0);
 
     if(nDiv < 0)
         bNeg = !bNeg;
@@ -1472,48 +1472,48 @@ void SdrModel::SetChanged(sal_Bool bFlg)
 void SdrModel::RecalcPageNums(FASTBOOL bMaster)
 {
     Container& rPL=*(bMaster ? &maMaPag : &maPages);
-    USHORT nAnz=USHORT(rPL.Count());
-    USHORT i;
+    sal_uInt16 nAnz=sal_uInt16(rPL.Count());
+    sal_uInt16 i;
     for (i=0; i<nAnz; i++) {
         SdrPage* pPg=(SdrPage*)(rPL.GetObject(i));
         pPg->SetPageNum(i);
     }
-    if (bMaster) bMPgNumsDirty=FALSE;
-    else bPagNumsDirty=FALSE;
+    if (bMaster) bMPgNumsDirty=sal_False;
+    else bPagNumsDirty=sal_False;
 }
 
-void SdrModel::InsertPage(SdrPage* pPage, USHORT nPos)
+void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
 {
-    USHORT nAnz=GetPageCount();
+    sal_uInt16 nAnz=GetPageCount();
     if (nPos>nAnz) nPos=nAnz;
     maPages.Insert(pPage,nPos);
     // #109538#
     PageListChanged();
-    pPage->SetInserted(TRUE);
+    pPage->SetInserted(sal_True);
     pPage->SetPageNum(nPos);
     pPage->SetModel(this);
-    if (nPos<nAnz) bPagNumsDirty=TRUE;
+    if (nPos<nAnz) bPagNumsDirty=sal_True;
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
     aHint.SetPage(pPage);
     Broadcast(aHint);
 }
 
-void SdrModel::DeletePage(USHORT nPgNum)
+void SdrModel::DeletePage(sal_uInt16 nPgNum)
 {
     SdrPage* pPg=RemovePage(nPgNum);
     delete pPg;
 }
 
-SdrPage* SdrModel::RemovePage(USHORT nPgNum)
+SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum)
 {
     SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum);
     // #109538#
     PageListChanged();
     if (pPg!=NULL) {
-        pPg->SetInserted(FALSE);
+        pPg->SetInserted(sal_False);
     }
-    bPagNumsDirty=TRUE;
+    bPagNumsDirty=sal_True;
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
     aHint.SetPage(pPg);
@@ -1521,29 +1521,29 @@ SdrPage* SdrModel::RemovePage(USHORT nPgNum)
     return pPg;
 }
 
-void SdrModel::MovePage(USHORT nPgNum, USHORT nNewPos)
+void SdrModel::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
 {
     SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum);
     // #109538#
     PageListChanged();
     if (pPg!=NULL) {
-        pPg->SetInserted(FALSE);
+        pPg->SetInserted(sal_False);
         InsertPage(pPg,nNewPos);
     }
 }
 
-void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos)
+void SdrModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
 {
-    USHORT nAnz=GetMasterPageCount();
+    sal_uInt16 nAnz=GetMasterPageCount();
     if (nPos>nAnz) nPos=nAnz;
     maMaPag.Insert(pPage,nPos);
     // #109538#
     MasterPageListChanged();
-    pPage->SetInserted(TRUE);
+    pPage->SetInserted(sal_True);
     pPage->SetPageNum(nPos);
     pPage->SetModel(this);
     if (nPos<nAnz) {
-        bMPgNumsDirty=TRUE;
+        bMPgNumsDirty=sal_True;
     }
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
@@ -1551,13 +1551,13 @@ void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos)
     Broadcast(aHint);
 }
 
-void SdrModel::DeleteMasterPage(USHORT nPgNum)
+void SdrModel::DeleteMasterPage(sal_uInt16 nPgNum)
 {
     SdrPage* pPg=RemoveMasterPage(nPgNum);
     if (pPg!=NULL) delete pPg;
 }
 
-SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
+SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum)
 {
     SdrPage* pRetPg=(SdrPage*)maMaPag.Remove(nPgNum);
     // #109538#
@@ -1573,10 +1573,10 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
             GetPage(np)->TRG_ImpMasterPageRemoved(*pRetPg);
         }
 
-        pRetPg->SetInserted(FALSE);
+        pRetPg->SetInserted(sal_False);
     }
 
-    bMPgNumsDirty=TRUE;
+    bMPgNumsDirty=sal_True;
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
     aHint.SetPage(pRetPg);
@@ -1584,18 +1584,18 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
     return pRetPg;
 }
 
-void SdrModel::MoveMasterPage(USHORT nPgNum, USHORT nNewPos)
+void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
 {
     SdrPage* pPg=(SdrPage*)maMaPag.Remove(nPgNum);
     // #109538#
     MasterPageListChanged();
     if (pPg!=NULL) {
-        pPg->SetInserted(FALSE);
+        pPg->SetInserted(sal_False);
         maMaPag.Insert(pPg,nNewPos);
         // #109538#
         MasterPageListChanged();
     }
-    bMPgNumsDirty=TRUE;
+    bMPgNumsDirty=sal_True;
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
     aHint.SetPage(pPg);
@@ -1606,7 +1606,7 @@ void SdrModel::MoveMasterPage(USHORT nPgNum, USHORT nNewPos)
 
 FASTBOOL SdrModel::CheckConsistence() const
 {
-    FASTBOOL bRet=TRUE;
+    FASTBOOL bRet=sal_True;
 #ifdef DBG_UTIL
     DBG_CHKTHIS(SdrModel,NULL);
 #endif
@@ -1616,8 +1616,8 @@ FASTBOOL SdrModel::CheckConsistence() const
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // #48289#
-void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
-                         USHORT nDestPos,
+void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+                         sal_uInt16 nDestPos,
                          FASTBOOL bUndo, FASTBOOL bMoveNoCopy)
 {
     if( bUndo && !IsUndoEnabled() )
@@ -1626,8 +1626,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
     if( bUndo )
         BegUndo(ImpGetResStr(STR_UndoMergeModel));
 
-    USHORT nPageAnz=GetPageCount();
-    USHORT nMaxPage=nPageAnz;
+    sal_uInt16 nPageAnz=GetPageCount();
+    sal_uInt16 nMaxPage=nPageAnz;
 
     if (nMaxPage!=0)
         nMaxPage--;
@@ -1640,10 +1640,10 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
         nDestPos=nPageAnz;
 
     // Zunaechst die Zeiger der betroffenen Seiten in einem Array sichern
-    USHORT nPageNum=nFirstPageNum;
-    USHORT nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1;
+    sal_uInt16 nPageNum=nFirstPageNum;
+    sal_uInt16 nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1;
     SdrPage** pPagePtrs=new SdrPage*[nCopyAnz];
-    USHORT nCopyNum;
+    sal_uInt16 nCopyNum;
     for(nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++)
     {
         pPagePtrs[nCopyNum]=GetPage(nPageNum);
@@ -1654,11 +1654,11 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
     }
 
     // Jetzt die Seiten kopieren
-    USHORT nDestNum=nDestPos;
+    sal_uInt16 nDestNum=nDestPos;
     for (nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++)
     {
         SdrPage* pPg=pPagePtrs[nCopyNum];
-        USHORT nPageNum2=pPg->GetPageNum();
+        sal_uInt16 nPageNum2=pPg->GetPageNum();
         if (!bMoveNoCopy)
         {
             const SdrPage* pPg1=GetPage(nPageNum2);
@@ -1694,8 +1694,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
 }
 
 void SdrModel::Merge(SdrModel& rSourceModel,
-                     USHORT nFirstPageNum, USHORT nLastPageNum,
-                     USHORT nDestPos,
+                     sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+                     sal_uInt16 nDestPos,
                      FASTBOOL bMergeMasterPages, FASTBOOL bAllMasterPages,
                      FASTBOOL bUndo, FASTBOOL bTreadSourceAsConst)
 {
@@ -1711,30 +1711,30 @@ void SdrModel::Merge(SdrModel& rSourceModel,
     if (bUndo)
         BegUndo(ImpGetResStr(STR_UndoMergeModel));
 
-    USHORT nSrcPageAnz=rSourceModel.GetPageCount();
-    USHORT nSrcMasterPageAnz=rSourceModel.GetMasterPageCount();
-    USHORT nDstMasterPageAnz=GetMasterPageCount();
+    sal_uInt16 nSrcPageAnz=rSourceModel.GetPageCount();
+    sal_uInt16 nSrcMasterPageAnz=rSourceModel.GetMasterPageCount();
+    sal_uInt16 nDstMasterPageAnz=GetMasterPageCount();
     FASTBOOL bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz);
-    USHORT nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--;
+    sal_uInt16 nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--;
     if (nFirstPageNum>nMaxSrcPage) nFirstPageNum=nMaxSrcPage;
     if (nLastPageNum>nMaxSrcPage)  nLastPageNum =nMaxSrcPage;
     FASTBOOL bReverse=nLastPageNum<nFirstPageNum;
 
-    USHORT*   pMasterMap=NULL;
-    FASTBOOL* pMasterNeed=NULL;
-    USHORT    nMasterNeed=0;
+    sal_uInt16*   pMasterMap=NULL;
+    int* pMasterNeed=NULL;
+    sal_uInt16    nMasterNeed=0;
     if (bMergeMasterPages && nSrcMasterPageAnz!=0) {
         // Feststellen, welche MasterPages aus rSrcModel benoetigt werden
-        pMasterMap=new USHORT[nSrcMasterPageAnz];
-        pMasterNeed=new FASTBOOL[nSrcMasterPageAnz];
-        memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(USHORT));
+        pMasterMap=new sal_uInt16[nSrcMasterPageAnz];
+        pMasterNeed=new int[nSrcMasterPageAnz];
+        memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(sal_uInt16));
         if (bAllMasterPages) {
-            memset(pMasterNeed,TRUE,nSrcMasterPageAnz*sizeof(FASTBOOL));
+            memset(pMasterNeed,sal_True,nSrcMasterPageAnz*sizeof(FASTBOOL));
         } else {
-            memset(pMasterNeed,FALSE,nSrcMasterPageAnz*sizeof(FASTBOOL));
-            USHORT nAnf= bReverse ? nLastPageNum : nFirstPageNum;
-            USHORT nEnd= bReverse ? nFirstPageNum : nLastPageNum;
-            for (USHORT i=nAnf; i<=nEnd; i++) {
+            memset(pMasterNeed,sal_False,nSrcMasterPageAnz*sizeof(FASTBOOL));
+            sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum;
+            sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum;
+            for (sal_uInt16 i=nAnf; i<=nEnd; i++) {
                 const SdrPage* pPg=rSourceModel.GetPage(i);
                 if(pPg->TRG_HasMasterPage())
                 {
@@ -1743,14 +1743,14 @@ void SdrModel::Merge(SdrModel& rSourceModel,
 
                     if(nMPgNum < nSrcMasterPageAnz)
                     {
-                        pMasterNeed[nMPgNum] = TRUE;
+                        pMasterNeed[nMPgNum] = sal_True;
                     }
                 }
             }
         }
         // Nun das Mapping der MasterPages bestimmen
-        USHORT nAktMaPagNum=nDstMasterPageAnz;
-        for (USHORT i=0; i<nSrcMasterPageAnz; i++) {
+        sal_uInt16 nAktMaPagNum=nDstMasterPageAnz;
+        for (sal_uInt16 i=0; i<nSrcMasterPageAnz; i++) {
             if (pMasterNeed[i]) {
                 pMasterMap[i]=nAktMaPagNum;
                 nAktMaPagNum++;
@@ -1761,7 +1761,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
 
     // rueberholen der Masterpages
     if (pMasterMap!=NULL && pMasterNeed!=NULL && nMasterNeed!=0) {
-        for (USHORT i=nSrcMasterPageAnz; i>0;) {
+        for (sal_uInt16 i=nSrcMasterPageAnz; i>0;) {
             i--;
             if (pMasterNeed[i]) {
                 SdrPage* pPg=NULL;
@@ -1778,9 +1778,9 @@ void SdrModel::Merge(SdrModel& rSourceModel,
                     maMaPag.Insert(pPg,nDstMasterPageAnz);
                     // #109538#
                     MasterPageListChanged();
-                    pPg->SetInserted(TRUE);
+                    pPg->SetInserted(sal_True);
                     pPg->SetModel(this);
-                    bMPgNumsDirty=TRUE;
+                    bMPgNumsDirty=sal_True;
                     if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg));
                 } else {
                     DBG_ERROR("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden");
@@ -1791,8 +1791,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
 
     // rueberholen der Zeichenseiten
     if (bInsPages) {
-        USHORT nSourcePos=nFirstPageNum;
-        USHORT nMergeCount=USHORT(Abs((long)((long)nFirstPageNum-nLastPageNum))+1);
+        sal_uInt16 nSourcePos=nFirstPageNum;
+        sal_uInt16 nMergeCount=sal_uInt16(Abs((long)((long)nFirstPageNum-nLastPageNum))+1);
         if (nDestPos>GetPageCount()) nDestPos=GetPageCount();
         while (nMergeCount>0) {
             SdrPage* pPg=NULL;
@@ -1852,8 +1852,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
     delete [] pMasterMap;
     delete [] pMasterNeed;
 
-    bMPgNumsDirty=TRUE;
-    bPagNumsDirty=TRUE;
+    bMPgNumsDirty=sal_True;
+    bPagNumsDirty=sal_True;
 
     SetChanged();
     // Fehlt: Mergen und Mapping der Layer
@@ -1861,12 +1861,12 @@ void SdrModel::Merge(SdrModel& rSourceModel,
     if (bUndo) EndUndo();
 }
 
-void SdrModel::SetStarDrawPreviewMode(BOOL bPreview)
+void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview)
 {
     if (!bPreview && bStarDrawPreviewMode && GetPageCount())
     {
         // Das Zuruecksetzen ist nicht erlaubt, da das Model ev. nicht vollstaendig geladen wurde
-        DBG_ASSERT(FALSE,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig");
+        DBG_ASSERT(sal_False,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig");
     }
     else
     {
@@ -1894,7 +1894,7 @@ uno::Reference< uno::XInterface > SdrModel::createUnoModel()
     return xInt;
 }
 
-void SdrModel::setLock( BOOL bLock )
+void SdrModel::setLock( sal_Bool bLock )
 {
     if( mbModelLocked != bLock )
     {
@@ -1923,7 +1923,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe
 
         while(nWhich)
         {
-            if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, FALSE, &pPoolItem))
+            if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, sal_False, &pPoolItem))
             {
                 const SfxPoolItem* pItem = pPoolItem;
 
@@ -1989,7 +1989,7 @@ vos::ORef<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const
     return mpForbiddenCharactersTable;
 }
 
-void SdrModel::SetCharCompressType( UINT16 nType )
+void SdrModel::SetCharCompressType( sal_uInt16 nType )
 {
     if( nType != mnCharCompressType )
     {
@@ -2024,26 +2024,26 @@ void SdrModel::ReformatAllTextObjects()
     ImpReformatAllTextObjects();
 }
 
-FASTBOOL SdrModel::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const
+FASTBOOL SdrModel::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const
 {
-    FASTBOOL    bRet = FALSE;
-    USHORT      n, nCount;
+    FASTBOOL    bRet = sal_False;
+    sal_uInt16      n, nCount;
 
     for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ )
         if( GetMasterPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) )
-            bRet = TRUE;
+            bRet = sal_True;
 
     if( !bRet )
     {
         for( n = 0, nCount = GetPageCount(); ( n < nCount ) && !bRet; n++ )
             if( GetPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) )
-                bRet = TRUE;
+                bRet = sal_True;
     }
 
     return bRet;
 }
 
-SdrOutliner* SdrModel::createOutliner( USHORT nOutlinerMode )
+SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode )
 {
     if( NULL == mpOutlinerCache )
         mpOutlinerCache = new SdrOutlinerCache(this);
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index d51ecbc53dac..f9055fedcabc 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -146,24 +146,24 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
 void SdrMarkView::ImpClearVars()
 {
     eDragMode=SDRDRAG_MOVE;
-    //HMHbHdlShown=FALSE;
-    bRefHdlShownOnly=FALSE;
+    //HMHbHdlShown=sal_False;
+    bRefHdlShownOnly=sal_False;
     eEditMode=SDREDITMODE_EDIT;
     eEditMode0=SDREDITMODE_EDIT;
-    bDesignMode=FALSE;
+    bDesignMode=sal_False;
     pMarkedObj=NULL;
     pMarkedPV=NULL;
-    bForceFrameHandles=FALSE;
-    bPlusHdlAlways=FALSE;
+    bForceFrameHandles=sal_False;
+    bPlusHdlAlways=sal_False;
     nFrameHandlesLimit=50;
-    bInsPolyPoint=FALSE;
+    bInsPolyPoint=sal_False;
     mnInsPointNum = 0L;
-    bMarkedObjRectDirty=FALSE;
-    bMarkedPointsRectsDirty=FALSE;
+    bMarkedObjRectDirty=sal_False;
+    bMarkedPointsRectsDirty=sal_False;
     mbMarkHandlesHidden = false;
-    bMrkPntDirty=FALSE;
-    bMarkHdlWhenTextEdit=FALSE;
-    bMarkableObjCountDirty=FALSE; // noch nicht implementiert
+    bMrkPntDirty=sal_False;
+    bMarkHdlWhenTextEdit=sal_False;
+    bMarkableObjCountDirty=sal_False; // noch nicht implementiert
     nMarkableObjCount=0;          // noch nicht implementiert
 
     // #114409#-3 Migrate selections
@@ -202,13 +202,13 @@ void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 
         if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED)
         {
-            bMarkedObjRectDirty=TRUE;
-            bMarkedPointsRectsDirty=TRUE;
+            bMarkedObjRectDirty=sal_True;
+            bMarkedPointsRectsDirty=sal_True;
         }
 /* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects
         if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )
         {
-            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE );
+            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), sal_True );
         }
 */
     }
@@ -219,14 +219,14 @@ void SdrMarkView::ModelHasChanged()
 {
     SdrPaintView::ModelHasChanged();
     GetMarkedObjectListWriteAccess().SetNameDirty();
-    bMarkedObjRectDirty=TRUE;
-    bMarkedPointsRectsDirty=TRUE;
+    bMarkedObjRectDirty=sal_True;
+    bMarkedPointsRectsDirty=sal_True;
     // Es sind beispielsweise Obj markiert und maMarkedObjectListist Sorted.
     // In einer anderen View 2 wird die ObjOrder veraendert
     // (z.B. MovToTop()). Dann ist Neusortieren der MarkList erforderlich.
     GetMarkedObjectListWriteAccess().SetUnsorted();
     SortMarkedObjects();
-    bMrkPntDirty=TRUE;
+    bMrkPntDirty=sal_True;
     UndirtyMrkPnt();
     SdrView* pV=(SdrView*)this;
     if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { // an dieser Stelle habe ich ein ziemliches Problem !!!
@@ -236,7 +236,7 @@ void SdrMarkView::ModelHasChanged()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::IsAction() const
+sal_Bool SdrMarkView::IsAction() const
 {
     return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints();
 }
@@ -538,16 +538,16 @@ void SdrMarkView::BrkMarkGluePoints()
     }
 }
 
-BOOL SdrMarkView::HasMarkableObj() const
+sal_Bool SdrMarkView::HasMarkableObj() const
 {
-    ULONG nCount=0;
+    sal_uIntPtr nCount=0;
 
     SdrPageView* pPV = GetSdrPageView();
     if(pPV)
     {
         SdrObjList* pOL=pPV->GetObjList();
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) {
             SdrObject* pObj=pOL->GetObj(nObjNum);
             if (IsObjMarkable(pObj,pPV)) {
                 nCount++;
@@ -557,16 +557,16 @@ BOOL SdrMarkView::HasMarkableObj() const
     return nCount!=0;
 }
 
-ULONG SdrMarkView::GetMarkableObjCount() const
+sal_uIntPtr SdrMarkView::GetMarkableObjCount() const
 {
-    ULONG nCount=0;
+    sal_uIntPtr nCount=0;
     SdrPageView* pPV = GetSdrPageView();
 
     if(pPV)
     {
         SdrObjList* pOL=pPV->GetObjList();
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
             SdrObject* pObj=pOL->GetObj(nObjNum);
             if (IsObjMarkable(pObj,pPV)) {
                 nCount++;
@@ -578,26 +578,26 @@ ULONG SdrMarkView::GetMarkableObjCount() const
 
 //HMHvoid SdrMarkView::ImpShowMarkHdl(bool /*bNoRefHdl*/)
 //HMH{
-//HMH   bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH   bNoRefHdl=sal_False; // geht leider erstmal nicht anders
 //HMH   if (!bHdlShown) {
-//HMH       bRefHdlShownOnly=FALSE;
-//HMH       bHdlShown=TRUE;
+//HMH       bRefHdlShownOnly=sal_False;
+//HMH       bHdlShown=sal_True;
 //HMH   }
 //HMH}
 
 //HMHvoid SdrMarkView::ShowMarkHdl(bool /*bNoRefHdl*/)
 //HMH{
-//HMH   bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH   bNoRefHdl=sal_False; // geht leider erstmal nicht anders
 //HMH   ImpShowMarkHdl(bNoRefHdl);
 //HMH}
 
 
 //HMHvoid SdrMarkView::HideMarkHdl(bool /*bNoRefHdl*/)
 //HMH{
-//HMH   bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH   bNoRefHdl=sal_False; // geht leider erstmal nicht anders
 //HMH   if (bHdlShown) {
 //HMH       bRefHdlShownOnly=bNoRefHdl;
-//HMH       bHdlShown=FALSE;
+//HMH       bHdlShown=sal_False;
 //HMH   }
 //HMH}
 
@@ -619,29 +619,29 @@ void SdrMarkView::showMarkHandles()
     }
 }
 
-BOOL SdrMarkView::ImpIsFrameHandles() const
+sal_Bool SdrMarkView::ImpIsFrameHandles() const
 {
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    BOOL bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
-    BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_Bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
+    sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE;
     if (nMarkAnz==1 && bStdDrag && bFrmHdl)
     {
         const SdrObject* pObj=GetMarkedObjectByIndex(0);
         if (pObj->GetObjInventor()==SdrInventor)
         {
-            UINT16 nIdent=pObj->GetObjIdentifier();
+            sal_uInt16 nIdent=pObj->GetObjIdentifier();
             if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE )
             {
-                bFrmHdl=FALSE;
+                bFrmHdl=sal_False;
             }
         }
     }
     if (!bStdDrag && !bFrmHdl) {
         // Grundsaetzlich erstmal alle anderen Dragmodi nur mit FrameHandles
-        bFrmHdl=TRUE;
+        bFrmHdl=sal_True;
         if (eDragMode==SDRDRAG_ROTATE) {
             // bei Rotate ObjOwn-Drag, wenn mind. 1 PolyObj
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 bFrmHdl=!pObj->IsPolyObj();
@@ -650,7 +650,7 @@ BOOL SdrMarkView::ImpIsFrameHandles() const
     }
     if (!bFrmHdl) {
         // FrameHandles, wenn wenigstens 1 Obj kein SpecialDrag kann
-        for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {
+        for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             const SdrObject* pObj=pM->GetMarkedSdrObj();
             bFrmHdl=!pObj->hasSpecialDrag();
@@ -690,9 +690,9 @@ void SdrMarkView::SetMarkHandles()
     // are handles enabled at all? Create only then
     if(!areMarkHandlesHidden())
     {
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
-        BOOL bSingleTextObjMark=FALSE;
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE;
+        sal_Bool bSingleTextObjMark=sal_False;
 
         if (nMarkAnz==1)
         {
@@ -703,13 +703,13 @@ void SdrMarkView::SetMarkHandles()
                 static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame();
         }
 
-        BOOL bFrmHdl=ImpIsFrameHandles();
+        sal_Bool bFrmHdl=ImpIsFrameHandles();
 
         if (nMarkAnz>0)
         {
             pMarkedPV=GetSdrPageViewOfMarkedByIndex(0);
 
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++)
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++)
             {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
 
@@ -735,15 +735,15 @@ void SdrMarkView::SetMarkHandles()
             { // sonst nix gefunden
                 if( bSingleTextObjMark )
                 {
-                    const ULONG nSiz0=aHdl.GetHdlCount();
+                    const sal_uIntPtr nSiz0=aHdl.GetHdlCount();
                     pMarkedObj->AddToHdlList(aHdl);
-                    const ULONG nSiz1=aHdl.GetHdlCount();
-                    for (ULONG i=nSiz0; i<nSiz1; i++)
+                    const sal_uIntPtr nSiz1=aHdl.GetHdlCount();
+                    for (sal_uIntPtr i=nSiz0; i<nSiz1; i++)
                     {
                         SdrHdl* pHdl=aHdl.GetHdl(i);
                         pHdl->SetObj(pMarkedObj);
                         pHdl->SetPageView(pMarkedPV);
-                        pHdl->SetObjHdlNum(USHORT(i-nSiz0));
+                        pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0));
                     }
                 }
                 else if( eDragMode==SDRDRAG_CROP )
@@ -759,8 +759,8 @@ void SdrMarkView::SetMarkHandles()
                 }
                 else
                 {
-                    BOOL bWdt0=aRect.Left()==aRect.Right();
-                    BOOL bHgt0=aRect.Top()==aRect.Bottom();
+                    sal_Bool bWdt0=aRect.Left()==aRect.Right();
+                    sal_Bool bHgt0=aRect.Top()==aRect.Bottom();
                     if (bWdt0 && bHgt0)
                     {
                         aHdl.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT));
@@ -786,27 +786,27 @@ void SdrMarkView::SetMarkHandles()
         }
         else
         {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
             {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 SdrObject* pObj=pM->GetMarkedSdrObj();
                 SdrPageView* pPV=pM->GetPageView();
-                const ULONG nSiz0=aHdl.GetHdlCount();
+                const sal_uIntPtr nSiz0=aHdl.GetHdlCount();
                 pObj->AddToHdlList(aHdl);
-                const ULONG nSiz1=aHdl.GetHdlCount();
+                const sal_uIntPtr nSiz1=aHdl.GetHdlCount();
                 bool bPoly=pObj->IsPolyObj();
                 const SdrUShortCont* pMrkPnts=pM->GetMarkedPoints();
-                for (ULONG i=nSiz0; i<nSiz1; i++)
+                for (sal_uIntPtr i=nSiz0; i<nSiz1; i++)
                 {
                     SdrHdl* pHdl=aHdl.GetHdl(i);
                     pHdl->SetObj(pObj);
                     pHdl->SetPageView(pPV);
-                    pHdl->SetObjHdlNum(USHORT(i-nSiz0));
+                    pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0));
                     if (bPoly)
                     {
-                        BOOL bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(USHORT(i-nSiz0));
+                        sal_Bool bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(sal_uInt16(i-nSiz0));
                         pHdl->SetSelected(bSelected);
-                        //BOOL bPlus=bPlusHdlAlways;
+                        //sal_Bool bPlus=bPlusHdlAlways;
                         if (bPlusHdlAlways || bSelected)
                         {
                             sal_uInt32 nPlusAnz=pObj->GetPlusHdlCount(*pHdl);
@@ -817,7 +817,7 @@ void SdrMarkView::SetMarkHandles()
                                 {
                                     pPlusHdl->SetObj(pObj);
                                     pPlusHdl->SetPageView(pPV);
-                                    pPlusHdl->SetPlusHdl(TRUE);
+                                    pPlusHdl->SetPlusHdl(sal_True);
                                     aHdl.AddHdl(pPlusHdl);
                                 }
                             }
@@ -828,7 +828,7 @@ void SdrMarkView::SetMarkHandles()
         } // if bFrmHdl else
 
         // GluePoint-Handles
-        for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
+        for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
         {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -839,13 +839,13 @@ void SdrMarkView::SetMarkHandles()
                 const SdrGluePointList* pGPL=pObj->GetGluePointList();
                 if (pGPL!=NULL)
                 {
-                    //USHORT nGlueAnz=pGPL->GetCount();
-                    USHORT nAnz=(USHORT)pMrkGlue->GetCount();
-                    for (USHORT nNum=0; nNum<nAnz; nNum++)
+                    //sal_uInt16 nGlueAnz=pGPL->GetCount();
+                    sal_uInt16 nAnz=(sal_uInt16)pMrkGlue->GetCount();
+                    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++)
                     {
-                        USHORT nId=pMrkGlue->GetObject(nNum);
+                        sal_uInt16 nId=pMrkGlue->GetObject(nNum);
                         //nNum changed to nNumGP because already used in for loop
-                        USHORT nNumGP=pGPL->FindGluePoint(nId);
+                        sal_uInt16 nNumGP=pGPL->FindGluePoint(nId);
                         if (nNumGP!=SDRGLUEPOINT_NOTFOUND)
                         {
                             const SdrGluePoint& rGP=(*pGPL)[nNumGP];
@@ -946,21 +946,21 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
         case SDRDRAG_TRANSPARENCE:
         {
             // add interactive transparence handle
-            ULONG nMarkAnz = GetMarkedObjectCount();
+            sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
             if(nMarkAnz == 1)
             {
                 SdrObject* pObj = GetMarkedObjectByIndex(0);
                 SdrModel* pModel = GetModel();
                 const SfxItemSet& rSet = pObj->GetMergedItemSet();
 
-                if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, FALSE))
+                if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_False))
                 {
                     // add this item, it's not yet there
                     XFillFloatTransparenceItem aNewItem(
                         (const XFillFloatTransparenceItem&)rSet.Get(XATTR_FILLFLOATTRANSPARENCE));
                     XGradient aGrad = aNewItem.GetGradientValue();
 
-                    aNewItem.SetEnabled(TRUE);
+                    aNewItem.SetEnabled(sal_True);
                     aGrad.SetStartIntens(100);
                     aGrad.SetEndIntens(100);
                     aNewItem.SetGradientValue(aGrad);
@@ -990,9 +990,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
                 // build handles
                 const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY()));
                 const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY()));
-                SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE);
-                SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE);
-                SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, FALSE);
+                SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True);
+                SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True);
+                SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_False);
                 DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!");
 
                 // link them
@@ -1011,7 +1011,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
         case SDRDRAG_GRADIENT:
         {
             // add interactive gradient handle
-            ULONG nMarkAnz = GetMarkedObjectCount();
+            sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
             if(nMarkAnz == 1)
             {
                 SdrObject* pObj = GetMarkedObjectByIndex(0);
@@ -1032,9 +1032,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
                     // build handles
                     const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY()));
                     const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY()));
-                    SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, FALSE);
-                    SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, FALSE);
-                    SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, TRUE);
+                    SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, sal_False);
+                    SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, sal_False);
+                    SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_True);
                     DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!");
 
                     // link them
@@ -1061,7 +1061,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
 }
 
 /** handle mouse over effects for handles */
-BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     if(aHdl.GetHdlCount())
     {
@@ -1073,9 +1073,9 @@ BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
         }
 
         // notify last mouse over handle that he lost the mouse
-        const ULONG nHdlCount = aHdl.GetHdlCount();
+        const sal_uIntPtr nHdlCount = aHdl.GetHdlCount();
 
-        for(ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ )
+        for(sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ )
         {
             SdrHdl* pCurrentHdl = GetHdl(nHdl);
             if( pCurrentHdl->mbMouseOver )
@@ -1215,13 +1215,13 @@ void SdrMarkView::SetRef2(const Point& rPt)
 
 void SdrMarkView::CheckMarked()
 {
-    for (ULONG nm=GetMarkedObjectCount(); nm>0;) {
+    for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) {
         nm--;
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         SdrPageView* pPV=pM->GetPageView();
         SdrLayerID nLay=pObj->GetLayer();
-        BOOL bRaus=!pObj->IsInserted(); // Obj geloescht?
+        sal_Bool bRaus=!pObj->IsInserted(); // Obj geloescht?
         if (!pObj->Is3DObj()) {
             bRaus=bRaus || pObj->GetPage()!=pPV->GetPage();   // Obj ploetzlich in anderer Page oder Group
         }
@@ -1260,7 +1260,7 @@ void SdrMarkView::CheckMarked()
 
     // #97995# at least reset the remembered BoundRect to prevent handle
     // generation if bForceFrameHandles is TRUE.
-    bMarkedObjRectDirty = TRUE;
+    bMarkedObjRectDirty = sal_True;
 }
 
 void SdrMarkView::SetMarkRects()
@@ -1274,12 +1274,12 @@ void SdrMarkView::SetMarkRects()
     }
 }
 
-void SdrMarkView::SetFrameHandles(BOOL bOn)
+void SdrMarkView::SetFrameHandles(sal_Bool bOn)
 {
     if (bOn!=bForceFrameHandles) {
-        BOOL bOld=ImpIsFrameHandles();
+        sal_Bool bOld=ImpIsFrameHandles();
         bForceFrameHandles=bOn;
-        BOOL bNew=ImpIsFrameHandles();
+        sal_Bool bNew=ImpIsFrameHandles();
         if (bNew!=bOld) {
             AdjustMarkHdl(); //HMHTRUE);
             MarkListHasChanged();
@@ -1290,12 +1290,12 @@ void SdrMarkView::SetFrameHandles(BOOL bOn)
 void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
 {
     if (eMode!=eEditMode) {
-        BOOL bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
-        BOOL bEdge0=((SdrCreateView*)this)->IsEdgeTool();
+        sal_Bool bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+        sal_Bool bEdge0=((SdrCreateView*)this)->IsEdgeTool();
         eEditMode0=eEditMode;
         eEditMode=eMode;
-        BOOL bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
-        BOOL bEdge1=((SdrCreateView*)this)->IsEdgeTool();
+        sal_Bool bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+        sal_Bool bEdge1=((SdrCreateView*)this)->IsEdgeTool();
         // etwas Aufwand um Flackern zu verhindern beim Umschalten
         // zwischen GlueEdit und EdgeTool
         if (bGlue1 && !bGlue0) ImpSetGlueVisible2(bGlue1);
@@ -1307,7 +1307,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
+sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
 {
     if (pObj)
     {
@@ -1316,65 +1316,65 @@ BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
         {
             // Objekt nicht selektierbar oder
             // SdrUnoObj nicht im DesignMode
-            return FALSE;
+            return sal_False;
         }
     }
-    return pPV!=NULL ? pPV->IsObjMarkable(pObj) : TRUE;
+    return pPV!=NULL ? pPV->IsObjMarkable(pObj) : sal_True;
 }
 
-BOOL SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
+sal_Bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     nTol=ImpGetHitTolLogic(nTol,NULL);
     Point aPt(rPnt);
-    for (ULONG nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) {
+    for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
-        bRet = 0 != CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0);
+        bRet = 0 != CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0);
     }
     return bRet;
 }
 
-SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, ULONG nOptions, SdrHdl* pHdl0) const
+SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, sal_uIntPtr nOptions, SdrHdl* pHdl0) const
 {
     if (bSomeObjChgdFlag) { // ggf. Handles neu berechnen lassen!
         FlushComeBackTimer();
     }
-    BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
-    BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0;
+    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+    sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
     Point aPt(rPnt);
     return aHdl.IsHdlListHit(aPt,bBack,bNext,pHdl0);
 }
 
-BOOL SdrMarkView::MarkObj(const Point& rPnt, short nTol, BOOL bToggle, BOOL bDeep)
+sal_Bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, sal_Bool bToggle, sal_Bool bDeep)
 {
     SdrObject* pObj;
     SdrPageView* pPV;
     nTol=ImpGetHitTolLogic(nTol,NULL);
-    ULONG nOptions=SDRSEARCH_PICKMARKABLE;
+    sal_uIntPtr nOptions=SDRSEARCH_PICKMARKABLE;
     if (bDeep) nOptions=nOptions|SDRSEARCH_DEEP;
-    BOOL bRet=PickObj(rPnt,(USHORT)nTol,pObj,pPV,nOptions);
+    sal_Bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions);
     if (bRet) {
-        BOOL bUnmark=bToggle && IsObjMarked(pObj);
+        sal_Bool bUnmark=bToggle && IsObjMarked(pObj);
         MarkObj(pObj,pPV,bUnmark);
     }
     return bRet;
 }
 
-BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
+sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev)
 {
     SdrPageView* pPageView = GetSdrPageView();
 
     if(!pPageView)
     {
-        return FALSE;
+        return sal_False;
     }
 
     SortMarkedObjects();
-    ULONG  nMarkAnz=GetMarkedObjectCount();
-    ULONG  nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries
-    ULONG  nSearchObjNum = bPrev ? 0 : ULONG_MAX;
+    sal_uIntPtr  nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr  nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries
+    sal_uIntPtr  nSearchObjNum = bPrev ? 0 : ULONG_MAX;
     if (nMarkAnz!=0) {
-        nChgMarkNum=bPrev ? 0 : ULONG(nMarkAnz-1);
+        nChgMarkNum=bPrev ? 0 : sal_uIntPtr(nMarkAnz-1);
         SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum);
         OSL_ASSERT(pM!=NULL);
         if (pM->GetMarkedSdrObj() != NULL)
@@ -1383,7 +1383,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
 
     SdrObject* pMarkObj=NULL;
     SdrObjList* pSearchObjList=pPageView->GetObjList();
-    ULONG nObjAnz=pSearchObjList->GetObjCount();
+    sal_uIntPtr nObjAnz=pSearchObjList->GetObjCount();
     if (nObjAnz!=0) {
         if (nSearchObjNum>nObjAnz) nSearchObjNum=nObjAnz;
         while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjAnz)))
@@ -1404,7 +1404,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
 
     if(!pMarkObj)
     {
-        return FALSE;
+        return sal_False;
     }
 
     if (nChgMarkNum!=ULONG_MAX)
@@ -1412,32 +1412,32 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
         GetMarkedObjectListWriteAccess().DeleteMark(nChgMarkNum);
     }
     MarkObj(pMarkObj,pPageView); // ruft auch MarkListHasChanged(), AdjustMarkHdl()
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
+sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
 {
     SortMarkedObjects();
     nTol=ImpGetHitTolLogic(nTol,NULL);
     Point aPt(rPnt);
     SdrMark* pTopMarkHit=NULL;
     SdrMark* pBtmMarkHit=NULL;
-    ULONG nTopMarkHit=0;
-    ULONG nBtmMarkHit=0;
+    sal_uIntPtr nTopMarkHit=0;
+    sal_uIntPtr nBtmMarkHit=0;
     // oberstes der markierten Objekte suchen, das von rPnt getroffen wird
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    ULONG nm=0;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nm=0;
     for (nm=nMarkAnz; nm>0 && pTopMarkHit==NULL;) {
         nm--;
         SdrMark* pM=GetSdrMarkByIndex(nm);
-        if(CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0))
+        if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0))
         {
             pTopMarkHit=pM;
             nTopMarkHit=nm;
         }
     }
     // Nichts gefunden, dann ganz normal ein Obj markieren.
-    if (pTopMarkHit==NULL) return MarkObj(rPnt,USHORT(nTol),FALSE);
+    if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),sal_False);
 
     SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj();
     SdrObjList* pObjList=pTopObjHit->GetObjList();
@@ -1447,7 +1447,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
     for (nm=0; nm<nMarkAnz && pBtmMarkHit==NULL; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrPageView* pPV2=pM->GetPageView();
-        if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pPV2,0,0))
+        if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,0,0))
         {
             pBtmMarkHit=pM;
             nBtmMarkHit=nm;
@@ -1455,10 +1455,10 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
     }
     if (pBtmMarkHit==NULL) { pBtmMarkHit=pTopMarkHit; nBtmMarkHit=nTopMarkHit; }
     SdrObject* pBtmObjHit=pBtmMarkHit->GetMarkedSdrObj();
-    ULONG nObjAnz=pObjList->GetObjCount();
+    sal_uIntPtr nObjAnz=pObjList->GetObjCount();
 
     // #110988#
-    //ULONG nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum();
+    //sal_uIntPtr nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum();
     sal_uInt32 nSearchBeg;
     E3dScene* pScene = NULL;
     SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit;
@@ -1489,7 +1489,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
         nSearchBeg = nOrdNumTop;
     }
 
-    ULONG no=nSearchBeg;
+    sal_uIntPtr no=nSearchBeg;
     SdrObject* pFndObj=NULL;
     //SdrObject* pAktObj=NULL;
     while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjAnz))) {
@@ -1505,7 +1505,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
             pObj = pObjList->GetObj(no);
         }
 
-        if (CheckSingleSdrObjectHit(aPt,USHORT(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0))
+        if (CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0))
         {
             if (TryToFindMarkedObject(pObj)==CONTAINER_ENTRY_NOTFOUND) {
                 pFndObj=pObj;
@@ -1525,9 +1525,9 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
     return pFndObj!=NULL;
 }
 
-BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark)
 {
-    BOOL bFnd=FALSE;
+    sal_Bool bFnd=sal_False;
     Rectangle aR(rRect);
     SdrObject* pObj;
     SdrObjList* pObjList;
@@ -1538,8 +1538,8 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
     {
         pObjList=pPV->GetObjList();
         Rectangle aFrm1(aR);
-        ULONG nObjAnz=pObjList->GetObjCount();
-        for (ULONG nO=0; nO<nObjAnz; nO++) {
+        sal_uIntPtr nObjAnz=pObjList->GetObjCount();
+        for (sal_uIntPtr nO=0; nO<nObjAnz; nO++) {
             pObj=pObjList->GetObj(nO);
             Rectangle aRect(pObj->GetCurrentBoundRect());
             if (aFrm1.IsInside(aRect)) {
@@ -1547,14 +1547,14 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
                     if (IsObjMarkable(pObj,pPV))
                     {
                         GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pObj,pPV));
-                        bFnd=TRUE;
+                        bFnd=sal_True;
                     }
                 } else {
-                    ULONG nPos=TryToFindMarkedObject(pObj);
+                    sal_uIntPtr nPos=TryToFindMarkedObject(pObj);
                     if (nPos!=CONTAINER_ENTRY_NOTFOUND)
                     {
                         GetMarkedObjectListWriteAccess().DeleteMark(nPos);
-                        bFnd=TRUE;
+                        bFnd=sal_True;
                     }
                 }
             }
@@ -1569,7 +1569,7 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
     return bFnd;
 }
 
-void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL bImpNoSetMarkHdl)
+void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, sal_Bool bImpNoSetMarkHdl)
 {
     if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) {
         BrkAction();
@@ -1579,7 +1579,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL
         }
         else
         {
-            ULONG nPos=TryToFindMarkedObject(pObj);
+            sal_uIntPtr nPos=TryToFindMarkedObject(pObj);
             if (nPos!=CONTAINER_ENTRY_NOTFOUND)
             {
                 GetMarkedObjectListWriteAccess().DeleteMark(nPos);
@@ -1596,20 +1596,20 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL
     }
 }
 
-BOOL SdrMarkView::IsObjMarked(SdrObject* pObj) const
+sal_Bool SdrMarkView::IsObjMarked(SdrObject* pObj) const
 {
     // nicht so ganz die feine Art: Da FindObject() nicht const ist
     // muss ich mich hier auf non-const casten.
-    ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj);
+    sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj);
     return nPos!=CONTAINER_ENTRY_NOTFOUND;
 }
 
-USHORT SdrMarkView::GetMarkHdlSizePixel() const
+sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const
 {
     return aHdl.GetHdlSize()*2+1;
 }
 
-void SdrMarkView::SetSolidMarkHdl(BOOL bOn)
+void SdrMarkView::SetSolidMarkHdl(sal_Bool bOn)
 {
     if (bOn!=aHdl.IsFineHdl()) {
         //HMHBOOL bMerk=IsMarkHdlShown();
@@ -1619,7 +1619,7 @@ void SdrMarkView::SetSolidMarkHdl(BOOL bOn)
     }
 }
 
-void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz)
+void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz)
 {
     if (nSiz<3) nSiz=3;
     nSiz/=2;
@@ -1632,7 +1632,7 @@ void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz)
 }
 
 #define SDRSEARCH_IMPISMASTER 0x80000000 /* MasterPage wird gerade durchsucht */
-SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
+SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const
 {
     if(((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) || (!pObj->IsVisible()))
     {
@@ -1645,7 +1645,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
     const bool bTXT(pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsTextFrame());
     SdrObject* pRet=NULL;
     Rectangle aRect(pObj->GetCurrentBoundRect());
-    USHORT nTol2(nTol);
+    sal_uInt16 nTol2(nTol);
 
     // double tolerance for OLE, text frames and objects in
     // active text edit
@@ -1698,9 +1698,9 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
     return pRet;
 }
 
-SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const
+SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const
 {
-    BOOL bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
+    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
     SdrObject* pRet=NULL;
     rpRootObj=NULL;
     if (pOL!=NULL)
@@ -1709,8 +1709,8 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
         sal_Bool bRemap(pOL->GetOwnerObj() && pOL->GetOwnerObj()->ISA(E3dScene));
         E3dScene* pRemapScene = (bRemap ? (E3dScene*)pOL->GetOwnerObj() : 0L);
 
-        ULONG nObjAnz=pOL->GetObjCount();
-        ULONG nObjNum=bBack ? 0 : nObjAnz;
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        sal_uIntPtr nObjNum=bBack ? 0 : nObjAnz;
         while (pRet==NULL && (bBack ? nObjNum<nObjAnz : nObjNum>0)) {
             if (!bBack) nObjNum--;
             SdrObject* pObj;
@@ -1733,12 +1733,12 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
     return pRet;
 }
 
-BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions) const
+sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
 {
     return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL,NULL);
 }
 
-BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum, USHORT* pnPassNum) const
+sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const
 { // Fehlt noch Pass2,Pass3
     SortMarkedObjects();
     if (ppRootObj!=NULL) *ppRootObj=NULL;
@@ -1746,14 +1746,14 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
     if (pnPassNum!=NULL) *pnPassNum=0;
     rpObj=NULL;
     rpPV=NULL;
-    BOOL bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0;
-    BOOL bMarked=(nOptions & SDRSEARCH_MARKED) !=0;
-    BOOL bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0;
-    BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+    sal_Bool bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0;
+    sal_Bool bMarked=(nOptions & SDRSEARCH_MARKED) !=0;
+    sal_Bool bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0;
+    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
 #if OSL_DEBUG_LEVEL > 0
-    BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i.
-    BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i.
-    BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i.
+    sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i.
+    sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i.
+    sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i.
 #endif
     if (nTol<0) nTol=ImpGetHitTolLogic(nTol,NULL);
     Point aPt(rPnt);
@@ -1766,8 +1766,8 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
         pPV=((SdrObjEditView*)this)->GetTextEditPageView();
     }
     if (bMarked) {
-        ULONG nMrkAnz=GetMarkedObjectCount();
-        ULONG nMrkNum=bBack ? 0 : nMrkAnz;
+        sal_uIntPtr nMrkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMrkNum=bBack ? 0 : nMrkAnz;
         while (pHitObj==NULL && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) {
             if (!bBack) nMrkNum--;
             SdrMark* pM=GetSdrMarkByIndex(nMrkNum);
@@ -1784,18 +1784,18 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
         if(pPV)
         {
             SdrPage* pPage=pPV->GetPage();
-            USHORT nPgAnz=1;
+            sal_uInt16 nPgAnz=1;
 
             if(bMasters && pPage->TRG_HasMasterPage())
             {
                 nPgAnz++;
             }
 
-            BOOL bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
+            sal_Bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
             if (bExtraPassForWholePage) nPgAnz++; // Suche erst in AktObjList, dann auf der gesamten Page
-            USHORT nPgNum=bBack ? 0 : nPgAnz;
+            sal_uInt16 nPgNum=bBack ? 0 : nPgAnz;
             while (pHitObj==NULL && (bBack ? nPgNum<nPgAnz : nPgNum>0)) {
-                ULONG nTmpOptions=nOptions;
+                sal_uIntPtr nTmpOptions=nOptions;
                 if (!bBack) nPgNum--;
                 const SetOfByte* pMVisLay=NULL;
                 SdrObjList* pObjList=NULL;
@@ -1857,19 +1857,19 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
     return rpObj!=NULL;
 }
 
-BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum, ULONG nOptions) const
+sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const
 {
     SortMarkedObjects();
-    BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
-    BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0;
+    sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
+    sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0;
     rpObj=NULL;
     rpPV=NULL;
     if (pnMarkNum!=NULL) *pnMarkNum=CONTAINER_ENTRY_NOTFOUND;
     Point aPt(rPnt);
-    USHORT nTol=(USHORT)nHitTolLog;
-    BOOL bFnd=FALSE;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    ULONG nMarkNum;
+    sal_uInt16 nTol=(sal_uInt16)nHitTolLog;
+    sal_Bool bFnd=sal_False;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nMarkNum;
     for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
         nMarkNum--;
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -1885,8 +1885,8 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
     if ((bBoundCheckOn2ndPass || bCheckNearestOn3rdPass) && !bFnd) {
         SdrObject* pBestObj=NULL;
         SdrPageView* pBestPV=NULL;
-        ULONG nBestMarkNum=0;
-        ULONG nBestDist=ULONG_MAX;
+        sal_uIntPtr nBestMarkNum=0;
+        sal_uIntPtr nBestDist=ULONG_MAX;
         for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
             nMarkNum--;
             SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -1898,12 +1898,12 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
             aRect.Right ()+=nTol;
             aRect.Bottom()+=nTol;
             if (aRect.IsInside(aPt)) {
-                bFnd=TRUE;
+                bFnd=sal_True;
                 rpObj=pObj;
                 rpPV=pPV;
                 if (pnMarkNum!=NULL) *pnMarkNum=nMarkNum;
             } else if (bCheckNearestOn3rdPass) {
-                ULONG nDist=0;
+                sal_uIntPtr nDist=0;
                 if (aPt.X()<aRect.Left())   nDist+=aRect.Left()-aPt.X();
                 if (aPt.X()>aRect.Right())  nDist+=aPt.X()-aRect.Right();
                 if (aPt.Y()<aRect.Top())    nDist+=aRect.Top()-aPt.Y();
@@ -1932,7 +1932,7 @@ SdrHitKind SdrMarkView::PickSomething(const Point& rPnt, short nTol) const
     Point aPt(rPnt);
     SdrObject* pObj=NULL;
     SdrPageView* pPV=NULL;
-    if (eRet==SDRHIT_NONE && PickObj(rPnt,USHORT(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) {
+    if (eRet==SDRHIT_NONE && PickObj(rPnt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) {
         Rectangle aRct1(aPt-Point(nTol,nTol),aPt+Point(nTol,nTol)); // HitRect fuer Toleranz
         Rectangle aBR(pObj->GetCurrentBoundRect());
         if      (aRct1.IsInside(aBR.TopLeft()))      eRet=SDRHIT_BOUNDTL;
@@ -2015,7 +2015,7 @@ void SdrMarkView::AdjustMarkHdl() //HMHBOOL bRestraintPaint)
 Rectangle SdrMarkView::GetMarkedObjBoundRect() const
 {
     Rectangle aRect;
-    for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+    for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
         Rectangle aR1(pO->GetCurrentBoundRect());
@@ -2028,9 +2028,9 @@ Rectangle SdrMarkView::GetMarkedObjBoundRect() const
 const Rectangle& SdrMarkView::GetMarkedObjRect() const
 {
     if (bMarkedObjRectDirty) {
-        ((SdrMarkView*)this)->bMarkedObjRectDirty=FALSE;
+        ((SdrMarkView*)this)->bMarkedObjRectDirty=sal_False;
         Rectangle aRect;
-        for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+        for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pO=pM->GetMarkedSdrObj();
             Rectangle aR1(pO->GetSnapRect());
@@ -2044,7 +2044,7 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal, USHORT nOpt) const
+void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const
 {
     rStr = ImpGetResStr(nStrCacheID);
     xub_StrLen nPos = rStr.SearchAscii("%1");
@@ -2078,9 +2078,9 @@ void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::EnterMarkedGroup()
+sal_Bool SdrMarkView::EnterMarkedGroup()
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     // Es wird nur die erste gefundene Gruppe (also nur in einer PageView) geentert
     // Weil PageView::EnterGroup ein AdjustMarkHdl ruft.
     // Das muss ich per Flag mal unterbinden  vvvvvvvv
@@ -2088,7 +2088,7 @@ BOOL SdrMarkView::EnterMarkedGroup()
 
     if(pPV)
     {
-        BOOL bEnter=FALSE;
+        sal_Bool bEnter=sal_False;
         for (sal_uInt32 nm(GetMarkedObjectCount()); nm > 0 && !bEnter;)
         {
             nm--;
@@ -2097,8 +2097,8 @@ BOOL SdrMarkView::EnterMarkedGroup()
                 SdrObject* pObj=pM->GetMarkedSdrObj();
                 if (pObj->IsGroupObject()) {
                     if (pPV->EnterGroup(pObj)) {
-                        bRet=TRUE;
-                        bEnter=TRUE;
+                        bRet=sal_True;
+                        bEnter=sal_True;
                     }
                 }
             }
@@ -2112,18 +2112,18 @@ BOOL SdrMarkView::EnterMarkedGroup()
 void SdrMarkView::MarkListHasChanged()
 {
     GetMarkedObjectListWriteAccess().SetNameDirty();
-    SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=TRUE;
+    SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=sal_True;
 
-    bMarkedObjRectDirty=TRUE;
-    bMarkedPointsRectsDirty=TRUE;
+    bMarkedObjRectDirty=sal_True;
+    bMarkedPointsRectsDirty=sal_True;
 #ifdef DBG_UTIL
     if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
-    BOOL bOneEdgeMarked=FALSE;
+    sal_Bool bOneEdgeMarked=sal_False;
     if (GetMarkedObjectCount()==1) {
         const SdrObject* pObj=GetMarkedObjectByIndex(0);
         if (pObj->GetObjInventor()==SdrInventor) {
-            UINT16 nIdent=pObj->GetObjIdentifier();
+            sal_uInt16 nIdent=pObj->GetObjIdentifier();
             bOneEdgeMarked=nIdent==OBJ_EDGE;
         }
     }
@@ -2132,17 +2132,17 @@ void SdrMarkView::MarkListHasChanged()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrMarkView::SetMoveOutside(BOOL bOn)
+void SdrMarkView::SetMoveOutside(sal_Bool bOn)
 {
     aHdl.SetMoveOutside(bOn);
 }
 
-BOOL SdrMarkView::IsMoveOutside() const
+sal_Bool SdrMarkView::IsMoveOutside() const
 {
     return aHdl.IsMoveOutside();
 }
 
-void SdrMarkView::SetDesignMode( BOOL _bOn )
+void SdrMarkView::SetDesignMode( sal_Bool _bOn )
 {
     if ( bDesignMode != _bOn )
     {
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index f67b35bfdf67..a1d2a2ecae9d 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -50,14 +50,14 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::HasMarkablePoints() const
+sal_Bool SdrMarkView::HasMarkablePoints() const
 {
     ForceUndirtyMrkPnt();
     bool bRet=false;
     if (!ImpIsFrameHandles()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz<=nFrameHandlesLimit) {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 bRet=pObj->IsPolyObj();
@@ -67,14 +67,14 @@ BOOL SdrMarkView::HasMarkablePoints() const
     return bRet;
 }
 
-ULONG SdrMarkView::GetMarkablePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkablePointCount() const
 {
     ForceUndirtyMrkPnt();
-    ULONG nAnz=0;
+    sal_uIntPtr nAnz=0;
     if (!ImpIsFrameHandles()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz<=nFrameHandlesLimit) {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 if (pObj->IsPolyObj()) {
@@ -86,14 +86,14 @@ ULONG SdrMarkView::GetMarkablePointCount() const
     return nAnz;
 }
 
-BOOL SdrMarkView::HasMarkedPoints() const
+sal_Bool SdrMarkView::HasMarkedPoints() const
 {
     ForceUndirtyMrkPnt();
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     if (!ImpIsFrameHandles()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz<=nFrameHandlesLimit) {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedPoints();
                 bRet=pPts!=NULL && pPts->GetCount()!=0;
@@ -103,14 +103,14 @@ BOOL SdrMarkView::HasMarkedPoints() const
     return bRet;
 }
 
-ULONG SdrMarkView::GetMarkedPointCount() const
+sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
 {
     ForceUndirtyMrkPnt();
-    ULONG nAnz=0;
+    sal_uIntPtr nAnz=0;
     if (!ImpIsFrameHandles()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz<=nFrameHandlesLimit) {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedPoints();
                 if (pPts!=NULL) nAnz+=pPts->GetCount();
@@ -120,33 +120,33 @@ ULONG SdrMarkView::GetMarkedPointCount() const
     return nAnz;
 }
 
-BOOL SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
+sal_Bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
 {
     return !ImpIsFrameHandles() && &rHdl!=NULL && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj();
 }
 
-BOOL SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark)
 {
     return ImpMarkPoint( pHdl, pMark, bUnmark );
 }
 
-BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
+sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark)
 {
     if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE)
-        return FALSE;
+        return sal_False;
 
     if (pHdl->IsSelected() != bUnmark)
-        return FALSE;
+        return sal_False;
 
     SdrObject* pObj=pHdl->GetObj();
     if (pObj==NULL || !pObj->IsPolyObj())
-        return FALSE;
+        return sal_False;
 
     if (pMark==NULL)
     {
-        ULONG nMarkNum=TryToFindMarkedObject(pObj);
+        sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);
         if (nMarkNum==CONTAINER_ENTRY_NOTFOUND)
-            return FALSE;
+            return sal_False;
         pMark=GetSdrMarkByIndex(nMarkNum);
     }
     const sal_uInt32 nHdlNum(pHdl->GetObjHdlNum());
@@ -157,14 +157,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
     }
     else
     {
-        ULONG nBla=pPts->GetPos((sal_uInt16)nHdlNum);
+        sal_uIntPtr nBla=pPts->GetPos((sal_uInt16)nHdlNum);
         if (nBla!=CONTAINER_ENTRY_NOTFOUND)
         {
             pPts->Remove(nBla);
         }
         else
         {
-            return FALSE; // Fehlerfall!
+            return sal_False; // Fehlerfall!
         }
     }
 
@@ -181,14 +181,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
                 {
                     pPlusHdl->SetObj(pObj);
                     pPlusHdl->SetPageView(pMark->GetPageView());
-                    pPlusHdl->SetPlusHdl(TRUE);
+                    pPlusHdl->SetPlusHdl(sal_True);
                     aHdl.AddHdl(pPlusHdl);
                 }
             }
         }
         else
         {
-            for (ULONG i = aHdl.GetHdlCount(); i>0;)
+            for (sal_uIntPtr i = aHdl.GetHdlCount(); i>0;)
             {
                 i--;
                 SdrHdl* pPlusHdl=aHdl.GetHdl(i);
@@ -204,18 +204,18 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
     // #97016# II: Sort handles. This was missing in ImpMarkPoint all the time.
     aHdl.Sort();
 
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark)
 {
-    if (&rHdl==NULL) return FALSE;
+    if (&rHdl==NULL) return sal_False;
     ForceUndirtyMrkPnt();
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     const SdrObject* pObj=rHdl.GetObj();
     if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) {
-        ULONG nMarkNum=TryToFindMarkedObject(pObj);
+        sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);
         if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) {
             SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             SdrUShortCont* pPts=pM->ForceMarkedPoints();
@@ -223,7 +223,7 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
             if (ImpMarkPoint(&rHdl,pM,bUnmark)) {
                 pPts->ForceSort();
                 MarkListHasChanged();
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
     }
@@ -231,18 +231,18 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
     return bRet;
 }
 
-BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     const SdrObject* pObj0=NULL;
     const SdrPageView* pPV0=NULL;
     SdrMark* pM=NULL;
     aHdl.Sort();
     //HMHBOOL bHideHdl=IsMarkHdlShown() && IsSolidMarkHdl() && !bPlusHdlAlways;
-    ULONG nHdlAnz=aHdl.GetHdlCount();
-    for (ULONG nHdlNum=nHdlAnz; nHdlNum>0;) {
+    sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+    for (sal_uIntPtr nHdlNum=nHdlAnz; nHdlNum>0;) {
         nHdlNum--;
         SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
         if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) {
@@ -253,7 +253,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
                     SdrUShortCont* pPts=pM->GetMarkedPoints();
                     if (pPts!=NULL) pPts->ForceSort();
                 }
-                ULONG nMarkNum=TryToFindMarkedObject(pObj);  // damit ImpMarkPoint() nicht staendig das
+                sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);  // damit ImpMarkPoint() nicht staendig das
                 if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { // Objekt in der MarkList suchen muss.
                     pM=GetSdrMarkByIndex(nMarkNum);
                     pObj0=pObj;
@@ -275,7 +275,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
                     //HMHsal_uInt32 nAnz=pHdl->GetObj()->GetPlusHdlCount(*pHdl);
                     //HMHif (nAnz!=0L) HideMarkHdl(); // #36987#
                 //HMH}
-                if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=TRUE;
+                if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=sal_True;
             }
         }
     }
@@ -291,10 +291,10 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
     return bChgd;
 }
 
-BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextPoint(sal_Bool /*bPrev*/)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     // ...
     if (bChgd) {
@@ -303,10 +303,10 @@ BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/)
     return bChgd;
 }
 
-BOOL SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     // ...
     if (bChgd) {
@@ -322,7 +322,7 @@ const Rectangle& SdrMarkView::GetMarkedPointsRect() const
     return aMarkedPointsRect;
 }
 
-void SdrMarkView::SetPlusHandlesAlwaysVisible(BOOL bOn)
+void SdrMarkView::SetPlusHandlesAlwaysVisible(sal_Bool bOn)
 { // HandlePaint optimieren !!!!!!!
     ForceUndirtyMrkPnt();
     if (bOn!=bPlusHdlAlways) {
@@ -343,8 +343,8 @@ void SdrMarkView::ImpSetPointsRects() const
 {
     Rectangle aPnts;
     Rectangle aGlue;
-    ULONG nHdlAnz=aHdl.GetHdlCount();
-    for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
+    sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+    for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
         const SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
         SdrHdlKind eKind=pHdl->GetKind();
         if ((eKind==HDL_POLY && pHdl->IsSelected()) || eKind==HDL_GLUE) {
@@ -362,7 +362,7 @@ void SdrMarkView::ImpSetPointsRects() const
     }
     ((SdrMarkView*)this)->aMarkedPointsRect=aPnts;
     ((SdrMarkView*)this)->aMarkedGluePointsRect=aGlue;
-    ((SdrMarkView*)this)->bMarkedPointsRectsDirty=FALSE;
+    ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -371,9 +371,9 @@ void SdrMarkView::ImpSetPointsRects() const
 
 void SdrMarkView::UndirtyMrkPnt() const
 {
-    BOOL bChg=FALSE;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+    sal_Bool bChg=sal_False;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         // PolyPoints
@@ -395,7 +395,7 @@ void SdrMarkView::UndirtyMrkPnt() const
                     if(nPtNum >= nMax)
                     {
                         pPts->Remove(nIndex);
-                        bChg = TRUE;
+                        bChg = sal_True;
                     }
                 }
             }
@@ -405,7 +405,7 @@ void SdrMarkView::UndirtyMrkPnt() const
                 if(pPts && pPts->GetCount())
                 {
                     pPts->Clear();
-                    bChg = TRUE;
+                    bChg = sal_True;
                 }
             }
         }
@@ -419,37 +419,37 @@ void SdrMarkView::UndirtyMrkPnt() const
                 // Eintraege (Id's) die nicht in der GluePointList des
                 // Objekts enthalten sind
                 pPts->ForceSort();
-                for (ULONG nIndex=pPts->GetCount(); nIndex>0;) {
+                for (sal_uIntPtr nIndex=pPts->GetCount(); nIndex>0;) {
                     nIndex--;
-                    USHORT nId=pPts->GetObject(nIndex);
+                    sal_uInt16 nId=pPts->GetObject(nIndex);
                     if (pGPL->FindGluePoint(nId)==SDRGLUEPOINT_NOTFOUND) {
                         pPts->Remove(nIndex);
-                        bChg=TRUE;
+                        bChg=sal_True;
                     }
                 }
             } else {
                 if (pPts!=NULL && pPts->GetCount()!=0) {
                     pPts->Clear(); // Objekt hat keine Klebepunkte (mehr)
-                    bChg=TRUE;
+                    bChg=sal_True;
                 }
             }
         }
     }
-    if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=TRUE;
-    ((SdrMarkView*)this)->bMrkPntDirty=FALSE;
+    if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_True;
+    ((SdrMarkView*)this)->bMrkPntDirty=sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::HasMarkableGluePoints() const
+sal_Bool SdrMarkView::HasMarkableGluePoints() const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     if (IsGluePointEditMode()) {
         ForceUndirtyMrkPnt();
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             const SdrObject* pObj=pM->GetMarkedSdrObj();
             const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -461,7 +461,7 @@ BOOL SdrMarkView::HasMarkableGluePoints() const
                 {
                     if((*pGPL)[a].IsUserDefined())
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -470,13 +470,13 @@ BOOL SdrMarkView::HasMarkableGluePoints() const
     return bRet;
 }
 
-ULONG SdrMarkView::GetMarkableGluePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkableGluePointCount() const
 {
-    ULONG nAnz=0;
+    sal_uIntPtr nAnz=0;
     if (IsGluePointEditMode()) {
         ForceUndirtyMrkPnt();
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             const SdrObject* pObj=pM->GetMarkedSdrObj();
             const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -497,12 +497,12 @@ ULONG SdrMarkView::GetMarkableGluePointCount() const
     return nAnz;
 }
 
-BOOL SdrMarkView::HasMarkedGluePoints() const
+sal_Bool SdrMarkView::HasMarkedGluePoints() const
 {
     ForceUndirtyMrkPnt();
-    BOOL bRet=FALSE;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+    sal_Bool bRet=sal_False;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
         const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
         bRet=pPts!=NULL && pPts->GetCount()!=0;
@@ -510,12 +510,12 @@ BOOL SdrMarkView::HasMarkedGluePoints() const
     return bRet;
 }
 
-ULONG SdrMarkView::GetMarkedGluePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkedGluePointCount() const
 {
     ForceUndirtyMrkPnt();
-    ULONG nAnz=0;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+    sal_uIntPtr nAnz=0;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
         const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
         if (pPts!=NULL) nAnz+=pPts->GetCount();
@@ -523,14 +523,14 @@ ULONG SdrMarkView::GetMarkedGluePointCount() const
     return nAnz;
 }
 
-BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
 {
-    if (!IsGluePointEditMode() && !bUnmark) return FALSE;
+    if (!IsGluePointEditMode() && !bUnmark) return sal_False;
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -538,12 +538,12 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
         if (bUnmark && pRect==NULL) { // UnmarkAll
             if (pPts!=NULL && pPts->GetCount()!=0) {
                 pPts->Clear();
-                bChgd=TRUE;
+                bChgd=sal_True;
             }
         } else {
             if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) {
-                USHORT nGPAnz=pGPL->GetCount();
-                for (USHORT nGPNum=0; nGPNum<nGPAnz; nGPNum++) {
+                sal_uInt16 nGPAnz=pGPL->GetCount();
+                for (sal_uInt16 nGPNum=0; nGPNum<nGPAnz; nGPNum++) {
                     const SdrGluePoint& rGP=(*pGPL)[nGPNum];
 
                     // #i38892#
@@ -553,13 +553,13 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
                         if (pRect==NULL || pRect->IsInside(aPos)) {
                             if (pPts==NULL) pPts=pM->ForceMarkedGluePoints();
                             else pPts->ForceSort();
-                            ULONG nPos=pPts->GetPos(rGP.GetId());
+                            sal_uIntPtr nPos=pPts->GetPos(rGP.GetId());
                             if (!bUnmark && nPos==CONTAINER_ENTRY_NOTFOUND) {
-                                bChgd=TRUE;
+                                bChgd=sal_True;
                                 pPts->Insert(rGP.GetId());
                             }
                             if (bUnmark && nPos!=CONTAINER_ENTRY_NOTFOUND) {
-                                bChgd=TRUE;
+                                bChgd=sal_True;
                                 pPts->Remove(nPos);
                             }
                         }
@@ -575,24 +575,24 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
     return bChgd;
 }
 
-BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions) const
+sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
 {
     SdrObject* pObj0=rpObj;
     //SdrPageView* pPV0=rpPV;
-    USHORT nId0=rnId;
+    sal_uInt16 nId0=rnId;
     rpObj=NULL; rpPV=NULL; rnId=0;
-    if (!IsGluePointEditMode()) return FALSE;
-    BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
-    BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0;
+    if (!IsGluePointEditMode()) return sal_False;
+    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+    sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
     OutputDevice* pOut=(OutputDevice*)pActualOutDev;
     if (pOut==NULL) pOut=GetFirstOutputDevice(); //GetWin(0);
-    if (pOut==NULL) return FALSE;
+    if (pOut==NULL) return sal_False;
     SortMarkedObjects();
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    ULONG nMarkNum=bBack ? 0 : nMarkAnz;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nMarkNum=bBack ? 0 : nMarkAnz;
     if (bNext) {
         nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0);
-        if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return FALSE;
+        if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return sal_False;
         if (!bBack) nMarkNum++;
     }
     while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) {
@@ -602,7 +602,7 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn
         SdrPageView* pPV=pM->GetPageView();
         const SdrGluePointList* pGPL=pObj->GetGluePointList();
         if (pGPL!=NULL) {
-            USHORT nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0);
+            sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0);
             if (nNum!=SDRGLUEPOINT_NOTFOUND)
             {
                 // #i38892#
@@ -613,34 +613,34 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn
                     rpObj=pObj;
                     rnId=(*pGPL)[nNum].GetId();
                     rpPV=pPV;
-                    return TRUE;
+                    return sal_True;
                 }
             }
         }
-        bNext=FALSE; // HitNextGluePoint nur beim ersten Obj
+        bNext=sal_False; // HitNextGluePoint nur beim ersten Obj
         if (bBack) nMarkNum++;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* /*pPV*/, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, sal_Bool bUnmark)
 {
-    if (!IsGluePointEditMode()) return FALSE;
+    if (!IsGluePointEditMode()) return sal_False;
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     if (pObj!=NULL) {
-        ULONG nMarkPos=TryToFindMarkedObject(pObj);
+        sal_uIntPtr nMarkPos=TryToFindMarkedObject(pObj);
         if (nMarkPos!=CONTAINER_ENTRY_NOTFOUND) {
             SdrMark* pM=GetSdrMarkByIndex(nMarkPos);
             SdrUShortCont* pPts=bUnmark ? pM->GetMarkedGluePoints() : pM->ForceMarkedGluePoints();
             if (pPts!=NULL) {
-                ULONG nPointPos=pPts->GetPos(nId);
+                sal_uIntPtr nPointPos=pPts->GetPos(nId);
                 if (!bUnmark && nPointPos==CONTAINER_ENTRY_NOTFOUND) {
-                    bChgd=TRUE;
+                    bChgd=sal_True;
                     pPts->Insert(nId);
                 }
                 if (bUnmark && nPointPos!=CONTAINER_ENTRY_NOTFOUND) {
-                    bChgd=TRUE;
+                    bChgd=sal_True;
                     pPts->Remove(nPointPos);
                 }
             }
@@ -656,11 +656,11 @@ BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPage
     return bChgd;
 }
 
-BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const
+sal_Bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const
 {
     ForceUndirtyMrkPnt();
-    BOOL bRet=FALSE;
-    ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst
+    sal_Bool bRet=sal_False;
+    sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         const SdrMark* pM=GetSdrMarkByIndex(nPos);
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
@@ -671,18 +671,18 @@ BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const
     return bRet;
 }
 
-BOOL SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl)
+sal_Bool SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl)
 {
     if (&rHdl!=NULL && rHdl.GetKind()==HDL_GLUE && rHdl.GetObj()!=NULL) {
-        return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),TRUE);
-    } else return FALSE;
+        return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),sal_True);
+    } else return sal_False;
 }
 
-SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const
+SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const
 {
     ForceUndirtyMrkPnt();
-    ULONG nHdlAnz=aHdl.GetHdlCount();
-    for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
+    sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+    for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
         SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
         if (pHdl->GetObj()==pObj &&
             pHdl->GetKind()==HDL_GLUE &&
@@ -691,10 +691,10 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const
     return NULL;
 }
 
-BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextGluePoint(sal_Bool /*bPrev*/)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     // ...
     if (bChgd) {
@@ -703,10 +703,10 @@ BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/)
     return bChgd;
 }
 
-BOOL SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     // ...
     if (bChgd) {
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 6a8221136f7c..30791ce216d4 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -632,7 +632,7 @@ SdrObjCustomShape::SdrObjCustomShape() :
     fObjectRotation( 0.0 ),
     mpLastShadowGeometry(0L)
 {
-    bTextFrame = TRUE;
+    bTextFrame = sal_True;
 }
 
 SdrObjCustomShape::~SdrObjCustomShape()
@@ -1623,17 +1623,17 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
 void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
     rInfo.bResizeFreeAllowed=fObjectRotation == 0.0;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=TRUE;
-    rInfo.bRotate90Allowed  =TRUE;
-    rInfo.bMirrorFreeAllowed=TRUE;
-    rInfo.bMirror45Allowed  =TRUE;
-    rInfo.bMirror90Allowed  =TRUE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =TRUE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bNoContortion     =TRUE;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_True;
+    rInfo.bRotate90Allowed  =sal_True;
+    rInfo.bMirrorFreeAllowed=sal_True;
+    rInfo.bMirror45Allowed  =sal_True;
+    rInfo.bMirror90Allowed  =sal_True;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_True;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bNoContortion     =sal_True;
 
     // #i37011#
     if ( mXRenderedCustomShape.is() )
@@ -1680,9 +1680,9 @@ void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
     mXRenderedCustomShape.clear();
 }
 
-UINT16 SdrObjCustomShape::GetObjIdentifier() const
+sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const
 {
-    return UINT16(OBJ_CUSTOMSHAPE);
+    return sal_uInt16(OBJ_CUSTOMSHAPE);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1998,9 +1998,9 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, FAST
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
 {
-    INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
 
     // #i25616#
     if(!LineIsOutsideGeometry())
@@ -2020,7 +2020,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const
     if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
@@ -2052,7 +2052,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                 for(a = 0; a < pSource->GetCount(); a++)
                 {
                     SdrGluePoint aCopy((*pSource)[a]);
-                    aCopy.SetUserDefined(FALSE);
+                    aCopy.SetUserDefined(sal_False);
                     aNewList.Insert(aCopy);
                 }
 
@@ -2067,9 +2067,9 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                     Polygon aPoly( aRect );
                     if( nShearWink )
                     {
-                        USHORT nPointCount=aPoly.GetSize();
-                        for (USHORT i=0; i<nPointCount; i++)
-                            ShearPoint(aPoly[i],aRect.Center(), fTan, FALSE );
+                        sal_uInt16 nPointCount=aPoly.GetSize();
+                        for (sal_uInt16 i=0; i<nPointCount; i++)
+                            ShearPoint(aPoly[i],aRect.Center(), fTan, sal_False );
                     }
                     if ( aGeo.nDrehWink )
                         aPoly.Rotate( aRect.Center(), aGeo.nDrehWink / 10 );
@@ -2464,7 +2464,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
     }
 
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
+    bSnapRectDirty=sal_True;
 }
 
 FASTBOOL SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
@@ -2481,7 +2481,7 @@ FASTBOOL SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
     }
     DragCreateObject( rStat );
     SetRectsDirty();
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
@@ -2527,7 +2527,7 @@ FASTBOOL SdrObjCustomShape::IsAutoGrowHeight() const
     const SfxItemSet& rSet = GetMergedItemSet();
     FASTBOOL bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
     if ( bIsAutoGrowHeight && IsVerticalWriting() )
-        bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE;
+        bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
     return bIsAutoGrowHeight;
 }
 FASTBOOL SdrObjCustomShape::IsAutoGrowWidth() const
@@ -2535,7 +2535,7 @@ FASTBOOL SdrObjCustomShape::IsAutoGrowWidth() const
     const SfxItemSet& rSet = GetMergedItemSet();
     FASTBOOL bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
     if ( bIsAutoGrowWidth && !IsVerticalWriting() )
-        bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE;
+        bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
     return bIsAutoGrowWidth;
 }
 
@@ -2659,7 +2659,7 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
             {
                 Outliner& rOutliner=ImpGetDrawOutliner();
                 rOutliner.SetPaperSize(aSiz);
-                rOutliner.SetUpdateMode(TRUE);
+                rOutliner.SetUpdateMode(sal_True);
                 // !!! hier sollte ich wohl auch noch mal die Optimierung mit
                 // bPortionInfoChecked usw einbauen
                 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -2696,9 +2696,9 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
             long nWdtGrow = nWdt-(rR.Right()-rR.Left());
             long nHgtGrow = nHgt-(rR.Bottom()-rR.Top());
             if ( nWdtGrow == 0 )
-                bWdtGrow = FALSE;
+                bWdtGrow = sal_False;
             if ( nHgtGrow == 0 )
-                bHgtGrow=FALSE;
+                bHgtGrow=sal_False;
             if ( bWdtGrow || bHgtGrow )
             {
                 if ( bWdtGrow )
@@ -2738,11 +2738,11 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
                     aD2-=aD1;
                     rR.Move(aD2.X(),aD2.Y());
                 }
-                return TRUE;
+                return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt )
@@ -2969,13 +2969,13 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const
         SdrTextObj::TakeTextAnchorRect( rAnchorRect );
 }
 void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText,
-                               Rectangle* pAnchorRect, BOOL /*bLineWidth*/) const
+                               Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const
 {
     Rectangle aAnkRect; // Rect innerhalb dem geankert wird
     TakeTextAnchorRect(aAnkRect);
     SdrTextVertAdjust eVAdj=GetTextVerticalAdjust();
     SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
-    ULONG nStat0=rOutliner.GetControlWord();
+    sal_uIntPtr nStat0=rOutliner.GetControlWord();
     Size aNullSize;
 
     rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
@@ -3012,7 +3012,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
 
     if (pPara)
     {
-        BOOL bHitTest = FALSE;
+        sal_Bool bHitTest = sal_False;
         if( pModel )
             bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
 
@@ -3023,7 +3023,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
             if( bHitTest )
                 rOutliner.SetTextObj( this );
 
-            rOutliner.SetUpdateMode(TRUE);
+            rOutliner.SetUpdateMode(sal_True);
             rOutliner.SetText(*pPara);
         }
     }
@@ -3034,7 +3034,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
     if (pEdtOutl && !bNoEditText && pPara)
         delete pPara;
 
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetControlWord(nStat0);
 
     SdrText* pText = getActiveText();
@@ -3104,7 +3104,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject
 {
     SdrTextObj::NbcSetOutlinerParaObject( pTextObject );
     SetBoundRectDirty();
-    SetRectsDirty(TRUE);
+    SetRectsDirty(sal_True);
     InvalidateRenderGeometry();
 }
 
@@ -3148,7 +3148,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const
     return basegfx::B2DPolyPolygon();
 }
 
-SdrObject* SdrObjCustomShape::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     // #i37011#
     SdrObject* pRetval = 0L;
@@ -3319,7 +3319,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
         GeoStat aGeoStat;
         aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
         aGeoStat.RecalcTan();
-        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE);
+        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
     }
 
     // rotation?
@@ -3367,8 +3367,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
 
             Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
             Point aRef2( aRef1.X(), aRef1.Y() + 1000 );
-            USHORT i;
-            USHORT nPntAnz=aPol.GetSize();
+            sal_uInt16 i;
+            sal_uInt16 nPntAnz=aPol.GetSize();
             for (i=0; i<nPntAnz; i++)
             {
                 MirrorPoint(aPol[i],aRef1,aRef2);
@@ -3389,8 +3389,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
 
             Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
             Point aRef2( aRef1.X() + 1000, aRef1.Y() );
-            USHORT i;
-            USHORT nPntAnz=aPol.GetSize();
+            sal_uInt16 i;
+            sal_uInt16 nPntAnz=aPol.GetSize();
             for (i=0; i<nPntAnz; i++)
             {
                 MirrorPoint(aPol[i],aRef1,aRef2);
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 09965a1b98a6..27c31647e881 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -140,7 +140,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
 void __EXPORT SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 {
     SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint);
-    BOOL bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
+    sal_Bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
 
     if(bDataChg)
     {
@@ -167,12 +167,12 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const
     return nRetval;
 }
 
-BOOL SdrAttrObj::HasFill() const
+sal_Bool SdrAttrObj::HasFill() const
 {
     return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE;
 }
 
-BOOL SdrAttrObj::HasLine() const
+sal_Bool SdrAttrObj::HasLine() const
 {
     return ((XLineStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_LINESTYLE))).GetValue()!=XLINE_NONE;
 }
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 18e04f648725..81ff5005d0f6 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -150,12 +150,12 @@ void SdrObjUserData::operator=(const SdrObjUserData& /*rData*/)    // nicht impl
 
 sal_Bool SdrObjUserData::operator==(const SdrObjUserData& /*rData*/) const // nicht implementiert
 {
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SdrObjUserData::operator!=(const SdrObjUserData& /*rData*/) const // nicht implementiert
 {
-    return FALSE;
+    return sal_False;
 }
 
 SdrObjUserData::~SdrObjUserData()
@@ -164,7 +164,7 @@ SdrObjUserData::~SdrObjUserData()
 
 FASTBOOL SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 SdrObject* SdrObjUserData::CheckMacroHit(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const
@@ -208,7 +208,7 @@ void SdrObjUserData::PaintMacro(OutputDevice& rOut, const Rectangle& /*rDirtyRec
 
 FASTBOOL SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const
@@ -218,8 +218,8 @@ XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/
 
 void SdrObjUserDataList::Clear()
 {
-    USHORT nAnz=GetUserDataCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=GetUserDataCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         delete GetUserData(i);
     }
     aList.Clear();
@@ -231,10 +231,10 @@ DBG_NAME(SdrObjGeoData);
 
 SdrObjGeoData::SdrObjGeoData():
     pGPL(NULL),
-    bMovProt(FALSE),
-    bSizProt(FALSE),
-    bNoPrint(FALSE),
-    bClosedObj(FALSE),
+    bMovProt(sal_False),
+    bSizProt(sal_False),
+    bNoPrint(sal_False),
+    bClosedObj(sal_False),
     mbVisible(true),
     mnLayerID(0)
 {
@@ -271,10 +271,10 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const
 {
     SdrObjPlusData* pNeuPlusData=new SdrObjPlusData;
     if (pUserDataList!=NULL) {
-        USHORT nAnz=pUserDataList->GetUserDataCount();
+        sal_uInt16 nAnz=pUserDataList->GetUserDataCount();
         if (nAnz!=0) {
             pNeuPlusData->pUserDataList=new SdrObjUserDataList;
-            for (USHORT i=0; i<nAnz; i++) {
+            for (sal_uInt16 i=0; i<nAnz; i++) {
                 SdrObjUserData* pNeuUserData=pUserDataList->GetUserData(i)->Clone(pObj1);
                 if (pNeuUserData!=NULL) {
                     pNeuPlusData->pUserDataList->InsertUserData(pNeuUserData);
@@ -404,17 +404,17 @@ SdrObject::SdrObject()
     ,maWeakUnoShape()
 {
     DBG_CTOR(SdrObject,NULL);
-    bVirtObj         =FALSE;
-    bSnapRectDirty   =TRUE;
-    bNetLock         =FALSE;
-    bInserted        =FALSE;
-    bGrouped         =FALSE;
-    bMovProt         =FALSE;
-    bSizProt         =FALSE;
-    bNoPrint         =FALSE;
-    bEmptyPresObj    =FALSE;
-    bNotVisibleAsMaster=FALSE;
-    bClosedObj       =FALSE;
+    bVirtObj         =sal_False;
+    bSnapRectDirty   =sal_True;
+    bNetLock         =sal_False;
+    bInserted        =sal_False;
+    bGrouped         =sal_False;
+    bMovProt         =sal_False;
+    bSizProt         =sal_False;
+    bNoPrint         =sal_False;
+    bEmptyPresObj    =sal_False;
+    bNotVisibleAsMaster=sal_False;
+    bClosedObj       =sal_False;
     mbVisible        = true;
 
     // #i25616#
@@ -424,13 +424,13 @@ SdrObject::SdrObject()
     mbSupportTextIndentingOnLineWidthChange = sal_False;
 
     //#110094#-1
-    //bWriterFlyFrame  =FALSE;
+    //bWriterFlyFrame  =sal_False;
 
-    bNotMasterCachable=FALSE;
-    bIsEdge=FALSE;
-    bIs3DObj=FALSE;
-    bMarkProt=FALSE;
-    bIsUnoObj=FALSE;
+    bNotMasterCachable=sal_False;
+    bIsEdge=sal_False;
+    bIs3DObj=sal_False;
+    bMarkProt=sal_False;
+    bIsUnoObj=sal_False;
 }
 
 SdrObject::~SdrObject()
@@ -506,7 +506,7 @@ void SdrObject::SetRectsDirty(sal_Bool bNotMyself)
 {
     if (!bNotMyself) {
         SetBoundRectDirty();
-        bSnapRectDirty=TRUE;
+        bSnapRectDirty=sal_True;
     }
     if (pObjList!=NULL) {
         pObjList->SetRectsDirty();
@@ -586,29 +586,29 @@ SdrItemPool* SdrObject::GetObjectItemPool() const
     return &SdrObject::GetGlobalDrawObjectItemPool();
 }
 
-UINT32 SdrObject::GetObjInventor()   const
+sal_uInt32 SdrObject::GetObjInventor()   const
 {
     return SdrInventor;
 }
 
-UINT16 SdrObject::GetObjIdentifier() const
+sal_uInt16 SdrObject::GetObjIdentifier() const
 {
-    return UINT16(OBJ_NONE);
+    return sal_uInt16(OBJ_NONE);
 }
 
 void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =FALSE;
-    rInfo.bCanConvToContour = FALSE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_False;
+    rInfo.bCanConvToContour = sal_False;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
 }
 
 SdrLayerID SdrObject::GetLayer() const
@@ -621,8 +621,8 @@ void SdrObject::getMergedHierarchyLayerSet(SetOfByte& rSet) const
     rSet.Set(GetLayer());
     SdrObjList* pOL=GetSubList();
     if (pOL!=NULL) {
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
             pOL->GetObj(nObjNum)->getMergedHierarchyLayerSet(rSet);
         }
     }
@@ -680,7 +680,7 @@ AutoTimer* SdrObject::ForceAutoTimer()
 
 FASTBOOL SdrObject::HasRefPoint() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 Point SdrObject::GetRefPoint() const
@@ -867,7 +867,7 @@ String SdrObject::GetHTMLName() const
     return String();
 }
 
-UINT32 SdrObject::GetOrdNum() const
+sal_uInt32 SdrObject::GetOrdNum() const
 {
     if (pObjList!=NULL) {
         if (pObjList->IsObjOrdNumsDirty()) {
@@ -1006,7 +1006,7 @@ sal_Bool SdrObject::SingleObjectPainter(OutputDevice& rOut) const
     return sal_True;
 }
 
-BOOL SdrObject::LineGeometryUsageIsNecessary() const
+sal_Bool SdrObject::LineGeometryUsageIsNecessary() const
 {
     XLineStyle eXLS = (XLineStyle)((const XLineStyleItem&)GetMergedItem(XATTR_LINESTYLE)).GetValue();
     return (eXLS != XLINE_NONE);
@@ -1057,7 +1057,7 @@ void SdrObject::operator=(const SdrObject& rObj)
     bEmptyPresObj =rObj.bEmptyPresObj;
     //NotVisibleAsMaster wird nicht kopiert: nun doch! (25-07-1995, Joe)
     bNotVisibleAsMaster=rObj.bNotVisibleAsMaster;
-    bSnapRectDirty=TRUE; //rObj.bSnapRectDirty;
+    bSnapRectDirty=sal_True; //rObj.bSnapRectDirty;
     bNotMasterCachable=rObj.bNotMasterCachable;
     if (pPlusData!=NULL) { delete pPlusData; pPlusData=NULL; }
     if (rObj.pPlusData!=NULL) {
@@ -1088,7 +1088,7 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const
     rName=ImpGetResStr(STR_ObjNamePluralNONE);
 }
 
-void SdrObject::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal) const
+void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal) const
 {
     rStr = ImpGetResStr(nStrCacheID);
 
@@ -1168,17 +1168,17 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
         {
             // create connections if connector, will be cleaned up when
             // deleting the connector again
-            SdrObject* pLeft = pEdgeObj->GetConnectedNode(TRUE);
-            SdrObject* pRight = pEdgeObj->GetConnectedNode(FALSE);
+            SdrObject* pLeft = pEdgeObj->GetConnectedNode(sal_True);
+            SdrObject* pRight = pEdgeObj->GetConnectedNode(sal_False);
 
             if(pLeft)
             {
-                pClone->ConnectToNode(TRUE, pLeft);
+                pClone->ConnectToNode(sal_True, pLeft);
             }
 
             if(pRight)
             {
-                pClone->ConnectToNode(FALSE, pRight);
+                pClone->ConnectToNode(sal_False, pRight);
             }
         }
 
@@ -1408,7 +1408,7 @@ FASTBOOL SdrObject::BegCreate(SdrDragStat& rStat)
     aRect1.Justify();
     rStat.SetActionRect(aRect1);
     aOutRect = aRect1;
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrObject::MovCreate(SdrDragStat& rStat)
@@ -1423,9 +1423,9 @@ FASTBOOL SdrObject::MovCreate(SdrDragStat& rStat)
     // cause no further prolems
     //
     // SetBoundRectDirty();
-    // bSnapRectDirty=TRUE;
+    // bSnapRectDirty=sal_True;
 
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -1446,7 +1446,7 @@ void SdrObject::BrkCreate(SdrDragStat& /*rStat*/)
 
 FASTBOOL SdrObject::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 basegfx::B2DPolyPolygon SdrObject::TakeCreatePoly(const SdrDragStat& rDrag) const
@@ -1496,7 +1496,7 @@ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti
 
 void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     aOutRect.Move(-rRef.X(),-rRef.Y());
     Rectangle R(aOutRect);
     if (sn==1.0 && cs==0.0) { // 90deg
@@ -1519,12 +1519,12 @@ void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     aOutRect.Justify(); // Sicherheitshalber
     SetRectsDirty();
     NbcRotateGluePoints(rRef,nWink,sn,cs);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     aOutRect.Move(-rRef1.X(),-rRef1.Y());
     Rectangle R(aOutRect);
     long dx=rRef2.X()-rRef1.X();
@@ -1550,14 +1550,14 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
     aOutRect.Justify(); // Sicherheitshalber
     SetRectsDirty();
     NbcMirrorGluePoints(rRef1,rRef2);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     NbcShearGluePoints(rRef,nWink,tn,bVShear);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrObject::Move(const Size& rSiz)
@@ -1766,12 +1766,12 @@ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, sal_uInt32 /*i*/)
 
 FASTBOOL SdrObject::HasTextEdit() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/)
@@ -1823,8 +1823,8 @@ void SdrObject::BurnInStyleSheetAttributes()
 SdrObjUserData* SdrObject::ImpGetMacroUserData() const
 {
     SdrObjUserData* pData=NULL;
-    USHORT nAnz=GetUserDataCount();
-    for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) {
+    sal_uInt16 nAnz=GetUserDataCount();
+    for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) {
         nNum--;
         pData=GetUserData(nNum);
         if (!pData->HasMacro(this)) pData=NULL;
@@ -1835,7 +1835,7 @@ SdrObjUserData* SdrObject::ImpGetMacroUserData() const
 FASTBOOL SdrObject::HasMacro() const
 {
     SdrObjUserData* pData=ImpGetMacroUserData();
-    return pData!=NULL ? pData->HasMacro(this) : FALSE;
+    return pData!=NULL ? pData->HasMacro(this) : sal_False;
 }
 
 SdrObject* SdrObject::CheckMacroHit(const SdrObjMacroHitRec& rRec) const
@@ -1897,7 +1897,7 @@ FASTBOOL SdrObject::DoMacro(const SdrObjMacroHitRec& rRec)
     if (pData!=NULL) {
         return pData->DoMacro(rRec,this);
     }
-    return FALSE;
+    return sal_False;
 }
 
 XubString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
@@ -2060,41 +2060,41 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
     Point aRef1(rSnap.Center());
     Point aRef2(aRef1); aRef2.Y()++;
     const SfxPoolItem *pPoolItem=NULL;
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aRef1.X()=((const SdrTransformRef1XItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aRef1.Y()=((const SdrTransformRef1YItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aRef2.X()=((const SdrTransformRef2XItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aRef2.Y()=((const SdrTransformRef2YItem*)pPoolItem)->GetValue();
     }
 
     Rectangle aNewSnap(rSnap);
-    if (rAttr.GetItemState(SDRATTR_MOVEX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_MOVEX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrMoveXItem*)pPoolItem)->GetValue();
         aNewSnap.Move(n,0);
     }
-    if (rAttr.GetItemState(SDRATTR_MOVEY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_MOVEY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrMoveYItem*)pPoolItem)->GetValue();
         aNewSnap.Move(0,n);
     }
-    if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrOnePositionXItem*)pPoolItem)->GetValue();
         aNewSnap.Move(n-aNewSnap.Left(),0);
     }
-    if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrOnePositionYItem*)pPoolItem)->GetValue();
         aNewSnap.Move(0,n-aNewSnap.Top());
     }
-    if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrOneSizeWidthItem*)pPoolItem)->GetValue();
         aNewSnap.Right()=aNewSnap.Left()+n;
     }
-    if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrOneSizeHeightItem*)pPoolItem)->GetValue();
         aNewSnap.Bottom()=aNewSnap.Top()+n;
     }
@@ -2106,15 +2106,15 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
         }
     }
 
-    if (rAttr.GetItemState(SDRATTR_SHEARANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_SHEARANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrShearAngleItem*)pPoolItem)->GetValue();
         n-=GetShearAngle();
         if (n!=0) {
             double nTan=tan(n*nPi180);
-            NbcShear(aRef1,n,nTan,FALSE);
+            NbcShear(aRef1,n,nTan,sal_False);
         }
     }
-    if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrRotateAngleItem*)pPoolItem)->GetValue();
         n-=GetRotateAngle();
         if (n!=0) {
@@ -2123,28 +2123,28 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
             NbcRotate(aRef1,n,nSin,nCos);
         }
     }
-    if (rAttr.GetItemState(SDRATTR_ROTATEONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ROTATEONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrRotateOneItem*)pPoolItem)->GetValue();
         double nSin=sin(n*nPi180);
         double nCos=cos(n*nPi180);
         NbcRotate(aRef1,n,nSin,nCos);
     }
-    if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrHorzShearOneItem*)pPoolItem)->GetValue();
         double nTan=tan(n*nPi180);
-        NbcShear(aRef1,n,nTan,FALSE);
+        NbcShear(aRef1,n,nTan,sal_False);
     }
-    if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrVertShearOneItem*)pPoolItem)->GetValue();
         double nTan=tan(n*nPi180);
-        NbcShear(aRef1,n,nTan,TRUE);
+        NbcShear(aRef1,n,nTan,sal_True);
     }
 
-    if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         bool b=((const SdrObjMoveProtectItem*)pPoolItem)->GetValue();
         SetMoveProtect(b);
     }
-    if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         bool b=((const SdrObjSizeProtectItem*)pPoolItem)->GetValue();
         SetResizeProtect(b);
     }
@@ -2153,25 +2153,25 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
     if( IsMoveProtect() )
         SetResizeProtect( true );
 
-    if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         bool b=((const SdrObjPrintableItem*)pPoolItem)->GetValue();
         SetPrintable(b);
     }
 
-    if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         bool b=((const SdrObjVisibleItem*)pPoolItem)->GetValue();
         SetVisible(b);
     }
 
     SdrLayerID nLayer=SDRLAYER_NOTFOUND;
-    if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) {
+    if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) {
         XubString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue();
         const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL;
         if (pLayAd!=NULL) {
-            const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, TRUE);
+            const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, sal_True);
             if (pLayer!=NULL) {
                 nLayer=pLayer->GetID();
             }
@@ -2182,16 +2182,16 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
         NbcSetLayer(nLayer);
     }
 
-    if (rAttr.GetItemState(SDRATTR_OBJECTNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJECTNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         XubString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue();
         SetName(aName);
     }
     Rectangle aNewLogic(rLogic);
-    if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrLogicSizeWidthItem*)pPoolItem)->GetValue();
         aNewLogic.Right()=aNewLogic.Left()+n;
     }
-    if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrLogicSizeHeightItem*)pPoolItem)->GetValue();
         aNewLogic.Bottom()=aNewLogic.Top()+n;
     }
@@ -2200,10 +2200,10 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
     }
     Fraction aResizeX(1,1);
     Fraction aResizeY(1,1);
-    if (rAttr.GetItemState(SDRATTR_RESIZEXONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_RESIZEXONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aResizeX*=((const SdrResizeXOneItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_RESIZEYONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_RESIZEYONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aResizeY*=((const SdrResizeYOneItem*)pPoolItem)->GetValue();
     }
     if (aResizeX!=Fraction(1,1) || aResizeY!=Fraction(1,1)) {
@@ -2213,7 +2213,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
 
 void lcl_SetItem(SfxItemSet& rAttr, FASTBOOL bMerge, const SfxPoolItem& rItem)
 {
-    if (bMerge) rAttr.MergeValue(rItem,TRUE);
+    if (bMerge) rAttr.MergeValue(rItem,sal_True);
     else rAttr.Put(rItem);
 }
 
@@ -2293,10 +2293,10 @@ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRe
 
 FASTBOOL SdrObject::IsNode() const
 {
-    return TRUE;
+    return sal_True;
 }
 
-SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObject::GetVertexGluePoint(sal_uInt16 nPosNum) const
 {
     // #i41936# Use SnapRect for default GluePoints
     const Rectangle aR(GetSnapRect());
@@ -2312,12 +2312,12 @@ SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const
 
     aPt -= aR.Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
 
     return aGP;
 }
 
-SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObject::GetCornerGluePoint(sal_uInt16 nPosNum) const
 {
     Rectangle aR(GetCurrentBoundRect());
     Point aPt;
@@ -2329,7 +2329,7 @@ SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const
     }
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
@@ -2400,7 +2400,7 @@ void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, FAS
 
 FASTBOOL SdrObject::IsEdge() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrObject::ConnectToNode(FASTBOOL /*bTail1*/, SdrObject* /*pObj*/)
@@ -2418,7 +2418,7 @@ SdrObject* SdrObject::GetConnectedNode(FASTBOOL /*bTail1*/) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const
+SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const
 {
     bool bNoChange(true);
 
@@ -2479,7 +2479,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
                 aSet.Put(XLineWidthItem(0L));
                 aSet.Put(XLineStyleItem(XLINE_NONE));
                 Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue();
-                UINT16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
+                sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
                 aSet.Put(XFillColorItem(XubString(), aColorLine));
                 aSet.Put(XFillStyleItem(XFILL_SOLID));
                 aSet.Put(XFillTransparenceItem(nTransLine));
@@ -2592,7 +2592,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
 }
 
 // convert this path object to contour object, even when it is a group
-SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const
+SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const
 {
     if(pRet->ISA(SdrObjGroup))
     {
@@ -2600,7 +2600,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash)
         SdrObject* pGroup = new SdrObjGroup;
         pGroup->SetModel(pRet->GetModel());
 
-        for(UINT32 a=0;a<pObjList2->GetObjCount();a++)
+        for(sal_uInt32 a=0;a<pObjList2->GetObjCount();a++)
         {
             SdrObject* pIterObj = pObjList2->GetObj(a);
             pGroup->GetSubList()->NbcInsertObject(ConvertToContourObj(pIterObj, bForceLineDash));
@@ -2634,7 +2634,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const
+SdrObject* SdrObject::ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const
 {
     SdrObject* pRet = DoConvertToPolyObj(bBezier);
 
@@ -2656,7 +2656,7 @@ SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrObject::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -2731,19 +2731,19 @@ void SdrObject::SetVisible(sal_Bool bVisible)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-USHORT SdrObject::GetUserDataCount() const
+sal_uInt16 SdrObject::GetUserDataCount() const
 {
     if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return 0;
     return pPlusData->pUserDataList->GetUserDataCount();
 }
 
-SdrObjUserData* SdrObject::GetUserData(USHORT nNum) const
+SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const
 {
     if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return NULL;
     return pPlusData->pUserDataList->GetUserData(nNum);
 }
 
-void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos)
+void SdrObject::InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos)
 {
     if (pData!=NULL) {
         ImpForcePlusData();
@@ -2754,9 +2754,9 @@ void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos)
     }
 }
 
-void SdrObject::DeleteUserData(USHORT nNum)
+void SdrObject::DeleteUserData(sal_uInt16 nNum)
 {
-    USHORT nAnz=GetUserDataCount();
+    sal_uInt16 nAnz=GetUserDataCount();
     if (nNum<nAnz) {
         pPlusData->pUserDataList->DeleteUserData(nNum);
         if (nAnz==1)  {
@@ -2856,7 +2856,7 @@ void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, S
     }
 }
 
-sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
+sal_Bool SdrObject::IsTransparent( sal_Bool /*bCheckForAlphaChannel*/) const
 {
     bool bRet = false;
 
@@ -2873,7 +2873,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
                 ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
                   ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) )
             {
-                bRet = TRUE;
+                bRet = sal_True;
             }
             else if( pO->ISA( SdrGrafObj ) )
             {
@@ -2881,7 +2881,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
                 if( ( (const SdrGrafTransparenceItem&) rAttr.Get( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ||
                     ( pGrafObj->GetGraphicType() == GRAPHIC_BITMAP && pGrafObj->GetGraphic().GetBitmapEx().IsAlpha() ) )
                 {
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
         }
@@ -2895,7 +2895,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
             ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
               ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) )
         {
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else if( ISA( SdrGrafObj ) )
         {
@@ -3157,7 +3157,7 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
+SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
 {
     nInventor=nInvent;
     nIdentifier=nIdent;
@@ -3168,7 +3168,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, S
     pNewData=NULL;
 }
 
-SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
+SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1)
 {
     nInventor=nInvent;
     nIdentifier=nIdent;
@@ -3179,7 +3179,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
     pNewData=NULL;
 }
 
-SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel)
+SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel)
 {
     if(pModel == NULL && pPage != NULL)
         pModel = pPage->GetModel();
@@ -3189,37 +3189,37 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage*
     {
         switch (nIdent)
         {
-            case USHORT(OBJ_NONE       ): pObj=new SdrObject;                   break;
-            case USHORT(OBJ_GRUP       ): pObj=new SdrObjGroup;                 break;
-            case USHORT(OBJ_LINE       ): pObj=new SdrPathObj(OBJ_LINE       ); break;
-            case USHORT(OBJ_POLY       ): pObj=new SdrPathObj(OBJ_POLY       ); break;
-            case USHORT(OBJ_PLIN       ): pObj=new SdrPathObj(OBJ_PLIN       ); break;
-            case USHORT(OBJ_PATHLINE   ): pObj=new SdrPathObj(OBJ_PATHLINE   ); break;
-            case USHORT(OBJ_PATHFILL   ): pObj=new SdrPathObj(OBJ_PATHFILL   ); break;
-            case USHORT(OBJ_FREELINE   ): pObj=new SdrPathObj(OBJ_FREELINE   ); break;
-            case USHORT(OBJ_FREEFILL   ): pObj=new SdrPathObj(OBJ_FREEFILL   ); break;
-            case USHORT(OBJ_PATHPOLY   ): pObj=new SdrPathObj(OBJ_POLY       ); break;
-            case USHORT(OBJ_PATHPLIN   ): pObj=new SdrPathObj(OBJ_PLIN       ); break;
-            case USHORT(OBJ_EDGE       ): pObj=new SdrEdgeObj;                  break;
-            case USHORT(OBJ_RECT       ): pObj=new SdrRectObj;                  break;
-            case USHORT(OBJ_CIRC       ): pObj=new SdrCircObj(OBJ_CIRC       ); break;
-            case USHORT(OBJ_SECT       ): pObj=new SdrCircObj(OBJ_SECT       ); break;
-            case USHORT(OBJ_CARC       ): pObj=new SdrCircObj(OBJ_CARC       ); break;
-            case USHORT(OBJ_CCUT       ): pObj=new SdrCircObj(OBJ_CCUT       ); break;
-            case USHORT(OBJ_TEXT       ): pObj=new SdrRectObj(OBJ_TEXT       ); break;
-            case USHORT(OBJ_TEXTEXT    ): pObj=new SdrRectObj(OBJ_TEXTEXT    ); break;
-            case USHORT(OBJ_TITLETEXT  ): pObj=new SdrRectObj(OBJ_TITLETEXT  ); break;
-            case USHORT(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break;
-            case USHORT(OBJ_MEASURE    ): pObj=new SdrMeasureObj;               break;
-            case USHORT(OBJ_GRAF       ): pObj=new SdrGrafObj;                  break;
-            case USHORT(OBJ_OLE2       ): pObj=new SdrOle2Obj;                  break;
-            case USHORT(OBJ_FRAME      ): pObj=new SdrOle2Obj(TRUE);            break;
-            case USHORT(OBJ_CAPTION    ): pObj=new SdrCaptionObj;               break;
-            case USHORT(OBJ_PAGE       ): pObj=new SdrPageObj;                  break;
-            case USHORT(OBJ_UNO        ): pObj=new SdrUnoObj(String());         break;
-            case USHORT(OBJ_CUSTOMSHAPE  ): pObj=new SdrObjCustomShape();       break;
-            case USHORT(OBJ_MEDIA      ): pObj=new SdrMediaObj();               break;
-            case USHORT(OBJ_TABLE      ): pObj=new ::sdr::table::SdrTableObj(pModel);   break;
+            case sal_uInt16(OBJ_NONE       ): pObj=new SdrObject;                   break;
+            case sal_uInt16(OBJ_GRUP       ): pObj=new SdrObjGroup;                 break;
+            case sal_uInt16(OBJ_LINE       ): pObj=new SdrPathObj(OBJ_LINE       ); break;
+            case sal_uInt16(OBJ_POLY       ): pObj=new SdrPathObj(OBJ_POLY       ); break;
+            case sal_uInt16(OBJ_PLIN       ): pObj=new SdrPathObj(OBJ_PLIN       ); break;
+            case sal_uInt16(OBJ_PATHLINE   ): pObj=new SdrPathObj(OBJ_PATHLINE   ); break;
+            case sal_uInt16(OBJ_PATHFILL   ): pObj=new SdrPathObj(OBJ_PATHFILL   ); break;
+            case sal_uInt16(OBJ_FREELINE   ): pObj=new SdrPathObj(OBJ_FREELINE   ); break;
+            case sal_uInt16(OBJ_FREEFILL   ): pObj=new SdrPathObj(OBJ_FREEFILL   ); break;
+            case sal_uInt16(OBJ_PATHPOLY   ): pObj=new SdrPathObj(OBJ_POLY       ); break;
+            case sal_uInt16(OBJ_PATHPLIN   ): pObj=new SdrPathObj(OBJ_PLIN       ); break;
+            case sal_uInt16(OBJ_EDGE       ): pObj=new SdrEdgeObj;                  break;
+            case sal_uInt16(OBJ_RECT       ): pObj=new SdrRectObj;                  break;
+            case sal_uInt16(OBJ_CIRC       ): pObj=new SdrCircObj(OBJ_CIRC       ); break;
+            case sal_uInt16(OBJ_SECT       ): pObj=new SdrCircObj(OBJ_SECT       ); break;
+            case sal_uInt16(OBJ_CARC       ): pObj=new SdrCircObj(OBJ_CARC       ); break;
+            case sal_uInt16(OBJ_CCUT       ): pObj=new SdrCircObj(OBJ_CCUT       ); break;
+            case sal_uInt16(OBJ_TEXT       ): pObj=new SdrRectObj(OBJ_TEXT       ); break;
+            case sal_uInt16(OBJ_TEXTEXT    ): pObj=new SdrRectObj(OBJ_TEXTEXT    ); break;
+            case sal_uInt16(OBJ_TITLETEXT  ): pObj=new SdrRectObj(OBJ_TITLETEXT  ); break;
+            case sal_uInt16(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break;
+            case sal_uInt16(OBJ_MEASURE    ): pObj=new SdrMeasureObj;               break;
+            case sal_uInt16(OBJ_GRAF       ): pObj=new SdrGrafObj;                  break;
+            case sal_uInt16(OBJ_OLE2       ): pObj=new SdrOle2Obj;                  break;
+            case sal_uInt16(OBJ_FRAME      ): pObj=new SdrOle2Obj(sal_True);            break;
+            case sal_uInt16(OBJ_CAPTION    ): pObj=new SdrCaptionObj;               break;
+            case sal_uInt16(OBJ_PAGE       ): pObj=new SdrPageObj;                  break;
+            case sal_uInt16(OBJ_UNO        ): pObj=new SdrUnoObj(String());         break;
+            case sal_uInt16(OBJ_CUSTOMSHAPE  ): pObj=new SdrObjCustomShape();       break;
+            case sal_uInt16(OBJ_MEDIA      ): pObj=new SdrMediaObj();               break;
+            case sal_uInt16(OBJ_TABLE      ): pObj=new ::sdr::table::SdrTableObj(pModel);   break;
         }
     }
 
@@ -3253,13 +3253,13 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage*
     return pObj;
 }
 
-SdrObjUserData* SdrObjFactory::MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
+SdrObjUserData* SdrObjFactory::MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1)
 {
     SdrObjUserData* pData=NULL;
     if (nInvent==SdrInventor) {
         switch (nIdent)
         {
-            case USHORT(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break;
+            case sal_uInt16(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break;
         }
     }
     if (pData==NULL) {
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index fd9ee15b8f2c..53f255c361a1 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -85,15 +85,15 @@ public:
     ImpCaptParams()
     {
         eType      =SDRCAPT_TYPE3;
-        bFixedAngle=FALSE;
+        bFixedAngle=sal_False;
         nAngle     =4500;
         nGap       =0;
         eEscDir    =SDRCAPT_ESCHORIZONTAL;
-        bEscRel    =TRUE;
+        bEscRel    =sal_True;
         nEscRel    =5000;
         nEscAbs    =0;
         nLineLen   =0;
-        bFitLineLen=TRUE;
+        bFitLineLen=sal_True;
     }
     void CalcEscPos(const Point& rTail, const Rectangle& rRect, Point& rPt, EscDir& rDir) const;
 };
@@ -201,24 +201,24 @@ TYPEINIT1(SdrCaptionObj,SdrRectObj);
 SdrCaptionObj::SdrCaptionObj():
     SdrRectObj(OBJ_TEXT),
     aTailPoly(3),  // Default Groesse: 3 Punkte = 2 Linien
-    mbSpecialTextBoxShadow(FALSE),
-    mbFixedTail(FALSE)
+    mbSpecialTextBoxShadow(sal_False),
+    mbFixedTail(sal_False)
 {
 }
 
 SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect):
     SdrRectObj(OBJ_TEXT,rRect),
     aTailPoly(3),  // Default Groesse: 3 Punkte = 2 Linien
-    mbSpecialTextBoxShadow(FALSE),
-    mbFixedTail(FALSE)
+    mbSpecialTextBoxShadow(sal_False),
+    mbFixedTail(sal_False)
 {
 }
 
 SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect, const Point& rTail):
     SdrRectObj(OBJ_TEXT,rRect),
     aTailPoly(3),  // Default Groesse: 3 Punkte = 2 Linien
-    mbSpecialTextBoxShadow(FALSE),
-    mbFixedTail(FALSE)
+    mbSpecialTextBoxShadow(sal_False),
+    mbFixedTail(sal_False)
 {
     aTailPoly[0]=maFixedTailPos=rTail;
 }
@@ -229,25 +229,25 @@ SdrCaptionObj::~SdrCaptionObj()
 
 void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bCanConvToPath    =TRUE;
-    rInfo.bCanConvToPoly    =TRUE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bCanConvToPath    =sal_True;
+    rInfo.bCanConvToPoly    =sal_True;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrCaptionObj::GetObjIdentifier() const
+sal_uInt16 SdrCaptionObj::GetObjIdentifier() const
 {
-    return UINT16(OBJ_CAPTION);
+    return sal_uInt16(OBJ_CAPTION);
 }
 
 void SdrCaptionObj::operator=(const SdrObject& rObj)
@@ -559,7 +559,7 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect
 
 FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat)
 {
-    if (aRect.IsEmpty()) return FALSE; // Create z.Zt. nur mit vorgegebenen Rect
+    if (aRect.IsEmpty()) return sal_False; // Create z.Zt. nur mit vorgegebenen Rect
 
     ImpCaptParams aPara;
     ImpGetCaptParams(aPara);
@@ -567,7 +567,7 @@ FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat)
     aTailPoly[0]=rStat.GetStart();
     ImpCalcTail(aPara,aTailPoly,aRect);
     rStat.SetActionRect(aRect);
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat)
@@ -578,8 +578,8 @@ FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat)
     ImpCalcTail(aPara,aTailPoly,aRect);
     rStat.SetActionRect(aRect);
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    return TRUE;
+    bSnapRectDirty=sal_True;
+    return sal_True;
 }
 
 FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -594,7 +594,7 @@ FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 
 FASTBOOL SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrCaptionObj::BrkCreate(SdrDragStat& /*rStat*/)
@@ -755,18 +755,18 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo)
     aTailPoly=rCGeo.aTailPoly;
 }
 
-SdrObject* SdrCaptionObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const
 { // #42334# - Convert implementiert
     SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier);
     SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
     SdrObject* pRet=(pTail!=NULL) ? pTail : pRect;
     if (pTail!=NULL && pRect!=NULL) {
-        FASTBOOL bInsRect=TRUE;
-        FASTBOOL bInsTail=TRUE;
+        FASTBOOL bInsRect=sal_True;
+        FASTBOOL bInsTail=sal_True;
         SdrObjList* pOL=pTail->GetSubList();
-        if (pOL!=NULL) { pRet=pRect; bInsTail=FALSE; }
+        if (pOL!=NULL) { pRet=pRect; bInsTail=sal_False; }
         if (pOL==NULL) pOL=pRect->GetSubList();
-        if (pOL!=NULL) { pRet=pRect; bInsRect=FALSE; }
+        if (pOL!=NULL) { pRet=pRect; bInsRect=sal_False; }
         if (pOL==NULL) {
             SdrObjGroup* pGrp=new SdrObjGroup;
             pOL=pGrp->GetSubList();
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index d28039cf1989..1d00e13571d9 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -153,15 +153,15 @@ SdrCircObj::~SdrCircObj()
 void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
     FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve();
-    rInfo.bEdgeRadiusAllowed    = FALSE;
+    rInfo.bEdgeRadiusAllowed    = sal_False;
     rInfo.bCanConvToPath=bCanConv;
     rInfo.bCanConvToPoly=bCanConv;
     rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrCircObj::GetObjIdentifier() const
+sal_uInt16 SdrCircObj::GetObjIdentifier() const
 {
-    return UINT16(meCircleKind);
+    return sal_uInt16(meCircleKind);
 }
 
 FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const
@@ -172,7 +172,7 @@ FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const
     // und Kreis-/Ellipsenboegen (wg. Genauigkeit)
     FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT;
     // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!)
-    if (meCircleKind!=OBJ_CIRC) bNeed=TRUE;
+    if (meCircleKind!=OBJ_CIRC) bNeed=sal_True;
 
     const SfxItemSet& rSet = GetObjectItemSet();
     if(!bNeed)
@@ -209,7 +209,7 @@ FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const
     }
 
     if(!bNeed && meCircleKind != OBJ_CIRC && nStartWink == nEndWink)
-        bNeed=TRUE; // Weil sonst Vollkreis gemalt wird
+        bNeed=sal_True; // Weil sonst Vollkreis gemalt wird
 
     return bNeed;
 }
@@ -295,7 +295,7 @@ void SdrCircObj::RecalcXPoly()
 
 void SdrCircObj::TakeObjNameSingul(XubString& rName) const
 {
-    USHORT nID=STR_ObjNameSingulCIRC;
+    sal_uInt16 nID=STR_ObjNameSingulCIRC;
     if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) {
         switch (meCircleKind) {
             case OBJ_CIRC: nID=STR_ObjNameSingulCIRC; break;
@@ -327,7 +327,7 @@ void SdrCircObj::TakeObjNameSingul(XubString& rName) const
 
 void SdrCircObj::TakeObjNamePlural(XubString& rName) const
 {
-    USHORT nID=STR_ObjNamePluralCIRC;
+    sal_uInt16 nID=STR_ObjNamePluralCIRC;
     if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) {
         switch (meCircleKind) {
             case OBJ_CIRC: nID=STR_ObjNamePluralCIRC; break;
@@ -384,7 +384,7 @@ public:
         nWdt(0),
         nStart(0),
         nEnd(0),
-        bRight(FALSE)
+        bRight(sal_False)
     {}
     void SetCreateParams(SdrDragStat& rStat);
 };
@@ -595,7 +595,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
                 nWink = pU->nEnd;
             }
 
-            aStr += GetWinkStr(nWink,FALSE);
+            aStr += GetWinkStr(nWink,sal_False);
             aStr += sal_Unicode(')');
         }
 
@@ -612,7 +612,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
 
             ImpTakeDescriptionStr(STR_DragCircAngle, aStr);
             aStr.AppendAscii(" (");
-            aStr += GetWinkStr(nWink,FALSE);
+            aStr += GetWinkStr(nWink,sal_False);
             aStr += sal_Unicode(')');
 
             return aStr;
@@ -698,7 +698,7 @@ FASTBOOL SdrCircObj::BegCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     aRect = aRect1;
     ImpSetCreateParams(rStat);
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat)
@@ -711,7 +711,7 @@ FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat)
     nStartWink=pU->nStart;
     nEndWink=pU->nEnd;
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
+    bSnapRectDirty=sal_True;
     SetXPolyDirty();
 
     // #i103058# push current angle settings to ItemSet to
@@ -721,14 +721,14 @@ FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat)
         ImpSetCircInfoToAttr();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     ImpSetCreateParams(rStat);
     ImpCircUser* pU=(ImpCircUser*)rStat.GetUser();
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     if (eCmd==SDRCREATE_FORCEEND && rStat.GetPointAnz()<4) meCircleKind=OBJ_CIRC;
     if (meCircleKind==OBJ_CIRC) {
         bRet=rStat.GetPointAnz()>=2;
@@ -1098,8 +1098,8 @@ void SdrCircObj::ImpSetAttrToCircInfo()
     sal_Int32 nNewStart = ((SdrCircStartAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue();
     sal_Int32 nNewEnd = ((SdrCircEndAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue();
 
-    BOOL bKindChg = meCircleKind != eNewKind;
-    BOOL bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
+    sal_Bool bKindChg = meCircleKind != eNewKind;
+    sal_Bool bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
 
     if(bKindChg || bWinkChg)
     {
@@ -1155,7 +1155,7 @@ void SdrCircObj::ImpSetCircInfoToAttr()
     }
 }
 
-SdrObject* SdrCircObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     const sal_Bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True);
     const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink));
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index c7bbc5fab761..6eec6e855bf9 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -68,31 +68,31 @@ void SdrObjConnection::ResetVars()
     nConId=0;
     nXDist=0;
     nYDist=0;
-    bBestConn=TRUE;
-    bBestVertex=TRUE;
-    bXDistOvr=FALSE;
-    bYDistOvr=FALSE;
-    bAutoVertex=FALSE;
-    bAutoCorner=FALSE;
+    bBestConn=sal_True;
+    bBestVertex=sal_True;
+    bXDistOvr=sal_False;
+    bYDistOvr=sal_False;
+    bAutoVertex=sal_False;
+    bAutoCorner=sal_False;
 }
 
 FASTBOOL SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsPos) const
 {
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     if (pObj!=NULL) { // Ein Obj muss schon angedockt sein!
         if (bAutoVertex) {
             rGP=pObj->GetVertexGluePoint(nConId);
-            bRet=TRUE;
+            bRet=sal_True;
         } else if (bAutoCorner) {
             rGP=pObj->GetCornerGluePoint(nConId);
-            bRet=TRUE;
+            bRet=sal_True;
         } else {
             const SdrGluePointList* pGPL=pObj->GetGluePointList();
             if (pGPL!=NULL) {
-                USHORT nNum=pGPL->FindGluePoint(nConId);
+                sal_uInt16 nNum=pGPL->FindGluePoint(nConId);
                 if (nNum!=SDRGLUEPOINT_NOTFOUND) {
                     rGP=(*pGPL)[nNum];
-                    bRet=TRUE;
+                    bRet=sal_True;
                 }
             }
         }
@@ -117,7 +117,7 @@ Point& SdrEdgeInfoRec::ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode)
     return aMiddleLine;
 }
 
-USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
+sal_uInt16 SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
 {
     switch (eLineCode) {
         case OBJ1LINE2 : return 1;
@@ -131,7 +131,7 @@ USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon&
 
 FASTBOOL SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
 {
-    USHORT nIdx=ImpGetPolyIdx(eLineCode,rXP);
+    sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP);
     FASTBOOL bHorz=nAngle1==0 || nAngle1==18000;
     if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) {
         nIdx=rXP.GetPointCount()-nIdx; // #36314#
@@ -185,16 +185,16 @@ SdrEdgeObj::SdrEdgeObj()
     // #110649#
     mbBoundRectCalculationRunning(sal_False)
 {
-    bClosedObj=FALSE;
-    bIsEdge=TRUE;
+    bClosedObj=sal_False;
+    bIsEdge=sal_True;
     pEdgeTrack=new XPolygon;
 
 }
 
 SdrEdgeObj::~SdrEdgeObj()
 {
-    DisconnectFromNode(TRUE);
-    DisconnectFromNode(FALSE);
+    DisconnectFromNode(sal_True);
+    DisconnectFromNode(sal_False);
     delete pEdgeTrack;
 }
 
@@ -243,8 +243,8 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo()
     }
     else if(eKind == SDREDGE_THREELINES)
     {
-        BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
-        BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
+        sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
+        sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
 
         if(bHor1)
         {
@@ -314,8 +314,8 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
     }
     else if(eKind == SDREDGE_THREELINES)
     {
-        BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
-        BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
+        sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
+        sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
 
         n = 2;
         nVals[0] = bHor1 ? aEdgeInfo.aObj1Line2.X() : aEdgeInfo.aObj1Line2.Y();
@@ -364,24 +364,24 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
 
 void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
     FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve();
     rInfo.bCanConvToPath=bCanConv;
     rInfo.bCanConvToPoly=bCanConv;
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrEdgeObj::GetObjIdentifier() const
+sal_uInt16 SdrEdgeObj::GetObjIdentifier() const
 {
-    return UINT16(OBJ_EDGE);
+    return sal_uInt16(OBJ_EDGE);
 }
 
 const Rectangle& SdrEdgeObj::GetCurrentBoundRect() const
@@ -416,18 +416,18 @@ void SdrEdgeObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
 
 FASTBOOL SdrEdgeObj::IsNode() const
 {
-    return TRUE;
+    return sal_True;
 }
 
-SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const
+SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const
 {
     Point aPt;
-    USHORT nPntAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nPntAnz=pEdgeTrack->GetPointCount();
     if (nPntAnz>0)
     {
         Point aOfs = GetSnapRect().Center();
-        if (nNum==2 && GetConnectedNode(TRUE)==NULL) aPt=(*pEdgeTrack)[0];
-        else if (nNum==3 && GetConnectedNode(FALSE)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1];
+        if (nNum==2 && GetConnectedNode(sal_True)==NULL) aPt=(*pEdgeTrack)[0];
+        else if (nNum==3 && GetConnectedNode(sal_False)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1];
         else {
             if ((nPntAnz & 1) ==1) {
                 aPt=(*pEdgeTrack)[nPntAnz/2];
@@ -443,11 +443,11 @@ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const
         aPt-=aOfs;
     }
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
-SdrGluePoint SdrEdgeObj::GetCornerGluePoint(USHORT nNum) const
+SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const
 {
     return GetVertexGluePoint(nNum);
 }
@@ -464,7 +464,7 @@ SdrGluePointList* SdrEdgeObj::ForceGluePointList()
 
 FASTBOOL SdrEdgeObj::IsEdge() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 void SdrEdgeObj::ConnectToNode(FASTBOOL bTail1, SdrObject* pObj)
@@ -496,15 +496,15 @@ SdrObject* SdrEdgeObj::GetConnectedNode(FASTBOOL bTail1) const
 
 FASTBOOL SdrEdgeObj::CheckNodeConnection(FASTBOOL bTail1) const
 {
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     const SdrObjConnection& rCon=GetConnection(bTail1);
-    USHORT nPtAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount();
     if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) {
         const SdrGluePointList* pGPL=rCon.pObj->GetGluePointList();
-        USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
-        USHORT nGesAnz=nConAnz+8;
-        Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[USHORT(nPtAnz-1)]);
-        for (USHORT i=0; i<nGesAnz && !bRet; i++) {
+        sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
+        sal_uInt16 nGesAnz=nConAnz+8;
+        Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]);
+        for (sal_uInt16 i=0; i<nGesAnz && !bRet; i++) {
             if (i<nConAnz) { // UserDefined
                 bRet=aTail==(*pGPL)[i].GetAbsolutePos(*rCon.pObj);
             } else if (i<nConAnz+4) { // Vertex
@@ -521,7 +521,7 @@ FASTBOOL SdrEdgeObj::CheckNodeConnection(FASTBOOL bTail1) const
 
 void SdrEdgeObj::ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt)
 {
-    USHORT nPtAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount();
     if (nPtAnz==0) {
         (*pEdgeTrack)[0]=rPt;
         (*pEdgeTrack)[1]=rPt;
@@ -529,7 +529,7 @@ void SdrEdgeObj::ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt)
         if (!bTail1) (*pEdgeTrack)[1]=rPt;
         else { (*pEdgeTrack)[1]=(*pEdgeTrack)[0]; (*pEdgeTrack)[0]=rPt; }
     } else {
-        if (!bTail1) (*pEdgeTrack)[USHORT(nPtAnz-1)]=rPt;
+        if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]=rPt;
         else (*pEdgeTrack)[0]=rPt;
     }
     ImpRecalcEdgeTrack();
@@ -597,7 +597,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
     }
 }
 
-USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
+sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
 {
     if (pObj==NULL) return SDRESC_ALL;
     Rectangle aR(pObj->GetSnapRect());
@@ -612,7 +612,7 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
     FASTBOOL bDiag=Abs(dx-dy)<2;
     if (bxMitt && byMitt) return SDRESC_ALL; // In der Mitte
     if (bDiag) {  // diagonal
-        USHORT nRet=0;
+        sal_uInt16 nRet=0;
         if (byMitt) nRet|=SDRESC_VERT;
         if (bxMitt) nRet|=SDRESC_HORZ;
         if (dxl<dxr) { // Links
@@ -638,7 +638,7 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
 FASTBOOL SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const
 {
     // fehlende Implementation !!!
-    return FALSE;
+    return sal_False;
 }
 
 XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) const
@@ -656,7 +656,7 @@ XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, cons
     if (bObn) aP1.Y()=rRect.Top();
     if (bUnt) aP1.Y()=rRect.Bottom();
 
-    FASTBOOL bFinish=FALSE;
+    FASTBOOL bFinish=sal_False;
     if (!bFinish) {
         Point aP2(aP1); // Und nun den Pflichtabstand ggf. bis auf Meetinghoehe erweitern
         if (bLks && rMeeting.X()<=aP2.X()) aP2.X()=rMeeting.X();
@@ -707,7 +707,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
 {
     Point aPt1,aPt2;
     SdrGluePoint aGP1,aGP2;
-    USHORT nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL;
+    sal_uInt16 nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL;
     Rectangle aBoundRect1;
     Rectangle aBoundRect2;
     Rectangle aBewareRect1;
@@ -715,7 +715,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
     // Erstmal die alten Endpunkte wiederholen
     if (rTrack0.GetPointCount()!=0) {
         aPt1=rTrack0[0];
-        USHORT nSiz=rTrack0.GetPointCount();
+        sal_uInt16 nSiz=rTrack0.GetPointCount();
         nSiz--;
         aPt2=rTrack0[nSiz];
     } else {
@@ -777,36 +777,36 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
         aBewareRect2=aBoundRect2;
     }
     XPolygon aBestXP;
-    ULONG nBestQual=0xFFFFFFFF;
+    sal_uIntPtr nBestQual=0xFFFFFFFF;
     SdrEdgeInfoRec aBestInfo;
     FASTBOOL bAuto1=bCon1 && rCon1.bBestVertex;
     FASTBOOL bAuto2=bCon2 && rCon2.bBestVertex;
-    if (bAuto1) rCon1.bAutoVertex=TRUE;
-    if (bAuto2) rCon2.bAutoVertex=TRUE;
-    USHORT nBestAuto1=0;
-    USHORT nBestAuto2=0;
-    USHORT nAnz1=bAuto1 ? 4 : 1;
-    USHORT nAnz2=bAuto2 ? 4 : 1;
-    for (USHORT nNum1=0; nNum1<nAnz1; nNum1++) {
+    if (bAuto1) rCon1.bAutoVertex=sal_True;
+    if (bAuto2) rCon2.bAutoVertex=sal_True;
+    sal_uInt16 nBestAuto1=0;
+    sal_uInt16 nBestAuto2=0;
+    sal_uInt16 nAnz1=bAuto1 ? 4 : 1;
+    sal_uInt16 nAnz2=bAuto2 ? 4 : 1;
+    for (sal_uInt16 nNum1=0; nNum1<nAnz1; nNum1++) {
         if (bAuto1) rCon1.nConId=nNum1;
-        if (bCon1 && rCon1.TakeGluePoint(aGP1,TRUE)) {
+        if (bCon1 && rCon1.TakeGluePoint(aGP1,sal_True)) {
             aPt1=aGP1.GetPos();
             nEsc1=aGP1.GetEscDir();
             if (nEsc1==SDRESC_SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs);
         }
-        for (USHORT nNum2=0; nNum2<nAnz2; nNum2++) {
+        for (sal_uInt16 nNum2=0; nNum2<nAnz2; nNum2++) {
             if (bAuto2) rCon2.nConId=nNum2;
-            if (bCon2 && rCon2.TakeGluePoint(aGP2,TRUE)) {
+            if (bCon2 && rCon2.TakeGluePoint(aGP2,sal_True)) {
                 aPt2=aGP2.GetPos();
                 nEsc2=aGP2.GetEscDir();
                 if (nEsc2==SDRESC_SMART) nEsc2=ImpCalcEscAngle(rCon2.pObj,aPt2-rCon2.aObjOfs);
             }
             for (long nA1=0; nA1<36000; nA1+=9000) {
-                USHORT nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0;
+                sal_uInt16 nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0;
                 for (long nA2=0; nA2<36000; nA2+=9000) {
-                    USHORT nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0;
+                    sal_uInt16 nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0;
                     if ((nEsc1&nE1)!=0 && (nEsc2&nE2)!=0) {
-                        ULONG nQual=0;
+                        sal_uIntPtr nQual=0;
                         SdrEdgeInfoRec aInfo;
                         if (pInfo!=NULL) aInfo=*pInfo;
                         XPolygon aXP(ImpCalcEdgeTrack(aPt1,nA1,aBoundRect1,aBewareRect1,aPt2,nA2,aBoundRect2,aBewareRect2,&nQual,&aInfo));
@@ -830,7 +830,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
 
 XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1,
     const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2,
-    ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const
+    sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const
 {
     SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
     FASTBOOL bRts1=nAngle1==0;
@@ -861,8 +861,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
     Rectangle aBewareRect1(rBewareRect1);
     Rectangle aBewareRect2(rBewareRect2);
     Point aMeeting((aPt1.X()+aPt2.X()+1)/2,(aPt1.Y()+aPt2.Y()+1)/2);
-    FASTBOOL bMeetingXMid=TRUE;
-    FASTBOOL bMeetingYMid=TRUE;
+    FASTBOOL bMeetingXMid=sal_True;
+    FASTBOOL bMeetingYMid=sal_True;
     if (eKind==SDREDGE_ONELINE) {
         XPolygon aXP(2);
         aXP[0]=rPt1;
@@ -907,8 +907,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
         return aXP;
     }
-    USHORT nIntersections=0;
-    FASTBOOL bForceMeeting=FALSE; // Muss die Linie durch den MeetingPoint laufen?
+    sal_uInt16 nIntersections=0;
+    FASTBOOL bForceMeeting=sal_False; // Muss die Linie durch den MeetingPoint laufen?
     {
         Point aC1(aBewareRect1.Center());
         Point aC2(aBewareRect2.Center());
@@ -946,7 +946,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right());
         long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top());
         long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom());
-        //FASTBOOL bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() &&
+        //int bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() &&
                                aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom();
         FASTBOOL bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
                                 aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom();
@@ -963,23 +963,23 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             FASTBOOL bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom();
             if (bLks1 && (bY1Ok || aBewareRect1.Left()<aBewareRect2.Right()) && (bY2Ok || aBewareRect2.Left()<aBewareRect1.Right())) {
                 aMeeting.X()=nXMin;
-                bMeetingXMid=FALSE;
+                bMeetingXMid=sal_False;
             }
             if (bRts1 && (bY1Ok || aBewareRect1.Right()>aBewareRect2.Left()) && (bY2Ok || aBewareRect2.Right()>aBewareRect1.Left())) {
                 aMeeting.X()=nXMax;
-                bMeetingXMid=FALSE;
+                bMeetingXMid=sal_False;
             }
             if (bObn1 && (bX1Ok || aBewareRect1.Top()<aBewareRect2.Bottom()) && (bX2Ok || aBewareRect2.Top()<aBewareRect1.Bottom())) {
                 aMeeting.Y()=nYMin;
-                bMeetingYMid=FALSE;
+                bMeetingYMid=sal_False;
             }
             if (bUnt1 && (bX1Ok || aBewareRect1.Bottom()>aBewareRect2.Top()) && (bX2Ok || aBewareRect2.Bottom()>aBewareRect1.Top())) {
                 aMeeting.Y()=nYMax;
-                bMeetingYMid=FALSE;
+                bMeetingYMid=sal_False;
             }
         } else if (nMainCase==2) {
             // Fall 2:
-            bForceMeeting=TRUE;
+            bForceMeeting=sal_True;
             if (bHor1) { // beide waagerecht
                 /* 9 Moeglichkeiten:                   ù ù ù                    */
                 /*   2.1 Gegenueber, Ueberschneidung   Ã ´ ù                    */
@@ -1014,17 +1014,17 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                     // Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9
                     if (aBewR1.Right()>aBewR2.Left()) {
                         // Faelle 2.8, 2.9
-                        // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE).
+                        // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False).
                         // Fall 2.9 kann auch Direktverbindung sein (bei geringer
                         // Ueberschneidung der BewareRects ohne Ueberschneidung der
                         // Boundrects wenn die Linienaustritte sonst das BewareRect
                         // des jeweils anderen Objekts verletzen wuerden.
-                        FASTBOOL bCase29Direct=FALSE;
+                        FASTBOOL bCase29Direct=sal_False;
                         FASTBOOL bCase29=aBewR1.Right()>aBewR2.Left();
                         if (aBndR1.Right()<=aBndR2.Left()) { // Fall 2.9 und keine Boundrectueberschneidung
                             if ((aPt1.Y()>aBewareRect2.Top() && aPt1.Y()<aBewareRect2.Bottom()) ||
                                 (aPt2.Y()>aBewareRect1.Top() && aPt2.Y()<aBewareRect1.Bottom())) {
-                               bCase29Direct=TRUE;
+                               bCase29Direct=sal_True;
                             }
                         }
                         if (!bCase29Direct) {
@@ -1034,7 +1034,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                             } else {
                                 aMeeting.Y()=nYMax;
                             }
-                            bMeetingYMid=FALSE;
+                            bMeetingYMid=sal_False;
                             if (bCase29) {
                                 // und nun noch dafuer sorgen, dass das
                                 // umzingelte Obj nicht durchquert wird
@@ -1043,7 +1043,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                                 } else {
                                     aMeeting.X()=aBewR1.Left();
                                 }
-                                bMeetingXMid=FALSE;
+                                bMeetingXMid=sal_False;
                             }
                         } else {
                             // Direkte Verbindung (3-Linien Z-Verbindung), da
@@ -1074,17 +1074,17 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                     // Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9
                     if (aBewR1.Bottom()>aBewR2.Top()) {
                         // Faelle 2.8, 2.9
-                        // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE).
+                        // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False).
                         // Fall 2.9 kann auch Direktverbindung sein (bei geringer
                         // Ueberschneidung der BewareRects ohne Ueberschneidung der
                         // Boundrects wenn die Linienaustritte sonst das BewareRect
                         // des jeweils anderen Objekts verletzen wuerden.
-                        FASTBOOL bCase29Direct=FALSE;
+                        FASTBOOL bCase29Direct=sal_False;
                         FASTBOOL bCase29=aBewR1.Bottom()>aBewR2.Top();
                         if (aBndR1.Bottom()<=aBndR2.Top()) { // Fall 2.9 und keine Boundrectueberschneidung
                             if ((aPt1.X()>aBewareRect2.Left() && aPt1.X()<aBewareRect2.Right()) ||
                                 (aPt2.X()>aBewareRect1.Left() && aPt2.X()<aBewareRect1.Right())) {
-                               bCase29Direct=TRUE;
+                               bCase29Direct=sal_True;
                             }
                         }
                         if (!bCase29Direct) {
@@ -1094,7 +1094,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                             } else {
                                 aMeeting.X()=nXMax;
                             }
-                            bMeetingXMid=FALSE;
+                            bMeetingXMid=sal_False;
                             if (bCase29) {
                                 // und nun noch dafuer sorgen, dass das
                                 // umzingelte Obj nicht durchquert wird
@@ -1103,7 +1103,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                                 } else {
                                     aMeeting.Y()=aBewR1.Top();
                                 }
-                                bMeetingYMid=FALSE;
+                                bMeetingYMid=sal_False;
                             }
                         } else {
                             // Direkte Verbindung (3-Linien Z-Verbindung), da
@@ -1174,9 +1174,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                 (((bRts2 && aTmpR2.Right ()<=aPt1.X()) || (bLks2 && aTmpR2.Left()>=aPt1.X())) &&
                  ((bUnt1 && aTmpR1.Bottom()<=aPt2.Y()) || (bObn1 && aTmpR1.Top ()>=aPt2.Y())))) {
                 // Fall 3.2 trifft zu: Verbindung mit lediglich 2 Linien
-                bForceMeeting=TRUE;
-                bMeetingXMid=FALSE;
-                bMeetingYMid=FALSE;
+                bForceMeeting=sal_True;
+                bMeetingXMid=sal_False;
+                bMeetingYMid=sal_False;
                 if (bHor1) {
                     aMeeting.X()=aPt2.X();
                     aMeeting.Y()=aPt1.Y();
@@ -1196,19 +1196,19 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                         ((bUnt1 && aBewareRect1.Bottom()>aBewareRect2.Top   ()) ||
                          (bObn1 && aBewareRect1.Top   ()<aBewareRect2.Bottom())))) {
                 // Fall 3.3
-                bForceMeeting=TRUE;
-                if (bRts1 || bRts2) { aMeeting.X()=nXMax; bMeetingXMid=FALSE; }
-                if (bLks1 || bLks2) { aMeeting.X()=nXMin; bMeetingXMid=FALSE; }
-                if (bUnt1 || bUnt2) { aMeeting.Y()=nYMax; bMeetingYMid=FALSE; }
-                if (bObn1 || bObn2) { aMeeting.Y()=nYMin; bMeetingYMid=FALSE; }
+                bForceMeeting=sal_True;
+                if (bRts1 || bRts2) { aMeeting.X()=nXMax; bMeetingXMid=sal_False; }
+                if (bLks1 || bLks2) { aMeeting.X()=nXMin; bMeetingXMid=sal_False; }
+                if (bUnt1 || bUnt2) { aMeeting.Y()=nYMax; bMeetingYMid=sal_False; }
+                if (bObn1 || bObn2) { aMeeting.Y()=nYMin; bMeetingYMid=sal_False; }
             }
         }
     }
 
     XPolygon aXP1(ImpCalcObjToCenter(aPt1,nAngle1,aBewareRect1,aMeeting));
     XPolygon aXP2(ImpCalcObjToCenter(aPt2,nAngle2,aBewareRect2,aMeeting));
-    USHORT nXP1Anz=aXP1.GetPointCount();
-    USHORT nXP2Anz=aXP2.GetPointCount();
+    sal_uInt16 nXP1Anz=aXP1.GetPointCount();
+    sal_uInt16 nXP2Anz=aXP2.GetPointCount();
     if (bInfo) {
         pInfo->nObj1Lines=nXP1Anz; if (nXP1Anz>1) pInfo->nObj1Lines--;
         pInfo->nObj2Lines=nXP2Anz; if (nXP2Anz>1) pInfo->nObj2Lines--;
@@ -1222,8 +1222,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         // Sonderbehandlung fuer 'I'-Verbinder
         nXP1Anz--; aXP1.Remove(nXP1Anz,1);
         nXP2Anz--; aXP2.Remove(nXP2Anz,1);
-        bMeetingXMid=FALSE;
-        bMeetingYMid=FALSE;
+        bMeetingXMid=sal_False;
+        bMeetingYMid=sal_False;
     }
     if (bInsMeetingPoint) {
         aXP1.Insert(XPOLY_APPEND,aMeeting,XPOLY_NORMAL);
@@ -1248,13 +1248,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         // Dies wird die Mittellinie.
         pInfo->nMiddleLine=nXP1Anz-1;
     }
-    USHORT nNum=aXP2.GetPointCount();
+    sal_uInt16 nNum=aXP2.GetPointCount();
     if (aXP1[nXP1Anz-1]==aXP2[nXP2Anz-1] && nXP1Anz>1 && nXP2Anz>1) nNum--;
     while (nNum>0) {
         nNum--;
         aXP1.Insert(XPOLY_APPEND,aXP2[nNum],XPOLY_NORMAL);
     }
-    USHORT nPntAnz=aXP1.GetPointCount();
+    sal_uInt16 nPntAnz=aXP1.GetPointCount();
     char cForm=0;
     if (bInfo || pnQuality!=NULL) {
         cForm='?';
@@ -1301,26 +1301,26 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
     }
     if (pnQuality!=NULL) {
-        ULONG nQual=0;
-        ULONG nQual0=nQual; // Ueberlaeufe vorbeugen
-        FASTBOOL bOverflow=FALSE;
+        sal_uIntPtr nQual=0;
+        sal_uIntPtr nQual0=nQual; // Ueberlaeufe vorbeugen
+        FASTBOOL bOverflow=sal_False;
         Point aPt0(aXP1[0]);
-        for (USHORT nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
+        for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
             Point aPt1b(aXP1[nPntNum]);
             nQual+=Abs(aPt1b.X()-aPt0.X())+Abs(aPt1b.Y()-aPt0.Y());
-            if (nQual<nQual0) bOverflow=TRUE;
+            if (nQual<nQual0) bOverflow=sal_True;
             nQual0=nQual;
             aPt0=aPt1b;
         }
 
-        USHORT nTmp=nPntAnz;
+        sal_uInt16 nTmp=nPntAnz;
         if (cForm=='Z') {
             nTmp=2; // Z-Form hat gute Qualitaet (nTmp=2 statt 4)
-            ULONG n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y());
-            ULONG n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y());
-            ULONG n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y());
+            sal_uIntPtr n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y());
+            sal_uIntPtr n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y());
+            sal_uIntPtr n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y());
             // fuer moeglichst gleichlange Linien sorgen
-            ULONG nBesser=0;
+            sal_uIntPtr nBesser=0;
             n1+=n3;
             n3=n2/4;
             if (n1>=n2) nBesser=6;
@@ -1331,8 +1331,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
         if (nTmp>=3) {
             nQual0=nQual;
-            nQual+=(ULONG)nTmp*0x01000000;
-            if (nQual<nQual0 || nTmp>15) bOverflow=TRUE;
+            nQual+=(sal_uIntPtr)nTmp*0x01000000;
+            if (nQual<nQual0 || nTmp>15) bOverflow=sal_True;
         }
         if (nPntAnz>=2) { // Austrittswinkel nochmal pruefen
             Point aP1(aXP1[1]); aP1-=aXP1[0];
@@ -1351,13 +1351,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         aBewareRect1=rBewareRect1;
         aBewareRect2=rBewareRect2;
 
-        for (USHORT i=0; i<nPntAnz; i++) {
+        for (sal_uInt16 i=0; i<nPntAnz; i++) {
             Point aPt1b(aXP1[i]);
             FASTBOOL b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() &&
                         aPt1b.Y()>aBewareRect1.Top() && aPt1b.Y()<aBewareRect1.Bottom();
             FASTBOOL b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() &&
                         aPt1b.Y()>aBewareRect2.Top() && aPt1b.Y()<aBewareRect2.Bottom();
-            USHORT nInt0=nIntersections;
+            sal_uInt16 nInt0=nIntersections;
             if (i==0 || i==nPntAnz-1) {
                 if (b1 && b2) nIntersections++;
             } else {
@@ -1386,15 +1386,15 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
         if (nPntAnz<=1) nIntersections++;
         nQual0=nQual;
-        nQual+=(ULONG)nIntersections*0x10000000;
-        if (nQual<nQual0 || nIntersections>15) bOverflow=TRUE;
+        nQual+=(sal_uIntPtr)nIntersections*0x10000000;
+        if (nQual<nQual0 || nIntersections>15) bOverflow=sal_True;
 
         if (bOverflow || nQual==0xFFFFFFFF) nQual=0xFFFFFFFE;
         *pnQuality=nQual;
     }
     if (bInfo) { // nun die Linienversaetze auf aXP1 anwenden
         if (pInfo->nMiddleLine!=0xFFFF) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1);
             if (pInfo->ImpIsHorzLine(MIDDLELINE,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aMiddleLine.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aMiddleLine.Y();
@@ -1404,7 +1404,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             }
         }
         if (pInfo->nObj1Lines>=2) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1);
             if (pInfo->ImpIsHorzLine(OBJ1LINE2,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aObj1Line2.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aObj1Line2.Y();
@@ -1414,7 +1414,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             }
         }
         if (pInfo->nObj1Lines>=3) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1);
             if (pInfo->ImpIsHorzLine(OBJ1LINE3,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aObj1Line3.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aObj1Line3.Y();
@@ -1424,7 +1424,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             }
         }
         if (pInfo->nObj2Lines>=2) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1);
             if (pInfo->ImpIsHorzLine(OBJ2LINE2,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aObj2Line2.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aObj2Line2.Y();
@@ -1434,7 +1434,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             }
         }
         if (pInfo->nObj2Lines>=3) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1);
             if (pInfo->ImpIsHorzLine(OBJ2LINE3,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aObj2Line3.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aObj2Line3.Y();
@@ -1552,7 +1552,7 @@ je Objekt variiert von 0-3:
 void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
-    ULONG nId=pSimple==0 ? 0 : pSimple->GetId();
+    sal_uIntPtr nId=pSimple==0 ? 0 : pSimple->GetId();
     FASTBOOL bDataChg=nId==SFX_HINT_DATACHANGED;
     FASTBOOL bDying=nId==SFX_HINT_DYING;
     FASTBOOL bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC;
@@ -1713,10 +1713,10 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const
         }
         else if (eKind==SDREDGE_THREELINES && nPntAnz == 4L)
         {
-            if(GetConnectedNode(TRUE))
+            if(GetConnectedNode(sal_True))
                 nHdlAnz++;
 
-            if(GetConnectedNode(FALSE))
+            if(GetConnectedNode(sal_False))
                 nHdlAnz++;
         }
     }
@@ -1731,10 +1731,10 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
     if (nPntAnz!=0) {
         if (nHdlNum==0) {
             pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY);
-            if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(TRUE);
+            if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(sal_True);
         } else if (nHdlNum==1) {
-            pHdl=new ImpEdgeHdl((*pEdgeTrack)[USHORT(nPntAnz-1)],HDL_POLY);
-            if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(TRUE);
+            pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],HDL_POLY);
+            if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(sal_True);
         } else {
             SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
             if (eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) {
@@ -1774,7 +1774,7 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
                 }
             } else if (eKind==SDREDGE_THREELINES) {
                 sal_uInt32 nNum(nHdlNum);
-                if (GetConnectedNode(TRUE)==NULL) nNum++;
+                if (GetConnectedNode(sal_True)==NULL) nNum++;
                 Point aPos((*pEdgeTrack)[(sal_uInt16)nNum-1]);
                 pHdl=new ImpEdgeHdl(aPos,HDL_POLY);
                 if (nNum==2) ((ImpEdgeHdl*)pHdl)->SetLineCode(OBJ1LINE2);
@@ -1904,7 +1904,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
 
     // force recalc EdgeTrack
     *pEdgeTrack = ImpCalcEdgeTrack(*pEdgeTrack, aCon1, aCon2, &aEdgeInfo);
-    bEdgeTrackDirty=FALSE;
+    bEdgeTrackDirty=sal_False;
 
     // save EdgeInfos and mark object as user modified
     ImpSetEdgeInfoToAttr();
@@ -2006,40 +2006,40 @@ basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMeth
 
 FASTBOOL SdrEdgeObj::BegCreate(SdrDragStat& rDragStat)
 {
-    rDragStat.SetNoSnap(TRUE);
+    rDragStat.SetNoSnap(sal_True);
     pEdgeTrack->SetPointCount(2);
     (*pEdgeTrack)[0]=rDragStat.GetStart();
     (*pEdgeTrack)[1]=rDragStat.GetNow();
     if (rDragStat.GetPageView()!=NULL) {
         ImpFindConnector(rDragStat.GetStart(),*rDragStat.GetPageView(),aCon1,this);
-        ConnectToNode(TRUE,aCon1.pObj);
+        ConnectToNode(sal_True,aCon1.pObj);
     }
     *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
 {
-    USHORT nMax=pEdgeTrack->GetPointCount();
+    sal_uInt16 nMax=pEdgeTrack->GetPointCount();
     (*pEdgeTrack)[nMax-1]=rDragStat.GetNow();
     if (rDragStat.GetPageView()!=NULL) {
         ImpFindConnector(rDragStat.GetNow(),*rDragStat.GetPageView(),aCon2,this);
         rDragStat.GetView()->SetConnectMarker(aCon2,*rDragStat.GetPageView());
     }
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    ConnectToNode(FALSE,aCon2.pObj);
+    bSnapRectDirty=sal_True;
+    ConnectToNode(sal_False,aCon2.pObj);
     *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
-    bEdgeTrackDirty=FALSE;
-    return TRUE;
+    bEdgeTrackDirty=sal_False;
+    return sal_True;
 }
 
 FASTBOOL SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd)
 {
     FASTBOOL bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2);
     if (bOk) {
-        ConnectToNode(TRUE,aCon1.pObj);
-        ConnectToNode(FALSE,aCon2.pObj);
+        ConnectToNode(sal_True,aCon1.pObj);
+        ConnectToNode(sal_False,aCon2.pObj);
         if (rDragStat.GetView()!=NULL) {
             rDragStat.GetView()->HideConnectMarker();
         }
@@ -2054,7 +2054,7 @@ FASTBOOL SdrEdgeObj::BckCreate(SdrDragStat& rDragStat)
     if (rDragStat.GetView()!=NULL) {
         rDragStat.GetView()->HideConnectMarker();
     }
-    return FALSE;
+    return sal_False;
 }
 
 void SdrEdgeObj::BrkCreate(SdrDragStat& rDragStat)
@@ -2080,11 +2080,11 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
 {
     rCon.ResetVars();
     if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0);
-    if (pOut==NULL) return FALSE;
+    if (pOut==NULL) return sal_False;
     SdrObjList* pOL=rPV.GetObjList();
     const SetOfByte& rVisLayer=rPV.GetVisibleLayers();
     // Sensitiver Bereich der Konnektoren ist doppelt so gross wie die Handles:
-    USHORT nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel();
+    sal_uInt16 nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel();
     Size aHalfConSiz(nMarkHdSiz,nMarkHdSiz);
     aHalfConSiz=pOut->PixelToLogic(aHalfConSiz);
     Size aHalfCenterSiz(2*aHalfConSiz.Width(),2*aHalfConSiz.Height());
@@ -2093,13 +2093,13 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
     aMouseRect.Top()   -=aHalfConSiz.Height();
     aMouseRect.Right() +=aHalfConSiz.Width();
     aMouseRect.Bottom()+=aHalfConSiz.Height();
-    USHORT nBoundHitTol=(USHORT)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1;
-    ULONG no=pOL->GetObjCount();
-    FASTBOOL bFnd=FALSE;
+    sal_uInt16 nBoundHitTol=(sal_uInt16)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1;
+    sal_uIntPtr no=pOL->GetObjCount();
+    FASTBOOL bFnd=sal_False;
     SdrObjConnection aTestCon;
     SdrObjConnection aBestCon;
-    FASTBOOL bTestBoundHit=FALSE;
-    //FASTBOOL bBestBoundHit=FALSE;
+    FASTBOOL bTestBoundHit=sal_False;
+    //int bBestBoundHit=sal_False;
 
     while (no>0 && !bFnd) {
         // Problem: Gruppenobjekt mit verschiedenen Layern liefert LayerID 0 !!!!
@@ -2112,43 +2112,43 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
             Rectangle aObjBound(pObj->GetCurrentBoundRect());
             if (aObjBound.IsOver(aMouseRect)) {
                 aTestCon.ResetVars();
-                bTestBoundHit=FALSE;
+                bTestBoundHit=sal_False;
                 FASTBOOL bEdge=HAS_BASE(SdrEdgeObj,pObj); // kein BestCon fuer Edge
                 // Die Userdefined Konnektoren haben absolute Prioritaet.
                 // Danach kommt Vertex, Corner und Mitte(Best) gleich priorisiert.
                 // Zum Schluss kommt noch ein HitTest aufs Obj.
                 const SdrGluePointList* pGPL=pObj->GetGluePointList();
-                USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
-                USHORT nGesAnz=nConAnz+9;
-                FASTBOOL bUserFnd=FALSE;
-                ULONG nBestDist=0xFFFFFFFF;
-                for (USHORT i=0; i<nGesAnz; i++)
+                sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
+                sal_uInt16 nGesAnz=nConAnz+9;
+                FASTBOOL bUserFnd=sal_False;
+                sal_uIntPtr nBestDist=0xFFFFFFFF;
+                for (sal_uInt16 i=0; i<nGesAnz; i++)
                 {
                     FASTBOOL bUser=i<nConAnz;
                     FASTBOOL bVertex=i>=nConAnz+0 && i<nConAnz+4;
                     FASTBOOL bCorner=i>=nConAnz+4 && i<nConAnz+8;
                     FASTBOOL bCenter=i==nConAnz+8;
-                    FASTBOOL bOk=FALSE;
+                    FASTBOOL bOk=sal_False;
                     Point aConPos;
-                    USHORT nConNum=i;
+                    sal_uInt16 nConNum=i;
                     if (bUser) {
                         const SdrGluePoint& rGP=(*pGPL)[nConNum];
                         aConPos=rGP.GetAbsolutePos(*pObj);
                         nConNum=rGP.GetId();
-                        bOk=TRUE;
+                        bOk=sal_True;
                     } else if (bVertex && !bUserFnd) {
                         nConNum=nConNum-nConAnz;
                         if (rPV.GetView().IsAutoVertexConnectors()) {
                             SdrGluePoint aPt(pObj->GetVertexGluePoint(nConNum));
                             aConPos=aPt.GetAbsolutePos(*pObj);
-                            bOk=TRUE;
+                            bOk=sal_True;
                         } else i+=3;
                     } else if (bCorner && !bUserFnd) {
                         nConNum-=nConAnz+4;
                         if (rPV.GetView().IsAutoCornerConnectors()) {
                             SdrGluePoint aPt(pObj->GetCornerGluePoint(nConNum));
                             aConPos=aPt.GetAbsolutePos(*pObj);
-                            bOk=TRUE;
+                            bOk=sal_True;
                         } else i+=3;
                     }
                     else if (bCenter && !bUserFnd && !bEdge)
@@ -2160,20 +2160,20 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
                             // Edges nicht!
                             nConNum=0;
                             aConPos=aObjBound.Center();
-                            bOk=TRUE;
+                            bOk=sal_True;
                         }
                     }
                     if (bOk && aMouseRect.IsInside(aConPos)) {
-                        if (bUser) bUserFnd=TRUE;
-                        bFnd=TRUE;
-                        ULONG nDist=(ULONG)Abs(aConPos.X()-rPt.X())+(ULONG)Abs(aConPos.Y()-rPt.Y());
+                        if (bUser) bUserFnd=sal_True;
+                        bFnd=sal_True;
+                        sal_uIntPtr nDist=(sal_uIntPtr)Abs(aConPos.X()-rPt.X())+(sal_uIntPtr)Abs(aConPos.Y()-rPt.Y());
                         if (nDist<nBestDist) {
                             nBestDist=nDist;
                             aTestCon.pObj=pObj;
                             aTestCon.nConId=nConNum;
                             aTestCon.bAutoCorner=bCorner;
                             aTestCon.bAutoVertex=bVertex;
-                            aTestCon.bBestConn=FALSE; // bCenter;
+                            aTestCon.bBestConn=sal_False; // bCenter;
                             aTestCon.bBestVertex=bCenter;
                         }
                     }
@@ -2188,9 +2188,9 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
                     // Suppress default connect at object inside bound
                     if(!pThis || !pThis->GetSuppressDefaultConnect())
                     {
-                        bFnd=TRUE;
+                        bFnd=sal_True;
                         aTestCon.pObj=pObj;
-                        aTestCon.bBestConn=TRUE;
+                        aTestCon.bBestConn=sal_True;
                     }
                 }
                 if (bFnd) {
@@ -2261,7 +2261,7 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F
     }
 }
 
-SdrObject* SdrEdgeObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrEdgeObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     basegfx::B2DPolyPolygon aPolyPolygon;
     aPolyPolygon.append(pEdgeTrack->getB2DPolygon());
@@ -2279,7 +2279,7 @@ sal_uInt32 SdrEdgeObj::GetSnapPointCount() const
 Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const
 {
     ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack();
-    USHORT nAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
     if (i==0) return (*pEdgeTrack)[0];
     else return (*pEdgeTrack)[nAnz-1];
 }
@@ -2297,7 +2297,7 @@ sal_uInt32 SdrEdgeObj::GetPointCount() const
 Point SdrEdgeObj::GetPoint(sal_uInt32 i) const
 {
     ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack();
-    USHORT nAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
     if (0L == i)
         return (*pEdgeTrack)[0];
     else
@@ -2308,7 +2308,7 @@ void SdrEdgeObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
 {
     // ToDo: Umconnekten fehlt noch
     ImpUndirtyEdgeTrack();
-    USHORT nAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
     if (0L == i)
         (*pEdgeTrack)[0]=rPnt;
     if (1L == i)
@@ -2364,7 +2364,7 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo)
     aEdgeInfo      =rEGeo.aEdgeInfo;
 }
 
-Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
+Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const
 {
     if( pEdgeTrack && pEdgeTrack->GetPointCount()!=0)
     {
@@ -2375,7 +2375,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
         }
         else
         {
-            const USHORT nSiz = rTrack0.GetPointCount() - 1;
+            const sal_uInt16 nSiz = rTrack0.GetPointCount() - 1;
             return rTrack0[nSiz];
         }
     }
@@ -2389,7 +2389,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
 
 }
 
-void SdrEdgeObj::SetTailPoint( BOOL bTail, const Point& rPt )
+void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt )
 {
     ImpSetTailPoint( bTail, rPt );
     SetChanged();
@@ -2427,12 +2427,12 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */
         nIndex = 0;
     }
 
-    rConn1.SetConnectorId( (USHORT)nIndex );
+    rConn1.SetConnectorId( (sal_uInt16)nIndex );
 
     SetChanged();
     SetRectsDirty();
     ImpRecalcEdgeTrack();
-    // bEdgeTrackDirty=TRUE;
+    // bEdgeTrackDirty=sal_True;
 }
 
 /** this method is used by the api to return a glue point id for a connection.
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index b299d4c7a2ef..adfc7d0ba991 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -93,7 +93,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt
 {
     Graphic aGraphic;
 
-    SfxMedium xMed( rFileName, STREAM_STD_READ, TRUE );
+    SfxMedium xMed( rFileName, STREAM_STD_READ, sal_True );
     xMed.DownLoad();
 
     SvStream* pInStrm = xMed.GetInStream();
@@ -102,7 +102,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt
         pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
         GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
 
-        const USHORT nFilter = rFilterName.Len() && pGF->GetImportFormatCount()
+        const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount()
                             ? pGF->GetImportFormatNumber( rFilterName )
                             : GRFILTER_FORMAT_DONTKNOW;
 
@@ -135,7 +135,7 @@ public:
                                 const ::com::sun::star::uno::Any & rValue );
     void                DataChanged( const Graphic& rGraphic );
 
-    BOOL                Connect() { return 0 != GetRealObject(); }
+    sal_Bool                Connect() { return 0 != GetRealObject(); }
     void                UpdateAsynchron();
     void                RemoveGraphicUpdater();
 };
@@ -215,7 +215,7 @@ SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj)
 , pGrafObj( pObj )
 , pGraphicUpdater( NULL )
 {
-    SetSynchron( FALSE );
+    SetSynchron( sal_False );
 }
 
 // -----------------------------------------------------------------------------
@@ -325,11 +325,11 @@ TYPEINIT1(SdrGrafObj,SdrRectObj);
 SdrGrafObj::SdrGrafObj()
 :   SdrRectObj(),
     pGraphicLink    ( NULL ),
-    bMirrored       ( FALSE )
+    bMirrored       ( sal_False )
 {
     pGraphic = new GraphicObject;
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
-    bNoShear = TRUE;
+    bNoShear = sal_True;
 
     // #111096#
     mbGrafAnimationAllowed = sal_True;
@@ -348,11 +348,11 @@ SdrGrafObj::SdrGrafObj()
 SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect)
 :   SdrRectObj      ( rRect ),
     pGraphicLink    ( NULL ),
-    bMirrored       ( FALSE )
+    bMirrored       ( sal_False )
 {
     pGraphic = new GraphicObject( rGrf );
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
-    bNoShear = TRUE;
+    bNoShear = sal_True;
 
     // #111096#
     mbGrafAnimationAllowed = sal_True;
@@ -371,11 +371,11 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect)
 SdrGrafObj::SdrGrafObj( const Graphic& rGrf )
 :   SdrRectObj(),
     pGraphicLink    ( NULL ),
-    bMirrored       ( FALSE )
+    bMirrored       ( sal_False )
 {
     pGraphic = new GraphicObject( rGrf );
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
-    bNoShear = TRUE;
+    bNoShear = sal_True;
 
     // #111096#
     mbGrafAnimationAllowed = sal_True;
@@ -447,7 +447,7 @@ const Graphic& SdrGrafObj::GetGraphic() const
 
 // -----------------------------------------------------------------------------
 
-Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
+Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
 {
     // #107947# Refactored most of the code to GraphicObject, where
     // everybody can use e.g. the cropping functionality
@@ -455,8 +455,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
     GraphicType     eType = GetGraphicType();
     MapMode         aDestMap( pModel->GetScaleUnit(), Point(), pModel->GetScaleFraction(), pModel->GetScaleFraction() );
     const Size      aDestSize( GetLogicRect().GetSize() );
-    const BOOL      bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
-    const BOOL      bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
+    const sal_Bool      bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
+    const sal_Bool      bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
         ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType );
 
     // #104115# Need cropping info earlier
@@ -472,7 +472,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
 
         if( bMirror )
         {
-            USHORT      nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
+            sal_uInt16      nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
             FASTBOOL    bHMirr = nMirrorCase == 2 || nMirrorCase == 4;
             FASTBOOL    bVMirr = nMirrorCase == 3 || nMirrorCase == 4;
 
@@ -664,28 +664,28 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
                                aGeo.nDrehWink % 18000 == 0 ||
                                aGeo.nDrehWink % 27000 == 0;
 
-    rInfo.bResizePropAllowed = TRUE;
+    rInfo.bResizePropAllowed = sal_True;
     rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim;
     rInfo.bRotate90Allowed = bNoPresGrf && !bAnim;
     rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim;
     rInfo.bMirror45Allowed = bNoPresGrf && !bAnim;
     rInfo.bMirror90Allowed = !bEmptyPresObj;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed = FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bCanConvToPath = FALSE;
-    rInfo.bCanConvToPathLineToArea = FALSE;
-    rInfo.bCanConvToPolyLineToArea = FALSE;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed = sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bCanConvToPath = sal_False;
+    rInfo.bCanConvToPathLineToArea = sal_False;
+    rInfo.bCanConvToPolyLineToArea = sal_False;
     rInfo.bCanConvToPoly = !IsEPS();
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
 // -----------------------------------------------------------------------------
 
-UINT16 SdrGrafObj::GetObjIdentifier() const
+sal_uInt16 SdrGrafObj::GetObjIdentifier() const
 {
-    return UINT16( OBJ_GRAF );
+    return sal_uInt16( OBJ_GRAF );
 }
 
 // -----------------------------------------------------------------------------
@@ -726,7 +726,7 @@ void SdrGrafObj::TakeObjNameSingul(XubString& rName) const
     {
         case GRAPHIC_BITMAP:
         {
-            const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+            const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
                                  ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) :
                                  ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) );
 
@@ -765,7 +765,7 @@ void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const
     {
         case GRAPHIC_BITMAP:
         {
-            const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+            const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
                                  ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) :
                                  ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) );
 
@@ -924,7 +924,7 @@ void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect)
 
 void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect)
 {
-    //FASTBOOL bChg=rRect.GetSize()!=aRect.GetSize();
+    //int bChg=rRect.GetSize()!=aRect.GetSize();
     SdrRectObj::NbcSetLogicRect(rRect);
 }
 
@@ -950,7 +950,7 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo)
 {
     //long      nDrehMerk = aGeo.nDrehWink;
     //long      nShearMerk = aGeo.nShearWink;
-    //FASTBOOL  bMirrMerk = bMirrored;
+    //int   bMirrMerk = bMirrored;
     Size        aSizMerk( aRect.GetSize() );
 
     SdrRectObj::RestGeoData(rGeo);
@@ -1041,7 +1041,7 @@ const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const
 
 // -----------------------------------------------------------------------------
 
-SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     SdrObject* pRetval = NULL;
 
@@ -1058,7 +1058,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
             aFilter.SetScaleRect(GetSnapRect());
             aFilter.SetLayer(GetLayer());
 
-            UINT32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0);
+            sal_uInt32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0);
             if(nInsAnz)
             {
                 pRetval = pGrp;
@@ -1104,7 +1104,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
                 Bitmap aBitmap( GetTransformedGraphic().GetBitmap() );
                 XOBitmap aXBmp(aBitmap, XBITMAP_STRETCH);
                 aSet.Put(XFillBitmapItem(String(), aXBmp));
-                aSet.Put(XFillBmpTileItem(FALSE));
+                aSet.Put(XFillBmpTileItem(sal_False));
 
                 pRetval->SetMergedItemSet(aSet);
             }
@@ -1142,7 +1142,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo()
     aGrafInfo.SetChannelG( ( (SdrGrafGreenItem&) rSet.Get( SDRATTR_GRAFGREEN ) ).GetValue() );
     aGrafInfo.SetChannelB( ( (SdrGrafBlueItem&) rSet.Get( SDRATTR_GRAFBLUE ) ).GetValue() );
     aGrafInfo.SetGamma( ( (SdrGrafGamma100Item&) rSet.Get( SDRATTR_GRAFGAMMA ) ).GetValue() * 0.01 );
-    aGrafInfo.SetTransparency( (BYTE) FRound( Min( nTrans, (USHORT) 100 )  * 2.55 ) );
+    aGrafInfo.SetTransparency( (sal_uInt8) FRound( Min( nTrans, (sal_uInt16) 100 )  * 2.55 ) );
     aGrafInfo.SetInvert( ( (SdrGrafInvertItem&) rSet.Get( SDRATTR_GRAFINVERT ) ).GetValue() );
     aGrafInfo.SetDrawMode( ( (SdrGrafModeItem&) rSet.Get( SDRATTR_GRAFMODE ) ).GetValue() );
     aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() );
@@ -1161,7 +1161,7 @@ void SdrGrafObj::ImpSetGrafInfoToAttr()
     SetObjectItem( SdrGrafGreenItem( aGrafInfo.GetChannelG() ) );
     SetObjectItem( SdrGrafBlueItem( aGrafInfo.GetChannelB() ) );
     SetObjectItem( SdrGrafGamma100Item( FRound( aGrafInfo.GetGamma() * 100.0 ) ) );
-    SetObjectItem( SdrGrafTransparenceItem( (USHORT) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) );
+    SetObjectItem( SdrGrafTransparenceItem( (sal_uInt16) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) );
     SetObjectItem( SdrGrafInvertItem( aGrafInfo.IsInvert() ) );
     SetObjectItem( SdrGrafModeItem( aGrafInfo.GetDrawMode() ) );
     SetObjectItem( SdrGrafCropItem( aGrafInfo.GetLeftCrop(), aGrafInfo.GetTopCrop(), aGrafInfo.GetRightCrop(), aGrafInfo.GetBottomCrop() ) );
@@ -1234,7 +1234,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
             // ## test only if there are VOCs other than the preview renderer
             if(!GetViewContact().HasViewObjectContacts(true))
             {
-                const ULONG nSwapMode = pModel->GetSwapGraphicsMode();
+                const sal_uIntPtr   nSwapMode = pModel->GetSwapGraphicsMode();
 
                 if( ( pGraphic->HasUserData() || pGraphicLink ) &&
                     ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) )
@@ -1266,7 +1266,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
             {
                 SdrDocumentStreamInfo aStreamInfo;
 
-                aStreamInfo.mbDeleteAfterUse = FALSE;
+                aStreamInfo.mbDeleteAfterUse = sal_False;
                 aStreamInfo.maUserData = pGraphic->GetUserData();
 
                 SvStream* pStream = pModel->GetDocumentStream( aStreamInfo );
@@ -1384,7 +1384,7 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
         {
             SdrDocumentStreamInfo aStreamInfo;
 
-            aStreamInfo.mbDeleteAfterUse = FALSE;
+            aStreamInfo.mbDeleteAfterUse = sal_False;
             aStreamInfo.maUserData = pGraphic->GetUserData();
 
             SvStream* pStream = pModel->GetDocumentStream( aStreamInfo );
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 56c49ac7ddee..ede6b35178f9 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -100,10 +100,10 @@ SdrObjGroup::SdrObjGroup()
     pSub=new SdrObjList(NULL,NULL);
     pSub->SetOwnerObj(this);
     pSub->SetListKind(SDROBJLIST_GROUPOBJ);
-    bRefPoint=FALSE;
+    bRefPoint=sal_False;
     nDrehWink=0;
     nShearWink=0;
-    bClosedObj=FALSE;
+    bClosedObj=sal_False;
 }
 
 
@@ -114,51 +114,51 @@ SdrObjGroup::~SdrObjGroup()
 
 void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bNoContortion=FALSE;
+    rInfo.bNoContortion=sal_False;
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         SdrObjTransformInfoRec aInfo;
         pObj->TakeObjInfo(aInfo);
-        if (!aInfo.bMoveAllowed            ) rInfo.bMoveAllowed            =FALSE;
-        if (!aInfo.bResizeFreeAllowed      ) rInfo.bResizeFreeAllowed      =FALSE;
-        if (!aInfo.bResizePropAllowed      ) rInfo.bResizePropAllowed      =FALSE;
-        if (!aInfo.bRotateFreeAllowed      ) rInfo.bRotateFreeAllowed      =FALSE;
-        if (!aInfo.bRotate90Allowed        ) rInfo.bRotate90Allowed        =FALSE;
-        if (!aInfo.bMirrorFreeAllowed      ) rInfo.bMirrorFreeAllowed      =FALSE;
-        if (!aInfo.bMirror45Allowed        ) rInfo.bMirror45Allowed        =FALSE;
-        if (!aInfo.bMirror90Allowed        ) rInfo.bMirror90Allowed        =FALSE;
-        if (!aInfo.bShearAllowed           ) rInfo.bShearAllowed           =FALSE;
-        if (!aInfo.bEdgeRadiusAllowed      ) rInfo.bEdgeRadiusAllowed      =FALSE;
-        if (!aInfo.bNoOrthoDesired         ) rInfo.bNoOrthoDesired         =FALSE;
-        if (aInfo.bNoContortion            ) rInfo.bNoContortion           =TRUE;
-        if (!aInfo.bCanConvToPath          ) rInfo.bCanConvToPath          =FALSE;
+        if (!aInfo.bMoveAllowed            ) rInfo.bMoveAllowed            =sal_False;
+        if (!aInfo.bResizeFreeAllowed      ) rInfo.bResizeFreeAllowed      =sal_False;
+        if (!aInfo.bResizePropAllowed      ) rInfo.bResizePropAllowed      =sal_False;
+        if (!aInfo.bRotateFreeAllowed      ) rInfo.bRotateFreeAllowed      =sal_False;
+        if (!aInfo.bRotate90Allowed        ) rInfo.bRotate90Allowed        =sal_False;
+        if (!aInfo.bMirrorFreeAllowed      ) rInfo.bMirrorFreeAllowed      =sal_False;
+        if (!aInfo.bMirror45Allowed        ) rInfo.bMirror45Allowed        =sal_False;
+        if (!aInfo.bMirror90Allowed        ) rInfo.bMirror90Allowed        =sal_False;
+        if (!aInfo.bShearAllowed           ) rInfo.bShearAllowed           =sal_False;
+        if (!aInfo.bEdgeRadiusAllowed      ) rInfo.bEdgeRadiusAllowed      =sal_False;
+        if (!aInfo.bNoOrthoDesired         ) rInfo.bNoOrthoDesired         =sal_False;
+        if (aInfo.bNoContortion            ) rInfo.bNoContortion           =sal_True;
+        if (!aInfo.bCanConvToPath          ) rInfo.bCanConvToPath          =sal_False;
 
         if(!aInfo.bCanConvToContour)
-            rInfo.bCanConvToContour = FALSE;
+            rInfo.bCanConvToContour = sal_False;
 
-        if (!aInfo.bCanConvToPoly          ) rInfo.bCanConvToPoly          =FALSE;
-        if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=FALSE;
-        if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=FALSE;
+        if (!aInfo.bCanConvToPoly          ) rInfo.bCanConvToPoly          =sal_False;
+        if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=sal_False;
+        if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=sal_False;
     }
     if (nObjAnz==0) {
-        rInfo.bRotateFreeAllowed=FALSE;
-        rInfo.bRotate90Allowed  =FALSE;
-        rInfo.bMirrorFreeAllowed=FALSE;
-        rInfo.bMirror45Allowed  =FALSE;
-        rInfo.bMirror90Allowed  =FALSE;
-        rInfo.bTransparenceAllowed = FALSE;
-        rInfo.bGradientAllowed = FALSE;
-        rInfo.bShearAllowed     =FALSE;
-        rInfo.bEdgeRadiusAllowed=FALSE;
-        rInfo.bNoContortion     =TRUE;
+        rInfo.bRotateFreeAllowed=sal_False;
+        rInfo.bRotate90Allowed  =sal_False;
+        rInfo.bMirrorFreeAllowed=sal_False;
+        rInfo.bMirror45Allowed  =sal_False;
+        rInfo.bMirror90Allowed  =sal_False;
+        rInfo.bTransparenceAllowed = sal_False;
+        rInfo.bGradientAllowed = sal_False;
+        rInfo.bShearAllowed     =sal_False;
+        rInfo.bEdgeRadiusAllowed=sal_False;
+        rInfo.bNoContortion     =sal_True;
     }
     if(nObjAnz != 1)
     {
         // only allowed if single object selected
-        rInfo.bTransparenceAllowed = FALSE;
-        rInfo.bGradientAllowed = FALSE;
+        rInfo.bTransparenceAllowed = sal_False;
+        rInfo.bGradientAllowed = sal_False;
     }
 }
 
@@ -169,21 +169,21 @@ void SdrObjGroup::SetBoundRectDirty()
     // not re-creatable view data
 }
 
-UINT16 SdrObjGroup::GetObjIdentifier() const
+sal_uInt16 SdrObjGroup::GetObjIdentifier() const
 {
-    return UINT16(OBJ_GRUP);
+    return sal_uInt16(OBJ_GRUP);
 }
 
 
 SdrLayerID SdrObjGroup::GetLayer() const
 {
-    FASTBOOL b1st=TRUE;
+    FASTBOOL b1st=sal_True;
     SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer());
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrLayerID nLay1=pOL->GetObj(i)->GetLayer();
-        if (b1st) { nLay=nLay1; b1st=FALSE; }
+        if (b1st) { nLay=nLay1; b1st=sal_False; }
         else if (nLay1!=nLay) return 0;
     }
     return nLay;
@@ -194,8 +194,8 @@ void SdrObjGroup::NbcSetLayer(SdrLayerID nLayer)
 {
     SdrObject::NbcSetLayer(nLayer);
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         pOL->GetObj(i)->NbcSetLayer(nLayer);
     }
 }
@@ -259,7 +259,7 @@ Point SdrObjGroup::GetRefPoint() const
 
 void SdrObjGroup::SetRefPoint(const Point& rPnt)
 {
-    bRefPoint=TRUE;
+    bRefPoint=sal_True;
     aRefPoint=rPnt;
 }
 
@@ -387,7 +387,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const
 
 FASTBOOL SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -434,8 +434,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz)
     MovePoint(aRefPoint,rSiz);
     if (pSub->GetObjCount()!=0) {
         SdrObjList* pOL=pSub;
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG i=0; i<nObjAnz; i++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr i=0; i<nObjAnz; i++) {
             SdrObject* pObj=pOL->GetObj(i);
             pObj->NbcMove(rSiz);
         }
@@ -466,8 +466,8 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
     ResizePoint(aRefPoint,rRef,xFact,yFact);
     if (pSub->GetObjCount()!=0) {
         SdrObjList* pOL=pSub;
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG i=0; i<nObjAnz; i++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr i=0; i<nObjAnz; i++) {
             SdrObject* pObj=pOL->GetObj(i);
             pObj->NbcResize(rRef,xFact,yFact);
         }
@@ -480,48 +480,48 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
 
 void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     nDrehWink=NormAngle360(nDrehWink+nWink);
     RotatePoint(aRefPoint,rRef,sn,cs);
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         pObj->NbcRotate(rRef,nWink,sn,cs);
     }
     NbcRotateGluePoints(rRef,nWink,sn,cs);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 
 void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         pObj->NbcMirror(rRef1,rRef2);
     }
     NbcMirrorGluePoints(rRef1,rRef2);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 
 void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     nShearWink+=nWink;
     ShearPoint(aRefPoint,rRef,tn);
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         pObj->NbcShear(rRef,nWink,tn,bVShear);
     }
     NbcShearGluePoints(rRef,nWink,tn,bVShear);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 
@@ -531,8 +531,8 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt)
     Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
     MovePoint(aRefPoint,aSiz);
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         pObj->NbcSetAnchorPos(rPnt);
     }
@@ -578,8 +578,8 @@ void SdrObjGroup::Move(const Size& rSiz)
         if (pSub->GetObjCount()!=0) {
             // #32383# Erst die Verbinder verschieben, dann den Rest
             SdrObjList* pOL=pSub;
-            ULONG nObjAnz=pOL->GetObjCount();
-            ULONG i;
+            sal_uIntPtr nObjAnz=pOL->GetObjCount();
+            sal_uIntPtr i;
             for (i=0; i<nObjAnz; i++) {
                 SdrObject* pObj=pOL->GetObj(i);
                 if (pObj->IsEdgeObj()) pObj->Move(rSiz);
@@ -624,8 +624,8 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
         if (pSub->GetObjCount()!=0) {
             // #32383# Erst die Verbinder verschieben, dann den Rest
             SdrObjList* pOL=pSub;
-            ULONG nObjAnz=pOL->GetObjCount();
-            ULONG i;
+            sal_uIntPtr nObjAnz=pOL->GetObjCount();
+            sal_uIntPtr i;
             for (i=0; i<nObjAnz; i++) {
                 SdrObject* pObj=pOL->GetObj(i);
                 if (pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact);
@@ -650,14 +650,14 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
 void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
 {
     if (nWink!=0) {
-        SetGlueReallyAbsolute(TRUE);
+        SetGlueReallyAbsolute(sal_True);
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         nDrehWink=NormAngle360(nDrehWink+nWink);
         RotatePoint(aRefPoint,rRef,sn,cs);
         // #32383# Erst die Verbinder verschieben, dann den Rest
         SdrObjList* pOL=pSub;
-        ULONG nObjAnz=pOL->GetObjCount();
-        ULONG i;
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        sal_uIntPtr i;
         for (i=0; i<nObjAnz; i++) {
             SdrObject* pObj=pOL->GetObj(i);
             if (pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
@@ -667,7 +667,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
             if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
         }
         NbcRotateGluePoints(rRef,nWink,sn,cs);
-        SetGlueReallyAbsolute(FALSE);
+        SetGlueReallyAbsolute(sal_False);
         SetChanged();
         BroadcastObjectChange();
         SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -677,13 +677,13 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
 
 void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
     MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
     // #32383# Erst die Verbinder verschieben, dann den Rest
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    ULONG i;
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    sal_uIntPtr i;
     for (i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         if (pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
@@ -693,7 +693,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
         if (!pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
     }
     NbcMirrorGluePoints(rRef1,rRef2);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
     SetChanged();
     BroadcastObjectChange();
     SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -703,14 +703,14 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
 void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
 {
     if (nWink!=0) {
-        SetGlueReallyAbsolute(TRUE);
+        SetGlueReallyAbsolute(sal_True);
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         nShearWink+=nWink;
         ShearPoint(aRefPoint,rRef,tn);
         // #32383# Erst die Verbinder verschieben, dann den Rest
         SdrObjList* pOL=pSub;
-        ULONG nObjAnz=pOL->GetObjCount();
-        ULONG i;
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        sal_uIntPtr i;
         for (i=0; i<nObjAnz; i++) {
             SdrObject* pObj=pOL->GetObj(i);
             if (pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
@@ -720,7 +720,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShe
             if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
         }
         NbcShearGluePoints(rRef,nWink,tn,bVShear);
-        SetGlueReallyAbsolute(FALSE);
+        SetGlueReallyAbsolute(sal_False);
         SetChanged();
         BroadcastObjectChange();
         SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -737,8 +737,8 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
     MovePoint(aRefPoint,aSiz);
     // #32383# Erst die Verbinder verschieben, dann den Rest
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    ULONG i;
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    sal_uIntPtr i;
     for (i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         if (pObj->IsEdgeObj()) pObj->SetAnchorPos(rPnt);
@@ -780,12 +780,12 @@ void SdrObjGroup::ReformatText()
     pSub->ReformatAllTextObjects();
 }
 
-SdrObject* SdrObjGroup::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     SdrObject* pGroup = new SdrObjGroup;
     pGroup->SetModel(GetModel());
 
-    for(UINT32 a=0;a<pSub->GetObjCount();a++)
+    for(sal_uInt32 a=0;a<pSub->GetObjCount();a++)
     {
         SdrObject* pIterObj = pSub->GetObj(a);
         SdrObject* pResult = pIterObj->DoConvertToPolyObj(bBezier);
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index ade79ec70878..63d23eb2c72b 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -79,8 +79,8 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
 {
     rStr.Erase();
     Fraction aMeasureScale(1, 1);
-    BOOL bTextRota90(FALSE);
-    BOOL bShowUnit(FALSE);
+    sal_Bool bTextRota90(sal_False);
+    sal_Bool bShowUnit(sal_False);
     FieldUnit eMeasureUnit(FUNIT_NONE);
     FieldUnit eModUIUnit(FUNIT_NONE);
 
@@ -104,7 +104,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
                 if(eMeasureUnit == FUNIT_NONE)
                     eMeasureUnit = eModUIUnit;
 
-                INT32 nLen(GetLen(aPt2 - aPt1));
+                sal_Int32 nLen(GetLen(aPt2 - aPt1));
                 Fraction aFact(1,1);
 
                 if(eMeasureUnit != eModUIUnit)
@@ -124,7 +124,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
                     nLen = BigMulDiv(nLen, aFact.GetNumerator(), aFact.GetDenominator());
                 }
 
-                pModel->TakeMetricStr(nLen, rStr, TRUE, nNumDigits);
+                pModel->TakeMetricStr(nLen, rStr, sal_True, nNumDigits);
 
                 if(!aFact.IsValid())
                 {
@@ -215,7 +215,7 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact()
 TYPEINIT1(SdrMeasureObj,SdrTextObj);
 
 SdrMeasureObj::SdrMeasureObj():
-    bTextDirty(FALSE)
+    bTextDirty(sal_False)
 {
     // #i25616#
     mbSupportTextIndentingOnLineWidthChange = sal_False;
@@ -224,7 +224,7 @@ SdrMeasureObj::SdrMeasureObj():
 SdrMeasureObj::SdrMeasureObj(const Point& rPt1, const Point& rPt2):
     aPt1(rPt1),
     aPt2(rPt2),
-    bTextDirty(FALSE)
+    bTextDirty(sal_False)
 {
     // #i25616#
     mbSupportTextIndentingOnLineWidthChange = sal_False;
@@ -236,31 +236,31 @@ SdrMeasureObj::~SdrMeasureObj()
 
 void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bSelectAllowed    =TRUE;
-    rInfo.bMoveAllowed      =TRUE;
-    rInfo.bResizeFreeAllowed=TRUE;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=TRUE;
-    rInfo.bRotate90Allowed  =TRUE;
-    rInfo.bMirrorFreeAllowed=TRUE;
-    rInfo.bMirror45Allowed  =TRUE;
-    rInfo.bMirror90Allowed  =TRUE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =TRUE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bNoOrthoDesired   =TRUE;
-    rInfo.bNoContortion     =FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =TRUE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
+    rInfo.bSelectAllowed    =sal_True;
+    rInfo.bMoveAllowed      =sal_True;
+    rInfo.bResizeFreeAllowed=sal_True;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_True;
+    rInfo.bRotate90Allowed  =sal_True;
+    rInfo.bMirrorFreeAllowed=sal_True;
+    rInfo.bMirror45Allowed  =sal_True;
+    rInfo.bMirror90Allowed  =sal_True;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_True;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bNoOrthoDesired   =sal_True;
+    rInfo.bNoContortion     =sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_True;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrMeasureObj::GetObjIdentifier() const
+sal_uInt16 SdrMeasureObj::GetObjIdentifier() const
 {
-    return (UINT16)OBJ_MEASURE;
+    return (sal_uInt16)OBJ_MEASURE;
 }
 
 struct ImpMeasureRec : public SdrDragStatUserData
@@ -312,7 +312,7 @@ struct ImpMeasurePoly
     double                      nLineCos;
     double                      nHlpSin;
     double                      nHlpCos;
-    USHORT                      nMainlineAnz;
+    sal_uInt16                      nMainlineAnz;
     SdrMeasureTextHPos          eUsedTextHPos;
     SdrMeasureTextVPos          eUsedTextVPos;
     long                        nLineWdt2;  // Halbe Strichstaerke
@@ -389,7 +389,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
     rPol.nArrow2Wdt=0;
     long nArrowNeed=0;
     long nShortLen=0;
-    FASTBOOL bPfeileAussen=FALSE;
+    FASTBOOL bPfeileAussen=sal_False;
 
     const SfxItemSet& rSet = GetObjectItemSet();
     sal_Int32 nLineWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); // Strichstaerke
@@ -413,7 +413,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
     // nArrowLen ist bei bCenter bereits halbiert
     // Bei 2 Pfeilen a 4mm ist unter 10mm Schluss.
     nArrowNeed=nArrow1Len+nArrow2Len+(nArrow1Wdt+nArrow2Wdt)/2;
-    if (rPol.nLineLen<nArrowNeed) bPfeileAussen=TRUE;
+    if (rPol.nLineLen<nArrowNeed) bPfeileAussen=sal_True;
     nShortLen=(nArrow1Len+nArrow1Wdt + nArrow2Len+nArrow2Wdt) /2;
 
     rPol.eUsedTextHPos=rRec.eWantTextHPos;
@@ -425,23 +425,23 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
         OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject();
         if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1)
         {
-            bBrkLine=TRUE; // Unterbrochene Linie, wenn nur 1 Absatz.
+            bBrkLine=sal_True; // Unterbrochene Linie, wenn nur 1 Absatz.
         }
     }
     rPol.bBreakedLine=bBrkLine;
     if (rPol.eUsedTextHPos==SDRMEASURE_TEXTHAUTO) { // bei zu breitem Text diesen eventuell nach aussen schieben
-        FASTBOOL bOutside=FALSE;
+        FASTBOOL bOutside=sal_False;
         long nNeedSiz=!rRec.bTextRota90 ? rPol.aTextSize.Width() : rPol.aTextSize.Height();
-        if (nNeedSiz>rPol.nLineLen) bOutside=TRUE; // Text passt nicht in die Mitte
+        if (nNeedSiz>rPol.nLineLen) bOutside=sal_True; // Text passt nicht in die Mitte
         if (bBrkLine) {
-            if (nNeedSiz+nArrowNeed>rPol.nLineLen) bPfeileAussen=TRUE; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen
+            if (nNeedSiz+nArrowNeed>rPol.nLineLen) bPfeileAussen=sal_True; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen
         } else {
             long nSmallNeed=nArrow1Len+nArrow2Len+(nArrow1Wdt+nArrow2Wdt)/2/4;
-            if (nNeedSiz+nSmallNeed>rPol.nLineLen) bPfeileAussen=TRUE; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen
+            if (nNeedSiz+nSmallNeed>rPol.nLineLen) bPfeileAussen=sal_True; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen
         }
         rPol.eUsedTextHPos=bOutside ? SDRMEASURE_TEXTLEFTOUTSIDE : SDRMEASURE_TEXTINSIDE;
     }
-    if (rPol.eUsedTextHPos!=SDRMEASURE_TEXTINSIDE) bPfeileAussen=TRUE;
+    if (rPol.eUsedTextHPos!=SDRMEASURE_TEXTINSIDE) bPfeileAussen=sal_True;
     rPol.nArrow1Wdt=nArrow1Wdt;
     rPol.nArrow2Wdt=nArrow2Wdt;
     rPol.nShortLineLen=nShortLen;
@@ -461,12 +461,12 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
     rPol.nTextWink=rPol.nLineWink;
     if (rRec.bTextRota90) rPol.nTextWink+=9000;
 
-    rPol.bAutoUpsideDown=FALSE;
+    rPol.bAutoUpsideDown=sal_False;
     if (rRec.bTextAutoAngle) {
         long nTmpWink=NormAngle360(rPol.nTextWink-rRec.nTextAutoAngleView);
         if (nTmpWink>=18000) {
             rPol.nTextWink+=18000;
-            rPol.bAutoUpsideDown=TRUE;
+            rPol.bAutoUpsideDown=sal_True;
         }
     }
 
@@ -581,7 +581,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol)
     return aRetval;
 }
 
-FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
     FASTBOOL bEdit,
     Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const
 {
@@ -596,7 +596,7 @@ FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara,
                 rpFldColor=NULL;
             }
         }
-        return TRUE;
+        return sal_True;
     } else {
         return SdrTextObj::CalcFieldValue(rField,nPara,nPos,bEdit,rpTxtColor,rpFldColor,rRet);
     }
@@ -628,14 +628,14 @@ void SdrMeasureObj::UndirtyText() const
             rOutliner.SetText(*pOutlinerParaObject);
         }
 
-        rOutliner.SetUpdateMode(TRUE);
+        rOutliner.SetUpdateMode(sal_True);
         rOutliner.UpdateFields();
         Size aSiz(rOutliner.CalcTextSize());
         rOutliner.Clear();
         // 3x casting auf nonconst
         ((SdrMeasureObj*)this)->aTextSize=aSiz;
-        ((SdrMeasureObj*)this)->bTextSizeDirty=FALSE;
-        ((SdrMeasureObj*)this)->bTextDirty=FALSE;
+        ((SdrMeasureObj*)this)->bTextSizeDirty=sal_False;
+        ((SdrMeasureObj*)this)->bTextDirty=sal_False;
     }
 }
 
@@ -977,7 +977,7 @@ FASTBOOL SdrMeasureObj::BegCreate(SdrDragStat& rStat)
     aPt1=rStat.GetStart();
     aPt2=rStat.GetNow();
     SetTextDirty();
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrMeasureObj::MovCreate(SdrDragStat& rStat)
@@ -991,8 +991,8 @@ FASTBOOL SdrMeasureObj::MovCreate(SdrDragStat& rStat)
     }
     SetTextDirty();
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    return TRUE;
+    bSnapRectDirty=sal_True;
+    return sal_True;
 }
 
 FASTBOOL SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -1004,7 +1004,7 @@ FASTBOOL SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 
 FASTBOOL SdrMeasureObj::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrMeasureObj::BrkCreate(SdrDragStat& /*rStat*/)
@@ -1158,7 +1158,7 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo)
     SetTextDirty();
 }
 
-SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     // get XOR Poly as base
     XPolyPolygon aTmpPolyPolygon(TakeXorPoly());
@@ -1174,8 +1174,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
     // prepare parameters
     basegfx::B2DPolyPolygon aPolyPoly;
     SdrPathObj* pPath;
-    UINT16 nCount(aTmpPolyPolygon.Count());
-    UINT16 nLoopStart(0);
+    sal_uInt16 nCount(aTmpPolyPolygon.Count());
+    sal_uInt16 nLoopStart(0);
 
     if(nCount == 3)
     {
@@ -1196,8 +1196,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
     {
         // four lines, middle line with gap, so there are two lines used
         // which have one arrow each
-        //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
-        INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
+        //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
+        sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
         aSet.Put(XLineEndWidthItem(0L));
 
         aPolyPoly.clear();
@@ -1227,8 +1227,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
     else if(nCount == 5)
     {
         // five lines, first two are the outer ones
-        //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
-        INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
+        //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
+        sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
 
         aSet.Put(XLineEndWidthItem(0L));
 
@@ -1299,7 +1299,7 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject)
 }
 
 void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText,
-    Rectangle* pAnchorRect, BOOL bLineWidth ) const
+    Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
 {
     if (bTextDirty) UndirtyText();
     SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
@@ -1317,7 +1317,7 @@ void SdrMeasureObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle
     SdrTextObj::TakeTextEditArea(pPaperMin,pPaperMax,pViewInit,pViewMin);
 }
 
-USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
 {
     if (bTextDirty) UndirtyText();
     ImpMeasureRec aRec;
@@ -1330,7 +1330,7 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
     SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos;
     SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos;
     FASTBOOL bTextRota90=aRec.bTextRota90;
-    //FASTBOOL bTextUpsideDown=aRec.bTextUpsideDown;
+    //int bTextUpsideDown=aRec.bTextUpsideDown;
     FASTBOOL bBelowRefEdge=aRec.bBelowRefEdge;
 
     // bTextUpsideDown muss hier noch ausgewertet werden!!!!
@@ -1369,7 +1369,7 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
         else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=ANCHOR_BOTTOM_HCENTER;
         else eRet=ANCHOR_VCENTER_HCENTER;
     }
-    return (USHORT)eRet;
+    return (sal_uInt16)eRet;
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 8d360e67bed0..26dfb41de180 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -65,7 +65,7 @@ SdrMediaObj::~SdrMediaObj()
 
 FASTBOOL SdrMediaObj::HasTextEdit() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 // ------------------------------------------------------------------------------
@@ -103,9 +103,9 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
 
 // ------------------------------------------------------------------------------
 
-UINT16 SdrMediaObj::GetObjIdentifier() const
+sal_uInt16 SdrMediaObj::GetObjIdentifier() const
 {
-    return UINT16( OBJ_MEDIA );
+    return sal_uInt16( OBJ_MEDIA );
 }
 
 // ------------------------------------------------------------------------------
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 216783663603..7becaa96e254 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -397,7 +397,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
         xParentFrame->setActiveFrame( xOwnFrame );
 
     OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache();
-    const ULONG nCount = rObjCache.Count();
+    const sal_uIntPtr nCount = rObjCache.Count();
     for(sal_Int32 i = nCount-1 ; i >= 0;--i)
     {
         SdrOle2Obj* pObj = reinterpret_cast<SdrOle2Obj*>(rObjCache.GetObject(i));
@@ -627,7 +627,7 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):
     ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
     pObj(pObject)
 {
-    SetSynchron( FALSE );
+    SetSynchron( sal_False );
 }
 
 // -----------------------------------------------------------------------------
@@ -756,7 +756,7 @@ SdrOle2Obj::SdrOle2Obj(FASTBOOL bFrame_) : m_bTypeAsked(false)
 ,m_bChart(false)
 {
     DBG_CTOR( SdrOle2Obj,NULL);
-    bInDestruction = FALSE;
+    bInDestruction = sal_False;
     Init();
     bFrame=bFrame_;
 }
@@ -768,13 +768,13 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFram
     , m_bChart(false)
 {
     DBG_CTOR( SdrOle2Obj,NULL);
-    bInDestruction = FALSE;
+    bInDestruction = sal_False;
     Init();
 
     bFrame=bFrame_;
 
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
-        SetResizeProtect(TRUE);
+        SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -789,14 +789,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin
     , m_bChart(false)
 {
     DBG_CTOR( SdrOle2Obj,NULL);
-    bInDestruction = FALSE;
+    bInDestruction = sal_False;
     Init();
 
     mpImpl->aPersistName = rNewObjName;
     bFrame=bFrame_;
 
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
-        SetResizeProtect(TRUE);
+        SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -812,14 +812,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef&  rNewObjRef, const XubStri
     , m_bChart(false)
 {
     DBG_CTOR( SdrOle2Obj,NULL);
-    bInDestruction = FALSE;
+    bInDestruction = sal_False;
     Init();
 
     mpImpl->aPersistName = rNewObjName;
     bFrame=bFrame_;
 
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
-        SetResizeProtect(TRUE);
+        SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -836,7 +836,7 @@ void SdrOle2Obj::Init()
     mpImpl->pGraphicObject=NULL;
     mpImpl->pLightClient = 0;
 
-    xObjRef.Lock( TRUE );
+    xObjRef.Lock( sal_True );
 }
 
 // -----------------------------------------------------------------------------
@@ -844,7 +844,7 @@ void SdrOle2Obj::Init()
 SdrOle2Obj::~SdrOle2Obj()
 {
     DBG_DTOR( SdrOle2Obj,NULL);
-    bInDestruction = TRUE;
+    bInDestruction = sal_True;
 
     if ( mpImpl->mbConnected )
         Disconnect();
@@ -1123,7 +1123,7 @@ void SdrOle2Obj::Connect_Impl()
                 {
                     xObjRef.AssignToContainer( &rContainer, mpImpl->aPersistName );
                     mpImpl->mbConnected = true;
-                    xObjRef.Lock( TRUE );
+                    xObjRef.Lock( sal_True );
                 }
             }
 
@@ -1174,7 +1174,7 @@ void SdrOle2Obj::Connect_Impl()
             pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER)
         {
             // Kein RefDevice oder RefDevice kein Printer
-            BOOL bModified = (*ppObjRef)->IsModified();
+            sal_Bool bModified = (*ppObjRef)->IsModified();
             Printer* pPrinter = (Printer*) pModel->GetRefDevice();
             (*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
             (*ppObjRef)->SetModified( bModified );
@@ -1442,7 +1442,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
     // MBA: the caller of the method is responsible to control the old object, it will not be closed here
     // Otherwise WW8 import crashes because it tranfers control to OLENode by this method
     if ( xObjRef.GetObject().is() )
-        xObjRef.Lock( FALSE );
+        xObjRef.Lock( sal_False );
 
     // MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
     // This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener
@@ -1459,7 +1459,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
         DELETEZ( pGraphic );
 
         if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
-            SetResizeProtect(TRUE);
+            SetResizeProtect(sal_True);
 
         // #108759# For math objects, set closed state to transparent
         if( ImplIsMathObj( rNewObjRef ) )
@@ -1557,28 +1557,28 @@ String SdrOle2Obj::GetPersistName() const
 
 void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bNoOrthoDesired   =FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =FALSE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
-    rInfo.bCanConvToContour = FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bNoOrthoDesired   =sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_False;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
+    rInfo.bCanConvToContour = sal_False;
 }
 
 // -----------------------------------------------------------------------------
 
-UINT16 SdrOle2Obj::GetObjIdentifier() const
+sal_uInt16 SdrOle2Obj::GetObjIdentifier() const
 {
-    return bFrame ? UINT16(OBJ_FRAME) : UINT16(OBJ_OLE2);
+    return bFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2);
 }
 
 // -----------------------------------------------------------------------------
@@ -1980,23 +1980,23 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb
 
 // -----------------------------------------------------------------------------
 
-BOOL SdrOle2Obj::Unload()
+sal_Bool SdrOle2Obj::Unload()
 {
-    BOOL bUnloaded = FALSE;
+    sal_Bool bUnloaded = sal_False;
 
     if( xObjRef.is() )
     {
         //TODO/LATER: no refcounting tricks anymore!
         //"customers" must register as state change listeners
         //Nicht notwendig im Doc DTor (MM)
-        //ULONG nRefCount = (*ppObjRef)->GetRefCount();
+        //sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount();
         // prevent Unload if there are external references
         //if( nRefCount > 2 )
-        //    return FALSE;
+        //    return sal_False;
         //DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" );
     }
     else
-        bUnloaded = TRUE;
+        bUnloaded = sal_True;
 
     if ( pModel && xObjRef.is() )
     {
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index dbe19ac40efe..1897d2765678 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -144,27 +144,27 @@ void SdrPageObj::SetBoundRectDirty()
     // not re-creatable view data
 }
 
-UINT16 SdrPageObj::GetObjIdentifier() const
+sal_uInt16 SdrPageObj::GetObjIdentifier() const
 {
-    return UINT16(OBJ_PAGE);
+    return sal_uInt16(OBJ_PAGE);
 }
 
 void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bNoOrthoDesired   =FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =FALSE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bNoOrthoDesired   =sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_False;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
 }
 
 void SdrPageObj::operator=(const SdrObject& rObj)
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index b3f61c7b0813..38784af56936 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -80,7 +80,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 
 using namespace sdr;
 
-inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
+inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, FASTBOOL bClosed)
 {
     if (nPnt>0) {
         nPnt--;
@@ -91,7 +91,7 @@ inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
     return nPnt;
 }
 
-inline USHORT GetNextPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
+inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, FASTBOOL bClosed)
 {
     nPnt++;
     if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0;
@@ -101,45 +101,45 @@ inline USHORT GetNextPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
 struct ImpSdrPathDragData  : public SdrDragStatUserData
 {
     XPolygon                    aXP;            // Ausschnitt aud dem Originalpolygon
-    FASTBOOL                    bValid;         // FALSE = zu wenig Punkte
+    FASTBOOL                    bValid;         // sal_False = zu wenig Punkte
     FASTBOOL                    bClosed;        // geschlossenes Objekt?
-    USHORT                      nPoly;          // Nummer des Polygons im PolyPolygon
-    USHORT                      nPnt;           // Punktnummer innerhalb des obigen Polygons
-    USHORT                      nPntAnz;        // Punktanzahl des Polygons
-    USHORT                      nPntMax;        // Maximaler Index
+    sal_uInt16                      nPoly;          // Nummer des Polygons im PolyPolygon
+    sal_uInt16                      nPnt;           // Punktnummer innerhalb des obigen Polygons
+    sal_uInt16                      nPntAnz;        // Punktanzahl des Polygons
+    sal_uInt16                      nPntMax;        // Maximaler Index
     FASTBOOL                    bBegPnt;        // Gedraggter Punkt ist der Anfangspunkt einer Polyline
     FASTBOOL                    bEndPnt;        // Gedraggter Punkt ist der Endpunkt einer Polyline
-    USHORT                      nPrevPnt;       // Index des vorherigen Punkts
-    USHORT                      nNextPnt;       // Index des naechsten Punkts
+    sal_uInt16                      nPrevPnt;       // Index des vorherigen Punkts
+    sal_uInt16                      nNextPnt;       // Index des naechsten Punkts
     FASTBOOL                    bPrevIsBegPnt;  // Vorheriger Punkt ist Anfangspunkt einer Polyline
     FASTBOOL                    bNextIsEndPnt;  // Folgepunkt ist Endpunkt einer Polyline
-    USHORT                      nPrevPrevPnt;   // Index des vorvorherigen Punkts
-    USHORT                      nNextNextPnt;   // Index des uebernaechsten Punkts
+    sal_uInt16                      nPrevPrevPnt;   // Index des vorvorherigen Punkts
+    sal_uInt16                      nNextNextPnt;   // Index des uebernaechsten Punkts
     FASTBOOL                    bControl;       // Punkt ist ein Kontrollpunkt
     FASTBOOL                    bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
     FASTBOOL                    bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
     FASTBOOL                    bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
     FASTBOOL                    bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
-    USHORT                      nPrevPrevPnt0;
-    USHORT                      nPrevPnt0;
-    USHORT                      nPnt0;
-    USHORT                      nNextPnt0;
-    USHORT                      nNextNextPnt0;
+    sal_uInt16                      nPrevPrevPnt0;
+    sal_uInt16                      nPrevPnt0;
+    sal_uInt16                      nPnt0;
+    sal_uInt16                      nNextPnt0;
+    sal_uInt16                      nNextNextPnt0;
     FASTBOOL                    bEliminate;     // Punkt loeschen? (wird von MovDrag gesetzt)
 
     // ##
-    BOOL                        mbMultiPointDrag;
+    sal_Bool                        mbMultiPointDrag;
     const XPolyPolygon          maOrig;
     XPolyPolygon                maMove;
     Container                   maHandles;
 
 public:
-    ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag);
+    ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag);
     void ResetPoly(const SdrPathObj& rPO);
-    BOOL IsMultiPointDrag() const { return mbMultiPointDrag; }
+    sal_Bool IsMultiPointDrag() const { return mbMultiPointDrag; }
 };
 
-ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag)
+ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag)
 :   aXP(5),
     mbMultiPointDrag(bMuPoDr),
     maOrig(rPO.GetPathPoly()),
@@ -163,11 +163,11 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
         }
 
         maMove = maOrig;
-        bValid = TRUE;
+        bValid = sal_True;
     }
     else
     {
-        bValid=FALSE;
+        bValid=sal_False;
         bClosed=rPO.IsClosed();          // geschlossenes Objekt?
         nPoly=(sal_uInt16)rHdl.GetPolyNum();            // Nummer des Polygons im PolyPolygon
         nPnt=(sal_uInt16)rHdl.GetPointNum();            // Punktnummer innerhalb des obigen Polygons
@@ -192,10 +192,10 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
         if (!bPrevIsBegPnt) nPrevPrevPnt=GetPrevPnt(nPrevPnt,nPntMax,bClosed);
         if (!bNextIsEndPnt) nNextNextPnt=GetNextPnt(nNextPnt,nPntMax,bClosed);
         bControl=rHdl.IsPlusHdl();          // Punkt ist ein Kontrollpunkt
-        bIsPrevControl=FALSE;               // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
-        bIsNextControl=FALSE;               // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
-        bPrevIsControl=FALSE;               // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
-        bNextIsControl=FALSE;               // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
+        bIsPrevControl=sal_False;               // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
+        bIsNextControl=sal_False;               // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+        bPrevIsControl=sal_False;               // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
+        bNextIsControl=sal_False;               // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
         if (bControl) {
             bIsPrevControl=aTmpXP.IsControl(nPrevPnt);
             bIsNextControl=!bIsPrevControl;
@@ -213,9 +213,9 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
         nPnt=2;
         nNextPnt=3;
         nNextNextPnt=4;
-        bEliminate=FALSE;
+        bEliminate=sal_False;
         ResetPoly(rPO);
-        bValid=TRUE;
+        bValid=sal_True;
     }
 }
 
@@ -258,21 +258,21 @@ struct ImpPathCreateUser  : public SdrDragStatUserData
     FASTBOOL                bLine90;
     FASTBOOL                bRect;
     FASTBOOL                bMixedCreate;
-    USHORT                  nBezierStartPoint;
+    sal_uInt16                  nBezierStartPoint;
     SdrObjKind              eStartKind;
     SdrObjKind              eAktKind;
 
 public:
     ImpPathCreateUser(): nCircRadius(0),nCircStWink(0),nCircRelWink(0),
-        bBezier(FALSE),bBezHasCtrl0(FALSE),bCurve(FALSE),bCircle(FALSE),bAngleSnap(FALSE),bLine(FALSE),bLine90(FALSE),bRect(FALSE),
-        bMixedCreate(FALSE),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
+        bBezier(sal_False),bBezHasCtrl0(sal_False),bCurve(sal_False),bCircle(sal_False),bAngleSnap(sal_False),bLine(sal_False),bLine90(sal_False),bRect(sal_False),
+        bMixedCreate(sal_False),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
 
-    void ResetFormFlags() { bBezier=FALSE; bCurve=FALSE; bCircle=FALSE; bLine=FALSE; bRect=FALSE; }
+    void ResetFormFlags() { bBezier=sal_False; bCurve=sal_False; bCircle=sal_False; bLine=sal_False; bRect=sal_False; }
     FASTBOOL IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; }
     XPolygon GetFormPoly() const;
     FASTBOOL CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, FASTBOOL bMouseDown);
     XPolygon GetBezierPoly() const;
-    //FASTBOOL CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return FALSE; }
+    //int CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return sal_False; }
     XPolygon GetCurvePoly() const { return XPolygon(); }
     FASTBOOL CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
     XPolygon GetCirclePoly() const;
@@ -295,7 +295,7 @@ XPolygon ImpPathCreateUser::GetFormPoly() const
 
 FASTBOOL ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, FASTBOOL bMouseDown)
 {
-    FASTBOOL bRet=TRUE;
+    FASTBOOL bRet=sal_True;
     aBezStart=rP1;
     aBezCtrl1=rP1+rDir;
     aBezCtrl2=rP2;
@@ -361,7 +361,7 @@ FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const
         }
     }
     nCircRadius=nRad;
-    if (nRad==0 || Abs(nCircRelWink)<5) bRet=FALSE;
+    if (nRad==0 || Abs(nCircRelWink)<5) bRet=sal_False;
     bCircle=bRet;
     return bRet;
 }
@@ -370,17 +370,17 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const
 {
     if (nCircRelWink>=0) {
         XPolygon aXP(aCircCenter,nCircRadius,nCircRadius,
-                     USHORT((nCircStWink+5)/10),USHORT((nCircStWink+nCircRelWink+5)/10),FALSE);
+                     sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),sal_False);
         aXP[0]=aCircStart; aXP.SetFlags(0,XPOLY_SMOOTH);
         if (!bAngleSnap) aXP[aXP.GetPointCount()-1]=aCircEnd;
         return aXP;
     } else {
         XPolygon aXP(aCircCenter,nCircRadius,nCircRadius,
-                     USHORT(NormAngle360(nCircStWink+nCircRelWink+5)/10),USHORT((nCircStWink+5)/10),FALSE);
-        USHORT nAnz=aXP.GetPointCount();
-        for (USHORT nNum=nAnz/2; nNum>0;) {
+                     sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),sal_False);
+        sal_uInt16 nAnz=aXP.GetPointCount();
+        for (sal_uInt16 nNum=nAnz/2; nNum>0;) {
             nNum--; // XPoly Punktreihenfolge umkehren
-            USHORT n2=nAnz-nNum-1;
+            sal_uInt16 n2=nAnz-nNum-1;
             Point aPt(aXP[nNum]);
             aXP[nNum]=aXP[n2];
             aXP[n2]=aPt;
@@ -417,8 +417,8 @@ FASTBOOL ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const P
 {
     aLineStart=rP1;
     aLineEnd=rP2;
-    bLine90=FALSE;
-    if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=FALSE; return FALSE; }
+    bLine90=sal_False;
+    if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=sal_False; return sal_False; }
     Point aTmpPt(rP2-rP1);
     long nDirX=rDir.X();
     long nDirY=rDir.Y();
@@ -431,8 +431,8 @@ FASTBOOL ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const P
     } else {          // rechtwinkliger Uebergang
         aLineEnd+=aP2;
     }
-    bLine=TRUE;
-    return TRUE;
+    bLine=sal_True;
+    return sal_True;
 }
 
 XPolygon ImpPathCreateUser::GetLinePoly() const
@@ -448,7 +448,7 @@ FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const P
     aRectP1=rP1;
     aRectP2=rP1;
     aRectP3=rP2;
-    if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=FALSE; return FALSE; }
+    if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=sal_False; return sal_False; }
     Point aTmpPt(rP2-rP1);
     long nDirX=rDir.X();
     long nDirY=rDir.Y();
@@ -492,8 +492,8 @@ FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const P
             aRectP3.Y()+=ytemp;
         }
     }
-    bRect=TRUE;
-    return TRUE;
+    bRect=sal_True;
+    return sal_True;
 }
 
 XPolygon ImpPathCreateUser::GetRectPoly() const
@@ -568,12 +568,12 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag )  const
 {
     const SdrHdl* pHdl=rDrag.GetHdl();
     if(!pHdl)
-        return FALSE;
+        return sal_False;
 
-    BOOL bMultiPointDrag(TRUE);
+    sal_Bool bMultiPointDrag(sal_True);
 
     if(aPathPolygon[(sal_uInt16)pHdl->GetPolyNum()].IsControl((sal_uInt16)pHdl->GetPointNum()))
-        bMultiPointDrag = FALSE;
+        bMultiPointDrag = sal_False;
 
     if(bMultiPointDrag)
     {
@@ -594,7 +594,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag )  const
         }
 
         if(nSelectedPoints <= 1)
-            bMultiPointDrag = FALSE;
+            bMultiPointDrag = sal_False;
     }
 
     ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = new ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag);
@@ -632,7 +632,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
                 const XPolygon& rOrig = mpSdrPathDragData->maOrig[nPolyIndex];
                 XPolygon& rMove = mpSdrPathDragData->maMove[nPolyIndex];
                 const sal_uInt16 nPointCount(rOrig.GetPointCount());
-                BOOL bClosed(rOrig[0] == rOrig[nPointCount-1]);
+                sal_Bool bClosed(rOrig[0] == rOrig[nPointCount-1]);
 
                 // move point itself
                 rMove[nPointIndex] = rOrig[nPointIndex] + aDelta;
@@ -670,17 +670,17 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
 
         // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff
         FASTBOOL bClosed       =mpSdrPathDragData->bClosed       ; // geschlossenes Objekt?
-        USHORT   nPnt          =mpSdrPathDragData->nPnt          ; // Punktnummer innerhalb des obigen Polygons
+        sal_uInt16   nPnt          =mpSdrPathDragData->nPnt          ; // Punktnummer innerhalb des obigen Polygons
         FASTBOOL bBegPnt       =mpSdrPathDragData->bBegPnt       ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
         FASTBOOL bEndPnt       =mpSdrPathDragData->bEndPnt       ; // Gedraggter Punkt ist der Endpunkt einer Polyline
-        USHORT   nPrevPnt      =mpSdrPathDragData->nPrevPnt      ; // Index des vorherigen Punkts
-        USHORT   nNextPnt      =mpSdrPathDragData->nNextPnt      ; // Index des naechsten Punkts
+        sal_uInt16   nPrevPnt      =mpSdrPathDragData->nPrevPnt      ; // Index des vorherigen Punkts
+        sal_uInt16   nNextPnt      =mpSdrPathDragData->nNextPnt      ; // Index des naechsten Punkts
         FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline
         FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline
-        USHORT   nPrevPrevPnt  =mpSdrPathDragData->nPrevPrevPnt  ; // Index des vorvorherigen Punkts
-        USHORT   nNextNextPnt  =mpSdrPathDragData->nNextNextPnt  ; // Index des uebernaechsten Punkts
+        sal_uInt16   nPrevPrevPnt  =mpSdrPathDragData->nPrevPrevPnt  ; // Index des vorvorherigen Punkts
+        sal_uInt16   nNextNextPnt  =mpSdrPathDragData->nNextNextPnt  ; // Index des uebernaechsten Punkts
         FASTBOOL bControl      =mpSdrPathDragData->bControl      ; // Punkt ist ein Kontrollpunkt
-        //FASTBOOL bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
+        //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
         FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
         FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
         FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
@@ -690,9 +690,9 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
             FASTBOOL bBigOrtho=rDrag.GetView()->IsBigOrtho();
             Point  aPos(rDrag.GetNow());      // die aktuelle Position
             Point  aPnt(mpSdrPathDragData->aXP[nPnt]);      // der gedraggte Punkt
-            USHORT nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte
+            sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte
             Point  aNeuPos1,aNeuPos2;         // die neuen Alternativen fuer aPos
-            FASTBOOL bPnt1=FALSE,bPnt2=FALSE; // die neuen Alternativen gueltig?
+            FASTBOOL bPnt1=sal_False,bPnt2=sal_False; // die neuen Alternativen gueltig?
             if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { // Mind. 2 Pt bei Linien
                 if (!bBegPnt) nPnt1=nPrevPnt;
                 if (!bEndPnt) nPnt2=nNextPnt;
@@ -710,7 +710,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
                 if (!bHLin || !bVLin) {
                     long ndx=aPos.X()-aPnt1.X();
                     long ndy=aPos.Y()-aPnt1.Y();
-                    bPnt1=TRUE;
+                    bPnt1=sal_True;
                     double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
                     double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
                     FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
@@ -731,7 +731,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
                 if (!bHLin || !bVLin) {
                     long ndx=aPos.X()-aPnt2.X();
                     long ndy=aPos.Y()-aPnt2.Y();
-                    bPnt2=TRUE;
+                    bPnt2=sal_True;
                     double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
                     double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
                     FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
@@ -751,7 +751,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
                 nX1+=nY1; // Korrekturabstand zum Quadrat
                 nX2+=nY2; // Korrekturabstand zum Quadrat
                 // Die Alternative mit dem geringeren Korrekturbedarf gewinnt
-                if (nX1<nX2) bPnt2=FALSE; else bPnt1=FALSE;
+                if (nX1<nX2) bPnt2=sal_False; else bPnt1=sal_False;
             }
             if (bPnt1) rDrag.Now()=aNeuPos1;
             if (bPnt2) rDrag.Now()=aNeuPos2;
@@ -800,8 +800,8 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
 
         // Nun symmetrische PlusHandles etc. checken
         if (bControl) { // Faelle 5,6,7,8
-            USHORT   nSt=nPnt;   // der zugehoerige Stuetzpunkt
-            USHORT   nFix=nPnt;  // der gegenueberliegende Kontrollpunkt
+            sal_uInt16   nSt=nPnt;   // der zugehoerige Stuetzpunkt
+            sal_uInt16   nFix=nPnt;  // der gegenueberliegende Kontrollpunkt
             if (bIsNextControl) { // Wenn der naechste ein Kontrollpunkt ist, muss der vorh. der Stuetzpunkt sein
                 nSt=nPrevPnt;
                 nFix=nPrevPrevPnt;
@@ -976,26 +976,26 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
             mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr);
             aStr += aMetr;
             aStr.AppendAscii(" r=");
-            mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, TRUE);
+            mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True);
             aStr += aMetr;
         }
 
         aStr.AppendAscii("dx=");
-        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, TRUE);
+        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, sal_True);
         aStr += aMetr;
 
         aStr.AppendAscii(" dy=");
-        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, TRUE);
+        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, sal_True);
         aStr += aMetr;
 
         if(!IsFreeHand(meObjectKind))
         {
-            INT32 nLen(GetLen(aNow));
+            sal_Int32 nLen(GetLen(aNow));
             aStr.AppendAscii("  l=");
-            mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE);
+            mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
             aStr += aMetr;
 
-            INT32 nWink(GetAngle(aNow));
+            sal_Int32 nWink(GetAngle(aNow));
             aStr += sal_Unicode(' ');
             mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
             aStr += aMetr;
@@ -1050,19 +1050,19 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
 
         aStr = String();
         aStr.AppendAscii("dx=");
-        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, TRUE);
+        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, sal_True);
         aStr += aMetr;
 
         aStr.AppendAscii(" dy=");
-        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, TRUE);
+        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, sal_True);
         aStr += aMetr;
 
         if(!pDragData->IsMultiPointDrag())
         {
-            UINT16 nPntNum((sal_uInt16)pHdl->GetPointNum());
+            sal_uInt16 nPntNum((sal_uInt16)pHdl->GetPointNum());
             const XPolygon& rXPoly = aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()];
-            UINT16 nPntAnz((sal_uInt16)rXPoly.GetPointCount());
-            BOOL bClose(IsClosed(meObjectKind));
+            sal_uInt16 nPntAnz((sal_uInt16)rXPoly.GetPointCount());
+            sal_Bool bClose(IsClosed(meObjectKind));
 
             if(bClose)
                 nPntAnz--;
@@ -1070,7 +1070,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
             if(pHdl->IsPlusHdl())
             {
                 // Hebel
-                UINT16 nRef(nPntNum);
+                sal_uInt16 nRef(nPntNum);
 
                 if(rXPoly.IsControl(nPntNum + 1))
                     nRef--;
@@ -1079,31 +1079,31 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
 
                 aNow -= rXPoly[nRef];
 
-                INT32 nLen(GetLen(aNow));
+                sal_Int32 nLen(GetLen(aNow));
                 aStr.AppendAscii("  l=");
-                mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE);
+                mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
                 aStr += aMetr;
 
-                INT32 nWink(GetAngle(aNow));
+                sal_Int32 nWink(GetAngle(aNow));
                 aStr += sal_Unicode(' ');
                 mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
                 aStr += aMetr;
             }
             else if(nPntAnz > 1)
             {
-                UINT16 nPntMax(nPntAnz - 1);
+                sal_uInt16 nPntMax(nPntAnz - 1);
                 Point aPt1,aPt2;
-                BOOL bIsClosed(IsClosed(meObjectKind));
-                BOOL bPt1(nPntNum > 0);
-                BOOL bPt2(nPntNum < nPntMax);
+                sal_Bool bIsClosed(IsClosed(meObjectKind));
+                sal_Bool bPt1(nPntNum > 0);
+                sal_Bool bPt2(nPntNum < nPntMax);
 
                 if(bIsClosed && nPntAnz > 2)
                 {
-                    bPt1 = TRUE;
-                    bPt2 = TRUE;
+                    bPt1 = sal_True;
+                    bPt2 = sal_True;
                 }
 
-                UINT16 nPt1,nPt2;
+                sal_uInt16 nPt1,nPt2;
 
                 if(nPntNum > 0)
                     nPt1 = nPntNum - 1;
@@ -1116,22 +1116,22 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
                     nPt2 = 0;
 
                 if(bPt1 && rXPoly.IsControl(nPt1))
-                    bPt1 = FALSE; // Keine Anzeige
+                    bPt1 = sal_False; // Keine Anzeige
 
                 if(bPt2 && rXPoly.IsControl(nPt2))
-                    bPt2 = FALSE; // von Bezierdaten
+                    bPt2 = sal_False; // von Bezierdaten
 
                 if(bPt1)
                 {
                     Point aPt(aNow);
                     aPt -= rXPoly[nPt1];
 
-                    INT32 nLen(GetLen(aPt));
+                    sal_Int32 nLen(GetLen(aPt));
                     aStr.AppendAscii("  l=");
-                    mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE);
+                    mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
                     aStr += aMetr;
 
-                    INT32 nWink(GetAngle(aPt));
+                    sal_Int32 nWink(GetAngle(aPt));
                     aStr += sal_Unicode(' ');
                     mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
                     aStr += aMetr;
@@ -1147,12 +1147,12 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
                     Point aPt(aNow);
                     aPt -= rXPoly[nPt2];
 
-                    INT32 nLen(GetLen(aPt));
+                    sal_Int32 nLen(GetLen(aPt));
                     aStr.AppendAscii("l=");
-                    mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE);
+                    mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
                     aStr += aMetr;
 
-                    INT32 nWink(GetAngle(aPt));
+                    sal_Int32 nWink(GetAngle(aPt));
                     aStr += sal_Unicode(' ');
                     mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
                     aStr += aMetr;
@@ -1189,18 +1189,18 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
         }
         // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff
         FASTBOOL bClosed       =mpSdrPathDragData->bClosed       ; // geschlossenes Objekt?
-        USHORT   nPntAnz       =mpSdrPathDragData->nPntAnz       ; // Punktanzahl
-        USHORT   nPnt          =mpSdrPathDragData->nPnt          ; // Punktnummer innerhalb des Polygons
+        sal_uInt16   nPntAnz       =mpSdrPathDragData->nPntAnz       ; // Punktanzahl
+        sal_uInt16   nPnt          =mpSdrPathDragData->nPnt          ; // Punktnummer innerhalb des Polygons
         FASTBOOL bBegPnt       =mpSdrPathDragData->bBegPnt       ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
         FASTBOOL bEndPnt       =mpSdrPathDragData->bEndPnt       ; // Gedraggter Punkt ist der Endpunkt einer Polyline
-        USHORT   nPrevPnt      =mpSdrPathDragData->nPrevPnt      ; // Index des vorherigen Punkts
-        USHORT   nNextPnt      =mpSdrPathDragData->nNextPnt      ; // Index des naechsten Punkts
+        sal_uInt16   nPrevPnt      =mpSdrPathDragData->nPrevPnt      ; // Index des vorherigen Punkts
+        sal_uInt16   nNextPnt      =mpSdrPathDragData->nNextPnt      ; // Index des naechsten Punkts
         FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline
         FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline
-        USHORT   nPrevPrevPnt  =mpSdrPathDragData->nPrevPrevPnt  ; // Index des vorvorherigen Punkts
-        USHORT   nNextNextPnt  =mpSdrPathDragData->nNextNextPnt  ; // Index des uebernaechsten Punkts
+        sal_uInt16   nPrevPrevPnt  =mpSdrPathDragData->nPrevPrevPnt  ; // Index des vorvorherigen Punkts
+        sal_uInt16   nNextNextPnt  =mpSdrPathDragData->nNextNextPnt  ; // Index des uebernaechsten Punkts
         FASTBOOL bControl      =mpSdrPathDragData->bControl      ; // Punkt ist ein Kontrollpunkt
-        //FASTBOOL bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
+        //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
         FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
         FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
         FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
@@ -1264,7 +1264,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
             }
             if (bClosed) { // "Birnenproblem": 2 Linien, 1 Kurve, alles Smooth, Punkt zw. beiden Linien wird gedraggt
                 if (aXPoly.GetPointCount()>nPntAnz && aXPoly.IsControl(1)) {
-                    USHORT a=aXPoly.GetPointCount();
+                    sal_uInt16 a=aXPoly.GetPointCount();
                     aXPoly[a-2]=aXPoly[2]; aXPoly.SetFlags(a-2,aXPoly.GetFlags(2));
                     aXPoly[a-1]=aXPoly[3]; aXPoly.SetFlags(a-1,aXPoly.GetFlags(3));
                     aXPoly.Remove(0,3);
@@ -1287,12 +1287,12 @@ FASTBOOL ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat)
     rStat.SetNoSnap(bFreeHand);
     rStat.SetOrtho8Possible();
     aPathPolygon.Clear();
-    mbCreating=TRUE;
-    FASTBOOL bMakeStartPoint=TRUE;
+    mbCreating=sal_True;
+    FASTBOOL bMakeStartPoint=sal_True;
     SdrView* pView=rStat.GetView();
     if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() &&
         (meObjectKind==OBJ_POLY || meObjectKind==OBJ_PLIN || meObjectKind==OBJ_PATHLINE || meObjectKind==OBJ_PATHFILL)) {
-        bMakeStartPoint=FALSE;
+        bMakeStartPoint=sal_False;
     }
     aPathPolygon.Insert(XPolygon());
     aPathPolygon[0][0]=rStat.GetStart();
@@ -1303,7 +1303,7 @@ FASTBOOL ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat)
     pU->eStartKind=meObjectKind;
     pU->eAktKind=meObjectKind;
     rStat.SetUser(pU);
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
@@ -1313,8 +1313,8 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
     XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
     if (pView!=NULL && pView->IsCreateMode()) {
         // ggf. auf anderes CreateTool umschalten
-        UINT16 nIdent;
-        UINT32 nInvent;
+        sal_uInt16 nIdent;
+        sal_uInt32 nInvent;
         pView->TakeCurrentObj(nIdent,nInvent);
         if (nInvent==SdrInventor && pU->eAktKind!=(SdrObjKind)nIdent) {
             SdrObjKind eNewKind=(SdrObjKind)nIdent;
@@ -1326,7 +1326,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
                 case OBJ_FREELINE: case OBJ_FREEFILL:
                 case OBJ_SPLNLINE: case OBJ_SPLNFILL: {
                     pU->eAktKind=eNewKind;
-                    pU->bMixedCreate=TRUE;
+                    pU->bMixedCreate=sal_True;
                     pU->nBezierStartPoint=rXPoly.GetPointCount();
                     if (pU->nBezierStartPoint>0) pU->nBezierStartPoint--;
                 } break;
@@ -1334,7 +1334,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
             } // switch
         }
     }
-    USHORT nActPoint=rXPoly.GetPointCount();
+    sal_uInt16 nActPoint=rXPoly.GetPointCount();
     if (aPathPolygon.Count()>1 && rStat.IsMouseDown() && nActPoint<2) {
         rXPoly[0]=rStat.GetPos0();
         rXPoly[1]=rStat.GetNow();
@@ -1370,7 +1370,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
             Point aPt1(rStat.Now());
             long dx=aPt0.X()-aPt1.X(); if (dx<0) dx=-dx;
             long dy=aPt0.Y()-aPt1.Y(); if (dy<0) dy=-dy;
-            if (dx<nMinDist && dy<nMinDist) return FALSE;
+            if (dx<nMinDist && dy<nMinDist) return sal_False;
 
             // folgendes ist aus EndCreate kopiert (nur kleine Modifikationen)
             // und sollte dann mal in eine Methode zusammengefasst werden:
@@ -1410,24 +1410,24 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
         pU->CalcRect(rXPoly[nActPoint-1],rXPoly[nActPoint],rXPoly[nActPoint-1]-rXPoly[nActPoint-2],pView);
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     SdrView* pView=rStat.GetView();
     FASTBOOL bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface();
     XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
-    USHORT nActPoint=rXPoly.GetPointCount()-1;
+    sal_uInt16 nActPoint=rXPoly.GetPointCount()-1;
     Point aAktMerk(rXPoly[nActPoint]);
     rXPoly[nActPoint]=rStat.Now();
     if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE) {
         if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND;
         bRet=eCmd==SDRCREATE_FORCEEND;
         if (bRet) {
-            mbCreating=FALSE;
+            mbCreating=sal_False;
             delete pU;
             rStat.SetUser(NULL);
         }
@@ -1438,7 +1438,7 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
         if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND;
         bRet=eCmd==SDRCREATE_FORCEEND;
         if (bRet) {
-            mbCreating=FALSE;
+            mbCreating=sal_False;
             delete pU;
             rStat.SetUser(NULL);
         }
@@ -1462,15 +1462,15 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
             } else {
                 if (nActPoint==1 && IsBezier(pU->eAktKind) && !pU->bBezHasCtrl0) {
                     pU->aBezControl0=rStat.GetNow();;
-                    pU->bBezHasCtrl0=TRUE;
+                    pU->bBezHasCtrl0=sal_True;
                     nActPoint--;
                 }
                 if (pU->IsFormFlag()) {
-                    USHORT nPtAnz0=rXPoly.GetPointCount();
+                    sal_uInt16 nPtAnz0=rXPoly.GetPointCount();
                     rXPoly.Remove(nActPoint-1,2); // die letzten beiden Punkte entfernen und durch die Form ersetzen
                     rXPoly.Insert(XPOLY_APPEND,pU->GetFormPoly());
-                    USHORT nPtAnz1=rXPoly.GetPointCount();
-                    for (USHORT i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert
+                    sal_uInt16 nPtAnz1=rXPoly.GetPointCount();
+                    for (sal_uInt16 i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert
                         if (!rXPoly.IsControl(i)) rStat.NextPoint();
                     }
                     nActPoint=rXPoly.GetPointCount()-1;
@@ -1481,7 +1481,7 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
         }
         if (eCmd==SDRCREATE_NEXTOBJECT) {
             if (rXPoly.GetPointCount()>=2) {
-                pU->bBezHasCtrl0=FALSE;
+                pU->bBezHasCtrl0=sal_False;
                 // nur einzelnes Polygon kann offen sein, deshalb schliessen
                 rXPoly[nActPoint]=rXPoly[0];
                 XPolygon aXP;
@@ -1491,12 +1491,12 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
         }
     }
 
-    USHORT nPolyAnz=aPathPolygon.Count();
+    sal_uInt16 nPolyAnz=aPathPolygon.Count();
     if (nPolyAnz!=0) {
         // den letzten Punkt ggf. wieder loeschen
         if (eCmd==SDRCREATE_FORCEEND) {
             XPolygon& rXP=aPathPolygon[nPolyAnz-1];
-            USHORT nPtAnz=rXP.GetPointCount();
+            sal_uInt16 nPtAnz=rXP.GetPointCount();
             if (nPtAnz>=2) {
                 if (!rXP.IsControl(nPtAnz-2)) {
                     if (rXP[nPtAnz-1]==rXP[nPtAnz-2]) {
@@ -1509,10 +1509,10 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
                 }
             }
         }
-        for (USHORT nPolyNum=nPolyAnz; nPolyNum>0;) {
+        for (sal_uInt16 nPolyNum=nPolyAnz; nPolyNum>0;) {
             nPolyNum--;
             XPolygon& rXP=aPathPolygon[nPolyNum];
-            USHORT nPtAnz=rXP.GetPointCount();
+            sal_uInt16 nPtAnz=rXP.GetPointCount();
             // Polygone mit zu wenig Punkten werden geloescht
             if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) {
                 if (nPtAnz<2) aPathPolygon.Remove(nPolyNum);
@@ -1522,7 +1522,7 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
     pU->ResetFormFlags();
     bRet=eCmd==SDRCREATE_FORCEEND;
     if (bRet) {
-        mbCreating=FALSE;
+        mbCreating=sal_False;
         delete pU;
         rStat.SetUser(NULL);
     }
@@ -1534,7 +1534,7 @@ FASTBOOL ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat)
     ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
     if (aPathPolygon.Count()>0) {
         XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
-        USHORT nActPoint=rXPoly.GetPointCount();
+        sal_uInt16 nActPoint=rXPoly.GetPointCount();
         if (nActPoint>0) {
             nActPoint--;
             // Das letzte Stueck einer Bezierkurve wird erstmal zu 'ner Linie
@@ -1558,7 +1558,7 @@ FASTBOOL ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat)
         }
         if (aPathPolygon.Count()>0) {
             XPolygon& rLocalXPoly=aPathPolygon[aPathPolygon.Count()-1];
-            USHORT nLocalActPoint=rLocalXPoly.GetPointCount();
+            sal_uInt16 nLocalActPoint=rLocalXPoly.GetPointCount();
             if (nLocalActPoint>0) {
                 nLocalActPoint--;
                 rLocalXPoly[nLocalActPoint]=rStat.Now();
@@ -1573,7 +1573,7 @@ void ImpPathForDragAndCreate::BrkCreate(SdrDragStat& rStat)
 {
     ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
     aPathPolygon.Clear();
-    mbCreating=FALSE;
+    mbCreating=sal_False;
     delete pU;
     rStat.SetUser(NULL);
 }
@@ -1844,7 +1844,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
             default: break;
         }
 
-        bClosedObj = TRUE;
+        bClosedObj = sal_True;
     }
     else
     {
@@ -1857,7 +1857,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
             default: break;
         }
 
-        bClosedObj = FALSE;
+        bClosedObj = sal_False;
     }
 
     ImpForceKind();
@@ -1865,20 +1865,20 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
 
 void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bNoContortion=FALSE;
+    rInfo.bNoContortion=sal_False;
 
     FASTBOOL bCanConv = !HasText() || ImpCanConvTextToCurve();
     FASTBOOL bIsPath = IsBezier() || IsSpline();
 
-    rInfo.bEdgeRadiusAllowed    = FALSE;
+    rInfo.bEdgeRadiusAllowed    = sal_False;
     rInfo.bCanConvToPath = bCanConv && !bIsPath;
     rInfo.bCanConvToPoly = bCanConv && bIsPath;
     rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrPathObj::GetObjIdentifier() const
+sal_uInt16 SdrPathObj::GetObjIdentifier() const
 {
-    return USHORT(meKind);
+    return sal_uInt16(meKind);
 }
 
 void SdrPathObj::operator=(const SdrObject& rObj)
@@ -2060,16 +2060,16 @@ void SdrPathObj::AddToHdlList(SdrHdlList& rHdlList) const
 {
     // keep old stuff to be able to keep old SdrHdl stuff, too
     const XPolyPolygon aOldPathPolygon(GetPathPoly());
-    USHORT nPolyCnt=aOldPathPolygon.Count();
+    sal_uInt16 nPolyCnt=aOldPathPolygon.Count();
     FASTBOOL bClosed=IsClosed();
-    USHORT nIdx=0;
+    sal_uInt16 nIdx=0;
 
-    for (USHORT i=0; i<nPolyCnt; i++) {
+    for (sal_uInt16 i=0; i<nPolyCnt; i++) {
         const XPolygon& rXPoly=aOldPathPolygon.GetObject(i);
-        USHORT nPntCnt=rXPoly.GetPointCount();
+        sal_uInt16 nPntCnt=rXPoly.GetPointCount();
         if (bClosed && nPntCnt>1) nPntCnt--;
 
-        for (USHORT j=0; j<nPntCnt; j++) {
+        for (sal_uInt16 j=0; j<nPntCnt; j++) {
             if (rXPoly.GetFlags(j)!=XPOLY_CONTROL) {
                 const Point& rPnt=rXPoly[j];
                 SdrHdl* pHdl=new SdrHdl(rPnt,HDL_POLY);
@@ -2153,7 +2153,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const
                 }
 
                 pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum());
-                pHdl->SetPlusHdl(TRUE);
+                pHdl->SetPlusHdl(sal_True);
             }
         }
     }
@@ -2479,7 +2479,7 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const
     sal_uInt32 nPoly,nPnt;
     if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt, nPoly, nPnt))
     {
-        DBG_ASSERT(FALSE,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!");
+        DBG_ASSERT(sal_False,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!");
     }
 
     const basegfx::B2DPoint aB2DPoint(GetPathPoly().getB2DPolygon(nPoly).getB2DPoint(nPnt));
@@ -2739,7 +2739,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index)
     return pNewObj;
 }
 
-SdrObject* SdrPathObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     // #i89784# check for FontWork with activated HideContour
     const drawinglayer::attribute::SdrTextAttribute aText(
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 84dab2cfb165..c6202b825561 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -79,14 +79,14 @@ TYPEINIT1(SdrRectObj,SdrTextObj);
 SdrRectObj::SdrRectObj()
 :   mpXPoly(0L)
 {
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
 SdrRectObj::SdrRectObj(const Rectangle& rRect)
 :   SdrTextObj(rRect),
     mpXPoly(NULL)
 {
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
 SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
@@ -96,7 +96,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
                "SdrRectObj::SdrRectObj(SdrObjKind) ist nur fuer Textrahmen gedacht");
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
 SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
@@ -106,17 +106,17 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
                "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht");
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
-SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 :    SdrTextObj(eNewTextKind,rNewRect,rInput,rBaseURL,eFormat),
     mpXPoly(NULL)
 {
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
                "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht");
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
 SdrRectObj::~SdrRectObj()
@@ -185,22 +185,22 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
     FASTBOOL bNoTextFrame=!IsTextFrame();
     rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=TRUE;
-    rInfo.bRotate90Allowed  =TRUE;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_True;
+    rInfo.bRotate90Allowed  =sal_True;
     rInfo.bMirrorFreeAllowed=bNoTextFrame;
     rInfo.bMirror45Allowed  =bNoTextFrame;
     rInfo.bMirror90Allowed  =bNoTextFrame;
 
     // allow transparence
-    rInfo.bTransparenceAllowed = TRUE;
+    rInfo.bTransparenceAllowed = sal_True;
 
     // gradient depends on fillstyle
     XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
     rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
 
     rInfo.bShearAllowed     =bNoTextFrame;
-    rInfo.bEdgeRadiusAllowed=TRUE;
+    rInfo.bEdgeRadiusAllowed=sal_True;
 
     FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve();
     if (bCanConv && !bNoTextFrame && !HasText()) {
@@ -211,10 +211,10 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrRectObj::GetObjIdentifier() const
+sal_uInt16 SdrRectObj::GetObjIdentifier() const
 {
-    if (IsTextFrame()) return UINT16(eTextKind);
-    else return UINT16(OBJ_RECT);
+    if (IsTextFrame()) return sal_uInt16(eTextKind);
+    else return sal_uInt16(OBJ_RECT);
 }
 
 void SdrRectObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
@@ -243,7 +243,7 @@ void SdrRectObj::TakeObjNameSingul(XubString& rName) const
     }
     else
     {
-        USHORT nResId=STR_ObjNameSingulRECT;
+        sal_uInt16 nResId=STR_ObjNameSingulRECT;
         if (aGeo.nShearWink!=0) {
             nResId+=4;  // Parallelogramm oder Raute
             // Raute ist nicht, weil Shear die vertikalen Kanten verlaengert!
@@ -269,7 +269,7 @@ void SdrRectObj::TakeObjNamePlural(XubString& rName) const
 {
     if (IsTextFrame()) SdrTextObj::TakeObjNamePlural(rName);
     else {
-        USHORT nResId=STR_ObjNamePluralRECT;
+        sal_uInt16 nResId=STR_ObjNamePluralRECT;
         if (aGeo.nShearWink!=0) {
             nResId+=4;  // Parallelogramm oder Raute
         } else {
@@ -531,9 +531,9 @@ XubString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
     return SdrTextObj::GetMacroPopupComment(rRec);
 }
 
-SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const
 {
-    INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
 
     // #i25616#
     if(!LineIsOutsideGeometry())
@@ -553,13 +553,13 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const
     if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
-SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
 {
-    INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
 
     // #i25616#
     if(!LineIsOutsideGeometry())
@@ -579,11 +579,11 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const
     if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
-SdrObject* SdrRectObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius()));
     { // #40608# Nur Uebergangsweise bis zum neuen TakeContour()
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index f10e3bf33fc3..7c0d7e6568af 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -116,15 +116,15 @@ SdrTextObj::SdrTextObj()
     pFormTextBoundRect(NULL),
     eTextKind(OBJ_TEXT)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=FALSE;
-    bNoShear=FALSE;
-    bNoRotate=FALSE;
-    bNoMirror=FALSE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_False;
+    bNoShear=sal_False;
+    bNoRotate=sal_False;
+    bNoMirror=sal_False;
+    bDisableAutoWidthOnDragging=sal_False;
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -146,16 +146,16 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
     pEdtOutl(NULL),
     pFormTextBoundRect(NULL)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=FALSE;
-    bNoShear=FALSE;
-    bNoRotate=FALSE;
-    bNoMirror=FALSE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_False;
+    bNoShear=sal_False;
+    bNoRotate=sal_False;
+    bNoMirror=sal_False;
+    bDisableAutoWidthOnDragging=sal_False;
     ImpJustifyRect(aRect);
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -177,15 +177,15 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
     pFormTextBoundRect(NULL),
     eTextKind(eNewTextKind)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=TRUE;
-    bNoShear=TRUE;
-    bNoRotate=FALSE;
-    bNoMirror=TRUE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_True;
+    bNoShear=sal_True;
+    bNoRotate=sal_False;
+    bNoMirror=sal_True;
+    bDisableAutoWidthOnDragging=sal_False;
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -208,16 +208,16 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
     pFormTextBoundRect(NULL),
     eTextKind(eNewTextKind)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=TRUE;
-    bNoShear=TRUE;
-    bNoRotate=FALSE;
-    bNoMirror=TRUE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_True;
+    bNoShear=sal_True;
+    bNoRotate=sal_False;
+    bNoMirror=sal_True;
+    bDisableAutoWidthOnDragging=sal_False;
     ImpJustifyRect(aRect);
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -232,7 +232,7 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
     mbSupportTextIndentingOnLineWidthChange = sal_True;
 }
 
-SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 :   SdrAttrObj(),
     aRect(rNewRect),
     mpText(NULL),
@@ -240,18 +240,18 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr
     pFormTextBoundRect(NULL),
     eTextKind(eNewTextKind)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=TRUE;
-    bNoShear=TRUE;
-    bNoRotate=FALSE;
-    bNoMirror=TRUE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_True;
+    bNoShear=sal_True;
+    bNoRotate=sal_False;
+    bNoMirror=sal_True;
+    bDisableAutoWidthOnDragging=sal_False;
     ImpJustifyRect(aRect);
 
     NbcSetText(rInput, rBaseURL, eFormat);
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -294,7 +294,7 @@ void SdrTextObj::FitFrameToTextSize()
     {
         SdrOutliner& rOutliner=ImpGetDrawOutliner();
         rOutliner.SetPaperSize(Size(aRect.Right()-aRect.Left(),aRect.Bottom()-aRect.Top()));
-        rOutliner.SetUpdateMode(TRUE);
+        rOutliner.SetUpdateMode(sal_True);
         rOutliner.SetText(*pText->GetOutlinerParaObject());
         Rectangle aTextRect;
         Size aNewSize(rOutliner.CalcTextSize());
@@ -316,7 +316,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
     SdrOutliner& rOutliner=ImpGetDrawOutliner();
     rOutliner.SetStyleSheet( 0, GetStyleSheet());
     //OutputDevice* pRef1=rOutliner.GetRefDevice();
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 ));
     OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
     Size aSiz(rOutliner.CalcTextSize());
@@ -324,7 +324,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
     rOutliner.Clear();
     NbcSetOutlinerParaObject(pNewText);
     aTextSize=aSiz;
-    bTextSizeDirty=FALSE;
+    bTextSizeDirty=sal_False;
 }
 
 void SdrTextObj::SetText(const XubString& rStr)
@@ -340,21 +340,21 @@ void SdrTextObj::SetText(const XubString& rStr)
     //}
 }
 
-void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 {
     SdrOutliner& rOutliner=ImpGetDrawOutliner();
     rOutliner.SetStyleSheet( 0, GetStyleSheet());
     rOutliner.Read(rInput,rBaseURL,eFormat);
     OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     Size aSiz(rOutliner.CalcTextSize());
     rOutliner.Clear();
     NbcSetOutlinerParaObject(pNewText);
     aTextSize=aSiz;
-    bTextSizeDirty=FALSE;
+    bTextSizeDirty=sal_False;
 }
 
-void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
     // #110094#-14 SendRepaintBroadcast();
@@ -374,13 +374,13 @@ const Size& SdrTextObj::GetTextSize() const
         {
             SdrOutliner& rOutliner=ImpGetDrawOutliner();
             rOutliner.SetText(*pText->GetOutlinerParaObject());
-            rOutliner.SetUpdateMode(TRUE);
+            rOutliner.SetUpdateMode(sal_True);
             aSiz=rOutliner.CalcTextSize();
             rOutliner.Clear();
         }
         // 2x casting auf nonconst
         ((SdrTextObj*)this)->aTextSize=aSiz;
-        ((SdrTextObj*)this)->bTextSizeDirty=FALSE;
+        ((SdrTextObj*)this)->bTextSizeDirty=sal_False;
     }
     return aTextSize;
 }
@@ -388,10 +388,10 @@ const Size& SdrTextObj::GetTextSize() const
 FASTBOOL SdrTextObj::IsAutoGrowHeight() const
 {
     if(!bTextFrame)
-        return FALSE; // AutoGrow nur bei TextFrames
+        return sal_False; // AutoGrow nur bei TextFrames
 
     const SfxItemSet& rSet = GetObjectItemSet();
-    BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
+    sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
 
     if(bRet)
     {
@@ -403,7 +403,7 @@ FASTBOOL SdrTextObj::IsAutoGrowHeight() const
 
             if(eDirection == SDRTEXTANI_UP || eDirection == SDRTEXTANI_DOWN)
             {
-                bRet = FALSE;
+                bRet = sal_False;
             }
         }
     }
@@ -413,13 +413,13 @@ FASTBOOL SdrTextObj::IsAutoGrowHeight() const
 FASTBOOL SdrTextObj::IsAutoGrowWidth() const
 {
     if(!bTextFrame)
-        return FALSE; // AutoGrow nur bei TextFrames
+        return sal_False; // AutoGrow nur bei TextFrames
 
     const SfxItemSet& rSet = GetObjectItemSet();
-    BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
+    sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
 
     // #101684#
-    BOOL bInEditMOde = IsInEditMode();
+    sal_Bool bInEditMOde = IsInEditMode();
 
     if(!bInEditMOde && bRet)
     {
@@ -431,7 +431,7 @@ FASTBOOL SdrTextObj::IsAutoGrowWidth() const
 
             if(eDirection == SDRTEXTANI_LEFT || eDirection == SDRTEXTANI_RIGHT)
             {
-                bRet = FALSE;
+                bRet = sal_False;
             }
         }
     }
@@ -451,7 +451,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co
     SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
 
     // #101684#
-    BOOL bInEditMode = IsInEditMode();
+    sal_Bool bInEditMode = IsInEditMode();
 
     if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK)
     {
@@ -483,7 +483,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons
 
     // #103516# Take care for vertical text animation here
     SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
-    BOOL bInEditMode = IsInEditMode();
+    sal_Bool bInEditMode = IsInEditMode();
 
     // #103516# Take care for vertical text animation here
     if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK)
@@ -525,21 +525,21 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
     FASTBOOL bNoTextFrame=!IsTextFrame();
     rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=TRUE;
-    rInfo.bRotate90Allowed  =TRUE;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_True;
+    rInfo.bRotate90Allowed  =sal_True;
     rInfo.bMirrorFreeAllowed=bNoTextFrame;
     rInfo.bMirror45Allowed  =bNoTextFrame;
     rInfo.bMirror90Allowed  =bNoTextFrame;
 
     // allow transparence
-    rInfo.bTransparenceAllowed = TRUE;
+    rInfo.bTransparenceAllowed = sal_True;
 
     // gradient depends on fillstyle
     XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
     rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
     rInfo.bShearAllowed     =bNoTextFrame;
-    rInfo.bEdgeRadiusAllowed=TRUE;
+    rInfo.bEdgeRadiusAllowed=sal_True;
     FASTBOOL bCanConv=ImpCanConvTextToCurve();
     rInfo.bCanConvToPath    =bCanConv;
     rInfo.bCanConvToPoly    =bCanConv;
@@ -548,9 +548,9 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrTextObj::GetObjIdentifier() const
+sal_uInt16 SdrTextObj::GetObjIdentifier() const
 {
-    return USHORT(eTextKind);
+    return sal_uInt16(eTextKind);
 }
 
 bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
@@ -559,7 +559,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
     if(pOutliner)
     {
         Paragraph* p1stPara=pOutliner->GetParagraph( 0 );
-        ULONG nParaAnz=pOutliner->GetParagraphCount();
+        sal_uIntPtr nParaAnz=pOutliner->GetParagraphCount();
         if(p1stPara==NULL)
             nParaAnz=0;
 
@@ -635,7 +635,7 @@ void SdrTextObj::SetModel(SdrModel* pNewModel)
 FASTBOOL SdrTextObj::NbcSetEckenradius(long nRad)
 {
     SetObjectItem(SdrEckenradiusItem(nRad));
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
@@ -643,9 +643,9 @@ FASTBOOL SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
     if(bTextFrame)
     {
         SetObjectItem(SdrTextAutoGrowHeightItem(bAuto));
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 FASTBOOL SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
@@ -658,13 +658,13 @@ FASTBOOL SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
         // bDisableAutoHeightOnDragging if vertical.
         if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
         {
-            bDisableAutoWidthOnDragging = FALSE;
-            SetObjectItem(SdrTextAutoGrowHeightItem(FALSE));
+            bDisableAutoWidthOnDragging = sal_False;
+            SetObjectItem(SdrTextAutoGrowHeightItem(sal_False));
         }
 
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 FASTBOOL SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt)
@@ -672,9 +672,9 @@ FASTBOOL SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt)
     if(bTextFrame)
     {
         SetObjectItem(SdrTextMaxFrameHeightItem(nHgt));
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 FASTBOOL SdrTextObj::NbcSetAutoGrowWidth(bool bAuto)
@@ -682,9 +682,9 @@ FASTBOOL SdrTextObj::NbcSetAutoGrowWidth(bool bAuto)
     if(bTextFrame)
     {
         SetObjectItem(SdrTextAutoGrowWidthItem(bAuto));
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 FASTBOOL SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
@@ -697,13 +697,13 @@ FASTBOOL SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
         // when not vertical.
         if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
         {
-            bDisableAutoWidthOnDragging = FALSE;
-            SetObjectItem(SdrTextAutoGrowWidthItem(FALSE));
+            bDisableAutoWidthOnDragging = sal_False;
+            SetObjectItem(SdrTextAutoGrowWidthItem(sal_False));
         }
 
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 FASTBOOL SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt)
@@ -711,9 +711,9 @@ FASTBOOL SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt)
     if(bTextFrame)
     {
         SetObjectItem(SdrTextMaxFrameWidthItem(nWdt));
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 FASTBOOL SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit)
@@ -721,12 +721,12 @@ FASTBOOL SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit)
     if(bTextFrame)
     {
         SetObjectItem(SdrTextFitToSizeTypeItem(eFit));
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const
+void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const
 {
     basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly());
     basegfx::B2DPolyPolygon* pContourPolyPolygon = 0L;
@@ -761,7 +761,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
         {
             // #86258# force shadow off
             SdrObject* pCopy = Clone();
-            pCopy->SetMergedItem(SdrShadowItem(FALSE));
+            pCopy->SetMergedItem(SdrShadowItem(sal_False));
             *pContourPolyPolygon = pCopy->TakeContour();
             SdrObject::Free( pCopy );
         }
@@ -825,7 +825,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
 }
 
 void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText,
-                               Rectangle* pAnchorRect, BOOL bLineWidth ) const
+                               Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
 {
     Rectangle aAnkRect; // Rect innerhalb dem geankert wird
     TakeTextAnchorRect(aAnkRect);
@@ -839,7 +839,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
     FASTBOOL bContourFrame=IsContourTextFrame();
 
     FASTBOOL bFrame=IsTextFrame();
-    ULONG nStat0=rOutliner.GetControlWord();
+    sal_uIntPtr nStat0=rOutliner.GetControlWord();
     Size aNullSize;
     if (!bContourFrame)
     {
@@ -858,7 +858,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
             long nHgt=nAnkHgt;
 
             // #101684#
-            BOOL bInEditMode = IsInEditMode();
+            sal_Bool bInEditMode = IsInEditMode();
 
             if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
             {
@@ -893,7 +893,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
 
     if (pPara)
     {
-        BOOL bHitTest = FALSE;
+        sal_Bool bHitTest = sal_False;
         if( pModel )
             bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
 
@@ -907,7 +907,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
                 rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
             }
 
-            rOutliner.SetUpdateMode(TRUE);
+            rOutliner.SetUpdateMode(sal_True);
             rOutliner.SetText(*pPara);
         }
     }
@@ -919,7 +919,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
     if (pEdtOutl && !bNoEditText && pPara)
         delete pPara;
 
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetControlWord(nStat0);
 
     if( pText )
@@ -999,7 +999,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const
 void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& rTextRect, const Rectangle& rAnchorRect, Fraction& rFitXKorreg) const
 {
     OutputDevice* pOut = rOutliner.GetRefDevice();
-    BOOL bNoStretching(FALSE);
+    sal_Bool bNoStretching(sal_False);
 
     if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER)
     {
@@ -1011,7 +1011,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r
             pMtf = NULL;
 
         if(pMtf)
-            pMtf->Pause(TRUE);
+            pMtf->Pause(sal_True);
 
         Font aFontMerk(pOut->GetFont());
         Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) );
@@ -1025,7 +1025,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r
         pOut->SetFont(aFontMerk);
 
         if(pMtf)
-            pMtf->Pause(FALSE);
+            pMtf->Pause(sal_False);
 
         bNoStretching = (aSize1 == aSize2);
 
@@ -1034,12 +1034,12 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r
         // Und das finden wir nicht so schoen.
         if(aSize2.Height() >= aSize1.Height() * 2)
         {
-            bNoStretching = TRUE;
+            bNoStretching = sal_True;
         }
 #endif
     }
     unsigned nLoopCount=0;
-    FASTBOOL bNoMoreLoop=FALSE;
+    FASTBOOL bNoMoreLoop=sal_False;
     long nXDiff0=0x7FFFFFFF;
     long nWantWdt=rAnchorRect.Right()-rAnchorRect.Left();
     long nIsWdt=rTextRect.Right()-rTextRect.Left();
@@ -1055,43 +1055,43 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r
 
     long nX=(nWantWdt*100) /nIsWdt; // X-Stretching berechnen
     long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen
-    FASTBOOL bChkX=TRUE;
-    FASTBOOL bChkY=TRUE;
+    FASTBOOL bChkX=sal_True;
+    FASTBOOL bChkY=sal_True;
     if (bNoStretching) { // #35762# evtl. nur proportional moeglich
-        if (nX>nY) { nX=nY; bChkX=FALSE; }
-        else { nY=nX; bChkY=FALSE; }
+        if (nX>nY) { nX=nY; bChkX=sal_False; }
+        else { nY=nX; bChkY=sal_False; }
     }
 
     while (nLoopCount<5 && !bNoMoreLoop) {
         if (nX<0) nX=-nX;
-        if (nX<1) { nX=1; bNoMoreLoop=TRUE; }
-        if (nX>65535) { nX=65535; bNoMoreLoop=TRUE; }
+        if (nX<1) { nX=1; bNoMoreLoop=sal_True; }
+        if (nX>65535) { nX=65535; bNoMoreLoop=sal_True; }
 
         if (nY<0) nY=-nY;
-        if (nY<1) { nY=1; bNoMoreLoop=TRUE; }
-        if (nY>65535) { nY=65535; bNoMoreLoop=TRUE; }
+        if (nY<1) { nY=1; bNoMoreLoop=sal_True; }
+        if (nY>65535) { nY=65535; bNoMoreLoop=sal_True; }
 
         // exception, there is no text yet (horizontal case)
         if(nIsWdt <= 1)
         {
             nX = nY;
-            bNoMoreLoop = TRUE;
+            bNoMoreLoop = sal_True;
         }
 
         // #87877# exception, there is no text yet (vertical case)
         if(nIsHgt <= 1)
         {
             nY = nX;
-            bNoMoreLoop = TRUE;
+            bNoMoreLoop = sal_True;
         }
 
-        rOutliner.SetGlobalCharStretching((USHORT)nX,(USHORT)nY);
+        rOutliner.SetGlobalCharStretching((sal_uInt16)nX,(sal_uInt16)nY);
         nLoopCount++;
         Size aSiz(rOutliner.CalcTextSize());
         long nXDiff=aSiz.Width()-nWantWdt;
         rFitXKorreg=Fraction(nWantWdt,aSiz.Width());
         if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0/*&& Abs(nYDiff)<=nYTol*/) {
-            bNoMoreLoop=TRUE;
+            bNoMoreLoop=sal_True;
         } else {
             // Stretchingfaktoren korregieren
             long nMul=nWantWdt;
@@ -1272,7 +1272,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
 
         Rectangle aAnchor2;
         Rectangle aR;
-        TakeTextRect(rOutliner,aR,FALSE,&aAnchor2);
+        TakeTextRect(rOutliner,aR,sal_False,&aAnchor2);
         rOutliner.Clear();
         SdrFitToSizeType eFit=GetFitToSize();
         FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
@@ -1320,7 +1320,7 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const
 
 void SdrTextObj::ImpCheckMasterCachable()
 {
-    bNotMasterCachable=FALSE;
+    bNotMasterCachable=sal_False;
 
     OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
 
@@ -1346,14 +1346,14 @@ void SdrTextObj::ImpCheckMasterCachable()
 // #101029#: Extracted from ImpGetDrawOutliner()
 void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
 {
-    rOutl.SetUpdateMode(FALSE);
-    USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
+    rOutl.SetUpdateMode(sal_False);
+    sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
     if ( !IsOutlText() )
         nOutlinerMode = OUTLINERMODE_TEXTOBJECT;
     rOutl.Init( nOutlinerMode );
 
     rOutl.SetGlobalCharStretching(100,100);
-    ULONG nStat=rOutl.GetControlWord();
+    sal_uIntPtr nStat=rOutl.GetControlWord();
     nStat&=~(EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE);
     rOutl.SetControlWord(nStat);
     Size aNullSize;
@@ -1395,13 +1395,13 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL         bContourFrame,
         SdrFitToSizeType eFit=GetFitToSize();
         if (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES)
         {
-            ULONG nStat=rOutliner.GetControlWord();
+            sal_uIntPtr nStat=rOutliner.GetControlWord();
             nStat|=EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE;
             rOutliner.SetControlWord(nStat);
         }
     }
     rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
-    TakeTextRect(rOutliner, rTextRect, FALSE, &rAnchorRect);
+    TakeTextRect(rOutliner, rTextRect, sal_False, &rAnchorRect);
     rPaintRect = rTextRect;
 
     if (!bContourFrame)
@@ -1578,7 +1578,7 @@ void SdrTextObj::ForceOutlinerParaObject()
     SdrText* pText = getActiveText();
     if( pText && (pText->GetOutlinerParaObject() == 0) )
     {
-        USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT;
+        sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT;
         if( IsTextFrame() && eTextKind == OBJ_OUTLINETEXT )
             nOutlMode = OUTLINERMODE_OUTLINEOBJECT;
 
@@ -1810,7 +1810,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
         GeoStat aGeoStat;
         aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
         aGeoStat.RecalcTan();
-        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE);
+        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
     }
 
     // rotation?
@@ -1868,19 +1868,19 @@ long SdrTextObj::GetMaxTextFrameWidth() const
 
 FASTBOOL SdrTextObj::IsFontwork() const
 {
-    return (bTextFrame) ? FALSE // Default ist FALSE
+    return (bTextFrame) ? sal_False // Default ist FALSE
         : ((XFormTextStyleItem&)(GetObjectItemSet().Get(XATTR_FORMTXTSTYLE))).GetValue()!=XFT_NONE;
 }
 
 FASTBOOL SdrTextObj::IsHideContour() const
 {
-    return (bTextFrame) ? FALSE // Default ist: Nein, kein HideContour; HideContour nicht bei TextFrames
+    return (bTextFrame) ? sal_False // Default ist: Nein, kein HideContour; HideContour nicht bei TextFrames
         : ((XFormTextHideFormItem&)(GetObjectItemSet().Get(XATTR_FORMTXTHIDEFORM))).GetValue();
 }
 
 FASTBOOL SdrTextObj::IsContourTextFrame() const
 {
-    return (bTextFrame) ? FALSE // ContourFrame nicht bei normalen TextFrames
+    return (bTextFrame) ? sal_False // ContourFrame nicht bei normalen TextFrames
         : ((SdrTextContourFrameItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_CONTOURFRAME))).GetValue();
 }
 
@@ -2070,20 +2070,20 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
 // Konzept des TextObjekts:
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 // Attribute/Varianten:
-// - BOOL Textrahmen / beschriftetes Zeichenobjekt
-// - BOOL FontWork                 (wenn nicht Textrahmen und nicht ContourTextFrame)
-// - BOOL ContourTextFrame         (wenn nicht Textrahmen und nicht Fontwork)
+// - sal_Bool Textrahmen / beschriftetes Zeichenobjekt
+// - sal_Bool FontWork                 (wenn nicht Textrahmen und nicht ContourTextFrame)
+// - sal_Bool ContourTextFrame         (wenn nicht Textrahmen und nicht Fontwork)
 // - long Drehwinkel               (wenn nicht FontWork)
 // - long Textrahmenabstaende      (wenn nicht FontWork)
-// - BOOL FitToSize                (wenn nicht FontWork)
-// - BOOL AutoGrowingWidth/Height  (wenn nicht FitToSize und nicht FontWork)
+// - sal_Bool FitToSize                (wenn nicht FontWork)
+// - sal_Bool AutoGrowingWidth/Height  (wenn nicht FitToSize und nicht FontWork)
 // - long Min/MaxFrameWidth/Height (wenn AutoGrowingWidth/Height)
 // - enum Horizontale Textverankerung Links,Mitte,Rechts,Block,Stretch(ni)
 // - enum Vertikale Textverankerung Oben,Mitte,Unten,Block,Stretch(ni)
 // - enum Laufschrift              (wenn nicht FontWork)
 //
-// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=TRUE)
-// oder ein beschriftetes Zeichenobjekt (bTextFrame=FALSE).
+// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=sal_True)
+// oder ein beschriftetes Zeichenobjekt (bTextFrame=sal_False).
 //
 // Defaultverankerung von Textrahmen:
 //   SDRTEXTHORZADJUST_BLOCK, SDRTEXTVERTADJUST_TOP
@@ -2111,8 +2111,8 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
 // ContourTextFrame:
 // - long Drehwinkel
 // - long Textrahmenabstaende         spaeter vielleicht
-// - BOOL FitToSize                   spaeter vielleicht
-// - BOOL AutoGrowingWidth/Height     viel spaeter vielleicht
+// - sal_Bool FitToSize                   spaeter vielleicht
+// - sal_Bool AutoGrowingWidth/Height     viel spaeter vielleicht
 // - long Min/MaxFrameWidth/Height    viel spaeter vielleicht
 // - enum Horizontale Textverankerung spaeter vielleicht, erstmal Links, Absatz zentr.
 // - enum Vertikale Textverankerung   spaeter vielleicht, erstmal oben
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 178af85d2cf4..72de016703bd 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -568,7 +568,7 @@ namespace
                             }
                         }
 
-                        // consume from portion // no += here, xub_StrLen is USHORT and the compiler will gererate a warning here
+                        // consume from portion // no += here, xub_StrLen is sal_uInt16 and the compiler will gererate a warning here
                         nUsedTextLength = nUsedTextLength + nNextGlyphLen;
 
                         // consume from polygon
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 8b6dab72d5e9..6a903b75ae92 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -122,7 +122,7 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
             if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2
 
             // #101684#
-            BOOL bInEditMode = IsInEditMode();
+            sal_Bool bInEditMode = IsInEditMode();
 
             if(!bInEditMode)
             {
@@ -143,7 +143,7 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
             } else {
                 Outliner& rOutliner=ImpGetDrawOutliner();
                 rOutliner.SetPaperSize(aSiz);
-                rOutliner.SetUpdateMode(TRUE);
+                rOutliner.SetUpdateMode(sal_True);
                 // !!! hier sollte ich wohl auch noch mal die Optimierung mit
                 // bPortionInfoChecked usw einbauen
                 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -172,8 +172,8 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
             if (nHgt<1) nHgt=1; // nVDist kann auch negativ sein
             long nWdtGrow=nWdt-(rR.Right()-rR.Left());
             long nHgtGrow=nHgt-(rR.Bottom()-rR.Top());
-            if (nWdtGrow==0) bWdtGrow=FALSE;
-            if (nHgtGrow==0) bHgtGrow=FALSE;
+            if (nWdtGrow==0) bWdtGrow=sal_False;
+            if (nHgtGrow==0) bHgtGrow=sal_False;
             if (bWdtGrow || bHgtGrow) {
                 if (bWdtGrow) {
                     SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
@@ -203,11 +203,11 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
                     aD2-=aD1;
                     rR.Move(aD2.X(),aD2.Y());
                 }
-                return TRUE;
+                return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 FASTBOOL SdrTextObj::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt)
@@ -262,22 +262,22 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
             const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject();
             XubString aStyleName;
             SfxStyleFamily eStyleFam;
-            USHORT nParaAnz=rTextObj.GetParagraphCount();
+            sal_uInt16 nParaAnz=rTextObj.GetParagraphCount();
 
-            for(UINT16 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
+            for(sal_uInt16 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
             {
                 rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam);
 
                 if(aStyleName.Len())
                 {
-                    XubString aFam = UniString::CreateFromInt32((UINT16)eStyleFam);
+                    XubString aFam = UniString::CreateFromInt32((sal_uInt16)eStyleFam);
                     aFam.Expand(5);
 
                     aStyleName += sal_Unicode('|');
                     aStyleName += aFam;
 
-                    BOOL bFnd(FALSE);
-                    UINT32 nNum(aStyles.Count());
+                    sal_Bool bFnd(sal_False);
+                    sal_uInt32 nNum(aStyles.Count());
 
                     while(!bFnd && nNum > 0)
                     {
@@ -295,7 +295,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
         }
 
         // nun die Strings im Container durch StyleSheet* ersetzten
-        ULONG nNum=aStyles.Count();
+        sal_uIntPtr nNum=aStyles.Count();
         while (nNum>0) {
             nNum--;
             XubString* pName=(XubString*)aStyles.GetObject(nNum);
@@ -306,8 +306,8 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
             aFam.Erase(0,1);
             aFam.EraseTrailingChars();
 
-            // UNICODE: USHORT nFam=USHORT(aFam);
-            UINT16 nFam = (UINT16)aFam.ToInt32();
+            // UNICODE: sal_uInt16 nFam=sal_uInt16(aFam);
+            sal_uInt16 nFam = (sal_uInt16)aFam.ToInt32();
 
             SfxStyleFamily eFam=(SfxStyleFamily)nFam;
             SfxStyleSheetBase* pStyleBase=pStylePool->Find(*pName,eFam);
@@ -323,7 +323,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
         nNum=GetBroadcasterCount();
         while (nNum>0) {
             nNum--;
-            SfxBroadcaster* pBroadcast=GetBroadcasterJOE((USHORT)nNum);
+            SfxBroadcaster* pBroadcast=GetBroadcasterJOE((sal_uInt16)nNum);
             SfxStyleSheet* pStyle=PTR_CAST(SfxStyleSheet,pBroadcast);
             if (pStyle!=NULL && pStyle!=GetStyleSheet()) { // Sonderbehandlung fuer den StyleSheet des Objekts
                 if (aStyles.GetPos(pStyle)==CONTAINER_ENTRY_NOTFOUND) {
@@ -337,7 +337,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
             nNum--;
             SfxStyleSheet* pStyle=(SfxStyleSheet*)aStyles.GetObject(nNum);
             // StartListening soll selbst nachsehen, ob hier nicht evtl. schon gehorcht wird
-            StartListening(*pStyle,TRUE);
+            StartListening(*pStyle,sal_True);
         }
     }
 }
@@ -383,13 +383,13 @@ void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction&
             if (nAbsHgt>0xFFFF) nAbsHgt=0xFFFF;
 
             // und nun attributieren
-            SetObjectItem(SvxCharScaleWidthItem( (USHORT) nRelWdt, EE_CHAR_FONTWIDTH));
-            SetObjectItem(SvxFontHeightItem(nAbsHgt,(USHORT)nRelHgt, EE_CHAR_FONTHEIGHT));
+            SetObjectItem(SvxCharScaleWidthItem( (sal_uInt16) nRelWdt, EE_CHAR_FONTWIDTH));
+            SetObjectItem(SvxFontHeightItem(nAbsHgt,(sal_uInt16)nRelHgt, EE_CHAR_FONTHEIGHT));
             // Zeichen- und Absatzattribute innerhalb des OutlinerParaObjects
             Outliner& rOutliner=ImpGetDrawOutliner();
             rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX));
             rOutliner.SetText(*pOutlinerParaObject);
-            rOutliner.DoStretchChars((USHORT)nX,(USHORT)nY);
+            rOutliner.DoStretchChars((sal_uInt16)nX,(sal_uInt16)nY);
             OutlinerParaObject* pNewPara=rOutliner.CreateParaObject();
             NbcSetOutlinerParaObject(pNewPara);
             rOutliner.Clear();
@@ -452,7 +452,7 @@ bool SdrTextObj::HasText() const
     if( pOPO )
     {
         const EditTextObject& rETO = pOPO->GetTextObject();
-        USHORT nParaCount = rETO.GetParagraphCount();
+        sal_uInt16 nParaCount = rETO.GetParagraphCount();
 
         if( nParaCount > 0 )
             bHasText = (nParaCount > 1) || (rETO.GetText( 0 ).Len() != 0);
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 0e4feeedd2f3..845df672d834 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -211,7 +211,7 @@ FASTBOOL SdrTextObj::BegCreate(SdrDragStat& rStat)
     aRect1.Justify();
     rStat.SetActionRect(aRect1);
     aRect = aRect1;
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrTextObj::MovCreate(SdrDragStat& rStat)
@@ -222,11 +222,11 @@ FASTBOOL SdrTextObj::MovCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     aRect=aRect1; // fuer ObjName
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
+    bSnapRectDirty=sal_True;
     if (HAS_BASE(SdrRectObj,this)) {
         ((SdrRectObj*)this)->SetXPolyDirty();
     }
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -262,7 +262,7 @@ void SdrTextObj::BrkCreate(SdrDragStat& /*rStat*/)
 
 FASTBOOL SdrTextObj::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return TRUE;
+    return sal_True;
 }
 
 basegfx::B2DPolyPolygon SdrTextObj::TakeCreatePoly(const SdrDragStat& rDrag) const
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 6f749a297aef..af53a36f133c 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -56,7 +56,7 @@ FASTBOOL SdrTextObj::HasTextEdit() const
 {
     // lt. Anweisung von MB duerfen gelinkte Textobjekte nun doch
     // geaendert werden (kein automatisches Reload)
-    return TRUE;
+    return sal_True;
 }
 
 sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
@@ -65,9 +65,9 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     pEdtOutl=&rOutl;
 
     // #101684#
-    mbInEditMode = TRUE;
+    mbInEditMode = sal_True;
 
-    USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
+    sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
     if ( !IsOutlText() )
         nOutlinerMode = OUTLINERMODE_TEXTOBJECT;
     rOutl.Init( nOutlinerMode );
@@ -79,7 +79,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     ImpSetTextEditParams();
 
     if (!bContourFrame) {
-        ULONG nStat=rOutl.GetControlWord();
+        sal_uIntPtr nStat=rOutl.GetControlWord();
         nStat|=EE_CNTRL_AUTOPAGESIZE;
         if (bFitToSize) nStat|=EE_CNTRL_STRETCHING; else nStat&=~EE_CNTRL_STRETCHING;
         rOutl.SetControlWord(nStat);
@@ -116,8 +116,8 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     {
         Rectangle aAnchorRect;
         Rectangle aTextRect;
-        TakeTextRect(rOutl, aTextRect, FALSE,
-            &aAnchorRect/* #97097# give TRUE here, not FALSE */);
+        TakeTextRect(rOutl, aTextRect, sal_False,
+            &aAnchorRect/* #97097# give sal_True here, not sal_False */);
         Fraction aFitXKorreg(1,1);
         ImpSetCharStretching(rOutl,aTextRect,aAnchorRect,aFitXKorreg);
     }
@@ -127,7 +127,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
         // #78476# also repaint when animated text is put to edit mode
         // to not make appear the text double
         // #111096# should now repaint automatically.
-        // BOOL bIsAnimated(pPlusData && pPlusData->pAnimator);
+        // sal_Bool bIsAnimated(pPlusData && pPlusData->pAnimator);
 
         if(aGeo.nDrehWink || IsFontwork() /*|| bIsAnimated*/)
         {
@@ -190,7 +190,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
             SdrTextAniDirection eAniDirection=GetTextAniDirection();
 
             // #101684#
-            BOOL bInEditMode = IsInEditMode();
+            sal_Bool bInEditMode = IsInEditMode();
 
             if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
             {
@@ -274,26 +274,26 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
         // need to end edit mode early since SetOutlinerParaObject already
         // uses GetCurrentBoundRect() which needs to take the text into account
         // to work correct
-        mbInEditMode = FALSE;
+        mbInEditMode = sal_False;
         SetOutlinerParaObject(pNewText);
     }
 
     pEdtOutl = NULL;
     rOutl.Clear();
-    UINT32 nStat = rOutl.GetControlWord();
+    sal_uInt32 nStat = rOutl.GetControlWord();
     nStat &= ~EE_CNTRL_AUTOPAGESIZE;
     rOutl.SetControlWord(nStat);
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 }
 
-USHORT SdrTextObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const
 {
     SdrTextHorzAdjust eH=GetTextHorizontalAdjust();
     SdrTextVertAdjust eV=GetTextVerticalAdjust();
     EVAnchorMode eRet=ANCHOR_TOP_LEFT;
-    if (IsContourTextFrame()) return (USHORT)eRet;
+    if (IsContourTextFrame()) return (sal_uInt16)eRet;
     if (eH==SDRTEXTHORZADJUST_LEFT) {
         if (eV==SDRTEXTVERTADJUST_TOP) {
             eRet=ANCHOR_TOP_LEFT;
@@ -319,14 +319,14 @@ USHORT SdrTextObj::GetOutlinerViewAnchorMode() const
             eRet=ANCHOR_VCENTER_HCENTER;
         }
     }
-    return (USHORT)eRet;
+    return (sal_uInt16)eRet;
 }
 
 void SdrTextObj::ImpSetTextEditParams() const
 {
     if (pEdtOutl!=NULL) {
         FASTBOOL bUpdMerk=pEdtOutl->GetUpdateMode();
-        if (bUpdMerk) pEdtOutl->SetUpdateMode(FALSE);
+        if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False);
         Size aPaperMin;
         Size aPaperMax;
         Rectangle aEditArea;
@@ -335,16 +335,16 @@ void SdrTextObj::ImpSetTextEditParams() const
         //FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
         FASTBOOL bContourFrame=IsContourTextFrame();
         //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode();
-        //ULONG nViewAnz=pEdtOutl->GetViewCount();
+        //sal_uIntPtr nViewAnz=pEdtOutl->GetViewCount();
         pEdtOutl->SetMinAutoPaperSize(aPaperMin);
         pEdtOutl->SetMaxAutoPaperSize(aPaperMax);
         pEdtOutl->SetPaperSize(Size());
         if (bContourFrame) {
             Rectangle aAnchorRect;
             TakeTextAnchorRect(aAnchorRect);
-            ImpSetContourPolygon(*pEdtOutl,aAnchorRect, TRUE);
+            ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True);
         }
-        if (bUpdMerk) pEdtOutl->SetUpdateMode(TRUE);
+        if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_True);
     }
 }
 
diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx
index fe21621c1b9a..444796adb30c 100644
--- a/svx/source/svdraw/svdotxfl.cxx
+++ b/svx/source/svdraw/svdotxfl.cxx
@@ -33,7 +33,7 @@
 #include <svx/svdotext.hxx>
 #include <svx/svdfield.hxx>
 
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
 
 // Do not remove this, it is still used in src536a!
 void SdrRegisterFieldClasses()
@@ -44,15 +44,15 @@ void SdrRegisterFieldClasses()
         SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxHeaderField);
         SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxFooterField);
         SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxDateTimeField);
-        bInit = TRUE;
+        bInit = sal_True;
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////// */
 
-FASTBOOL SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/,
+FASTBOOL SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/,
     FASTBOOL /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 57bcc7a22ae8..d36b73ae0a1b 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -78,7 +78,7 @@ public:
     virtual void DataChanged( const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue );
 
-    BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); }
+    sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
 };
 
 ImpSdrObjTextLink::~ImpSdrObjTextLink()
@@ -101,7 +101,7 @@ void ImpSdrObjTextLink::Closed()
 void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/,
                                 const ::com::sun::star::uno::Any & /*rValue */)
 {
-    FASTBOOL bForceReload=FALSE;
+    FASTBOOL bForceReload=sal_False;
     SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0;
     sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0;
     if( pLinkManager )
@@ -119,7 +119,7 @@ void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/,
                 pData->aFileName = aFile;
                 pData->aFilterName = aFilter;
                 pSdrObj->SetChanged();
-                bForceReload = TRUE;
+                bForceReload = sal_True;
             }
         }
     }
@@ -198,8 +198,8 @@ void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName,
 void SdrTextObj::ReleaseTextLink()
 {
     ImpLinkAbmeldung();
-    USHORT nAnz=GetUserDataCount();
-    for (USHORT nNum=nAnz; nNum>0;) {
+    sal_uInt16 nAnz=GetUserDataCount();
+    for (sal_uInt16 nNum=nAnz; nNum>0;) {
         nNum--;
         SdrObjUserData* pData=GetUserData(nNum);
         if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) {
@@ -211,17 +211,17 @@ void SdrTextObj::ReleaseTextLink()
 FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad)
 {
     ImpSdrObjTextLinkUserData*  pData = GetLinkUserData();
-    FASTBOOL                    bRet = TRUE;
+    FASTBOOL                    bRet = sal_True;
 
     if( pData )
     {
         ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
         DateTime                    aFileDT;
-        BOOL                        bExists = FALSE, bLoad = FALSE;
+        sal_Bool                        bExists = sal_False, bLoad = sal_False;
 
         if( pBroker )
         {
-            bExists = TRUE;
+            bExists = sal_True;
 
             try
             {
@@ -237,14 +237,14 @@ FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad)
             }
             catch( ... )
             {
-                bExists = FALSE;
+                bExists = sal_False;
             }
         }
 
         if( bExists )
         {
             if( bForceLoad )
-                bLoad = TRUE;
+                bLoad = sal_True;
             else
                 bLoad = ( aFileDT > pData->aFileDate0 );
 
@@ -263,7 +263,7 @@ FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad)
 FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet)
 {
     INetURLObject   aFileURL( rFileName );
-    BOOL            bRet = FALSE;
+    sal_Bool            bRet = sal_False;
 
     if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID )
     {
@@ -288,14 +288,14 @@ FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterNa
         cRTF[4] = 0;
         pIStm->Read(cRTF, 5);
 
-        BOOL bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f';
+        sal_Bool bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f';
 
         pIStm->Seek(0);
 
         if( !pIStm->GetError() )
         {
-            SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< USHORT >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) );
-            bRet = TRUE;
+            SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< sal_uInt16 >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) );
+            bRet = sal_True;
         }
 
         delete pIStm;
@@ -307,8 +307,8 @@ FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterNa
 ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const
 {
     ImpSdrObjTextLinkUserData* pData=NULL;
-    USHORT nAnz=GetUserDataCount();
-    for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) {
+    sal_uInt16 nAnz=GetUserDataCount();
+    for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) {
         nNum--;
         pData=(ImpSdrObjTextLinkUserData*)GetUserData(nNum);
         if (pData->GetInventor()!=SdrInventor || pData->GetId()!=SDRUSERDATA_OBJTEXTLINK) {
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 65514307bb86..6f129affcbba 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -239,7 +239,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
 
 void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     long dx=aRect.Right()-aRect.Left();
     long dy=aRect.Bottom()-aRect.Top();
     Point aP(aRect.TopLeft());
@@ -258,18 +258,18 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     }
     SetRectsDirty();
     NbcRotateGluePoints(rRef,nWink,sn,cs);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
 
     // #75889# when this is a SdrPathObj aRect maybe not initialized
     Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo));
 
-    USHORT nPointCount=aPol.GetSize();
-    for (USHORT i=0; i<nPointCount; i++) {
+    sal_uInt16 nPointCount=aPol.GetSize();
+    for (sal_uInt16 i=0; i<nPointCount; i++) {
          ShearPoint(aPol[i],rRef,tn,bVShear);
     }
     Poly2Rect(aPol,aRect,aGeo);
@@ -280,22 +280,22 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVS
     ImpCheckShear();
     SetRectsDirty();
     NbcShearGluePoints(rRef,nWink,tn,bVShear);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     FASTBOOL bNoShearMerk=aGeo.nShearWink==0;
-    FASTBOOL bRota90Merk=FALSE;
+    FASTBOOL bRota90Merk=sal_False;
     if (bNoShearMerk &&
         (rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() ||
          Abs(rRef1.X()-rRef2.X())==Abs(rRef1.Y()-rRef2.Y()))) {
         bRota90Merk=aGeo.nDrehWink % 9000 ==0;
     }
     Polygon aPol(Rect2Poly(aRect,aGeo));
-    USHORT i;
-    USHORT nPntAnz=aPol.GetSize();
+    sal_uInt16 i;
+    sal_uInt16 nPntAnz=aPol.GetSize();
     for (i=0; i<nPntAnz; i++) {
          MirrorPoint(aPol[i],rRef1,rRef2);
     }
@@ -333,7 +333,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
     ImpCheckShear();
     SetRectsDirty();
     NbcMirrorGluePoints(rRef1,rRef2);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -461,7 +461,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
 
 //////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrTextObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrTextObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     return ImpConvertContainedTextToSdrPathObjs(!bBezier);
 }
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 894a5c72926f..ed6c2170a5f2 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -164,11 +164,11 @@ namespace
 
 TYPEINIT1(SdrUnoObj, SdrRectObj);
 
-SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel)
+SdrUnoObj::SdrUnoObj(const String& rModelName, sal_Bool _bOwnUnoControlModel)
 :   m_pImpl( new SdrUnoObjDataHolder ),
     bOwnUnoControlModel( _bOwnUnoControlModel )
 {
-    bIsUnoObj = TRUE;
+    bIsUnoObj = sal_True;
 
     m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
 
@@ -179,11 +179,11 @@ SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel)
 
 SdrUnoObj::SdrUnoObj(const String& rModelName,
                      const uno::Reference< lang::XMultiServiceFactory >& rxSFac,
-                     BOOL _bOwnUnoControlModel)
+                     sal_Bool _bOwnUnoControlModel)
 :   m_pImpl( new SdrUnoObjDataHolder ),
     bOwnUnoControlModel( _bOwnUnoControlModel )
 {
-    bIsUnoObj = TRUE;
+    bIsUnoObj = sal_True;
 
     m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
 
@@ -227,26 +227,26 @@ void SdrUnoObj::SetPage(SdrPage* pNewPage)
 
 void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed        =   FALSE;
-    rInfo.bRotate90Allowed          =   FALSE;
-    rInfo.bMirrorFreeAllowed        =   FALSE;
-    rInfo.bMirror45Allowed          =   FALSE;
-    rInfo.bMirror90Allowed          =   FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed             =   FALSE;
-    rInfo.bEdgeRadiusAllowed        =   FALSE;
-    rInfo.bNoOrthoDesired           =   FALSE;
-    rInfo.bCanConvToPath            =   FALSE;
-    rInfo.bCanConvToPoly            =   FALSE;
-    rInfo.bCanConvToPathLineToArea  =   FALSE;
-    rInfo.bCanConvToPolyLineToArea  =   FALSE;
-    rInfo.bCanConvToContour = FALSE;
+    rInfo.bRotateFreeAllowed        =   sal_False;
+    rInfo.bRotate90Allowed          =   sal_False;
+    rInfo.bMirrorFreeAllowed        =   sal_False;
+    rInfo.bMirror45Allowed          =   sal_False;
+    rInfo.bMirror90Allowed          =   sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed             =   sal_False;
+    rInfo.bEdgeRadiusAllowed        =   sal_False;
+    rInfo.bNoOrthoDesired           =   sal_False;
+    rInfo.bCanConvToPath            =   sal_False;
+    rInfo.bCanConvToPoly            =   sal_False;
+    rInfo.bCanConvToPathLineToArea  =   sal_False;
+    rInfo.bCanConvToPolyLineToArea  =   sal_False;
+    rInfo.bCanConvToContour = sal_False;
 }
 
-UINT16 SdrUnoObj::GetObjIdentifier() const
+sal_uInt16 SdrUnoObj::GetObjIdentifier() const
 {
-    return UINT16(OBJ_UNO);
+    return sal_uInt16(OBJ_UNO);
 }
 
 void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode )
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 79e74a3382b8..22c28b7808d4 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -41,7 +41,7 @@ DBG_NAME(SdrOutliner)
 |* Ctor
 |*
 \************************************************************************/
-SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, USHORT nMode )
+SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode )
 :   Outliner( pItemPool, nMode ),
     //mpPaintInfoRec( NULL )
     mpVisualizedPage(0)
@@ -70,15 +70,15 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
 {
     if( pObj && pObj != mpTextObj.get() )
     {
-        SetUpdateMode(FALSE);
-        USHORT nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT;
+        SetUpdateMode(sal_False);
+        sal_uInt16 nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT;
         if ( !pObj->IsOutlText() )
             nOutlinerMode2 = OUTLINERMODE_TEXTOBJECT;
         Init( nOutlinerMode2 );
 
         SetGlobalCharStretching(100,100);
 
-        ULONG nStat = GetControlWord();
+        sal_uIntPtr nStat = GetControlWord();
         nStat &= ~( EE_CNTRL_STRETCHING | EE_CNTRL_AUTOPAGESIZE );
         SetControlWord(nStat);
 
@@ -108,14 +108,14 @@ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj )
 |*
 |*
 \************************************************************************/
-XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
                                      Color*& rpTxtColor, Color*& rpFldColor)
 {
-    FASTBOOL bOk = FALSE;
+    FASTBOOL bOk = sal_False;
     XubString aRet;
 
     if(mpTextObj.is())
-        bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, FALSE, rpTxtColor, rpFldColor, aRet);
+        bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet);
 
     if (!bOk)
         aRet = Outliner::CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor);
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index 429b459d3271..afa2a23bb93d 100644
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -33,7 +33,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>
 
-extern SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel );
+extern SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel );
 
 SdrOutlinerCache::SdrOutlinerCache( SdrModel* pModel )
 :   mpModel( pModel ),
@@ -85,7 +85,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
 {
     if( pOutliner )
     {
-        USHORT nOutlMode = pOutliner->GetOutlinerMode();
+        sal_uInt16 nOutlMode = pOutliner->GetOutlinerMode();
 
         if( (OUTLINERMODE_OUTLINEOBJECT == nOutlMode) && (NULL == mpModeOutline) )
         {
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index c97af7abc37c..c6703f2305df 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -60,7 +60,7 @@ TYPEINIT1(SdrVirtObj,SdrObject);
 SdrVirtObj::SdrVirtObj(SdrObject& rNewObj):
     rRefObj(rNewObj)
 {
-    bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt
+    bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt
     rRefObj.AddReference(*this);
     bClosedObj=rRefObj.IsClosedObj();
 }
@@ -69,7 +69,7 @@ SdrVirtObj::SdrVirtObj(SdrObject& rNewObj, const Point& rAnchorPos):
     rRefObj(rNewObj)
 {
     aAnchor=rAnchorPos;
-    bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt
+    bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt
     rRefObj.AddReference(*this);
     bClosedObj=rRefObj.IsClosedObj();
 }
@@ -119,12 +119,12 @@ void SdrVirtObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rRefObj.TakeObjInfo(rInfo);
 }
 
-UINT32 SdrVirtObj::GetObjInventor() const
+sal_uInt32 SdrVirtObj::GetObjInventor() const
 {
     return rRefObj.GetObjInventor();
 }
 
-UINT16 SdrVirtObj::GetObjIdentifier() const
+sal_uInt16 SdrVirtObj::GetObjIdentifier() const
 {
     return rRefObj.GetObjIdentifier();
 }
@@ -197,7 +197,7 @@ void SdrVirtObj::TakeObjNamePlural(XubString& rName) const
 void operator +=(PolyPolygon& rPoly, const Point& rOfs)
 {
     if (rOfs.X()!=0 || rOfs.Y()!=0) {
-        USHORT i,j;
+        sal_uInt16 i,j;
         for (j=0; j<rPoly.Count(); j++) {
             Polygon aP1(rPoly.GetObject(j));
             for (i=0; i<aP1.GetSize(); i++) {
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 26190c18aa60..7fdc35ae7545 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -111,8 +111,8 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU
     pModel=pNewModel;
     pPage=pNewPage;
     pUpList=pNewUpList;
-    bObjOrdNumsDirty=FALSE;
-    bRectsDirty=FALSE;
+    bObjOrdNumsDirty=sal_False;
+    bRectsDirty=sal_False;
     pOwnerObj=NULL;
     eListKind=SDROBJLIST_UNKNOWN;
 }
@@ -127,8 +127,8 @@ SdrObjList::SdrObjList(const SdrObjList& rSrcList):
     pModel=NULL;
     pPage=NULL;
     pUpList=NULL;
-    bObjOrdNumsDirty=FALSE;
-    bRectsDirty=FALSE;
+    bObjOrdNumsDirty=sal_False;
+    bRectsDirty=sal_False;
     pOwnerObj=NULL;
     eListKind=SDROBJLIST_UNKNOWN;
     *this=rSrcList;
@@ -157,12 +157,12 @@ void SdrObjList::operator=(const SdrObjList& rSrcList)
 void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
 {
     Clear();
-    bObjOrdNumsDirty=FALSE;
-    bRectsDirty     =FALSE;
-    ULONG nCloneErrCnt=0;
-    ULONG nAnz=rSrcList.GetObjCount();
+    bObjOrdNumsDirty=sal_False;
+    bRectsDirty     =sal_False;
+    sal_uIntPtr nCloneErrCnt=0;
+    sal_uIntPtr nAnz=rSrcList.GetObjCount();
     SdrInsertReason aReason(SDRREASON_COPY);
-    ULONG no;
+    sal_uIntPtr no;
     for (no=0; no<nAnz; no++) {
         SdrObject* pSO=rSrcList.GetObj(no);
 
@@ -191,8 +191,8 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
             const SdrObject* pSrcOb=rSrcList.GetObj(no);
             SdrEdgeObj* pSrcEdge=PTR_CAST(SdrEdgeObj,pSrcOb);
             if (pSrcEdge!=NULL) {
-                SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(TRUE);
-                SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(FALSE);
+                SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(sal_True);
+                SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(sal_False);
                 if (pSrcNode1!=NULL && pSrcNode1->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode1=NULL; // Listenuebergreifend
                 if (pSrcNode2!=NULL && pSrcNode2->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode2=NULL; // ist (noch) nicht
                 if (pSrcNode1!=NULL || pSrcNode2!=NULL) {
@@ -200,19 +200,19 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
                     SdrEdgeObj* pDstEdge=PTR_CAST(SdrEdgeObj,pEdgeObjTmp);
                     if (pDstEdge!=NULL) {
                         if (pSrcNode1!=NULL) {
-                            ULONG nDstNode1=pSrcNode1->GetOrdNum();
+                            sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum();
                             SdrObject* pDstNode1=GetObj(nDstNode1);
                             if (pDstNode1!=NULL) { // Sonst grober Fehler!
-                                pDstEdge->ConnectToNode(TRUE,pDstNode1);
+                                pDstEdge->ConnectToNode(sal_True,pDstNode1);
                             } else {
                                 DBG_ERROR("SdrObjList::operator=(): pDstNode1==NULL!");
                             }
                         }
                         if (pSrcNode2!=NULL) {
-                            ULONG nDstNode2=pSrcNode2->GetOrdNum();
+                            sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum();
                             SdrObject* pDstNode2=GetObj(nDstNode2);
                             if (pDstNode2!=NULL) { // Node war sonst wohl nicht markiert
-                                pDstEdge->ConnectToNode(FALSE,pDstNode2);
+                                pDstEdge->ConnectToNode(sal_False,pDstNode2);
                             } else {
                                 DBG_ERROR("SdrObjList::operator=(): pDstNode2==NULL!");
                             }
@@ -289,8 +289,8 @@ void SdrObjList::SetPage(SdrPage* pNewPage)
 {
     if (pPage!=pNewPage) {
         pPage=pNewPage;
-        ULONG nAnz=GetObjCount();
-        for (ULONG no=0; no<nAnz; no++) {
+        sal_uIntPtr nAnz=GetObjCount();
+        for (sal_uIntPtr no=0; no<nAnz; no++) {
             SdrObject* pObj=GetObj(no);
             pObj->SetPage(pPage);
         }
@@ -306,8 +306,8 @@ void SdrObjList::SetModel(SdrModel* pNewModel)
 {
     if (pModel!=pNewModel) {
         pModel=pNewModel;
-        ULONG nAnz=GetObjCount();
-        for (ULONG i=0; i<nAnz; i++) {
+        sal_uIntPtr nAnz=GetObjCount();
+        for (sal_uIntPtr i=0; i<nAnz; i++) {
             SdrObject* pObj=GetObj(i);
             pObj->SetModel(pModel);
         }
@@ -316,20 +316,20 @@ void SdrObjList::SetModel(SdrModel* pNewModel)
 
 void SdrObjList::RecalcObjOrdNums()
 {
-    ULONG nAnz=GetObjCount();
-    for (ULONG no=0; no<nAnz; no++) {
+    sal_uIntPtr nAnz=GetObjCount();
+    for (sal_uIntPtr no=0; no<nAnz; no++) {
         SdrObject* pObj=GetObj(no);
         pObj->SetOrdNum(no);
     }
-    bObjOrdNumsDirty=FALSE;
+    bObjOrdNumsDirty=sal_False;
 }
 
 void SdrObjList::RecalcRects()
 {
     aOutRect=Rectangle();
     aSnapRect=aOutRect;
-    ULONG nAnz=GetObjCount();
-    ULONG i;
+    sal_uIntPtr nAnz=GetObjCount();
+    sal_uIntPtr i;
     for (i=0; i<nAnz; i++) {
         SdrObject* pObj=GetObj(i);
         if (i==0) {
@@ -344,7 +344,7 @@ void SdrObjList::RecalcRects()
 
 void SdrObjList::SetRectsDirty()
 {
-    bRectsDirty=TRUE;
+    bRectsDirty=sal_True;
     if (pUpList!=NULL) pUpList->SetRectsDirty();
 }
 
@@ -358,16 +358,16 @@ void SdrObjList::impChildInserted(SdrObject& rChild) const
     }
 }
 
-void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* /*pReason*/)
+void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* /*pReason*/)
 {
     DBG_ASSERT(pObj!=NULL,"SdrObjList::NbcInsertObject(NULL)");
     if (pObj!=NULL) {
         DBG_ASSERT(!pObj->IsInserted(),"ZObjekt hat bereits Inserted-Status");
-        ULONG nAnz=GetObjCount();
+        sal_uIntPtr nAnz=GetObjCount();
         if (nPos>nAnz) nPos=nAnz;
         InsertObjectIntoContainer(*pObj,nPos);
 
-        if (nPos<nAnz) bObjOrdNumsDirty=TRUE;
+        if (nPos<nAnz) bObjOrdNumsDirty=sal_True;
         pObj->SetOrdNum(nPos);
         pObj->SetObjList(this);
         pObj->SetPage(pPage);
@@ -380,11 +380,11 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea
             aOutRect.Union(pObj->GetCurrentBoundRect());
             aSnapRect.Union(pObj->GetSnapRect());
         }
-        pObj->SetInserted(TRUE); // Ruft u.a. den UserCall
+        pObj->SetInserted(sal_True); // Ruft u.a. den UserCall
     }
 }
 
-void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void SdrObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
 {
     DBG_ASSERT(pObj!=NULL,"SdrObjList::InsertObject(NULL)");
 
@@ -427,7 +427,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason
     }
 }
 
-SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
+SdrObject* SdrObjList::NbcRemoveObject(sal_uIntPtr nObjNum)
 {
     if (nObjNum >= maList.size())
     {
@@ -435,7 +435,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
         return NULL;
     }
 
-    ULONG nAnz=GetObjCount();
+    sal_uIntPtr nAnz=GetObjCount();
     SdrObject* pObj=maList[nObjNum];
     RemoveObjectFromContainer(nObjNum);
 
@@ -445,12 +445,12 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
     DBG_ASSERT(pObj!=NULL,"Object zum Removen nicht gefunden");
     if (pObj!=NULL) {
         DBG_ASSERT(pObj->IsInserted(),"ZObjekt hat keinen Inserted-Status");
-        pObj->SetInserted(FALSE); // Ruft u.a. den UserCall
+        pObj->SetInserted(sal_False); // Ruft u.a. den UserCall
         pObj->SetObjList(NULL);
         pObj->SetPage(NULL);
         if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird
-            if (nObjNum!=ULONG(nAnz-1)) {
-                bObjOrdNumsDirty=TRUE;
+            if (nObjNum!=sal_uIntPtr(nAnz-1)) {
+                bObjOrdNumsDirty=sal_True;
             }
         }
         SetRectsDirty();
@@ -458,7 +458,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
     return pObj;
 }
 
-SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
+SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum)
 {
     if (nObjNum >= maList.size())
     {
@@ -466,7 +466,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
         return NULL;
     }
 
-    ULONG nAnz=GetObjCount();
+    sal_uIntPtr nAnz=GetObjCount();
     SdrObject* pObj=maList[nObjNum];
     RemoveObjectFromContainer(nObjNum);
 
@@ -486,12 +486,12 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
             }
             pModel->SetChanged();
         }
-        pObj->SetInserted(FALSE); // Ruft u.a. den UserCall
+        pObj->SetInserted(sal_False); // Ruft u.a. den UserCall
         pObj->SetObjList(NULL);
         pObj->SetPage(NULL);
         if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird
-            if (nObjNum!=ULONG(nAnz-1)) {
-                bObjOrdNumsDirty=TRUE;
+            if (nObjNum!=sal_uIntPtr(nAnz-1)) {
+                bObjOrdNumsDirty=sal_True;
             }
         }
         SetRectsDirty();
@@ -506,7 +506,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
     return pObj;
 }
 
-SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
+SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
 {
     if (nObjNum >= maList.size() || pNewObj == NULL)
     {
@@ -519,7 +519,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
     DBG_ASSERT(pObj!=NULL,"SdrObjList::ReplaceObject: Object zum Removen nicht gefunden");
     if (pObj!=NULL) {
         DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: ZObjekt hat keinen Inserted-Status");
-        pObj->SetInserted(FALSE);
+        pObj->SetInserted(sal_False);
         pObj->SetObjList(NULL);
         pObj->SetPage(NULL);
         ReplaceObjectInContainer(*pNewObj,nObjNum);
@@ -535,13 +535,13 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
         // evtl. existing parent visualisations
         impChildInserted(*pNewObj);
 
-        pNewObj->SetInserted(TRUE);
+        pNewObj->SetInserted(sal_True);
         SetRectsDirty();
     }
     return pObj;
 }
 
-SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
+SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
 {
     if (nObjNum >= maList.size())
     {
@@ -566,7 +566,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
                 pModel->Broadcast(aHint);
             }
         }
-        pObj->SetInserted(FALSE);
+        pObj->SetInserted(sal_False);
         pObj->SetObjList(NULL);
         pObj->SetPage(NULL);
         ReplaceObjectInContainer(*pNewObj,nObjNum);
@@ -582,7 +582,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
         // evtl. existing parent visualisations
         impChildInserted(*pNewObj);
 
-        pNewObj->SetInserted(TRUE);
+        pNewObj->SetInserted(sal_True);
         if (pModel!=NULL) {
             // Hier muss ein anderer Broadcast her!
             if (pNewObj->GetPage()!=NULL) {
@@ -597,7 +597,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
     return pObj;
 }
 
-SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
+SdrObject* SdrObjList::NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum)
 {
     if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size())
     {
@@ -620,12 +620,12 @@ SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
         pObj->ActionChanged();
 
         pObj->SetOrdNum(nNewObjNum);
-        bObjOrdNumsDirty=TRUE;
+        bObjOrdNumsDirty=sal_True;
     }
     return pObj;
 }
 
-SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
+SdrObject* SdrObjList::SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum)
 {
     if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size())
     {
@@ -647,7 +647,7 @@ SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
         pObj->ActionChanged();
 
         pObj->SetOrdNum(nNewObjNum);
-        bObjOrdNumsDirty=TRUE;
+        bObjOrdNumsDirty=sal_True;
         if (pModel!=NULL)
         {
             // Hier muss ein anderer Broadcast her!
@@ -662,7 +662,7 @@ const Rectangle& SdrObjList::GetAllObjSnapRect() const
 {
     if (bRectsDirty) {
         ((SdrObjList*)this)->RecalcRects();
-        ((SdrObjList*)this)->bRectsDirty=FALSE;
+        ((SdrObjList*)this)->bRectsDirty=sal_False;
     }
     return aSnapRect;
 }
@@ -677,15 +677,15 @@ const Rectangle& SdrObjList::GetAllObjBoundRect() const
     if (bRectsDirty || aOutRect.IsEmpty())
     {
         ((SdrObjList*)this)->RecalcRects();
-        ((SdrObjList*)this)->bRectsDirty=FALSE;
+        ((SdrObjList*)this)->bRectsDirty=sal_False;
     }
     return aOutRect;
 }
 
 void SdrObjList::NbcReformatAllTextObjects()
 {
-    ULONG nAnz=GetObjCount();
-    ULONG nNum=0;
+    sal_uIntPtr nAnz=GetObjCount();
+    sal_uIntPtr nNum=0;
 
     Printer* pPrinter = NULL;
 
@@ -750,7 +750,7 @@ void SdrObjList::BurnInStyleSheetAttributes()
     }
 }
 
-ULONG SdrObjList::GetObjCount() const
+sal_uIntPtr SdrObjList::GetObjCount() const
 {
     return maList.size();
 }
@@ -758,7 +758,7 @@ ULONG SdrObjList::GetObjCount() const
 
 
 
-SdrObject* SdrObjList::GetObj(ULONG nNum) const
+SdrObject* SdrObjList::GetObj(sal_uIntPtr nNum) const
 {
     if (nNum >= maList.size())
     {
@@ -774,16 +774,16 @@ SdrObject* SdrObjList::GetObj(ULONG nNum) const
 
 FASTBOOL SdrObjList::IsReadOnly() const
 {
-    FASTBOOL bRet=FALSE;
+    FASTBOOL bRet=sal_False;
     if (pPage!=NULL && pPage!=this) bRet=pPage->IsReadOnly();
     return bRet;
 }
 
-ULONG SdrObjList::CountAllObjects() const
+sal_uIntPtr SdrObjList::CountAllObjects() const
 {
-    ULONG nCnt=GetObjCount();
-    ULONG nAnz=nCnt;
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uIntPtr nCnt=GetObjCount();
+    sal_uIntPtr nAnz=nCnt;
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         SdrObjList* pSubOL=GetObj(nNum)->GetSubList();
         if (pSubOL!=NULL) {
             nCnt+=pSubOL->CountAllObjects();
@@ -794,8 +794,8 @@ ULONG SdrObjList::CountAllObjects() const
 
 void SdrObjList::ForceSwapInObjects() const
 {
-    ULONG nObjAnz=GetObjCount();
-    for (ULONG nObjNum=nObjAnz; nObjNum>0;) {
+    sal_uIntPtr nObjAnz=GetObjCount();
+    for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) {
         SdrObject* pObj=GetObj(--nObjNum);
         SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj);
         if (pGrafObj!=NULL) {
@@ -810,8 +810,8 @@ void SdrObjList::ForceSwapInObjects() const
 
 void SdrObjList::ForceSwapOutObjects() const
 {
-    ULONG nObjAnz=GetObjCount();
-    for (ULONG nObjNum=nObjAnz; nObjNum>0;) {
+    sal_uIntPtr nObjAnz=GetObjCount();
+    for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) {
         SdrObject* pObj=GetObj(--nObjNum);
         SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj);
         if (pGrafObj!=NULL) {
@@ -832,7 +832,7 @@ void SdrObjList::FlattenGroups()
         UnGroupObj(i);
 }
 
-void SdrObjList::UnGroupObj( ULONG nObjNum )
+void SdrObjList::UnGroupObj( sal_uIntPtr nObjNum )
 {
     // if the given object is no group, this method is a noop
     SdrObject* pUngroupObj = GetObj( nObjNum );
@@ -1054,7 +1054,7 @@ void SdrObjList::InsertObjectIntoContainer (
         maList.push_back(&rObject);
     else
         maList.insert(maList.begin()+nInsertPosition, &rObject);
-    bObjOrdNumsDirty=TRUE;
+    bObjOrdNumsDirty=sal_True;
 }
 
 
@@ -1091,7 +1091,7 @@ void SdrObjList::ReplaceObjectInContainer (
     }
 
     maList[nObjectPosition] = &rNewObject;
-    bObjOrdNumsDirty=TRUE;
+    bObjOrdNumsDirty=sal_True;
 }
 
 
@@ -1120,7 +1120,7 @@ void SdrObjList::RemoveObjectFromContainer (
     }
 
     maList.erase(maList.begin()+nObjectPosition);
-    bObjOrdNumsDirty=TRUE;
+    bObjOrdNumsDirty=sal_True;
 }
 
 
@@ -1130,8 +1130,8 @@ void SdrObjList::RemoveObjectFromContainer (
 
 void SdrPageGridFrameList::Clear()
 {
-    USHORT nAnz=GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         delete GetObject(i);
     }
     aList.Clear();
@@ -1534,7 +1534,7 @@ Size SdrPage::GetSize() const
     return Size(nWdt,nHgt);
 }
 
-INT32 SdrPage::GetWdt() const
+sal_Int32 SdrPage::GetWdt() const
 {
     return nWdt;
 }
@@ -1559,12 +1559,12 @@ Orientation SdrPage::GetOrientation() const
     return eRet;
 }
 
-INT32 SdrPage::GetHgt() const
+sal_Int32 SdrPage::GetHgt() const
 {
     return nHgt;
 }
 
-void  SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
+void  SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr)
 {
     bool bChanged(false);
 
@@ -1598,7 +1598,7 @@ void  SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
     }
 }
 
-void  SdrPage::SetLftBorder(INT32 nBorder)
+void  SdrPage::SetLftBorder(sal_Int32 nBorder)
 {
     if(nBordLft != nBorder)
     {
@@ -1607,7 +1607,7 @@ void  SdrPage::SetLftBorder(INT32 nBorder)
     }
 }
 
-void  SdrPage::SetUppBorder(INT32 nBorder)
+void  SdrPage::SetUppBorder(sal_Int32 nBorder)
 {
     if(nBordUpp != nBorder)
     {
@@ -1616,7 +1616,7 @@ void  SdrPage::SetUppBorder(INT32 nBorder)
     }
 }
 
-void  SdrPage::SetRgtBorder(INT32 nBorder)
+void  SdrPage::SetRgtBorder(sal_Int32 nBorder)
 {
     if(nBordRgt != nBorder)
     {
@@ -1625,7 +1625,7 @@ void  SdrPage::SetRgtBorder(INT32 nBorder)
     }
 }
 
-void  SdrPage::SetLwrBorder(INT32 nBorder)
+void  SdrPage::SetLwrBorder(sal_Int32 nBorder)
 {
     if(nBordLwr != nBorder)
     {
@@ -1634,22 +1634,22 @@ void  SdrPage::SetLwrBorder(INT32 nBorder)
     }
 }
 
-INT32 SdrPage::GetLftBorder() const
+sal_Int32 SdrPage::GetLftBorder() const
 {
     return nBordLft;
 }
 
-INT32 SdrPage::GetUppBorder() const
+sal_Int32 SdrPage::GetUppBorder() const
 {
     return nBordUpp;
 }
 
-INT32 SdrPage::GetRgtBorder() const
+sal_Int32 SdrPage::GetRgtBorder() const
 {
     return nBordRgt;
 }
 
-INT32 SdrPage::GetLwrBorder() const
+sal_Int32 SdrPage::GetLwrBorder() const
 {
     return nBordLwr;
 }
@@ -1709,17 +1709,17 @@ void SdrPage::SetPageNum(sal_uInt16 nNew)
     }
 }
 
-USHORT SdrPage::GetPageNum() const
+sal_uInt16 SdrPage::GetPageNum() const
 {
     if (!mbInserted)
         return 0;
 
     if (mbMaster) {
         if (pModel && pModel->IsMPgNumsDirty())
-            ((SdrModel*)pModel)->RecalcPageNums(TRUE);
+            ((SdrModel*)pModel)->RecalcPageNums(sal_True);
     } else {
         if (pModel && pModel->IsPagNumsDirty())
-            ((SdrModel*)pModel)->RecalcPageNums(FALSE);
+            ((SdrModel*)pModel)->RecalcPageNums(sal_False);
     }
     return nPageNum;
 }
@@ -1859,13 +1859,13 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const
     return pObj->GetStyleSheet();
 }
 
-FASTBOOL SdrPage::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const
+FASTBOOL SdrPage::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const
 {
-    FASTBOOL bRet = FALSE;
+    FASTBOOL bRet = sal_False;
 
-    for( ULONG n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ )
+    for( sal_uIntPtr n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ )
         if( GetObj( n )->IsTransparent( bCheckForAlphaChannel ) )
-            bRet = TRUE;
+            bRet = sal_True;
 
     return bRet;
 }
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 1758cd92745b..65a72cc915be 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -331,8 +331,8 @@ void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect)
     //const SdrObject* pTextObjTmp=GetView().GetTextEditObject();
     //const SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextObjTmp);
     //FASTBOOL bTextFrame=pText!=NULL && pText->IsTextFrame();
-    ULONG nViewAnz=GetView().pTextEditOutliner->GetViewCount();
-    for (ULONG i=0; i<nViewAnz; i++) {
+    sal_uIntPtr nViewAnz=GetView().pTextEditOutliner->GetViewCount();
+    for (sal_uIntPtr i=0; i<nViewAnz; i++) {
         OutlinerView* pOLV=GetView().pTextEditOutliner->GetView(i);
         if (pOLV->GetWindow()==pOut) {
             GetView().ImpPaintOutlinerView(*pOLV, rRect);
@@ -497,7 +497,7 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef OS2
-#define RGBCOLOR(r,g,b) ((ULONG)(((BYTE)(b) | ((USHORT)(g)<<8)) | (((ULONG)(BYTE)(r))<<16)))
+#define RGBCOLOR(r,g,b) ((sal_uIntPtr)(((sal_uInt8)(b) | ((sal_uInt16)(g)<<8)) | (((sal_uIntPtr)(sal_uInt8)(r))<<16)))
 #endif
 
 void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor)
@@ -604,11 +604,11 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
         long y1=GetPage()->GetUppBorder()+1+nWrX;
         long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY;
         const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,NULL);
-        //USHORT nBufSiz=1024; // 4k Buffer = max. 512 Punkte
+        //sal_uInt16 nBufSiz=1024; // 4k Buffer = max. 512 Punkte
         // #90353# long* pBuf = NULL;
-        USHORT nGridPaintAnz=1;
+        sal_uInt16 nGridPaintAnz=1;
         if (pFrames!=NULL) nGridPaintAnz=pFrames->GetCount();
-        for (USHORT nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) {
+        for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) {
             if (pFrames!=NULL) {
                 const SdrPageGridFrame& rGF=(*pFrames)[nGridPaintNum];
                 nWrX=rGF.GetPaperRect().Left();
@@ -649,13 +649,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
             {
                 if( bHoriLines )
                 {
-                    ULONG nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS );
-                    UINT16 nSteps = sal_uInt16(nx1 / nx2);
-                    UINT32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0;
-                    UINT32 nStepOffset = 0;
-                    UINT16 nPointOffset = 0;
+                    sal_uIntPtr nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS );
+                    sal_uInt16 nSteps = sal_uInt16(nx1 / nx2);
+                    sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0;
+                    sal_uInt32 nStepOffset = 0;
+                    sal_uInt16 nPointOffset = 0;
 
-                    for(UINT16 a=0;a<nSteps;a++)
+                    for(sal_uInt16 a=0;a<nSteps;a++)
                     {
                         // Zeichnen
                         rOut.DrawGrid(
@@ -674,13 +674,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
 
                 if( bVertLines )
                 {
-                    ULONG nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS );
-                    UINT16 nSteps = sal_uInt16(ny1 / ny2);
-                    UINT32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0;
-                    UINT32 nStepOffset = 0;
-                    UINT16 nPointOffset = 0;
+                    sal_uIntPtr nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS );
+                    sal_uInt16 nSteps = sal_uInt16(ny1 / ny2);
+                    sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0;
+                    sal_uInt32 nStepOffset = 0;
+                    sal_uInt16 nPointOffset = 0;
 
-                    for(UINT16 a=0;a<nSteps;a++)
+                    for(sal_uInt16 a=0;a<nSteps;a++)
                     {
                         // Zeichnen
                         rOut.DrawGrid(
@@ -806,7 +806,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
         {
             // Der Layer muss sichtbar und darf nicht gesperrt sein
             SdrLayerID nL = pObj->GetLayer();
-            return (aLayerVisi.IsSet(BYTE(nL)) && !aLayerLock.IsSet(BYTE(nL)));
+            return (aLayerVisi.IsSet(sal_uInt8(nL)) && !aLayerLock.IsSet(sal_uInt8(nL)));
         }
     }
 
@@ -823,7 +823,7 @@ void SdrPageView::SetPageOrigin(const Point& rOrg)
     }
 }
 
-void SdrPageView::ImpInvalidateHelpLineArea(USHORT nNum) const
+void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const
 {
     if (GetView().IsHlplVisible() && nNum<aHelpLines.GetCount()) {
         const SdrHelpLine& rHL=aHelpLines[nNum];
@@ -853,14 +853,14 @@ void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL)
     InvalidateAllWin();
 }
 
-void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine)
+void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine)
 {
     if (nNum<aHelpLines.GetCount() && aHelpLines[nNum]!=rNewHelpLine) {
-        FASTBOOL bNeedRedraw=TRUE;
+        FASTBOOL bNeedRedraw=sal_True;
         if (aHelpLines[nNum].GetKind()==rNewHelpLine.GetKind()) {
             switch (rNewHelpLine.GetKind()) {
-                case SDRHELPLINE_VERTICAL  : if (aHelpLines[nNum].GetPos().X()==rNewHelpLine.GetPos().X()) bNeedRedraw=FALSE; break;
-                case SDRHELPLINE_HORIZONTAL: if (aHelpLines[nNum].GetPos().Y()==rNewHelpLine.GetPos().Y()) bNeedRedraw=FALSE; break;
+                case SDRHELPLINE_VERTICAL  : if (aHelpLines[nNum].GetPos().X()==rNewHelpLine.GetPos().X()) bNeedRedraw=sal_False; break;
+                case SDRHELPLINE_HORIZONTAL: if (aHelpLines[nNum].GetPos().Y()==rNewHelpLine.GetPos().Y()) bNeedRedraw=sal_False; break;
                 default: break;
             } // switch
         }
@@ -870,7 +870,7 @@ void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine)
     }
 }
 
-void SdrPageView::DeleteHelpLine(USHORT nNum)
+void SdrPageView::DeleteHelpLine(sal_uInt16 nNum)
 {
     if (nNum<aHelpLines.GetCount()) {
         ImpInvalidateHelpLineArea(nNum);
@@ -878,7 +878,7 @@ void SdrPageView::DeleteHelpLine(USHORT nNum)
     }
 }
 
-void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum)
+void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum)
 {
     if (nNum>aHelpLines.GetCount()) nNum=aHelpLines.GetCount();
     aHelpLines.Insert(rHL,nNum);
@@ -961,7 +961,7 @@ void SdrPageView::LeaveOneGroup()
 {
     if(GetAktGroup())
     {
-        BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible());
+        sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
 
         if(bGlueInvalidate)
             GetView().GlueInvalidate();
@@ -999,7 +999,7 @@ void SdrPageView::LeaveAllGroup()
 {
     if(GetAktGroup())
     {
-        BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible());
+        sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
 
         if(bGlueInvalidate)
             GetView().GlueInvalidate();
@@ -1033,9 +1033,9 @@ void SdrPageView::LeaveAllGroup()
     }
 }
 
-USHORT SdrPageView::GetEnteredLevel() const
+sal_uInt16 SdrPageView::GetEnteredLevel() const
 {
-    USHORT nAnz=0;
+    sal_uInt16 nAnz=0;
     SdrObject* pGrp=GetAktGroup();
     while (pGrp!=NULL) {
         nAnz++;
@@ -1062,7 +1062,7 @@ XubString SdrPageView::GetActualGroupName() const
 XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const
 {
     XubString aStr;
-    BOOL bNamFnd(FALSE);
+    sal_Bool bNamFnd(sal_False);
     SdrObject* pGrp = GetAktGroup();
 
     while(pGrp)
@@ -1072,7 +1072,7 @@ XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const
         if(!aStr1.Len())
             aStr1 += sal_Unicode('?');
         else
-            bNamFnd = TRUE;
+            bNamFnd = sal_True;
 
         aStr += aStr1;
         pGrp = pGrp->GetUpGroup();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 1d74ed119c33..aaa83ed5f1fe 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -222,23 +222,23 @@ void SdrPaintView::ImpClearVars()
 #ifdef DBG_UTIL
     pItemBrowser=NULL;
 #endif
-    bPageVisible=TRUE;
-    bPageBorderVisible=TRUE;
-    bBordVisible=TRUE;
-    bGridVisible=TRUE;
-    bGridFront  =FALSE;
-    bHlplVisible=TRUE;
-    bHlplFront  =TRUE;
-    bGlueVisible=FALSE;
-    bGlueVisible2=FALSE;
-    bGlueVisible3=FALSE;
-    bGlueVisible4=FALSE;
-    bSwapAsynchron=FALSE;
-    bPrintPreview=FALSE;
-    mbPreviewRenderer=FALSE;
+    bPageVisible=sal_True;
+    bPageBorderVisible=sal_True;
+    bBordVisible=sal_True;
+    bGridVisible=sal_True;
+    bGridFront  =sal_False;
+    bHlplVisible=sal_True;
+    bHlplFront  =sal_True;
+    bGlueVisible=sal_False;
+    bGlueVisible2=sal_False;
+    bGlueVisible3=sal_False;
+    bGlueVisible4=sal_False;
+    bSwapAsynchron=sal_False;
+    bPrintPreview=sal_False;
+    mbPreviewRenderer=sal_False;
 
     eAnimationMode = SDR_ANIMATION_ANIMATE;
-    bAnimationPause = FALSE;
+    bAnimationPause = sal_False;
 
     nHitTolPix=2;
     nMinMovPix=3;
@@ -246,16 +246,16 @@ void SdrPaintView::ImpClearVars()
     nMinMovLog=0;
     pActualOutDev=NULL;
     pDragWin=NULL;
-    bRestoreColors=TRUE;
+    bRestoreColors=sal_True;
     pDefaultStyleSheet=NULL;
-    bSomeObjChgdFlag=FALSE;
+    bSomeObjChgdFlag=sal_False;
     nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD;
     aComeBackTimer.SetTimeout(1);
     aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
     String aNam;    // System::GetUserName() just return an empty string
 
     if (pMod)
-        SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), TRUE);
+        SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), sal_True);
 
     aNam.ToUpperAscii();
 
@@ -285,7 +285,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
     }
 
     // Flag zur Visualisierung von Gruppen
-    bVisualizeEnteredGroup = TRUE;
+    bVisualizeEnteredGroup = sal_True;
 
     maColorConfig.AddListener(this);
     onChangeColorConfig();
@@ -330,14 +330,14 @@ void __EXPORT SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
         return;
     }
 
-    BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
+    sal_Bool bObjChg=!bSomeObjChgdFlag; // sal_True= auswerten fuer ComeBack-Timer
     if (bObjChg) {
         SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
         if (pSdrHint!=NULL) {
             SdrHintKind eKind=pSdrHint->GetKind();
             if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) {
                 if (bObjChg) {
-                    bSomeObjChgdFlag=TRUE;
+                    bSomeObjChgdFlag=sal_True;
                     aComeBackTimer.Start();
                 }
             }
@@ -367,7 +367,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
 IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG)
 {
     if (bSomeObjChgdFlag) {
-        bSomeObjChgdFlag=FALSE;
+        bSomeObjChgdFlag=sal_False;
         ModelHasChanged();
     }
     return 0;
@@ -407,7 +407,7 @@ void SdrPaintView::ModelHasChanged()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrPaintView::IsAction() const
+sal_Bool SdrPaintView::IsAction() const
 {
     return IsEncirclement();
 }
@@ -461,9 +461,9 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const
+sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const
 {
-    if (nMinMov>=0) return USHORT(nMinMov);
+    if (nMinMov>=0) return sal_uInt16(nMinMov);
     if (pOut==NULL)
     {
         pOut = GetFirstOutputDevice();
@@ -475,9 +475,9 @@ USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut)
     }
 }
 
-USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const
+sal_uInt16 SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const
 {
-    if (nHitTol>=0) return USHORT(nHitTol);
+    if (nHitTol>=0) return sal_uInt16(nHitTol);
     if (pOut==NULL)
     {
         pOut = GetFirstOutputDevice();
@@ -492,8 +492,8 @@ USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut)
 void SdrPaintView::TheresNewMapMode()
 {
     if (pActualOutDev!=NULL) {
-        nHitTolLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width();
-        nMinMovLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width();
+        nHitTolLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width();
+        nMinMovLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width();
     }
 }
 
@@ -643,7 +643,7 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
 #endif
 }
 
-void SdrPaintView::SetLayerVisible(const XubString& rName, BOOL bShow)
+void SdrPaintView::SetLayerVisible(const XubString& rName, sal_Bool bShow)
 {
     if(mpPageView)
     {
@@ -663,7 +663,7 @@ bool SdrPaintView::IsLayerVisible(const XubString& rName) const
     return false;
 }
 
-void SdrPaintView::SetAllLayersVisible(BOOL bShow)
+void SdrPaintView::SetAllLayersVisible(sal_Bool bShow)
 {
     if(mpPageView)
     {
@@ -673,7 +673,7 @@ void SdrPaintView::SetAllLayersVisible(BOOL bShow)
     InvalidateAllWin();
 }
 
-void SdrPaintView::SetLayerLocked(const XubString& rName, BOOL bLock)
+void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock)
 {
     if(mpPageView)
     {
@@ -691,7 +691,7 @@ bool SdrPaintView::IsLayerLocked(const XubString& rName) const
     return false;
 }
 
-void SdrPaintView::SetAllLayersLocked(BOOL bLock)
+void SdrPaintView::SetAllLayersLocked(sal_Bool bLock)
 {
     if(mpPageView)
     {
@@ -699,7 +699,7 @@ void SdrPaintView::SetAllLayersLocked(BOOL bLock)
     }
 }
 
-void SdrPaintView::SetLayerPrintable(const XubString& rName, BOOL bPrn)
+void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn)
 {
     if(mpPageView)
     {
@@ -717,7 +717,7 @@ bool SdrPaintView::IsLayerPrintable(const XubString& rName) const
     return false;
 }
 
-void SdrPaintView::SetAllLayersPrintable(BOOL bPrn)
+void SdrPaintView::SetAllLayersPrintable(sal_Bool bPrn)
 {
     if(mpPageView)
     {
@@ -1070,9 +1070,9 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/)
+sal_Bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrPaintView::GlueInvalidate() const
@@ -1090,8 +1090,8 @@ void SdrPaintView::GlueInvalidate() const
             if(mpPageView)
             {
                 const SdrObjList* pOL=mpPageView->GetObjList();
-                ULONG nObjAnz=pOL->GetObjCount();
-                for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+                sal_uIntPtr nObjAnz=pOL->GetObjCount();
+                for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
                     const SdrObject* pObj=pOL->GetObj(nObjNum);
                     const SdrGluePointList* pGPL=pObj->GetGluePointList();
                     if (pGPL!=NULL && pGPL->GetCount()!=0) {
@@ -1118,7 +1118,7 @@ void SdrPaintView::InvalidateAllWin()
     }
 }
 
-void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix)
+void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix)
 {
     const sal_uInt32 nWindowCount(PaintWindowCount());
 
@@ -1193,12 +1193,12 @@ bool SdrPaintView::IsGroupEntered() const
     return false;
 }
 
-void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/)
+void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
 {
     // bReplaceAll hat hier keinerlei Wirkung
-    BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
+    sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
     const SfxPoolItem *pPoolItem=NULL;
-    if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         SdrLayerID nLayerId=((const SdrLayerIdItem*)pPoolItem)->GetValue();
         const SdrLayer* pLayer=pMod->GetLayerAdmin().GetLayerPerID(nLayerId);
         if (pLayer!=NULL) {
@@ -1206,35 +1206,35 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bRep
             else aAktLayer=pLayer->GetName();
         }
     }
-    if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         if (bMeasure) aMeasureLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue();
         else aAktLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue();
     }
 }
 
-void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const
+void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
 {
     // bOnlyHardAttr hat hier keinerlei Wirkung
-    BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
+    sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
     const XubString& aNam=bMeasure?aMeasureLayer:aAktLayer;
     rAttr.Put(SdrLayerNameItem(aNam));
-    SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,TRUE);
+    SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True);
     if (nLayer!=SDRLAYER_NOTFOUND) {
         rAttr.Put(SdrLayerIdItem(nLayer));
     }
 }
 
-void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll)
+void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
 {
 #ifdef DBG_UTIL
     {
-        BOOL bHasEEFeatureItems=FALSE;
+        sal_Bool bHasEEFeatureItems=sal_False;
         SfxItemIter aIter(rAttr);
         const SfxPoolItem* pItem=aIter.FirstItem();
         while (!bHasEEFeatureItems && pItem!=NULL) {
             if (!IsInvalidItem(pItem)) {
-                USHORT nW=pItem->Which();
-                if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE;
+                sal_uInt16 nW=pItem->Which();
+                if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True;
             }
             pItem=aIter.NextItem();
         }
@@ -1248,14 +1248,14 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll)
     }
 #endif
     if (bReplaceAll) aDefaultAttr.Set(rAttr);
-    else aDefaultAttr.Put(rAttr,FALSE); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten
+    else aDefaultAttr.Put(rAttr,sal_False); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten
     SetNotPersistDefaultAttr(rAttr,bReplaceAll);
 #ifdef DBG_UTIL
     if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
 }
 
-void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (pDefaultStyleSheet)
         EndListening(*pDefaultStyleSheet);
@@ -1265,9 +1265,9 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe
 
     if (pStyleSheet!=NULL && !bDontRemoveHardAttr) {
         SfxWhichIter aIter(pStyleSheet->GetItemSet());
-        USHORT nWhich=aIter.FirstWhich();
+        sal_uInt16 nWhich=aIter.FirstWhich();
         while (nWhich!=0) {
-            if (pStyleSheet->GetItemSet().GetItemState(nWhich,TRUE)==SFX_ITEM_SET) {
+            if (pStyleSheet->GetItemSet().GetItemState(nWhich,sal_True)==SFX_ITEM_SET) {
                 aDefaultAttr.ClearItem(nWhich);
             }
             nWhich=aIter.NextWhich();
@@ -1279,49 +1279,49 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe
 }
 
 /* new interface src537 */
-BOOL SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if(bOnlyHardAttr || !pDefaultStyleSheet)
     {
-        rTargetSet.Put(aDefaultAttr, FALSE);
+        rTargetSet.Put(aDefaultAttr, sal_False);
     }
     else
     {
         // sonst DefStyleSheet dazumergen
-        rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), FALSE);
-        rTargetSet.Put(aDefaultAttr, FALSE);
+        rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), sal_False);
+        rTargetSet.Put(aDefaultAttr, sal_False);
     }
     MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr);
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrPaintView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
     SetDefaultAttr(rSet,bReplaceAll);
-    return TRUE;
+    return sal_True;
 }
 
-SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(sal_Bool& rOk) const
 {
-    //rOk=TRUE;
+    //rOk=sal_True;
     return GetDefaultStyleSheet();
 }
 
-BOOL SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr);
-    return TRUE;
+    return sal_True;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef DBG_UTIL
-void SdrPaintView::ShowItemBrowser(BOOL bShow)
+void SdrPaintView::ShowItemBrowser(sal_Bool bShow)
 {
     if (bShow) {
         if (pItemBrowser==NULL) {
             pItemBrowser=new SdrItemBrowser(*(SdrView*)this);
-            pItemBrowser->SetFloatingMode(TRUE);
+            pItemBrowser->SetFloatingMode(sal_True);
         }
         pItemBrowser->Show();
         pItemBrowser->GrabFocus();
@@ -1343,12 +1343,12 @@ void SdrPaintView::MakeVisible(const Rectangle& rRect, Window& rWin)
     if( aActualSize.Height() > 0 && aActualSize.Width() > 0 )
     {
         Size aNewSize(rRect.GetSize());
-        BOOL bNewScale=FALSE;
-        BOOL bNeedMoreX=aNewSize.Width()>aActualSize.Width();
-        BOOL bNeedMoreY=aNewSize.Height()>aActualSize.Height();
+        sal_Bool bNewScale=sal_False;
+        sal_Bool bNeedMoreX=aNewSize.Width()>aActualSize.Width();
+        sal_Bool bNeedMoreY=aNewSize.Height()>aActualSize.Height();
         if (bNeedMoreX || bNeedMoreY)
         {
-            bNewScale=TRUE;
+            bNewScale=sal_True;
             // Neuen MapMode (Size+Org) setzen und dabei alles invalidieren
             Fraction aXFact(aNewSize.Width(),aActualSize.Width());
             Fraction aYFact(aNewSize.Height(),aActualSize.Height());
@@ -1388,7 +1388,7 @@ void SdrPaintView::DoConnect(SdrOle2Obj* /*pOleObj*/)
 {
 }
 
-void SdrPaintView::SetAnimationEnabled( BOOL bEnable )
+void SdrPaintView::SetAnimationEnabled( sal_Bool bEnable )
 {
     SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE );
 }
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 3a3942319661..75be5919b114 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -51,8 +51,8 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags()
 {
     eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE;
     eMarkedSegmentsKind=SDRPATHSEGMENT_DONTCARE;
-    bSetMarkedPointsSmoothPossible=FALSE;
-    bSetMarkedSegmentsKindPossible=FALSE;
+    bSetMarkedPointsSmoothPossible=sal_False;
+    bSetMarkedSegmentsKindPossible=sal_False;
 }
 
 void SdrPolyEditView::ImpClearVars()
@@ -73,7 +73,7 @@ SdrPolyEditView::~SdrPolyEditView()
 void SdrPolyEditView::ImpCheckPolyPossibilities()
 {
     ImpResetPolyPossibilityFlags();
-    const ULONG nMarkAnz(GetMarkedObjectCount());
+    const sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
 
     if(nMarkAnz && !ImpIsFrameHandles())
     {
@@ -84,7 +84,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities()
         bool bSegmFuz(false);
         basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE;
 
-        for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
+        for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
         {
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
             CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth );
@@ -214,9 +214,9 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints());
-        ULONG nMarkAnz(GetMarkedObjectCount());
+        sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
 
-        for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;)
+        for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
         {
             nMarkNum--;
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -249,9 +249,9 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints());
-        ULONG nMarkAnz(GetMarkedObjectCount());
+        sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
 
-        for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;)
+        for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
         {
             nMarkNum--;
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -275,7 +275,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
     }
 }
 
-BOOL SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
+sal_Bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
 {
     ForcePossibilities();
     return bSetMarkedPointsSmoothPossible;
@@ -287,7 +287,7 @@ SdrPathSmoothKind SdrPolyEditView::GetMarkedPointsSmooth() const
     return eMarkedPointsSmooth;
 }
 
-BOOL SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
+sal_Bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
 {
     ForcePossibilities();
     return bSetMarkedSegmentsKindPossible;
@@ -299,7 +299,7 @@ SdrPathSegmentKind SdrPolyEditView::GetMarkedSegmentsKind() const
     return eMarkedSegmentsKind;
 }
 
-BOOL SdrPolyEditView::IsDeleteMarkedPointsPossible() const
+sal_Bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const
 {
     return HasMarkedPoints();
 }
@@ -310,7 +310,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
     {
         BrkAction();
         SortMarkedObjects();
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
 
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
@@ -319,7 +319,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
             BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE);
         }
 
-        for (ULONG nMarkNum=nMarkAnz; nMarkNum>0;)
+        for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;)
         {
             nMarkNum--;
             SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -400,13 +400,13 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
                         pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason);
                         if( bUndo )
                             AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
-                        MarkObj(pNeuObj, pM->GetPageView(), FALSE, TRUE);
+                        MarkObj(pNeuObj, pM->GetPageView(), sal_False, sal_True);
                     }
 
                     if(nNewPt0Idx)
                     {
                         // Korrektur notwendig?
-                        DBG_ASSERT(bKorregFlag==FALSE,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()");
+                        DBG_ASSERT(bKorregFlag==sal_False,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()");
                         if(!bKorregFlag)
                         {
                             bKorregFlag = sal_True;
@@ -555,7 +555,7 @@ void SdrPolyEditView::ShutMarkedObjects()
     CloseMarkedObjects();
 }
 
-void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOpenDistance)
+void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance)
 {
     if (AreObjectsMarked())
     {
@@ -564,12 +564,12 @@ void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOp
             BegUndo(ImpGetResStr(STR_EditShut),GetDescriptionOfMarkedPoints());
 
         bool bChg=false;
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        for (ULONG nm=0; nm<nMarkAnz; nm++)
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pO=pM->GetMarkedSdrObj();
-            BOOL bClosed=pO->IsClosedObj();
+            sal_Bool bClosed=pO->IsClosedObj();
             if (pO->IsPolyObj() && (bClosed==bOpen) || bToggle)
             {
                 if( bUndo )
@@ -605,13 +605,13 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
 {
     const bool bUndo = IsUndoEnabled();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedPoints();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
         if (nPtAnz!=0 && pPath!=NULL)
         {
@@ -685,7 +685,7 @@ static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const vo
 
 void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy)
 {
-    bCopy=FALSE; // noch nicht implementiert
+    bCopy=sal_False; // noch nicht implementiert
     ForceUndirtyMrkPnt();
     XubString aStr(ImpGetResStr(STR_EditMove));
     if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -707,7 +707,7 @@ static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
 
 void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy)
 {
-    bCopy=FALSE; // noch nicht implementiert
+    bCopy=sal_False; // noch nicht implementiert
     ForceUndirtyMrkPnt();
     XubString aStr(ImpGetResStr(STR_EditResize));
     if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -729,7 +729,7 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
 
 void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCopy)
 {
-    bCopy=FALSE; // noch nicht implementiert
+    bCopy=sal_False; // noch nicht implementiert
     ForceUndirtyMrkPnt();
     XubString aStr(ImpGetResStr(STR_EditResize));
     if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index a58081ad0ee0..d44be3d6bab0 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -203,29 +203,29 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
 void SdrSnapView::ClearVars()
 {
     nMagnSizPix=4;
-    bSnapEnab=TRUE;
-    bGridSnap=TRUE;
-    bSnapTo1Pix=TRUE;
-    bBordSnap=TRUE;
-    bHlplSnap=TRUE;
-    bOFrmSnap=TRUE;
-    bOPntSnap=FALSE;
-    bOConSnap=TRUE;
-    bMoveMFrmSnap=TRUE;
-    bMoveOFrmSnap=TRUE;
-    bMoveOPntSnap=TRUE;
-    bMoveOConSnap=TRUE;
-    bMoveSnapOnlyTopLeft=FALSE;
-    bOrtho=FALSE;
-    bBigOrtho=TRUE;
+    bSnapEnab=sal_True;
+    bGridSnap=sal_True;
+    bSnapTo1Pix=sal_True;
+    bBordSnap=sal_True;
+    bHlplSnap=sal_True;
+    bOFrmSnap=sal_True;
+    bOPntSnap=sal_False;
+    bOConSnap=sal_True;
+    bMoveMFrmSnap=sal_True;
+    bMoveOFrmSnap=sal_True;
+    bMoveOPntSnap=sal_True;
+    bMoveOConSnap=sal_True;
+    bMoveSnapOnlyTopLeft=sal_False;
+    bOrtho=sal_False;
+    bBigOrtho=sal_True;
     nSnapAngle=1500;
-    bAngleSnapEnab=FALSE;
-    bMoveOnlyDragging=FALSE;
-    bSlantButShear=FALSE;
-    bCrookNoContortion=FALSE;
+    bAngleSnapEnab=sal_False;
+    bMoveOnlyDragging=sal_False;
+    bSlantButShear=sal_False;
+    bCrookNoContortion=sal_False;
     eCrookMode=SDRCROOK_ROTATE;
-    bHlplFixed=FALSE;
-    bEliminatePolyPoints=FALSE;
+    bHlplFixed=sal_False;
+    bEliminatePolyPoints=sal_False;
     nEliminatePolyPointLimitAngle=0;
 
     // #114409#-1 Migrate PageOrigin
@@ -257,7 +257,7 @@ SdrSnapView::~SdrSnapView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrSnapView::IsAction() const
+sal_Bool SdrSnapView::IsAction() const
 {
     return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction();
 }
@@ -317,14 +317,14 @@ Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const
 }
 
 #define NOT_SNAPPED 0x7FFFFFFF
-USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
+sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
 {
     if (!bSnapEnab) return SDRSNAP_NOTSNAPPED;
-    BOOL bPVOfs=FALSE;
+    sal_Bool bPVOfs=sal_False;
     long x=rPnt.X();
     long y=rPnt.Y();
     if (pPV==NULL) {
-        bPVOfs=TRUE;
+        bPVOfs=sal_True;
         pPV=GetSdrPageView();
         if (pPV==NULL) return SDRSNAP_NOTSNAPPED;
     }
@@ -337,8 +337,8 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
     if (bHlplVisible && bHlplSnap && !IsDragHelpLine())
     {
         const SdrHelpLineList& rHLL=pPV->GetHelpLines();
-        USHORT nAnz=rHLL.GetCount();
-        for (USHORT i=nAnz; i>0;) {
+        sal_uInt16 nAnz=rHLL.GetCount();
+        for (sal_uInt16 i=nAnz; i>0;) {
             i--;
             const SdrHelpLine& rHL=rHLL[i];
             const Point& rPos=rHL.GetPos();
@@ -381,11 +381,11 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
         a=y- ys     ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // rechte Papierkante
     }
     if (bOFrmSnap || bOPntSnap /*|| (bConnVisible && bOConSnap)*/) {
-        ULONG nMaxPointSnapCount=200;
-        ULONG nMaxFrameSnapCount=200;
+        sal_uIntPtr nMaxPointSnapCount=200;
+        sal_uIntPtr nMaxFrameSnapCount=200;
 
         // #97981# go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons
-        SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,TRUE);
+        SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,sal_True);
 
         while (aIter.IsMore() && (nMaxPointSnapCount>0 || nMaxFrameSnapCount>0)) {
             SdrObject* pO=aIter.Next();
@@ -461,7 +461,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
             dy = 0;
         }
     }
-    BOOL bRet=SDRSNAP_NOTSNAPPED;
+    sal_Bool bRet=SDRSNAP_NOTSNAPPED;
     if (dx==NOT_SNAPPED) dx=0; else bRet|=SDRSNAP_XSNAPPED;
     if (dy==NOT_SNAPPED) dy=0; else bRet|=SDRSNAP_YSNAPPED;
     rPnt.X()=x+dx;
@@ -472,7 +472,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
 void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const
 {
     Point aPt(rPt);
-    USHORT nRet=SnapPos(aPt,pPV);
+    sal_uInt16 nRet=SnapPos(aPt,pPV);
     aPt-=rPt;
     if ((nRet & SDRSNAP_XSNAPPED) !=0) {
         if (bXSnapped) {
@@ -481,7 +481,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
             }
         } else {
             nBestXSnap=aPt.X();
-            bXSnapped=TRUE;
+            bXSnapped=sal_True;
         }
     }
     if ((nRet & SDRSNAP_YSNAPPED) !=0) {
@@ -491,17 +491,17 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
             }
         } else {
             nBestYSnap=aPt.Y();
-            bYSnapped=TRUE;
+            bYSnapped=sal_True;
         }
     }
 }
 
-USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const
+sal_uInt16 SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const
 {
     long nBestXSnap=0;
     long nBestYSnap=0;
-    bool bXSnapped=FALSE;
-    bool bYSnapped=FALSE;
+    bool bXSnapped=sal_False;
+    bool bYSnapped=sal_False;
     CheckSnap(rRect.TopLeft()    ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
     if (!bMoveSnapOnlyTopLeft) {
         CheckSnap(rRect.TopRight()   ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
@@ -510,7 +510,7 @@ USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, lon
     }
     rDX=nBestXSnap;
     rDY=nBestYSnap;
-    USHORT nRet=0;
+    sal_uInt16 nRet=0;
     if (bXSnapped) nRet+=SDRSNAP_XSNAPPED;
     if (bYSnapped) nRet+=SDRSNAP_YSNAPPED;
     return nRet;
@@ -575,7 +575,7 @@ void SdrSnapView::BrkSetPageOrg()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const
+sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const
 {
     rpPV=NULL;
     nTol=ImpGetHitTolLogic(nTol,&rOut);
@@ -584,7 +584,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe
     if(pPV)
     {
         Point aPnt(rPnt);
-        USHORT nIndex=pPV->GetHelpLines().HitTest(aPnt,USHORT(nTol),rOut);
+        sal_uInt16 nIndex=pPV->GetHelpLines().HitTest(aPnt,sal_uInt16(nTol),rOut);
         if (nIndex!=SDRHELPLINE_NOTFOUND) {
             rpPV=pPV;
             rnHelpLineNum=nIndex;
@@ -595,7 +595,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe
 }
 
 // start HelpLine drag for new HelpLine
-sal_Bool SdrSnapView::BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV)
+sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
 {
     sal_Bool bRet(sal_False);
 
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 29018b6084ea..cc65d71f8e05 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -76,7 +76,7 @@ void SdrText::CheckPortionInfo( SdrOutliner& rOutliner )
 
 void SdrText::ReformatText()
 {
-    mbPortionInfoChecked=FALSE;
+    mbPortionInfoChecked=sal_False;
     mpOutlinerParaObject->ClearPortionInfo();
 }
 
@@ -140,7 +140,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
 
     if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL)
     {
-        bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, TRUE) == SFX_ITEM_SET;
+        bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, sal_True) == SFX_ITEM_SET;
 
         MapUnit aOldUnit(pOldModel->GetScaleUnit());
         MapUnit aNewUnit(pNewModel->GetScaleUnit());
@@ -149,10 +149,10 @@ void SdrText::SetModel( SdrModel* pNewModel )
         // !!! Hier muss noch DefTab und RefDevice der beiden Models
         // !!! verglichen werden und dann ggf. AutoGrow zuschlagen !!!
         // !!! fehlende Implementation !!!
-        ULONG nOldFontHgt=pOldModel->GetDefaultFontHeight();
-        ULONG nNewFontHgt=pNewModel->GetDefaultFontHeight();
-        BOOL bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
-        BOOL bSetHgtItem=bDefHgtChanged && !bHgtSet;
+        sal_uIntPtr nOldFontHgt=pOldModel->GetDefaultFontHeight();
+        sal_uIntPtr nNewFontHgt=pNewModel->GetDefaultFontHeight();
+        sal_Bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
+        sal_Bool bSetHgtItem=bDefHgtChanged && !bHgtSet;
         if (bSetHgtItem)
         { // #32665#
             // zunaechst das HeightItem festklopfen, damit
@@ -172,7 +172,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
             // Funktioniert nicht richtig:
             // Geht am Outliner leider nur in %
             // double nPercFloat=double(aMetricFactor)*100+0.5;
-            // USHORT nPerc=(USHORT)nPercFloat;
+            // sal_uInt16 nPerc=(sal_uInt16)nPercFloat;
             // rOutliner.DoStretchChars(100,nPerc);
 
             if (bSetHgtItem)
@@ -184,12 +184,12 @@ void SdrText::SetModel( SdrModel* pNewModel )
         }
         SetOutlinerParaObject(rOutliner.CreateParaObject()); // #34494#
         mpOutlinerParaObject->ClearPortionInfo();
-        mbPortionInfoChecked=FALSE;
+        mbPortionInfoChecked=sal_False;
         rOutliner.Clear();
     }
 }
 
-void SdrText::ForceOutlinerParaObject( USHORT nOutlMode )
+void SdrText::ForceOutlinerParaObject( sal_uInt16 nOutlMode )
 {
     if( mpModel && !mpOutlinerParaObject )
     {
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index ad4cf3763241..5559b3a9df03 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -93,32 +93,32 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con
 
 void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    USHORT nAnz=rPoly.GetSize();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetSize();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ResizePoint(rPoly[i],rRef,xFact,yFact);
     }
 }
 
 void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    USHORT nAnz=rPoly.GetPointCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetPointCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ResizePoint(rPoly[i],rRef,xFact,yFact);
     }
 }
 
 void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ResizePoly(rPoly[i],rRef,xFact,yFact);
     }
 }
 
 void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ResizeXPoly(rPoly[i],rRef,xFact,yFact);
     }
 }
@@ -127,32 +127,32 @@ void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact,
 
 void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs)
 {
-    USHORT nAnz=rPoly.GetSize();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetSize();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         RotatePoint(rPoly[i],rRef,sn,cs);
     }
 }
 
 void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs)
 {
-    USHORT nAnz=rPoly.GetPointCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetPointCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         RotatePoint(rPoly[i],rRef,sn,cs);
     }
 }
 
 void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         RotatePoly(rPoly[i],rRef,sn,cs);
     }
 }
 
 void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         RotateXPoly(rPoly[i],rRef,sn,cs);
     }
 }
@@ -202,32 +202,32 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2)
 
 void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2)
 {
-    USHORT nAnz=rPoly.GetSize();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetSize();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         MirrorPoint(rPoly[i],rRef1,rRef2);
     }
 }
 
 void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2)
 {
-    USHORT nAnz=rPoly.GetPointCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetPointCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         MirrorPoint(rPoly[i],rRef1,rRef2);
     }
 }
 
 void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         MirrorPoly(rPoly[i],rRef1,rRef2);
     }
 }
 
 void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         MirrorXPoly(rPoly[i],rRef1,rRef2);
     }
 }
@@ -236,32 +236,32 @@ void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
 
 void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
 {
-    USHORT nAnz=rPoly.GetSize();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetSize();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ShearPoint(rPoly[i],rRef,tn,bVShear);
     }
 }
 
 void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
 {
-    USHORT nAnz=rPoly.GetPointCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetPointCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ShearPoint(rPoly[i],rRef,tn,bVShear);
     }
 }
 
 void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ShearPoly(rPoly[i],rRef,tn,bVShear);
     }
 }
 
 void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ShearXPoly(rPoly[i],rRef,tn,bVShear);
     }
 }
@@ -415,8 +415,8 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen
 void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
 {
     double nSin,nCos;
-    USHORT nPointAnz=rPoly.GetPointCount();
-    USHORT i=0;
+    sal_uInt16 nPointAnz=rPoly.GetPointCount();
+    sal_uInt16 i=0;
     while (i<nPointAnz) {
         Point* pPnt=&rPoly[i];
         Point* pC1=NULL;
@@ -438,8 +438,8 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, F
 void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
 {
     double nSin,nCos;
-    USHORT nPointAnz=rPoly.GetPointCount();
-    USHORT i=0;
+    sal_uInt16 nPointAnz=rPoly.GetPointCount();
+    sal_uInt16 i=0;
     while (i<nPointAnz) {
         Point* pPnt=&rPoly[i];
         Point* pC1=NULL;
@@ -461,8 +461,8 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FA
 void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect)
 {
     double nSin,nCos;
-    USHORT nPointAnz=rPoly.GetPointCount();
-    USHORT i=0;
+    sal_uInt16 nPointAnz=rPoly.GetPointCount();
+    sal_uInt16 i=0;
     while (i<nPointAnz) {
         Point* pPnt=&rPoly[i];
         Point* pC1=NULL;
@@ -485,24 +485,24 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad,
 
 void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
 {
-    USHORT nPolyAnz=rPoly.Count();
-    for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+    sal_uInt16 nPolyAnz=rPoly.Count();
+    for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
         CrookRotatePoly(rPoly[nPolyNum],rCenter,rRad,bVert);
     }
 }
 
 void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
 {
-    USHORT nPolyAnz=rPoly.Count();
-    for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+    sal_uInt16 nPolyAnz=rPoly.Count();
+    for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
         CrookSlantPoly(rPoly[nPolyNum],rCenter,rRad,bVert);
     }
 }
 
 void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect)
 {
-    USHORT nPolyAnz=rPoly.Count();
-    for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+    sal_uInt16 nPolyAnz=rPoly.Count();
+    for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
         CrookStretchPoly(rPoly[nPolyNum],rCenter,rRad,bVert,rRefRect);
     }
 }
@@ -537,7 +537,7 @@ long NormAngle360(long a)
     return a;
 }
 
-USHORT GetAngleSector(long nWink)
+sal_uInt16 GetAngleSector(long nWink)
 {
     while (nWink<0) nWink+=36000;
     while (nWink>=36000) nWink-=36000;
@@ -716,17 +716,17 @@ long BigMulDiv(long nVal, long nMul, long nDiv)
 
 void Kuerzen(Fraction& rF, unsigned nDigits)
 {
-    INT32 nMul=rF.GetNumerator();
-    INT32 nDiv=rF.GetDenominator();
-    FASTBOOL bNeg=FALSE;
+    sal_Int32 nMul=rF.GetNumerator();
+    sal_Int32 nDiv=rF.GetDenominator();
+    FASTBOOL bNeg=sal_False;
     if (nMul<0) { nMul=-nMul; bNeg=!bNeg; }
     if (nDiv<0) { nDiv=-nDiv; bNeg=!bNeg; }
     if (nMul==0 || nDiv==0) return;
-    UINT32 a;
-    a=UINT32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen
+    sal_uInt32 a;
+    a=sal_uInt32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen
     while (a<0x00800000) { nMulZ+=8; a<<=8; }
     while (a<0x80000000) { nMulZ++; a<<=1; }
-    a=UINT32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen
+    a=sal_uInt32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen
     while (a<0x00800000) { nDivZ+=8; a<<=8; }
     while (a<0x80000000) { nDivZ++; a<<=1; }
     // Anzahl der verwendeten Digits bestimmen
@@ -863,24 +863,24 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
     // 1 yd      =  3 ft      =     36" =       914,4mm
     // 1 ft      = 12 "       =      1" =       304,8mm
 
-void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, FASTBOOL& rbMetr, FASTBOOL& rbInch)
+void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, int& rbMetr, int& rbInch)
 {
     rnMul=1; rnDiv=1;
     short nKomma=0;
-    FASTBOOL bMetr=FALSE,bInch=FALSE;
+    FASTBOOL bMetr=sal_False,bInch=sal_False;
     switch (eMU) {
         // Metrisch
-        case MAP_100TH_MM   : bMetr=TRUE; nKomma=5; break;
-        case MAP_10TH_MM    : bMetr=TRUE; nKomma=4; break;
-        case MAP_MM         : bMetr=TRUE; nKomma=3; break;
-        case MAP_CM         : bMetr=TRUE; nKomma=2; break;
+        case MAP_100TH_MM   : bMetr=sal_True; nKomma=5; break;
+        case MAP_10TH_MM    : bMetr=sal_True; nKomma=4; break;
+        case MAP_MM         : bMetr=sal_True; nKomma=3; break;
+        case MAP_CM         : bMetr=sal_True; nKomma=2; break;
         // Inch
-        case MAP_1000TH_INCH: bInch=TRUE; nKomma=3; break;
-        case MAP_100TH_INCH : bInch=TRUE; nKomma=2; break;
-        case MAP_10TH_INCH  : bInch=TRUE; nKomma=1; break;
-        case MAP_INCH       : bInch=TRUE; nKomma=0; break;
-        case MAP_POINT      : bInch=TRUE; rnDiv=72;  break;          // 1Pt   = 1/72"
-        case MAP_TWIP       : bInch=TRUE; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
+        case MAP_1000TH_INCH: bInch=sal_True; nKomma=3; break;
+        case MAP_100TH_INCH : bInch=sal_True; nKomma=2; break;
+        case MAP_10TH_INCH  : bInch=sal_True; nKomma=1; break;
+        case MAP_INCH       : bInch=sal_True; nKomma=0; break;
+        case MAP_POINT      : bInch=sal_True; rnDiv=72;  break;          // 1Pt   = 1/72"
+        case MAP_TWIP       : bInch=sal_True; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
         // Sonstiges
         case MAP_PIXEL      : break;
         case MAP_SYSFONT    : break;
@@ -893,26 +893,26 @@ void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, FASTB
     rbInch=bInch;
 }
 
-void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, FASTBOOL& rbMetr, FASTBOOL& rbInch)
+void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, int& rbMetr, int& rbInch)
 {
     rnMul=1; rnDiv=1;
     short nKomma=0;
-    FASTBOOL bMetr=FALSE,bInch=FALSE;
+    FASTBOOL bMetr=sal_False,bInch=sal_False;
     switch (eFU) {
         case FUNIT_NONE     : break;
         // Metrisch
-        case FUNIT_100TH_MM : bMetr=TRUE; nKomma=5; break;
-        case FUNIT_MM       : bMetr=TRUE; nKomma=3; break;
-        case FUNIT_CM       : bMetr=TRUE; nKomma=2; break;
-        case FUNIT_M        : bMetr=TRUE; nKomma=0; break;
-        case FUNIT_KM       : bMetr=TRUE; nKomma=-3; break;
+        case FUNIT_100TH_MM : bMetr=sal_True; nKomma=5; break;
+        case FUNIT_MM       : bMetr=sal_True; nKomma=3; break;
+        case FUNIT_CM       : bMetr=sal_True; nKomma=2; break;
+        case FUNIT_M        : bMetr=sal_True; nKomma=0; break;
+        case FUNIT_KM       : bMetr=sal_True; nKomma=-3; break;
         // Inch
-        case FUNIT_TWIP     : bInch=TRUE; rnDiv=144; nKomma=1; break;  // 1Twip = 1/1440"
-        case FUNIT_POINT    : bInch=TRUE; rnDiv=72; break;   // 1Pt   = 1/72"
-        case FUNIT_PICA     : bInch=TRUE; rnDiv=6; break;    // 1Pica = 1/6"  ?
-        case FUNIT_INCH     : bInch=TRUE; break;             // 1"    = 1"
-        case FUNIT_FOOT     : bInch=TRUE; rnMul=12; break;   // 1Ft   = 12"
-        case FUNIT_MILE     : bInch=TRUE; rnMul=6336; nKomma=-1; break; // 1mile = 63360"
+        case FUNIT_TWIP     : bInch=sal_True; rnDiv=144; nKomma=1; break;  // 1Twip = 1/1440"
+        case FUNIT_POINT    : bInch=sal_True; rnDiv=72; break;   // 1Pt   = 1/72"
+        case FUNIT_PICA     : bInch=sal_True; rnDiv=6; break;    // 1Pica = 1/6"  ?
+        case FUNIT_INCH     : bInch=sal_True; break;             // 1"    = 1"
+        case FUNIT_FOOT     : bInch=sal_True; rnMul=12; break;   // 1Ft   = 12"
+        case FUNIT_MILE     : bInch=sal_True; rnMul=6336; nKomma=-1; break; // 1mile = 63360"
         // sonstiges
         case FUNIT_CUSTOM   : break;
         case FUNIT_PERCENT  : nKomma=2; break;
@@ -960,7 +960,7 @@ void SdrFormatter::Undirty()
     nMul_=nMul1;
     nDiv_=nDiv1;
     nKomma_=nKomma1;
-    bDirty=FALSE;
+    bDirty=sal_False;
 }
 
 
@@ -976,7 +976,7 @@ void SdrFormatter::TakeStr(long nVal, XubString& rStr) const
     }
 
     // Hier fallen trotzdem evtl. Nachkommastellen weg, wg. MulDiv statt Real
-    BOOL bNeg(nVal < 0);
+    sal_Bool bNeg(nVal < 0);
     SvtSysLocale aSysLoc;
     const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData();
 
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index a20ebd9baf65..e1d5d7f9b054 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -57,7 +57,7 @@ static void ImplUnmarkObject( SdrObject* pObj )
     SdrViewIter aIter( pObj );
     for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
     {
-        pView->MarkObj( pObj, pView->GetSdrPageView(), TRUE );
+        pView->MarkObj( pObj, pView->GetSdrPageView(), sal_True );
     }
 }
 
@@ -65,11 +65,11 @@ static void ImplUnmarkObject( SdrObject* pObj )
 
 TYPEINIT1(SdrUndoAction,SfxUndoAction);
 
-BOOL SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const
+sal_Bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const
 {
     SdrView* pV=PTR_CAST(SdrView,&rView);
     if (pV!=NULL) return CanSdrRepeat(*pV);
-    return FALSE;
+    return sal_False;
 }
 
 void SdrUndoAction::Repeat(SfxRepeatTarget& rView)
@@ -88,7 +88,7 @@ XubString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const
 
 bool SdrUndoAction::CanSdrRepeat(SdrView& /*rView*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrUndoAction::SdrRepeat(SdrView& /*rView*/)
@@ -122,7 +122,7 @@ SdrUndoGroup::~SdrUndoGroup()
 
 void SdrUndoGroup::Clear()
 {
-    for (ULONG nu=0; nu<GetActionCount(); nu++) {
+    for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) {
         SdrUndoAction* pAct=GetAction(nu);
         delete pAct;
     }
@@ -136,12 +136,12 @@ void SdrUndoGroup::AddAction(SdrUndoAction* pAct)
 
 void SdrUndoGroup::push_front( SdrUndoAction* pAct )
 {
-    aBuf.Insert(pAct, (ULONG)0 );
+    aBuf.Insert(pAct, (sal_uIntPtr)0 );
 }
 
 void SdrUndoGroup::Undo()
 {
-    for (ULONG nu=GetActionCount(); nu>0;) {
+    for (sal_uIntPtr nu=GetActionCount(); nu>0;) {
         nu--;
         SdrUndoAction* pAct=GetAction(nu);
         pAct->Undo();
@@ -150,7 +150,7 @@ void SdrUndoGroup::Undo()
 
 void SdrUndoGroup::Redo()
 {
-    for (ULONG nu=0; nu<GetActionCount(); nu++) {
+    for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) {
         SdrUndoAction* pAct=GetAction(nu);
         pAct->Redo();
     }
@@ -170,14 +170,14 @@ XubString SdrUndoGroup::GetComment() const
 bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
 {
     switch (eFunction) {
-        case SDRREPFUNC_OBJ_NONE            :  return FALSE;
+        case SDRREPFUNC_OBJ_NONE            :  return sal_False;
         case SDRREPFUNC_OBJ_DELETE          :  return rView.AreObjectsMarked();
-        case SDRREPFUNC_OBJ_COMBINE_POLYPOLY:  return rView.IsCombinePossible(FALSE);
-        case SDRREPFUNC_OBJ_COMBINE_ONEPOLY :  return rView.IsCombinePossible(TRUE);
-        case SDRREPFUNC_OBJ_DISMANTLE_POLYS :  return rView.IsDismantlePossible(FALSE);
-        case SDRREPFUNC_OBJ_DISMANTLE_LINES :  return rView.IsDismantlePossible(TRUE);
-        case SDRREPFUNC_OBJ_CONVERTTOPOLY   :  return rView.IsConvertToPolyObjPossible(FALSE);
-        case SDRREPFUNC_OBJ_CONVERTTOPATH   :  return rView.IsConvertToPathObjPossible(FALSE);
+        case SDRREPFUNC_OBJ_COMBINE_POLYPOLY:  return rView.IsCombinePossible(sal_False);
+        case SDRREPFUNC_OBJ_COMBINE_ONEPOLY :  return rView.IsCombinePossible(sal_True);
+        case SDRREPFUNC_OBJ_DISMANTLE_POLYS :  return rView.IsDismantlePossible(sal_False);
+        case SDRREPFUNC_OBJ_DISMANTLE_LINES :  return rView.IsDismantlePossible(sal_True);
+        case SDRREPFUNC_OBJ_CONVERTTOPOLY   :  return rView.IsConvertToPolyObjPossible(sal_False);
+        case SDRREPFUNC_OBJ_CONVERTTOPATH   :  return rView.IsConvertToPathObjPossible(sal_False);
         case SDRREPFUNC_OBJ_GROUP           :  return rView.IsGroupPossible();
         case SDRREPFUNC_OBJ_UNGROUP         :  return rView.IsUnGroupPossible();
         case SDRREPFUNC_OBJ_PUTTOTOP        :  return rView.IsToTopPossible();
@@ -188,7 +188,7 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
         case SDRREPFUNC_OBJ_IMPORTMTF       :  return rView.IsImportMtfPossible();
         default: break;
     } // switch
-    return FALSE;
+    return sal_False;
 }
 
 void SdrUndoGroup::SdrRepeat(SdrView& rView)
@@ -198,10 +198,10 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
         case SDRREPFUNC_OBJ_DELETE          :  rView.DeleteMarked();                break;
         case SDRREPFUNC_OBJ_COMBINE_POLYPOLY:  rView.CombineMarkedObjects(sal_False);   break;
         case SDRREPFUNC_OBJ_COMBINE_ONEPOLY :  rView.CombineMarkedObjects(sal_True);    break;
-        case SDRREPFUNC_OBJ_DISMANTLE_POLYS :  rView.DismantleMarkedObjects(FALSE); break;
-        case SDRREPFUNC_OBJ_DISMANTLE_LINES :  rView.DismantleMarkedObjects(TRUE);  break;
-        case SDRREPFUNC_OBJ_CONVERTTOPOLY   :  rView.ConvertMarkedToPolyObj(FALSE); break;
-        case SDRREPFUNC_OBJ_CONVERTTOPATH   :  rView.ConvertMarkedToPathObj(FALSE); break;
+        case SDRREPFUNC_OBJ_DISMANTLE_POLYS :  rView.DismantleMarkedObjects(sal_False); break;
+        case SDRREPFUNC_OBJ_DISMANTLE_LINES :  rView.DismantleMarkedObjects(sal_True);  break;
+        case SDRREPFUNC_OBJ_CONVERTTOPOLY   :  rView.ConvertMarkedToPolyObj(sal_False); break;
+        case SDRREPFUNC_OBJ_CONVERTTOPATH   :  rView.ConvertMarkedToPathObj(sal_False); break;
         case SDRREPFUNC_OBJ_GROUP           :  rView.GroupMarked();                 break;
         case SDRREPFUNC_OBJ_UNGROUP         :  rView.UnGroupMarked();               break;
         case SDRREPFUNC_OBJ_PUTTOTOP        :  rView.PutMarkedToTop();              break;
@@ -245,7 +245,7 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
 {
 }
 
-void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat )
+void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat )
 {
     rStr = ImpGetResStr(nStrCacheID);
     sal_Char aSearchText[] = "%1";
@@ -271,7 +271,7 @@ void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, US
     }
 }
 
-void SdrUndoObj::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, FASTBOOL bRepeat) const
+void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, FASTBOOL bRepeat) const
 {
     if ( pObj )
         GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat );
@@ -302,7 +302,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1, FASTBO
     pUndoStyleSheet(NULL),
     pRedoStyleSheet(NULL),
     pRepeatStyleSheet(NULL),
-    bHaveToTakeRedoSet(TRUE),
+    bHaveToTakeRedoSet(sal_True),
     pTextUndo(NULL),
 
     // #i8508#
@@ -313,8 +313,8 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1, FASTBO
     bStyleSheet = bStyleSheet1;
 
     SdrObjList* pOL = rNewObj.GetSubList();
-    BOOL bIsGroup(pOL!=NULL && pOL->GetObjCount());
-    BOOL bIs3DScene(bIsGroup && pObj->ISA(E3dScene));
+    sal_Bool bIsGroup(pOL!=NULL && pOL->GetObjCount());
+    sal_Bool bIs3DScene(bIsGroup && pObj->ISA(E3dScene));
 
     if(bIsGroup)
     {
@@ -379,7 +379,7 @@ void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet)
 void SdrUndoAttrObj::Undo()
 {
     E3DModifySceneSnapRectUpdater aUpdater(pObj);
-    BOOL bIs3DScene(pObj && pObj->ISA(E3dScene));
+    sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
 
     // #94278# Trigger PageChangeCall
     ImpShowPageOfThisObject();
@@ -388,7 +388,7 @@ void SdrUndoAttrObj::Undo()
     {
         if(bHaveToTakeRedoSet)
         {
-            bHaveToTakeRedoSet = FALSE;
+            bHaveToTakeRedoSet = sal_False;
 
             if(pRedoSet)
             {
@@ -413,7 +413,7 @@ void SdrUndoAttrObj::Undo()
         if(bStyleSheet)
         {
             pRedoStyleSheet = pObj->GetStyleSheet();
-            pObj->SetStyleSheet(pUndoStyleSheet, TRUE);
+            pObj->SetStyleSheet(pUndoStyleSheet, sal_True);
         }
 
         sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
@@ -480,14 +480,14 @@ void SdrUndoAttrObj::Undo()
 void SdrUndoAttrObj::Redo()
 {
     E3DModifySceneSnapRectUpdater aUpdater(pObj);
-    BOOL bIs3DScene(pObj && pObj->ISA(E3dScene));
+    sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
 
     if(!pUndoGroup || bIs3DScene)
     {
         if(bStyleSheet)
         {
             pUndoStyleSheet = pObj->GetStyleSheet();
-            pObj->SetStyleSheet(pRedoStyleSheet, TRUE);
+            pObj->SetStyleSheet(pRedoStyleSheet, sal_True);
         }
 
         sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
@@ -570,7 +570,7 @@ void SdrUndoAttrObj::SdrRepeat(SdrView& rView)
 {
     if(pRepeatSet)
     {
-        rView.SetAttrToMarked(*pRepeatSet, FALSE);
+        rView.SetAttrToMarked(*pRepeatSet, sal_False);
     }
 }
 
@@ -585,11 +585,11 @@ XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 
     if(bStyleSheet)
     {
-        ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, TRUE);
+        ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, sal_True);
     }
     else
     {
-        ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, TRUE);
+        ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, sal_True);
     }
 
     return aStr;
@@ -633,7 +633,7 @@ bool SdrUndoMoveObj::CanSdrRepeat(SdrView& rView) const
 XubString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_EditMove,aStr,TRUE);
+    ImpTakeDescriptionStr(STR_EditMove,aStr,sal_True);
     return aStr;
 }
 
@@ -651,8 +651,8 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj):
         // Aha, Gruppenobjekt
         // AW: Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen
         pUndoGroup=new SdrUndoGroup(*pObj->GetModel());
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
             pUndoGroup->AddAction(new SdrUndoGeoObj(*pOL->GetObj(nObjNum)));
         }
     } else {
@@ -720,7 +720,7 @@ XubString SdrUndoGeoObj::GetComment() const
 
 SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect)
 :   SdrUndoObj(rNewObj),
-    bOwner(FALSE),
+    bOwner(sal_False),
     pView(NULL),
     pPageView(NULL)
 {
@@ -737,7 +737,7 @@ SdrUndoObjList::~SdrUndoObjList()
     if (pObj!=NULL && IsOwner())
     {
         // Attribute muessen wieder in den regulaeren Pool
-        SetOwner(FALSE);
+        SetOwner(sal_False);
 
         // nun loeschen
         SdrObject::Free( pObj );
@@ -855,14 +855,14 @@ void SdrUndoDelObj::Undo()
 {
     SdrUndoRemoveObj::Undo();
     DBG_ASSERT(IsOwner(),"UndoDeleteObj: pObj gehoert nicht der UndoAction");
-    SetOwner(FALSE);
+    SetOwner(sal_False);
 }
 
 void SdrUndoDelObj::Redo()
 {
     SdrUndoRemoveObj::Redo();
     DBG_ASSERT(!IsOwner(),"RedoDeleteObj: pObj gehoert bereits der UndoAction");
-    SetOwner(TRUE);
+    SetOwner(sal_True);
 }
 
 XubString SdrUndoDelObj::GetComment() const
@@ -885,7 +885,7 @@ bool SdrUndoDelObj::CanSdrRepeat(SdrView& rView) const
 XubString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_EditDelete,aStr,TRUE);
+    ImpTakeDescriptionStr(STR_EditDelete,aStr,sal_True);
     return aStr;
 }
 
@@ -895,14 +895,14 @@ void SdrUndoNewObj::Undo()
 {
     SdrUndoInsertObj::Undo();
     DBG_ASSERT(!IsOwner(),"RedoNewObj: pObj gehoert bereits der UndoAction");
-    SetOwner(TRUE);
+    SetOwner(sal_True);
 }
 
 void SdrUndoNewObj::Redo()
 {
     SdrUndoInsertObj::Redo();
     DBG_ASSERT(IsOwner(),"RedoNewObj: pObj gehoert nicht der UndoAction");
-    SetOwner(FALSE);
+    SetOwner(sal_False);
 }
 
 String SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
@@ -921,11 +921,11 @@ XubString SdrUndoNewObj::GetComment() const
 
 SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect)
 :   SdrUndoObj(rOldObj1),
-    bOldOwner(FALSE),
-    bNewOwner(FALSE),
+    bOldOwner(sal_False),
+    bNewOwner(sal_False),
     pNewObj(&rNewObj1)
 {
-    SetOldOwner(TRUE);
+    SetOldOwner(sal_True);
 
     pObjList=pObj->GetObjList();
     if (bOrdNumDirect) {
@@ -940,7 +940,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
     if (pObj!=NULL && IsOldOwner())
     {
         // Attribute muessen wieder in den regulaeren Pool
-        SetOldOwner(FALSE);
+        SetOldOwner(sal_False);
 
         // nun loeschen
         SdrObject::Free( pObj );
@@ -948,7 +948,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
     if (pNewObj!=NULL && IsNewOwner())
     {
         // Attribute muessen wieder in den regulaeren Pool
-        SetNewOwner(FALSE);
+        SetNewOwner(sal_False);
 
         // nun loeschen
         SdrObject::Free( pNewObj );
@@ -964,8 +964,8 @@ void SdrUndoReplaceObj::Undo()
     {
         DBG_ASSERT(!pObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Altes Objekt ist bereits inserted!");
         DBG_ASSERT(pNewObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Neues Objekt ist nicht inserted!");
-        SetOldOwner(FALSE);
-        SetNewOwner(TRUE);
+        SetOldOwner(sal_False);
+        SetNewOwner(sal_True);
 
         ImplUnmarkObject( pNewObj );
         pObjList->ReplaceObject(pObj,nOrdNum);
@@ -982,8 +982,8 @@ void SdrUndoReplaceObj::Redo()
     {
         DBG_ASSERT(!pNewObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Neues Objekt ist bereits inserted!");
         DBG_ASSERT(pObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Altes Objekt ist nicht inserted!");
-        SetOldOwner(TRUE);
-        SetNewOwner(FALSE);
+        SetOldOwner(sal_True);
+        SetNewOwner(sal_False);
 
         ImplUnmarkObject( pObj );
         pObjList->ReplaceObject(pNewObj,nOrdNum);
@@ -1041,7 +1041,7 @@ void SdrUndoObjectLayerChange::Redo()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1):
+SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1):
     SdrUndoObj(rNewObj),
     nOldOrdNum(nOldOrdNum1),
     nNewOrdNum(nNewOrdNum1)
@@ -1087,8 +1087,8 @@ SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText)
 : SdrUndoObj(rNewObj)
 , pOldText(NULL)
 , pNewText(NULL)
-, bNewTextAvailable(FALSE)
-, bEmptyPresObj(FALSE)
+, bNewTextAvailable(sal_False)
+, bEmptyPresObj(sal_False)
 , mnText(nText)
 {
     SdrText* pText = static_cast< SdrTextObj*>( &rNewObj )->getText(mnText);
@@ -1113,7 +1113,7 @@ void SdrUndoObjSetText::AfterSetText()
         SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText);
         if( pText && pText->GetOutlinerParaObject() )
             pNewText = new OutlinerParaObject(*pText->GetOutlinerParaObject());
-        bNewTextAvailable=TRUE;
+        bNewTextAvailable=sal_True;
     }
 }
 
@@ -1185,8 +1185,8 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView)
             rView.BegUndo(aStr);
         }
 
-        ULONG nAnz=rML.GetMarkCount();
-        for (ULONG nm=0; nm<nAnz; nm++)
+        sal_uIntPtr nAnz=rML.GetMarkCount();
+        for (sal_uIntPtr nm=0; nm<nAnz; nm++)
         {
             SdrObject* pObj2=rML.GetMark(nm)->GetMarkedSdrObj();
             SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pObj2);
@@ -1209,9 +1209,9 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView)
 
 bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const
 {
-    FASTBOOL bOk=FALSE;
+    bool bOk=sal_False;
     if (bNewTextAvailable && rView.AreObjectsMarked()) {
-        bOk=TRUE;
+        bOk=sal_True;
     }
     return bOk;
 }
@@ -1319,12 +1319,12 @@ String SdrUndoObjStrAttr::GetComment() const
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrUndoLayer::SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel):
+SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel):
     SdrUndoAction(rNewModel),
     pLayer(rNewLayerAdmin.GetLayer(nLayerNum)),
     pLayerAdmin(&rNewLayerAdmin),
     nNum(nLayerNum),
-    bItsMine(FALSE)
+    bItsMine(sal_False)
 {
 }
 
@@ -1340,7 +1340,7 @@ SdrUndoLayer::~SdrUndoLayer()
 void SdrUndoNewLayer::Undo()
 {
     DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert bereits der UndoAction");
-    bItsMine=TRUE;
+    bItsMine=sal_True;
 #ifdef DBG_UTIL
     SdrLayer* pCmpLayer=
 #endif
@@ -1351,7 +1351,7 @@ void SdrUndoNewLayer::Undo()
 void SdrUndoNewLayer::Redo()
 {
     DBG_ASSERT(bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert nicht der UndoAction");
-    bItsMine=FALSE;
+    bItsMine=sal_False;
     pLayerAdmin->InsertLayer(pLayer,nNum);
 }
 
@@ -1365,14 +1365,14 @@ XubString SdrUndoNewLayer::GetComment() const
 void SdrUndoDelLayer::Undo()
 {
     DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert nicht der UndoAction");
-    bItsMine=FALSE;
+    bItsMine=sal_False;
     pLayerAdmin->InsertLayer(pLayer,nNum);
 }
 
 void SdrUndoDelLayer::Redo()
 {
     DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert bereits der UndoAction");
-    bItsMine=TRUE;
+    bItsMine=sal_True;
 #ifdef DBG_UTIL
     SdrLayer* pCmpLayer=
 #endif
@@ -1432,7 +1432,7 @@ SdrUndoPage::SdrUndoPage(SdrPage& rNewPg)
 {
 }
 
-void SdrUndoPage::ImpInsertPage(USHORT nNum)
+void SdrUndoPage::ImpInsertPage(sal_uInt16 nNum)
 {
     DBG_ASSERT(!mrPage.IsInserted(),"SdrUndoPage::ImpInsertPage(): mrPage ist bereits Inserted");
     if (!mrPage.IsInserted()) {
@@ -1444,7 +1444,7 @@ void SdrUndoPage::ImpInsertPage(USHORT nNum)
     }
 }
 
-void SdrUndoPage::ImpRemovePage(USHORT nNum)
+void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum)
 {
     DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpRemovePage(): mrPage ist nicht Inserted");
     if (mrPage.IsInserted()) {
@@ -1458,7 +1458,7 @@ void SdrUndoPage::ImpRemovePage(USHORT nNum)
     }
 }
 
-void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum)
+void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum)
 {
     DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpMovePage(): mrPage ist nicht Inserted");
     if (mrPage.IsInserted()) {
@@ -1470,7 +1470,7 @@ void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum)
     }
 }
 
-void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT /*n*/, FASTBOOL /*bRepeat*/) const
+void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, FASTBOOL /*bRepeat*/) const
 {
     rStr=ImpGetResStr(nStrCacheID);
 }
@@ -1479,7 +1479,7 @@ void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH
 
 SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg):
     SdrUndoPage(rNewPg),
-    bItsMine(FALSE)
+    bItsMine(sal_False)
 {
     nPageNum=rNewPg.GetPageNum();
 }
@@ -1498,7 +1498,7 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg):
     SdrUndoPageList(rNewPg),
     pUndoGroup(NULL)
 {
-    bItsMine = TRUE;
+    bItsMine = sal_True;
 
     // Und nun ggf. die MasterPage-Beziehungen merken
     if(mrPage.IsMasterPage())
@@ -1541,7 +1541,7 @@ void SdrUndoDelPage::Undo()
         pUndoGroup->Undo();
     }
     DBG_ASSERT(bItsMine,"UndoDeletePage: mrPage gehoert nicht der UndoAction");
-    bItsMine=FALSE;
+    bItsMine=sal_False;
 }
 
 void SdrUndoDelPage::Redo()
@@ -1549,20 +1549,20 @@ void SdrUndoDelPage::Redo()
     ImpRemovePage(nPageNum);
     // Die MasterPage-Beziehungen werden ggf. von selbst geloesst
     DBG_ASSERT(!bItsMine,"RedoDeletePage: mrPage gehoert bereits der UndoAction");
-    bItsMine=TRUE;
+    bItsMine=sal_True;
 }
 
 XubString SdrUndoDelPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
     return aStr;
 }
 
 XubString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1572,7 +1572,7 @@ void SdrUndoDelPage::SdrRepeat(SdrView& /*rView*/)
 
 bool SdrUndoDelPage::CanSdrRepeat(SdrView& /*rView*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1581,20 +1581,20 @@ void SdrUndoNewPage::Undo()
 {
     ImpRemovePage(nPageNum);
     DBG_ASSERT(!bItsMine,"UndoNewPage: mrPage gehoert bereits der UndoAction");
-    bItsMine=TRUE;
+    bItsMine=sal_True;
 }
 
 void SdrUndoNewPage::Redo()
 {
     ImpInsertPage(nPageNum);
     DBG_ASSERT(bItsMine,"RedoNewPage: mrPage gehoert nicht der UndoAction");
-    bItsMine=FALSE;
+    bItsMine=sal_False;
 }
 
 XubString SdrUndoNewPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1603,14 +1603,14 @@ XubString SdrUndoNewPage::GetComment() const
 XubString SdrUndoCopyPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
     return aStr;
 }
 
 XubString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1621,7 +1621,7 @@ void SdrUndoCopyPage::SdrRepeat(SdrView& /*rView*/)
 
 bool SdrUndoCopyPage::CanSdrRepeat(SdrView& /*rView*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1639,7 +1639,7 @@ void SdrUndoSetPageNum::Redo()
 XubString SdrUndoSetPageNum::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1695,7 +1695,7 @@ void SdrUndoPageRemoveMasterPage::Redo()
 XubString SdrUndoPageRemoveMasterPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1740,7 +1740,7 @@ void SdrUndoPageChangeMasterPage::Redo()
 XubString SdrUndoPageChangeMasterPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1764,32 +1764,32 @@ SdrUndoAction* SdrUndoFactory::CreateUndoGeoObject( SdrObject& rObject )
 
 SdrUndoAction* SdrUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText )
 {
-    return new SdrUndoAttrObj( rObject, bStyleSheet1 ? TRUE : FALSE, bSaveText ? TRUE : FALSE );
+    return new SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoInsertObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoInsertObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoDelObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoDelObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoNewObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoNewObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoCopyObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoCopyObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1)
@@ -1799,7 +1799,7 @@ SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_u
 
 SdrUndoAction* SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect )
 {
-    return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer )
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 51ab577ca74c..acfaf12ae8d6 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -76,20 +76,20 @@ SdrViewEvent::SdrViewEvent()
       nMouseCode(0),
       nHlplIdx(0),
       nGlueId(0),
-      bMouseDown(FALSE),
-      bMouseUp(FALSE),
-      bDoubleHdlSize(FALSE),
-      bIsAction(FALSE),
-      bIsTextEdit(FALSE),
-      bTextEditHit(FALSE),
-      bAddMark(FALSE),
-      bUnmark(FALSE),
-      bPrevNextMark(FALSE),
-      bMarkPrev(FALSE),
-      bInsPointNewObj(FALSE),
-      bDragWithCopy(FALSE),
-      bCaptureMouse(FALSE),
-      bReleaseMouse(FALSE)
+      bMouseDown(sal_False),
+      bMouseUp(sal_False),
+      bDoubleHdlSize(sal_False),
+      bIsAction(sal_False),
+      bIsTextEdit(sal_False),
+      bTextEditHit(sal_False),
+      bAddMark(sal_False),
+      bUnmark(sal_False),
+      bPrevNextMark(sal_False),
+      bMarkPrev(sal_False),
+      bInsPointNewObj(sal_False),
+      bDragWithCopy(sal_False),
+      bCaptureMouse(sal_False),
+      bReleaseMouse(sal_False)
 {
 }
 
@@ -175,12 +175,12 @@ TYPEINIT1(SdrView,SdrCreateView);
 
 SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut)
 :   SdrCreateView(pModel1,pOut),
-    bNoExtendedMouseDispatcher(FALSE),
-    bNoExtendedKeyDispatcher(FALSE),
-    bNoExtendedCommandDispatcher(FALSE),
+    bNoExtendedMouseDispatcher(sal_False),
+    bNoExtendedKeyDispatcher(sal_False),
+    bNoExtendedCommandDispatcher(sal_False),
     mbMasterPagePaintCaching(sal_False)
 {
-    bTextEditOnObjectsWithoutTextIfTextTool=FALSE;
+    bTextEditOnObjectsWithoutTextIfTextTool=sal_False;
 
     maAccessibilityOptions.AddListener(this);
 
@@ -192,12 +192,12 @@ SdrView::~SdrView()
     maAccessibilityOptions.RemoveListener(this);
 }
 
-BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
 {
     SetActualWin(pWin);
-    BOOL bRet=SdrCreateView::KeyInput(rKEvt,pWin);
+    sal_Bool bRet=SdrCreateView::KeyInput(rKEvt,pWin);
     if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) {
-        bRet=TRUE;
+        bRet=sal_True;
         switch (rKEvt.GetKeyCode().GetFullFunction()) {
             case KEYFUNC_CUT   : Cut(); break;
             case KEYFUNC_COPY  : Yank(); break;
@@ -221,7 +221,7 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
                     case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: pMod->Redo(); break;
                     case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: pMod->Repeat(*this); break;
                     case KEY_MOD1+KEY_A: MarkAll(); break;
-                    default: bRet=FALSE;
+                    default: bRet=sal_False;
                 } // switch
             }
         } // switch
@@ -235,11 +235,11 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
     return bRet;
 }
 
-BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
 {
     SetActualWin(pWin);
-    if (rMEvt.IsLeft()) aDragStat.SetMouseDown(TRUE);
-    BOOL bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin);
+    if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_True);
+    sal_Bool bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin);
     if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
         SdrViewEvent aVEvt;
         PickAnything(rMEvt,SDRMOUSEBUTTONDOWN,aVEvt);
@@ -248,12 +248,12 @@ BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
     return bRet;
 }
 
-BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
 {
     SetActualWin(pWin);
-    if (rMEvt.IsLeft()) aDragStat.SetMouseDown(FALSE);
-    BOOL bAction=IsAction();
-    BOOL bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
+    if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_False);
+    sal_Bool bAction=IsAction();
+    sal_Bool bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
     if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
         SdrViewEvent aVEvt;
         PickAnything(rMEvt,SDRMOUSEBUTTONUP,aVEvt);
@@ -262,15 +262,15 @@ BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
     return bRet;
 }
 
-BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     SetActualWin(pWin);
     aDragStat.SetMouseDown(rMEvt.IsLeft());
-    BOOL bRet=SdrCreateView::MouseMove(rMEvt,pWin);
+    sal_Bool bRet=SdrCreateView::MouseMove(rMEvt,pWin);
     if (!IsExtendedMouseEventDispatcherEnabled() && !IsTextEditInSelectionMode()) {
         SdrViewEvent aVEvt;
         PickAnything(rMEvt,SDRMOUSEMOVE,aVEvt);
-        if (DoMouseEvent(aVEvt)) bRet=TRUE;
+        if (DoMouseEvent(aVEvt)) bRet=sal_True;
     }
 
     // #87792# Removed code which did let the mouse snap on object
@@ -279,26 +279,26 @@ BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
     return bRet;
 }
 
-BOOL SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
+sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
 {
     SetActualWin(pWin);
-    BOOL bRet=SdrCreateView::Command(rCEvt,pWin);
+    sal_Bool bRet=SdrCreateView::Command(rCEvt,pWin);
     return bRet;
 }
 
 /* new interface src537 */
-BOOL SdrView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr);
 }
 
 SfxStyleSheet* SdrView::GetStyleSheet() const
 {
-    //BOOL bOk=FALSE;
+    //sal_Bool bOk=sal_False;
     return SdrCreateView::GetStyleSheet(); //bOk);
 }
 
-SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, USHORT nEventKind, SdrViewEvent& rVEvt) const
+SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, SdrViewEvent& rVEvt) const
 {
     rVEvt.bMouseDown=nEventKind==SDRMOUSEBUTTONDOWN;
     rVEvt.bMouseUp=nEventKind==SDRMOUSEBUTTONUP;
@@ -352,30 +352,30 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
     // #i73628# Use a non-changeable copy of he logic pos
     const Point aLocalLogicPosition(rLogicPos);
 
-    BOOL bEditMode=IsEditMode();
-    BOOL bPointMode=bEditMode && HasMarkablePoints();
-    BOOL bGluePointMode=IsGluePointEditMode();
-    BOOL bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
-    BOOL bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
-    BOOL bIsTextEdit=IsTextEdit();
-    BOOL bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
-    BOOL bTextEditSel=IsTextEditInSelectionMode();
-    BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
-    BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
-    BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
+    sal_Bool bEditMode=IsEditMode();
+    sal_Bool bPointMode=bEditMode && HasMarkablePoints();
+    sal_Bool bGluePointMode=IsGluePointEditMode();
+    sal_Bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
+    sal_Bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
+    sal_Bool bIsTextEdit=IsTextEdit();
+    sal_Bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
+    sal_Bool bTextEditSel=IsTextEditInSelectionMode();
+    sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
+    sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
+    sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
     SdrHitKind eHit=SDRHIT_NONE;
     SdrHdl* pHdl=pOut!=NULL && !bTextEditSel ? PickHandle(aLocalLogicPosition) : NULL;
     SdrPageView* pPV=NULL;
     SdrObject* pObj=NULL;
     SdrObject* pHitObj=NULL;
-    USHORT nHitPassNum=0;
-    USHORT nHlplIdx=0;
-    USHORT nGlueId=0;
-    BOOL bUnmarkedObjHit=FALSE;
+    sal_uInt16 nHitPassNum=0;
+    sal_uInt16 nHlplIdx=0;
+    sal_uInt16 nGlueId=0;
+    sal_Bool bUnmarkedObjHit=sal_False;
     if (bTextEditHit || bTextEditSel)
     {
         eHit=SDRHIT_TEXTEDIT;
-        bTextEditHit=TRUE;
+        bTextEditHit=sal_True;
     }
     else if (pHdl!=NULL)
     {
@@ -429,7 +429,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
                     break;
             }
         }
-        bUnmarkedObjHit=TRUE;
+        bUnmarkedObjHit=sal_True;
     }
     else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,nHitTolLog,*pOut,nHlplIdx,pPV))
     {
@@ -438,8 +438,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
     if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT)
     {
         bool bRoot=pObj->HasMacro();
-        BOOL bDeep=pObj!=pHitObj && pHitObj->HasMacro();
-        BOOL bMid=FALSE; // Gruppierte Gruppe mit Macro getroffen?
+        sal_Bool bDeep=pObj!=pHitObj && pHitObj->HasMacro();
+        sal_Bool bMid=sal_False; // Gruppierte Gruppe mit Macro getroffen?
         SdrObject* pMidObj=NULL;
         if (pObj!=pHitObj)
         {
@@ -450,7 +450,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
             {
                 if (pObjTmp->HasMacro())
                 {
-                    bMid=TRUE;
+                    bMid=sal_True;
                     pMidObj=pObjTmp;
                 }
                 pObjTmp=pObjTmp->GetUpGroup();
@@ -496,14 +496,14 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
                 if( pTextObj->GetModel() )
                     pOutliner = &pTextObj->GetModel()->GetHitTestOutliner();
 
-                pTextObj->TakeTextRect( *pOutliner, aTextRect, FALSE, &aAnchor, FALSE );
+                pTextObj->TakeTextRect( *pOutliner, aTextRect, sal_False, &aAnchor, sal_False );
 
                 // #i73628# Use a text-relative position for hit test in hit test outliner
                 Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft());
 
                 // FitToSize berueksichtigen
                 SdrFitToSizeType eFit=pTextObj->GetFitToSize();
-                BOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+                sal_Bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
                 if (bFitToSize) {
                     Fraction aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1);
                     Fraction aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1);
@@ -570,7 +570,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
             // TextEdit an Objekten im gesperrten Layer
             if (pPV->GetLockedLayers().IsSet(pHitObj->GetLayer()))
             {
-                bTEHit=FALSE;
+                bTEHit=sal_False;
             }
 
             if (bTEHit)
@@ -586,12 +586,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
         pObj=NULL;
         pPV=NULL;
     }
-    BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
-    BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
-    BOOL bMouseDown=rVEvt.bMouseDown;
-    BOOL bMouseUp=rVEvt.bMouseUp;
+    sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
+    sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
+    sal_Bool bMouseDown=rVEvt.bMouseDown;
+    sal_Bool bMouseUp=rVEvt.bMouseUp;
     SdrEventKind eEvent=SDREVENT_NONE;
-    BOOL bIsAction=IsAction();
+    sal_Bool bIsAction=IsAction();
 
     if (bIsAction)
     {
@@ -660,21 +660,21 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
         else if (eHit==SDRHIT_HANDLE)
         {
             eEvent=SDREVENT_BEGDRAGOBJ;    // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark
-            BOOL bGlue=pHdl->GetKind()==HDL_GLUE;
-            BOOL bPoly=!bGlue && IsPointMarkable(*pHdl);
-            BOOL bMarked=bGlue || bPoly && pHdl->IsSelected();
+            sal_Bool bGlue=pHdl->GetKind()==HDL_GLUE;
+            sal_Bool bPoly=!bGlue && IsPointMarkable(*pHdl);
+            sal_Bool bMarked=bGlue || bPoly && pHdl->IsSelected();
             if (bGlue || bPoly)
             {
                 eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT;
                 if (MODKEY_DeepMark)
                 {
-                    rVEvt.bAddMark=TRUE;
-                    rVEvt.bPrevNextMark=TRUE;
+                    rVEvt.bAddMark=sal_True;
+                    rVEvt.bPrevNextMark=sal_True;
                     rVEvt.bMarkPrev=MODKEY_DeepBackw;
                 }
                 else if (MODKEY_MultiMark)
                 {
-                    rVEvt.bAddMark=TRUE;
+                    rVEvt.bAddMark=sal_True;
                     rVEvt.bUnmark=bMarked; // Toggle
                     if (bGlue)
                     {
@@ -780,23 +780,23 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
     return eHit;
 }
 
-BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
+sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     SdrHitKind eHit=rVEvt.eHit;
     Point aLogicPos(rVEvt.aLogicPos);
 
-    BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
-    BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
-    BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
-    BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
-    //BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
-    BOOL bMouseDown=rVEvt.bMouseDown;
-    BOOL bMouseUp=rVEvt.bMouseUp;
+    sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
+    sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
+    sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
+    sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
+    //sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
+    sal_Bool bMouseDown=rVEvt.bMouseDown;
+    sal_Bool bMouseUp=rVEvt.bMouseUp;
     if (bMouseDown) {
-        if (bMouseLeft) aDragStat.SetMouseDown(TRUE);
+        if (bMouseLeft) aDragStat.SetMouseDown(sal_True);
     } else if (bMouseUp) {
-        if (bMouseLeft) aDragStat.SetMouseDown(FALSE);
+        if (bMouseLeft) aDragStat.SetMouseDown(sal_False);
     } else { // ansonsten MoueMove
         aDragStat.SetMouseDown(bMouseLeft);
     }
@@ -827,13 +827,13 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
         // sein muesste (wg. eHit).
     }
     switch (rVEvt.eEvent) {
-        case SDREVENT_NONE: bRet=FALSE; break;
-        case SDREVENT_TEXTEDIT: bRet=FALSE; break; // Events an die OutlinerView werden hier nicht beruecksichtigt
-        case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=TRUE; break;
-        case SDREVENT_ENDACTION: EndAction(); bRet=TRUE; break;
-        case SDREVENT_BCKACTION: BckAction(); bRet=TRUE; break;
-        case SDREVENT_BRKACTION: BrkAction(); bRet=TRUE; break;
-        case SDREVENT_ENDMARK  : EndAction(); bRet=TRUE; break;
+        case SDREVENT_NONE: bRet=sal_False; break;
+        case SDREVENT_TEXTEDIT: bRet=sal_False; break; // Events an die OutlinerView werden hier nicht beruecksichtigt
+        case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=sal_True; break;
+        case SDREVENT_ENDACTION: EndAction(); bRet=sal_True; break;
+        case SDREVENT_BCKACTION: BckAction(); bRet=sal_True; break;
+        case SDREVENT_BRKACTION: BrkAction(); bRet=sal_True; break;
+        case SDREVENT_ENDMARK  : EndAction(); bRet=sal_True; break;
         case SDREVENT_BRKMARK  : {
             BrkAction();
             if (!MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark)) {
@@ -843,7 +843,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
                 // - und ansonsten Objekte
                 if (!rVEvt.bAddMark) UnmarkAll();
             }
-            bRet=TRUE;
+            bRet=sal_True;
         } break;
         case SDREVENT_ENDCREATE: { // ggf. MarkObj
             SdrCreateCmd eCmd=SDRCREATE_NEXTPOINT;
@@ -854,7 +854,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
                     MarkObj(rVEvt.pRootObj,rVEvt.pPV);
                     if (eHit==SDRHIT_TEXTEDIT)
                     {
-                        BOOL bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
+                        sal_Bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
                             SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L));
 
                         if(bRet2)
@@ -869,9 +869,9 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
                             }
                         }
                     }
-                    bRet=TRUE; // Obj markiert und ggf. TextEdit gestartet
-                } else bRet=FALSE; // Create abgebrochen, sonst nix weiter.
-            } else bRet=TRUE; // EndCreate mit TRUE returniert
+                    bRet=sal_True; // Obj markiert und ggf. TextEdit gestartet
+                } else bRet=sal_False; // Create abgebrochen, sonst nix weiter.
+            } else bRet=sal_True; // EndCreate mit sal_True returniert
         } break;
         case SDREVENT_ENDDRAG: {
             bRet=EndDragObj(IsDragWithCopy());
@@ -879,20 +879,20 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
         } break;
         case SDREVENT_MARKOBJ: { // + ggf. BegDrag
             if (!rVEvt.bAddMark) UnmarkAllObj();
-            BOOL bUnmark=rVEvt.bUnmark;
+            sal_Bool bUnmark=rVEvt.bUnmark;
             if (rVEvt.bPrevNextMark) {
                 bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev);
             } else {
                 SortMarkedObjects();
-                ULONG nAnz0=GetMarkedObjectCount();
+                sal_uIntPtr nAnz0=GetMarkedObjectCount();
                 bRet=MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark);
                 SortMarkedObjects();
-                ULONG nAnz1=GetMarkedObjectCount();
+                sal_uIntPtr nAnz1=GetMarkedObjectCount();
                 bUnmark=nAnz1<nAnz0;
             }
             if (!bUnmark) {
                 BegDragObj(aLogicPos,NULL,(SdrHdl*)NULL,nMinMovLog);
-                bRet=TRUE;
+                bRet=sal_True;
             }
         } break;
         case SDREVENT_MARKPOINT: { // + ggf. BegDrag
@@ -904,7 +904,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
             }
             if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
                 BegDragObj(aLogicPos,NULL,rVEvt.pHdl,nMinMovLog);
-                bRet=TRUE;
+                bRet=sal_True;
             }
         } break;
         case SDREVENT_MARKGLUEPOINT: { // + ggf. BegDrag
@@ -917,7 +917,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
             if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
                 SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId);
                 BegDragObj(aLogicPos,NULL,pHdl,nMinMovLog);
-                bRet=TRUE;
+                bRet=sal_True;
             }
         } break;
         case SDREVENT_BEGMARK: bRet=BegMark(aLogicPos,rVEvt.bAddMark,rVEvt.bUnmark); break;
@@ -927,7 +927,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
             if (MODKEY_PolyPoly) eCmd=SDRCREATE_NEXTOBJECT;
             if (rVEvt.nMouseClicks>1) eCmd=SDRCREATE_FORCEEND;
             EndInsObjPoint(eCmd);
-            bRet=TRUE;
+            bRet=sal_True;
         } break;
         case SDREVENT_BEGINSGLUEPOINT: bRet=BegInsGluePoint(aLogicPos); break;
         case SDREVENT_BEGDRAGHELPLINE: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break;
@@ -961,14 +961,14 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
     if (bRet && pActualOutDev!=NULL && pActualOutDev->GetOutDevType()==OUTDEV_WINDOW) {
         Window* pWin=(Window*)pActualOutDev;
         // Maus links gedrueckt?
-        BOOL bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown;
+        sal_Bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown;
         // Maus links losgelassen?
-        BOOL bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
+        sal_Bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
         // Maus links gedrueckt oder gehalten?
-        BOOL bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
+        sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
         pWin->SetPointer(GetPreferedPointer(rVEvt.aLogicPos,pWin,
                 rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1));
-        BOOL bAction=IsAction();
+        sal_Bool bAction=IsAction();
         if (bLeftDown && bAction) pWin->CaptureMouse();
         else if (bLeftUp || (rVEvt.bIsAction && !bAction)) pWin->ReleaseMouse();
     }
@@ -976,7 +976,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
 }
 #include <editeng/outlobj.hxx>
 
-Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const
+Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const
 {
     // Actions
     if (IsCreateObj())
@@ -1003,7 +1003,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
         aHitRec.bDown=bMacroDown;
         return pMacroObj->GetMacroPointer(aHitRec);
     }
-    //USHORT nTol=nHitTolLog;
+    //sal_uInt16 nTol=nHitTolLog;
     // TextEdit, ObjEdit, Macro
     if (IsTextEdit() && (IsTextEditInSelectionMode() || IsTextEditHit(rMousePos,0/*nTol*/)))
     {
@@ -1087,30 +1087,30 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
         default: break;
     }
 
-    BOOL bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
+    sal_Bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
     SdrHdl* pHdl=aVEvt.pHdl;
     // Nun die Pointer fuer Dragging checken
     if (pHdl!=NULL || bMarkHit) {
         SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE;
-        BOOL bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
-        BOOL bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
-        BOOL bMov=eHdl==HDL_MOVE;
+        sal_Bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
+        sal_Bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
+        sal_Bool bMov=eHdl==HDL_MOVE;
         if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || bMarkedHitMovesAlways)) {
             if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // weil Doppelklick oder Drag&Drop moeglich
             return Pointer(POINTER_MOVE);
         }
         switch (eDragMode) {
             case SDRDRAG_ROTATE: {
-                if ((bCorner || bMov) && !IsRotateAllowed(TRUE))
+                if ((bCorner || bMov) && !IsRotateAllowed(sal_True))
                     return Pointer(POINTER_NOTALLOWED);
 
                 // Sind 3D-Objekte selektiert?
-                BOOL b3DObjSelected = FALSE;
+                sal_Bool b3DObjSelected = sal_False;
 #ifndef SVX_LIGHT
-                for (UINT32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) {
+                for (sal_uInt32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) {
                     SdrObject* pObj = GetMarkedObjectByIndex(a);
                     if(pObj && pObj->ISA(E3dObject))
-                        b3DObjSelected = TRUE;
+                        b3DObjSelected = sal_True;
                 }
 #endif
                 // Falls es um ein 3D-Objekt geht, muss trotz !IsShearAllowed
@@ -1123,7 +1123,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
             } break;
             case SDRDRAG_SHEAR: case SDRDRAG_DISTORT: {
                 if (bCorner) {
-                    if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED);
+                    if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED);
                     else return Pointer(POINTER_REFHAND);
                 }
                 if (bVertex && !IsShearAllowed()) return Pointer(POINTER_NOTALLOWED);
@@ -1136,18 +1136,18 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
                 if (bCorner || bVertex || bMov) {
                     SdrHdl* pH1=aHdl.GetHdl(HDL_REF1);
                     SdrHdl* pH2=aHdl.GetHdl(HDL_REF2);
-                    BOOL b90=FALSE;
-                    BOOL b45=FALSE;
+                    sal_Bool b90=sal_False;
+                    sal_Bool b45=sal_False;
                     Point aDif;
                     if (pH1!=NULL && pH2!=NULL) {
                         aDif=pH2->GetPos()-pH1->GetPos();
                         b90=(aDif.X()==0) || aDif.Y()==0;
                         b45=b90 || (Abs(aDif.X())==Abs(aDif.Y()));
                     }
-                    BOOL bNo=FALSE;
-                    if (!IsMirrorAllowed(TRUE,TRUE)) bNo=TRUE; // Spiegeln ueberhaupt nicht erlaubt
-                    if (!IsMirrorAllowed(FALSE,FALSE) && !b45) bNo=TRUE; // freies Spiegeln nicht erlaubt
-                    if (!IsMirrorAllowed(TRUE,FALSE) && !b90) bNo=TRUE;  // Spiegeln hor/ver erlaubt
+                    sal_Bool bNo=sal_False;
+                    if (!IsMirrorAllowed(sal_True,sal_True)) bNo=sal_True; // Spiegeln ueberhaupt nicht erlaubt
+                    if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=sal_True; // freies Spiegeln nicht erlaubt
+                    if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=sal_True;  // Spiegeln hor/ver erlaubt
                     if (bNo) return Pointer(POINTER_NOTALLOWED);
                     if (b90) {
                         return Pointer(POINTER_MIRROR);
@@ -1174,7 +1174,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
 
             case SDRDRAG_CROOK: {
                 if (bCorner || bVertex || bMov) {
-                    if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED);
+                    if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED);
                     return Pointer(POINTER_CROOK);
                 }
             }
@@ -1185,7 +1185,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
             }
 
             default: {
-                if ((bCorner || bVertex) && !IsResizeAllowed(TRUE)) return Pointer(POINTER_NOTALLOWED);
+                if ((bCorner || bVertex) && !IsResizeAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED);
             }
         }
         if (pHdl!=NULL) return pHdl->GetPointer();
@@ -1267,7 +1267,7 @@ XubString SdrView::GetStatusText()
         ESelection aSel(pTextEditOutlinerView->GetSelection());
         long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos;
         if (aSel.nEndPara>0) {
-            for (USHORT nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) {
+            for (sal_uInt16 nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) {
                 nLin+=pTextEditOutliner->GetLineCount(nParaNum);
             }
         }
@@ -1275,18 +1275,18 @@ XubString SdrView::GetStatusText()
         // Am Ende einer Zeile eines mehrzeiligen Absatzes wird die Position
         // der naechsten Zeile des selben Absatzes angezeigt, so es eine solche
         // gibt.
-        USHORT nParaLine=0;
-        ULONG nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara);
-        BOOL bBrk=FALSE;
+        sal_uInt16 nParaLine=0;
+        sal_uIntPtr nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara);
+        sal_Bool bBrk=sal_False;
         while (!bBrk) {
-            USHORT nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
-            BOOL bLastLine=(nParaLine==nParaLineAnz-1);
+            sal_uInt16 nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
+            sal_Bool bLastLine=(nParaLine==nParaLineAnz-1);
             if (nCol>nLen || (!bLastLine && nCol==nLen)) {
                 nCol-=nLen;
                 nLin++;
                 nParaLine++;
-            } else bBrk=TRUE;
-            if (nLen==0) bBrk=TRUE; // Sicherheitshalber
+            } else bBrk=sal_True;
+            if (nLen==0) bBrk=sal_True; // Sicherheitshalber
         }
 
         aStr.SearchAndReplaceAscii("%1", UniString::CreateFromInt32(nPar + 1));
@@ -1336,14 +1336,14 @@ SdrViewContext SdrView::GetContext() const
     if( IsGluePointEditMode() )
         return SDRCONTEXT_GLUEPOINTEDIT;
 
-    const ULONG nMarkAnz = GetMarkedObjectCount();
+    const sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
 
     if( HasMarkablePoints() && !IsFrameHandles() )
     {
-        BOOL bPath=TRUE;
-        for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ )
+        sal_Bool bPath=sal_True;
+        for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ )
             if (!GetMarkedObjectByIndex(nMarkNum)->ISA(SdrPathObj))
-                bPath=FALSE;
+                bPath=sal_False;
 
         if( bPath )
             return SDRCONTEXT_POINTEDIT;
@@ -1351,9 +1351,9 @@ SdrViewContext SdrView::GetContext() const
 
     if( GetMarkedObjectCount() )
     {
-        BOOL bGraf = TRUE, bMedia = TRUE, bTable = TRUE;
+        sal_Bool bGraf = sal_True, bMedia = sal_True, bTable = sal_True;
 
-        for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
+        for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
         {
             const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum );
             DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" );
@@ -1362,13 +1362,13 @@ SdrViewContext SdrView::GetContext() const
                 continue;
 
             if( !pMarkObj->ISA( SdrGrafObj ) )
-                bGraf = FALSE;
+                bGraf = sal_False;
 
             if( !pMarkObj->ISA( SdrMediaObj ) )
-                bMedia = FALSE;
+                bMedia = sal_False;
 
             if( !pMarkObj->ISA( ::sdr::table::SdrTableObj ) )
-                bTable = FALSE;
+                bTable = sal_False;
         }
 
         if( bGraf )
@@ -1409,24 +1409,24 @@ void SdrView::UnmarkAll()
     else UnmarkAllObj();
 }
 
-BOOL SdrView::IsAllMarked() const
+sal_Bool SdrView::IsAllMarked() const
 {
     if (IsTextEdit()) {
         return ImpIsTextEditAllSelected();
     }
     if (IsGluePointEditMode()) {
-        ULONG nAnz=GetMarkableGluePointCount();
+        sal_uIntPtr nAnz=GetMarkableGluePointCount();
         return nAnz!=0 && nAnz==GetMarkedGluePointCount();
     }
     if (HasMarkedPoints()) {
-        ULONG nAnz=GetMarkablePointCount();
+        sal_uIntPtr nAnz=GetMarkablePointCount();
         return nAnz!=0 && nAnz==GetMarkedPointCount();
     }
-    ULONG nAnz=GetMarkableObjCount();
+    sal_uIntPtr nAnz=GetMarkableObjCount();
     return nAnz!=0 && nAnz == GetMarkedObjectCount();
 }
 
-BOOL SdrView::IsMarkPossible() const
+sal_Bool SdrView::IsMarkPossible() const
 {
     if(IsTextEdit())
     {
@@ -1446,10 +1446,10 @@ BOOL SdrView::IsMarkPossible() const
     return HasMarkableObj();
 }
 
-BOOL SdrView::IsAllMarkPrevNextPossible() const
+sal_Bool SdrView::IsAllMarkPrevNextPossible() const
 {
     if (IsTextEdit()) {
-        return FALSE;
+        return sal_False;
     }
     if (IsGluePointEditMode()) {
         return HasMarkableGluePoints();
@@ -1460,10 +1460,10 @@ BOOL SdrView::IsAllMarkPrevNextPossible() const
     return HasMarkableObj();
 }
 
-BOOL SdrView::MarkNext(BOOL bPrev)
+sal_Bool SdrView::MarkNext(sal_Bool bPrev)
 {
     if (IsTextEdit()) {
-        return FALSE;
+        return sal_False;
     }
     if (IsGluePointEditMode() && HasMarkedGluePoints()) {
         return MarkNextGluePoint(bPrev);
@@ -1474,10 +1474,10 @@ BOOL SdrView::MarkNext(BOOL bPrev)
     return MarkNextObj(bPrev);
 }
 
-BOOL SdrView::MarkNext(const Point& rPnt, BOOL bPrev)
+sal_Bool SdrView::MarkNext(const Point& rPnt, sal_Bool bPrev)
 {
     if (IsTextEdit()) {
-        return FALSE;
+        return sal_False;
     }
     if (IsGluePointEditMode() && HasMarkedGluePoints()) {
         //return MarkNextGluePoint(rPnt,bPrev); fehlende Implementation !!!
@@ -1535,9 +1535,9 @@ void SdrView::DeleteMarked()
     }
 }
 
-BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark)
+sal_Bool SdrView::BegMark(const Point& rPnt, sal_Bool bAddMark, sal_Bool bUnmark)
 {
-    if (bUnmark) bAddMark=TRUE;
+    if (bUnmark) bAddMark=sal_True;
     if (IsGluePointEditMode()) {
         if (!bAddMark) UnmarkAllGluePoints();
         return BegMarkGluePoints(rPnt,bUnmark);
@@ -1550,12 +1550,12 @@ BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark)
     }
 }
 
-BOOL SdrView::IsDeleteMarkedPossible() const
+sal_Bool SdrView::IsDeleteMarkedPossible() const
 {
-    if (IsReadOnly()) return FALSE;
-    if (IsTextEdit()) return TRUE;
-    if (IsGluePointEditMode() && HasMarkedGluePoints()) return TRUE;
-    if (HasMarkedPoints()) return TRUE;
+    if (IsReadOnly()) return sal_False;
+    if (IsTextEdit()) return sal_True;
+    if (IsGluePointEditMode() && HasMarkedGluePoints()) return sal_True;
+    if (HasMarkedPoints()) return sal_True;
     return IsDeleteMarkedObjPossible();
 }
 
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index ceb192e85683..c33b4d8c84b3 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -134,7 +134,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const
 
                             if(!aObjLay.IsEmpty())
                             {
-                                return TRUE;
+                                return sal_True;
                             } // ansonsten die naechste MasterPage der Page ansehen...
                         }
                         else
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 181b086988db..dd7275f9cfdc 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -104,34 +104,34 @@ Point SdrExchangeView::GetPastePos(SdrObjList* pLst, OutputDevice* pOut)
     return aP;
 }
 
-BOOL SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
+sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
 {
-    BOOL bRet(FALSE);
+    sal_Bool bRet(sal_False);
 
     if(!aMaxWorkArea.IsEmpty())
     {
         if(rPt.X()<aMaxWorkArea.Left())
         {
             rPt.X() = aMaxWorkArea.Left();
-            bRet = TRUE;
+            bRet = sal_True;
         }
 
         if(rPt.X()>aMaxWorkArea.Right())
         {
             rPt.X() = aMaxWorkArea.Right();
-            bRet = TRUE;
+            bRet = sal_True;
         }
 
         if(rPt.Y()<aMaxWorkArea.Top())
         {
             rPt.Y() = aMaxWorkArea.Top();
-            bRet = TRUE;
+            bRet = sal_True;
         }
 
         if(rPt.Y()>aMaxWorkArea.Bottom())
         {
             rPt.Y() = aMaxWorkArea.Bottom();
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     return bRet;
@@ -149,14 +149,14 @@ void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst)
     }
 }
 
-BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const
+sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     rLayer=0;
     if (pObjList!=NULL) {
         const SdrPage* pPg=pObjList->GetPage();
         if (pPg!=NULL) {
-            rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,TRUE);
+            rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,sal_True);
             if (rLayer==SDRLAYER_NOTFOUND) rLayer=0;
             SdrPageView* pPV = GetSdrPageView();
             if (pPV!=NULL) {
@@ -169,50 +169,50 @@ BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& r
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     ImpLimitToWorkArea( aPos );
-    if (pLst==NULL) return FALSE;
+    if (pLst==NULL) return sal_False;
     SdrLayerID nLayer;
-    if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark) UnmarkAllObj();
     SdrGrafObj* pObj=new SdrGrafObj(Graphic(rMtf));
     pObj->SetLayer(nLayer);
     ImpPasteObject(pObj,*pLst,aPos,rMtf.GetPrefSize(),rMtf.GetPrefMapMode(),nOptions);
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     ImpLimitToWorkArea( aPos );
-    if (pLst==NULL) return FALSE;
+    if (pLst==NULL) return sal_False;
     SdrLayerID nLayer;
-    if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark) UnmarkAllObj();
     SdrGrafObj* pObj=new SdrGrafObj(Graphic(rBmp));
     pObj->SetLayer(nLayer);
     ImpPasteObject(pObj,*pLst,aPos,rBmp.GetSizePixel(),MapMode(MAP_PIXEL),nOptions);
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     if(!rStr.Len())
-        return FALSE;
+        return sal_False;
 
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     ImpLimitToWorkArea( aPos );
-    if (pLst==NULL) return FALSE;
+    if (pLst==NULL) return sal_False;
     SdrLayerID nLayer;
-    if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark) UnmarkAllObj();
     Rectangle aTextRect(0,0,500,500);
     SdrPage* pPage=pLst->GetPage();
@@ -238,18 +238,18 @@ BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList
     MapUnit eMap=pMod->GetScaleUnit();
     Fraction aMap=pMod->GetScaleFraction();
     ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions);
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     ImpLimitToWorkArea( aPos );
-    if (pLst==NULL) return FALSE;
+    if (pLst==NULL) return sal_False;
     SdrLayerID nLayer;
-    if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark) UnmarkAllObj();
     Rectangle aTextRect(0,0,500,500);
     SdrPage* pPage=pLst->GetPage();
@@ -296,14 +296,14 @@ BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFo
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     const SdrModel* pSrcMod=&rMod;
     if (pSrcMod==pMod)
-        return FALSE; // na so geht's ja nun nicht
+        return sal_False; // na so geht's ja nun nicht
 
     const bool bUndo = IsUndoEnabled();
 
@@ -314,7 +314,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
     {
         if( bUndo )
             EndUndo();
-        return TRUE;
+        return sal_True;
     }
 
     Point aPos(rPos);
@@ -330,9 +330,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
 
     ImpLimitToWorkArea( aPos );
     if (pLst==NULL)
-        return FALSE;
+        return sal_False;
 
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark)
         UnmarkAllObj();
 
@@ -340,7 +340,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
     // Dafuer erstmal die Faktoren berechnen
     MapUnit eSrcUnit=pSrcMod->GetScaleUnit();
     MapUnit eDstUnit=pMod->GetScaleUnit();
-    BOOL bResize=eSrcUnit!=eDstUnit;
+    sal_Bool bResize=eSrcUnit!=eDstUnit;
     Fraction xResize,yResize;
     Point aPt0;
     if (bResize)
@@ -350,7 +350,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
         yResize=aResize.Y();
     }
     SdrObjList*  pDstLst=pLst;
-    USHORT nPg,nPgAnz=pSrcMod->GetPageCount();
+    sal_uInt16 nPg,nPgAnz=pSrcMod->GetPageCount();
     for (nPg=0; nPg<nPgAnz; nPg++)
     {
         const SdrPage* pSrcPg=pSrcMod->GetPage(nPg);
@@ -362,10 +362,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
             ResizeRect(aR,aPt0,xResize,yResize);
         Point aDist(aPos-aR.Center());
         Size  aSiz(aDist.X(),aDist.Y());
-        //ULONG nDstObjAnz0=pDstLst->GetObjCount();
-        ULONG nCloneErrCnt=0;
-        ULONG nOb,nObAnz=pSrcPg->GetObjCount();
-        BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
+        //sal_uIntPtr nDstObjAnz0=pDstLst->GetObjCount();
+        sal_uIntPtr nCloneErrCnt=0;
+        sal_uIntPtr nOb,nObAnz=pSrcPg->GetObjCount();
+        sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
 
         // #i13033#
         // New mechanism to re-create the connections of cloned connectors
@@ -382,9 +382,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
             {
                 if(bResize)
                 {
-                    pNeuObj->GetModel()->SetPasteResize(TRUE); // #51139#
+                    pNeuObj->GetModel()->SetPasteResize(sal_True); // #51139#
                     pNeuObj->NbcResize(aPt0,xResize,yResize);
-                    pNeuObj->GetModel()->SetPasteResize(FALSE); // #51139#
+                    pNeuObj->GetModel()->SetPasteResize(sal_False); // #51139#
                 }
 
                 // #i39861#
@@ -408,7 +408,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
                     }
                     else
                     {
-                        nLayer = rAd.GetLayerID(aAktLayer, TRUE);
+                        nLayer = rAd.GetLayerID(aAktLayer, sal_True);
                     }
 
                     if(SDRLAYER_NOTFOUND == nLayer)
@@ -428,7 +428,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
                 if (bMark) {
                     // Markhandles noch nicht sofort setzen!
                     // Das erledigt das ModelHasChanged der MarkView.
-                    MarkObj(pNeuObj,pMarkPV,FALSE,TRUE);
+                    MarkObj(pNeuObj,pMarkPV,sal_False,sal_True);
                 }
 
                 // #i13033#
@@ -470,10 +470,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
     if( bUndo )
         EndUndo();
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const
+sal_Bool SdrExchangeView::IsExchangeFormatSupported(sal_uIntPtr nFormat) const
 {
     return( FORMAT_PRIVATE == nFormat ||
             FORMAT_GDIMETAFILE == nFormat ||
@@ -484,7 +484,7 @@ BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const
             SOT_FORMATSTR_ID_EDITENGINE == nFormat );
 }
 
-void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions)
+void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions)
 {
     BigInt nSizX(rSiz.Width());
     BigInt nSizY(rSiz.Height());
@@ -524,7 +524,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
             pMarkPV=pPV;
     }
 
-    BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
+    sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
     if (bMark)
     { // Obj in der ersten gefundenen PageView markieren
         MarkObj(pObj,pMarkPV);
@@ -533,7 +533,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const
+Bitmap SdrExchangeView::GetMarkedObjBitmap( sal_Bool bNoVDevIfOneBmpMarked ) const
 {
     Bitmap aBmp;
 
@@ -570,7 +570,7 @@ Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const
 
 // -----------------------------------------------------------------------------
 
-GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked ) const
+GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( sal_Bool bNoVDevIfOneMtfMarked ) const
 {
     GDIMetaFile aMtf;
 
@@ -608,7 +608,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked )
             Size            aDummySize( 2, 2 );
 
             aOut.SetOutputSizePixel( aDummySize );
-            aOut.EnableOutput( FALSE );
+            aOut.EnableOutput( sal_False );
             aOut.SetMapMode( aMap );
 
             aMtf.Clear();
@@ -649,7 +649,7 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const
         if( ( 1 == GetMarkedObjectCount() ) && GetSdrMarkByIndex( 0 ) )
             aRet = SdrExchangeView::GetObjGraphic( pMod, GetMarkedObjectByIndex( 0 ) );
         else
-            aRet = GetMarkedObjMetaFile( FALSE );
+            aRet = GetMarkedObjMetaFile( sal_False );
     }
 
     return aRet;
@@ -691,7 +691,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject*
                                   pModel->GetScaleFraction(),
                                   pModel->GetScaleFraction() );
 
-            aOut.EnableOutput( FALSE );
+            aOut.EnableOutput( sal_False );
             aOut.SetMapMode( aMap );
             aMtf.Record( &aOut );
             pObj->SingleObjectPainter( aOut ); // #110094#-17
@@ -725,7 +725,7 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const
     ::std::vector< SdrMark* >&                  rObjVector1 = aObjVectors[ 0 ];
     ::std::vector< SdrMark* >&                  rObjVector2 = aObjVectors[ 1 ];
     const SdrLayerAdmin&                        rLayerAdmin = pMod->GetLayerAdmin();
-    const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE );
+    const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
     sal_uInt32                                  n, nCount;
 
     for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
@@ -759,7 +759,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
     // werde ich sie mir wohl kopieren muessen.
     SortMarkedObjects();
     SdrModel* pNeuMod=pMod->AllocModel();
-    SdrPage* pNeuPag=pNeuMod->AllocPage(FALSE);
+    SdrPage* pNeuPag=pNeuMod->AllocPage(sal_False);
     pNeuMod->InsertPage(pNeuPag);
 
     if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) )
@@ -768,7 +768,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
         ::std::vector< SdrMark* >&                  rObjVector1 = aObjVectors[ 0 ];
         ::std::vector< SdrMark* >&                  rObjVector2 = aObjVectors[ 1 ];
         const SdrLayerAdmin&                        rLayerAdmin = pMod->GetLayerAdmin();
-        const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE );
+        const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
         sal_uInt32                                  n, nCount, nCloneErrCnt = 0;
 
         for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
@@ -857,38 +857,38 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
 
 // -----------------------------------------------------------------------------
 
-BOOL SdrExchangeView::Cut( ULONG /*nFormat */)
+sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */)
 {
     DBG_ERROR( "SdrExchangeView::Cut: Not supported anymore" );
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------------
 
-void SdrExchangeView::CutMarked( ULONG /*nFormat */)
+void SdrExchangeView::CutMarked( sal_uIntPtr /*nFormat */)
 {
     DBG_ERROR( "SdrExchangeView::CutMarked: Not supported anymore" );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL SdrExchangeView::Yank(ULONG /*nFormat*/)
+sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/)
 {
     DBG_ERROR( "SdrExchangeView::Yank: Not supported anymore" );
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------------
 
-void SdrExchangeView::YankMarked(ULONG /*nFormat*/)
+void SdrExchangeView::YankMarked(sal_uIntPtr /*nFormat*/)
 {
     DBG_ERROR( "YankMarked: Not supported anymore" );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL SdrExchangeView::Paste(Window* /*pWin*/, ULONG /*nFormat*/)
+sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/)
 {
     DBG_ERROR( "SdrExchangeView::Paste: Not supported anymore" );
-    return FALSE;
+    return sal_False;
 }
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 0f5467c99721..f6540e304bfc 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -399,7 +399,7 @@ void Cell::mergeContent( const CellRef& xSourceCell )
     if( xSourceCell->hasText() )
     {
         SdrOutliner& rOutliner=rTableObj.ImpGetDrawOutliner();
-        rOutliner.SetUpdateMode(TRUE);
+        rOutliner.SetUpdateMode(sal_True);
 
         if( hasText() )
         {
@@ -657,7 +657,7 @@ sal_Int32 Cell::getMinimumHeight()
     {
         Outliner& rOutliner=rTableObj.ImpGetDrawOutliner();
         rOutliner.SetPaperSize(aSize);
-        rOutliner.SetUpdateMode(TRUE);
+        rOutliner.SetUpdateMode(sal_True);
         ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT );
 
         if( GetOutlinerParaObject() )
@@ -1417,7 +1417,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
                 case XATTR_FILLHATCH:
                 case XATTR_LINEDASH:
                     {
-                        NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+                        NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
                         if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) )
                             eState = PropertyState_DEFAULT_VALUE;
                     }
@@ -1432,7 +1432,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
                 case XATTR_LINESTART:
                 case XATTR_FILLFLOATTRANSPARENCE:
                     {
-                        NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+                        NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
                         if( ( pItem == NULL ) )
                             eState = PropertyState_DEFAULT_VALUE;
                     }
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index 4b49088be6e2..e979816fcb8d 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -153,7 +153,7 @@ public:
     void                    lock();
     void                    unlock();
 
-    BOOL                    IsValid() const;
+    sal_Bool                    IsValid() const;
 
     Rectangle               GetVisArea();
     Point                   LogicToPixel( const Point&, const MapMode& rMapMode );
@@ -320,7 +320,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
         {
             case HINT_OBJCHG:
             {
-                mbDataValid = FALSE;                        // Text muss neu geholt werden
+                mbDataValid = sal_False;                        // Text muss neu geholt werden
 
                 if( HasView() )
                 {
@@ -353,7 +353,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
                         mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, CellEditSourceImpl, NotifyHdl) );
 
                     // #104157# Only now we're really in edit mode
-                    mbShapeIsEditMode = TRUE;
+                    mbShapeIsEditMode = sal_True;
 
                     Broadcast( *pSdrHint );
                 }
@@ -367,7 +367,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     Broadcast( *pSdrHint );
 
                     // #104157# We're no longer in edit mode
-                    mbShapeIsEditMode = FALSE;
+                    mbShapeIsEditMode = sal_False;
 
                     // remove as listener - outliner might outlive ourselves
                     if( mpView && mpView->GetTextEditOutliner() )
@@ -800,9 +800,9 @@ void CellEditSourceImpl::unlock()
     }
 }
 
-BOOL CellEditSourceImpl::IsValid() const
+sal_Bool CellEditSourceImpl::IsValid() const
 {
-    return mpView && mpWindow ? TRUE : FALSE;
+    return mpView && mpWindow ? sal_True : sal_False;
 }
 
 Rectangle CellEditSourceImpl::GetVisArea()
@@ -997,7 +997,7 @@ void CellEditSource::unlock()
 
 //------------------------------------------------------------------------
 
-BOOL CellEditSource::IsValid() const
+sal_Bool CellEditSource::IsValid() const
 {
     return mpImpl->IsValid();
 }
diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx
index 561086106fbf..4d5ccbd43e55 100644
--- a/svx/source/table/celleditsource.hxx
+++ b/svx/source/table/celleditsource.hxx
@@ -71,7 +71,7 @@ public:
     void unlock();
 
     // the SvxViewForwarder interface
-    virtual BOOL        IsValid() const;
+    virtual sal_Bool        IsValid() const;
     virtual Rectangle   GetVisArea() const;
     virtual Point       LogicToPixel( const Point&, const MapMode& ) const;
     virtual Point       PixelToLogic( const Point&, const MapMode& ) const;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 7f9250a90561..9ac652f5e025 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -756,7 +756,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int
 
 void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
 {
-    bClosedObj = TRUE;
+    bClosedObj = sal_True;
 
     mpImpl = new SdrTableObjImpl;
     mpImpl->acquire();
@@ -1353,14 +1353,14 @@ void SdrTableObj::FitFrameToTextSize()
 
 FASTBOOL SdrTableObj::IsAutoGrowHeight() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------
 
 FASTBOOL SdrTableObj::IsAutoGrowWidth() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------
@@ -1399,34 +1399,34 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
 
 void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bResizeFreeAllowed=TRUE;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
+    rInfo.bResizeFreeAllowed=sal_True;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
 
     // allow transparence
-    rInfo.bTransparenceAllowed = TRUE;
+    rInfo.bTransparenceAllowed = sal_True;
 
     // gradient depends on fillstyle
     XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
     rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =FALSE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
-    rInfo.bCanConvToContour = FALSE;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_False;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
+    rInfo.bCanConvToContour = sal_False;
 }
 
 // --------------------------------------------------------------------
 
-UINT16 SdrTableObj::GetObjIdentifier() const
+sal_uInt16 SdrTableObj::GetObjIdentifier() const
 {
-    return static_cast<UINT16>(OBJ_TABLE);
+    return static_cast<sal_uInt16>(OBJ_TABLE);
 }
 
 // --------------------------------------------------------------------
@@ -1460,7 +1460,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
 
 // --------------------------------------------------------------------
 
-void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, BOOL bLineWidth ) const
+void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
 {
     if( mpImpl )
         TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
@@ -1468,7 +1468,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FA
 
 // --------------------------------------------------------------------
 
-void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, BOOL /*bLineWidth*/ ) const
+void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/ ) const
 {
     if( !mpImpl )
         return;
@@ -1483,7 +1483,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
     SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust();
 //  SdrTextHorzAdjust eHAdj=xCell->GetTextHorizontalAdjust();
 
-    ULONG nStat0=rOutliner.GetControlWord();
+    sal_uIntPtr nStat0=rOutliner.GetControlWord();
     Size aNullSize;
     nStat0 |= EE_CNTRL_AUTOPAGESIZE;
     rOutliner.SetControlWord(nStat0);
@@ -1519,7 +1519,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
             if( bHitTest ) // #i33696# take back fix #i27510#
                 rOutliner.SetTextObj( this );
 
-            rOutliner.SetUpdateMode(TRUE);
+            rOutliner.SetUpdateMode(sal_True);
             rOutliner.SetText(*pPara);
         }
     }
@@ -1531,7 +1531,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
     if (pEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell )
         delete pPara;
 
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetControlWord(nStat0);
 
     Point aTextPos(aAnkRect.TopLeft());
@@ -1750,7 +1750,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size*
 
 // --------------------------------------------------------------------
 
-USHORT SdrTableObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
 {
     EVAnchorMode eRet=ANCHOR_TOP_LEFT;
     CellRef xCell( getActiveCell() );
@@ -1807,7 +1807,7 @@ USHORT SdrTableObj::GetOutlinerViewAnchorMode() const
         }
 */
     }
-    return (USHORT)eRet;
+    return (sal_uInt16)eRet;
 }
 
 // --------------------------------------------------------------------
@@ -2044,14 +2044,14 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
 
 //  ForceOutlinerParaObject();
 
-    mbInEditMode = TRUE;
+    mbInEditMode = sal_True;
 
     rOutl.Init( OUTLINERMODE_TEXTOBJECT );
     rOutl.SetRefDevice( pModel->GetRefDevice() );
 
 // --
         FASTBOOL bUpdMerk=rOutl.GetUpdateMode();
-        if (bUpdMerk) rOutl.SetUpdateMode(FALSE);
+        if (bUpdMerk) rOutl.SetUpdateMode(sal_False);
         Size aPaperMin;
         Size aPaperMax;
         Rectangle aEditArea;
@@ -2061,10 +2061,10 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
         rOutl.SetMaxAutoPaperSize(aPaperMax);
         rOutl.SetPaperSize(aPaperMax);
 
-        if (bUpdMerk) rOutl.SetUpdateMode(TRUE);
+        if (bUpdMerk) rOutl.SetUpdateMode(sal_True);
 //---
 
-    ULONG nStat=rOutl.GetControlWord();
+    sal_uIntPtr nStat=rOutl.GetControlWord();
 //  nStat   &= ~EE_CNTRL_AUTOPAGESIZE;
     nStat   |= EE_CNTRL_AUTOPAGESIZE;
     nStat   &=~EE_CNTRL_STRETCHING;
@@ -2093,7 +2093,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
 
         OutlinerParaObject* pNewText = 0;
         Paragraph* p1stPara = rOutl.GetParagraph( 0 );
-        UINT32 nParaAnz = rOutl.GetParagraphCount();
+        sal_uInt32 nParaAnz = rOutl.GetParagraphCount();
 
         if(p1stPara)
         {
@@ -2123,11 +2123,11 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
 
     pEdtOutl = 0;
     rOutl.Clear();
-    UINT32 nStat = rOutl.GetControlWord();
+    sal_uInt32 nStat = rOutl.GetControlWord();
     nStat &= ~EE_CNTRL_AUTOPAGESIZE;
     rOutl.SetControlWord(nStat);
 
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 }
 
 // --------------------------------------------------------------------
@@ -2235,7 +2235,7 @@ FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt
 FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHeight, FASTBOOL bWidth) const
 {
     if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() )
-        return FALSE;
+        return sal_False;
 
     Rectangle aRectangle( rR );
     mpImpl->LayoutTable( aRectangle, !bWidth, !bHeight );
@@ -2243,11 +2243,11 @@ FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHei
     if( aRectangle != rR )
     {
         rR = aRectangle;
-        return TRUE;
+        return sal_True;
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -2330,7 +2330,7 @@ bool SdrTableObj::IsRealyEdited() const
 
 FASTBOOL SdrTableObj::IsFontwork() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 // --------------------------------------------------------------------
@@ -2439,8 +2439,8 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const
     rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomCenter(),HDL_LOWER) ); pH->SetMoveOutside( true );
     rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomRight(),HDL_LWRGT) ); pH->SetMoveOutside( true );
 
-    ULONG nHdlCount = rHdlList.GetHdlCount();
-    for( ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ )
+    sal_uIntPtr nHdlCount = rHdlList.GetHdlCount();
+    for( sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ )
         rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this);
 }
 
@@ -2606,7 +2606,7 @@ FASTBOOL SdrTableObj::BegCreate(SdrDragStat& rStat)
     aRect1.Justify();
     rStat.SetActionRect(aRect1);
     aRect = aRect1;
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------
@@ -2619,8 +2619,8 @@ FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     aRect=aRect1; // fuer ObjName
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    return TRUE;
+    bSnapRectDirty=sal_True;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------
@@ -2640,7 +2640,7 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/)
 
 FASTBOOL SdrTableObj::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index a4ba47047efe..9452420901a7 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -400,7 +400,7 @@ void SvxTableController::GetState( SfxItemSet& rSet )
 
     // Iterate over all requested items in the set.
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         switch (nWhich)
@@ -418,7 +418,7 @@ void SvxTableController::GetState( SfxItemSet& rSet )
                         if( !pSet )
                         {
                             pSet = new SfxItemSet( mxTableObj->GetModel()->GetItemPool() );
-                            MergeAttrFromSelectedCells(*pSet, FALSE);
+                            MergeAttrFromSelectedCells(*pSet, sal_False);
                         }
 
                         SdrTextVertAdjust eAdj = SDRTEXTVERTADJUST_BLOCK;
@@ -504,11 +504,11 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
         if( pArgs )
         {
             const SfxPoolItem* pItem = 0;
-            pArgs->GetItemState(nSId, FALSE, &pItem);
+            pArgs->GetItemState(nSId, sal_False, &pItem);
             if (pItem)
             {
                 nCount = ((const SfxInt16Item* )pItem)->GetValue();
-                if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, TRUE, &pItem))
+                if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, sal_True, &pItem))
                     bInsertAfter = ((const SfxBoolItem* )pItem)->GetValue();
             }
         }
@@ -722,14 +722,14 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
     if( !pArgs && pTableObj->GetModel() )
     {
         SfxItemSet aNewAttr( pTableObj->GetModel()->GetItemPool() );
-        MergeAttrFromSelectedCells(aNewAttr, FALSE);
+        MergeAttrFromSelectedCells(aNewAttr, sal_False);
 
         // merge drawing layer text distance items into SvxBoxItem used by the dialog
         SvxBoxItem aBoxItem( static_cast< const SvxBoxItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER ) ) );
-        aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT );
-        aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT );
-        aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP );
-        aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM );
+        aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT );
+        aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT );
+        aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP );
+        aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM );
         aNewAttr.Put( aBoxItem );
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -752,7 +752,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
             if( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) != aBoxItem.GetDistance( BOX_LINE_BOTTOM ) )
                 aNewSet.Put(SdrTextLowerDistItem( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) ) );
 
-            SetAttrToSelectedCells(aNewSet, FALSE);
+            SetAttrToSelectedCells(aNewSet, sal_False);
         }
         UpdateTableShape();
     }
@@ -843,7 +843,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
     SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() );
     SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0;
 
-    if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, FALSE)) )
+    if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, sal_False)) )
         return;
 
     const SfxStringItem* pArg = dynamic_cast< const SfxStringItem* >( &pArgs->Get( SID_TABLE_STYLE ) );
@@ -882,7 +882,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
                         bool bChanges = false;
                         const SfxItemSet& rStyleAttribs = xCell->GetStyleSheet()->GetItemSet();
 
-                        for ( USHORT nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
+                        for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
                         {
                             if( (rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON) && (aSet.GetItemState( nWhich ) == SFX_ITEM_ON) )
                             {
@@ -930,22 +930,22 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs )
 
     const SfxPoolItem *pPoolItem=NULL;
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseFirstRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseLastRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseRowBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseFirstColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseLastColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseColumnBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
     if( aSettings == pTableObj->getTableStyleSettings() )
@@ -1677,7 +1677,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
         if(!pTableObj->GetOutlinerParaObject() && mpView->GetTextEditOutliner())
         {
             ::Outliner* pOutl = mpView->GetTextEditOutliner();
-            ULONG nParaAnz = pOutl->GetParagraphCount();
+            sal_uIntPtr nParaAnz = pOutl->GetParagraphCount();
             Paragraph* p1stPara = pOutl->GetParagraph( 0 );
 
             if(nParaAnz==1 && p1stPara)
@@ -1703,7 +1703,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
             // create new outliner, owner will be the SdrObjEditView
             SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpModel );
             if( pTableObj->IsVerticalWriting() )
-                pOutl->SetVertical( TRUE );
+                pOutl->SetVertical( sal_True );
 
             if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, sal_True, pOutl))
             {
@@ -2020,15 +2020,15 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl
                     {
                         if(!bOnlyHardAttr)
                         {
-                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                                 rAttr.InvalidateItem(nWhich);
                             else
-                                rAttr.MergeValue(rSet.Get(nWhich), TRUE);
+                                rAttr.MergeValue(rSet.Get(nWhich), sal_True);
                         }
-                        else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE))
+                        else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False))
                         {
                             const SfxPoolItem& rItem = rSet.Get(nWhich);
-                            rAttr.MergeValue(rItem, TRUE);
+                            rAttr.MergeValue(rItem, sal_True);
                         }
 
                         nWhich = aIter.NextWhich();
@@ -2057,7 +2057,7 @@ const sal_uInt16 CELL_LOWER  = 0x0080;
 
 // --------------------------------------------------------------------
 
-static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, USHORT nLine )
+static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, sal_uInt16 nLine )
 {
     if( pNew )
     {
@@ -2126,14 +2126,14 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem,
 
         // apply distance to borders
         if( pBoxInfoItem->IsValid( VALID_DISTANCE ) )
-            for( USHORT nLine = 0; nLine < 4; ++nLine )
+            for( sal_uInt16 nLine = 0; nLine < 4; ++nLine )
                 rNewFrame.SetDistance( pBoxItem->GetDistance( nLine ), nLine );
     }
 }
 
 // --------------------------------------------------------------------
 
-static void ImplSetLineColor( SvxBoxItem& rNewFrame, USHORT nLine, const Color& rColor )
+static void ImplSetLineColor( SvxBoxItem& rNewFrame, sal_uInt16 nLine, const Color& rColor )
 {
     const SvxBorderLine* pSourceLine = rNewFrame.GetLine( nLine );
     if( pSourceLine )
@@ -2220,19 +2220,19 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr )
         if( nRowCount && nColCount )
         {
             const SvxBoxItem* pBoxItem = 0;
-            if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, FALSE) )
+            if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, sal_False) )
                 pBoxItem = dynamic_cast< const SvxBoxItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER ) );
 
             const SvxBoxInfoItem* pBoxInfoItem = 0;
-            if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, FALSE) )
+            if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, sal_False) )
                 pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER_INNER ) );
 
             const SvxColorItem* pLineColorItem = 0;
-            if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, FALSE) )
+            if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, sal_False) )
                 pLineColorItem = dynamic_cast< const SvxColorItem* >( &rAttr.Get( SID_FRAME_LINECOLOR ) );
 
             const SvxBorderLine* pBorderLineItem = 0;
-            if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, FALSE) )
+            if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, sal_False) )
                 pBorderLineItem = ((const SvxLineItem&)rAttr.Get( SID_FRAME_LINESTYLE )).GetLine();
 
             if( pBoxInfoItem && !pBoxItem )
@@ -2327,7 +2327,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR
         getSelectedCells( aStart, aEnd );
 
         SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges());
-        aAttr.Put(rAttr, TRUE);
+        aAttr.Put(rAttr, sal_True);
 
         const bool bFrame = (rAttr.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rAttr.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET);
 
@@ -2381,8 +2381,8 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt
             if(pTextEditOutlinerView)
             {
                 // FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten
-                rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE);
-                rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE );
+                rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
+                rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
             }
         }
 
@@ -2534,7 +2534,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
         getSelectedCells( aStart, aEnd );
 
         SfxItemSet aAttr(*rFormatSet.GetPool(), rFormatSet.GetRanges());
-        aAttr.Put(rFormatSet, TRUE);
+        aAttr.Put(rFormatSet, sal_True);
 
         const bool bFrame = (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET);
 
@@ -2544,7 +2544,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
             aAttr.ClearItem( SDRATTR_TABLE_BORDER_INNER );
         }
 
-        const USHORT* pRanges = rFormatSet.GetRanges();
+        const sal_uInt16* pRanges = rFormatSet.GetRanges();
         bool bTextOnly = true;
 
         while( *pRanges )
diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx
index 8ced09bc587f..40f22ef8ea09 100644
--- a/svx/source/table/tablecontroller.hxx
+++ b/svx/source/table/tablecontroller.hxx
@@ -161,7 +161,7 @@ private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxModifyListener;
 
-    ULONG mnUpdateEvent;
+    sal_uLong mnUpdateEvent;
 };
 
 } }
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 7f855752dcf2..643251100cbd 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -927,8 +927,8 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine
     if (!pOther || (pOther == &gEmptyBorder))
         return true;
 
-    USHORT nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
-    USHORT nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
+    sal_uInt16 nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
+    sal_uInt16 nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
 
     if (nThisSize > nOtherSize)
         return true;
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index d155e084fff8..6fdb0f6c8be7 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -64,7 +64,7 @@ class SdrTableRtfExporter
 {
 public:
     SdrTableRtfExporter( SvStream& rStrmP, SdrTableObj& rObj );
-    ULONG Write();
+    sal_uLong Write();
     void WriteRow( const Reference< XPropertySet >& xRowSet, sal_Int32 nRow, const std::vector< sal_Int32 >& aColumnStart );
     void WriteCell( sal_Int32 nCol, sal_Int32 nRow );
 
@@ -95,7 +95,7 @@ long HundMMToTwips( long nIn )
     return nRet;
 }
 
-ULONG SdrTableRtfExporter::Write()
+sal_uLong SdrTableRtfExporter::Write()
 {
     mrStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
     mrStrm << OOO_STRING_SVTOOLS_RTF_ANSI << RTFOutFuncs::sNewLine;
@@ -185,7 +185,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
     }
     mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << RTFOutFuncs::sNewLine;
 
-    ULONG nStrmPos = mrStrm.Tell();
+    sal_uLong nStrmPos = mrStrm.Tell();
     for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
     {
         WriteCell( nCol, nRow );
@@ -232,7 +232,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
     }
 
     bool bResetPar, bResetAttr;
-    bResetPar = bResetAttr = FALSE;
+    bResetPar = bResetAttr = sal_False;
 
     SdrTextHorzAdjust eHAdj = xCell->GetTextHorizontalAdjust();
 
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 359089444210..530732796c05 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -62,7 +62,7 @@ struct RTFCellDefault
 {
     SfxItemSet          maItemSet;
     sal_Int32           mnCol;
-    USHORT              mnTwips;         // right border of the cell
+    sal_uInt16              mnTwips;         // right border of the cell
     sal_Int32           mnColSpan;   // MergeCell if >1, merged cells if 0
 
     RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnCol(0), mnTwips(0 ), mnColSpan(1) {}
@@ -119,7 +119,7 @@ private:
     sal_Int32       mnLastWidth;
     bool            mbNewDef;
 
-    USHORT          mnStartPara;
+    sal_uInt16          mnStartPara;
 
     sal_Int32       mnColCnt;
     sal_Int32       mnRowCnt;
@@ -151,7 +151,7 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj )
 , mpDefMerge( 0 )
 , mxTable( rTableObj.getTable() )
 {
-    mpOutliner->SetUpdateMode(TRUE);
+    mpOutliner->SetUpdateMode(sal_True);
     mpOutliner->SetStyleSheet( 0, mrTableObj.GetStyleSheet() );
     mpInsDefault = new RTFCellDefault( &mrItemPool );
 }
@@ -282,16 +282,16 @@ void SdrTableRTFParser::FillTable()
                 if( xCell.is() && xCellInfo.get() )
                 {
                     const SfxPoolItem *pPoolItem = 0;
-                    if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,FALSE,&pPoolItem)==SFX_ITEM_SET)
+                    if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,&pPoolItem)==SFX_ITEM_SET)
                         xCell->SetMergedItem( *pPoolItem );
 
                     String sDebug = mpOutliner->GetText( mpOutliner->GetParagraph( xCellInfo->mnStartPara ), xCellInfo->mnParaCount );
 
-                    OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (USHORT)xCellInfo->mnStartPara, (USHORT)xCellInfo->mnParaCount );
+                    OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (sal_uInt16)xCellInfo->mnStartPara, (sal_uInt16)xCellInfo->mnParaCount );
                     if( pTextObject )
                     {
                         SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner();
-                        rOutliner.SetUpdateMode(TRUE);
+                        rOutliner.SetUpdateMode(sal_True);
                         rOutliner.SetText( *pTextObject );
                         mrTableObj.NbcSetOutlinerParaObjectForText( rOutliner.CreateParaObject(), xCell.get() );
                         delete pTextObject;
@@ -316,7 +316,7 @@ void SdrTableRTFParser::NewCellRow()
 {
     if( mbNewDef )
     {
-        mbNewDef = FALSE;
+        mbNewDef = sal_False;
 
         maRows.push_back( RTFColumnVectorPtr( new RTFColumnVector() ) );
     }
@@ -373,7 +373,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
         break;
         case RTF_CELLX:         // closes cell default
         {
-            mbNewDef = TRUE;
+            mbNewDef = sal_True;
             mpInsDefault->mnCol = mnColCnt;
             maDefaultList.push_back( boost::shared_ptr< RTFCellDefault >( mpInsDefault ) );
 
@@ -427,10 +427,10 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
             switch ( pInfo->nToken & ~(0xff | RTF_TABLEDEF) )
             {
                 case RTF_SHADINGDEF:
-//                  ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, TRUE );
+//                  ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True );
                 break;
                 case RTF_BRDRDEF:
-                    ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, TRUE );
+                    ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True );
                 break;
             }
         }
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index d57be9f0994d..9b3f5e293070 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -107,16 +107,16 @@ void CellUndo::Redo()
     }
 }
 
-BOOL CellUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool CellUndo::Merge( SfxUndoAction *pNextAction )
 {
     CellUndo* pNext = dynamic_cast< CellUndo* >( pNextAction );
     if( pNext && pNext->mxCell.get() == mxCell.get() )
     {
-        return TRUE;
+        return sal_True;
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -413,7 +413,7 @@ void TableColumnUndo::Redo()
 
 // -----------------------------------------------------------------------------
 
-BOOL TableColumnUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool TableColumnUndo::Merge( SfxUndoAction *pNextAction )
 {
     TableColumnUndo* pNext = dynamic_cast< TableColumnUndo* >( pNextAction );
     return pNext && pNext->mxCol == mxCol;
@@ -482,7 +482,7 @@ void TableRowUndo::Redo()
 
 // -----------------------------------------------------------------------------
 
-BOOL TableRowUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool TableRowUndo::Merge( SfxUndoAction *pNextAction )
 {
     TableRowUndo* pNext = dynamic_cast< TableRowUndo* >( pNextAction );
     return pNext && pNext->mxRow == mxRow;
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 8bf00c4b0d98..2e5fee9382d6 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -55,7 +55,7 @@ public:
 
     virtual void            Undo();
     virtual void            Redo();
-    virtual BOOL            Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool            Merge( SfxUndoAction *pNextAction );
 
     void dispose();
     virtual void ObjectInDestruction(const SdrObject& rObject);
@@ -172,7 +172,7 @@ public:
 
     virtual void            Undo();
     virtual void            Redo();
-    virtual BOOL            Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool            Merge( SfxUndoAction *pNextAction );
 
 private:
     struct Data
@@ -204,7 +204,7 @@ public:
 
     virtual void            Undo();
     virtual void            Redo();
-    virtual BOOL            Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool            Merge( SfxUndoAction *pNextAction );
 
 private:
     struct Data
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 6475ec5fc1a5..726d0810aab2 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -18,7 +18,7 @@ class SvxColorWindow_Impl : public SfxPopupWindow
     using FloatingWindow::StateChanged;
 
 private:
-    const USHORT                                                        theSlotId;
+    const sal_uInt16                                                        theSlotId;
     ValueSet                                                            aColorSet;
     rtl::OUString                                                       maCommand;
 
@@ -28,11 +28,11 @@ private:
 
 protected:
     virtual void    Resize();
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 
 public:
     SvxColorWindow_Impl( const rtl::OUString& rCommand,
-                         USHORT nSlotId,
+                         sal_uInt16 nSlotId,
                          const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                          const String& rWndTitle,
                          Window* pParentWindow );
@@ -40,7 +40,7 @@ public:
     void                StartSelection();
 
     virtual void        KeyInput( const KeyEvent& rKEvt );
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
     virtual SfxPopupWindow* Clone() const;
 };
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 260a2e2e646c..b712bcfe04d2 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -111,7 +111,7 @@ sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*,
 SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) :
     ValueSet( _pParent, nWinStyle ),
     DragSourceHelper( this ),
-    bLeft (TRUE)
+    bLeft (sal_True)
 {
 }
 
@@ -124,7 +124,7 @@ SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) :
 SvxColorValueSet::SvxColorValueSet( Window* _pParent, const ResId& rResId ) :
     ValueSet( _pParent, rResId ),
     DragSourceHelper( this ),
-    bLeft (TRUE)
+    bLeft (sal_True)
 {
 }
 
@@ -139,12 +139,12 @@ void SvxColorValueSet::MouseButtonDown( const MouseEvent& rMEvt )
     // Fuer Mac noch anders handlen !
     if( rMEvt.IsLeft() )
     {
-        bLeft = TRUE;
+        bLeft = sal_True;
         ValueSet::MouseButtonDown( rMEvt );
     }
     else
     {
-        bLeft = FALSE;
+        bLeft = sal_False;
         MouseEvent aMEvt( rMEvt.GetPosPixel(),
                           rMEvt.GetClicks(),
                           rMEvt.GetMode(),
@@ -167,12 +167,12 @@ void SvxColorValueSet::MouseButtonUp( const MouseEvent& rMEvt )
     // Fuer Mac noch anders handlen !
     if( rMEvt.IsLeft() )
     {
-        bLeft = TRUE;
+        bLeft = sal_True;
         ValueSet::MouseButtonUp( rMEvt );
     }
     else
     {
-        bLeft = FALSE;
+        bLeft = sal_False;
         MouseEvent aMEvt( rMEvt.GetPosPixel(),
                           rMEvt.GetClicks(),
                           rMEvt.GetMode(),
@@ -215,7 +215,7 @@ void SvxColorValueSet::StartDrag( sal_Int8 , const Point&  )
 void SvxColorValueSet::DoDrag()
 {
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
-    USHORT          nItemId = GetItemId( aDragPosPixel );
+    sal_uInt16          nItemId = GetItemId( aDragPosPixel );
 
     if( pDocSh && nItemId )
     {
@@ -252,7 +252,7 @@ IMPL_STATIC_LINK(SvxColorValueSet, ExecDragHdl, void*, EMPTYARG)
 \************************************************************************/
 
 SvxColorChildWindow::SvxColorChildWindow( Window* _pParent,
-                                          USHORT nId,
+                                          sal_uInt16 nId,
                                           SfxBindings* pBindings,
                                           SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
@@ -333,7 +333,7 @@ SvxColorDockingWindow::SvxColorDockingWindow
 
     SetSize();
     aColorSet.Show();
-    StartListening( *_pBindings, TRUE );
+    StartListening( *_pBindings, sal_True );
 }
 
 
@@ -390,7 +390,7 @@ void SvxColorDockingWindow::FillValueSet()
 
         Bitmap aBmp( aVD.GetBitmap( Point(), aColorSize ) );
 
-        aColorSet.InsertItem( (USHORT)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
+        aColorSet.InsertItem( (sal_uInt16)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
 
         XColorEntry* pEntry;
         nCount = pColorTable->Count();
@@ -398,7 +398,7 @@ void SvxColorDockingWindow::FillValueSet()
         for( long i = 0; i < nCount; i++ )
         {
             pEntry = pColorTable->GetColor( i );
-            aColorSet.InsertItem( (USHORT)i+2,
+            aColorSet.InsertItem( (sal_uInt16)i+2,
                             pEntry->GetColor(), pEntry->GetName() );
         }
     }
@@ -418,8 +418,8 @@ void SvxColorDockingWindow::SetSize()
     aSize.Height() -= 4;
 
     // Zeilen und Spalten berechnen
-    nCols = (USHORT) ( aSize.Width() / aItemSize.Width() );
-    nLines = (USHORT) ( (float) aSize.Height() / (float) aItemSize.Height() /*+ 0.35*/ );
+    nCols = (sal_uInt16) ( aSize.Width() / aItemSize.Width() );
+    nLines = (sal_uInt16) ( (float) aSize.Height() / (float) aItemSize.Height() /*+ 0.35*/ );
     if( nLines == 0 )
         nLines++;
 
@@ -436,7 +436,7 @@ void SvxColorDockingWindow::SetSize()
     if( nScrollWidth > 0 )
     {
         // Spalten mit ScrollBar berechnen
-        nCols = (USHORT) ( ( aSize.Width() - nScrollWidth ) / aItemSize.Width() );
+        nCols = (sal_uInt16) ( ( aSize.Width() - nScrollWidth ) / aItemSize.Width() );
     }
     aColorSet.SetColCount( nCols );
 
@@ -457,13 +457,13 @@ void SvxColorDockingWindow::SetSize()
 |*
 \************************************************************************/
 
-BOOL SvxColorDockingWindow::Close()
+sal_Bool SvxColorDockingWindow::Close()
 {
-    SfxBoolItem aItem( SID_COLOR_CONTROL, FALSE );
+    SfxBoolItem aItem( SID_COLOR_CONTROL, sal_False );
     GetBindings().GetDispatcher()->Execute(
         SID_COLOR_CONTROL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     SfxDockingWindow::Close();
-    return( TRUE );
+    return( sal_True );
 }
 
 /*************************************************************************
@@ -475,7 +475,7 @@ BOOL SvxColorDockingWindow::Close()
 IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
 {
     SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
-    USHORT nPos = aColorSet.GetSelectItemId();
+    sal_uInt16 nPos = aColorSet.GetSelectItemId();
     Color  aColor( aColorSet.GetItemColor( nPos ) );
     String aStr( aColorSet.GetItemText( nPos ) );
 
@@ -490,7 +490,7 @@ IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
             }
             else
             {
-                BOOL bDone = FALSE;
+                sal_Bool bDone = sal_False;
 
                 // Wenn wir eine DrawView haben und uns im TextEdit-Modus befinden,
                 // wird nicht die Flaechen-, sondern die Textfarbe zugewiesen
@@ -503,7 +503,7 @@ IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
                         SvxColorItem aTextColorItem( aColor, SID_ATTR_CHAR_COLOR );
                         pDispatcher->Execute(
                             SID_ATTR_CHAR_COLOR, SFX_CALLMODE_RECORD, &aTextColorItem, 0L );
-                        bDone = TRUE;
+                        bDone = sal_True;
                     }
                 }
                 if ( !bDone )
@@ -581,8 +581,8 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
     rNewSize.Height() -= 4;
 
     // Spalten und Reihen ermitteln
-    nCols = (USHORT) ( (float) rNewSize.Width() / (float) aItemSize.Width() + 0.5 );
-    nLines = (USHORT) ( (float) rNewSize.Height() / (float) aItemSize.Height() + 0.5 );
+    nCols = (sal_uInt16) ( (float) rNewSize.Width() / (float) aItemSize.Width() + 0.5 );
+    nLines = (sal_uInt16) ( (float) rNewSize.Height() / (float) aItemSize.Height() + 0.5 );
     if( nLines == 0 )
         nLines = 1;
 
@@ -599,7 +599,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
     if( nScrollWidth > 0 )
     {
         // Spalten mit ScrollBar berechnen
-        nCols = (USHORT) ( ( ( (float) rNewSize.Width() - (float) nScrollWidth ) )
+        nCols = (sal_uInt16) ( ( ( (float) rNewSize.Width() - (float) nScrollWidth ) )
                             / (float) aItemSize.Width() + 0.5 );
     }
     if( nCols <= 1 )
@@ -610,7 +610,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
     if( nCount %  nCols )
         nMaxLines++;
 
-    nLines = sal::static_int_cast< USHORT >(
+    nLines = sal::static_int_cast< sal_uInt16 >(
         std::min< long >( nLines, nMaxLines ) );
 
     // Groesse des Windows setzen
@@ -647,7 +647,7 @@ long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )
     if( ( rNEvt.GetType() == EVENT_KEYINPUT ) )
     {
         KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
-        USHORT   nKeyCode = aKeyEvt.GetKeyCode().GetCode();
+        sal_uInt16   nKeyCode = aKeyEvt.GetKeyCode().GetCode();
         switch( nKeyCode )
         {
             case KEY_ESCAPE:
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index e5bc5045c7b3..fb68c8768d49 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -98,7 +98,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon
 {
     SetHelpId( HID_MENU_EXTRUSION_DIRECTION );
 
-    USHORT i;
+    sal_uInt16 i;
     for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
     {
         maImgDirection[i] = Image( SVX_RES( IMG_DIRECTION + i ) );
@@ -111,7 +111,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon
 
     mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
     mpDirectionSet->SetColCount( 3 );
-    mpDirectionSet->EnableFullItemMode( FALSE );
+    mpDirectionSet->EnableFullItemMode( sal_False );
 
     bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
@@ -144,7 +144,7 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
     {
         bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
-        for( USHORT i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
+        for( sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
         {
             mpDirectionSet->SetItemImage( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ] );
         }
@@ -160,7 +160,7 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled
 {
     if( mpDirectionSet )
     {
-        USHORT nItemId;
+        sal_uInt16 nItemId;
         for( nItemId = DIRECTION_NW; nItemId <= DIRECTION_SE; nItemId++ )
         {
             if( gSkewList[nItemId] == nSkew )
@@ -406,7 +406,7 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth )
 void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
 {
     meUnit = eUnit;
-    USHORT nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH;
+    sal_uInt16 nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH;
 
     for( int i = 0; i < 5; i++ )
     {
@@ -594,7 +594,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
 , msExtrusionLightingDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" ))
 , msExtrusionLightingIntensity( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" ))
 {
-    USHORT i;
+    sal_uInt16 i;
     for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
     {
         if( i != FROM_FRONT )
@@ -616,7 +616,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
 
     mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) );
     mpLightingSet->SetColCount( 3 );
-    mpLightingSet->EnableFullItemMode( FALSE );
+    mpLightingSet->EnableFullItemMode( sal_False );
 
     bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
@@ -673,7 +673,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
     if( !bEnabled )
         nDirection = FROM_FRONT;
 
-    USHORT nItemId;
+    sal_uInt16 nItemId;
     for( nItemId = FROM_TOP_LEFT; nItemId <= FROM_BOTTOM_RIGHT; nItemId++ )
     {
         if( nItemId == FROM_FRONT )
@@ -684,11 +684,11 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
         {
             if( bHighContrast )
             {
-                mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOnh[nItemId] : maImgLightingOffh[nItemId] );
+                mpLightingSet->SetItemImage( nItemId + 1, (sal_uInt16)nDirection == nItemId ? maImgLightingOnh[nItemId] : maImgLightingOffh[nItemId] );
             }
             else
             {
-                mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] );
+                mpLightingSet->SetItemImage( nItemId + 1, (sal_uInt16)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] );
             }
         }
     }
@@ -990,7 +990,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames(
 SFX_IMPL_TOOLBOX_CONTROL( ExtrusionColorControl, SvxColorItem );
 
 ExtrusionColorControl::ExtrusionColorControl(
-    USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+    sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
 : SfxToolBoxControl ( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -1029,9 +1029,9 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void ExtrusionColorControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
 
     if( nSID == SID_EXTRUSION_3D_COLOR )
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 5b740dbef004..eb10f11060d4 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -66,7 +66,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxFillToolBoxControl, XFillStyleItem );
 |*
 \************************************************************************/
 
-SvxFillToolBoxControl::SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
 
     pStyleItem      ( NULL ),
@@ -77,8 +77,8 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBo
     pFillControl    ( NULL ),
     pFillTypeLB     ( NULL ),
     pFillAttrLB     ( NULL ),
-    bUpdate         ( FALSE ),
-    bIgnoreStatusUpdate( FALSE ),
+    bUpdate         ( sal_False ),
+    bIgnoreStatusUpdate( sal_False ),
     eLastXFS        ( XFILL_NONE )
 {
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )));
@@ -106,10 +106,10 @@ SvxFillToolBoxControl::~SvxFillToolBoxControl()
 
 void SvxFillToolBoxControl::StateChanged(
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    FASTBOOL bEnableControls = FALSE;
+    bool bEnableControls = sal_False;
 
     if ( bIgnoreStatusUpdate )
         return;
@@ -135,11 +135,11 @@ void SvxFillToolBoxControl::StateChanged(
                 pFillTypeLB->Enable();
 
                 eLastXFS = pFillTypeLB->GetSelectEntryPos();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
 
                 XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue();
                 pFillTypeLB->SelectEntryPos(
-                    sal::static_int_cast< USHORT >( eXFS ) );
+                    sal::static_int_cast< sal_uInt16 >( eXFS ) );
                 pFillAttrLB->Enable();
             }
             else if( pStyleItem )
@@ -152,7 +152,7 @@ void SvxFillToolBoxControl::StateChanged(
                     pColorItem = (XFillColorItem*) pState->Clone();
 
                     if( eXFS == XFILL_SOLID )
-                        bEnableControls = TRUE;
+                        bEnableControls = sal_True;
                 }
                 else if( nSID == SID_ATTR_FILL_GRADIENT )
                 {
@@ -160,7 +160,7 @@ void SvxFillToolBoxControl::StateChanged(
                     pGradientItem = (XFillGradientItem*) pState->Clone();
 
                     if( eXFS == XFILL_GRADIENT )
-                        bEnableControls = TRUE;
+                        bEnableControls = sal_True;
                 }
                 else if( nSID == SID_ATTR_FILL_HATCH )
                 {
@@ -168,7 +168,7 @@ void SvxFillToolBoxControl::StateChanged(
                     pHatchItem = (XFillHatchItem*) pState->Clone();
 
                     if( eXFS == XFILL_HATCH )
-                        bEnableControls = TRUE;
+                        bEnableControls = sal_True;
                 }
                 else if( nSID == SID_ATTR_FILL_BITMAP )
                 {
@@ -176,7 +176,7 @@ void SvxFillToolBoxControl::StateChanged(
                     pBitmapItem = (XFillBitmapItem*) pState->Clone();
 
                     if( eXFS == XFILL_BITMAP )
-                        bEnableControls = TRUE;
+                        bEnableControls = sal_True;
                 }
             }
             if( bEnableControls )
@@ -184,7 +184,7 @@ void SvxFillToolBoxControl::StateChanged(
                 //pFillTypeLB->Enable();
                 pFillAttrLB->Enable();
 
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
 
             Update( pState );
@@ -197,7 +197,7 @@ void SvxFillToolBoxControl::StateChanged(
                 pFillTypeLB->SetNoSelection();
                 pFillAttrLB->Disable();
                 pFillAttrLB->SetNoSelection();
-                bUpdate = FALSE;
+                bUpdate = sal_False;
             }
             else
             {
@@ -211,7 +211,7 @@ void SvxFillToolBoxControl::StateChanged(
                     ( nSID == SID_ATTR_FILL_BITMAP   && eXFS == XFILL_BITMAP ) )
                 {
                     pFillAttrLB->SetNoSelection();
-                    //bUpdate = FALSE;
+                    //bUpdate = sal_False;
                 }
             }
         }
@@ -231,7 +231,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
 {
     if ( pStyleItem && pState && bUpdate )
     {
-        bUpdate = FALSE;
+        bUpdate = sal_False;
 
         XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue();
 
@@ -265,7 +265,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         LISTBOX_ENTRY_NOTFOUND ||
                         pFillAttrLB->GetSelectEntryColor() != aColor )
                     {
-                        USHORT nCount = pFillAttrLB->GetEntryCount();
+                        sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
                         String aTmpStr;
                         if( nCount > 0 )
                         {
@@ -281,9 +281,9 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         aTmpStr += aString;
                         aTmpStr += TMP_STR_END;
 
-                        //pFillAttrLB->SetUpdateMode( FALSE );
-                        USHORT nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr );
-                        //pFillAttrLB->SetUpdateMode( TRUE );
+                        //pFillAttrLB->SetUpdateMode( sal_False );
+                        sal_uInt16 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr );
+                        //pFillAttrLB->SetUpdateMode( sal_True );
                         pFillAttrLB->SelectEntryPos( nPos );
                     }
                     // NEU
@@ -303,7 +303,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                     // Pruefen, ob Eintrag nicht in der Liste ist
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
-                        USHORT nCount = pFillAttrLB->GetEntryCount();
+                        sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
                         String aTmpStr;
                         if( nCount > 0 )
                         {
@@ -323,7 +323,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         String aEmptyString = String();
                          XGradientList aGradientList( aEmptyString );
                         aGradientList.Insert( pEntry );
-                        aGradientList.SetDirty( FALSE );
+                        aGradientList.SetDirty( sal_False );
                         Bitmap* pBmp = aGradientList.CreateBitmapForUI( 0 );
 
                         if( pBmp )
@@ -353,7 +353,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                     // Pruefen, ob Eintrag nicht in der Liste ist
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
-                        USHORT nCount = pFillAttrLB->GetEntryCount();
+                        sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
                         String aTmpStr;
                         if( nCount > 0 )
                         {
@@ -373,7 +373,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         String aEmptyString = String();
                         XHatchList aHatchList( aEmptyString );
                         aHatchList.Insert( pEntry );
-                        aHatchList.SetDirty( FALSE );
+                        aHatchList.SetDirty( sal_False );
                         Bitmap* pBmp = aHatchList.CreateBitmapForUI( 0 );
 
                         if( pBmp )
@@ -410,7 +410,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                     // Pruefen, ob Eintrag nicht in der Liste ist
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
-                        USHORT nCount = pFillAttrLB->GetEntryCount();
+                        sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
                         String aTmpStr;
                         if( nCount > 0 )
                         {
@@ -429,7 +429,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         XBitmapEntry* pEntry = new XBitmapEntry( pBitmapItem->GetBitmapValue(), aTmpStr );
                         XBitmapList aBitmapList( String::CreateFromAscii("TmpList") );
                         aBitmapList.Insert( pEntry );
-                        aBitmapList.SetDirty( FALSE );
+                        aBitmapList.SetDirty( sal_False );
                         //Bitmap* pBmp = aBitmapList.GetBitmap( 0 );
                         //( (ListBox*)pFillAttrLB )->InsertEntry( pEntry->GetName(), *pBmp );
                         pFillAttrLB->Fill( &aBitmapList );
@@ -677,7 +677,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
 {
     XFillStyle eXFS = (XFillStyle)pLbFillType->GetSelectEntryPos();
     XFillStyleItem aXFillStyleItem( eXFS );
-    BOOL bAction = pBox && !pLbFillAttr->IsTravelSelect();
+    sal_Bool bAction = pBox && !pLbFillAttr->IsTravelSelect();
 
     SfxObjectShell* pSh = SfxObjectShell::Current();
     if ( bAction )
@@ -689,10 +689,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
         aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ));
         aXFillStyleItem.QueryValue(  a );
         aArgs[0].Value = a;
-        ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( TRUE );
+        ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True );
         ((SvxFillToolBoxControl*)GetData())->Dispatch(
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs );
-        ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( FALSE );
+        ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False );
 
         switch( eXFS )
         {
@@ -723,7 +723,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
             break;
             case XFILL_GRADIENT:
             {
-                USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+                sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
 
                 if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_GRADIENT_LIST ) )
                 {
@@ -747,7 +747,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
 
             case XFILL_HATCH:
             {
-                USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+                sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
 
                 if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_HATCH_LIST ) )
                 {
@@ -770,7 +770,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
 
             case XFILL_BITMAP:
             {
-                USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+                sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
 
                 if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_BITMAP_LIST ) )
                 {
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 23f2241ab235..416dc09ca157 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -121,7 +121,7 @@ FontWorkGalleryDialog::~FontWorkGalleryDialog()
 void FontWorkGalleryDialog::initfavorites(sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites)
 {
     // Ueber die Gallery werden die Favoriten eingelesen
-    ULONG nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId );
+    sal_uIntPtr nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId );
 
     // Gallery thema locken
     GalleryExplorer::BeginLocking(nThemeId);
@@ -197,10 +197,10 @@ void FontWorkGalleryDialog::changeText( SdrTextObj* pObj )
     {
         SdrOutliner& rOutl = mpModel->GetDrawOutliner(pObj);
 
-        USHORT nOutlMode = rOutl.GetMode();
+        sal_uInt16 nOutlMode = rOutl.GetMode();
         Size aPaperSize = rOutl.GetPaperSize();
-        BOOL bUpdateMode = rOutl.GetUpdateMode();
-        rOutl.SetUpdateMode(FALSE);
+        sal_Bool bUpdateMode = rOutl.GetUpdateMode();
+        rOutl.SetUpdateMode(sal_False);
         rOutl.SetParaAttribs( 0, rOutl.GetEmptyItemSet() );
 
         // #95114# Always set the object's StyleSheet at the Outliner to
@@ -232,7 +232,7 @@ void FontWorkGalleryDialog::SetSdrObjectRef( SdrObject** ppSdrObject, SdrModel*
 
 void FontWorkGalleryDialog::insertSelectedFontwork()
 {
-    USHORT nItemId = maCtlFavorites.GetSelectItemId();
+    sal_uInt16 nItemId = maCtlFavorites.GetSelectItemId();
 
     if( nItemId > 0 )
     {
@@ -307,7 +307,7 @@ IMPL_LINK( FontWorkGalleryDialog, DoubleClickFavoriteHdl, void*, EMPTYARG )
 //------------------------------------------------------------------------
 
 SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem );
-FontWorkShapeTypeControl::FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox &rTbx )
+FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
 : SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -338,7 +338,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void FontWorkShapeTypeControl::Select( BOOL )
+void FontWorkShapeTypeControl::Select( sal_Bool )
 {
 
 }
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 45e76f8ae6e9..1f6195d0da87 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -49,12 +49,12 @@ using namespace ::com::sun::star::beans;
 
 SFX_IMPL_TOOLBOX_CONTROL( FormatPaintBrushToolBoxControl, SfxBoolItem );
 
-FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     : SfxToolBoxControl( nSlotId, nId, rTbx )
     , m_bPersistentCopy(false)
     , m_aDoubleClickTimer()
 {
-    ULONG nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime();
+    sal_uIntPtr nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime();
 
     m_aDoubleClickTimer.SetTimeoutHdl( LINK(this, FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) );
     m_aDoubleClickTimer.SetTimeout(nDblClkTime);
@@ -102,12 +102,12 @@ IMPL_LINK(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, void*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-void FormatPaintBrushToolBoxControl::Select( BOOL )
+void FormatPaintBrushToolBoxControl::Select( sal_Bool )
 {
 }
 
 // -----------------------------------------------------------------------
-void FormatPaintBrushToolBoxControl::StateChanged( USHORT nSID, SfxItemState eState,
+void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                 const SfxPoolItem* pState )
 {
     if( ( eState & SFX_ITEM_SET ) == 0 )
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 9f8c023c3b3d..ebad78935d13 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -92,7 +92,7 @@ TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item );
 
 //---------------------------------------------------------
 
-TbxImageItem::TbxImageItem( USHORT _nWhich, UINT16 nImage ) :
+TbxImageItem::TbxImageItem( sal_uInt16 _nWhich, sal_uInt16 nImage ) :
     SfxUInt16Item( _nWhich, nImage )
 {
 }
@@ -255,11 +255,11 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem )
 struct CommandToRID
 {
     const char* pCommand;
-    USHORT      nResId;
-    USHORT      nHCResId;
+    sal_uInt16      nResId;
+    sal_uInt16      nHCResId;
 };
 
-static USHORT ImplGetRID( const OUString& aCommand, bool bHighContrast )
+static sal_uInt16 ImplGetRID( const OUString& aCommand, bool bHighContrast )
 {
     static const CommandToRID aImplCommandToResMap[] =
     {
@@ -273,7 +273,7 @@ static USHORT ImplGetRID( const OUString& aCommand, bool bHighContrast )
         { 0, 0, 0 }
     };
 
-    USHORT nRID = 0;
+    sal_uInt16 nRID = 0;
 
     sal_Int32 i( 0 );
     while ( aImplCommandToResMap[ i ].pCommand )
@@ -307,7 +307,7 @@ protected:
 
 public:
 
-                            ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame );
+                            ImplGrafControl( Window* pParent, sal_uInt16 nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame );
                             ~ImplGrafControl();
 
     void                    Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); }
@@ -316,7 +316,7 @@ public:
 
 // -----------------------------------------------------------------------------
 
-ImplGrafControl::ImplGrafControl( Window* pParent, USHORT, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) :
+ImplGrafControl::ImplGrafControl( Window* pParent, sal_uInt16, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) :
     Control( pParent, WB_TABSTOP ),
     maImage     ( this ),
     maField     ( this, rCmd, rFrame )
@@ -378,7 +378,7 @@ class ImplGrafModeControl : public ListBox
 {
     using Window::Update;
 private:
-    USHORT              mnCurPos;
+    sal_uInt16              mnCurPos;
     Reference< XFrame > mxFrame;
 
     virtual void    Select();
@@ -443,7 +443,7 @@ void ImplGrafModeControl::Select()
 
 long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         mnCurPos = GetSelectEntryPos();
@@ -526,7 +526,7 @@ private:
                                     DECL_LINK( TbxSelectHdl, void* );
 
 public:
-                                    ImplGrafFilterPopup( USHORT nId, SvxGrafFilterToolBoxControl* pParent,
+                                    ImplGrafFilterPopup( sal_uInt16 nId, SvxGrafFilterToolBoxControl* pParent,
                                                          WindowAlign eAlign,
                                                          const ResId& rResIdWin, const ResId& rResIdTbx,
                                                          SfxBindings& rBindings );
@@ -541,7 +541,7 @@ public:
 
 // -----------------------------------------------------------------------------
 
-ImplGrafFilterPopup::ImplGrafFilterPopup( USHORT nId, SvxGrafFilterToolBoxControl* pParent,
+ImplGrafFilterPopup::ImplGrafFilterPopup( sal_uInt16 nId, SvxGrafFilterToolBoxControl* pParent,
                                           WindowAlign eAlign,
                                           const ResId& rResIdWin, const ResId& rResIdTbx ) :
     SfxPopupWindow  ( nId, rResIdWin ),
@@ -599,7 +599,7 @@ void ImplGrafFilterPopup::PopupModeEnd()
 
 IMPL_LINK( ImplGrafFilterPopup, TbxSelectHdl, void*, EMPTYARG )
 {
-    const USHORT nSlotId = maTbxMgr.GetToolBox().GetCurItemId();
+    const sal_uInt16 nSlotId = maTbxMgr.GetToolBox().GetCurItemId();
 
     if( IsInPopupMode() )
         EndPopupMode();
@@ -617,7 +617,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafFilterToolBoxControl, TbxImageItem );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -632,7 +632,7 @@ SvxGrafFilterToolBoxControl::~SvxGrafFilterToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void SvxGrafFilterToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* )
 {
     GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) );
 }
@@ -663,7 +663,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafToolBoxControl, SfxVoidItem );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafToolBoxControl::SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx) :
+SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -678,7 +678,7 @@ SvxGrafToolBoxControl::~SvxGrafToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void SvxGrafToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     ImplGrafControl* pCtrl = (ImplGrafControl*) GetToolBox().GetItemWindow( GetId() );
@@ -715,7 +715,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafRedToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -728,7 +728,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGreenToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -741,7 +741,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafBlueToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -754,7 +754,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafLuminanceToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -767,7 +767,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafContrastToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -780,7 +780,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGammaToolBoxControl, SfxUInt32Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -793,7 +793,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafTransparenceToolBoxControl, SfxUInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -806,7 +806,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafModeToolBoxControl, SfxUInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -819,7 +819,7 @@ SvxGrafModeToolBoxControl::~SvxGrafModeToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void SvxGrafModeToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     ImplGrafModeControl* pCtrl = (ImplGrafModeControl*) GetToolBox().GetItemWindow( GetId() );
@@ -869,9 +869,9 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
 
     const SfxItemSet*   pArgs = rReq.GetArgs();
     const SfxPoolItem*  pItem;
-    USHORT              nSlot = rReq.GetSlot();
+    sal_uInt16              nSlot = rReq.GetSlot();
 
-    if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, FALSE, &pItem ))
+    if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, sal_False, &pItem ))
         pItem = 0;
 
     switch( nSlot )
@@ -1139,13 +1139,13 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
     SfxItemPool&    rPool = rView.GetModel()->GetItemPool();
     SfxItemSet      aAttrSet( rPool );
     SfxWhichIter    aIter( rSet );
-    USHORT          nWhich = aIter.FirstWhich();
+    sal_uInt16          nWhich = aIter.FirstWhich();
 
     rView.GetAttributes( aAttrSet );
 
     while( nWhich )
     {
-        USHORT nSlotId = SfxItemPool::IsWhich( nWhich ) ? rPool.GetSlotId( nWhich ) : nWhich;
+        sal_uInt16 nSlotId = SfxItemPool::IsWhich( nWhich ) ? rPool.GetSlotId( nWhich ) : nWhich;
 
         switch( nSlotId )
         {
@@ -1154,7 +1154,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
                 if( SFX_ITEM_AVAILABLE <= aAttrSet.GetItemState( SDRATTR_GRAFMODE ) )
                 {
                     rSet.Put( SfxUInt16Item( nSlotId,
-                        sal::static_int_cast< UINT16 >( ITEMVALUE( aAttrSet, SDRATTR_GRAFMODE, SdrGrafModeItem ) ) ) );
+                        sal::static_int_cast< sal_uInt16 >( ITEMVALUE( aAttrSet, SDRATTR_GRAFMODE, SdrGrafModeItem ) ) ) );
                 }
             }
             break;
@@ -1224,9 +1224,9 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
                 if( SFX_ITEM_AVAILABLE <= aAttrSet.GetItemState( SDRATTR_GRAFTRANSPARENCE ) )
                 {
                     const SdrMarkList&  rMarkList = rView.GetMarkedObjectList();
-                    BOOL                bEnable = TRUE;
+                    sal_Bool                bEnable = sal_True;
 
-                    for( USHORT i = 0, nCount = (USHORT) rMarkList.GetMarkCount();
+                    for( sal_uInt16 i = 0, nCount = (sal_uInt16) rMarkList.GetMarkCount();
                          ( i < nCount ) && bEnable; i++ )
                     {
                         SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -1235,7 +1235,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
                             ( (SdrGrafObj*) pObj )->HasGDIMetaFile() ||
                             ( (SdrGrafObj*) pObj )->IsAnimated() )
                         {
-                            bEnable = FALSE;
+                            bEnable = sal_False;
                         }
                     }
 
@@ -1251,7 +1251,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
             case( SID_ATTR_GRAF_CROP ):
             {
                 const SdrMarkList&  rMarkList = rView.GetMarkedObjectList();
-                BOOL                bDisable = TRUE;
+                sal_Bool                bDisable = sal_True;
 
                 if( 1 == rMarkList.GetMarkCount() )
                 {
@@ -1264,7 +1264,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
                         if( ( pGrafObj->GetGraphicType() != GRAPHIC_NONE ) &&
                             ( pGrafObj->GetGraphicType() != GRAPHIC_DEFAULT ) )
                         {
-                            bDisable = FALSE;
+                            bDisable = sal_False;
                         }
                     }
                 }
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 26b5a508491e..76fd7d423324 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -74,7 +74,7 @@ SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinB
     meBmpMode   ( GetSettings().GetStyleSettings().GetHighContrastMode() ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL ),
     nCurPos     ( 0 ),
     aLogicalSize(40,140),
-    bRelease    ( TRUE ),
+    bRelease    ( sal_True ),
     mpSh        ( NULL ),
     mxFrame     ( rFrame )
 {
@@ -114,7 +114,7 @@ void SvxLineBox::Select()
     if ( !IsTravelSelect() )
     {
         XLineStyle eXLS;
-        USHORT nPos = GetSelectEntryPos();
+        sal_uInt16 nPos = GetSelectEntryPos();
 //      SfxDispatcher* pDisp = rBindings.GetDispatcher();
         //DBG_ASSERT( pDisp, "invalid Dispatcher" );
 
@@ -177,7 +177,7 @@ void SvxLineBox::Select()
 
 long SvxLineBox::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     switch(nType)
     {
@@ -193,7 +193,7 @@ long SvxLineBox::PreNotify( NotifyEvent& rNEvt )
             const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
             if( pKEvt->GetKeyCode().GetCode() == KEY_TAB)
             {
-                bRelease = FALSE;
+                bRelease = sal_False;
                 Select();
             }
         }
@@ -235,7 +235,7 @@ void SvxLineBox::ReleaseFocus_Impl()
 {
     if(!bRelease)
     {
-        bRelease = TRUE;
+        bRelease = sal_True;
         return;
     }
 
@@ -302,7 +302,7 @@ SvxColorBox::SvxColorBox(
     ColorLB( pParent, nBits ),
     nCurPos     ( 0 ),
     aLogicalSize(45,80),
-    bRelease    ( TRUE ),
+    bRelease    ( sal_True ),
     maCommand   ( rCommand ),
     mxFrame     ( rFrame )
 {
@@ -383,7 +383,7 @@ void SvxColorBox::Select()
 
 long SvxColorBox::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     switch(nType)
     {
@@ -400,7 +400,7 @@ long SvxColorBox::PreNotify( NotifyEvent& rNEvt )
 
             if( pKEvt->GetKeyCode().GetCode() == KEY_TAB)
             {
-                bRelease = FALSE;
+                bRelease = sal_False;
                 Select();
             }
         }
@@ -456,7 +456,7 @@ void SvxColorBox::ReleaseFocus_Impl()
 {
     if(!bRelease)
     {
-        bRelease = TRUE;
+        bRelease = sal_True;
         return;
     }
 
@@ -492,7 +492,7 @@ SvxMetricField::SvxMetricField(
     SetFirst( 0 );
 
     eDlgUnit = SfxModule::GetCurrentFieldUnit();
-    SetFieldUnit( *this, eDlgUnit, FALSE );
+    SetFieldUnit( *this, eDlgUnit, sal_False );
     Show();
 }
 
@@ -580,7 +580,7 @@ void SvxMetricField::RefreshDlgUnit()
     if ( eDlgUnit != eTmpUnit )
     {
         eDlgUnit = eTmpUnit;
-        SetFieldUnit( *this, eDlgUnit, FALSE );
+        SetFieldUnit( *this, eDlgUnit, sal_False );
     }
 }
 
@@ -588,7 +588,7 @@ void SvxMetricField::RefreshDlgUnit()
 
 long SvxMetricField::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         aCurTxt = GetText();
@@ -612,18 +612,18 @@ long SvxMetricField::Notify( NotifyEvent& rNEvt )
             pSh->KeyInput( *pKEvt );
         else
         {
-            FASTBOOL bHandled = FALSE;
+            bool bHandled = sal_False;
 
             switch ( rKey.GetCode() )
             {
                 case KEY_RETURN:
                     Reformat();
-                    bHandled = TRUE;
+                    bHandled = sal_True;
                     break;
 
                 case KEY_ESCAPE:
                     SetText( aCurTxt );
-                    bHandled = TRUE;
+                    bHandled = sal_True;
                     break;
             }
 
@@ -658,8 +658,8 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt )
 SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) :
     FillTypeLB( pParent, nBits | WB_TABSTOP ),
     nCurPos ( 0 ),
-    bSelect ( FALSE ),
-    bRelease(TRUE)
+    bSelect ( sal_False ),
+    bRelease(sal_True)
 {
     SetSizePixel( LogicToPixel( Size(40, 40 ),MAP_APPFONT ));
     Fill();
@@ -677,18 +677,18 @@ SvxFillTypeBox::~SvxFillTypeBox()
 
 long SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         nCurPos = GetSelectEntryPos();
     else if ( EVENT_LOSEFOCUS == nType
         && Application::GetFocusWindow()
-        && !IsWindowOrChild( Application::GetFocusWindow(), TRUE ) )
+        && !IsWindowOrChild( Application::GetFocusWindow(), sal_True ) )
     {
         if ( !bSelect )
             SelectEntryPos( nCurPos );
         else
-            bSelect = FALSE;
+            bSelect = sal_False;
     }
 
     return FillTypeLB::PreNotify( rNEvt );
@@ -710,9 +710,9 @@ long SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
                 ( (Link&)GetSelectHdl() ).Call( this );
             break;
             case KEY_TAB:
-                bRelease = FALSE;
+                bRelease = sal_False;
                 ( (Link&)GetSelectHdl() ).Call( this );
-                bRelease = TRUE;
+                bRelease = sal_True;
                 break;
 
             case KEY_ESCAPE:
@@ -747,7 +747,7 @@ SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) :
     FillAttrLB( pParent, nBits | WB_TABSTOP ),
 
     nCurPos( 0 ),
-    bRelease( TRUE )
+    bRelease( sal_True )
 
 {
     SetPosPixel( Point( 90, 0 ) );
@@ -765,7 +765,7 @@ SvxFillAttrBox::~SvxFillAttrBox()
 
 long SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         nCurPos = GetSelectEntryPos();
@@ -790,9 +790,9 @@ long SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
                 nHandled = 1;
             break;
             case KEY_TAB:
-                bRelease = FALSE;
+                bRelease = sal_False;
                 GetSelectHdl().Call( this );
-                bRelease = TRUE;
+                bRelease = sal_True;
             break;
             case KEY_ESCAPE:
                 SelectEntryPos( nCurPos );
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 04e7e3dc543a..ff03e87a0997 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -70,8 +70,8 @@ private:
     long                nMX;
     long                nMY;
     long                nTextHeight;
-    BOOL                bInitialKeyInput;
-    BOOL                m_bMod1;
+    sal_Bool                bInitialKeyInput;
+    sal_Bool                m_bMod1;
     ToolBox&            rTbx;
     Reference< XFrame > mxFrame;
     rtl::OUString       maCommand;
@@ -79,7 +79,7 @@ private:
     void UpdateSize_Impl( long nNewCol, long nNewLine);
 
 public:
-                            TableWindow( USHORT                     nSlotId,
+                            TableWindow( sal_uInt16                     nSlotId,
                                          const rtl::OUString&       rCmd,
                                          ToolBox&                   rParentTbx,
                                          const Reference< XFrame >& rFrame );
@@ -93,16 +93,16 @@ public:
     virtual void            PopupModeEnd();
     virtual SfxPopupWindow* Clone() const;
 
-    USHORT                  GetColCount() const { return (USHORT)nCol; }
-    USHORT                  GetLineCount() const { return (USHORT)nLine; }
+    sal_uInt16                  GetColCount() const { return (sal_uInt16)nCol; }
+    sal_uInt16                  GetLineCount() const { return (sal_uInt16)nLine; }
 };
 
 // -----------------------------------------------------------------------
 
-TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
     SfxPopupWindow( nSlotId, rFrame, WB_SYSTEMWINDOW ),
-    bInitialKeyInput(TRUE),
-    m_bMod1(FALSE),
+    bInitialKeyInput(sal_True),
+    m_bMod1(sal_False),
     rTbx(rParentTbx),
     mxFrame( rFrame ),
     maCommand( rCmd )
@@ -119,7 +119,7 @@ TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, ToolBox& rP
     Font aFont = GetFont();
     aFont.SetColor( aLineColor );
     aFont.SetFillColor( aFillColor );
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
     SetFont( aFont );
 
     nCol    = 0;
@@ -268,16 +268,16 @@ void TableWindow::UpdateSize_Impl( long nNewCol, long nNewLine)
  ---------------------------------------------------------------------------*/
 void TableWindow::KeyInput( const KeyEvent& rKEvt )
 {
-    BOOL bHandled = FALSE;
-    USHORT nModifier = rKEvt.GetKeyCode().GetModifier();
-    USHORT nKey = rKEvt.GetKeyCode().GetCode();
+    sal_Bool bHandled = sal_False;
+    sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier();
+    sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode();
     if(!nModifier)
     {
         if( KEY_UP == nKey || KEY_DOWN == nKey ||
             KEY_LEFT == nKey || KEY_RIGHT == nKey ||
             KEY_ESCAPE == nKey ||KEY_RETURN == nKey )
         {
-            bHandled = TRUE;
+            bHandled = sal_True;
             long nNewCol = nCol;
             long nNewLine = nLine;
             switch(nKey)
@@ -312,7 +312,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
             //make sure that a table can initially be created
             if(bInitialKeyInput)
             {
-                bInitialKeyInput = FALSE;
+                bInitialKeyInput = sal_False;
                 if(!nNewLine)
                     nNewLine = 1;
                 if(!nNewCol)
@@ -323,7 +323,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
     }
     else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
     {
-        m_bMod1 = TRUE;
+        m_bMod1 = sal_True;
         if(IsMouseCaptured())
             ReleaseMouse();
         EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL );
@@ -430,7 +430,7 @@ void TableWindow::PopupModeEnd()
     if ( !IsPopupModeCanceled() && nCol && nLine )
     {
         Window* pParent = rTbx.GetParent();
-        USHORT nId = GetId();
+        sal_uInt16 nId = GetId();
         pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
 
         Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY );
@@ -473,15 +473,15 @@ private:
     long                nWidth;
     long                nMX;
     long                nTextHeight;
-    BOOL                bInitialKeyInput;
-    BOOL                m_bMod1;
+    sal_Bool                bInitialKeyInput;
+    sal_Bool                m_bMod1;
     ToolBox&            rTbx;
     Reference< XFrame > mxFrame;
     ::rtl::OUString            maCommand;
 
     void UpdateSize_Impl( long nNewCol );
 public:
-                            ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
+                            ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
 
     void                    KeyInput( const KeyEvent& rKEvt );
     virtual void            MouseMove( const MouseEvent& rMEvt );
@@ -491,15 +491,15 @@ public:
     virtual void            PopupModeEnd();
     virtual SfxPopupWindow* Clone() const;
 
-    USHORT                  GetColCount() const { return (USHORT)nCol; }
+    sal_uInt16                  GetColCount() const { return (sal_uInt16)nCol; }
 };
 
 // -----------------------------------------------------------------------
 
-ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
     SfxPopupWindow( nId, rFrame, WB_SYSTEMWINDOW ),
-    bInitialKeyInput(TRUE),
-    m_bMod1(FALSE),
+    bInitialKeyInput(sal_True),
+    m_bMod1(sal_False),
     rTbx(rParentTbx),
     mxFrame(rFrame),
     maCommand( rCmd )
@@ -516,7 +516,7 @@ ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, ToolBox&
     Font aFont( GetFont() );
     aFont.SetColor( aLineColor );
     aFont.SetFillColor( aFillColor );
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
     SetFont( aFont );
 
     nCol        = 0;
@@ -630,16 +630,16 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt )
  ---------------------------------------------------------------------------*/
 void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
 {
-    BOOL bHandled = FALSE;
-    USHORT nModifier = rKEvt.GetKeyCode().GetModifier();
-    USHORT nKey = rKEvt.GetKeyCode().GetCode();
+    sal_Bool bHandled = sal_False;
+    sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier();
+    sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode();
     if(!nModifier)
     {
         if( KEY_LEFT == nKey || KEY_RIGHT == nKey ||
             KEY_RETURN == nKey ||KEY_ESCAPE == nKey ||
             KEY_UP == nKey)
         {
-            bHandled = TRUE;
+            bHandled = sal_True;
             long nNewCol = nCol;
             switch(nKey)
             {
@@ -663,7 +663,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
             //make sure that a table can initially be created
             if(bInitialKeyInput)
             {
-                bInitialKeyInput = FALSE;
+                bInitialKeyInput = sal_False;
                 if(!nNewCol)
                     nNewCol = 1;
             }
@@ -672,7 +672,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
     }
     else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
     {
-        m_bMod1 = TRUE;
+        m_bMod1 = sal_True;
         if(IsMouseCaptured())
             ReleaseMouse();
         EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL );
@@ -753,7 +753,7 @@ void ColumnsWindow::PopupModeEnd()
 {
     if ( !IsPopupModeCanceled() && nCol )
     {
-        USHORT nId = GetId();
+        sal_uInt16 nId = GetId();
         Window* pParent = rTbx.GetParent();
         pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
 
@@ -774,9 +774,9 @@ void ColumnsWindow::PopupModeEnd()
 
 // class SvxTableToolBoxControl ------------------------------------------
 
-SvxTableToolBoxControl::SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
-    bEnabled( TRUE )
+    bEnabled( sal_True )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
     rTbx.Invalidate();
@@ -821,17 +821,17 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading()
 
 // -----------------------------------------------------------------------
 
-void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( pState && pState->ISA(SfxUInt16Item) )
     {
-        INT16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue();
+        sal_Int16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue();
         bEnabled = ( nValue != 0 );
     }
     else
         bEnabled = SFX_ITEM_DISABLED != eState;
 
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
 
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -841,7 +841,7 @@ void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const Sf
 
 // class SvxColumnsToolBoxControl ------------------------------------------
 
-SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -890,7 +890,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading()
 /* -----------------18.11.99 16:38-------------------
 
  --------------------------------------------------*/
-void SvxColumnsToolBoxControl::StateChanged( USHORT nSID,
+void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState )
 {
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 4fe822f94955..9c0a5262ce7a 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -73,49 +73,49 @@ class SvxPopupWindowListBox : public SfxPopupWindow
     FixedInfo       aInfo;
     ListBox *       pListBox;
     ToolBox &       rToolBox;
-    BOOL            bUserSel;
-    USHORT          nTbxId;
+    sal_Bool            bUserSel;
+    sal_uInt16          nTbxId;
     rtl::OUString   maCommandURL;
     // disallow copy-constructor and assignment-operator
 
     SvxPopupWindowListBox(const int& );
     SvxPopupWindowListBox & operator = (const int& );
 
-//  SvxPopupWindowListBox( USHORT nSlotId, ToolBox& rTbx, USHORT nTbxItemId );
+//  SvxPopupWindowListBox( sal_uInt16 nSlotId, ToolBox& rTbx, sal_uInt16 nTbxItemId );
 
 public:
-    SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nTbxId, ToolBox& rTbx );
+    SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nTbxId, ToolBox& rTbx );
     virtual ~SvxPopupWindowListBox();
 
     // SfxPopupWindow
     virtual SfxPopupWindow *    Clone() const;
     virtual void                PopupModeEnd();
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 
     void                        StartSelection();
     inline ListBox &            GetListBox()    { return *pListBox; }
     inline FixedInfo &          GetInfo()       { return aInfo; }
 
-    BOOL                        IsUserSelected() const          { return bUserSel; }
-    void                        SetUserSelected( BOOL bVal )    { bUserSel = bVal; }
+    sal_Bool                        IsUserSelected() const          { return bUserSel; }
+    void                        SetUserSelected( sal_Bool bVal )    { bUserSel = bVal; }
     /*virtual*/Window*                     GetPreferredKeyInputWindow();
 };
 
 /////////////////////////////////////////////////////////////////
 
-SvxPopupWindowListBox::SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nId, ToolBox& rTbx ) :
+SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ),
     aInfo       ( this, SVX_RES( FT_NUM_OPERATIONS ) ),
     rToolBox    ( rTbx ),
-    bUserSel    ( FALSE ),
+    bUserSel    ( sal_False ),
     nTbxId      ( nId ),
     maCommandURL( rCommandURL )
 {
     DBG_ASSERT( nSlotId == GetId(), "id mismatch" );
     pListBox = new ListBox( this, SVX_RES( LB_SVXTBX_UNDO_REDO_CTRL ) );
     FreeResource();
-    pListBox->EnableMultiSelection( TRUE, TRUE );
+    pListBox->EnableMultiSelection( sal_True, sal_True );
     SetBackground( GetSettings().GetStyleSettings().GetDialogColor() );
     AddStatusListener( rCommandURL );
 }
@@ -149,7 +149,7 @@ void SvxPopupWindowListBox::PopupModeEnd()
 
 
 void SvxPopupWindowListBox::StateChanged(
-        USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+        sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     rToolBox.EnableItem( nTbxId, ( SfxToolBoxControl::GetItemState( pState ) != SFX_ITEM_DISABLED) );
     SfxPopupWindow::StateChanged( nSID, eState, pState );
@@ -173,7 +173,7 @@ Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow()
 SFX_IMPL_TOOLBOX_CONTROL( SvxListBoxControl, SfxStringItem );
 
 
-SvxListBoxControl::SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx ),
     pPopupWin   ( 0 )
 {
@@ -201,7 +201,7 @@ SfxPopupWindowType SvxListBoxControl::GetPopupWindowType() const
 
 
 void SvxListBoxControl::StateChanged(
-        USHORT, SfxItemState, const SfxPoolItem* pState )
+        sal_uInt16, SfxItemState, const SfxPoolItem* pState )
 {
     GetToolBox().EnableItem( GetId(),
                             SFX_ITEM_DISABLED != GetItemState(pState) );
@@ -213,7 +213,7 @@ IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG )
     if( pPopupWin && 0 == pPopupWin->GetPopupModeFlags()  &&
         pPopupWin->IsUserSelected() )
     {
-        USHORT nCount = pPopupWin->GetListBox().GetSelectEntryCount();
+        sal_uInt16 nCount = pPopupWin->GetListBox().GetSelectEntryCount();
 
         INetURLObject aObj( m_aCommandURL );
 
@@ -226,13 +226,13 @@ IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG )
 }
 
 
-void SvxListBoxControl::Impl_SetInfo( USHORT nCount )
+void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount )
 {
     DBG_ASSERT( pPopupWin, "NULL pointer, PopupWindow missing" );
 
 //    ListBox &rListBox = pPopupWin->GetListBox();
 
-    USHORT nId;
+    sal_uInt16 nId;
     if (nCount == 1)
         nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTION : RID_SVXSTR_NUM_REDO_ACTION;
     else
@@ -250,14 +250,14 @@ IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG )
 {
     if (pPopupWin)
     {
-        //pPopupWin->SetUserSelected( FALSE );
+        //pPopupWin->SetUserSelected( sal_False );
 
         ListBox &rListBox = pPopupWin->GetListBox();
         if (rListBox.IsTravelSelect())
             Impl_SetInfo( rListBox.GetSelectEntryCount() );
         else
         {
-            pPopupWin->SetUserSelected( TRUE );
+            pPopupWin->SetUserSelected( sal_True );
             pPopupWin->EndPopupMode( 0 );
         }
     }
@@ -268,7 +268,7 @@ IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG )
 
 SFX_IMPL_TOOLBOX_CONTROL( SvxUndoRedoControl, SfxStringItem );
 
-SvxUndoRedoControl::SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxUndoRedoControl::SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     : SvxListBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -281,7 +281,7 @@ SvxUndoRedoControl::~SvxUndoRedoControl()
 }
 
 void SvxUndoRedoControl::StateChanged(
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( nSID == SID_UNDO || nSID == SID_REDO )
     {
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 0b7e6fe7182b..3369f1ae8eb5 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -88,13 +88,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxLineEndToolBoxControl,   SfxBoolItem );
 |*
 \************************************************************************/
 
-SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( USHORT nSlotId,
-                                                        USHORT nId,
+SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId,
+                                                        sal_uInt16 nId,
                                                         ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     pStyleItem      ( NULL ),
     pDashItem       ( NULL ),
-    bUpdate         ( FALSE )
+    bUpdate         ( sal_False )
 {
     addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )));
     addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" )));
@@ -112,7 +112,7 @@ SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl()
 
 void SvxLineStyleToolBoxControl::StateChanged (
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() );
@@ -140,7 +140,7 @@ void SvxLineStyleToolBoxControl::StateChanged (
                 pDashItem = (XLineDashItem*)pState->Clone();
             }
 
-            bUpdate = TRUE;
+            bUpdate = sal_True;
             Update( pState );
         }
         else if ( nSID != SID_DASH_LIST )
@@ -157,7 +157,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState )
 {
     if ( pState && bUpdate )
     {
-        bUpdate = FALSE;
+        bUpdate = sal_False;
 
         SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() );
         DBG_ASSERT( pBox, "Window not found!" );
@@ -232,7 +232,7 @@ Window* SvxLineStyleToolBoxControl::CreateItemWindow( Window *pParent )
 \************************************************************************/
 
 SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl(
-    USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+    sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" )));
@@ -247,7 +247,7 @@ SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl()
 //========================================================================
 
 void SvxLineWidthToolBoxControl::StateChanged(
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     SvxMetricField* pFld = (SvxMetricField*)
                            GetToolBox().GetItemWindow( GetId() );
@@ -299,7 +299,7 @@ Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent )
 \************************************************************************/
 
 SvxLineColorToolBoxControl::SvxLineColorToolBoxControl(
-    USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+    sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
@@ -315,7 +315,7 @@ SvxLineColorToolBoxControl::~SvxLineColorToolBoxControl()
 
 void SvxLineColorToolBoxControl::StateChanged(
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     SvxColorBox* pBox = (SvxColorBox*)GetToolBox().GetItemWindow( GetId() );
@@ -377,7 +377,7 @@ Window* SvxLineColorToolBoxControl::CreateItemWindow( Window *pParent )
 \************************************************************************/
 
 SvxLineEndWindow::SvxLineEndWindow(
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     const Reference< XFrame >& rFrame,
     const String& rWndTitle ) :
     SfxPopupWindow( nSlotId,
@@ -388,7 +388,7 @@ SvxLineEndWindow::SvxLineEndWindow(
     nCols           ( 2 ),
     nLines          ( 12 ),
     nLineEndWidth   ( 400 ),
-    bPopupMode      ( TRUE ),
+    bPopupMode      ( sal_True ),
     mbInResize      ( false ),
     mxFrame         ( rFrame )
 {
@@ -397,7 +397,7 @@ SvxLineEndWindow::SvxLineEndWindow(
 }
 
 SvxLineEndWindow::SvxLineEndWindow(
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     const Reference< XFrame >& rFrame,
     Window* pParentWindow,
     const String& rWndTitle ) :
@@ -410,7 +410,7 @@ SvxLineEndWindow::SvxLineEndWindow(
     nCols           ( 2 ),
     nLines          ( 12 ),
     nLineEndWidth   ( 400 ),
-    bPopupMode      ( TRUE ),
+    bPopupMode      ( sal_True ),
     mbInResize      ( false ),
     mxFrame         ( rFrame )
 {
@@ -467,7 +467,7 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG )
 {
     XLineEndItem*           pLineEndItem = NULL;
     XLineStartItem*         pLineStartItem = NULL;
-    USHORT                  nId = aLineEndSet.GetSelectItemId();
+    sal_uInt16                  nId = aLineEndSet.GetSelectItemId();
 
     if( nId == 1 )
     {
@@ -543,7 +543,7 @@ void SvxLineEndWindow::FillValueSet()
         DBG_ASSERT( pBmp, "UI-Bitmap wurde nicht erzeugt" );
 
         aBmpSize = pBmp->GetSizePixel();
-        aVD.SetOutputSizePixel( aBmpSize, FALSE );
+        aVD.SetOutputSizePixel( aBmpSize, sal_False );
         aBmpSize.Width() = aBmpSize.Width() / 2;
         Point aPt0( 0, 0 );
         Point aPt1( aBmpSize.Width(), 0 );
@@ -562,10 +562,10 @@ void SvxLineEndWindow::FillValueSet()
             DBG_ASSERT( pBmp, "UI-Bitmap wurde nicht erzeugt" );
 
             aVD.DrawBitmap( aPt0, *pBmp );
-            aLineEndSet.InsertItem( (USHORT)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() );
-            aLineEndSet.InsertItem( (USHORT)((i+2L)*2L),    aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() );
+            aLineEndSet.InsertItem( (sal_uInt16)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() );
+            aLineEndSet.InsertItem( (sal_uInt16)((i+2L)*2L),    aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() );
         }
-        nLines = Min( (USHORT)(nCount + 1), (USHORT) MAX_LINES );
+        nLines = Min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES );
         aLineEndSet.SetLineCount( nLines );
 
         SetSize();
@@ -609,21 +609,21 @@ void __EXPORT SvxLineEndWindow::Resizing( Size& rNewSize )
     Size aItemSize = aLineEndSet.CalcItemSizePixel( aBitmapSize );  // -> Member
     //Size aOldSize = GetOutputSizePixel(); // fuer Breite
 
-    USHORT nItemCount = aLineEndSet.GetItemCount(); // -> Member
+    sal_uInt16 nItemCount = aLineEndSet.GetItemCount(); // -> Member
 
     // Spalten ermitteln
     long nItemW = aItemSize.Width();
     long nW = rNewSize.Width();
-    nCols = (USHORT) Max( ( (ULONG)(( nW + nItemW ) / ( nItemW * 2 ) )),
-                                            (ULONG) 1L );
+    nCols = (sal_uInt16) Max( ( (sal_uIntPtr)(( nW + nItemW ) / ( nItemW * 2 ) )),
+                                            (sal_uIntPtr) 1L );
     nCols *= 2;
 
     // Reihen ermitteln
     long nItemH = aItemSize.Height();
     long nH = rNewSize.Height();
-    nLines = (USHORT) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L );
+    nLines = (sal_uInt16) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L );
 
-    USHORT nMaxCols  = nItemCount / nLines;
+    sal_uInt16 nMaxCols  = nItemCount / nLines;
     if( nItemCount % nLines )
         nMaxCols++;
     if( nCols > nMaxCols )
@@ -633,9 +633,9 @@ void __EXPORT SvxLineEndWindow::Resizing( Size& rNewSize )
     // Keine ungerade Anzahl von Spalten
     if( nCols % 2 )
         nCols--;
-    nCols = Max( nCols, (USHORT) 2 );
+    nCols = Max( nCols, (sal_uInt16) 2 );
 
-    USHORT nMaxLines  = nItemCount / nCols;
+    sal_uInt16 nMaxLines  = nItemCount / nCols;
     if( nItemCount % nCols )
         nMaxLines++;
     if( nLines > nMaxLines )
@@ -654,7 +654,7 @@ void SvxLineEndWindow::StartSelection()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxLineEndWindow::Close()
+sal_Bool SvxLineEndWindow::Close()
 {
     return SfxPopupWindow::Close();
 }
@@ -662,7 +662,7 @@ BOOL SvxLineEndWindow::Close()
 // -----------------------------------------------------------------------
 
 void SvxLineEndWindow::StateChanged(
-    USHORT nSID, SfxItemState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState )
 {
     if ( nSID == SID_LINEEND_LIST )
     {
@@ -688,7 +688,7 @@ void SvxLineEndWindow::PopupModeEnd()
 {
     if ( IsVisible() )
     {
-        bPopupMode = FALSE;
+        bPopupMode = sal_False;
         SetSize();
     }
     SfxPopupWindow::PopupModeEnd();
@@ -701,8 +701,8 @@ void SvxLineEndWindow::SetSize()
     //if( !bPopupMode )
     if( !IsInPopupMode() )
     {
-        USHORT nItemCount = aLineEndSet.GetItemCount(); // -> Member
-        USHORT nMaxLines  = nItemCount / nCols; // -> Member ?
+        sal_uInt16 nItemCount = aLineEndSet.GetItemCount(); // -> Member
+        sal_uInt16 nMaxLines  = nItemCount / nCols; // -> Member ?
         if( nItemCount % nCols )
             nMaxLines++;
 
@@ -740,7 +740,7 @@ void SvxLineEndWindow::GetFocus (void)
 |*
 \************************************************************************/
 
-SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) :
+SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -766,7 +766,7 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow()
 {
     SvxLineEndWindow* pLineEndWin =
         new SvxLineEndWindow( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( RID_SVXSTR_LINEEND ) );
-    pLineEndWin->StartPopupMode( &GetToolBox(), TRUE );
+    pLineEndWin->StartPopupMode( &GetToolBox(), sal_True );
     pLineEndWin->StartSelection();
     SetPopupWindow( pLineEndWin );
     return pLineEndWin;
@@ -774,9 +774,9 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void SvxLineEndToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* )
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
 
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index e2a7a535a77f..526f32434c2e 100644
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -41,7 +41,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxSubToolBoxControl, SfxUInt16Item );
 
 **********************************************************************/
 
-SvxSubToolBoxControl::SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxSubToolBoxControl::SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
 : SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bd0a39200dd1..5a4362592738 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -103,11 +103,11 @@
 #define DELETEZ(p) (delete (p), (p)=NULL)
 #endif
 // don't make more than 15 entries visible at once
-#define MAX_STYLES_ENTRIES          static_cast< USHORT >( 15 )
+#define MAX_STYLES_ENTRIES          static_cast< sal_uInt16 >( 15 )
 
 void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet );
 void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize );
-BOOL lcl_FontChangedHint( const SfxHint &rHint );
+sal_Bool lcl_FontChangedHint( const SfxHint &rHint );
 
 // namespaces
 using ::rtl::OUString;
@@ -138,12 +138,12 @@ class SvxStyleBox_Impl : public ComboBox
 {
     using Window::IsVisible;
 public:
-    SvxStyleBox_Impl( Window* pParent, USHORT nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider,
-                        const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, BOOL bInSpecialMode );
+    SvxStyleBox_Impl( Window* pParent, sal_uInt16 nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider,
+                        const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, sal_Bool bInSpecialMode );
     ~SvxStyleBox_Impl();
 
     void            SetFamily( SfxStyleFamily eNewFamily );
-    inline BOOL     IsVisible() { return bVisible; }
+    inline sal_Bool     IsVisible() { return bVisible; }
 
     virtual long    PreNotify( NotifyEvent& rNEvt );
     virtual long    Notify( NotifyEvent& rNEvt );
@@ -160,20 +160,20 @@ protected:
     virtual void    Select();
 
 private:
-    USHORT                          nSlotId;
+    sal_uInt16                          nSlotId;
     SfxStyleFamily                  eStyleFamily;
-    USHORT                          nCurSel;
-    BOOL                            bRelease;
+    sal_uInt16                          nCurSel;
+    sal_Bool                            bRelease;
     Size                            aLogicalSize;
     Link                            aVisibilityListener;
-    BOOL                            bVisible;
+    sal_Bool                            bVisible;
     Reference< XDispatchProvider >  m_xDispatchProvider;
     Reference< XFrame >             m_xFrame;
     OUString                        m_aCommand;
     String                          aClearFormatKey;
     String                          aMoreKey;
     String                          sDefaultStyle;
-    BOOL                            bInSpecialMode;
+    sal_Bool                            bInSpecialMode;
 
     void            ReleaseFocus();
 };
@@ -191,8 +191,8 @@ private:
     Font                           aCurFont;
     Size                           aLogicalSize;
     String                         aCurText;
-    USHORT                         nFtCount;
-    BOOL                           bRelease;
+    sal_uInt16                         nFtCount;
+    sal_Bool                           bRelease;
     Reference< XDispatchProvider > m_xDispatchProvider;
     Reference< XFrame >            m_xFrame;
 
@@ -210,7 +210,7 @@ public:
 
     void            FillList();
     void            Update( const SvxFontItem* pFontItem );
-    USHORT          GetListCount() { return nFtCount; }
+    sal_uInt16          GetListCount() { return nFtCount; }
     void            Clear() { FontNameBox::Clear(); nFtCount = 0; }
     void            Fill( const FontList* pList )
                         { FontNameBox::Fill( pList );
@@ -230,12 +230,12 @@ public:
 
 class SvxFrmValueSet_Impl : public ValueSet
 {
-    USHORT          nModifier;
+    sal_uInt16          nModifier;
     virtual void    MouseButtonUp( const MouseEvent& rMEvt );
 public:
     SvxFrmValueSet_Impl(Window* pParent,  WinBits nWinStyle)
         : ValueSet(pParent, nWinStyle), nModifier(0) {}
-    USHORT          GetModifier() const {return nModifier;}
+    sal_uInt16          GetModifier() const {return nModifier;}
 
 };
 
@@ -260,24 +260,24 @@ private:
 
 protected:
     virtual void    Resize();
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
     virtual Window* GetPreferredKeyInputWindow();
     virtual void    GetFocus();
 
 public:
-    SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
+    SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
     ~SvxFrameWindow_Impl();
     void            StartSelection();
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual SfxPopupWindow* Clone() const;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
-    inline BOOL     IsHighContrast( void ) const;
+    inline sal_Bool     IsHighContrast( void ) const;
 };
 
-inline BOOL SvxFrameWindow_Impl::IsHighContrast( void ) const
+inline sal_Bool SvxFrameWindow_Impl::IsHighContrast( void ) const
 {
     return GetSettings().GetStyleSettings().GetHighContrastMode();
 }
@@ -292,20 +292,20 @@ private:
     bool                m_bIsWriter;
 
 #if _SOLAR__PRIVATE
-    void            MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
+    void            MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
                                     const ::Color& rLine, const ::Color& rBack );
     DECL_LINK( SelectHdl, void * );
 #endif
 
 protected:
     virtual void    Resize();
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
     virtual Window* GetPreferredKeyInputWindow();
     virtual void    GetFocus();
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
     void            CreateBitmaps( void );
 public:
-    SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
+    SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
 
     void                    StartSelection();
     virtual SfxPopupWindow* Clone() const;
@@ -322,12 +322,12 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
 {
     public:
         SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider,
-                                     USHORT nSlotId,
+                                     sal_uInt16 nSlotId,
                                      const rtl::OUString& rCommand,
                                      SvxStyleToolBoxControl& rTbxCtl );
 
     protected:
-        virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+        virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
     private:
         SvxStyleToolBoxControl& rControl;
@@ -339,21 +339,21 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
 
 SvxStyleBox_Impl::SvxStyleBox_Impl(
     Window*                                 pParent,
-    USHORT                                  nSlot,
+    sal_uInt16                                  nSlot,
     const rtl::OUString&                    rCommand,
     SfxStyleFamily                          eFamily,
     const Reference< XDispatchProvider >&   rDispatchProvider,
     const Reference< XFrame >&              _xFrame,
     const String&                           rClearFormatKey,
     const String&                           rMoreKey,
-    BOOL                                    bInSpec) :
+    sal_Bool                                    bInSpec) :
 
     ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ),
 
     nSlotId     ( nSlot ),
     eStyleFamily( eFamily ),
-    bRelease    ( TRUE ),
-    bVisible(FALSE),
+    bRelease    ( sal_True ),
+    bVisible(sal_False),
     m_xDispatchProvider( rDispatchProvider ),
     m_xFrame(_xFrame),
     m_aCommand  ( rCommand ),
@@ -362,7 +362,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(
     bInSpecialMode  ( bInSpec )
 {
     aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT );
-    EnableAutocomplete( TRUE );
+    EnableAutocomplete( sal_True );
 }
 
 SvxStyleBox_Impl::~SvxStyleBox_Impl()
@@ -375,7 +375,7 @@ void SvxStyleBox_Impl::ReleaseFocus()
 {
     if ( !bRelease )
     {
-        bRelease = TRUE;
+        bRelease = sal_True;
         return;
     }
     if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() )
@@ -463,7 +463,7 @@ void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily )
 
 long SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         nCurSel = GetSelectEntryPos();
@@ -484,7 +484,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
         switch ( nCode )
         {
@@ -492,7 +492,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
             case KEY_TAB:
             {
                 if ( KEY_TAB == nCode )
-                    bRelease = FALSE;
+                    bRelease = sal_False;
                 else
                     nHandled = 1;
                 Select();
@@ -536,7 +536,7 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType nStateChange )
     }
     else if ( nStateChange == STATE_CHANGE_INITSHOW )
     {
-        bVisible = TRUE;
+        bVisible = sal_True;
         if ( aVisibilityListener.IsSet() )
             aVisibilityListener.Call( this );
     }
@@ -554,9 +554,9 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl )
 
 // -----------------------------------------------------------------------
 
-BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
+sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     const SfxObjectShell* pDocSh = SfxObjectShell::Current();
     SvxFontListItem* pFontListItem = NULL;
 
@@ -568,7 +568,7 @@ BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox
         ::std::auto_ptr<FontList> aFontList(new FontList( pBox ));
         *ppFontList = aFontList.get();
         pBox->SetOwnFontList(aFontList);
-        bChanged = TRUE;
+        bChanged = sal_True;
     }
 
     if ( pFontListItem )
@@ -581,7 +581,7 @@ BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox
         {
             // => "ubernehmen
             *ppFontList = pNewFontList;
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
         else
         {
@@ -634,7 +634,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDis
     pFontList          ( NULL ),
     aLogicalSize       ( 75,160 ),
     nFtCount           ( 0 ),
-    bRelease           ( TRUE ),
+    bRelease           ( sal_True ),
     m_xDispatchProvider( rDispatchProvider ),
     m_xFrame (_xFrame)
 {
@@ -674,7 +674,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
 
 long SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
     {
@@ -692,7 +692,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
         switch ( nCode )
         {
@@ -700,7 +700,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
             case KEY_TAB:
             {
                 if ( KEY_TAB == nCode )
-                    bRelease = FALSE;
+                    bRelease = sal_False;
                 else
                     nHandled = 1;
                 Select();
@@ -743,7 +743,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
 {
     if ( !bRelease )
     {
-        bRelease = TRUE;
+        bRelease = sal_True;
         return;
     }
     if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() )
@@ -755,8 +755,8 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
 void SvxFontNameBox_Impl::EnableControls_Impl()
 {
     SvtFontOptions aFontOpt;
-    BOOL bEnable = aFontOpt.IsFontHistoryEnabled();
-    USHORT nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0;
+    sal_Bool bEnable = aFontOpt.IsFontHistoryEnabled();
+    sal_uInt16 nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0;
     if ( GetMaxMRUCount() != nEntries )
     {
         // refill in the next GetFocus-Handler
@@ -824,7 +824,7 @@ void SvxFontNameBox_Impl::Select()
 #define PALETTE_SIZE (PALETTE_X * PALETTE_Y)
 
 SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
-                                          USHORT                     nSlotId,
+                                          sal_uInt16                     nSlotId,
                                           const Reference< XFrame >& rFrame,
                                           const String&              rWndTitle,
                                           Window*                    pParentWindow ) :
@@ -839,7 +839,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     const SfxPoolItem* pItem = NULL;
     XColorTable* pColorTable = NULL;
-    BOOL bKillTable = FALSE;
+    sal_Bool bKillTable = sal_False;
     const Size aSize12( 13, 13 );
 
     if ( pDocSh )
@@ -849,7 +849,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
     if ( !pColorTable )
     {
         pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
-        bKillTable = TRUE;
+        bKillTable = sal_True;
     }
 
     if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId )
@@ -934,7 +934,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const
 
 IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG )
 {
-    USHORT nItemId = aColorSet.GetSelectItemId();
+    sal_uInt16 nItemId = aColorSet.GetSelectItemId();
     SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId );
 
     /*  #i33380# DR 2004-09-03 Moved the following line above the Dispatch() calls.
@@ -999,14 +999,14 @@ void SvxColorWindow_Impl::StartSelection()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxColorWindow_Impl::Close()
+sal_Bool SvxColorWindow_Impl::Close()
 {
     return SfxPopupWindow::Close();
 }
 
 // -----------------------------------------------------------------------
 
-void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if (( SFX_ITEM_DISABLED != eState ) && pState )
     {
@@ -1053,7 +1053,7 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const
 // class SvxFrameWindow_Impl --------------------------------------------------
 //========================================================================
 
-SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
+SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
 
     SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
     aFrameSet   ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
@@ -1075,7 +1075,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
      *                                             abgeschaltet werden
      */
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
 
     for ( i=1; i<9; i++ )
         aFrameSet.InsertItem( i, aImgList.GetImage(i) );
@@ -1126,9 +1126,9 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
     {
         aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) );
 
-        USHORT  nNumOfItems = aFrameSet.GetItemCount();
+        sal_uInt16  nNumOfItems = aFrameSet.GetItemCount();
 
-        for( USHORT i = 1 ; i <= nNumOfItems ; ++i )
+        for( sal_uInt16 i = 1 ; i <= nNumOfItems ; ++i )
             aFrameSet.SetItemImage( i, aImgList.GetImage( i ) );
     }
 }
@@ -1157,9 +1157,9 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
                         *pRight = 0,
                         *pTop = 0,
                         *pBottom = 0;
-    USHORT              nSel = aFrameSet.GetSelectItemId();
-    USHORT              nModifier = aFrameSet.GetModifier();
-    BYTE                nValidFlags = 0;
+    sal_uInt16              nSel = aFrameSet.GetSelectItemId();
+    sal_uInt16              nModifier = aFrameSet.GetModifier();
+    sal_uInt8               nValidFlags = 0;
 
     theDefLine.SetOutWidth( DEF_LINE_WIDTH_0 );
     switch ( nSel )
@@ -1233,8 +1233,8 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
     aBorderInner.SetValid( VALID_RIGHT,     0 != (nValidFlags&FRM_VALID_RIGHT ));
     aBorderInner.SetValid( VALID_HORI,      0 != (nValidFlags&FRM_VALID_HINNER ));
     aBorderInner.SetValid( VALID_VERT,      0 != (nValidFlags&FRM_VALID_VINNER));
-    aBorderInner.SetValid( VALID_DISTANCE, TRUE );
-    aBorderInner.SetValid( VALID_DISABLE, FALSE );
+    aBorderInner.SetValid( VALID_DISTANCE, sal_True );
+    aBorderInner.SetValid( VALID_DISABLE, sal_False );
 
     if ( IsInPopupMode() )
         EndPopupMode();
@@ -1270,7 +1270,7 @@ void SvxFrameWindow_Impl::Resize()
 
 void SvxFrameWindow_Impl::StateChanged(
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     if ( pState && nSID == SID_BORDER_REDUCED_MODE)
@@ -1279,24 +1279,24 @@ void SvxFrameWindow_Impl::StateChanged(
 
         if ( pItem )
         {
-            bParagraphMode = (BOOL)pItem->GetValue();
+            bParagraphMode = (sal_Bool)pItem->GetValue();
             //initial calls mustn't insert or remove elements
             if(aFrameSet.GetItemCount())
             {
-                BOOL bTableMode = ( aFrameSet.GetItemCount() == 12 );
-                BOOL bResize    = FALSE;
+                sal_Bool bTableMode = ( aFrameSet.GetItemCount() == 12 );
+                sal_Bool bResize    = sal_False;
 
                 if ( bTableMode && bParagraphMode )
                 {
-                    for ( USHORT i = 9; i < 13; i++ )
+                    for ( sal_uInt16 i = 9; i < 13; i++ )
                         aFrameSet.RemoveItem(i);
-                    bResize = TRUE;
+                    bResize = sal_True;
                 }
                 else if ( !bTableMode && !bParagraphMode )
                 {
-                    for ( USHORT i = 9; i < 13; i++ )
+                    for ( sal_uInt16 i = 9; i < 13; i++ )
                         aFrameSet.InsertItem( i, aImgList.GetImage(i) );
-                    bResize = TRUE;
+                    bResize = sal_True;
                 }
 
                 if ( bResize )
@@ -1318,7 +1318,7 @@ void SvxFrameWindow_Impl::StartSelection()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxFrameWindow_Impl::Close()
+sal_Bool SvxFrameWindow_Impl::Close()
 {
     return SfxPopupWindow::Close();
 }
@@ -1327,7 +1327,7 @@ BOOL SvxFrameWindow_Impl::Close()
 // class SvxLineWindow_Impl --------------------------------------------------
 //========================================================================
 
-SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
+SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
 
     SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
 
@@ -1362,7 +1362,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const
 
 // -----------------------------------------------------------------------
 
-void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
+void SvxLineWindow_Impl::MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
                                             const ::Color& rLineCol, const ::Color& rBackCol )
 {
     VirtualDevice   aVirDev( *this );
@@ -1388,14 +1388,14 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 5;
             aRect.Bottom()  = 6;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) DEF_LINE_WIDTH_1/20;
+            nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_1/20;
             break;
 
         case 3: // DEF_LINE_WIDTH_2
             aRect.Top()     = 5;
             aRect.Bottom()  = 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) DEF_LINE_WIDTH_2/20;
+            nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_2/20;
             break;
 
         case 4: // DEF_LINE_WIDTH_3
@@ -1403,14 +1403,14 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Bottom()  = 7;
             aVirDev.DrawRect( aRect );
             aVirDev.DrawRect( Rectangle( Point(2,4), Point(37,7) ) );
-            nLineWidth = (USHORT) DEF_LINE_WIDTH_3/20;
+            nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_3/20;
             break;
 
         case 5: // DEF_LINE_WIDTH_4
             aRect.Top()     = 4;
             aRect.Bottom()  = 8;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) DEF_LINE_WIDTH_4/20;
+            nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_4/20;
             break;
 
         case 6: // DEF_DOUBLE_LINE0
@@ -1420,7 +1420,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 7;
             aRect.Bottom()  = 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20;
             break;
 
         case 7: // DEF_DOUBLE_LINE7
@@ -1430,7 +1430,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 7;
             aRect.Bottom()  = 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20;
             break;
 
         case 8: // DEF_DOUBLE_LINE1
@@ -1440,7 +1440,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 7;
             aRect.Bottom()  = 8;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20;
             break;
 
         case 9: // DEF_DOUBLE_LINE2
@@ -1450,7 +1450,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 8;
             aRect.Bottom()  = 10;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20;
             break;
 
         case 10: // DEF_DOUBLE_LINE8
@@ -1460,7 +1460,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 7;
             aRect.Bottom()  = 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20;
             break;
 
         case 11: // DEF_DOUBLE_LINE9
@@ -1470,7 +1470,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 8;
             aRect.Bottom()  = 8;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20;
             break;
 
         case 12: // DEF_DOUBLE_LINE10
@@ -1480,7 +1480,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 8;
             aRect.Bottom()  = 8;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20;
             break;
 
         case 13: // DEF_DOUBLE_LINE3
@@ -1490,7 +1490,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 7;
             aRect.Bottom()  = 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20;
             break;
 
         case 14: // DEF_DOUBLE_LINE4
@@ -1500,7 +1500,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 6;
             aRect.Bottom()  = 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20;
             break;
 
         case 15: // DEF_DOUBLE_LINE5
@@ -1510,7 +1510,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 8;
             aRect.Bottom()  = 9;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20;
             break;
 
         case 16: // DEF_DOUBLE_LINE6
@@ -1520,7 +1520,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top()     = 7;
             aRect.Bottom()  = 9;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20;
             break;
 
         default:
@@ -1539,10 +1539,10 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
 IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
 {
     SvxLineItem     aLineItem( SID_FRAME_LINESTYLE );
-    USHORT          n1 = 0,
+    sal_uInt16          n1 = 0,
                     n2 = 0,
                     n3 = 0;
-    BOOL            bSetLine = TRUE;
+    sal_Bool            bSetLine = sal_True;
 
     switch ( aLineSet.GetSelectItemId() )
     {
@@ -1587,7 +1587,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
                  n3 = DEF_DOUBLE_LINE6_DIST;     break;
         case  0:
         default:
-            bSetLine = FALSE;
+            bSetLine = sal_False;
             break;
     }
     if ( bSetLine )
@@ -1634,7 +1634,7 @@ void SvxLineWindow_Impl::StartSelection()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxLineWindow_Impl::Close()
+sal_Bool SvxLineWindow_Impl::Close()
 {
     return SfxPopupWindow::Close();
 }
@@ -1676,7 +1676,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
     ::Color                 aBackCol( rStyleSettings.GetWindowColor() );
     aLineSet.Clear();
 
-    for( USHORT i = 1 ; i < 17 ; ++i )
+    for( sal_uInt16 i = 1 ; i < 17 ; ++i )
     {
         MakeLineBitmap( i, aBmp, aBmpSize, aStr, aLineCol, aBackCol );
         aLineSet.InsertItem( i, aBmp, aStr );
@@ -1694,7 +1694,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
 
 SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
     const Reference< XDispatchProvider >& rDispatchProvider,
-    USHORT                                nSlotId,      // Family-ID
+    sal_uInt16                                nSlotId,      // Family-ID
     const rtl::OUString&                  rCommand,     // .uno: command bound to this item
     SvxStyleToolBoxControl&               rTbxCtl )     // Controller-Instanz, dem dieses Item zugeordnet ist.
     :   SfxStatusListener( rDispatchProvider, nSlotId, rCommand ),
@@ -1705,7 +1705,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
 // -----------------------------------------------------------------------
 
 void SfxStyleControllerItem_Impl::StateChanged(
-    USHORT, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
     switch ( GetId() )
     {
@@ -1715,7 +1715,7 @@ void SfxStyleControllerItem_Impl::StateChanged(
         case SID_STYLE_FAMILY4:
         case SID_STYLE_FAMILY5:
         {
-            const USHORT nIdx = GetId() - SID_STYLE_FAMILY_START;
+            const sal_uInt16 nIdx = GetId() - SID_STYLE_FAMILY_START;
 
             if ( SFX_ITEM_AVAILABLE == eState )
             {
@@ -1742,16 +1742,16 @@ struct SvxStyleToolBoxControl::Impl
     String                              aClearForm;
     String                              aMore;
     ::std::vector< ::rtl::OUString >    aDefaultStyles;
-    BOOL                        bListening;
-    BOOL                        bSpecModeWriter;
-    BOOL                        bSpecModeCalc;
+    sal_Bool                        bListening;
+    sal_Bool                        bSpecModeWriter;
+    sal_Bool                        bSpecModeCalc;
 
     inline Impl( void )
         :aClearForm         ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) )
         ,aMore              ( SVX_RESSTR( RID_SVXSTR_MORE ) )
-        ,bListening         ( FALSE )
-        ,bSpecModeWriter    ( FALSE )
-        ,bSpecModeCalc      ( FALSE )
+        ,bListening         ( sal_False )
+        ,bSpecModeWriter    ( sal_False )
+        ,bSpecModeCalc      ( sal_False )
     {
 
 
@@ -1848,14 +1848,14 @@ static const char* StyleSlotToStyleCommand[MAX_FAMILIES] =
 };
 
 SvxStyleToolBoxControl::SvxStyleToolBoxControl(
-    USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+    sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :   SfxToolBoxControl   ( nSlotId, nId, rTbx ),
         pStyleSheetPool     ( NULL ),
         nActFamily          ( 0xffff ),
-        bListening          ( FALSE ),
+        bListening          ( sal_False ),
         pImpl               ( new Impl )
 {
-    for ( USHORT i=0; i<MAX_FAMILIES; i++ )
+    for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
     {
         pBoundItems[i] = 0;
         m_xBoundItems[i] = Reference< XComponent >();
@@ -1880,7 +1880,7 @@ throw ( Exception, RuntimeException)
     {
         pImpl->InitializeStyles(m_xFrame->getController()->getModel());
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame->getController(), UNO_QUERY );
-        for ( USHORT i=0; i<MAX_FAMILIES; i++ )
+        for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
         {
             pBoundItems[i]   = new SfxStyleControllerItem_Impl( xDispatchProvider,
                                                                 SID_STYLE_FAMILY_START + i,
@@ -1898,7 +1898,7 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     SfxToolBoxControl::dispose();
 
-    for( USHORT i=0; i<MAX_FAMILIES; i++ )
+    for( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
     {
         if ( m_xBoundItems[i].is() )
         {
@@ -1964,10 +1964,10 @@ void SvxStyleToolBoxControl::FillStyleBox()
     if ( pStyleSheetPool && pBox && nActFamily!=0xffff )
     {
         const SfxStyleFamily    eFamily     = GetActFamily();
-        USHORT                  nCount      = pStyleSheetPool->Count();
-        USHORT                  i           = 0;
+        sal_uInt16                  nCount      = pStyleSheetPool->Count();
+        sal_uInt16                  i           = 0;
         SfxStyleSheetBase*      pStyle      = NULL;
-        BOOL                    bDoFill     = FALSE;
+        sal_Bool                    bDoFill     = sal_False;
 
         pStyleSheetPool->SetSearchMask( eFamily, SFXSTYLEBIT_USED );
 
@@ -1980,7 +1980,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
         //!!! so the list doesn't show the count
         if ( nCount != pBox->GetEntryCount() )
         {
-            bDoFill = TRUE;
+            bDoFill = sal_True;
         }
         else
         {
@@ -1994,11 +1994,11 @@ void SvxStyleToolBoxControl::FillStyleBox()
 
         if ( bDoFill )
         {
-            pBox->SetUpdateMode( FALSE );
+            pBox->SetUpdateMode( sal_False );
             pBox->Clear();
 
             {
-                USHORT  _i;
+                sal_uInt16  _i;
                 sal_uInt32  nCnt = pImpl->aDefaultStyles.size();
                 bool    bInsert;
 
@@ -2038,9 +2038,9 @@ void SvxStyleToolBoxControl::FillStyleBox()
             if( pImpl->bSpecModeWriter || pImpl->bSpecModeCalc )
             {
                 // insert default styles
-                USHORT  _i;
+                sal_uInt16  _i;
                 sal_uInt32  nCnt = pImpl->aDefaultStyles.size();
-                USHORT nPos = 1;
+                sal_uInt16 nPos = 1;
                 for( _i = 0 ; _i < nCnt ; ++_i )
                 {
                     pBox->InsertEntry( pImpl->aDefaultStyles[_i], nPos );
@@ -2062,10 +2062,10 @@ void SvxStyleToolBoxControl::FillStyleBox()
                 pBox->SetStyle( nWinBits );
             }
 
-            pBox->SetUpdateMode( TRUE );
+            pBox->SetUpdateMode( sal_True );
             pBox->SetFamily( eFamily );
 
-            USHORT nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES );
+            sal_uInt16 nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES );
             pBox->SetDropDownLineCount( nLines );
         }
     }
@@ -2105,7 +2105,7 @@ void SvxStyleToolBoxControl::Update()
     if ( pDocShell )
         pPool = pDocShell->GetStyleSheetPool();
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i=0; i<MAX_FAMILIES; i++ )
         if( pFamilyState[i] )
             break;
@@ -2149,7 +2149,7 @@ void SvxStyleToolBoxControl::Update()
 
 // -----------------------------------------------------------------------
 
-void SvxStyleToolBoxControl::SetFamilyState( USHORT nIdx,
+void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx,
                                              const SfxTemplateItem* pItem )
 {
     DELETEZ( pFamilyState[nIdx] );
@@ -2165,7 +2165,7 @@ void SvxStyleToolBoxControl::SetFamilyState( USHORT nIdx,
 IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG )
 {
 
-    USHORT i;
+    sal_uInt16 i;
 
     // Call ReBind() && UnBind() according to visibility
     SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)( GetToolBox().GetItemWindow( GetId() ));
@@ -2190,10 +2190,10 @@ IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG )
 
 void SvxStyleToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT       nId    = GetId();
+    sal_uInt16       nId    = GetId();
     ToolBox&     rTbx   = GetToolBox();
     SvxStyleBox_Impl* pBox   = (SvxStyleBox_Impl*)(rTbx.GetItemWindow( nId ));
     TriState     eTri   = STATE_NOCHECK;
@@ -2252,8 +2252,8 @@ Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent )
 //========================================================================
 
 SvxFontNameToolBoxControl::SvxFontNameToolBoxControl(
-                                            USHORT          nSlotId,
-                                            USHORT          nId,
+                                            sal_uInt16          nSlotId,
+                                            sal_uInt16          nId,
                                             ToolBox&        rTbx )
 
     :   SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2264,10 +2264,10 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl(
 
 void SvxFontNameToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT               nId    = GetId();
+    sal_uInt16               nId    = GetId();
     ToolBox&             rTbx   = GetToolBox();
     SvxFontNameBox_Impl* pBox   = (SvxFontNameBox_Impl*)(rTbx.GetItemWindow( nId ));
 
@@ -2313,8 +2313,8 @@ Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent )
 //========================================================================
 
 SvxFontColorToolBoxControl::SvxFontColorToolBoxControl(
-    USHORT          nSlotId,
-    USHORT          nId,
+    sal_uInt16          nSlotId,
+    sal_uInt16          nId,
     ToolBox&        rTbx )
 
     :   SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2361,10 +2361,10 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow()
 
 void SvxFontColorToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
     const SvxColorItem* pItem = 0;
 
@@ -2382,7 +2382,7 @@ void SvxFontColorToolBoxControl::StateChanged(
 // class SvxColorToolBoxControl --------------------------------
 //========================================================================
 
-SvxColorToolBoxControl::SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxColorToolBoxControl::SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
@@ -2412,7 +2412,7 @@ SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const
 
 SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
 {
-    USHORT nResId = GetSlotId() == SID_BACKGROUND_COLOR ?
+    sal_uInt16 nResId = GetSlotId() == SID_BACKGROUND_COLOR ?
                         RID_SVXSTR_BACKGROUND : RID_SVXSTR_COLOR;
     SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl(
         OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BackgroundColor" )),
@@ -2432,7 +2432,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
 
 void SvxColorToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 
 {
     const SvxColorItem* pItem   = 0;
@@ -2442,7 +2442,7 @@ void SvxColorToolBoxControl::StateChanged(
     if ( pItem )
         pBtnUpdater->Update( pItem->GetValue() );
 
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
     rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
@@ -2453,8 +2453,8 @@ void SvxColorToolBoxControl::StateChanged(
 //========================================================================
 
 SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl(
-    USHORT nSlotId,
-    USHORT nId,
+    sal_uInt16 nSlotId,
+    sal_uInt16 nId,
     ToolBox& rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2467,7 +2467,7 @@ SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl(
     else
         addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" )));
 
-    USHORT nMode =  SID_ATTR_CHAR_COLOR2 == nSlotId
+    sal_uInt16 nMode =  SID_ATTR_CHAR_COLOR2 == nSlotId
         ? TBX_UPDATER_MODE_CHAR_COLOR_NEW : TBX_UPDATER_MODE_CHAR_COLOR_NEW;
     pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), nMode );
 }
@@ -2512,10 +2512,10 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow()
 
 void SvxFontColorExtToolBoxControl::StateChanged(
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
     const SvxColorItem* pItem = 0;
 
@@ -2541,7 +2541,7 @@ void SvxFontColorExtToolBoxControl::StateChanged(
 
 // -----------------------------------------------------------------------
 
-void SvxFontColorExtToolBoxControl::Select( BOOL )
+void SvxFontColorExtToolBoxControl::Select( sal_Bool )
 {
     OUString aCommand;
     OUString aParamName;
@@ -2567,8 +2567,8 @@ void SvxFontColorExtToolBoxControl::Select( BOOL )
 //========================================================================
 
 SvxFrameToolBoxControl::SvxFrameToolBoxControl(
-    USHORT      nSlotId,
-    USHORT      nId,
+    sal_uInt16      nSlotId,
+    sal_uInt16      nId,
     ToolBox&    rTbx )
 
     :   SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2601,10 +2601,10 @@ SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow()
 
 void SvxFrameToolBoxControl::StateChanged(
 
-    USHORT, SfxItemState eState, const SfxPoolItem*  )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem*  )
 
 {
-    USHORT                  nId     = GetId();
+    sal_uInt16                  nId     = GetId();
     ToolBox&                rTbx    = GetToolBox();
 
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -2618,8 +2618,8 @@ void SvxFrameToolBoxControl::StateChanged(
 //========================================================================
 
 SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
-    USHORT          nSlotId,
-    USHORT          nId,
+    sal_uInt16          nSlotId,
+    sal_uInt16          nId,
     ToolBox&        rTbx )
 
     :    SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2639,7 +2639,7 @@ SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
 SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 {
     SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), m_xFrame, &GetToolBox() );
-    pLineWin->StartPopupMode( &GetToolBox(), TRUE );
+    pLineWin->StartPopupMode( &GetToolBox(), sal_True );
     pLineWin->StartSelection();
     SetPopupWindow( pLineWin );
 
@@ -2650,9 +2650,9 @@ SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 
 void SvxFrameLineStyleToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem*  )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem*  )
 {
-    USHORT       nId    = GetId();
+    sal_uInt16       nId    = GetId();
     ToolBox&     rTbx   = GetToolBox();
 
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -2666,8 +2666,8 @@ void SvxFrameLineStyleToolBoxControl::StateChanged(
 //========================================================================
 
 SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl(
-    USHORT      nSlotId,
-    USHORT      nId,
+    sal_uInt16      nSlotId,
+    sal_uInt16      nId,
     ToolBox&    rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2713,10 +2713,10 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow()
 
 void SvxFrameLineColorToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
     rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
@@ -2753,7 +2753,7 @@ public:
 
 // -----------------------------------------------------------------------
 
-SvxReloadControllerItem::SvxReloadControllerItem( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxReloadControllerItem::SvxReloadControllerItem( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
 :   SfxToolBoxControl( nSlotId, nId, rTbx )
 ,   pImpl( new SvxReloadControllerItem_Impl )
 {
@@ -2770,7 +2770,7 @@ SvxReloadControllerItem::~SvxReloadControllerItem()
 // -----------------------------------------------------------------------
 
 void SvxReloadControllerItem::StateChanged(
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 {
     SfxBoolItem* pItem = PTR_CAST( SfxBoolItem, pState );
     ToolBox& rBox = GetToolBox();
@@ -2787,7 +2787,7 @@ void SvxReloadControllerItem::StateChanged(
 // class SvxSimpleUndoRedoController -------------------------------------
 //========================================================================
 
-SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx  )
+SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx  )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     aDefaultText = rTbx.GetItemText( nId );
@@ -2801,7 +2801,7 @@ SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController()
 
 // -----------------------------------------------------------------------
 
-void SvxSimpleUndoRedoController::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
     SfxStringItem* pItem = PTR_CAST( SfxStringItem, pState );
     ToolBox& rBox = GetToolBox();
@@ -2837,7 +2837,7 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
 
 // -----------------------------------------------------------------------
 
-BOOL lcl_FontChangedHint( const SfxHint &rHint )
+sal_Bool lcl_FontChangedHint( const SfxHint &rHint )
 {
     SfxPoolItemHint *pItemHint = PTR_CAST(SfxPoolItemHint, &rHint);
     if ( pItemHint )
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index d9d2dc3e44df..bbb00d0085a0 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -72,7 +72,7 @@ private:
     FontHeightToolBoxControl*                  m_pCtrl;
     String                                     m_aCurText;
     Size                                       m_aLogicalSize;
-    BOOL                                       m_bRelease;
+    sal_Bool                                       m_bRelease;
     uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
     uno::Reference< frame::XFrame >            m_xFrame;
     uno::Reference< awt::XWindow >             m_xOldFocusWindow;
@@ -94,7 +94,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
 
     m_pCtrl             ( &_rCtrl ),
     m_aLogicalSize      ( 30,100 ),
-    m_bRelease          ( TRUE ),
+    m_bRelease          ( sal_True ),
     m_xDispatchProvider ( _rDispatchProvider ),
     m_xFrame            ( _xFrame )
 {
@@ -109,7 +109,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl()
 {
     if ( !m_bRelease )
     {
-        m_bRelease = TRUE;
+        m_bRelease = sal_True;
         return;
     }
 
@@ -197,7 +197,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
         switch ( nCode )
         {
@@ -205,7 +205,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
             case KEY_TAB:
             {
                 if ( KEY_TAB == nCode )
-                    m_bRelease = FALSE;
+                    m_bRelease = sal_False;
                 else
                     nHandled = 1;
                 Select();
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index e446d3d3b9d5..f2926c38aa5b 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -96,14 +96,14 @@ void FindTextFieldControl::InitControls_Impl()
     SetText( SVX_RESSTR( RID_SVXSTR_FINDBAR_FIND ) );
     SetControlForeground(GetSettings().GetStyleSettings().GetDisableColor());
 
-    EnableAutocomplete(TRUE, TRUE);
+    EnableAutocomplete(sal_True, sal_True);
 }
 
 void FindTextFieldControl::Remember_Impl(const String& rStr)
 {
-    USHORT nCount = GetEntryCount();
+    sal_uInt16 nCount = GetEntryCount();
 
-    for (USHORT i=0; i<nCount; ++i)
+    for (sal_uInt16 i=0; i<nCount; ++i)
     {
         if ( rStr == GetEntry(i))
             return;
@@ -357,8 +357,8 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< :
     ToolBox* pToolBox = (ToolBox*)pWindow;
     if ( pToolBox )
     {
-        USHORT nItemCount = pToolBox->GetItemCount();
-        for ( USHORT i=0; i<nItemCount; ++i )
+        sal_uInt16 nItemCount = pToolBox->GetItemCount();
+        for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
             if ( sItemCommand.equals( COMMAND_DOWNSEARCH ) )
@@ -528,8 +528,8 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
     ToolBox* pToolBox = (ToolBox*)pWindow;
     if ( pToolBox )
     {
-        USHORT nItemCount = pToolBox->GetItemCount();
-        for ( USHORT i=0; i<nItemCount; ++i )
+        sal_uInt16 nItemCount = pToolBox->GetItemCount();
+        for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
             if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
@@ -657,8 +657,8 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th
     ToolBox* pToolBox = (ToolBox*)pWindow;
     if ( pToolBox )
     {
-        USHORT nItemCount = pToolBox->GetItemCount();
-        for ( USHORT i=0; i<nItemCount; ++i )
+        sal_uInt16 nItemCount = pToolBox->GetItemCount();
+        for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
             if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
@@ -815,8 +815,8 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
         ToolBox* pToolBox = (ToolBox*)pWindow;
         if ( pToolBox )
         {
-            USHORT nItemCount = pToolBox->GetItemCount();
-            for ( USHORT i=0; i<nItemCount; ++i )
+            sal_uInt16 nItemCount = pToolBox->GetItemCount();
+            for ( sal_uInt16 i=0; i<nItemCount; ++i )
             {
                 ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
                 if ( sItemCommand.equalsAscii(".uno:FindText") )
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index e0bcd03b62fc..8b509fdafc50 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -53,7 +53,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlAlign, SfxAllEnumItem);
 |*
 \************************************************************************/
 
-SvxTbxCtlAlign::SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
     ,   m_aSubTbName( RTL_CONSTASCII_USTRINGPARAM( "alignmentbar" ))
     ,   m_aSubTbResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/alignmentbar" ))
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index dd96799af0fd..e218f01fac0e 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -47,10 +47,10 @@ namespace svx
     //====================================================================
 
     ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(
-        USHORT nId,
-        USHORT nTbxBtnId,
+        sal_uInt16 nId,
+        sal_uInt16 nTbxBtnId,
         ToolBox* ptrTbx,
-        USHORT nMode ) :
+        sal_uInt16 nMode ) :
         mnDrawMode        ( nMode ),
         mnBtnId           ( nTbxBtnId ),
         mnSlotId           ( nId ),
@@ -60,7 +60,7 @@ namespace svx
         if (mnSlotId == SID_BACKGROUND_COLOR)
             mnDrawMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
         DBG_ASSERT( ptrTbx, "ToolBox not found :-(" );
-        mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : FALSE;
+        mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : sal_False;
         Update(mnSlotId == SID_ATTR_CHAR_COLOR2 ? COL_BLACK : COL_GRAY);
     }
 
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 34969ca00bc2..5943d6d0286d 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::frame;
 
 // -----------------------------------------------------------------------
 
-SvxTbxCtlDraw::SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
 
@@ -68,7 +68,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
 
 // -----------------------------------------------------------------------
 
-void SvxTbxCtlDraw::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState )
 {
     GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) );
@@ -94,7 +94,7 @@ void SvxTbxCtlDraw::toggleToolbox()
     Reference< XLayoutManager > xLayoutMgr = getLayoutManager();
     if ( xLayoutMgr.is() )
     {
-        BOOL bCheck = FALSE;
+        sal_Bool bCheck = sal_False;
         if ( xLayoutMgr->isElementVisible( m_sToolboxName ) )
         {
             xLayoutMgr->hideElement( m_sToolboxName );
@@ -102,7 +102,7 @@ void SvxTbxCtlDraw::toggleToolbox()
         }
         else
         {
-            bCheck = TRUE;
+            bCheck = sal_True;
             xLayoutMgr->createElement( m_sToolboxName );
             xLayoutMgr->showElement( m_sToolboxName );
         }
@@ -113,7 +113,7 @@ void SvxTbxCtlDraw::toggleToolbox()
 
 // -----------------------------------------------------------------------
 
-void SvxTbxCtlDraw::Select( BOOL )
+void SvxTbxCtlDraw::Select( sal_Bool )
 {
     toggleToolbox();
 }
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 14ffdc778361..6f437dfb791e 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -42,22 +42,22 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem);
 
 // -----------------------------27.04.01 15:50--------------------------------
 
-SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
-    SetVert(FALSE);
+    SetVert(sal_False);
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CTLFontState" )));
 }
 
-SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
-    SetVert(TRUE);
+    SetVert(sal_True);
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:VerticalTextState" )));
 }
 
 /* ---------------------------------------------------------------------------*/
-SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     bCheckVertical(sal_True)
 {
@@ -73,13 +73,13 @@ SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( )
 
  ---------------------------------------------------------------------------*/
 void SvxVertCTLTextTbxCtrl::StateChanged(
-    USHORT nSID,
+    sal_uInt16 nSID,
     SfxItemState eState,
     const SfxPoolItem* pState )
 {
     SvtLanguageOptions aLangOptions;
-    BOOL bCalc = sal_False;
-    BOOL bVisible = GetToolBox().IsItemVisible(GetId());
+    sal_Bool bCalc = sal_False;
+    sal_Bool bVisible = GetToolBox().IsItemVisible(GetId());
     sal_Bool bEnabled = sal_False;
     if ( nSID == SID_VERTICALTEXT_STATE )
         bEnabled = aLangOptions.IsVerticalTextEnabled();
@@ -95,7 +95,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
     {
         if(!bVisible)
         {
-            GetToolBox().ShowItem( GetId(), TRUE );
+            GetToolBox().ShowItem( GetId(), sal_True );
             bCalc = sal_True;
         }
     }
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 74a00bd431c6..41d4a8c824c5 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -578,7 +578,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
                 nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
 
             const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-            ULONG nCount = rMarkList.GetMarkCount(), i;
+            sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
             for(i=0; i<nCount; i++)
             {
@@ -616,7 +616,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
                 FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)rReq.GetArgs()->GetItem(SID_ATTR_METRIC))->GetValue();
 
                 ExtrusionDepthDialog aDlg( 0L, fDepth, eUnit );
-                USHORT nRet = aDlg.Execute();
+                sal_uInt16 nRet = aDlg.Execute();
                 if( nRet != 0 )
                 {
                     fDepth = aDlg.getDepth();
@@ -631,7 +631,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
 
     if( nSID == SID_EXTRUSION_TOOGLE )
     {
-            static USHORT SidArray[] = {
+            static sal_uInt16 SidArray[] = {
                 SID_EXTRUSION_TILT_DOWN,
                 SID_EXTRUSION_TILT_UP,
                 SID_EXTRUSION_TILT_LEFT,
@@ -656,7 +656,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
 void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString  sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString  sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) );
@@ -807,7 +807,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString  sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString  sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
@@ -863,7 +863,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString  sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString  sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) );
@@ -952,7 +952,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString  sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString  sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
@@ -1004,7 +1004,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
     if( pSdrView->GetModel() )
     {
         FieldUnit eUnit = pSdrView->GetModel()->GetUIUnit();
-        rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (USHORT)eUnit ) );
+        rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)eUnit ) );
     }
 
     if( bHasCustomShape )
@@ -1032,7 +1032,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 )
 void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString  sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString  sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) );
@@ -1113,7 +1113,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString  sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString  sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) );
@@ -1181,7 +1181,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString  sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString  sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) );
@@ -1256,7 +1256,7 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded )
     static const rtl::OUString  sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
 
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
     bool bFound = false;
 
     for(i=0;(i<nCount) && !bFound ; i++)
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 49a4f62609a9..64367edbc85e 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno;
 void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     sal_Int32   nAlignment = -1;
     for( i = 0; i < nCount; i++ )
@@ -102,7 +102,7 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
 void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     sal_Int32   nCharacterSpacing = -1;
     for( i = 0; i < nCount; i++ )
@@ -127,7 +127,7 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
 void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     sal_Bool    bChecked = sal_False;
     for( i = 0; i < nCount; i++ )
@@ -146,7 +146,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
 void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     rtl::OUString aFontWorkShapeType;
 
@@ -258,7 +258,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
     static const rtl::OUString  sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
 
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
     sal_Bool bFound = sal_False;
     for(i=0;(i<nCount) && !bFound ; i++)
     {
@@ -526,7 +526,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
             {
                 sal_Int32 nCharSpacing = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue();
                 FontworkCharacterSpacingDialog aDlg( 0L, nCharSpacing );
-                USHORT nRet = aDlg.Execute();
+                sal_uInt16 nRet = aDlg.Execute();
                 if( nRet != 0 )
                 {
                     SfxInt32Item aItem( SID_FONTWORK_CHARACTER_SPACING, aDlg.getScale() );
@@ -559,7 +559,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
                 nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
 
             const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-            ULONG nCount = rMarkList.GetMarkCount(), i;
+            sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
             for( i = 0; i < nCount; i++ )
             {
                 SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 4b9e68650180..d4e2d2272c12 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -97,7 +97,7 @@ String DictionaryList::getPropertyTypeName( sal_Int16 nConversionPropertyType )
     if(!m_pPropertyTypeNameListBox || !m_pPropertyTypeNameListBox->GetEntryCount())
         return String();
 
-    USHORT nPos = static_cast<USHORT>( nConversionPropertyType )-1;
+    sal_uInt16 nPos = static_cast<sal_uInt16>( nConversionPropertyType )-1;
     if(nPos<m_pPropertyTypeNameListBox->GetEntryCount())
         return m_pPropertyTypeNameListBox->GetEntry(nPos);
     return m_pPropertyTypeNameListBox->GetEntry(0);
@@ -260,7 +260,7 @@ bool DictionaryList::hasTerm( const rtl::OUString& rTerm ) const
 }
 
 void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping
-                              , sal_Int16 nConversionPropertyType, ULONG nPos )
+                              , sal_Int16 nConversionPropertyType, sal_uIntPtr nPos )
 {
     if( hasTerm( rTerm ) )
         return;
@@ -286,9 +286,9 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos  )
     }
 }
 
-ULONG DictionaryList::deleteEntries( const rtl::OUString& rTerm )
+sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm )
 {
-    ULONG nPos = LIST_APPEND;
+    sal_uIntPtr nPos = LIST_APPEND;
     for( sal_Int32 nN=GetRowCount(); nN--; )
     {
         DictionaryEntry* pCurEntry = getEntryOnPos( nN );
@@ -355,7 +355,7 @@ void DictionaryList::Resize()
     m_pHeaderBar->SetSizePixel( aBarSize );
 }
 
-void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ )
+void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ )
 {
     m_nSortColumnIndex=nSortColumnIndex;
     if( nSortColumnIndex<3 )
@@ -372,7 +372,7 @@ void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ )
         GetModel()->SetSortMode(SortNone);
 }
 
-USHORT DictionaryList::getSortColumn() const
+sal_uInt16 DictionaryList::getSortColumn() const
 {
     return m_nSortColumnIndex;
 }
@@ -393,8 +393,8 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR
 
     if(pLeftItem != NULL && pRightItem != NULL)
     {
-        USHORT nLeftKind=pLeftItem->IsA();
-        USHORT nRightKind=pRightItem->IsA();
+        sal_uInt16 nLeftKind=pLeftItem->IsA();
+        sal_uInt16 nRightKind=pRightItem->IsA();
 
         if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
             nLeftKind == SV_ITEM_ID_LBOXSTRING )
@@ -412,12 +412,12 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR
     return eCompare;
 }
 
-SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const
+SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const
 {
     SvLBoxItem* pItem = NULL;
     if( pEntry )
     {
-        USHORT nCount = pEntry->ItemCount();
+        sal_uInt16 nCount = pEntry->ItemCount();
         nColumn++;
         if( nTreeFlags & TREEFLAG_CHKBTN )
             nColumn++;
@@ -791,12 +791,12 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG )
         {
             if( m_aCB_Reverse.IsChecked() )
             {
-                ULONG nPos = rReverse.deleteEntries( pE->m_aMapping );
+                sal_uIntPtr nPos = rReverse.deleteEntries( pE->m_aMapping );
                 nPos = rReverse.deleteEntries( aMapping );
                 rReverse.addEntry( aMapping, aTerm, nConversionPropertyType, nPos );
             }
 
-            ULONG nPos = rActive.deleteEntries( aTerm );
+            sal_uIntPtr nPos = rActive.deleteEntries( aTerm );
             rActive.addEntry( aTerm, aMapping, nConversionPropertyType, nPos );
         }
     }
@@ -869,7 +869,7 @@ IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG )
 {
     if(m_pHeaderBar)
     {
-        USHORT nId = m_pHeaderBar->GetCurItemId();
+        sal_uInt16 nId = m_pHeaderBar->GetCurItemId();
         HeaderBarItemBits nBits = m_pHeaderBar->GetItemBits(nId);
         if( nBits & HIB_CLICKABLE )
         {
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index afe573330fe8..31b77aa32f04 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -94,14 +94,14 @@ public:
     bool hasTerm( const rtl::OUString& rTerm ) const;
 
     void addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping
-            , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, ULONG nPos = LIST_APPEND );
-    ULONG deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted
+            , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND );
+    sal_uIntPtr deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted
     void deleteEntryOnPos( sal_Int32 nPos  );
     DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const;
     DictionaryEntry* getFirstSelectedEntry() const;
 
-    void sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ );
-    USHORT getSortColumn() const;
+    void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ );
+    sal_uInt16 getSortColumn() const;
 
     virtual void Resize();
 
@@ -111,7 +111,7 @@ private:
 
     DECL_LINK( CompareHdl, SvSortData* );
     StringCompare ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pRight );
-    SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const;
+    SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const;
 
 public:
     ::com::sun::star::uno::Reference<
@@ -123,7 +123,7 @@ private:
 
     std::vector< DictionaryEntry* > m_aToBeDeleted;
 
-    USHORT      m_nSortColumnIndex;
+    sal_uInt16      m_nSortColumnIndex;
 };
 
 class ChineseDictionaryDialog : public ModalDialog
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx
index d4779aad151f..43a5acc043f6 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx
@@ -42,7 +42,7 @@ static ResMgr* getTextConversionResMgr()
         pMgr = ResMgr::CreateResMgr( "textconversiondlgs" );
     return pMgr;
 }
-TextConversionDlgs_ResId::TextConversionDlgs_ResId(USHORT nId)
+TextConversionDlgs_ResId::TextConversionDlgs_ResId(sal_uInt16 nId)
          : ResId( nId, *getTextConversionResMgr() )
 {
 }
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx
index ed474b59c32d..d2891870a649 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.hxx
@@ -41,7 +41,7 @@ namespace textconversiondlgs
 class TextConversionDlgs_ResId : public ResId
 {
  public:
-    TextConversionDlgs_ResId(USHORT nId);
+    TextConversionDlgs_ResId(sal_uInt16 nId);
 };
 
 //.............................................................................
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 440f6c313e20..eb9a7cb8128f 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -179,7 +179,7 @@ namespace svx
         virtual sal_Bool SAL_CALL supportsMimeType( const ::rtl::OUString& MimeTypeName ) throw (RuntimeException);
         virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames(  ) throw (RuntimeException);
 
-        VirtualDevice* CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const;
+        VirtualDevice* CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const;
 
         DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
 
@@ -221,7 +221,7 @@ namespace svx
 
     /** creates a bitmap that is optionaly transparent from a metafile
     */
-    BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, BOOL bTransparent, const Size* pSize )
+    BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, sal_Bool bTransparent, const Size* pSize )
     {
         Graphic     aGraphic( rMtf );
         BitmapEx    aBmpEx;
@@ -349,7 +349,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
             if( pField && pField->ISA( SvxPageField ) )
             {
                 String aPageNumValue;
-                BOOL bUpper = FALSE;
+                sal_Bool bUpper = sal_False;
 
                 switch(mpDoc->GetPageNumType())
                 {
@@ -360,7 +360,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
                         aPageNumValue += (sal_Unicode)(char)((mnPageNumber - 1) % 26 + 'a');
                         break;
                     case SVX_ROMAN_UPPER:
-                        bUpper = TRUE;
+                        bUpper = sal_True;
                     case SVX_ROMAN_LOWER:
                         aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
                         break;
@@ -391,7 +391,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
 
     @return the returned VirtualDevice is owned by the caller
 */
-VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const
+VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const
 {
     VirtualDevice*  pVDev = new VirtualDevice();
     MapMode         aMM( MAP_100TH_MM );
@@ -422,17 +422,17 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixe
 
     pVDev->SetMapMode( aMM );
 #ifdef DBG_UTIL
-    BOOL bAbort = !
+    sal_Bool bAbort = !
 #endif
         pVDev->SetOutputSize(aPageSize);
     DBG_ASSERT(!bAbort, "virt. Device nicht korrekt erzeugt");
 
     SdrView* pView = new SdrView(mpDoc, pVDev);
-    pView->SetPageVisible( FALSE );
-    pView->SetBordVisible( FALSE );
-    pView->SetGridVisible( FALSE );
-    pView->SetHlplVisible( FALSE );
-    pView->SetGlueVisible( FALSE );
+    pView->SetPageVisible( sal_False );
+    pView->SetBordVisible( sal_False );
+    pView->SetGridVisible( sal_False );
+    pView->SetHlplVisible( sal_False );
+    pView->SetGlueVisible( sal_False );
     pView->ShowSdrPage(pPage);
     Region aRegion (Rectangle( aPoint, aPageSize ) );
 
@@ -719,7 +719,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                 aVDev.SetMapMode( aMap );
                 if( rSettings.mbUseHighContrast )
                     aVDev.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
-                aVDev.EnableOutput( FALSE );
+                aVDev.EnableOutput( sal_False );
                 aMtf.Record( &aVDev );
                 Size aNewSize;
 
@@ -735,14 +735,14 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                     pView = new SdrView( mpDoc, &aVDev );
                 }
 
-                pView->SetBordVisible( FALSE );
-                pView->SetPageVisible( FALSE );
+                pView->SetBordVisible( sal_False );
+                pView->SetPageVisible( sal_False );
                 pView->ShowSdrPage( pPage );
 
                 if ( pView && pPage )
                 {
-                    pView->SetBordVisible( FALSE );
-                    pView->SetPageVisible( FALSE );
+                    pView->SetBordVisible( sal_False );
+                    pView->SetPageVisible( sal_False );
                     pView->ShowSdrPage( pPage );
 
                     const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() );
@@ -788,7 +788,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                 if( rSettings.mbTranslucent )
                 {
                     Size aOutSize;
-                    aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), TRUE, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
+                    aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), sal_True, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
                 }
             }
         }
@@ -887,11 +887,11 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
 
                     pMtf->AddAction( new MetaCommentAction(
                                          "XTEXT_SCROLLRECT", 0,
-                                         reinterpret_cast<BYTE const*>(&aScrollRectangle),
+                                         reinterpret_cast<sal_uInt8 const*>(&aScrollRectangle),
                                          sizeof( Rectangle ) ) );
                     pMtf->AddAction( new MetaCommentAction(
                                          "XTEXT_PAINTRECT", 0,
-                                         reinterpret_cast<BYTE const*>(&aPaintRectangle),
+                                         reinterpret_cast<sal_uInt8 const*>(&aPaintRectangle),
                                          sizeof( Rectangle ) ) );
 
                     aGraphic = Graphic( *pMtf );
@@ -924,7 +924,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                 }
             }
 
-            aOut.EnableOutput( FALSE );
+            aOut.EnableOutput( sal_False );
             aOut.SetMapMode( aMap );
             if( rSettings.mbUseHighContrast )
                 aOut.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
@@ -1022,7 +1022,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
     // create the output stuff
     Graphic aGraphic;
 
-    USHORT nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR;
+    sal_uInt16 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR;
 
     if( nStatus == GRFILTER_OK )
     {
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 0ce5b6ca223a..69ee2502c27d 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -46,7 +46,7 @@ using namespace ::rtl;
 using namespace ::cppu;
 using namespace ::vos;
 
-SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw()
+SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw()
 : mpModel( pModel ),
   mpModelPool( pModel ? &pModel->GetItemPool() : NULL ),
   mnWhich( nWhich ), mnMemberId( nMemberId )
@@ -93,11 +93,11 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const  OUString& Service
     uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
     const OUString * pArray = aSNL.getConstArray();
 
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement )
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 2f864f6f72d2..995b58fb0cc0 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -50,15 +50,15 @@ class SvxUnoNameItemTable : public cppu::WeakImplHelper2< com::sun::star::contai
 private:
     SdrModel*       mpModel;
     SfxItemPool*    mpModelPool;
-    USHORT          mnWhich;
-    BYTE            mnMemberId;
+    sal_uInt16          mnWhich;
+    sal_uInt8           mnMemberId;
 
     ItemPoolVector maItemSetVector;
 
     void SAL_CALL ImplInsertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement );
 
 public:
-    SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw();
+    SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw();
     virtual ~SvxUnoNameItemTable() throw();
 
     virtual NameOrIndex* createItem() const throw() = 0;
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 617d1737a482..4a54b30c6caa 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -457,7 +457,7 @@ uno::Any SvxUnoXDashTable::getAny( const XPropertyEntry* pEntry ) const throw()
 
     drawing::LineDash aLineDash;
 
-    aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+    aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
     aLineDash.Dots = rXD.GetDots();
     aLineDash.DotLen = rXD.GetDotLen();
     aLineDash.Dashes = rXD.GetDashes();
@@ -477,7 +477,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An
 
     XDash aXDash;
 
-    aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+    aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
     aXDash.SetDots(aLineDash.Dots);
     aXDash.SetDotLen(aLineDash.DotLen);
     aXDash.SetDashes(aLineDash.Dashes);
@@ -616,8 +616,8 @@ uno::Any SvxUnoXGradientTable::getAny( const XPropertyEntry* pEntry ) const thro
     awt::Gradient aGradient;
 
     aGradient.Style = (awt::GradientStyle) aXGradient.GetGradientStyle();
-    aGradient.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
-    aGradient.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+    aGradient.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+    aGradient.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
     aGradient.Angle = (short)aXGradient.GetAngle();
     aGradient.Border = aXGradient.GetBorder();
     aGradient.XOffset = aXGradient.GetXOffset();
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index eb5cd8ec5231..ab09bbfb475b 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
 using namespace ::rtl;
 using namespace ::cppu;
 
-const USHORT NON_USER_DEFINED_GLUE_POINTS = 4;
+const sal_uInt16 NON_USER_DEFINED_GLUE_POINTS = 4;
 
 class SvxUnoGluePointAccess : public WeakImplHelper2< container::XIndexContainer, container::XIdentifierContainer >
 {
@@ -237,7 +237,7 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) thr
             {
                 SdrGluePoint aSdrGlue;
                 convert( aUnoGlue, aSdrGlue );
-                USHORT nId = pList->Insert( aSdrGlue );
+                sal_uInt16 nId = pList->Insert( aSdrGlue );
 
                 // only repaint, no objectchange
                 mpObject->ActionChanged();
@@ -257,11 +257,11 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier )
 {
     if( mpObject.is() && ( Identifier >= NON_USER_DEFINED_GLUE_POINTS ))
     {
-        const USHORT nId = (USHORT)(Identifier - NON_USER_DEFINED_GLUE_POINTS) + 1;
+        const sal_uInt16 nId = (sal_uInt16)(Identifier - NON_USER_DEFINED_GLUE_POINTS) + 1;
 
         SdrGluePointList* pList = const_cast<SdrGluePointList*>(mpObject->GetGluePointList());
-        const USHORT nCount = pList ? pList->GetCount() : 0;
-        USHORT i;
+        const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+        sal_uInt16 i;
 
         for( i = 0; i < nCount; i++ )
         {
@@ -290,11 +290,11 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, c
         if( (Identifier < NON_USER_DEFINED_GLUE_POINTS) || !(aElement >>= aGluePoint))
             throw lang::IllegalArgumentException();
 
-        const USHORT nId = (USHORT)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
+        const sal_uInt16 nId = (sal_uInt16)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
 
         SdrGluePointList* pList = const_cast< SdrGluePointList* >( mpObject->GetGluePointList() );
-        const USHORT nCount = pList ? pList->GetCount() : 0;
-        USHORT i;
+        const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+        sal_uInt16 i;
         for( i = 0; i < nCount; i++ )
         {
             if( (*pList)[i].GetId() == nId )
@@ -324,18 +324,18 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier )
 
         if( Identifier < NON_USER_DEFINED_GLUE_POINTS ) // default glue point?
         {
-            SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (USHORT)Identifier );
+            SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Identifier );
             aGluePoint.IsUserDefined = sal_False;
             convert( aTempPoint, aGluePoint );
             return uno::makeAny( aGluePoint );
         }
         else
         {
-            const USHORT nId = (USHORT)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
+            const sal_uInt16 nId = (sal_uInt16)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
 
             const SdrGluePointList* pList = mpObject->GetGluePointList();
-            const USHORT nCount = pList ? pList->GetCount() : 0;
-            for( USHORT i = 0; i < nCount; i++ )
+            const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+            for( sal_uInt16 i = 0; i < nCount; i++ )
             {
                 const SdrGluePoint& rTempPoint = (*pList)[i];
                 if( rTempPoint.GetId() == nId )
@@ -361,9 +361,9 @@ uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() thro
     if( mpObject.is() )
     {
         const SdrGluePointList* pList = mpObject->GetGluePointList();
-        const USHORT nCount = pList ? pList->GetCount() : 0;
+        const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
 
-        USHORT i;
+        sal_uInt16 i;
 
         uno::Sequence< sal_Int32 > aIdSequence( nCount + NON_USER_DEFINED_GLUE_POINTS );
         sal_Int32 *pIdentifier = aIdSequence.getArray();
@@ -428,7 +428,7 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index )
             Index -= 4;
             if( Index >= 0 && Index < pList->GetCount() )
             {
-                pList->Delete( (USHORT)Index );
+                pList->Delete( (sal_uInt16)Index );
 
                 // only repaint, no objectchange
                 mpObject->ActionChanged();
@@ -457,7 +457,7 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno:
         SdrGluePointList* pList = const_cast< SdrGluePointList* >( mpObject->GetGluePointList() );
         if( pList && Index < pList->GetCount() )
         {
-            SdrGluePoint& rGlue = (*pList)[(USHORT)Index];
+            SdrGluePoint& rGlue = (*pList)[(sal_uInt16)Index];
             convert( aUnoGlue, rGlue );
 
             // only repaint, no objectchange
@@ -500,7 +500,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
 
         if( Index < 4 ) // default glue point?
         {
-            SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (USHORT)Index );
+            SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Index );
             aGluePoint.IsUserDefined = sal_False;
             convert( aTempPoint, aGluePoint );
             uno::Any aAny;
@@ -513,7 +513,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
             const SdrGluePointList* pList = mpObject->GetGluePointList();
             if( pList && Index < pList->GetCount() )
             {
-                const SdrGluePoint& rTempPoint = (*pList)[(USHORT)Index];
+                const SdrGluePoint& rTempPoint = (*pList)[(sal_uInt16)Index];
                 aGluePoint.IsUserDefined = sal_True;
                 convert( rTempPoint, aGluePoint );
                 uno::Any aAny;
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 48357f873ce3..6b54a1458307 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -100,11 +100,11 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const  OUString& ServiceNam
     uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
     const OUString * pArray = aSNL.getConstArray();
 
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException )
@@ -132,7 +132,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::
     if( hasByName( aName ) )
         throw container::ElementExistException();
 
-    INT32 nColor = 0;
+    sal_Int32 nColor = 0;
     if( !(aElement >>= nColor) )
         throw lang::IllegalArgumentException();
 
@@ -157,7 +157,7 @@ void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name )
 void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno::Any& aElement )
     throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
 {
-    INT32 nColor = 0;
+    sal_Int32 nColor = 0;
     if( !(aElement >>= nColor) )
         throw lang::IllegalArgumentException();
 
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 195411b1e944..016128488ab4 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -192,11 +192,11 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(
 
     if( ServiceSpecifier.compareTo( aDrawingPrefix, aDrawingPrefix.getLength() ) == 0 )
     {
-        UINT32 nType = aSdrShapeIdentifierMap.getId( ServiceSpecifier );
+        sal_uInt32 nType = aSdrShapeIdentifierMap.getId( ServiceSpecifier );
         if( nType != UHASHMAP_NOTFOUND )
         {
-            UINT16 nT = (UINT16)(nType & ~E3D_INVENTOR_FLAG);
-            UINT32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor;
+            sal_uInt16 nT = (sal_uInt16)(nType & ~E3D_INVENTOR_FLAG);
+            sal_uInt32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor;
 
             return uno::Reference< uno::XInterface >( (drawing::XShape*) SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI ) );
         }
@@ -225,7 +225,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames
 {
     UHashMapEntry* pMap = pSdrShapeIdentifierMap;
 
-    UINT32 nCount = 0;
+    sal_uInt32 nCount = 0;
     while (pMap->aIdentifier.getLength())
     {
         pMap++;
@@ -236,7 +236,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames
     OUString* pStrings = aSeq.getArray();
 
     pMap = pSdrShapeIdentifierMap;
-    UINT32 nIdx = 0;
+    sal_uInt32 nIdx = 0;
     while(pMap->aIdentifier.getLength())
     {
         pStrings[nIdx] = pMap->aIdentifier;
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 01375649553b..a46b535a9baf 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -145,11 +145,11 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const  OUString& ServiceNa
     uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
     const OUString * pArray = aSNL.getConstArray();
 
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException )
@@ -307,7 +307,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
         throw container::NoSuchElementException();
 }
 
-static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, USHORT nWhich, uno::Any& rAny )
+static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, sal_uInt16 nWhich, uno::Any& rAny )
 {
     NameOrIndex *pItem;
     const sal_uInt32 nSurrogateCount = pPool ? pPool->GetItemCount2( nWhich ) : 0;
@@ -355,7 +355,7 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName )
     return aAny;
 }
 
-static void createNamesForPool( SfxItemPool* pPool, USHORT nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet )
+static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet )
 {
     const sal_uInt32 nSuroCount = pPool->GetItemCount2( nWhich );
     sal_uInt32 nSurrogate;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index af6a35ddd5ef..3602158722a9 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -623,7 +623,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
                 aNewPolygon.setClosed(true);
                 pObj->SetExtrudePolygon(basegfx::B2DPolyPolygon(aNewPolygon));
 
-                // #107245# pObj->SetExtrudeCharacterMode(TRUE);
+                // #107245# pObj->SetExtrudeCharacterMode(sal_True);
                 pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
             }
             else if(pNewObj->ISA(E3dLatheObj))
@@ -636,7 +636,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
                 aNewPolygon.setClosed(true);
                 pObj->SetPolyPoly2D(basegfx::B2DPolyPolygon(aNewPolygon));
 
-                // #107245# pObj->SetLatheCharacterMode(TRUE);
+                // #107245# pObj->SetLatheCharacterMode(sal_True);
                 pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
             }
         }
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 17c32389e311..fd682129b184 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -124,22 +124,22 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
         }
     default:
         {
-            const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
+            const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
 
-            BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
+            sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
             if( eMapUnit == SFX_MAPUNIT_100TH_MM )
                 nMemberId &= (~CONVERT_TWIPS);
 
             // DVO, OD 10.10.2003 #i18732#
             // Assure, that ID is a Which-ID (it could be a Slot-ID.)
             // Thus, convert handle to Which-ID.
-            pPool->GetDefaultItem( pPool->GetWhich( (USHORT)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId );
+            pPool->GetDefaultItem( pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId );
         }
     }
 
 
     // check for needed metric translation
-    const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle);
+    const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
     if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
     {
         SvxUnoConvertToMM( eMapUnit, rValue );
@@ -159,7 +159,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
 {
     uno::Any aValue( rValue );
 
-    const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle);
+    const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
     if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
     {
         SvxUnoConvertFromMM( eMapUnit, aValue );
@@ -193,7 +193,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
     default:
         {
             ::std::auto_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() );
-            BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
+            sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
             if( !pPool || (pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM) )
                 nMemberId &= (~CONVERT_TWIPS);
 
@@ -308,7 +308,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
     // OD 10.10.2003 #i18732#
     // Assure, that ID is a Which-ID (it could be a Slot-ID.)
     // Thus, convert handle to Which-ID.
-    const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle );
+    const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
     if ( pPool && pPool != mpDefaultsPool )
     {
         // OD 13.10.2003 #i18732# - use method <ResetPoolDefaultItem(..)>
@@ -326,7 +326,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry
     // using probably incompatible item pool <mpDefaultsPool>
     uno::Any aAny;
     SfxItemPool* pPool = getModelPool( sal_True );
-    const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle );
+    const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
     const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich );
     pItem->QueryValue( aAny, pEntry->mnMemberId );
 
@@ -409,11 +409,11 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const  OUString& ServiceName
     uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
     const OUString * pArray = aSNL.getConstArray();
 
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException )
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 6132139e0164..a4abc4e23d88 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -894,7 +894,7 @@ UHashMap::UHashMap( UHashMapEntry* pMap )
 
 // ---------------------------------------------------------------------
 
-UINT32 UHashMap::getId( const OUString& rCompareString )
+sal_uInt32 UHashMap::getId( const OUString& rCompareString )
 {
     size_t nHash = rCompareString.hashCode() & (HASHARRAYSIZE-1);
 
@@ -938,7 +938,7 @@ Svx_CompareMap(const void* pSmaller, const void* pBigger )
 
 SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
 {
-    for(UINT16 i=0;i<SVXMAP_END; i++)
+    for(sal_uInt16 i=0;i<SVXMAP_END; i++)
     {
         aSetArr[i] = 0;
         aMapArr[i] = 0;
@@ -947,23 +947,23 @@ SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
 
 SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider()
 {
-    for(UINT16 i=0;i<SVXMAP_END; i++)
+    for(sal_uInt16 i=0;i<SVXMAP_END; i++)
         delete aSetArr[i];
 }
 
 // ---------------------------------------------------------------------
 
-/*void SvxUnoPropertyMapProvider::Sort(USHORT nId)
+/*void SvxUnoPropertyMapProvider::Sort(sal_uInt16 nId)
 {
     SfxItemPropertyMapEntry* pTemp = aMapArr[nId];
-    UINT16 i = 0;
+    sal_uInt16 i = 0;
     while(pTemp[i].pName) { i++; }
     qsort(aMapArr[nId], i, sizeof(SfxItemPropertyMapEntry), Svx_CompareMap);
 }*/
 
 // ---------------------------------------------------------------------
 
-const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropertyId)
+const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId)
 {
     DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" );
     if(!aMapArr[nPropertyId]) {
@@ -1002,7 +1002,7 @@ const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropert
     }
     return aMapArr[nPropertyId];
 }
-const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool)
+const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool)
 {
     if( !aSetArr[nPropertyId] )
         aSetArr[nPropertyId] = new SvxItemPropertySet( GetMap( nPropertyId ), rPool );
@@ -1159,10 +1159,10 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI
         break;
 
     default:
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*sal_Int16 SvxUnoGetWhichIdForNamedProperty( const ::rtl::OUString & rPropName )
@@ -1211,29 +1211,29 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
     int i;
     for( i = 0; i < nCount; i++ )
     {
-        USHORT nResId = (USHORT)(nSourceResIds + i);
+        sal_uInt16 nResId = (sal_uInt16)(nSourceResIds + i);
         const ResId aRes( SVX_RES(nResId));
         const String aCompare( aRes );
         if( aShortString == aCompare )
         {
-            USHORT nNewResId = (USHORT)(nDestResIds + i);
+            sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
             ResId aNewRes( SVX_RES( nNewResId ));
             rString.Replace( 0, aShortString.Len(), String( aNewRes ) );
-            return TRUE;
+            return sal_True;
         }
         else if( rString == aCompare )
         {
-            USHORT nNewResId = (USHORT)(nDestResIds + i);
+            sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
             ResId aNewRes( SVX_RES( nNewResId ));
             rString = String( aNewRes );
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
+static sal_uInt16 __READONLY_DATA SvxUnoColorNameDefResId[] =
 {
     RID_SVXSTR_BLUEGREY_DEF,
     RID_SVXSTR_BLACK_DEF,
@@ -1264,7 +1264,7 @@ static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_CHART_DEF
 };
 
-static USHORT __READONLY_DATA SvxUnoColorNameResId[] =
+static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] =
 {
     RID_SVXSTR_BLUEGREY,
     RID_SVXSTR_BLACK,
@@ -1295,7 +1295,7 @@ static USHORT __READONLY_DATA SvxUnoColorNameResId[] =
     RID_SVXSTR_COLOR_CHART
 };
 
-bool SvxUnoConvertResourceString( USHORT* pSourceResIds, USHORT* pDestResIds, int nCount, String& rString ) throw()
+bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()
 {
     int i = 0;
 
@@ -1323,7 +1323,7 @@ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalNam
 
     if( nWhich == XATTR_LINECOLOR )
     {
-        if( SvxUnoConvertResourceString( (USHORT*)SvxUnoColorNameResId, (USHORT*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( USHORT ), aNew ) )
+        if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameResId, (sal_uInt16*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
         {
             rApiName = aNew;
             return;
@@ -1360,7 +1360,7 @@ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString&
 
     if( nWhich == XATTR_LINECOLOR )
     {
-        if( SvxUnoConvertResourceString( (USHORT*)SvxUnoColorNameDefResId, (USHORT*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( USHORT ), aNew ) )
+        if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameDefResId, (sal_uInt16*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
         {
             rInternalName = aNew;
             return;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 057e5f8b7e6c..17709c6197ce 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1717,7 +1717,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
                 // normal link
                 String              aFilterName;
                 const SfxFilter*    pSfxFilter = NULL;
-                SfxMedium           aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE );
+                SfxMedium           aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, sal_False );
 
                 SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
 
@@ -1997,8 +1997,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
 
                 Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
                 Point aRef2( aRef1.X(), aRef1.Y() + 1000 );
-                USHORT i;
-                USHORT nPntAnz=aPol.GetSize();
+                sal_uInt16 i;
+                sal_uInt16 nPntAnz=aPol.GetSize();
                 for (i=0; i<nPntAnz; i++)
                 {
                     MirrorPoint(aPol[i],aRef1,aRef2);
@@ -2019,8 +2019,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
 
                 Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
                 Point aRef2( aRef1.X() + 1000, aRef1.Y() );
-                USHORT i;
-                USHORT nPntAnz=aPol.GetSize();
+                sal_uInt16 i;
+                sal_uInt16 nPntAnz=aPol.GetSize();
                 for (i=0; i<nPntAnz; i++)
                 {
                     MirrorPoint(aPol[i],aRef1,aRef2);
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index fd8f9dd1d2d9..be20ca4421e3 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -394,7 +394,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
             double fCamFocal =
                 (double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
 
-            aCam.SetAutoAdjustProjection(FALSE);
+            aCam.SetAutoAdjustProjection(sal_False);
             aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
             basegfx::B3DPoint aLookAt;
             basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ);
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 79d5b7c5dec9..9f906dc59a39 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -285,13 +285,13 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
             Graphic* pGraphic = pObj->GetGraphic();
             if( pGraphic )
             {
-                BOOL bIsWMF = FALSE;
+                sal_Bool bIsWMF = sal_False;
                 if ( pGraphic->IsLink() )
                 {
                     GfxLink aLnk = pGraphic->GetLink();
                     if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF )
                     {
-                        bIsWMF = TRUE;
+                        bIsWMF = sal_True;
                         uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize());
                         rValue <<= aSeq;
                     }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 839c4553a859..73872e2e4b0a 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1538,7 +1538,7 @@ void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Re
 
 sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName )
 {
-    SfxItemSet aSet( mpModel->GetItemPool(),    (USHORT)nWID, (USHORT)nWID );
+    SfxItemSet aSet( mpModel->GetItemPool(),    (sal_uInt16)nWID, (sal_uInt16)nWID );
 
     if( SetFillAttribute( nWID, rName, aSet, mpModel ) )
     {
@@ -1723,12 +1723,12 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
     const SfxItemPool* pPool = rSet.GetPool();
 
     const String aSearchName( aName );
-    const sal_uInt32 nCount = pPool->GetItemCount2((USHORT)nWID);
+    const sal_uInt32 nCount = pPool->GetItemCount2((sal_uInt16)nWID);
     const NameOrIndex* pItem;
 
     for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)pPool->GetItem2((USHORT)nWID, nSurrogate);
+        pItem = (NameOrIndex*)pPool->GetItem2((sal_uInt16)nWID, nSurrogate);
         if( pItem && ( pItem->GetName() == aSearchName ) )
         {
             rSet.Put( *pItem );
@@ -1757,13 +1757,13 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
     const SfxItemPool& rPool = pModel->GetItemPool();
 
     const String aSearchName( rName );
-    const sal_uInt32 nCount = rPool.GetItemCount((USHORT)nWhich);
+    const sal_uInt32 nCount = rPool.GetItemCount((sal_uInt16)nWhich);
     const NameOrIndex* pItem = 0;
     bool bFound = false;
 
     for( sal_uInt32 nSurrogate = 0; ! bFound && nSurrogate < nCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)rPool.GetItem((USHORT)nWhich, nSurrogate);
+        pItem = (NameOrIndex*)rPool.GetItem((sal_uInt16)nWhich, nSurrogate);
         if( pItem && ( pItem->GetName() == aSearchName ) )
         {
             bFound = true;
@@ -2396,7 +2396,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
             case XATTR_FILLHATCH:
             case XATTR_LINEDASH:
                 {
-                    NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+                    NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
                     if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) )
                         eState = beans::PropertyState_DEFAULT_VALUE;
                 }
@@ -2411,7 +2411,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
             case XATTR_LINESTART:
             case XATTR_FILLFLOATTRANSPARENCE:
                 {
-                    NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+                    NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
                     if( ( pItem == NULL ) )
                         eState = beans::PropertyState_DEFAULT_VALUE;
                 }
@@ -2495,7 +2495,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
 #ifdef DBG_UTIL
                 SdrObject* pCheck =
 #endif
-                            pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), (ULONG)nNewOrdNum );
+                            pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), (sal_uIntPtr)nNewOrdNum );
                 DBG_ASSERT( pCheck == mpObj.get(), "GetOrdNum() failed!" );
             }
             return true;
@@ -2674,7 +2674,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
         OUString aLayerName;
         if( rValue >>= aLayerName )
         {
-            const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, TRUE);
+            const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, sal_True);
             if( pLayer != NULL )
             {
                 mpObj->SetLayer( pLayer->GetID() );
@@ -2712,7 +2712,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
             {
                 Point aRef1(mpObj->GetSnapRect().Center());
                 double nTan=tan(nShear*nPi180);
-                mpObj->Shear(aRef1,nShear,nTan,FALSE);
+                mpObj->Shear(aRef1,nShear,nTan,sal_False);
                 return true;
             }
         }
@@ -3207,13 +3207,13 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
             Graphic* pGraphic = pObj->GetGraphic();
             if( pGraphic )
             {
-                BOOL bIsWMF = FALSE;
+                sal_Bool bIsWMF = sal_False;
                 if ( pGraphic->IsLink() )
                 {
                     GfxLink aLnk = pGraphic->GetLink();
                     if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF )
                     {
-                        bIsWMF = TRUE;
+                        bIsWMF = sal_True;
                         uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize());
                         rValue <<= aSeq;
                     }
@@ -3424,7 +3424,7 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException)
     }
 
     // #i68523# special handling for Svx3DCharacterModeItem, this is not saved
-    // but needs to be TRUE in svx, pool default (false) in sch. Since sch
+    // but needs to be sal_True in svx, pool default (false) in sch. Since sch
     // does not load lathe or extrude objects, it is possible to set the items
     // here.
     // For other solution possibilities, see task description.
@@ -3534,7 +3534,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 
     if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor)
     {
-        const UINT16 nIdent = mpObj->GetObjIdentifier();
+        const sal_uInt16 nIdent = mpObj->GetObjIdentifier();
 
         switch(nIdent)
         {
@@ -4126,7 +4126,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
     else if( mpObj.is() && mpObj->GetObjInventor() == FmFormInventor)
     {
 #if OSL_DEBUG_LEVEL > 0
-        const UINT16 nIdent = mpObj->GetObjIdentifier();
+        const sal_uInt16 nIdent = mpObj->GetObjIdentifier();
         OSL_ENSURE( nIdent == OBJ_UNO, "SvxShape::_getSupportedServiceNames: FmFormInventor, but no UNO object?" );
 #endif
         static uno::Sequence< OUString > *pSeq = 0;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index f82283417be6..2d82868512c5 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -105,14 +105,14 @@ private:
     SvxDrawOutlinerViewForwarder*   mpViewForwarder;    // if non-NULL, use GetViewModeTextForwarder text forwarder
     css::uno::Reference< css::linguistic2::XLinguServiceManager > m_xLinguServiceManager;
     Point                           maTextOffset;
-    BOOL                            mbDataValid;
-    BOOL                            mbDestroyed;
-    BOOL                            mbIsLocked;
-    BOOL                            mbNeedsUpdate;
-    BOOL                            mbOldUndoMode;
-    BOOL                            mbForwarderIsEditMode;      // have to reflect that, since ENDEDIT can happen more often
-    BOOL                            mbShapeIsEditMode;          // #104157# only true, if HINT_BEGEDIT was received
-    BOOL                            mbNotificationsDisabled;    // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
+    sal_Bool                            mbDataValid;
+    sal_Bool                            mbDestroyed;
+    sal_Bool                            mbIsLocked;
+    sal_Bool                            mbNeedsUpdate;
+    sal_Bool                            mbOldUndoMode;
+    sal_Bool                            mbForwarderIsEditMode;      // have to reflect that, since ENDEDIT can happen more often
+    sal_Bool                            mbShapeIsEditMode;          // #104157# only true, if HINT_BEGEDIT was received
+    sal_Bool                            mbNotificationsDisabled;    // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
 
     XInterface*                     mpOwner;
     SvxUnoTextRangeBaseList         maTextRanges;
@@ -156,7 +156,7 @@ public:
     void                    lock();
     void                    unlock();
 
-    BOOL                    IsValid() const;
+    sal_Bool                    IsValid() const;
 
     Rectangle               GetVisArea();
     Point                   LogicToPixel( const Point&, const MapMode& rMapMode );
@@ -183,14 +183,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
     mpOutliner      ( NULL ),
     mpTextForwarder ( NULL ),
     mpViewForwarder ( NULL ),
-    mbDataValid     ( FALSE ),
-    mbDestroyed     ( FALSE ),
-    mbIsLocked      ( FALSE ),
-    mbNeedsUpdate   ( FALSE ),
-    mbOldUndoMode   ( FALSE ),
-    mbForwarderIsEditMode ( FALSE ),
-    mbShapeIsEditMode     ( FALSE ),
-    mbNotificationsDisabled ( FALSE ),
+    mbDataValid     ( sal_False ),
+    mbDestroyed     ( sal_False ),
+    mbIsLocked      ( sal_False ),
+    mbNeedsUpdate   ( sal_False ),
+    mbOldUndoMode   ( sal_False ),
+    mbForwarderIsEditMode ( sal_False ),
+    mbShapeIsEditMode     ( sal_False ),
+    mbNotificationsDisabled ( sal_False ),
     mpOwner( pOwner )
 {
     DBG_ASSERT( mpObject, "invalid pObject!" );
@@ -221,14 +221,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
     mpOutliner      ( NULL ),
     mpTextForwarder ( NULL ),
     mpViewForwarder ( NULL ),
-    mbDataValid     ( FALSE ),
-    mbDestroyed     ( FALSE ),
-    mbIsLocked      ( FALSE ),
-    mbNeedsUpdate   ( FALSE ),
-    mbOldUndoMode   ( FALSE ),
-    mbForwarderIsEditMode ( FALSE ),
-    mbShapeIsEditMode     ( TRUE ),
-    mbNotificationsDisabled ( FALSE ),
+    mbDataValid     ( sal_False ),
+    mbDestroyed     ( sal_False ),
+    mbIsLocked      ( sal_False ),
+    mbNeedsUpdate   ( sal_False ),
+    mbOldUndoMode   ( sal_False ),
+    mbForwarderIsEditMode ( sal_False ),
+    mbShapeIsEditMode     ( sal_True ),
+    mbNotificationsDisabled ( sal_False ),
     mpOwner(0)
 {
     if( !mpText )
@@ -369,7 +369,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
         {
             case HINT_OBJCHG:
             {
-                mbDataValid = FALSE;                        // Text muss neu geholt werden
+                mbDataValid = sal_False;                        // Text muss neu geholt werden
 
                 if( HasView() )
                 {
@@ -401,7 +401,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
                         mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) );
 
                     // #104157# Only now we're really in edit mode
-                    mbShapeIsEditMode = TRUE;
+                    mbShapeIsEditMode = sal_True;
 
                     Broadcast( *pSdrHint );
                 }
@@ -413,7 +413,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     Broadcast( *pSdrHint );
 
                     // #104157# We're no longer in edit mode
-                    mbShapeIsEditMode = FALSE;
+                    mbShapeIsEditMode = sal_False;
 
                     // remove as listener - outliner might outlive ourselves
                     if( mpView && mpView->GetTextEditOutliner() )
@@ -565,7 +565,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
         if( mpOutliner == NULL )
         {
             SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
-            USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT;
+            sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT;
             if( pTextObj && pTextObj->IsTextFrame() && pTextObj->GetTextKind() == OBJ_OUTLINETEXT )
                 nOutlMode = OUTLINERMODE_OUTLINEOBJECT;
 
@@ -638,7 +638,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
             // #91254# put text to object and set EmptyPresObj to FALSE
             if( mpText && bOwnParaObj && pOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() )
             {
-                mpObject->SetEmptyPresObj( FALSE );
+                mpObject->SetEmptyPresObj( sal_False );
                 static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText );
 
                 // #i103982# Here, due to mpObject->NbcSetOutlinerParaObjectForText, we LOSE ownership of the
@@ -679,7 +679,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
             }
         }
 
-        mbDataValid = TRUE;
+        mbDataValid = sal_True;
 
         if( bOwnParaObj )
             delete pOutlinerParaObject;
@@ -912,9 +912,9 @@ void SvxTextEditSourceImpl::unlock()
     }
 }
 
-BOOL SvxTextEditSourceImpl::IsValid() const
+sal_Bool SvxTextEditSourceImpl::IsValid() const
 {
-    return mpView && mpWindow ? TRUE : FALSE;
+    return mpView && mpWindow ? sal_True : sal_False;
 }
 
 Rectangle SvxTextEditSourceImpl::GetVisArea()
@@ -1109,7 +1109,7 @@ void SvxTextEditSource::unlock()
     mpImpl->unlock();
 }
 
-BOOL SvxTextEditSource::IsValid() const
+sal_Bool SvxTextEditSource::IsValid() const
 {
     return mpImpl->IsValid();
 }
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 46a84bf52fad..0f277467bd1f 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -84,7 +84,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService
 NameOrIndex* SvxUnoTransGradientTable::createItem() const throw()
 {
     XFillFloatTransparenceItem* pNewItem = new XFillFloatTransparenceItem();
-    pNewItem->SetEnabled( TRUE );
+    pNewItem->SetEnabled( sal_True );
     return pNewItem;
 }
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index a1a7565f314d..7889fcc0f5ff 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -329,8 +329,8 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
         Graphic aGraphic;
 
         mpOStm->Seek( 0 );
-        USHORT nFormat = GRFILTER_FORMAT_DONTKNOW;
-        USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
+        sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
+        sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
         GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat );
 
         if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
@@ -338,17 +338,17 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
             //Read the first two byte to check whether it is a gzipped stream, is so it may be in wmz or emz format
             //unzip them and try again
 
-            BYTE    sFirstBytes[ 2 ];
+            sal_uInt8    sFirstBytes[ 2 ];
 
             mpOStm->Seek( STREAM_SEEK_TO_END );
-            ULONG nStreamLen = mpOStm->Tell();
+            sal_uIntPtr nStreamLen = mpOStm->Tell();
             mpOStm->Seek( 0 );
 
             if ( !nStreamLen )
             {
                 SvLockBytes* pLockBytes = mpOStm->GetLockBytes();
                 if ( pLockBytes  )
-                    pLockBytes->SetSynchronMode( TRUE );
+                    pLockBytes->SetSynchronMode( sal_True );
 
                 mpOStm->Seek( STREAM_SEEK_TO_END );
                 nStreamLen = mpOStm->Tell();
@@ -370,7 +370,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
                     if (aZCodec.EndCompression() && pDest )
                     {
                         pDest->Seek( STREAM_SEEK_TO_END );
-                        ULONG nStreamLen_ = pDest->Tell();
+                        sal_uIntPtr nStreamLen_ = pDest->Tell();
                         if (nStreamLen_)
                         {
                             pDest->Seek(0L);
@@ -500,7 +500,7 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co
 
 SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName,
                                                               const ::rtl::OUString& rPictureStreamName,
-                                                              BOOL bTruncate )
+                                                              sal_Bool bTruncate )
 {
     SvxGraphicHelperStream_Impl aRet;
     aRet.xStorage = ImplGetGraphicStorage( rPictureStorageName );
@@ -566,7 +566,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor
                                              const ::rtl::OUString& rPictureStreamName )
 {
     Graphic             aGraphic;
-    SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, FALSE ) );
+    SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) );
     if( aStream.xStream.is() )
     {
         SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream );
@@ -589,7 +589,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
 
     if( aGrfObject.GetType() != GRAPHIC_NONE )
     {
-        SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, FALSE ) );
+        SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) );
         if( aStream.xStream.is() )
         {
             Graphic         aGraphic( (Graphic&) aGrfObject.GetGraphic() );
@@ -638,7 +638,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
                     if ( pComment )
                     {
                         sal_uInt32  nSize = pComment->GetDataSize();
-                        const BYTE* pData = pComment->GetData();
+                        const sal_uInt8* pData = pComment->GetData();
                         if ( nSize && pData )
                             pStream->Write( pData, nSize );
 
@@ -801,7 +801,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
 
 void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLStorage,
                                SvXMLGraphicHelperMode eCreateMode,
-                               BOOL bDirect )
+                               sal_Bool bDirect )
 {
     mxRootStorage = rXMLStorage;
     meCreateMode = eCreateMode;
@@ -812,7 +812,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto
 
 SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage,
                                                 SvXMLGraphicHelperMode eCreateMode,
-                                                BOOL bDirect )
+                                                sal_Bool bDirect )
 {
     SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper;
 
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index b04b083f486b..4441e22dbcc0 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -200,14 +200,14 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref
             if( !xServiceFactory.is() )
             {
                 DBG_ERROR( "got no service manager" );
-                return FALSE;
+                return sal_False;
             }
 
             uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) );
             if( !xWriter.is() )
             {
                 DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" );
-                return FALSE;
+                return sal_False;
             }
 
             uno::Reference<xml::sax::XDocumentHandler>  xHandler( xWriter, uno::UNO_QUERY );
@@ -231,7 +231,7 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref
             }
             else
             {
-                pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
+                pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, sal_True );
                 pMedium->IsRemote();
 
                 SvStream* pStream = pMedium->GetOutStream();
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index c2071d4bd252..b9cd5443f259 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -92,21 +92,21 @@ enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, st
 class SvxXMLTableImportContext : public SvXMLImportContext
 {
 public:
-    SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable,
+    SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable,
         sal_Bool bOOoFormat );
     virtual ~SvxXMLTableImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
 
     SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); }
 
 protected:
-    void importColor( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importMarker( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
 
 private:
     uno::Reference< XNameContainer > mxTable;
@@ -116,7 +116,7 @@ private:
 
 ///////////////////////////////////////////////////////////////////////
 
-SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat )
+SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat )
 : SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ),
     mbOOoFormat( bOOoFormat )
 {
@@ -126,7 +126,7 @@ SvxXMLTableImportContext::~SvxXMLTableImportContext()
 {
 }
 
-SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList )
+SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList )
 {
     if( XML_NAMESPACE_DRAW == nPrefix )
     {
@@ -223,7 +223,7 @@ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix
     return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
 }
 
-void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -252,7 +252,7 @@ void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocal
     }
 }
 
-void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -268,7 +268,7 @@ void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLoca
     }
 }
 
-void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -284,7 +284,7 @@ void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalN
     }
 }
 
-void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -300,7 +300,7 @@ void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocal
     }
 }
 
-void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -316,7 +316,7 @@ void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLo
     }
 }
 
-void SvxXMLTableImportContext::importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -373,7 +373,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X
     {
         do
         {
-            SfxMedium aMedium( rUrl, STREAM_READ | STREAM_NOCREATE, TRUE );
+            SfxMedium aMedium( rUrl, STREAM_READ | STREAM_NOCREATE, sal_True );
 
             uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() );
             if( !xServiceFactory.is() )
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 6b3419c7b04e..e8958bf82479 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -129,7 +129,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
 // UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998)
 #ifdef UNX
                 const Size  aBmpSize( aBmp.GetSizePixel() );
-                BOOL        bFullTrans = FALSE;
+                sal_Bool        bFullTrans = sal_False;
 
                 if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() )
                 {
@@ -139,7 +139,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
                     if( pMAcc )
                     {
                         if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) )
-                            bFullTrans = TRUE;
+                            bFullTrans = sal_True;
 
                         aTrans.ReleaseAccess( pMAcc );
                     }
@@ -207,7 +207,7 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
     const long      nBottom = aPixRect.Bottom();
     const long      nRight = aPixRect.Right();
     const long      nLeft = nXPos;
-    const BOOL      bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
+    const sal_Bool      bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
 
     pOutDev->Push();
     pOutDev->SetMapMode( MapMode() );
@@ -239,14 +239,14 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
 
 // ------------------------------------------------------------------------
 
-Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr )
+Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
 {
     Animation aNewAnim( rAnimation );
 
     if( bHMirr || bVMirr )
     {
         const Size& rGlobalSize = aNewAnim.GetDisplaySizePixel();
-        ULONG       nMirrorFlags = 0L;
+        sal_uIntPtr     nMirrorFlags = 0L;
 
         if( bHMirr )
             nMirrorFlags |= BMP_MIRROR_HORZ;
@@ -254,7 +254,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
         if( bVMirr )
             nMirrorFlags |= BMP_MIRROR_VERT;
 
-        for( USHORT i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
+        for( sal_uInt16 i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
         {
             AnimationBitmap aAnimBmp( aNewAnim.Get( i ) );
 
@@ -280,7 +280,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
 
 // ------------------------------------------------------------------------
 
-Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags )
+Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags )
 {
     Graphic aRetGraphic;
 
@@ -318,8 +318,8 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorF
 
 // ------------------------------------------------------------------------
 
-USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
-                                 const String& rFilterName, const ULONG nFlags,
+sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
+                                 const String& rFilterName, const sal_uIntPtr nFlags,
                                  const Size* pMtfSize_100TH_MM )
 {
     if( rGraphic.GetType() != GRAPHIC_NONE )
@@ -328,8 +328,8 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
         Graphic         aGraphic;
         String          aExt;
         GraphicFilter*  pFilter = GraphicFilter::GetGraphicFilter();
-        USHORT          nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
-        BOOL            bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
+        sal_uInt16          nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
+        sal_Bool            bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
 
         DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" );
 
@@ -370,7 +370,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
                 aURL.setExtension( aExt );
                 rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
 
-                SfxMedium   aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+                SfxMedium   aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
                 SvStream*   pOStm = aMedium.GetOutStream();
 
                 if( pOStm && aGfxLink.GetDataSize() && aGfxLink.GetData() )
@@ -387,7 +387,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
         if( GRFILTER_OK != nErr )
         {
             String  aFilter( rFilterName );
-            BOOL    bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) ||
+            sal_Bool    bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) ||
                                      ( aFilter.EqualsIgnoreCaseAscii( "gif" ) ) ||
                                      ( nFlags & XOUTBMP_USE_GIF_IF_POSSIBLE ) ||
                                      ( ( nFlags & XOUTBMP_USE_GIF_IF_SENSIBLE ) && ( bAnimated || bTransparent ) );
@@ -493,15 +493,15 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
 #pragma optimize ( "", off )
 #endif
 
-USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
-                                  GraphicFilter& rFilter, const USHORT nFormat,
+sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
+                                  GraphicFilter& rFilter, const sal_uInt16 nFormat,
                                   const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
 {
     DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
 
-    SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+    SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
     SvStream*   pOStm = aMedium.GetOutStream();
-    USHORT      nRet = GRFILTER_IOERROR;
+    sal_uInt16      nRet = GRFILTER_IOERROR;
 
     if( pOStm )
     {
@@ -525,11 +525,11 @@ USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject&
 
 // ------------------------------------------------------------------------
 
-Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
+Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
 {
     const Size  aSize( rBmp.GetSizePixel() );
     Bitmap      aRetBmp;
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
     if( ( aSize.Width() > 2L ) && ( aSize.Height() > 2L ) )
     {
@@ -548,8 +548,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
                 const long          nHeight = aSize.Height();
                 const long          nHeight2 = nHeight - 2L;
                 const long          lThres2 = (long) cThreshold * cThreshold;
-                const BitmapColor   aWhite = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
-                const BitmapColor   aBlack = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
+                const BitmapColor   aWhite = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
+                const BitmapColor   aBlack = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
                 long                nSum1;
                 long                nSum2;
                 long                lGray;
@@ -567,18 +567,18 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
                     {
                         nXTmp = nX;
 
-                        nSum1 = -( nSum2 = lGray = (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) );
-                        nSum2 += ( (long) (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
+                        nSum1 = -( nSum2 = lGray = (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) );
+                        nSum2 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
                         nSum1 += ( lGray = pReadAcc->GetPixel( nY, nXTmp ) );
                         nSum2 += lGray;
 
-                        nSum1 += ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
-                        nSum1 -= ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
+                        nSum1 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
+                        nSum1 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
 
-                        nSum1 += ( lGray = -(long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) );
+                        nSum1 += ( lGray = -(long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) );
                         nSum2 += lGray;
-                        nSum2 -= ( (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
-                        nSum1 += ( lGray = (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp ) );
+                        nSum2 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
+                        nSum1 += ( lGray = (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp ) );
                         nSum2 -= lGray;
 
                         if( ( nSum1 * nSum1 + nSum2 * nSum2 ) < lThres2 )
@@ -588,7 +588,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
                     }
                 }
 
-                bRet = TRUE;
+                bRet = sal_True;
             }
 
             aWorkBmp.ReleaseAccess( pReadAcc );
@@ -612,8 +612,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
 
 // ------------------------------------------------------------------------
 
-Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
-                                 const BYTE cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
+Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
+                                 const sal_uInt8 cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
 {
     Bitmap      aWorkBmp;
     Polygon     aRetPoly;
@@ -653,7 +653,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
             Point*              pPoints1 = NULL;
             Point*              pPoints2 = NULL;
             long                nX, nY;
-            USHORT              nPolyPos = 0;
+            sal_uInt16              nPolyPos = 0;
             const BitmapColor   aBlack = pAcc->GetBestMatchingColor( Color( COL_BLACK ) );
 
             if( nFlags & XOUTBMP_CONTOUR_VERT )
@@ -674,7 +674,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
                             nY = nStartY2;
 
                             // diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
-                            while( TRUE )
+                            while( sal_True )
                             {
                                 if( aBlack == pAcc->GetPixel( nY, nX ) )
                                 {
@@ -711,7 +711,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
                             nX = nStartX2;
 
                             // diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
-                            while( TRUE )
+                            while( sal_True )
                             {
                                 if( aBlack == pAcc->GetPixel( nY, nX ) )
                                 {
@@ -731,13 +731,13 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
                 }
             }
 
-            const USHORT nNewSize1 = nPolyPos << 1;
+            const sal_uInt16 nNewSize1 = nPolyPos << 1;
 
             aRetPoly = Polygon( nPolyPos, pPoints1 );
             aRetPoly.SetSize( nNewSize1 + 1 );
             aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ];
 
-            for( USHORT j = nPolyPos; nPolyPos < nNewSize1; )
+            for( sal_uInt16 j = nPolyPos; nPolyPos < nNewSize1; )
                 aRetPoly[ nPolyPos++ ] = pPoints2[ --j ];
 
             if( ( fFactorX != 0. ) && ( fFactorY != 0. ) )
@@ -755,14 +755,14 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
 // - DitherBitmap -
 // ----------------
 
-BOOL DitherBitmap( Bitmap& rBitmap )
+sal_Bool DitherBitmap( Bitmap& rBitmap )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( ( rBitmap.GetBitCount() >= 8 ) && ( Application::GetDefaultDevice()->GetColorCount() < 257 ) )
         bRet = rBitmap.Dither( BMP_DITHER_FLOYD );
     else
-        bRet = FALSE;
+        bRet = sal_False;
 
     return bRet;
 }
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 0e6252ddcb92..3dd39fc10347 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -57,11 +57,11 @@ DBG_NAME(XPolyPolygon);
 |*
 *************************************************************************/
 
-ImpXPolygon::ImpXPolygon( USHORT nInitSize, USHORT _nResize )
+ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize )
 {
     pPointAry               = NULL;
     pFlagAry                = NULL;
-    bDeleteOldPoints        = FALSE;
+    bDeleteOldPoints        = sal_False;
     nSize                   = 0;
     nResize                 = _nResize;
     nPoints                 = 0;
@@ -86,7 +86,7 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly )
 
     pPointAry               = NULL;
     pFlagAry                = NULL;
-    bDeleteOldPoints        = FALSE;
+    bDeleteOldPoints        = sal_False;
     nSize                   = 0;
     ImpXPolygon::nResize    = rImpXPoly.nResize;
     nPoints                 = 0;
@@ -140,7 +140,7 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
 |*
 |*    ImpXPolygon::Resize()
 |*
-|*    !!! Polygongroesse aendern - wenn bDeletePoints FALSE, dann den
+|*    !!! Polygongroesse aendern - wenn bDeletePoints sal_False, dann den
 |*    Point-Array nicht loeschen, sondern in pOldPointAry sichern und
 |*    das Flag bDeleteOldPoints setzen. Beim naechsten Zugriff wird
 |*    das Array dann geloescht.
@@ -152,13 +152,13 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
 |*
 *************************************************************************/
 
-void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
+void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints )
 {
     if( nNewSize == nSize )
         return;
 
-    BYTE*   pOldFlagAry  = pFlagAry;
-    USHORT  nOldSize     = nSize;
+    sal_uInt8*   pOldFlagAry  = pFlagAry;
+    sal_uInt16  nOldSize     = nSize;
 
     CheckPointDelete();
     pOldPointAry = pPointAry;
@@ -176,7 +176,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
     memset( pPointAry, 0, nSize*sizeof( Point ) );
 
     // Flag Array erzeugen
-    pFlagAry = new BYTE[ nSize ];
+    pFlagAry = new sal_uInt8[ nSize ];
     memset( pFlagAry, 0, nSize );
 
     // Eventuell umkopieren
@@ -197,7 +197,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
                 nPoints = nSize;
         }
         if ( bDeletePoints )    delete[] (char*) pOldPointAry;
-        else                    bDeleteOldPoints = TRUE;
+        else                    bDeleteOldPoints = sal_True;
         delete[] pOldFlagAry;
     }
 }
@@ -213,7 +213,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
 |*
 *************************************************************************/
 
-void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
+void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount )
 {
     CheckPointDelete();
 
@@ -228,7 +228,7 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
     // den Rest nach hinten schieben
     if( nPos < nPoints )
     {
-        USHORT nMove = nPoints - nPos;
+        sal_uInt16 nMove = nPoints - nPos;
         memmove( &pPointAry[nPos+nCount], &pPointAry[nPos],
                  nMove * sizeof(Point) );
         memmove( &pFlagAry[nPos+nCount], &pFlagAry[nPos], nMove );
@@ -250,13 +250,13 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
 |*
 *************************************************************************/
 
-void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
+void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
 {
     CheckPointDelete();
 
     if( (nPos + nCount) <= nPoints )
     {
-        USHORT nMove = nPoints - nPos - nCount;
+        sal_uInt16 nMove = nPoints - nPos - nCount;
 
         if( nMove )
         {
@@ -281,7 +281,7 @@ void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
 |*
 *************************************************************************/
 
-XPolygon::XPolygon( USHORT nSize, USHORT nResize )
+XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize )
 {
     DBG_CTOR(XPolygon,NULL);
     pImpXPolygon = new ImpXPolygon( nSize, nResize );
@@ -318,14 +318,14 @@ XPolygon::XPolygon( const Polygon& rPoly )
 {
     DBG_CTOR(XPolygon,NULL);
 
-    USHORT nSize = rPoly.GetSize();
+    sal_uInt16 nSize = rPoly.GetSize();
     pImpXPolygon = new ImpXPolygon( nSize );
     pImpXPolygon->nPoints = nSize;
 
-    for( USHORT i = 0; i < nSize;  i++ )
+    for( sal_uInt16 i = 0; i < nSize;  i++ )
     {
         pImpXPolygon->pPointAry[i] = rPoly[i];
-        pImpXPolygon->pFlagAry[i] = (BYTE) rPoly.GetFlags( i );
+        pImpXPolygon->pFlagAry[i] = (sal_uInt8) rPoly.GetFlags( i );
     }
 }
 
@@ -355,13 +355,13 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
     // Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
     long    nXHdl = (long)(0.552284749 * nRx);
     long    nYHdl = (long)(0.552284749 * nRy);
-    USHORT  nPos = 0;
+    sal_uInt16  nPos = 0;
 
     if ( nRx && nRy )
     {
         Point aCenter;
 
-        for (USHORT nQuad = 0; nQuad < 4; nQuad++)
+        for (sal_uInt16 nQuad = 0; nQuad < 4; nQuad++)
         {
             switch ( nQuad )
             {
@@ -383,8 +383,8 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
                         break;
             }
             GenBezArc(aCenter, nRx, nRy, nXHdl, nYHdl, 0, 900, nQuad, nPos);
-            pImpXPolygon->pFlagAry[nPos  ] = (BYTE) XPOLY_SMOOTH;
-            pImpXPolygon->pFlagAry[nPos+3] = (BYTE) XPOLY_SMOOTH;
+            pImpXPolygon->pFlagAry[nPos  ] = (sal_uInt8) XPOLY_SMOOTH;
+            pImpXPolygon->pFlagAry[nPos+3] = (sal_uInt8) XPOLY_SMOOTH;
             nPos += 4;
         }
     }
@@ -410,31 +410,31 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
 *************************************************************************/
 
 XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
-                   USHORT nStartAngle, USHORT nEndAngle, BOOL bClose)
+                   sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose)
 {
     DBG_CTOR(XPolygon,NULL);
     pImpXPolygon = new ImpXPolygon(17);
 
     nStartAngle %= 3600;
     if ( nEndAngle > 3600 ) nEndAngle %= 3600;
-    BOOL bFull = (nStartAngle == 0 && nEndAngle == 3600);
+    sal_Bool bFull = (nStartAngle == 0 && nEndAngle == 3600);
 
     // Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
     long    nXHdl = (long)(0.552284749 * nRx);
     long    nYHdl = (long)(0.552284749 * nRy);
-    USHORT  nPos = 0;
-    BOOL    bLoopEnd = FALSE;
+    sal_uInt16  nPos = 0;
+    sal_Bool    bLoopEnd = sal_False;
 
     do
     {
-        USHORT nA1, nA2;
-        USHORT nQuad = nStartAngle / 900;
+        sal_uInt16 nA1, nA2;
+        sal_uInt16 nQuad = nStartAngle / 900;
         if ( nQuad == 4 ) nQuad = 0;
         bLoopEnd = CheckAngles(nStartAngle, nEndAngle, nA1, nA2);
         GenBezArc(rCenter, nRx, nRy, nXHdl, nYHdl, nA1, nA2, nQuad, nPos);
         nPos += 3;
         if ( !bLoopEnd )
-            pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+            pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
 
     } while ( !bLoopEnd );
 
@@ -444,8 +444,8 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
 
     if ( bFull )
     {
-        pImpXPolygon->pFlagAry[0   ] = (BYTE) XPOLY_SMOOTH;
-        pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+        pImpXPolygon->pFlagAry[0   ] = (sal_uInt8) XPOLY_SMOOTH;
+        pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
     }
     pImpXPolygon->nPoints = nPos + 1;
 }
@@ -498,7 +498,7 @@ void XPolygon::CheckReference()
 |*
 *************************************************************************/
 
-void XPolygon::SetSize( USHORT nNewSize )
+void XPolygon::SetSize( sal_uInt16 nNewSize )
 {
     CheckReference();
     pImpXPolygon->Resize( nNewSize );
@@ -514,7 +514,7 @@ void XPolygon::SetSize( USHORT nNewSize )
 |*
 *************************************************************************/
 
-USHORT XPolygon::GetSize() const
+sal_uInt16 XPolygon::GetSize() const
 {
     pImpXPolygon->CheckPointDelete();
     return pImpXPolygon->nSize;
@@ -530,7 +530,7 @@ USHORT XPolygon::GetSize() const
 |*
 *************************************************************************/
 
-void XPolygon::SetPointCount( USHORT nPoints )
+void XPolygon::SetPointCount( sal_uInt16 nPoints )
 {
     pImpXPolygon->CheckPointDelete();
     CheckReference();
@@ -540,7 +540,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
 
     if ( nPoints < pImpXPolygon->nPoints )
     {
-        USHORT nSize = pImpXPolygon->nPoints - nPoints;
+        sal_uInt16 nSize = pImpXPolygon->nPoints - nPoints;
         memset( &pImpXPolygon->pPointAry[nPoints], 0, nSize * sizeof( Point ) );
         memset( &pImpXPolygon->pFlagAry [nPoints], 0, nSize );
     }
@@ -557,7 +557,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
 |*
 *************************************************************************/
 
-USHORT XPolygon::GetPointCount() const
+sal_uInt16 XPolygon::GetPointCount() const
 {
     pImpXPolygon->CheckPointDelete();
     return pImpXPolygon->nPoints;
@@ -573,13 +573,13 @@ USHORT XPolygon::GetPointCount() const
 |*
 *************************************************************************/
 
-void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
+void XPolygon::Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags )
 {
     CheckReference();
     if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
     pImpXPolygon->InsertSpace( nPos, 1 );
     pImpXPolygon->pPointAry[nPos] = rPt;
-    pImpXPolygon->pFlagAry[nPos]  = (BYTE)eFlags;
+    pImpXPolygon->pFlagAry[nPos]  = (sal_uInt8)eFlags;
 }
 
 /*************************************************************************
@@ -592,12 +592,12 @@ void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
 |*
 *************************************************************************/
 
-void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const XPolygon& rXPoly )
 {
     CheckReference();
     if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
 
-    USHORT nPoints = rXPoly.GetPointCount();
+    sal_uInt16 nPoints = rXPoly.GetPointCount();
 
     pImpXPolygon->InsertSpace( nPos, nPoints );
 
@@ -619,16 +619,16 @@ void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
 |*
 *************************************************************************/
 
-void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const Polygon& rPoly )
 {
     CheckReference();
     if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
 
-    USHORT nPoints = rPoly.GetSize();
+    sal_uInt16 nPoints = rPoly.GetSize();
 
     pImpXPolygon->InsertSpace( nPos, nPoints );
 
-    USHORT i;
+    sal_uInt16 i;
     for( i=0; i < nPoints; i++ )
         pImpXPolygon->pPointAry[i] = rPoly[i];
 
@@ -645,7 +645,7 @@ void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
 |*
 *************************************************************************/
 
-void XPolygon::Remove( USHORT nPos, USHORT nCount )
+void XPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
 {
     CheckReference();
     pImpXPolygon->Remove( nPos, nCount );
@@ -669,8 +669,8 @@ void XPolygon::Move( long nHorzMove, long nVertMove )
     CheckReference();
 
     // Punkte verschieben
-    USHORT nCount = pImpXPolygon->nPoints;
-    for ( USHORT i = 0; i < nCount; i++ )
+    sal_uInt16 nCount = pImpXPolygon->nPoints;
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         Point* pPt = &(pImpXPolygon->pPointAry[i]);
         pPt->X() += nHorzMove;
@@ -720,7 +720,7 @@ Rectangle XPolygon::GetBoundRect() const
 |*
 *************************************************************************/
 
-const Point& XPolygon::operator[]( USHORT nPos ) const
+const Point& XPolygon::operator[]( sal_uInt16 nPos ) const
 {
     DBG_ASSERT(nPos < pImpXPolygon->nPoints, "Ungueltiger Index bei const-Arrayzugriff auf XPolygon");
 
@@ -738,7 +738,7 @@ const Point& XPolygon::operator[]( USHORT nPos ) const
 |*
 *************************************************************************/
 
-Point& XPolygon::operator[]( USHORT nPos )
+Point& XPolygon::operator[]( sal_uInt16 nPos )
 {
     pImpXPolygon->CheckPointDelete();
     CheckReference();
@@ -746,7 +746,7 @@ Point& XPolygon::operator[]( USHORT nPos )
     if( nPos >= pImpXPolygon->nSize )
     {
         DBG_ASSERT(pImpXPolygon->nResize, "Ungueltiger Index bei Arrayzugriff auf XPolygon");
-        pImpXPolygon->Resize(nPos + 1, FALSE);
+        pImpXPolygon->Resize(nPos + 1, sal_False);
     }
     if( nPos >= pImpXPolygon->nPoints )
         pImpXPolygon->nPoints = nPos + 1;
@@ -789,10 +789,10 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly )
 |*
 *************************************************************************/
 
-BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const
 {
     pImpXPolygon->CheckPointDelete();
-    if (rXPoly.pImpXPolygon==pImpXPolygon) return TRUE;
+    if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_True;
     return *rXPoly.pImpXPolygon == *pImpXPolygon;
 }
 
@@ -806,10 +806,10 @@ BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
 |*
 *************************************************************************/
 
-BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const
 {
     pImpXPolygon->CheckPointDelete();
-    if (rXPoly.pImpXPolygon==pImpXPolygon) return FALSE;
+    if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_False;
     return *rXPoly.pImpXPolygon != *pImpXPolygon;
 }
 
@@ -823,7 +823,7 @@ BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
 |*
 *************************************************************************/
 
-XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
+XPolyFlags XPolygon::GetFlags( sal_uInt16 nPos ) const
 {
     pImpXPolygon->CheckPointDelete();
     return (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
@@ -839,11 +839,11 @@ XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
 |*
 *************************************************************************/
 
-void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
+void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags )
 {
     pImpXPolygon->CheckPointDelete();
     CheckReference();
-    pImpXPolygon->pFlagAry[nPos] = (BYTE) eFlags;
+    pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) eFlags;
 }
 
 /*************************************************************************
@@ -856,7 +856,7 @@ void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
 |*
 *************************************************************************/
 
-BOOL XPolygon::IsControl(USHORT nPos) const
+sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const
 {
     return ( (XPolyFlags) pImpXPolygon->pFlagAry[nPos] == XPOLY_CONTROL );
 }
@@ -871,7 +871,7 @@ BOOL XPolygon::IsControl(USHORT nPos) const
 |*
 *************************************************************************/
 
-BOOL XPolygon::IsSmooth(USHORT nPos) const
+sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const
 {
     XPolyFlags eFlag = (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
     return ( eFlag == XPOLY_SMOOTH || eFlag == XPOLY_SYMMTR );
@@ -887,7 +887,7 @@ BOOL XPolygon::IsSmooth(USHORT nPos) const
 |*
 *************************************************************************/
 
-double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
+double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2)
 {
     const Point& rP1 = pImpXPolygon->pPointAry[nP1];
     const Point& rP2 = pImpXPolygon->pPointAry[nP2];
@@ -906,7 +906,7 @@ double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
 |*
 *************************************************************************/
 
-void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
+void XPolygon::SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT)
 {
     Point*  pPoints = pImpXPolygon->pPointAry;
     double  fT2 = fT * fT;
@@ -914,7 +914,7 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
     double  fU = 1.0 - fT;
     double  fU2 = fU * fU;
     double  fU3 = fU * fU2;
-    USHORT  nIdx = nPos;
+    sal_uInt16  nIdx = nPos;
     short   nPosInc, nIdxInc;
 
     if ( bCalcFirst )
@@ -955,8 +955,8 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
 /************************************************************************/
 
 void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
-                         long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd,
-                         USHORT nQuad, USHORT nFirst)
+                         long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
+                         sal_uInt16 nQuad, sal_uInt16 nFirst)
 {
     Point* pPoints = pImpXPolygon->pPointAry;
     pPoints[nFirst  ] = rCenter;
@@ -991,29 +991,29 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
         pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl;
     }
     if ( nStart > 0 )
-        SubdivideBezier(nFirst, FALSE, (double)nStart / 900);
+        SubdivideBezier(nFirst, sal_False, (double)nStart / 900);
     if ( nEnd < 900 )
-        SubdivideBezier(nFirst, TRUE, (double)(nEnd-nStart) / (900-nStart));
+        SubdivideBezier(nFirst, sal_True, (double)(nEnd-nStart) / (900-nStart));
     SetFlags(nFirst+1, XPOLY_CONTROL);
     SetFlags(nFirst+2, XPOLY_CONTROL);
 }
 
 /************************************************************************/
 
-BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2)
+sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
 {
     if ( nStart == 3600 ) nStart = 0;
     if ( nEnd == 0 ) nEnd = 3600;
-    USHORT nStPrev = nStart;
-    USHORT nMax = (nStart / 900 + 1) * 900;
-    USHORT nMin = nMax - 900;
+    sal_uInt16 nStPrev = nStart;
+    sal_uInt16 nMax = (nStart / 900 + 1) * 900;
+    sal_uInt16 nMin = nMax - 900;
 
     if ( nEnd >= nMax || nEnd <= nStart )   nA2 = 900;
     else                                    nA2 = nEnd - nMin;
     nA1 = nStart - nMin;
     nStart = nMax;
 
-    // TRUE zurueck, falls letztes Segment berechnet wurde
+    // sal_True zurueck, falls letztes Segment berechnet wurde
     return (nStPrev < nEnd && nStart >= nEnd);
 }
 
@@ -1034,11 +1034,11 @@ BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2
 |*
 \************************************************************************/
 
-void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
+void XPolygon::CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt)
 {
     CheckReference();
 
-//  USHORT  nMaxPnt = pImpXPolygon->nPoints - 1;
+//  sal_uInt16  nMaxPnt = pImpXPolygon->nPoints - 1;
 
 //  if ( nCenter == nMaxPnt )   nPnt = 1;
 //  else if ( nCenter == 0 )    nPnt = nMaxPnt - 1;
@@ -1047,7 +1047,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
     // statt dessen nDrag auf der Achse nCenter-nPnt verschieben
     if ( !IsControl(nPnt) )
     {
-        USHORT nTmp = nDrag;
+        sal_uInt16 nTmp = nDrag;
         nDrag = nPnt;
         nPnt = nTmp;
     }
@@ -1081,7 +1081,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
 |*
 \************************************************************************/
 
-void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
+void XPolygon::CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext)
 {
     CheckReference();
 
@@ -1119,7 +1119,7 @@ void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
 |*
 \************************************************************************/
 
-void XPolygon::PointsToBezier(USHORT nFirst)
+void XPolygon::PointsToBezier(sal_uInt16 nFirst)
 {
     double  nFullLength, nPart1Length, nPart2Length;
     double  fX0, fY0, fX1, fY1, fX2, fY2, fX3, fY3;
@@ -1202,9 +1202,9 @@ void XPolygon::Translate(const Point& rTrans)
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
         pImpXPolygon->pPointAry[i] += rTrans;
 }
 
@@ -1231,9 +1231,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
     long nCenterX = rCenter.X();
     long nCenterY = rCenter.Y();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point *pPt = &(pImpXPolygon->pPointAry[i]);
         nX = pPt->X()-nCenterX;
@@ -1245,9 +1245,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
 
     /* und so stand das in einem anderen File auf T:
        dass ich am 29-11-1995 gegettet habe. Joe M.
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point P = pImpXPolygon->pPointAry[i] - rCenter;
         long X = P.X();
@@ -1270,7 +1270,7 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
 |*
 *************************************************************************/
 
-void XPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
 {
     nAngle %= 3600;
 
@@ -1298,9 +1298,9 @@ void XPolygon::Scale(double fSx, double fSy)
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point& rPnt = pImpXPolygon->pPointAry[i];
         rPnt.X() = (long)(fSx * rPnt.X());
@@ -1324,9 +1324,9 @@ void XPolygon::SlantX(long nYRef, double fSin, double fCos)
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point& rPnt = pImpXPolygon->pPointAry[i];
         long nDy = rPnt.Y() - nYRef;
@@ -1351,9 +1351,9 @@ void XPolygon::SlantY(long nXRef, double fSin, double fCos)
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point& rPnt = pImpXPolygon->pPointAry[i];
         long nDx = rPnt.X() - nXRef;
@@ -1407,9 +1407,9 @@ void XPolygon::Distort(const Rectangle& rRefRect,
         X4 = rDistortedRect[2].X();
         Y4 = rDistortedRect[2].Y();
 
-        USHORT nPntCnt = pImpXPolygon->nPoints;
+        sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-        for (USHORT i = 0; i < nPntCnt; i++)
+        for (sal_uInt16 i = 0; i < nPntCnt; i++)
         {
             Point& rPnt = pImpXPolygon->pPointAry[i];
 
@@ -1487,14 +1487,14 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon)
     DBG_CTOR(XPolygon,NULL);
 
     const Polygon aSource(rPolygon);
-    USHORT nSize = aSource.GetSize();
+    sal_uInt16 nSize = aSource.GetSize();
     pImpXPolygon = new ImpXPolygon( nSize );
     pImpXPolygon->nPoints = nSize;
 
-    for( USHORT i = 0; i < nSize;  i++ )
+    for( sal_uInt16 i = 0; i < nSize;  i++ )
     {
         pImpXPolygon->pPointAry[i] = aSource[i];
-        pImpXPolygon->pFlagAry[i] = (BYTE) aSource.GetFlags( i );
+        pImpXPolygon->pFlagAry[i] = (sal_uInt8) aSource.GetFlags( i );
     }
 }
 
@@ -1559,11 +1559,11 @@ ImpXPolyPolygon::~ImpXPolyPolygon()
 
 bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
 {
-    USHORT nAnz=(USHORT)aXPolyList.Count();
+    sal_uInt16 nAnz=(sal_uInt16)aXPolyList.Count();
     const XPolygonList& rCmpList=rImpXPolyPoly.aXPolyList;
-    if (nAnz!=(USHORT)rCmpList.Count()) return FALSE;
+    if (nAnz!=(sal_uInt16)rCmpList.Count()) return sal_False;
     bool bEq=true;
-    for (USHORT i=nAnz; i>0 && bEq;) {
+    for (sal_uInt16 i=nAnz; i>0 && bEq;) {
         i--;
         bEq= *aXPolyList.GetObject(i) == *rCmpList.GetObject(i);
     }
@@ -1580,7 +1580,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
 |*
 *************************************************************************/
 
-XPolyPolygon::XPolyPolygon( USHORT nInitSize, USHORT nResize )
+XPolyPolygon::XPolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize )
 {
     DBG_CTOR(XPolyPolygon,NULL);
     pImpXPolyPolygon = new ImpXPolyPolygon( nInitSize, nResize );
@@ -1636,7 +1636,7 @@ XPolyPolygon::XPolyPolygon( const PolyPolygon& rPolyPoly )
     DBG_CTOR(XPolyPolygon,NULL);
     pImpXPolyPolygon = new ImpXPolyPolygon;
 
-    for (USHORT i = 0; i < rPolyPoly.Count(); i++)
+    for (sal_uInt16 i = 0; i < rPolyPoly.Count(); i++)
         pImpXPolyPolygon->aXPolyList.Insert(
                                     new XPolygon(rPolyPoly.GetObject(i)) );
 }
@@ -1689,7 +1689,7 @@ void XPolyPolygon::CheckReference()
 |*
 *************************************************************************/
 
-void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos )
 {
     CheckReference();
     XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1706,11 +1706,11 @@ void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
 |*
 *************************************************************************/
 
-void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos )
 {
     CheckReference();
 
-    for (USHORT i = 0; i < rXPolyPoly.Count(); i++)
+    for (sal_uInt16 i = 0; i < rXPolyPoly.Count(); i++)
     {
         XPolygon* pXPoly = new XPolygon(rXPolyPoly[i]);
         pImpXPolyPolygon->aXPolyList.Insert(pXPoly, nPos);
@@ -1729,7 +1729,7 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
 |*
 *************************************************************************/
 
-XPolygon XPolyPolygon::Remove( USHORT nPos )
+XPolygon XPolyPolygon::Remove( sal_uInt16 nPos )
 {
     CheckReference();
     XPolygon* pTmpXPoly = pImpXPolyPolygon->aXPolyList.Remove( nPos );
@@ -1749,7 +1749,7 @@ XPolygon XPolyPolygon::Remove( USHORT nPos )
 |*
 *************************************************************************/
 
-XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
+XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, sal_uInt16 nPos )
 {
     CheckReference();
     XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1770,7 +1770,7 @@ XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
 |*
 *************************************************************************/
 
-const XPolygon& XPolyPolygon::GetObject( USHORT nPos ) const
+const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const
 {
     return *(pImpXPolyPolygon->aXPolyList.GetObject( nPos ));
 }
@@ -1816,9 +1816,9 @@ void XPolyPolygon::Clear()
 |*
 *************************************************************************/
 
-USHORT XPolyPolygon::Count() const
+sal_uInt16 XPolyPolygon::Count() const
 {
-    return (USHORT)(pImpXPolyPolygon->aXPolyList.Count());
+    return (sal_uInt16)(pImpXPolyPolygon->aXPolyList.Count());
 }
 
 
@@ -1862,10 +1862,10 @@ void XPolyPolygon::Move( long nHorzMove, long nVertMove )
 
 Rectangle XPolyPolygon::GetBoundRect() const
 {
-    USHORT    nXPoly = (USHORT)pImpXPolyPolygon->aXPolyList.Count();
+    sal_uInt16    nXPoly = (sal_uInt16)pImpXPolyPolygon->aXPolyList.Count();
     Rectangle aRect;
 
-    for ( USHORT n = 0; n < nXPoly; n++ )
+    for ( sal_uInt16 n = 0; n < nXPoly; n++ )
     {
         const XPolygon* pXPoly = pImpXPolyPolygon->aXPolyList.GetObject( n );
         aRect.Union( pXPoly->GetBoundRect() );
@@ -1885,7 +1885,7 @@ Rectangle XPolyPolygon::GetBoundRect() const
 |*
 *************************************************************************/
 
-XPolygon& XPolyPolygon::operator[]( USHORT nPos )
+XPolygon& XPolyPolygon::operator[]( sal_uInt16 nPos )
 {
     CheckReference();
     return *(pImpXPolyPolygon->aXPolyList.GetObject( nPos ));
@@ -1925,9 +1925,9 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly )
 |*
 *************************************************************************/
 
-BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
 {
-    if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return TRUE;
+    if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_True;
     return *pImpXPolyPolygon == *rXPolyPoly.pImpXPolyPolygon;
 }
 
@@ -1942,9 +1942,9 @@ BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
 |*
 *************************************************************************/
 
-BOOL XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
 {
-    if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return FALSE;
+    if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_False;
     return *pImpXPolyPolygon != *rXPolyPoly.pImpXPolyPolygon;
 }
 
@@ -1962,7 +1962,7 @@ void XPolyPolygon::Translate(const Point& rTrans)
 {
     CheckReference();
 
-    for (USHORT i = 0; i < Count(); i++)
+    for (sal_uInt16 i = 0; i < Count(); i++)
         pImpXPolyPolygon->aXPolyList.GetObject(i)->Translate(rTrans);
 }
 
@@ -1981,7 +1981,7 @@ void XPolyPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
 {
     CheckReference();
 
-    for (USHORT i = 0; i < Count(); i++)
+    for (sal_uInt16 i = 0; i < Count(); i++)
         pImpXPolyPolygon->aXPolyList.GetObject(i)->Rotate(rCenter, fSin, fCos);
 }
 
@@ -1996,7 +1996,7 @@ void XPolyPolygon::Rotate20()
 {
     CheckReference();
 
-    for (USHORT i = 0; i < Count(); i++)
+    for (sal_uInt16 i = 0; i < Count(); i++)
         pImpXPolyPolygon->aXPolyList.GetObject(i)->Rotate20();
 }
 
@@ -2011,7 +2011,7 @@ void XPolyPolygon::Rotate20()
 |*
 *************************************************************************/
 
-void XPolyPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolyPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
 {
     nAngle %= 3600;
 
@@ -2038,7 +2038,7 @@ void XPolyPolygon::Scale(double fSx, double fSy)
 {
     CheckReference();
 
-    for (USHORT i = 0; i < Count(); i++)
+    for (sal_uInt16 i = 0; i < Count(); i++)
         pImpXPolyPolygon->aXPolyList.GetObject(i)->Scale(fSx, fSy);
 }
 
@@ -2057,7 +2057,7 @@ void XPolyPolygon::SlantX(long nYRef, double fSin, double fCos)
 {
     CheckReference();
 
-    for (USHORT i = 0; i < Count(); i++)
+    for (sal_uInt16 i = 0; i < Count(); i++)
         pImpXPolyPolygon->aXPolyList.GetObject(i)->SlantX(nYRef, fSin, fCos);
 }
 
@@ -2076,7 +2076,7 @@ void XPolyPolygon::SlantY(long nXRef, double fSin, double fCos)
 {
     CheckReference();
 
-    for (USHORT i = 0; i < Count(); i++)
+    for (sal_uInt16 i = 0; i < Count(); i++)
         pImpXPolyPolygon->aXPolyList.GetObject(i)->SlantY(nXRef, fSin, fCos);
 }
 
@@ -2101,7 +2101,7 @@ void XPolyPolygon::Distort(const Rectangle& rRefRect,
 {
     CheckReference();
 
-    for (USHORT i = 0; i < Count(); i++)
+    for (sal_uInt16 i = 0; i < Count(); i++)
         pImpXPolyPolygon->aXPolyList.GetObject(i)->Distort(rRefRect,
                                                            rDistortedRect);
 }
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index f7ce452ea6e8..fedc43d228f5 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star;
 
 /************************************************************************/
 
-#define VCLTOSVCOL( rCol ) (USHORT)((((USHORT)(rCol))<<8)|(rCol))
+#define VCLTOSVCOL( rCol ) (sal_uInt16)((((sal_uInt16)(rCol))<<8)|(rCol))
 
 /************************************************************************/
 
@@ -107,7 +107,7 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv )
 
 /*************************************************************************
 |*
-|*    NameOrIndex::NameOrIndex(USHORT nWhich, INT32 nIndex)
+|*    NameOrIndex::NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex)
 |*
 |*    Beschreibung
 |*    Ersterstellung    14.11.94
@@ -115,7 +115,7 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv )
 |*
 *************************************************************************/
 
-NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) :
     SfxStringItem(_nWhich, aNameOrIndexEmptyString),
     nPalIndex(nIndex)
 {
@@ -123,7 +123,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
 
 /*************************************************************************
 |*
-|*    NameOrIndex::NameOrIndex(USHORT nWhich, const String& rName)
+|*    NameOrIndex::NameOrIndex(sal_uInt16 nWhich, const String& rName)
 |*
 |*    Beschreibung
 |*    Ersterstellung    14.11.94
@@ -131,7 +131,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
 |*
 *************************************************************************/
 
-NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, const XubString& rName) :
     SfxStringItem(_nWhich, rName),
     nPalIndex(-1)
 {
@@ -139,7 +139,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
 
 /*************************************************************************
 |*
-|*    NameOrIndex::NameOrIndex(USHORT nWhich, SvStream& rIn)
+|*    NameOrIndex::NameOrIndex(sal_uInt16 nWhich, SvStream& rIn)
 |*
 |*    Beschreibung
 |*    Ersterstellung    14.11.94
@@ -147,7 +147,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
 |*
 *************************************************************************/
 
-NameOrIndex::NameOrIndex(USHORT _nWhich, SvStream& rIn) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, SvStream& rIn) :
     SfxStringItem(_nWhich, rIn)
 {
     rIn >> nPalIndex;
@@ -203,7 +203,7 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    14.11.94
@@ -211,7 +211,7 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new NameOrIndex(Which(), rIn);
 }
@@ -226,7 +226,7 @@ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     SfxStringItem::Store( rOut, nItemVersion );
     rOut << nPalIndex;
@@ -238,7 +238,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
     Argument pPool2 can be null.
     If returned string equals NameOrIndex->GetName(), the name was already unique.
 */
-String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults )
+String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults )
 {
     sal_Bool bForceNew = sal_False;
 
@@ -368,11 +368,11 @@ TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*    XColorItem::XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor)
+|*    XColorItem::XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor)
 |*
 \************************************************************************/
 
-XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) :
     NameOrIndex(_nWhich, nIndex),
     aColor(rTheColor)
 {
@@ -380,11 +380,11 @@ XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
 
 /*************************************************************************
 |*
-|*    XColorItem::XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor)
+|*    XColorItem::XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor)
 |*
 \************************************************************************/
 
-XColorItem::XColorItem(USHORT _nWhich, const XubString& rName, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, const XubString& rName, const Color& rTheColor) :
     NameOrIndex(_nWhich, rName),
     aColor(rTheColor)
 {
@@ -404,11 +404,11 @@ XColorItem::XColorItem(const XColorItem& rItem) :
 
 /*************************************************************************
 |*
-|*    XColorItem::XColorItem(USHORT nWhich, SvStream& rIn)
+|*    XColorItem::XColorItem(sal_uInt16 nWhich, SvStream& rIn)
 |*
 \************************************************************************/
 
-XColorItem::XColorItem(USHORT _nWhich, SvStream& rIn) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, SvStream& rIn) :
     NameOrIndex(_nWhich, rIn)
 {
     if (!IsIndex())
@@ -442,11 +442,11 @@ int XColorItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 \************************************************************************/
 
-SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XColorItem(Which(), rIn);
 }
@@ -457,7 +457,7 @@ SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \************************************************************************/
 
-SvStream& XColorItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
@@ -484,13 +484,13 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const
 
 }
 
-sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
     return sal_True;
 }
 
-sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -520,7 +520,7 @@ TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem);
 *************************************************************************/
 
 XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) :
-    SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< USHORT >(eTheLineStyle))
+    SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle))
 {
 }
 
@@ -556,7 +556,7 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -564,7 +564,7 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineStyleItem(rIn);
 }
@@ -588,9 +588,9 @@ SfxItemPresentation XLineStyleItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
-            switch( (USHORT)GetValue() )
+            switch( (sal_uInt16)GetValue() )
             {
                 case XLINE_NONE:
                     nId = RID_SVXSTR_INVISIBLE;
@@ -609,14 +609,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation
     }
 }
 
-sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     ::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
     rVal <<= eLS;
     return sal_True;
 }
 
-sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     ::com::sun::star::drawing::LineStyle eLS;
     if(!(rVal >>= eLS ))
@@ -628,13 +628,13 @@ sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         eLS = (::com::sun::star::drawing::LineStyle)nLS;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( eLS ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) );
     return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-USHORT XLineStyleItem::GetValueCount() const
+sal_uInt16 XLineStyleItem::GetValueCount() const
 {
     return 3;
 }
@@ -645,7 +645,7 @@ USHORT XLineStyleItem::GetValueCount() const
 // ------------
 /*************************************************************************
 |*
-|*    XDash::XDash(XDashStyle, USHORT, ULONG, USHORT, ULONG, ULONG)
+|*    XDash::XDash(XDashStyle, sal_uInt16, sal_uIntPtr, sal_uInt16, sal_uIntPtr, sal_uIntPtr)
 |*
 |*    Beschreibung
 |*    Ersterstellung    21.11.94
@@ -653,8 +653,8 @@ USHORT XLineStyleItem::GetValueCount() const
 |*
 *************************************************************************/
 
-XDash::XDash(XDashStyle eTheDash, USHORT nTheDots, ULONG nTheDotLen,
-             USHORT nTheDashes, ULONG nTheDashLen, ULONG nTheDistance) :
+XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen,
+             sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) :
     eDash(eTheDash),
     nDots(nTheDots),
     nDotLen(nTheDotLen),
@@ -883,7 +883,7 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*    XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash)
+|*    XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash)
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -891,7 +891,7 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
 |*
 *************************************************************************/
 
-XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) :
+XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) :
     NameOrIndex(XATTR_LINEDASH, nIndex),
     aDash(rTheDash)
 {
@@ -944,9 +944,9 @@ XLineDashItem::XLineDashItem(SvStream& rIn) :
 {
     if (!IsIndex())
     {
-        USHORT  nSTemp;
-        UINT32  nLTemp;
-        INT32   nITemp;
+        sal_uInt16  nSTemp;
+        sal_uInt32  nLTemp;
+        sal_Int32   nITemp;
 
         rIn >> nITemp; aDash.SetDashStyle((XDashStyle)nITemp);
         rIn >> nSTemp; aDash.SetDots(nSTemp);
@@ -1005,7 +1005,7 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -1013,7 +1013,7 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineDashItem(rIn);
 }
@@ -1028,18 +1028,18 @@ SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& XLineDashItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
     if (!IsIndex())
     {
-        rOut << (INT32) aDash.GetDashStyle();
+        rOut << (sal_Int32) aDash.GetDashStyle();
         rOut << aDash.GetDots();
-        rOut << (UINT32) aDash.GetDotLen();
+        rOut << (sal_uInt32) aDash.GetDotLen();
         rOut << aDash.GetDashes();
-        rOut << (UINT32) aDash.GetDashLen();
-        rOut << (UINT32) aDash.GetDistance();
+        rOut << (sal_uInt32) aDash.GetDashLen();
+        rOut << (sal_uInt32) aDash.GetDistance();
     }
 
     return rOut;
@@ -1091,7 +1091,7 @@ SfxItemPresentation XLineDashItem::GetPresentation
 
 FASTBOOL XLineDashItem::HasMetrics() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -1101,10 +1101,10 @@ FASTBOOL XLineDashItem::ScaleMetrics(long nMul, long nDiv)
     aDash.SetDotLen( ScaleMetricValue( aDash.GetDotLen(), nMul, nDiv ) );
     aDash.SetDashLen( ScaleMetricValue( aDash.GetDashLen(), nMul, nDiv ) );
     aDash.SetDistance( ScaleMetricValue( aDash.GetDistance(), nMul, nDiv ) );
-    return TRUE;
+    return sal_True;
 }
 
-sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1118,7 +1118,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
             ::com::sun::star::drawing::LineDash aLineDash;
 
             const XDash& rXD = GetDashValue();
-            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
             aLineDash.Dots = rXD.GetDots();
             aLineDash.DotLen = rXD.GetDotLen();
             aLineDash.Dashes = rXD.GetDashes();
@@ -1149,7 +1149,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
 
             ::com::sun::star::drawing::LineDash aLineDash;
 
-            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
             aLineDash.Dots = rXD.GetDots();
             aLineDash.DotLen = rXD.GetDotLen();
             aLineDash.Dashes = rXD.GetDashes();
@@ -1208,7 +1208,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
     return sal_True;
 }
 
-sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1240,7 +1240,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
                 {
                     XDash aXDash;
 
-                    aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+                    aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
                     aXDash.SetDots(aLineDash.Dots);
                     aXDash.SetDotLen(aLineDash.DotLen);
                     aXDash.SetDashes(aLineDash.Dashes);
@@ -1276,7 +1276,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
 
             XDash aXDash;
 
-            aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+            aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
             aXDash.SetDots(aLineDash.Dots);
             aXDash.SetDotLen(aLineDash.DotLen);
             aXDash.SetDashes(aLineDash.Dashes);
@@ -1297,7 +1297,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
                 return sal_False;
 
             XDash aXDash = GetDashValue();
-            aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal)));
+            aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(nVal)));
 
             if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
                 aXDash.SetDots(1);
@@ -1354,7 +1354,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
     return sal_True;
 }
 
-BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue();
 }
@@ -1433,7 +1433,7 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -1441,7 +1441,7 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineWidthItem(rIn);
 }
@@ -1472,7 +1472,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
     }
 }
 
-sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Int32 nValue = GetValue();
     if( 0 != (nMemberId&CONVERT_TWIPS) )
@@ -1482,7 +1482,7 @@ sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
     return sal_True;
 }
 
-sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -1500,7 +1500,7 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
 
 /*************************************************************************
 |*
-|*    XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor)
+|*    XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor)
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -1508,7 +1508,7 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
 |*
 *************************************************************************/
 
-XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) :
+XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) :
     XColorItem(XATTR_LINECOLOR, nIndex, rTheColor)
 {
 }
@@ -1560,7 +1560,7 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -1568,7 +1568,7 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineColorItem(rIn);
 }
@@ -1597,13 +1597,13 @@ SfxItemPresentation XLineColorItem::GetPresentation
     }
 }
 
-sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
     return sal_True;
 }
 
-sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1719,7 +1719,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*    XLineStartItem::XLineStartItem(INT32 nIndex)
+|*    XLineStartItem::XLineStartItem(sal_Int32 nIndex)
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -1727,7 +1727,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
 |*
 *************************************************************************/
 
-XLineStartItem::XLineStartItem(INT32 nIndex)
+XLineStartItem::XLineStartItem(sal_Int32 nIndex)
 :   NameOrIndex(XATTR_LINESTART, nIndex)
 {
 }
@@ -1831,7 +1831,7 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -1839,7 +1839,7 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineStartItem(rIn);
 }
@@ -1854,7 +1854,7 @@ SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& XLineStartItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
@@ -1913,7 +1913,7 @@ SfxItemPresentation XLineStartItem::GetPresentation
     }
 }
 
-sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1933,7 +1933,7 @@ sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
     return sal_True;
 }
 
-sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2191,7 +2191,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*    XLineEndItem::XLineEndItem(INT32 nIndex)
+|*    XLineEndItem::XLineEndItem(sal_Int32 nIndex)
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -2199,7 +2199,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
 |*
 *************************************************************************/
 
-XLineEndItem::XLineEndItem(INT32 nIndex)
+XLineEndItem::XLineEndItem(sal_Int32 nIndex)
 :   NameOrIndex(XATTR_LINEEND, nIndex)
 {
 }
@@ -2303,7 +2303,7 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -2311,7 +2311,7 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineEndItem(rIn);
 }
@@ -2326,7 +2326,7 @@ SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& XLineEndItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
@@ -2607,7 +2607,7 @@ SfxItemPresentation XLineEndItem::GetPresentation
     }
 }
 
-sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2626,7 +2626,7 @@ sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMembe
     return sal_True;
 }
 
-sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2663,7 +2663,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem);
 
 /*************************************************************************
 |*
-|*    XLineStartWidthItem::XLineStartWidthItem(INT32 nWidth)
+|*    XLineStartWidthItem::XLineStartWidthItem(sal_Int32 nWidth)
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -2708,7 +2708,7 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT nVer)
+|*    SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*                                              const
 |*
 |*    Beschreibung
@@ -2717,7 +2717,7 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineStartWidthItem(rIn);
 }
@@ -2748,13 +2748,13 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
     }
 }
 
-sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -2816,7 +2816,7 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -2824,7 +2824,7 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineEndWidthItem(rIn);
 }
@@ -2855,13 +2855,13 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
     }
 }
 
-sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
 }
 
-sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -2877,7 +2877,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
 
 /*************************************************************************
 |*
-|*    XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter)
+|*    XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter)
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -2885,7 +2885,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
 |*
 *************************************************************************/
 
-XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter) :
+XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) :
     SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter)
 {
 }
@@ -2922,7 +2922,7 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT nVer)
+|*    SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*                                              const
 |*
 |*    Beschreibung
@@ -2931,7 +2931,7 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineStartCenterItem(rIn);
 }
@@ -2961,14 +2961,14 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation
     }
 }
 
-sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_Bool bValue = GetValue();
     rVal.setValue( &bValue, ::getCppuBooleanType()  );
     return sal_True;
 }
 
-sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
         return sal_False;
@@ -2985,7 +2985,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
 
 /*************************************************************************
 |*
-|*    XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter)
+|*    XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter)
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -2993,7 +2993,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
 |*
 *************************************************************************/
 
-XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter) :
+XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) :
     SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter)
 {
 }
@@ -3030,7 +3030,7 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT nVer)
+|*    SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*                                              const
 |*
 |*    Beschreibung
@@ -3039,7 +3039,7 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineEndCenterItem(rIn);
 }
@@ -3069,14 +3069,14 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation
     }
 }
 
-sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_Bool bValue = GetValue();
     rVal.setValue( &bValue, ::getCppuBooleanType()  );
     return sal_True;
 }
 
-BOOL XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
         return sal_False;
@@ -3106,7 +3106,7 @@ TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem);
 *************************************************************************/
 
 XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) :
-    SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< USHORT >(eFillStyle))
+    SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle))
 {
 }
 
@@ -3142,7 +3142,7 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -3150,7 +3150,7 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillStyleItem(rIn);
 }
@@ -3175,9 +3175,9 @@ SfxItemPresentation XFillStyleItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
-            switch( (USHORT)GetValue() )
+            switch( (sal_uInt16)GetValue() )
             {
                 case XFILL_NONE:
                     nId = RID_SVXSTR_INVISIBLE;
@@ -3207,13 +3207,13 @@ SfxItemPresentation XFillStyleItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-USHORT XFillStyleItem::GetValueCount() const
+sal_uInt16 XFillStyleItem::GetValueCount() const
 {
     return 5;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     ::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
 
@@ -3223,7 +3223,7 @@ sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     ::com::sun::star::drawing::FillStyle eFS;
     if(!(rVal >>= eFS))
@@ -3235,7 +3235,7 @@ sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         eFS = (::com::sun::star::drawing::FillStyle)nFS;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( eFS ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) );
 
     return sal_True;
 }
@@ -3248,7 +3248,7 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
 
 /*************************************************************************
 |*
-|*    XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor)
+|*    XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor)
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -3256,7 +3256,7 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
 |*
 *************************************************************************/
 
-XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
     XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor)
 {
 }
@@ -3308,7 +3308,7 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -3316,7 +3316,7 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillColorItem(rIn);
 }
@@ -3347,7 +3347,7 @@ SfxItemPresentation XFillColorItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
 
@@ -3356,7 +3356,7 @@ sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
 
 // -----------------------------------------------------------------------
 
-sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue ))
@@ -3371,7 +3371,7 @@ sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
 // -----------------------------
 TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
 
-XSecondaryFillColorItem::XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XSecondaryFillColorItem::XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
     XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
 {
 }
@@ -3391,14 +3391,14 @@ SfxPoolItem* XSecondaryFillColorItem::Clone(SfxItemPool* /*pPool*/) const
     return new XSecondaryFillColorItem(*this);
 }
 
-SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
 {
     if ( nVer >= 2 )
         return new XSecondaryFillColorItem( rIn );
     else
         return new XSecondaryFillColorItem( String(), Color(0,184,255) );
 }
-USHORT XSecondaryFillColorItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
+sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
 {
     return 2;
 }
@@ -3451,7 +3451,7 @@ XGradient::XGradient() :
 /*************************************************************************
 |*
 |*    XGradient::XGradient(XGradientStyle, const Color&, const Color&,
-|*                         long, USHORT, USHORT, USHORT)
+|*                         long, sal_uInt16, sal_uInt16, sal_uInt16)
 |*
 |*    Beschreibung
 |*    Ersterstellung    21.11.94
@@ -3460,10 +3460,10 @@ XGradient::XGradient() :
 *************************************************************************/
 
 XGradient::XGradient(const Color& rStart, const Color& rEnd,
-                     XGradientStyle eTheStyle, long nTheAngle, USHORT nXOfs,
-                     USHORT nYOfs, USHORT nTheBorder,
-                     USHORT nStartIntens, USHORT nEndIntens,
-                     USHORT nSteps) :
+                     XGradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
+                     sal_uInt16 nYOfs, sal_uInt16 nTheBorder,
+                     sal_uInt16 nStartIntens, sal_uInt16 nEndIntens,
+                     sal_uInt16 nSteps) :
     eStyle(eTheStyle),
     aStartColor(rStart),
     aEndColor(rEnd),
@@ -3509,7 +3509,7 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*    XFillGradientItem::XFillGradientItem(INT32 nIndex,
+|*    XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
 |*                                       const XGradient& rTheGradient)
 |*
 |*    Beschreibung
@@ -3518,7 +3518,7 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
 |*
 *************************************************************************/
 
-XFillGradientItem::XFillGradientItem(INT32 nIndex,
+XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
                                    const XGradient& rTheGradient) :
     NameOrIndex(XATTR_FILLGRADIENT, nIndex),
     aGradient(rTheGradient)
@@ -3569,31 +3569,31 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) :
 |*
 *************************************************************************/
 
-XFillGradientItem::XFillGradientItem(SvStream& rIn, USHORT nVer) :
+XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) :
     NameOrIndex(XATTR_FILLGRADIENT, rIn),
     aGradient(COL_BLACK, COL_WHITE)
 {
     if (!IsIndex())
     {
-        USHORT nUSTemp;
-        USHORT nRed;
-        USHORT nGreen;
-        USHORT nBlue;
-        INT16  nITemp;
-        INT32  nLTemp;
+        sal_uInt16 nUSTemp;
+        sal_uInt16 nRed;
+        sal_uInt16 nGreen;
+        sal_uInt16 nBlue;
+        sal_Int16  nITemp;
+        sal_Int32  nLTemp;
 
         rIn >> nITemp; aGradient.SetGradientStyle((XGradientStyle)nITemp);
         rIn >> nRed;
         rIn >> nGreen;
         rIn >> nBlue;
         Color aCol;
-        aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+        aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
         aGradient.SetStartColor( aCol );
 
         rIn >> nRed;
         rIn >> nGreen;
         rIn >> nBlue;
-        aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+        aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
         aGradient.SetEndColor(aCol);
         rIn >> nLTemp; aGradient.SetAngle(nLTemp);
         rIn >> nUSTemp; aGradient.SetBorder(nUSTemp);
@@ -3659,7 +3659,7 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -3667,7 +3667,7 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 {
     return new XFillGradientItem(rIn, nVer);
 }
@@ -3682,15 +3682,15 @@ SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
 |*
 *************************************************************************/
 
-SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
     if (!IsIndex())
     {
-        rOut << (INT16)aGradient.GetGradientStyle();
+        rOut << (sal_Int16)aGradient.GetGradientStyle();
 
-        USHORT nTmp;
+        sal_uInt16 nTmp;
 
         nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut << nTmp;
         nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut << nTmp;
@@ -3699,7 +3699,7 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
         nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut << nTmp;
         nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut << nTmp;
 
-        rOut << (INT32) aGradient.GetAngle();
+        rOut << (sal_Int32) aGradient.GetAngle();
         rOut << aGradient.GetBorder();
         rOut << aGradient.GetXOffset();
         rOut << aGradient.GetYOffset();
@@ -3733,7 +3733,7 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl
 
 /*************************************************************************
 |*
-|*    USHORT XFillGradientItem::GetVersion() const
+|*    sal_uInt16 XFillGradientItem::GetVersion() const
 |*
 |*    Beschreibung
 |*    Ersterstellung    01.11.95
@@ -3741,7 +3741,7 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl
 |*
 *************************************************************************/
 
-USHORT XFillGradientItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
 {
     // !!! this version number also represents the version number of superclasses
     // !!! (e.g. XFillFloatTransparenceItem); if you make any changes here,
@@ -3774,7 +3774,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     //sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3788,8 +3788,8 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
 
             const XGradient& aXGradient = GetGradientValue();
             aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
-            aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
-            aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+            aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+            aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
             aGradient2.Angle = (short)aXGradient.GetAngle();
             aGradient2.Border = aXGradient.GetBorder();
             aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3814,8 +3814,8 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
             ::com::sun::star::awt::Gradient aGradient2;
 
             aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
-            aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
-            aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+            aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+            aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
             aGradient2.Angle = (short)aXGradient.GetAngle();
             aGradient2.Border = aXGradient.GetBorder();
             aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3854,7 +3854,7 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3998,7 +3998,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
     return sal_True;
 }
 
-BOOL XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue();
 }
@@ -4034,14 +4034,14 @@ TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
 // -----------------------------------------------------------------------------
 
 XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
-    bEnabled( FALSE )
+    bEnabled( sal_False )
 {
     SetWhich( XATTR_FILLFLOATTRANSPARENCE );
 }
 
 //------------------------------------------------------------------------
 
-XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable ) :
     XFillGradientItem   ( nIndex, rGradient ),
     bEnabled            ( bEnable )
 {
@@ -4050,7 +4050,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGra
 
 //------------------------------------------------------------------------
 
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
     XFillGradientItem   ( rName, rGradient ),
     bEnabled            ( bEnable )
 {
@@ -4068,7 +4068,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
 
 //------------------------------------------------------------------------
 
-//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, USHORT nVer ) :
+//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, sal_uInt16 nVer ) :
 //  XFillGradientItem   ( rIn, nVer )
 //{
 //  SetWhich( XATTR_FILLFLOATTRANSPARENCE );
@@ -4077,7 +4077,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
 
 //*************************************************************************
 
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, BOOL bEnable )
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable )
 :   XFillGradientItem   ( -1, rTheGradient ),
     bEnabled            ( bEnable )
 {
@@ -4109,14 +4109,14 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
 
 //------------------------------------------------------------------------
 
-//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
+//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
 //{
 //  return( ( 0 == nVer ) ? Clone( NULL ) : new XFillFloatTransparenceItem( rIn, nVer ) );
 //}
 
 //------------------------------------------------------------------------
 
-//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 //{
 //  XFillGradientItem::Store( rOut, nItemVersion );
 //  rOut << bEnabled;
@@ -4125,7 +4125,7 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
 
 //------------------------------------------------------------------------
 
-USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
+sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
 {
     // !!! if version number of this object must be increased, please   !!!
     // !!! increase version number of base class XFillGradientItem      !!!
@@ -4134,14 +4134,14 @@ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
 
 //------------------------------------------------------------------------
 
-sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     return XFillGradientItem::QueryValue( rVal, nMemberId );
 }
 
 //------------------------------------------------------------------------
 
-sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     return XFillGradientItem::PutValue( rVal, nMemberId );
 }
@@ -4156,7 +4156,7 @@ SfxItemPresentation XFillFloatTransparenceItem::GetPresentation(    SfxItemPrese
     return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper );
 }
 
-BOOL XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return  ((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() &&
             ((XFillFloatTransparenceItem*)p1)->GetGradientValue()  == ((XFillFloatTransparenceItem*)p2)->GetGradientValue();
@@ -4180,7 +4180,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
             // if the given name is not valid, replace it!
             if( aUniqueName != GetName() )
             {
-                return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), TRUE );
+                return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), sal_True );
             }
         }
     }
@@ -4189,7 +4189,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
         // #85953# if disabled, force name to empty string
         if(GetName().Len())
         {
-            return new XFillFloatTransparenceItem(String(), GetGradientValue(), FALSE);
+            return new XFillFloatTransparenceItem(String(), GetGradientValue(), sal_False);
         }
     }
 
@@ -4245,7 +4245,7 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*    XFillHatchItem::XFillHatchItem(INT32 nIndex,
+|*    XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
 |*                                 const XHatch& rTheHatch)
 |*
 |*    Beschreibung
@@ -4254,7 +4254,7 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
 |*
 *************************************************************************/
 
-XFillHatchItem::XFillHatchItem(INT32 nIndex,
+XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
                              const XHatch& rTheHatch) :
     NameOrIndex(XATTR_FILLHATCH, nIndex),
     aHatch(rTheHatch)
@@ -4311,11 +4311,11 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
 {
     if (!IsIndex())
     {
-        USHORT nRed;
-        USHORT nGreen;
-        USHORT nBlue;
-        INT16  nITemp;
-        INT32  nLTemp;
+        sal_uInt16 nRed;
+        sal_uInt16 nGreen;
+        sal_uInt16 nBlue;
+        sal_Int16  nITemp;
+        sal_Int32  nLTemp;
 
         rIn >> nITemp; aHatch.SetHatchStyle((XHatchStyle)nITemp);
         rIn >> nRed;
@@ -4323,7 +4323,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
         rIn >> nBlue;
 
         Color aCol;
-        aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+        aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
         aHatch.SetColor(aCol);
         rIn >> nLTemp; aHatch.SetDistance(nLTemp);
         rIn >> nLTemp; aHatch.SetAngle(nLTemp);
@@ -4378,7 +4378,7 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    15.11.94
@@ -4386,7 +4386,7 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillHatchItem(rIn);
 }
@@ -4401,21 +4401,21 @@ SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& XFillHatchItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
     if (!IsIndex())
     {
-        rOut << (INT16)aHatch.GetHatchStyle();
+        rOut << (sal_Int16)aHatch.GetHatchStyle();
 
-        USHORT nTmp;
+        sal_uInt16 nTmp;
         nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut << nTmp;
         nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut << nTmp;
         nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut << nTmp;
 
-        rOut << (INT32) aHatch.GetDistance();
-        rOut << (INT32) aHatch.GetAngle();
+        rOut << (sal_Int32) aHatch.GetDistance();
+        rOut << (sal_Int32) aHatch.GetAngle();
     }
 
     return rOut;
@@ -4467,7 +4467,7 @@ SfxItemPresentation XFillHatchItem::GetPresentation
 
 FASTBOOL XFillHatchItem::HasMetrics() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -4475,11 +4475,11 @@ FASTBOOL XFillHatchItem::HasMetrics() const
 FASTBOOL XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
 {
     aHatch.SetDistance( ScaleMetricValue( aHatch.GetDistance(), nMul, nDiv ) );
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -4543,7 +4543,7 @@ sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -4639,7 +4639,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
     return sal_True;
 }
 
-BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue();
 }
@@ -4686,7 +4686,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem);
 *************************************************************************/
 
 XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) :
-    SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< USHORT >(eTheStyle))
+    SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< sal_uInt16 >(eTheStyle))
 {
 }
 
@@ -4722,7 +4722,7 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    02.02.95 ESO
@@ -4730,7 +4730,7 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextStyleItem(rIn);
 }
@@ -4741,7 +4741,7 @@ SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \*************************************************************************/
 
-USHORT XFormTextStyleItem::GetValueCount() const
+sal_uInt16 XFormTextStyleItem::GetValueCount() const
 {
     return 5;
 }
@@ -4753,7 +4753,7 @@ USHORT XFormTextStyleItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
@@ -4766,11 +4766,11 @@ sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) con
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
-    SetValue(sal::static_int_cast< USHORT >(nValue));
+    SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
 
     return sal_True;
 }
@@ -4791,7 +4791,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem);
 *************************************************************************/
 
 XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) :
-    SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< USHORT >(eTheAdjust))
+    SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< sal_uInt16 >(eTheAdjust))
 {
 }
 
@@ -4827,7 +4827,7 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    02.02.95 ESO
@@ -4835,7 +4835,7 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextAdjustItem(rIn);
 }
@@ -4846,7 +4846,7 @@ SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \*************************************************************************/
 
-USHORT XFormTextAdjustItem::GetValueCount() const
+sal_uInt16 XFormTextAdjustItem::GetValueCount() const
 {
     return 4;
 }
@@ -4858,7 +4858,7 @@ USHORT XFormTextAdjustItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
@@ -4871,11 +4871,11 @@ sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
-    SetValue(sal::static_int_cast< USHORT >(nValue));
+    SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
 
     return sal_True;
 }
@@ -4932,7 +4932,7 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    02.02.95 ESO
@@ -4940,7 +4940,7 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextDistanceItem(rIn);
 }
@@ -4997,7 +4997,7 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    02.02.95 ESO
@@ -5005,7 +5005,7 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextStartItem(rIn);
 }
@@ -5017,14 +5017,14 @@ TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem);
 
 /*************************************************************************
 |*
-|*    XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror)
+|*    XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror)
 |*
 |*    Ersterstellung    06.02.95 ESO
 |*    Letzte Aenderung  06.02.95 ESO
 |*
 *************************************************************************/
 
-XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror) :
+XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) :
     SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror)
 {
 }
@@ -5059,7 +5059,7 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT nVer)
+|*    SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*                                              const
 |*
 |*    Ersterstellung    06.02.95 ESO
@@ -5067,7 +5067,7 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextMirrorItem(rIn);
 }
@@ -5087,7 +5087,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem);
 |*
 *************************************************************************/
 
-XFormTextOutlineItem::XFormTextOutlineItem(BOOL bOutline) :
+XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) :
     SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline)
 {
 }
@@ -5122,7 +5122,7 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT nVer)
+|*    SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*                                              const
 |*
 |*    Ersterstellung    27.06.95 ESO
@@ -5130,7 +5130,7 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextOutlineItem(rIn);
 }
@@ -5152,7 +5152,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem);
 
 XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) :
     SfxEnumItem(
-        XATTR_FORMTXTSHADOW, sal::static_int_cast< USHORT >(eFormTextShadow))
+        XATTR_FORMTXTSHADOW, sal::static_int_cast< sal_uInt16 >(eFormTextShadow))
 {
 }
 
@@ -5188,7 +5188,7 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    27.06.95
@@ -5196,7 +5196,7 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowItem(rIn);
 }
@@ -5208,7 +5208,7 @@ SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \*************************************************************************/
 
-USHORT XFormTextShadowItem::GetValueCount() const
+sal_uInt16 XFormTextShadowItem::GetValueCount() const
 {
     return 3;
 }
@@ -5220,7 +5220,7 @@ USHORT XFormTextShadowItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
@@ -5233,11 +5233,11 @@ sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
-    SetValue(sal::static_int_cast< USHORT >(nValue));
+    SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
 
     return sal_True;
 }
@@ -5257,7 +5257,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem);
 |*
 *************************************************************************/
 
-XFormTextShadowColorItem::XFormTextShadowColorItem(INT32 nIndex,
+XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex,
                                                      const Color& rTheColor) :
     XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor)
 {
@@ -5311,7 +5311,7 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    27.06.95
@@ -5319,7 +5319,7 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowColorItem(rIn);
 }
@@ -5376,7 +5376,7 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    28.06.95 ESO
@@ -5384,7 +5384,7 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowXValItem(rIn);
 }
@@ -5441,7 +5441,7 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    28.06.95 ESO
@@ -5449,7 +5449,7 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowYValItem(rIn);
 }
@@ -5471,7 +5471,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem);
 
 XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) :
     SfxEnumItem(
-        XATTR_FORMTXTSTDFORM, sal::static_int_cast< USHORT >(eFormTextStdForm))
+        XATTR_FORMTXTSTDFORM, sal::static_int_cast< sal_uInt16 >(eFormTextStdForm))
 {
 }
 
@@ -5507,7 +5507,7 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    27.06.95
@@ -5515,7 +5515,7 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextStdFormItem(rIn);
 }
@@ -5527,7 +5527,7 @@ SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \*************************************************************************/
 
-USHORT XFormTextStdFormItem::GetValueCount() const
+sal_uInt16 XFormTextStdFormItem::GetValueCount() const
 {
     return 3;
 }
@@ -5539,7 +5539,7 @@ USHORT XFormTextStdFormItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return sal_True;
@@ -5552,11 +5552,11 @@ sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) c
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
-    SetValue(sal::static_int_cast< USHORT >(nValue));
+    SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
 
     return sal_True;
 }
@@ -5575,7 +5575,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem);
 |*
 *************************************************************************/
 
-XFormTextHideFormItem::XFormTextHideFormItem(BOOL bHide) :
+XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) :
     SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide)
 {
 }
@@ -5610,7 +5610,7 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT nVer)
+|*    SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*                                              const
 |*
 |*    Ersterstellung    27.06.95 ESO
@@ -5618,7 +5618,7 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextHideFormItem(rIn);
 }
@@ -5682,7 +5682,7 @@ SfxPoolItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const
 |*
 \************************************************************************/
 
-SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
 {
     SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
                                     XATTR_LINE_FIRST, XATTR_LINE_LAST);
@@ -5696,7 +5696,7 @@ SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
 |*
 \************************************************************************/
 
-SvStream& XLineAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
 {
     return SfxSetItem::Store( rStream, nItemVersion );
 }
@@ -5755,7 +5755,7 @@ SfxPoolItem* XFillAttrSetItem::Clone( SfxItemPool* pPool ) const
 |*
 \************************************************************************/
 
-SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
 {
     SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
                                     XATTR_FILL_FIRST, XATTR_FILL_LAST);
@@ -5769,7 +5769,7 @@ SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
 |*
 \************************************************************************/
 
-SvStream& XFillAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XFillAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
 {
     return SfxSetItem::Store( rStream, nItemVersion );
 }
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 0c8fc3e9cbec..cd82db743f4d 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -52,7 +52,7 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
 
 /*************************************************************************
 |*
-|*    XLineTransparenceItem::XLineTransparenceItem(USHORT)
+|*    XLineTransparenceItem::XLineTransparenceItem(sal_uInt16)
 |*
 |*    Beschreibung
 |*    Ersterstellung    07.11.95 KA
@@ -60,7 +60,7 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
 |*
 *************************************************************************/
 
-XLineTransparenceItem::XLineTransparenceItem(USHORT nLineTransparence) :
+XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
     SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence)
 {
 }
@@ -97,7 +97,7 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    07.11.95 KA
@@ -105,7 +105,7 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineTransparenceItem(rIn);
 }
@@ -130,7 +130,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((USHORT) GetValue()) );
+            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue()) );
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -147,7 +147,7 @@ TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem);
 // -----------------------------------------------------------------------------
 
 XLineJointItem::XLineJointItem( XLineJoint eLineJoint ) :
-    SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< USHORT >(eLineJoint))
+    SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint))
 {
 }
 
@@ -160,14 +160,14 @@ XLineJointItem::XLineJointItem( SvStream& rIn ) :
 
 // -----------------------------------------------------------------------------
 
-USHORT XLineJointItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XLineJointItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
 {
     return 1;
 }
 
 // -----------------------------------------------------------------------------
 
-SfxPoolItem* XLineJointItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XLineJointItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
 {
     XLineJointItem* pRet = new XLineJointItem( rIn );
 
@@ -198,7 +198,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
             switch( GetValue() )
             {
@@ -238,7 +238,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
 
 // -----------------------------------------------------------------------------
 
-sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     ::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
 
@@ -268,7 +268,7 @@ sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
 
 // -----------------------------------------------------------------------------
 
-BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     XLineJoint eJoint = XLINEJOINT_NONE;
     ::com::sun::star::drawing::LineJoint eUnoJoint;
@@ -300,14 +300,14 @@ BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
         break;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( eJoint ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( eJoint ) );
 
     return sal_True;
 }
 
 // -----------------------------------------------------------------------------
 
-USHORT XLineJointItem::GetValueCount() const
+sal_uInt16 XLineJointItem::GetValueCount() const
 {
     // don't forget to update the api interface also
     return 5;
@@ -320,7 +320,7 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
 
 /*************************************************************************
 |*
-|*    XFillTransparenceItem::XFillTransparenceItem(USHORT)
+|*    XFillTransparenceItem::XFillTransparenceItem(sal_uInt16)
 |*
 |*    Beschreibung
 |*    Ersterstellung    07.11.95 KA
@@ -328,7 +328,7 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
 |*
 *************************************************************************/
 
-XFillTransparenceItem::XFillTransparenceItem(USHORT nFillTransparence) :
+XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) :
     SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence)
 {
 }
@@ -365,7 +365,7 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    07.11.95 KA
@@ -373,7 +373,7 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillTransparenceItem(rIn);
 }
@@ -398,7 +398,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -413,7 +413,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
 
 /*************************************************************************
 |*
-|*    XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT)
+|*    XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16)
 |*
 |*    Beschreibung
 |*    Ersterstellung    09.11.95 KA
@@ -421,7 +421,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
 |*
 *************************************************************************/
 
-XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT nShdwTransparence) :
+XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) :
     SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence)
 {
 }
@@ -458,7 +458,7 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    09.11.95 KA
@@ -466,7 +466,7 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowTranspItem(rIn);
 }
@@ -479,7 +479,7 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
 
 /*************************************************************************
 |*
-|*    XGradientStepCountItem::XGradientStepCountItem( USHORT )
+|*    XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 )
 |*
 |*    Beschreibung
 |*    Ersterstellung    23.01.96 KA
@@ -487,7 +487,7 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
 |*
 *************************************************************************/
 
-XGradientStepCountItem::XGradientStepCountItem( USHORT nStepCount ) :
+XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) :
     SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount )
 {
 }
@@ -524,7 +524,7 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    23.01.96 KA
@@ -532,7 +532,7 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XGradientStepCountItem( rIn );
 }
@@ -557,7 +557,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
 //          rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) );
 //          rText += ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;
@@ -580,7 +580,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem );
 |*
 *************************************************************************/
 
-XFillBmpTileItem::XFillBmpTileItem( BOOL bTile ) :
+XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) :
             SfxBoolItem( XATTR_FILLBMP_TILE, bTile )
 {
 }
@@ -628,7 +628,7 @@ SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpTileItem( rIn );
 }
@@ -683,7 +683,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem );
 *************************************************************************/
 
 XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) :
-    SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< USHORT >( eRP ) )
+    SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) )
 {
 }
 
@@ -730,7 +730,7 @@ SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpPosItem( rIn );
 }
@@ -774,7 +774,7 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation
 |*
 \******************************************************************************/
 
-USHORT XFillBmpPosItem::GetValueCount() const
+sal_uInt16 XFillBmpPosItem::GetValueCount() const
 {
     return 9;
 }
@@ -843,7 +843,7 @@ SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpSizeXItem( rIn );
 }
@@ -959,7 +959,7 @@ SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpSizeYItem( rIn );
 }
@@ -1027,7 +1027,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem );
 |*
 *************************************************************************/
 
-XFillBmpSizeLogItem::XFillBmpSizeLogItem( BOOL bLog ) :
+XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) :
             SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
 {
 }
@@ -1075,7 +1075,7 @@ SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpSizeLogItem( rIn );
 }
@@ -1129,7 +1129,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item );
 |*
 *************************************************************************/
 
-XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( USHORT nOffX ) :
+XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) :
             SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX )
 {
 }
@@ -1177,7 +1177,7 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpTileOffsetXItem( rIn );
 }
@@ -1231,7 +1231,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item );
 |*
 *************************************************************************/
 
-XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( USHORT nOffY ) :
+XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) :
             SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY )
 {
 }
@@ -1279,7 +1279,7 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpTileOffsetYItem( rIn );
 }
@@ -1333,7 +1333,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem );
 |*
 *************************************************************************/
 
-XFillBmpStretchItem::XFillBmpStretchItem( BOOL bStretch ) :
+XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) :
             SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch )
 {
 }
@@ -1381,7 +1381,7 @@ SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpStretchItem( rIn );
 }
@@ -1435,7 +1435,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item );
 |*
 *************************************************************************/
 
-XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( USHORT nOffPosX ) :
+XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) :
             SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX )
 {
 }
@@ -1483,7 +1483,7 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpPosOffsetXItem( rIn );
 }
@@ -1537,7 +1537,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item );
 |*
 *************************************************************************/
 
-XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( USHORT nOffPosY ) :
+XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) :
             SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY )
 {
 }
@@ -1585,7 +1585,7 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpPosOffsetYItem( rIn );
 }
@@ -1630,7 +1630,7 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
 
 /*************************************************************************
 |*
-|*    XFillBackgroundItem::XFillBackgroundItem( BOOL )
+|*    XFillBackgroundItem::XFillBackgroundItem( sal_Bool )
 |*
 |*    Beschreibung
 |*    Ersterstellung    19.11.96 KA
@@ -1638,7 +1638,7 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
 |*
 *************************************************************************/
 
-XFillBackgroundItem::XFillBackgroundItem( BOOL bFill ) :
+XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) :
     SfxBoolItem( XATTR_FILLBACKGROUND, bFill )
 {
 }
@@ -1675,7 +1675,7 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    23.01.96 KA
@@ -1683,7 +1683,7 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBackgroundItem( rIn );
 }
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 57c894e00475..874cb35d3e30 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -70,7 +70,7 @@ XOBitmap::XOBitmap() :
     eType           ( XBITMAP_NONE ),
     eStyle          ( XBITMAP_STRETCH ),
     pPixelArray     ( NULL ),
-    bGraphicDirty   ( FALSE )
+    bGraphicDirty   ( sal_False )
 {
 }
 
@@ -89,7 +89,7 @@ XOBitmap::XOBitmap( const Bitmap& rBmp, XBitmapStyle eInStyle ) :
     eStyle          ( eInStyle ),
     aGraphicObject  ( rBmp ),
     pPixelArray     ( NULL ),
-    bGraphicDirty   ( FALSE )
+    bGraphicDirty   ( sal_False )
 {
 }
 
@@ -108,13 +108,13 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle )
     eStyle          ( eInStyle ),
     aGraphicObject  ( rGraphicObject ),
     pPixelArray     ( NULL ),
-    bGraphicDirty   ( FALSE )
+    bGraphicDirty   ( sal_False )
 {
 }
 
 /*************************************************************************
 |*
-|*    XOBitmap::XOBitmap( USHORT* pArray, const Color& aPixelColor,
+|*    XOBitmap::XOBitmap( sal_uInt16* pArray, const Color& aPixelColor,
 |*          const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
 |*          XBitmapStyle eStyle = XBITMAP_TILE )
 |*
@@ -124,7 +124,7 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle )
 |*
 *************************************************************************/
 
-XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
+XOBitmap::XOBitmap( const sal_uInt16* pArray, const Color& rPixelColor,
             const Color& rBckgrColor, const Size& rSize,
             XBitmapStyle eInStyle ) :
     eStyle          ( eInStyle ),
@@ -132,15 +132,15 @@ XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
     aArraySize      ( rSize ),
     aPixelColor     ( rPixelColor ),
     aBckgrColor     ( rBckgrColor ),
-    bGraphicDirty   ( TRUE )
+    bGraphicDirty   ( sal_True )
 
 {
     if( aArraySize.Width() == 8 && aArraySize.Height() == 8 )
     {
         eType = XBITMAP_8X8;
-        pPixelArray = new USHORT[ 64 ];
+        pPixelArray = new sal_uInt16[ 64 ];
 
-        for( USHORT i = 0; i < 64; i++ )
+        for( sal_uInt16 i = 0; i < 64; i++ )
             *( pPixelArray + i ) = *( pArray + i );
     }
     else
@@ -174,9 +174,9 @@ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) :
     {
         if( eType == XBITMAP_8X8 )
         {
-            pPixelArray = new USHORT[ 64 ];
+            pPixelArray = new sal_uInt16[ 64 ];
 
-            for( USHORT i = 0; i < 64; i++ )
+            for( sal_uInt16 i = 0; i < 64; i++ )
                 *( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
         }
     }
@@ -222,9 +222,9 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp )
     {
         if( eType == XBITMAP_8X8 )
         {
-            pPixelArray = new USHORT[ 64 ];
+            pPixelArray = new sal_uInt16[ 64 ];
 
-            for( USHORT i = 0; i < 64; i++ )
+            for( sal_uInt16 i = 0; i < 64; i++ )
                 *( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
         }
     }
@@ -251,24 +251,24 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
         aBckgrColor != rXOBitmap.aBckgrColor ||
         bGraphicDirty != rXOBitmap.bGraphicDirty )
     {
-        return( FALSE );
+        return( sal_False );
     }
 
     if( pPixelArray && rXOBitmap.pPixelArray )
     {
-        USHORT nCount = (USHORT) ( aArraySize.Width() * aArraySize.Height() );
-        for( USHORT i = 0; i < nCount; i++ )
+        sal_uInt16 nCount = (sal_uInt16) ( aArraySize.Width() * aArraySize.Height() );
+        for( sal_uInt16 i = 0; i < nCount; i++ )
         {
             if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) )
-                return( FALSE );
+                return( sal_False );
         }
     }
-    return( TRUE );
+    return( sal_True );
 }
 
 /*************************************************************************
 |*
-|*    void SetPixelArray( const USHORT* pArray )
+|*    void SetPixelArray( const sal_uInt16* pArray )
 |*
 |*    Beschreibung
 |*    Ersterstellung    27.07.95
@@ -276,19 +276,19 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
 |*
 *************************************************************************/
 
-void XOBitmap::SetPixelArray( const USHORT* pArray )
+void XOBitmap::SetPixelArray( const sal_uInt16* pArray )
 {
     if( eType == XBITMAP_8X8 )
     {
         if( pPixelArray )
             delete []pPixelArray;
 
-        pPixelArray = new USHORT[ 64 ];
+        pPixelArray = new sal_uInt16[ 64 ];
 
-        for( USHORT i = 0; i < 64; i++ )
+        for( sal_uInt16 i = 0; i < 64; i++ )
             *( pPixelArray + i ) = *( pArray + i );
 
-        bGraphicDirty = TRUE;
+        bGraphicDirty = sal_True;
     }
     else
     {
@@ -343,12 +343,12 @@ const GraphicObject& XOBitmap::GetGraphicObject() const
 void XOBitmap::Bitmap2Array()
 {
     VirtualDevice   aVD;
-    BOOL            bPixelColor = FALSE;
+    sal_Bool            bPixelColor = sal_False;
     const Bitmap    aBitmap( GetBitmap() );
-    const USHORT    nLines = 8; // von Type abhaengig
+    const sal_uInt16    nLines = 8; // von Type abhaengig
 
     if( !pPixelArray )
-        pPixelArray = new USHORT[ nLines * nLines ];
+        pPixelArray = new sal_uInt16[ nLines * nLines ];
 
     aVD.SetOutputSizePixel( aBitmap.GetSizePixel() );
     aVD.DrawBitmap( Point(), aBitmap );
@@ -356,9 +356,9 @@ void XOBitmap::Bitmap2Array()
 
     // Aufbau des Arrays und Ermittlung der Vorder-, bzw.
     // Hintergrundfarbe
-    for( USHORT i = 0; i < nLines; i++ )
+    for( sal_uInt16 i = 0; i < nLines; i++ )
     {
-        for( USHORT j = 0; j < nLines; j++ )
+        for( sal_uInt16 j = 0; j < nLines; j++ )
         {
             if ( aVD.GetPixel( Point( j, i ) ) == aBckgrColor )
                 *( pPixelArray + j + i * nLines ) = 0;
@@ -368,7 +368,7 @@ void XOBitmap::Bitmap2Array()
                 if( !bPixelColor )
                 {
                     aPixelColor = aVD.GetPixel( Point( j, i ) );
-                    bPixelColor = TRUE;
+                    bPixelColor = sal_True;
                 }
             }
         }
@@ -389,7 +389,7 @@ void XOBitmap::Bitmap2Array()
 void XOBitmap::Array2Bitmap()
 {
     VirtualDevice   aVD;
-    USHORT          nLines = 8; // von Type abhaengig
+    sal_uInt16          nLines = 8; // von Type abhaengig
 
     if( !pPixelArray )
         return;
@@ -397,9 +397,9 @@ void XOBitmap::Array2Bitmap()
     aVD.SetOutputSizePixel( Size( nLines, nLines ) );
 
     // Aufbau der Bitmap
-    for( USHORT i = 0; i < nLines; i++ )
+    for( sal_uInt16 i = 0; i < nLines; i++ )
     {
-        for( USHORT j = 0; j < nLines; j++ )
+        for( sal_uInt16 j = 0; j < nLines; j++ )
         {
             if( *( pPixelArray + j + i * nLines ) == 0 )
                 aVD.DrawPixel( Point( j, i ), aBckgrColor );
@@ -409,7 +409,7 @@ void XOBitmap::Array2Bitmap()
     }
 
     aGraphicObject = GraphicObject( aVD.GetBitmap( Point(), Size( nLines, nLines ) ) );
-    bGraphicDirty = FALSE;
+    bGraphicDirty = sal_False;
 }
 
 // -----------------------
@@ -479,7 +479,7 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) :
 |*
 *************************************************************************/
 
-XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
+XFillBitmapItem::XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer ) :
     NameOrIndex( XATTR_FILLBITMAP, rIn )
 {
     if( nVer == 0 )
@@ -508,7 +508,7 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
     {
         if (!IsIndex())
         {
-            INT16 iTmp;
+            sal_Int16 iTmp;
             rIn >> iTmp;
             aXOBitmap.SetBitmapStyle( (XBitmapStyle) iTmp );
             rIn >> iTmp;
@@ -522,10 +522,10 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
             }
             else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
             {
-                USHORT* pArray = new USHORT[ 64 ];
+                sal_uInt16* pArray = new sal_uInt16[ 64 ];
                 Color   aColor;
 
-                for( USHORT i = 0; i < 64; i++ )
+                for( sal_uInt16 i = 0; i < 64; i++ )
                     rIn >> *( pArray + i );
                 aXOBitmap.SetPixelArray( pArray );
 
@@ -591,7 +591,7 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 |*    Beschreibung
 |*    Ersterstellung    17.11.94
@@ -599,7 +599,7 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 {
     return new XFillBitmapItem( rIn, nVer );
 }
@@ -614,22 +614,22 @@ SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
 |*
 *************************************************************************/
 
-SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
     if (!IsIndex())
     {
-        rOut << (INT16) aXOBitmap.GetBitmapStyle();
+        rOut << (sal_Int16) aXOBitmap.GetBitmapStyle();
         if( !aXOBitmap.GetBitmap() )
-            rOut << (INT16) XBITMAP_NONE;
+            rOut << (sal_Int16) XBITMAP_NONE;
         else
         {
-            rOut << (INT16) aXOBitmap.GetBitmapType();
+            rOut << (sal_Int16) aXOBitmap.GetBitmapType();
             if( aXOBitmap.GetBitmapType() == XBITMAP_IMPORT )
             {
-                const USHORT    nOldComprMode = rOut.GetCompressMode();
-                USHORT          nNewComprMode = nOldComprMode;
+                const sal_uInt16    nOldComprMode = rOut.GetCompressMode();
+                sal_uInt16          nNewComprMode = nOldComprMode;
 
                 if( rOut.GetVersion() >= SOFFICE_FILEFORMAT_50 )
                     nNewComprMode |= COMPRESSMODE_ZBITMAP;
@@ -642,9 +642,9 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
             }
             else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
             {
-                USHORT* pArray = aXOBitmap.GetPixelArray();
-                for( USHORT i = 0; i < 64; i++ )
-                    rOut << (USHORT) *( pArray + i );
+                sal_uInt16* pArray = aXOBitmap.GetPixelArray();
+                for( sal_uInt16 i = 0; i < 64; i++ )
+                    rOut << (sal_uInt16) *( pArray + i );
 
                 rOut << aXOBitmap.GetPixelColor();
                 rOut << aXOBitmap.GetBackgroundColor();
@@ -676,7 +676,7 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons
 
 /*************************************************************************
 |*
-|*    USHORT XFillBitmapItem::GetVersion() const
+|*    sal_uInt16 XFillBitmapItem::GetVersion() const
 |*
 |*    Beschreibung
 |*    Ersterstellung    26.07.95
@@ -684,7 +684,7 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons
 |*
 *************************************************************************/
 
-USHORT XFillBitmapItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillBitmapItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
 {
     // 2. Version
     return( 1 );
@@ -716,7 +716,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -782,7 +782,7 @@ sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMe
 
 //------------------------------------------------------------------------
 
-sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -865,7 +865,7 @@ sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
     return (bSetName || bSetURL || bSetBitmap);
 }
 
-BOOL XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return ((XFillBitmapItem*)p1)->GetBitmapValue().GetGraphicObject().GetUniqueID() ==
            ((XFillBitmapItem*)p2)->GetBitmapValue().GetGraphicObject().GetUniqueID();
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 8b658918069a..052bc4c8d25a 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -88,7 +88,7 @@ XFillExchangeData::~XFillExchangeData()
 |*
 |*
 *************************************************************************/
-ULONG XFillExchangeData::RegisterClipboardFormatName()
+sal_uIntPtr XFillExchangeData::RegisterClipboardFormatName()
 {
     return( SOT_FORMATSTR_ID_XFA );
 }
@@ -104,7 +104,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
     if( rData.pXFillAttrSetItem )
     {
         SfxWhichIter        aIter( rData.pXFillAttrSetItem->GetItemSet() );
-        USHORT              nWhich = aIter.FirstWhich();
+        sal_uInt16              nWhich = aIter.FirstWhich();
         const SfxPoolItem*  pItem;
         sal_uInt32          nItemCount = 0;
         sal_Size            nFirstPos = rOStm.Tell();
@@ -113,10 +113,10 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
 
         while( nWhich )
         {
-            if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, FALSE, &pItem ) )
+            if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, sal_False, &pItem ) )
             {
                 VersionCompat   aCompat( rOStm, STREAM_WRITE );
-                const USHORT    nItemVersion2 = pItem->GetVersion( (USHORT) rOStm.GetVersion() );
+                const sal_uInt16    nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() );
 
                 rOStm << nWhich << nItemVersion2;
                 pItem->Store( rOStm, nItemVersion2 );
@@ -127,7 +127,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
             nWhich = aIter.NextWhich();
         }
 
-        const ULONG nLastPos = rOStm.Tell();
+        const sal_uIntPtr nLastPos = rOStm.Tell();
         rOStm.Seek( nFirstPos );
         rOStm << nItemCount;
         rOStm.Seek( nLastPos );
@@ -150,7 +150,7 @@ SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rData )
     SfxItemSet*     pSet = new SfxItemSet ( *rData.pPool, XATTR_FILL_FIRST, XATTR_FILL_LAST );
     SfxPoolItem*    pNewItem;
     sal_uInt32      nItemCount = 0;
-    USHORT          nWhich, nItemVersion;
+    sal_uInt16          nWhich, nItemVersion;
 
     rIStm >> nItemCount;
 
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 0435b62cd3c8..305b181a65a2 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -108,7 +108,7 @@ XOutdevItemPool::XOutdevItemPool(
     mppLocalPoolDefaults[XATTR_FILLBMP_STRETCH      -XATTR_START] = new XFillBmpStretchItem;
     mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETX       -XATTR_START] = new XFillBmpPosOffsetXItem;
     mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETY       -XATTR_START] = new XFillBmpPosOffsetYItem;
-    mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE    -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, FALSE );
+    mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE    -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, sal_False );
     mppLocalPoolDefaults[XATTR_SECONDARYFILLCOLOR       -XATTR_START] = new XSecondaryFillColorItem(aNullStr, aNullFillCol);
     mppLocalPoolDefaults[XATTR_FILLBACKGROUND           -XATTR_START] = new XFillBackgroundItem;
     mppLocalPoolDefaults[XATTR_FORMTXTSTYLE       -XATTR_START] = new XFormTextStyleItem;
@@ -178,12 +178,12 @@ XOutdevItemPool::XOutdevItemPool(
 /*************************************************************************
 |*
 |* copy ctor, sorgt dafuer, dass die static defaults gecloned werden
-|*            (Parameter 2 = TRUE)
+|*            (Parameter 2 = sal_True)
 |*
 \************************************************************************/
 
 XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool)
-:   SfxItemPool(rPool, TRUE),
+:   SfxItemPool(rPool, sal_True),
     mppLocalPoolDefaults(0L),
     mpLocalItemInfos(0L)
 {
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index d61c339f762d..07a1e5bf3ad9 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -72,7 +72,7 @@ static char const aChckXML[]     = { 'P', 'K', 0x03, 0x04 };        // = 6.0
 
 XBitmapTable::XBitmapTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -107,35 +107,35 @@ XBitmapEntry* XBitmapTable::GetBitmap(long nIndex) const
 
 /************************************************************************/
 
-BOOL XBitmapTable::Load()
+sal_Bool XBitmapTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XBitmapTable::Save()
+sal_Bool XBitmapTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XBitmapTable::Create()
+sal_Bool XBitmapTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XBitmapTable::CreateBitmapsForUI()
+sal_Bool XBitmapTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -152,7 +152,7 @@ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
 
 XBitmapList::XBitmapList( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyList( rPath, pInPool, nInitSize, nReSize)
 {
     // pBmpList = new List( nInitSize, nReSize );
@@ -187,18 +187,18 @@ XBitmapEntry* XBitmapList::GetBitmap(long nIndex) const
 
 /************************************************************************/
 
-BOOL XBitmapList::Load()
+sal_Bool XBitmapList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -209,19 +209,19 @@ BOOL XBitmapList::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXBitmapTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XBitmapList::Save()
+sal_Bool XBitmapList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -236,7 +236,7 @@ BOOL XBitmapList::Save()
 /************************************************************************/
 // Umgestellt am 27.07.95 auf XBitmap
 
-BOOL XBitmapList::Create()
+sal_Bool XBitmapList::Create()
 {
     // Array der Bitmap
     //-----------------------
@@ -252,7 +252,7 @@ BOOL XBitmapList::Create()
     String  aStr( SVX_RES( RID_SVXSTR_BITMAP ) );
     Color   aColWhite( RGB_Color( COL_WHITE ) );
     xub_StrLen nLen;
-    USHORT  aArray[64];
+    sal_uInt16  aArray[64];
 
     memset( aArray, 0, sizeof( aArray ) );
     aStr.AppendAscii(" 1");
@@ -274,19 +274,19 @@ BOOL XBitmapList::Create()
     aStr.SetChar(nLen, sal_Unicode('4'));
     Insert( new XBitmapEntry( XOBitmap( aArray, RGB_Color( COL_LIGHTBLUE ), aColWhite ), aStr ) );
 
-    return( TRUE );
+    return( sal_True );
 }
 
 /************************************************************************/
 
-BOOL XBitmapList::CreateBitmapsForUI()
+sal_Bool XBitmapList::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 2b3ac7ab850b..7411904b6303 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -73,7 +73,7 @@ static XColorTable* pTable=0;
 
 XColorTable::XColorTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     // ColorTable braucht keine eigene BmpTable
@@ -116,18 +116,18 @@ XColorEntry* XColorTable::GetColor(long nIndex) const
 
 /************************************************************************/
 
-BOOL XColorTable::Load()
+sal_Bool XColorTable::Load()
 {
     if( bTableDirty )
     {
-        bTableDirty = FALSE;
+        bTableDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -138,19 +138,19 @@ BOOL XColorTable::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXColorTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XColorTable::Save()
+sal_Bool XColorTable::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -164,13 +164,13 @@ BOOL XColorTable::Save()
 
 /************************************************************************/
 
-BOOL XColorTable::Create()
+sal_Bool XColorTable::Create()
 {
     XubString aStr;
     xub_StrLen nLen;
     ResMgr& rRes = DIALOG_MGR();
 
-    static USHORT __READONLY_DATA aResId[] =
+    static sal_uInt16 __READONLY_DATA aResId[] =
     {
         RID_SVXSTR_BLACK,
         RID_SVXSTR_BLUE,
@@ -219,7 +219,7 @@ BOOL XColorTable::Create()
         COL_WHITE
     };
 
-    for( USHORT n = 0; n < 16; ++n )
+    for( sal_uInt16 n = 0; n < 16; ++n )
     {
         Insert( n, new XColorEntry( Color( aColTab[n] ),
                                     String( ResId( aResId[ n ], rRes )) ) );
@@ -453,14 +453,14 @@ BOOL XColorTable::Create()
 
 /************************************************************************/
 
-BOOL XColorTable::CreateBitmapsForUI()
+sal_Bool XColorTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -477,7 +477,7 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
 
 XColorList::XColorList( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyList( rPath, pInPool, nInitSize, nReSize)
 {
     // pBmpList = new List( nInitSize, nReSize );
@@ -512,35 +512,35 @@ XColorEntry* XColorList::GetColor(long nIndex) const
 
 /************************************************************************/
 
-BOOL XColorList::Load()
+sal_Bool XColorList::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XColorList::Save()
+sal_Bool XColorList::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XColorList::Create()
+sal_Bool XColorList::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XColorList::CreateBitmapsForUI()
+sal_Bool XColorList::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 3455ed4d3588..dd6bf8f17d19 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -86,7 +86,7 @@ char const aChckXML[]   = { '<', '?', 'x', 'm', 'l' };      // = 6.0
 
 XDashTable::XDashTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -121,35 +121,35 @@ XDashEntry* XDashTable::GetDash(long nIndex) const
 
 /************************************************************************/
 
-BOOL XDashTable::Load()
+sal_Bool XDashTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XDashTable::Save()
+sal_Bool XDashTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XDashTable::Create()
+sal_Bool XDashTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XDashTable::CreateBitmapsForUI()
+sal_Bool XDashTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -268,18 +268,18 @@ XDashEntry* XDashList::GetDash(long nIndex) const
     return (XDashEntry*) XPropertyList::Get(nIndex, 0);
 }
 
-BOOL XDashList::Load()
+sal_Bool XDashList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -290,17 +290,17 @@ BOOL XDashList::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXDashTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-BOOL XDashList::Save()
+sal_Bool XDashList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -312,7 +312,7 @@ BOOL XDashList::Save()
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 }
 
-BOOL XDashList::Create()
+sal_Bool XDashList::Create()
 {
     XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) );
     xub_StrLen nLen;
@@ -325,16 +325,16 @@ BOOL XDashList::Create()
     aStr.SetChar(nLen, sal_Unicode('3'));
     Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr));
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL XDashList::CreateBitmapsForUI()
+sal_Bool XDashList::CreateBitmapsForUI()
 {
     impCreate();
 
     for( long i = 0; i < Count(); i++)
     {
-        Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+        Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
         DBG_ASSERT( pBmp, "XDashList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
@@ -343,10 +343,10 @@ BOOL XDashList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( TRUE );
+    return( sal_True );
 }
 
-Bitmap* XDashList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XDashList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 3a9f24c6d15a..02b35fb27f33 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -83,7 +83,7 @@ char const aChckXML[]       = { '<', '?', 'x', 'm', 'l' };      // = 6.0
 
 XGradientTable::XGradientTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -118,35 +118,35 @@ XGradientEntry* XGradientTable::GetGradient(long nIndex) const
 
 /************************************************************************/
 
-BOOL XGradientTable::Load()
+sal_Bool XGradientTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XGradientTable::Save()
+sal_Bool XGradientTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XGradientTable::Create()
+sal_Bool XGradientTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XGradientTable::CreateBitmapsForUI()
+sal_Bool XGradientTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -255,18 +255,18 @@ XGradientEntry* XGradientList::GetGradient(long nIndex) const
     return( (XGradientEntry*) XPropertyList::Get( nIndex, 0 ) );
 }
 
-BOOL XGradientList::Load()
+sal_Bool XGradientList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -278,17 +278,17 @@ BOOL XGradientList::Load()
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-BOOL XGradientList::Save()
+sal_Bool XGradientList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -300,7 +300,7 @@ BOOL XGradientList::Save()
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 }
 
-BOOL XGradientList::Create()
+sal_Bool XGradientList::Create()
 {
     XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) );
     xub_StrLen nLen;
@@ -319,16 +319,16 @@ BOOL XGradientList::Create()
     aStr.SetChar(nLen, sal_Unicode('6'));
     Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT      , 1900,60,60,50,100,100),aStr));
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL XGradientList::CreateBitmapsForUI()
+sal_Bool XGradientList::CreateBitmapsForUI()
 {
     impCreate();
 
     for( long i = 0; i < Count(); i++)
     {
-        Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+        Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
         DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
@@ -337,10 +337,10 @@ BOOL XGradientList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( FALSE );
+    return( sal_False );
 }
 
-Bitmap* XGradientList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index ef5beece8dc8..b62909fda71a 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -82,7 +82,7 @@ char const aChckXML[]    = { '<', '?', 'x', 'm', 'l' };     // = 6.0
 
 XHatchTable::XHatchTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -117,35 +117,35 @@ XHatchEntry* XHatchTable::GetHatch(long nIndex) const
 
 /************************************************************************/
 
-BOOL XHatchTable::Load()
+sal_Bool XHatchTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XHatchTable::Save()
+sal_Bool XHatchTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XHatchTable::Create()
+sal_Bool XHatchTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XHatchTable::CreateBitmapsForUI()
+sal_Bool XHatchTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -264,18 +264,18 @@ XHatchEntry* XHatchList::GetHatch(long nIndex) const
     return (XHatchEntry*) XPropertyList::Get(nIndex, 0);
 }
 
-BOOL XHatchList::Load()
+sal_Bool XHatchList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -286,17 +286,17 @@ BOOL XHatchList::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXHatchTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-BOOL XHatchList::Save()
+sal_Bool XHatchList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -308,7 +308,7 @@ BOOL XHatchList::Save()
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 }
 
-BOOL XHatchList::Create()
+sal_Bool XHatchList::Create()
 {
     XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) );
     xub_StrLen nLen;
@@ -321,16 +321,16 @@ BOOL XHatchList::Create()
     aStr.SetChar(nLen, sal_Unicode('3'));
     Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120,  0),aStr));
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL XHatchList::CreateBitmapsForUI()
+sal_Bool XHatchList::CreateBitmapsForUI()
 {
     impCreate();
 
     for( long i = 0; i < Count(); i++)
     {
-        Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+        Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
         DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
@@ -339,10 +339,10 @@ BOOL XHatchList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( TRUE );
+    return( sal_True );
 }
 
-Bitmap* XHatchList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XHatchList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index befbe5696db9..e0e0a1c7aa69 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -57,19 +57,19 @@ Color RGB_Color( ColorData nColorName )
 
 XPropertyTable::XPropertyTable( const String& rPath,
                                 XOutdevItemPool* pInPool,
-                                USHORT nInitSize, USHORT nReSize ) :
+                                sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
             aName           ( pszStandard, 8 ),
             aPath           ( rPath ),
             pXPool          ( pInPool ),
             aTable          ( nInitSize, nReSize ),
             pBmpTable       ( NULL ),
-            bTableDirty     ( TRUE ),
-            bBitmapsDirty   ( TRUE ),
-            bOwnPool        ( FALSE )
+            bTableDirty     ( sal_True ),
+            bBitmapsDirty   ( sal_True ),
+            bOwnPool        ( sal_False )
 {
     if( !pXPool )
     {
-        bOwnPool = TRUE;
+        bOwnPool = sal_True;
         pXPool = new XOutdevItemPool;
         DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
     }
@@ -96,7 +96,7 @@ XPropertyTable::~XPropertyTable()
 {
     XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
     Bitmap* pBitmap = NULL;
-    for (ULONG nIndex = 0; nIndex < aTable.Count(); nIndex++)
+    for (sal_uIntPtr nIndex = 0; nIndex < aTable.Count(); nIndex++)
     {
         delete pEntry;
         pEntry = (XPropertyEntry*)aTable.Next();
@@ -106,7 +106,7 @@ XPropertyTable::~XPropertyTable()
     {
         pBitmap = (Bitmap*) pBmpTable->First();
 
-        for( ULONG nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
+        for( sal_uIntPtr nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
         {
             delete pBitmap;
             pBitmap = (Bitmap*) pBmpTable->Next();
@@ -140,7 +140,7 @@ long XPropertyTable::Count() const
 {
     if( bTableDirty )
     {
-        // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+        // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
         if( !( (XPropertyTable*) this )->Load() )
             ( (XPropertyTable*) this )->Create();
     }
@@ -153,15 +153,15 @@ long XPropertyTable::Count() const
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyTable::Get( long nIndex, sal_uInt16 /*nDummy*/) const
 {
     if( bTableDirty )
     {
-        // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+        // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
         if( !( (XPropertyTable*) this )->Load() )
             ( (XPropertyTable*) this )->Create();
     }
-    return (XPropertyEntry*) aTable.GetObject( (ULONG) nIndex );
+    return (XPropertyEntry*) aTable.GetObject( (sal_uIntPtr) nIndex );
 }
 
 /*************************************************************************
@@ -174,7 +174,7 @@ long XPropertyTable::Get(const XubString& rName)
 {
     if( bTableDirty )
     {
-        // bTableDirty = FALSE;
+        // bTableDirty = sal_False;
         if( !Load() )
             Create();
     }
@@ -201,12 +201,12 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
     {
         if( bBitmapsDirty )
         {
-            ( (XPropertyTable*) this )->bBitmapsDirty = FALSE;
+            ( (XPropertyTable*) this )->bBitmapsDirty = sal_False;
             ( (XPropertyTable*) this )->CreateBitmapsForUI();
         }
 
-        if( pBmpTable->Count() >= (ULONG) nIndex )
-            return (Bitmap*) pBmpTable->GetObject( (ULONG) nIndex );
+        if( pBmpTable->Count() >= (sal_uIntPtr) nIndex )
+            return (Bitmap*) pBmpTable->GetObject( (sal_uIntPtr) nIndex );
     }
     return( NULL );
 }
@@ -217,14 +217,14 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
 |*
 *************************************************************************/
 
-BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
+sal_Bool XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
 {
-    BOOL bReturn = aTable.Insert( (ULONG) nIndex, pEntry );
+    sal_Bool bReturn = aTable.Insert( (sal_uIntPtr) nIndex, pEntry );
 
     if( pBmpTable && !bBitmapsDirty )
     {
-        Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
-        pBmpTable->Insert( (ULONG) nIndex, pBmp );
+        Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+        pBmpTable->Insert( (sal_uIntPtr) nIndex, pBmp );
     }
     return bReturn;
 }
@@ -237,12 +237,12 @@ BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
 
 XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
 {
-    XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (ULONG) nIndex, pEntry );
+    XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (sal_uIntPtr) nIndex, pEntry );
 
     if( pBmpTable && !bBitmapsDirty )
     {
-        Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
-        Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (ULONG) nIndex, pBmp );
+        Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+        Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (sal_uIntPtr) nIndex, pBmp );
         if( pOldBmp )
             delete pOldBmp;
     }
@@ -255,15 +255,15 @@ XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyTable::Remove( long nIndex, sal_uInt16 /*nDummy*/)
 {
     if( pBmpTable && !bBitmapsDirty )
     {
-        Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (ULONG) nIndex );
+        Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (sal_uIntPtr) nIndex );
         if( pOldBmp )
             delete pOldBmp;
     }
-    return (XPropertyEntry*) aTable.Remove((ULONG)nIndex);
+    return (XPropertyEntry*) aTable.Remove((sal_uIntPtr)nIndex);
 }
 
 /************************************************************************/
@@ -289,19 +289,19 @@ void XPropertyTable::SetName( const String& rString )
 
 XPropertyList::XPropertyList( const String& rPath,
                                 XOutdevItemPool* pInPool,
-                                USHORT nInitSize, USHORT nReSize ) :
+                                sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
             aName           ( pszStandard, 8 ),
             aPath           ( rPath ),
             pXPool          ( pInPool ),
             aList           ( nInitSize, nReSize ),
             pBmpList        ( NULL ),
-            bListDirty      ( TRUE ),
-            bBitmapsDirty   ( TRUE ),
-            bOwnPool        ( FALSE )
+            bListDirty      ( sal_True ),
+            bBitmapsDirty   ( sal_True ),
+            bOwnPool        ( sal_False )
 {
     if( !pXPool )
     {
-        bOwnPool = TRUE;
+        bOwnPool = sal_True;
         pXPool = new XOutdevItemPool;
         DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
     }
@@ -328,7 +328,7 @@ XPropertyList::~XPropertyList()
 {
     XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
     Bitmap* pBitmap = NULL;
-    for( ULONG nIndex = 0; nIndex < aList.Count(); nIndex++ )
+    for( sal_uIntPtr nIndex = 0; nIndex < aList.Count(); nIndex++ )
     {
         delete pEntry;
         pEntry = (XPropertyEntry*)aList.Next();
@@ -338,7 +338,7 @@ XPropertyList::~XPropertyList()
     {
         pBitmap = (Bitmap*) pBmpList->First();
 
-        for( ULONG nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
+        for( sal_uIntPtr nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
         {
             delete pBitmap;
             pBitmap = (Bitmap*) pBmpList->Next();
@@ -372,7 +372,7 @@ long XPropertyList::Count() const
 {
     if( bListDirty )
     {
-        // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+        // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
         if( !( (XPropertyList*) this )->Load() )
             ( (XPropertyList*) this )->Create();
     }
@@ -385,15 +385,15 @@ long XPropertyList::Count() const
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyList::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyList::Get( long nIndex, sal_uInt16 /*nDummy*/) const
 {
     if( bListDirty )
     {
-        // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+        // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
         if( !( (XPropertyList*) this )->Load() )
             ( (XPropertyList*) this )->Create();
     }
-    return (XPropertyEntry*) aList.GetObject( (ULONG) nIndex );
+    return (XPropertyEntry*) aList.GetObject( (sal_uIntPtr) nIndex );
 }
 
 /*************************************************************************
@@ -406,7 +406,7 @@ long XPropertyList::Get(const XubString& rName)
 {
     if( bListDirty )
     {
-        //bListDirty = FALSE;
+        //bListDirty = sal_False;
         if( !Load() )
             Create();
     }
@@ -433,11 +433,11 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
     {
         if( bBitmapsDirty )
         {
-            ( (XPropertyList*) this )->bBitmapsDirty = FALSE;
+            ( (XPropertyList*) this )->bBitmapsDirty = sal_False;
             ( (XPropertyList*) this )->CreateBitmapsForUI();
         }
-        if( pBmpList->Count() >= (ULONG) nIndex )
-            return (Bitmap*) pBmpList->GetObject( (ULONG) nIndex );
+        if( pBmpList->Count() >= (sal_uIntPtr) nIndex )
+            return (Bitmap*) pBmpList->GetObject( (sal_uIntPtr) nIndex );
     }
     return( NULL );
 }
@@ -450,13 +450,13 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
 
 void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
 {
-    aList.Insert( pEntry, (ULONG) nIndex );
+    aList.Insert( pEntry, (sal_uIntPtr) nIndex );
 
     if( pBmpList && !bBitmapsDirty )
     {
         Bitmap* pBmp = CreateBitmapForUI(
-                (ULONG) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
-        pBmpList->Insert( pBmp, (ULONG) nIndex );
+                (sal_uIntPtr) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
+        pBmpList->Insert( pBmp, (sal_uIntPtr) nIndex );
     }
 }
 
@@ -468,12 +468,12 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
 
 XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
 {
-    XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (ULONG) nIndex );
+    XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (sal_uIntPtr) nIndex );
 
     if( pBmpList && !bBitmapsDirty )
     {
-        Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
-        Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (ULONG) nIndex );
+        Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+        Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (sal_uIntPtr) nIndex );
         if( pOldBmp )
             delete pOldBmp;
     }
@@ -486,15 +486,15 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyList::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/)
 {
     if( pBmpList && !bBitmapsDirty )
     {
-        Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (ULONG) nIndex );
+        Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (sal_uIntPtr) nIndex );
         if( pOldBmp )
             delete pOldBmp;
     }
-    return (XPropertyEntry*) aList.Remove( (ULONG) nIndex );
+    return (XPropertyEntry*) aList.Remove( (sal_uIntPtr) nIndex );
 }
 
 /************************************************************************/
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index ac5dcc739e41..4a984b2a5bfb 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -95,7 +95,7 @@ static char const aChckXML[]   = { '<', '?', 'x', 'm', 'l' };       // = 6.0
 
 XLineEndTable::XLineEndTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -130,37 +130,37 @@ XLineEndEntry* XLineEndTable::GetLineEnd(long nIndex) const
 
 /************************************************************************/
 
-BOOL XLineEndTable::Load()
+sal_Bool XLineEndTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XLineEndTable::Save()
+sal_Bool XLineEndTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XLineEndTable::Create()
+sal_Bool XLineEndTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
 
 /************************************************************************/
 
-BOOL XLineEndTable::CreateBitmapsForUI()
+sal_Bool XLineEndTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 // --------------------
@@ -277,18 +277,18 @@ XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const
     return (XLineEndEntry*) XPropertyList::Get(nIndex, 0);
 }
 
-BOOL XLineEndList::Load()
+sal_Bool XLineEndList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -299,17 +299,17 @@ BOOL XLineEndList::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-BOOL XLineEndList::Save()
+sal_Bool XLineEndList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -321,7 +321,7 @@ BOOL XLineEndList::Save()
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 }
 
-BOOL XLineEndList::Create()
+sal_Bool XLineEndList::Create()
 {
     basegfx::B2DPolygon aTriangle;
     aTriangle.append(basegfx::B2DPoint(10.0, 0.0));
@@ -341,16 +341,16 @@ BOOL XLineEndList::Create()
     basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0));
     Insert( new XLineEndEntry( basegfx::B2DPolyPolygon(aCircle), SVX_RESSTR( RID_SVXSTR_CIRCLE ) ) );
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL XLineEndList::CreateBitmapsForUI()
+sal_Bool XLineEndList::CreateBitmapsForUI()
 {
     impCreate();
 
     for( long i = 0; i < Count(); i++)
     {
-        Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+        Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
         OSL_ENSURE(0 != pBmp, "XLineEndList: Bitmap(UI) could not be created!" );
 
         if( pBmp )
@@ -359,10 +359,10 @@ BOOL XLineEndList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( TRUE );
+    return( sal_True );
 }
 
-Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 125de9b29b6b..9b2f4f2e2aac 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -153,7 +153,7 @@
 // VARS...
 short nRotation = 0;
 USHORT nZoom = 100;
-BOOL bURLClicked = FALSE;
+sal_Bool bURLClicked = sal_False;
 
 using namespace ::com::sun::star::connection;
 using namespace ::vos;
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 6e546950a23a..94af36513670 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -490,7 +490,7 @@ sal_Int32 SAL_CALL SortedResultSet::getRow()
  @param row
     is the number of rows to move. Could be negative.
  @returns
-    <sal_True/> if the cursor is on a row; <sal_False/> otherwise
+    <TRUE/> if the cursor is on a row; <FALSE/> otherwise
  @throws SQLException
     if a database access error occurs or if row is 0, or the result set
     type is FORWARD_ONLY.
@@ -552,7 +552,7 @@ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row )
  @param rows
     is the number of rows to move. Could be negative.
  @returns
-    <sal_True/> if the cursor is on a valid row; <sal_False/> if it is off
+    <TRUE/> if the cursor is on a valid row; <FALSE/> if it is off
     the result set.
  @throws SQLException
     if a database access error occurs or if there is no
@@ -597,7 +597,7 @@ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows )
  <p>Note: <code>previous()</code> is not the same as
  <code>relative(-1)</code> because it makes sense to call
  <code>previous()</code> when there is no current row.
- @returns <sal_True/> if the cursor is on a valid row; <sal_False/> if it is off
+ @returns <TRUE/> if the cursor is on a valid row; <FALSE/> if it is off
     the result set.
  @throws SQLException
     if a database access error occurs or the result set type
diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx
index a806ff4e59e8..c75d32699a73 100644
--- a/uui/source/cookiedg.cxx
+++ b/uui/source/cookiedg.cxx
@@ -80,7 +80,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
     maCookieFB.SetPosSizePixel( LogicToPixel( aPoint ), aSize );
     maCookieFB.Show();
 
-    USHORT nOffset = CNTHTTP_COOKIE_REQUEST_RECV == mpCookieRequest->m_eType
+    sal_uInt16 nOffset = CNTHTTP_COOKIE_REQUEST_RECV == mpCookieRequest->m_eType
         ? 0 : STR_COOKIES_SEND_START - STR_COOKIES_RECV_START;
     INetURLObject aObj( mpCookieRequest->m_rURL );
     SetText( String( ResId( STR_COOKIES_RECV_TITLE + nOffset, *pResMgr ) ) );
@@ -91,7 +91,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
     List& rList =mpCookieRequest->m_rCookieList;
     String aPair, aCookie;
 
-    for ( USHORT i = (USHORT)rList.Count(); i--; )
+    for ( sal_uInt16 i = (sal_uInt16)rList.Count(); i--; )
     {
         CntHTTPCookie* pCookie = (CntHTTPCookie*)rList.GetObject(i);
 
@@ -107,7 +107,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
             aMsg += aCookie;
         }
     }
-    maInFutureInteractiveBtn.Check( TRUE );
+    maInFutureInteractiveBtn.Check( sal_True );
     maCookieFT.SetText( aMsg );
 }
 
@@ -117,7 +117,7 @@ short CookiesDialog::Execute()
 {
     maSendBtn.GrabFocus();
     short nRet = ModalDialog::Execute();
-    USHORT nStatus = CNTHTTP_COOKIE_POLICY_INTERACTIVE;
+    sal_uInt16 nStatus = CNTHTTP_COOKIE_POLICY_INTERACTIVE;
 
     if ( maInFutureSendBtn.IsChecked() )
         nStatus = CNTHTTP_COOKIE_POLICY_ACCEPTED;
@@ -126,9 +126,9 @@ short CookiesDialog::Execute()
         nStatus = CNTHTTP_COOKIE_POLICY_BANNED;
     List& rList = mpCookieRequest->m_rCookieList;
 
-    for ( USHORT i = (USHORT)rList.Count(); i--; )
+    for ( sal_uInt16 i = (sal_uInt16)rList.Count(); i--; )
     {
-        USHORT& rStatus = ( (CntHTTPCookie*)rList.GetObject(i) )->m_nPolicy;
+        sal_uInt16& rStatus = ( (CntHTTPCookie*)rList.GetObject(i) )->m_nPolicy;
 
         if ( rStatus == CNTHTTP_COOKIE_POLICY_INTERACTIVE )
             rStatus = nStatus;
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 4bda9fb9e579..55be2298abbd 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -140,15 +140,15 @@ void FilterDialog::ChangeFilters( const FilterNameList* pFilterNames )
 /*-************************************************************************************************************//**
     @short      ask user for his decision
     @descr      We show the dialog and if user finish it with "OK" - we try to find selected item in internal saved
-                name list (which you must set in "ChangeFilters()"!). If we return TRUE as result, you can use out
+                name list (which you must set in "ChangeFilters()"!). If we return sal_True as result, you can use out
                 parameter "pSelectedItem" as pointer into your FilterNameList to get selected item realy ...
-                but if we return FALSE ... user hsa cancel the dialog ... you shouldnt do that. pSelectedItem isnt
+                but if we return sal_False ... user hsa cancel the dialog ... you shouldnt do that. pSelectedItem isnt
                 set to any valid value then. We don't change them ...
 
     @seealso    method ChangeFilters()
 
     @param      "pSelectedItem", returns result of selection as pointer into set list of filter names
-                                 (valid for function return TRUE only!)
+                                 (valid for function return sal_True only!)
     @return     true  => pSelectedItem parameter points into name list and represent use decision
                 false => use has cancelled dialog (pSelectedItem isnt valid then!)
 
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 3176171c4865..0e5b011c7bf2 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -48,7 +48,7 @@ using namespace com::sun::star;
 
 namespace {
 
-USHORT
+sal_uInt16
 executeErrorDialog(
     Window * pParent,
     task::InteractionClassification eClassification,
@@ -112,7 +112,7 @@ executeErrorDialog(
             uno::Reference< uno::XInterface >());
     }
 
-    USHORT aResult = xBox->Execute();
+    sal_uInt16 aResult = xBox->Execute();
     switch( aResult )
     {
     case BUTTONID_OK:
@@ -164,7 +164,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
                 CREATEVERSIONRESMGR_NAME(cnt),
                 CREATEVERSIONRESMGR_NAME(svx),
                 CREATEVERSIONRESMGR_NAME(uui) };
-        static USHORT const aId[4]
+        static sal_uInt16 const aId[4]
             = { RID_ERRHDL,
                 RID_CHAOS_START + 12,
                 // cf. chaos/source/inc/cntrids.hrc, where
@@ -276,7 +276,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             }
         }
 
-        USHORT nResult = executeErrorDialog(
+        sal_uInt16 nResult = executeErrorDialog(
             getParentProperty(), eClassification, aContext, aMessage, nButtonMask );
 
         switch (nResult)
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index ee233f5ac9de..a872f7843706 100755
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -186,7 +186,7 @@ UUIInteractionHelper::handleRequest(
         HandleData aHD(rRequest);
         Link aLink(&aHD,handlerequest);
         pApp->PostUserEvent(aLink,this);
-        ULONG locks = Application::ReleaseSolarMutex();
+        sal_uLong locks = Application::ReleaseSolarMutex();
         aHD.wait();
         Application::AcquireSolarMutex(locks);
         return aHD.bHandled;
@@ -247,7 +247,7 @@ UUIInteractionHelper::getStringFromRequest(
         HandleData aHD(rRequest);
         Link aLink(&aHD,getstringfromrequest);
         pApp->PostUserEvent(aLink,this);
-        ULONG locks = Application::ReleaseSolarMutex();
+        sal_uLong locks = Application::ReleaseSolarMutex();
         aHD.wait();
         Application::AcquireSolarMutex(locks);
         return aHD.m_aResult;
@@ -1152,7 +1152,7 @@ UUIInteractionHelper::getInteractionHandler()
 
 namespace {
 
-USHORT
+sal_uInt16
 executeMessageBox(
     Window * pParent,
     rtl::OUString const & rTitle,
@@ -1164,7 +1164,7 @@ executeMessageBox(
 
     MessBox xBox( pParent, nButtonMask, rTitle, rMessage );
 
-    USHORT aResult = xBox.Execute();
+    sal_uInt16 aResult = xBox.Execute();
     switch( aResult )
     {
     case BUTTONID_OK:
@@ -1576,7 +1576,7 @@ ErrorResource::getString(ErrCode nErrorCode, rtl::OUString * pString)
     const SAL_THROW(())
 {
     OSL_ENSURE(pString, "specification violation");
-    ResId aResId(static_cast< USHORT >(nErrorCode & ERRCODE_RES_MASK),
+    ResId aResId(static_cast< sal_uInt16 >(nErrorCode & ERRCODE_RES_MASK),
                  *m_pResMgr);
     aResId.SetRT(RSC_STRING);
     if (!IsAvailableRes(aResId))
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index b0630a5514b2..c1489cd13704 100755
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -39,7 +39,7 @@
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/task/InteractionClassification.hpp"
 
-#include "tools/solar.h" // USHORT
+#include "tools/solar.h" // sal_uInt16
 #include "tools/errcode.hxx" // ErrCode
 #include "tools/rc.hxx" // Resource
 #include "tools/wintypes.hxx" // WinBits
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index d7ded58b5dde..ccf2b4806d26 100755..100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -55,24 +55,24 @@ static void lcl_Move( Window &rWin, long nOffset )
 }
 
 
-void LoginDialog::HideControls_Impl( USHORT nFlags )
+void LoginDialog::HideControls_Impl( sal_uInt16 nFlags )
 {
-    bool bPathHide = FALSE;
-    bool bErrorHide = FALSE;
-    bool bAccountHide = FALSE;
-    bool bUseSysCredsHide = FALSE;
+    bool bPathHide = sal_False;
+    bool bErrorHide = sal_False;
+    bool bAccountHide = sal_False;
+    bool bUseSysCredsHide = sal_False;
 
     if ( ( nFlags & LF_NO_PATH ) == LF_NO_PATH )
     {
         aPathFT.Hide();
         aPathED.Hide();
         aPathBtn.Hide();
-        bPathHide = TRUE;
+        bPathHide = sal_True;
     }
     else if ( ( nFlags & LF_PATH_READONLY ) == LF_PATH_READONLY )
     {
-        aPathED.Enable( FALSE );
-        aPathBtn.Enable( FALSE );
+        aPathED.Enable( sal_False );
+        aPathBtn.Enable( sal_False );
     }
 
     if ( ( nFlags & LF_NO_USERNAME ) == LF_NO_USERNAME )
@@ -82,7 +82,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
     }
     else if ( ( nFlags & LF_USERNAME_READONLY ) == LF_USERNAME_READONLY )
     {
-        aNameED.Enable( FALSE );
+        aNameED.Enable( sal_False );
     }
 
     if ( ( nFlags & LF_NO_PASSWORD ) == LF_NO_PASSWORD )
@@ -99,20 +99,20 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
         aErrorInfo.Hide();
         aErrorFT.Hide();
         aLogin1FL.Hide();
-        bErrorHide = TRUE;
+        bErrorHide = sal_True;
     }
 
     if ( ( nFlags & LF_NO_ACCOUNT ) == LF_NO_ACCOUNT )
     {
         aAccountFT.Hide();
         aAccountED.Hide();
-        bAccountHide = TRUE;
+        bAccountHide = sal_True;
     }
 
     if ( ( nFlags & LF_NO_USESYSCREDS ) == LF_NO_USESYSCREDS )
     {
         aUseSysCredsCB.Hide();
-        bUseSysCredsHide = TRUE;
+        bUseSysCredsHide = sal_True;
     }
 
     if ( bErrorHide )
@@ -196,7 +196,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
 };
 
 // -----------------------------------------------------------------------
-void LoginDialog::EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled )
+void LoginDialog::EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled )
 {
     aErrorInfo.Enable( !bUseSysCredsEnabled );
     aErrorFT.Enable( !bUseSysCredsEnabled );
@@ -252,7 +252,7 @@ IMPL_LINK( LoginDialog, UseSysCredsHdl_Impl, CheckBox *, EMPTYARG )
 LoginDialog::LoginDialog
 (
     Window* pParent,
-    USHORT nFlags,
+    sal_uInt16 nFlags,
     const String& rServer,
     const String* pRealm,
     ResMgr* pResMgr
@@ -317,7 +317,7 @@ LoginDialog::~LoginDialog()
 
 // -----------------------------------------------------------------------
 
-void LoginDialog::SetUseSystemCredentials( BOOL bUse )
+void LoginDialog::SetUseSystemCredentials( sal_Bool bUse )
 {
     if ( aUseSysCredsCB.IsVisible() )
     {
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 05ba8e8d55d4..c05bb00e6997 100755..100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -74,15 +74,15 @@ class LoginDialog : public ModalDialog
     CancelButton    aCancelBtn;
     HelpButton      aHelpBtn;
 
-    void            HideControls_Impl( USHORT nFlags );
-    void            EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled );
+    void            HideControls_Impl( sal_uInt16 nFlags );
+    void            EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled );
 
     DECL_LINK( OKHdl_Impl, OKButton * );
     DECL_LINK( PathHdl_Impl, PushButton * );
     DECL_LINK( UseSysCredsHdl_Impl, CheckBox * );
 
 public:
-    LoginDialog( Window* pParent, USHORT nFlags,
+    LoginDialog( Window* pParent, sal_uInt16 nFlags,
                  const String& rServer, const String* pRealm,
                  ResMgr * pResMgr );
     virtual ~LoginDialog();
@@ -95,11 +95,11 @@ public:
     void            SetPassword( const String& rNew )           { aPasswordED.SetText( rNew ); }
     String          GetAccount() const                          { return aAccountED.GetText(); }
     void            SetAccount( const String& rNew )            { aAccountED.SetText( rNew ); }
-    BOOL            IsSavePassword() const                      { return aSavePasswdBtn.IsChecked(); }
-    void            SetSavePassword( BOOL bSave )               { aSavePasswdBtn.Check( bSave ); }
+    sal_Bool            IsSavePassword() const                      { return aSavePasswdBtn.IsChecked(); }
+    void            SetSavePassword( sal_Bool bSave )               { aSavePasswdBtn.Check( bSave ); }
     void            SetSavePasswordText( const String& rTxt )   { aSavePasswdBtn.SetText( rTxt ); }
-    BOOL            IsUseSystemCredentials() const              { return aUseSysCredsCB.IsChecked(); }
-    void            SetUseSystemCredentials( BOOL bUse );
+    sal_Bool            IsUseSystemCredentials() const              { return aUseSysCredsCB.IsChecked(); }
+    void            SetUseSystemCredentials( sal_Bool bUse );
     void            SetErrorText( const String& rTxt )          { aErrorInfo.SetText( rTxt ); }
     void            SetLoginRequestText( const String& rTxt )   { aRequestInfo.SetText( rTxt ); }
     void            ClearPassword();
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index 39bbfb7d820c..208228eef131 100755..100644
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -51,8 +51,8 @@ private:
     String m_aPasswordToModify;
     String m_aPath;
     String m_aErrorText;
-    BYTE   m_nFlags;
-    USHORT m_nRet;
+    sal_uInt8   m_nFlags;
+    sal_uInt16 m_nRet;
     bool   m_bRecommendToOpenReadonly;
 
 public:
@@ -71,17 +71,17 @@ public:
     bool      IsRecommendToOpenReadonly() const   { return m_bRecommendToOpenReadonly; }
     const String&   GetPath() const                     { return m_aPath; }
     const String&   GetErrorText() const                { return m_aErrorText; }
-    BOOL            GetCanRememberPassword() const      { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); }
-    BOOL            GetIsRememberPersistent() const     { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); }
-    BOOL            GetIsRememberPassword() const       { return ( m_nFlags & LOGINERROR_FLAG_IS_REMEMBER_PASSWORD ); }
+    sal_Bool            GetCanRememberPassword() const      { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); }
+    sal_Bool            GetIsRememberPersistent() const     { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); }
+    sal_Bool            GetIsRememberPassword() const       { return ( m_nFlags & LOGINERROR_FLAG_IS_REMEMBER_PASSWORD ); }
 
-    BOOL            GetCanUseSystemCredentials() const
+    sal_Bool            GetCanUseSystemCredentials() const
                     { return ( m_nFlags & LOGINERROR_FLAG_CAN_USE_SYSCREDS ); }
-    BOOL            GetIsUseSystemCredentials() const
+    sal_Bool            GetIsUseSystemCredentials() const
                     { return ( m_nFlags & LOGINERROR_FLAG_IS_USE_SYSCREDS ) ==
                              LOGINERROR_FLAG_IS_USE_SYSCREDS; }
-    BYTE            GetFlags() const        { return m_nFlags; }
-    USHORT          GetResult() const       { return m_nRet; }
+    sal_uInt8            GetFlags() const        { return m_nFlags; }
+    sal_uInt16          GetResult() const       { return m_nRet; }
 
     void            SetTitle( const String& aTitle )
                     { m_aTitle = aTitle; }
@@ -101,23 +101,23 @@ public:
                     { m_aPath = aPath; }
     void            SetErrorText( const String& aErrorText )
                     { m_aErrorText = aErrorText; }
-    void            SetFlags( BYTE nFlags )
+    void            SetFlags( sal_uInt8 nFlags )
                     { m_nFlags = nFlags; }
 
-    inline void     SetCanRememberPassword( BOOL bSet );
-    inline void     SetIsRememberPassword( BOOL bSet );
-    inline void     SetIsRememberPersistent( BOOL bSet );
+    inline void     SetCanRememberPassword( sal_Bool bSet );
+    inline void     SetIsRememberPassword( sal_Bool bSet );
+    inline void     SetIsRememberPersistent( sal_Bool bSet );
 
-    inline void     SetCanUseSystemCredentials( BOOL bSet );
-    inline void     SetIsUseSystemCredentials( BOOL bSet );
-    inline void     SetModifyAccount( BOOL bSet );
-    inline void     SetModifyUserName( BOOL bSet );
+    inline void     SetCanUseSystemCredentials( sal_Bool bSet );
+    inline void     SetIsUseSystemCredentials( sal_Bool bSet );
+    inline void     SetModifyAccount( sal_Bool bSet );
+    inline void     SetModifyUserName( sal_Bool bSet );
 
-    void            SetResult( USHORT nRet )
+    void            SetResult( sal_uInt16 nRet )
                     { m_nRet = nRet; }
 };
 
-inline void LoginErrorInfo::SetCanRememberPassword( BOOL bSet )
+inline void LoginErrorInfo::SetCanRememberPassword( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD;
@@ -125,7 +125,7 @@ inline void LoginErrorInfo::SetCanRememberPassword( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD;
 }
 
-inline void LoginErrorInfo::SetIsRememberPassword( BOOL bSet )
+inline void LoginErrorInfo::SetIsRememberPassword( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_IS_REMEMBER_PASSWORD;
@@ -133,7 +133,7 @@ inline void LoginErrorInfo::SetIsRememberPassword( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_IS_REMEMBER_PASSWORD;
 }
 
-inline void LoginErrorInfo::SetIsRememberPersistent( BOOL bSet )
+inline void LoginErrorInfo::SetIsRememberPersistent( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_REMEMBER_PERSISTENT;
@@ -141,7 +141,7 @@ inline void LoginErrorInfo::SetIsRememberPersistent( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_REMEMBER_PERSISTENT;
 }
 
-inline void LoginErrorInfo::SetCanUseSystemCredentials( BOOL bSet )
+inline void LoginErrorInfo::SetCanUseSystemCredentials( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_CAN_USE_SYSCREDS;
@@ -149,7 +149,7 @@ inline void LoginErrorInfo::SetCanUseSystemCredentials( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_CAN_USE_SYSCREDS;
 }
 
-inline void LoginErrorInfo::SetIsUseSystemCredentials( BOOL bSet )
+inline void LoginErrorInfo::SetIsUseSystemCredentials( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_IS_USE_SYSCREDS;
@@ -157,7 +157,7 @@ inline void LoginErrorInfo::SetIsUseSystemCredentials( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_IS_USE_SYSCREDS;
 }
 
-inline void LoginErrorInfo::SetModifyAccount( BOOL bSet )
+inline void LoginErrorInfo::SetModifyAccount( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_MODIFY_ACCOUNT;
@@ -165,7 +165,7 @@ inline void LoginErrorInfo::SetModifyAccount( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_MODIFY_ACCOUNT;
 }
 
-inline void LoginErrorInfo::SetModifyUserName( BOOL bSet )
+inline void LoginErrorInfo::SetModifyUserName( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_MODIFY_USER_NAME;
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 348d2f833e15..a6fa5134c277 100755..100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -71,8 +71,8 @@ PasswordDialog::PasswordDialog(
 {
     if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER )
     {
-        const USHORT nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
-        const USHORT nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId;
+        const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
+        const sal_uInt16 nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId;
         String aErrorMsg( ResId( nErrStrId, *pResourceMgr ));
         ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
         aErrorBox.Execute();
@@ -82,8 +82,8 @@ PasswordDialog::PasswordDialog(
     String aTitle( ResId( STR_TITLE_ENTER_PASSWORD, *pResourceMgr ) );
     aFTConfirmPassword.Hide();
     aEDConfirmPassword.Hide();
-    aFTConfirmPassword.Enable( FALSE );
-    aEDConfirmPassword.Enable( FALSE );
+    aFTConfirmPassword.Enable( sal_False );
+    aEDConfirmPassword.Enable( sal_False );
 
     // settings for create password
     if (nDialogMode == task::PasswordRequestMode_PASSWORD_CREATE)
@@ -94,8 +94,8 @@ PasswordDialog::PasswordDialog(
 
         aFTConfirmPassword.Show();
         aEDConfirmPassword.Show();
-        aFTConfirmPassword.Enable( TRUE );
-        aEDConfirmPassword.Enable( TRUE );
+        aFTConfirmPassword.Enable( sal_True );
+        aEDConfirmPassword.Enable( sal_True );
     }
     else
     {
@@ -115,7 +115,7 @@ PasswordDialog::PasswordDialog(
 
     SetText( aTitle );
 
-    USHORT nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
+    sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
     aFTPassword.SetText( String( ResId( nStrId, *pResourceMgr ) ) );
     aFTPassword.SetText( aFTPassword.GetText() + aDocURL );
     if (bIsSimplePasswordRequest)
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index b94dbab82444..b35514dae651 100755..100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -48,7 +48,7 @@ class PasswordDialog : public ModalDialog
     CancelButton    aCancelBtn;
     HelpButton      aHelpBtn;
     FixedLine       aFixedLine1;
-    USHORT          nMinLen;
+    sal_uInt16          nMinLen;
     String          aPasswdMismatch;
 
 
@@ -58,7 +58,7 @@ public:
     PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL,
             bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
 
-    void            SetMinLen( USHORT nMin ) { nMinLen = nMin; }
+    void            SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; }
     String          GetPassword() const { return aEDPassword.GetText(); }
 
 private:
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index dda2200aa04a..22dc9a8f6cc8 100644
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -78,7 +78,7 @@ namespace ooo
 
         VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const rtl::OUString& aUrl );
         VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const rtl::OUString& aUrl, const css::uno::Sequence< css::beans::PropertyValue >& sProps );
-        VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
+        VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, sal_uInt16 nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
         VBAHELPER_DLLPUBLIC sal_Int32 OORGBToXLRGB( sal_Int32 );
         VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 );
         VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& );
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index c435744c5606..cfce8b49e3d1 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -198,9 +198,9 @@ implnCut()
 {
     ScTabViewShell* pViewShell =  getCurrentBestViewShell();
     if ( pViewShell )
-        pViewShell->CutToClip( NULL, TRUE );
+        pViewShell->CutToClip( NULL, sal_True );
 }
-void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
+void implnPasteSpecial(SfxViewShell* pViewShell, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
 {
     PasteCellsWarningReseter resetWarningBox;
     sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
@@ -225,7 +225,7 @@ void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction,
                     pDoc = pOwnClip->GetDocument();
                 pTabViewShell->PasteFromClip( nFlags, pDoc,
                     nFunction, bSkipEmpty, bTranspose, bAsLink,
-                    eMoveMode, IDF_NONE, TRUE );
+                    eMoveMode, IDF_NONE, sal_True );
                 pTabViewShell->CellContentChanged();
             }
         }
@@ -298,7 +298,7 @@ aNULL()
     return aNULLL;
 }
 
-void dispatchExecute(SfxViewShell* pViewShell, USHORT nSlot, SfxCallMode nCall)
+void dispatchExecute(SfxViewShell* pViewShell, sal_uInt16 nSlot, SfxCallMode nCall)
 {
     SfxViewFrame* pViewFrame = NULL;
     if ( pViewShell )
@@ -607,7 +607,7 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::
                 }
             }
             else
-                pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+                pDispatcher->Execute( (sal_uInt16)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
         }
 
     }
diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx
index 50da8451aedb..54546a394690 100644
--- a/vbahelper/source/vbahelper/vbawindowbase.cxx
+++ b/vbahelper/source/vbahelper/vbawindowbase.cxx
@@ -80,7 +80,7 @@ css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
     return aRect;
 }
 
-void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
+void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, sal_uInt16 nFlag )
 {
     uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
     uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index ff01097288b6..219b1d1d6870 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -66,12 +66,12 @@ public:
 
     /** default constructor: create new DOM tree */
     DomBuilderContext( SvXMLImport& rImport,
-                       USHORT nPrefix,
+                       sal_uInt16 nPrefix,
                        const ::rtl::OUString& rLocalName );
 
     /** constructor: create DOM subtree under the given node */
     DomBuilderContext( SvXMLImport& rImport,
-                       USHORT nPrefix,
+                       sal_uInt16 nPrefix,
                        const ::rtl::OUString& rLocalName,
                        com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& );
 
@@ -94,7 +94,7 @@ public:
     //
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index 505d4105fe10..c7858a96938e 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -52,14 +52,14 @@ public:
     // #100592#
     const ::rtl::OUString& GetFilterCLSID() const { return sCLSID; }
 
-    XMLEmbeddedObjectImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual ~XMLEmbeddedObjectImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index d8d6d873d034..3a919dca7c31 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -92,7 +92,7 @@ public:
 
     /// for footnotes, also parse begin and end notices
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index 562b78eb9710..fbb9a2a65099 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -65,7 +65,7 @@ public:
     virtual ~XMLImageMapContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index bd946ca336c0..60c0ab0dda2d 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -69,7 +69,7 @@ public:
 
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     sal_Int32 GetDrawKey() const { return mnKey; }
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index a70035f56385..84d11060cd27 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -52,7 +52,7 @@ public:
     virtual void EndElement();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index c21c4316674d..6a43702f4e7e 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -57,7 +57,7 @@ public:
     virtual ~XMLStringBufferImportContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index 9b4732e719b1..de7e4cfcc1fd 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -60,7 +60,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps );
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index dd250407c84d..7e795e6021f8 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -49,7 +49,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~XMLAnimationsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b1eac43e0c81..22519c378f59 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1383,7 +1383,7 @@ protected:
         ::com::sun::star::beans::XPropertySet> & xPropertySet);
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
                 ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -1479,7 +1479,7 @@ public:
                                     const ::rtl::OUString& sLocalName);
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
index 249d5c39ba36..62eaedb0e89f 100644
--- a/xmloff/inc/xmloff/DocumentSettingsContext.hxx
+++ b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
@@ -43,12 +43,12 @@ class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext
     ::std::auto_ptr< XMLDocumentSettingsContext_Data >  m_pData;
 
 public:
-    XMLDocumentSettingsContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~XMLDocumentSettingsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index d15b19ee5d38..a618d363137f 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -132,9 +132,9 @@ public:
 
     static sal_uInt16 GetChartFamilyID() { return XML_STYLE_FAMILY_SCH_CHART_ID; }
 
-    /** @param bPushLastChartType If </FALSE>, in case a new chart type has to
+    /** @param bPushLastChartType If </sal_False>, in case a new chart type has to
                be added (because it does not exist yet), it is appended at the
-               end of the chart-type container.  When </TRUE>, a new chart type
+               end of the chart-type container.  When </sal_True>, a new chart type
                is added at one position before the last one, i.e. the formerly
                last chart type is pushed back, so that it remains the last one.
 
diff --git a/xmloff/inc/xmloff/VisAreaContext.hxx b/xmloff/inc/xmloff/VisAreaContext.hxx
index 3aa7cabd4a22..80a0e8c75659 100644
--- a/xmloff/inc/xmloff/VisAreaContext.hxx
+++ b/xmloff/inc/xmloff/VisAreaContext.hxx
@@ -41,19 +41,19 @@ class XMLVisAreaContext : public SvXMLImportContext
 {
 public:
     // read all attributes and set the values in rRect
-    XMLVisAreaContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLVisAreaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       Rectangle& rRect, const MapUnit aMapUnit);
 
-    XMLVisAreaContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLVisAreaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit);
 
     virtual ~XMLVisAreaContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
index b2e5a4d1913b..e938edcebea8 100644
--- a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
+++ b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
@@ -45,7 +45,7 @@ class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext
 public:
     TYPEINFO();
 
-    XMLBase64ImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                             const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
diff --git a/xmloff/inc/xmloff/formsimp.hxx b/xmloff/inc/xmloff/formsimp.hxx
index 86e62015294f..c2bbdc97a98f 100644
--- a/xmloff/inc/xmloff/formsimp.hxx
+++ b/xmloff/inc/xmloff/formsimp.hxx
@@ -41,7 +41,7 @@ public:
     XMLFormsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName);
     virtual ~XMLFormsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/inc/xmloff/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx
index 643b1d3a88f6..331c8bc5a758 100644
--- a/xmloff/inc/xmloff/i18nmap.hxx
+++ b/xmloff/inc/xmloff/i18nmap.hxx
@@ -46,7 +46,7 @@ class XMLOFF_DLLPUBLIC SvI18NMap
 {
     SvI18NMap_Impl      *pImpl;
 
-    SAL_DLLPRIVATE SvI18NMapEntry_Impl *_Find( USHORT nKind,
+    SAL_DLLPRIVATE SvI18NMapEntry_Impl *_Find( sal_uInt16 nKind,
                                 const ::rtl::OUString& rName ) const;
 
 public:
@@ -55,12 +55,12 @@ public:
     ~SvI18NMap();
 
     // Add a name mapping
-    void Add( USHORT nKind, const ::rtl::OUString& rName,
+    void Add( sal_uInt16 nKind, const ::rtl::OUString& rName,
               const ::rtl::OUString& rNewName );
 
     // Return a mapped name. If the name could not be found, return the
     // original name.
-    const ::rtl::OUString& Get( USHORT nKind,
+    const ::rtl::OUString& Get( sal_uInt16 nKind,
                                 const ::rtl::OUString& rName ) const;
 };
 
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx
index f51f46a95e4d..4e97c24e720f 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -189,8 +189,8 @@ class SdXML3DLightContext: public SvXMLImportContext
     // local parameters which need to be read
     Color                       maDiffuseColor;
     ::basegfx::B3DVector        maDirection;
-    BOOL                        mbEnabled;
-    BOOL                        mbSpecular;
+    sal_Bool                        mbEnabled;
+    sal_Bool                        mbSpecular;
 
 public:
     SdXML3DLightContext(
@@ -202,8 +202,8 @@ public:
 
     const Color& GetDiffuseColor() { return maDiffuseColor; }
     const ::basegfx::B3DVector& GetDirection() { return maDirection; }
-    BOOL GetEnabled() { return mbEnabled; }
-    BOOL GetSpecular() { return mbSpecular; }
+    sal_Bool GetEnabled() { return mbEnabled; }
+    sal_Bool GetSpecular() { return mbSpecular; }
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -220,7 +220,7 @@ protected:
 
     // local parameters which need to be read
     com::sun::star::drawing::HomogenMatrix mxHomMat;
-    BOOL                        mbSetTransform;
+    sal_Bool                        mbSetTransform;
 
     com::sun::star::drawing::ProjectionMode mxPrjMode;
     sal_Int32                   mnDistance;
@@ -228,14 +228,14 @@ protected:
     sal_Int32                   mnShadowSlant;
     com::sun::star::drawing::ShadeMode mxShadeMode;
     Color                       maAmbientColor;
-    BOOL                        mbLightingMode;
+    sal_Bool                        mbLightingMode;
 
     ::basegfx::B3DVector        maVRP;
     ::basegfx::B3DVector        maVPN;
     ::basegfx::B3DVector        maVUP;
-    BOOL                        mbVRPUsed;
-    BOOL                        mbVPNUsed;
-    BOOL                        mbVUPUsed;
+    sal_Bool                        mbVRPUsed;
+    sal_Bool                        mbVPNUsed;
+    sal_Bool                        mbVUPUsed;
 
 public:
     SdXML3DSceneAttributesHelper( SvXMLImport& rImporter );
@@ -261,7 +261,7 @@ protected:
     rtl::OUString                                                       msHyperlink;
 
 public:
-    SvXMLShapeContext( SvXMLImport& rImp, USHORT nPrfx,
+    SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
         const ::rtl::OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {}
 
     TYPEINFO();
@@ -336,7 +336,7 @@ public:
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList);
     SvXMLImportContext* CreateFrameChildContext(
-        SvXMLImportContext *pThisContext, USHORT nPrefix, const rtl::OUString& rLocalName,
+        SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     SvXMLShapeContext* Create3DSceneChildContext(
diff --git a/xmloff/inc/xmloff/table/XMLTableImport.hxx b/xmloff/inc/xmloff/table/XMLTableImport.hxx
index 412bfd05e848..42d3cb52b479 100644
--- a/xmloff/inc/xmloff/table/XMLTableImport.hxx
+++ b/xmloff/inc/xmloff/table/XMLTableImport.hxx
@@ -54,10 +54,10 @@ public:
     XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef );
     virtual ~XMLTableImport();
 
-    SvXMLImportContext* CreateTableContext( USHORT nPrfx, const ::rtl::OUString& rLName,
+    SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::table::XColumnRowRange >& xColumnRowRange );
 
-    SvXMLStyleContext* CreateTableTemplateContext( USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     rtl::Reference< SvXMLImportPropertyMapper > GetCellImportPropertySetMapper() const { return mxCellImportPropertySetMapper; }
     rtl::Reference< SvXMLImportPropertyMapper > GetRowImportPropertySetMapper() const { return mxRowImportPropertySetMapper; }
diff --git a/xmloff/inc/xmloff/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx
index 8784ea55b58e..2626c07927d5 100644
--- a/xmloff/inc/xmloff/xformsimport.hxx
+++ b/xmloff/inc/xmloff/xformsimport.hxx
@@ -30,7 +30,7 @@
 #include "sal/config.h"
 #include "xmloff/dllapi.h"
 
-#include <tools/solar.h> // for USHORT
+#include <tools/solar.h> // for sal_uInt16
 #include <com/sun/star/uno/Reference.hxx>
 
 class SvXMLImport;
@@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star {
 /** create import context for xforms:model element. */
 XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName );
 
 /** perform the actual binding of an XForms-binding with the suitable control
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx
index b3c27581690e..51d3cf3c8ff4 100644
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/xmloff/inc/xmloff/xmlcnimp.hxx
@@ -58,10 +58,10 @@ public:
 
     int  operator ==( const SvXMLAttrContainerData& rCmp ) const;
 
-    BOOL AddAttr( const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
+    sal_Bool AddAttr( const ::rtl::OUString& rLName, const rtl::OUString& rValue );
+    sal_Bool AddAttr( const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
                     const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix,
+    sal_Bool AddAttr( const ::rtl::OUString& rPrefix,
                   const ::rtl::OUString& rLName,
                   const ::rtl::OUString& rValue );
 
@@ -76,12 +76,12 @@ public:
     inline const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const;
     inline const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const;
 
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
                 const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rPrefix,
                 const ::rtl::OUString& rLName,
                 const ::rtl::OUString& rValue );
diff --git a/xmloff/inc/xmloff/xmlcnitm.hxx b/xmloff/inc/xmloff/xmlcnitm.hxx
index 772ba1dd0fc4..9c0010d5df5b 100644
--- a/xmloff/inc/xmloff/xmlcnitm.hxx
+++ b/xmloff/inc/xmloff/xmlcnitm.hxx
@@ -61,8 +61,8 @@ public:
 
     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
     { return new SvXMLAttrContainerItem( *this ); }
diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/xmloff/inc/xmloff/xmlictxt.hxx
index bb8d58cf791c..9288645a0ad1 100644
--- a/xmloff/inc/xmloff/xmlictxt.hxx
+++ b/xmloff/inc/xmloff/xmlictxt.hxx
@@ -46,7 +46,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public SvRefBase
 
     SvXMLImport& mrImport;
 
-    USHORT       mnPrefix;
+    sal_uInt16       mnPrefix;
     ::rtl::OUString maLocalName;
 
     SvXMLNamespaceMap   *mpRewindMap;
@@ -63,14 +63,14 @@ protected:
 public:
     TYPEINFO();
 
-    USHORT GetPrefix() const { return mnPrefix; }
+    sal_uInt16 GetPrefix() const { return mnPrefix; }
     const ::rtl::OUString& GetLocalName() const { return maLocalName; }
 
     // A contexts constructor does anything that is required if an element
     // starts. Namespace processing has been done already.
     // Note that virtual methods cannot be used inside constructors. Use
     // StartElement instead if this is required.
-    SvXMLImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    SvXMLImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName );
 
     // A contexts destructor does anything that is required if an element
@@ -81,7 +81,7 @@ public:
 
     // Create a childs element context. By default, the import's
     // CreateContext method is called to create a new default context.
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/xmloff/inc/xmloff/xmlmetai.hxx
index 6343c4ee37dc..efdd1d3f024f 100644
--- a/xmloff/inc/xmloff/xmlmetai.hxx
+++ b/xmloff/inc/xmloff/xmlmetai.hxx
@@ -50,7 +50,7 @@ private:
         ::com::sun::star::xml::sax::XDocumentHandler> mxDocBuilder;
 
 public:
-    SvXMLMetaDocumentContext(SvXMLImport& rImport, USHORT nPrfx,
+    SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
         const rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::document::XDocumentProperties>& xDocProps,
@@ -59,7 +59,7 @@ public:
 
     virtual ~SvXMLMetaDocumentContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index 8463037fa6d3..537e789cfea2 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -99,7 +99,7 @@ public:
     ~SvXMLNumFmtHelper();
 
     SvXMLStyleContext*  CreateChildContext( SvXMLImport& rImport,
-                USHORT nPrefix, const rtl::OUString& rLocalName,
+                sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
                 const ::com::sun::star::uno::Reference<
                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                     SvXMLStylesContext& rStyles);
@@ -116,12 +116,12 @@ public:
 class SvXMLNumFmtDefaults
 {
 public:
-    static sal_Bool IsSystemLongDay( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongMonth( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemTextualMonth( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongYear( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongEra( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongDayOfWeek( const SvtSysLocale& rSysLoc, BOOL bLong );
+    static sal_Bool IsSystemLongDay( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemLongMonth( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemTextualMonth( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemLongYear( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemLongEra( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemLongDayOfWeek( const SvtSysLocale& rSysLoc, sal_Bool bLong );
 
     // return value is NfIndexTableOffset
     static sal_uInt16 GetDefaultDateFormat( SvXMLDateElementAttributes eDOW,
@@ -177,13 +177,13 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
     SAL_DLLPRIVATE sal_Int32 PrivateGetKey();
 
 public:
-                SvXMLNumFormatContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     SvXMLStylesContext& rStyles );
-                SvXMLNumFormatContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -191,7 +191,7 @@ public:
                                     SvXMLStylesContext& rStyles );
     virtual     ~SvXMLNumFormatContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/xmlprcon.hxx b/xmloff/inc/xmloff/xmlprcon.hxx
index 33ae4986e4d2..04da34bd4254 100644
--- a/xmloff/inc/xmloff/xmlprcon.hxx
+++ b/xmloff/inc/xmloff/xmlprcon.hxx
@@ -49,7 +49,7 @@ protected:
 public:
 
     SvXMLPropertySetContext(
-            SvXMLImport& rImport, USHORT nPrfx,
+            SvXMLImport& rImport, sal_uInt16 nPrfx,
             const ::rtl::OUString& rLName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
             sal_uInt32 nFamily,
@@ -59,14 +59,14 @@ public:
 
     virtual ~SvXMLPropertySetContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     // This method is called from this instance implementation of
     // CreateChildContext if the element matches an entry in the
     // SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT_ITEM_IMPORT
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index c26912c72870..9361e11eb8b4 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -127,10 +127,10 @@ public:
 
     sal_uInt16 GetFamily() const { return mnFamily; }
 
-    BOOL IsValid() const { return mbValid; }
+    sal_Bool IsValid() const { return mbValid; }
     void SetValid( sal_Bool b ) { mbValid = b; }
 
-    BOOL IsNew() const { return mbNew; }
+    sal_Bool IsNew() const { return mbNew; }
     void SetNew( sal_Bool b ) { mbNew = b; }
 
     // This method is called for every default style
@@ -158,7 +158,7 @@ public:
         and Finish() will not be called.
         The default return value is false
     */
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
@@ -243,7 +243,7 @@ public:
     const SvXMLStyleContext *FindStyleChildContext(
                                       sal_uInt16 nFamily,
                                       const ::rtl::OUString& rName,
-                                      BOOL bCreateIndex=sal_False ) const;
+                                      sal_Bool bCreateIndex=sal_False ) const;
     virtual sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const;
     virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
                         sal_uInt16 nFamily ) const;
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index 580a20b76a5c..ea8200d83a27 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -223,7 +223,7 @@ public:
         this method will either use the given default or return
         false if not default is set */
     static sal_Bool convertEnum( ::rtl::OUStringBuffer& rBuffer,
-                                 USHORT nValue,
+                                 sal_uInt16 nValue,
                                  const SvXMLEnumStringMapEntry *pMap,
                                  sal_Char* pDefault = NULL );
 
@@ -258,18 +258,18 @@ public:
     /** convert double number to string (using ::rtl::math) and DO
         convert to export MapUnit */
     void convertDouble(::rtl::OUStringBuffer& rBuffer,
-        double fNumber, BOOL bWriteUnits) const;
+        double fNumber, sal_Bool bWriteUnits) const;
 
     /** convert double number to string (using ::rtl::math) and
         DO convert from eSrcUnit to export MapUnit */
     static void convertDouble( ::rtl::OUStringBuffer& rBuffer,
-        double fNumber, BOOL bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit);
+        double fNumber, sal_Bool bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit);
 
     /** convert double number to string (using ::rtl::math) without unit conversion */
     static void convertDouble( ::rtl::OUStringBuffer& rBuffer, double fNumber);
 
     /** convert string to double number (using ::rtl::math) and DO convert. */
-    sal_Bool convertDouble(double& rValue, const ::rtl::OUString& rString, BOOL bLookForUnits) const;
+    sal_Bool convertDouble(double& rValue, const ::rtl::OUString& rString, sal_Bool bLookForUnits) const;
 
     /** convert string to double number (using ::rtl::math) and DO convert from
         SrcUnit to DstUnit. */
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx
index a0ccf8a1c92b..a908c69711fd 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -159,9 +159,9 @@ public:
             (i.e. for an UnknownPropertyExcption) or if the interface is not
             supported it uses the XPropertySet interface.
         @return If none of the two interfaces is supported or using them both
-            fails then FALSE is returned.  Else True is returned.
+            fails then sal_False is returned.  Else True is returned.
     */
-    inline  BOOL    GetProperties   (void);
+    inline  sal_Bool    GetProperties   (void);
 
 private:
     /** @descr  Try to use the XMultiPropertySet interface to get the property
@@ -170,7 +170,7 @@ private:
             containing the properties names.
         @return True if values could be derived.
     */
-    inline  BOOL    MultiGet    (const ::com::sun::star::uno::Sequence<
+    inline  sal_Bool    MultiGet    (const ::com::sun::star::uno::Sequence<
         ::rtl::OUString> & rNameList);
 
     /** @descr  Try to use the XPropertySet interface to get the property
@@ -179,7 +179,7 @@ private:
             containing the properties names.
         @return True if values could be derived.
     */
-    inline  BOOL    SingleGet   (const ::com::sun::star::uno::Sequence<
+    inline  sal_Bool    SingleGet   (const ::com::sun::star::uno::Sequence<
         ::rtl::OUString> & rNameList);
 
     /** @descr  STL map that maps from property names to polymorphic instances of
@@ -222,7 +222,7 @@ template<class T> void  MultiPropertySetHandler::Add (const ::rtl::OUString & sN
 
 
 
-BOOL    MultiPropertySetHandler::GetProperties  (void)
+sal_Bool    MultiPropertySetHandler::GetProperties  (void)
 {
     ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I;
     ::com::sun::star::uno::Sequence< ::rtl::OUString> aNameList (aPropertyList.size());
@@ -231,14 +231,14 @@ BOOL    MultiPropertySetHandler::GetProperties  (void)
         aNameList[i++] = I->second->msName;
     if ( ! MultiGet(aNameList))
         if ( ! SingleGet(aNameList))
-            return FALSE;
-    return TRUE;
+            return sal_False;
+    return sal_True;
 }
 
 
 
 
-BOOL    MultiPropertySetHandler::MultiGet   (const ::com::sun::star::uno::Sequence<
+sal_Bool    MultiPropertySetHandler::MultiGet   (const ::com::sun::star::uno::Sequence<
     ::rtl::OUString> & rNameList)
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> xMultiSet (
@@ -255,18 +255,18 @@ BOOL    MultiPropertySetHandler::MultiGet   (const ::com::sun::star::uno::Sequen
         }
         catch (::com::sun::star::beans::UnknownPropertyException e)
         {
-            return FALSE;
+            return sal_False;
         }
     else
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 
 
 
-BOOL    MultiPropertySetHandler::SingleGet  (const ::com::sun::star::uno::Sequence<
+sal_Bool    MultiPropertySetHandler::SingleGet  (const ::com::sun::star::uno::Sequence<
     ::rtl::OUString> & rNameList)
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSingleSet (
@@ -281,12 +281,12 @@ BOOL    MultiPropertySetHandler::SingleGet  (const ::com::sun::star::uno::Sequen
         }
         catch (::com::sun::star::beans::UnknownPropertyException e)
         {
-            return FALSE;
+            return sal_False;
         }
     else
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index d08e4937ff22..f9828fa04931 100755
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -305,13 +305,13 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
         OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
             case XML_TOK_AXIS_DIMENSION:
                 {
-                    USHORT nEnumVal;
+                    sal_uInt16 nEnumVal;
                     if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisDimensionMap ))
                         m_aCurrentAxis.eDimension = ( SchXMLAxisDimension )nEnumVal;
                 }
@@ -321,7 +321,7 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList
                 break;
             case XML_TOK_AXIS_TYPE:
             case XML_TOK_AXIS_TYPE_EXT:
-                USHORT nEnumVal;
+                sal_uInt16 nEnumVal;
                 if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisTypeMap ))
                 {
                     m_nAxisType = nEnumVal;
@@ -653,7 +653,7 @@ struct theAxisChildTokenMap : public rtl::Static< AxisChildTokenMap, theAxisChil
 }
 
 SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
-    USHORT p_nPrefix,
+    sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -695,7 +695,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
             {
                 OUString sAttrName = xAttrList->getNameByIndex( i );
                 OUString aLocalName;
-                USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+                sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
                 if( nPrefix == XML_NAMESPACE_CHART )
                 {
@@ -906,7 +906,7 @@ void SchXMLCategoriesContext::StartElement( const Reference< xml::sax::XAttribut
     {
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_TABLE &&
             IsXMLToken( aLocalName, XML_CELL_RANGE_ADDRESS ) )
@@ -997,7 +997,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
         OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx
index 78ce22415630..2689c6adff6d 100755
--- a/xmloff/source/chart/SchXMLAxisContext.hxx
+++ b/xmloff/source/chart/SchXMLAxisContext.hxx
@@ -49,7 +49,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index ff3a9a08379b..78c1ac42430f 100755
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -68,7 +68,7 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport&
         }
     }
 }
-SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
 {
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
index 9fe2db8a30a4..423d6fdfd11a 100755
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
@@ -40,7 +40,7 @@ public:
                                      const ::com::sun::star::uno::Reference<
                                          ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 2a19d2949ff9..6b42b2e629df 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -289,7 +289,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -1031,7 +1031,7 @@ void SchXMLChartContext::MergeSeriesForStockChart()
 }
 
 SvXMLImportContext* SchXMLChartContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -1210,7 +1210,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_SVG )
         {
@@ -1255,7 +1255,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
 }
 
 SvXMLImportContext* SchXMLTitleContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -1318,7 +1318,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -1330,7 +1330,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
                     {
                         try
                         {
-                            USHORT nEnumVal;
+                            sal_uInt16 nEnumVal;
                             if( GetImport().GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLLegendAlignmentMap ))
                             {
                                 uno::Any aAny;
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 0f1fb0b4ab83..41f84f783a67 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -100,7 +100,7 @@ public:
                                      com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -166,7 +166,7 @@ public:
     virtual void StartElement( const com::sun::star::uno::Reference<
                                com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 72a324fe772b..a033dcb60e7d 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -675,7 +675,7 @@ SchXMLImport::~SchXMLImport() throw ()
 
 // create the main context (subcontexts are created
 // by the one created here)
-SvXMLImportContext *SchXMLImport::CreateContext( USHORT nPrefix, const OUString& rLocalName,
+SvXMLImportContext *SchXMLImport::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& xAttrList )
 {
     SvXMLImportContext* pContext = 0;
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index bcd201153b7f..7835f0cbe4d3 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -66,7 +66,7 @@ void SchXMLParagraphContext::StartElement( const uno::Reference< xml::sax::XAttr
         {
             rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
             rtl::OUString aLocalName;
-            USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+            sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
             if (IsXMLToken(aLocalName, XML_ID))
             {
@@ -93,7 +93,7 @@ void SchXMLParagraphContext::EndElement()
 }
 
 SvXMLImportContext* SchXMLParagraphContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx
index a40c305d5d2c..fc6cccf97c43 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -54,7 +54,7 @@ public:
     virtual void EndElement();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 91b99bb1ff2d..8b559d6279a8 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -261,7 +261,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -465,7 +465,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
 }
 
 SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -698,7 +698,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_CHART )
         {
@@ -843,7 +843,7 @@ void SchXMLCoordinateRegionContext::StartElement( const uno::Reference< xml::sax
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         m_rPositioning.readPositioningAttribute( nPrefix, aLocalName, aValue );
     }
 }
@@ -879,7 +879,7 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr
         {
             rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
             rtl::OUString aLocalName;
-            USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+            sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
             if( nPrefix == XML_NAMESPACE_CHART &&
                 IsXMLToken( aLocalName, XML_STYLE_NAME ) )
@@ -942,7 +942,7 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut
         {
             rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
             rtl::OUString aLocalName;
-            USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+            sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
             if( nPrefix == XML_NAMESPACE_CHART &&
                 IsXMLToken( aLocalName, XML_STYLE_NAME ) )
@@ -1019,7 +1019,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_CHART )
         {
@@ -1052,7 +1052,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
 }
 
 SvXMLImportContext* SchXMLStatisticsObjectContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -1112,7 +1112,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index ca44e127cfb8..0437d5cabbc3 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -126,7 +126,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
@@ -287,7 +287,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index f42154b056c9..d106398a0fcd 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -117,7 +117,7 @@ void SchXMLDomain2Context::StartElement( const uno::Reference< xml::sax::XAttrib
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_TABLE &&
             IsXMLToken( aLocalName, XML_CELL_RANGE_ADDRESS ) )
@@ -318,7 +318,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -635,7 +635,7 @@ void SchXMLSeries2Context::EndElement()
 }
 
 SvXMLImportContext* SchXMLSeries2Context::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >&  )
 {
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index faa42b2809ac..80deb2c705bc 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -96,7 +96,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index a7214fa558bd..5e9751d73ded 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -327,7 +327,7 @@ SchXMLTableContext::~SchXMLTableContext()
 }
 
 SvXMLImportContext *SchXMLTableContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -374,7 +374,7 @@ void SchXMLTableContext::StartElement( const uno::Reference< xml::sax::XAttribut
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         if ( nPrefix == XML_NAMESPACE_TABLE )
         {
             if ( IsXMLToken( aLocalName, XML_NAME ) )
@@ -524,7 +524,7 @@ SchXMLTableColumnsContext::~SchXMLTableColumnsContext()
 }
 
 SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -567,7 +567,7 @@ void SchXMLTableColumnContext::StartElement( const uno::Reference< xml::sax::XAt
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_TABLE &&
             IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) )
@@ -629,7 +629,7 @@ SchXMLTableRowsContext::~SchXMLTableRowsContext()
 }
 
 SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -675,7 +675,7 @@ SchXMLTableRowContext::~SchXMLTableRowContext()
 }
 
 SvXMLImportContext* SchXMLTableRowContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -711,13 +711,13 @@ private:
 
 public:
     SchXMLRangeSomewhereContext( SvXMLImport& rImport,
-                            USHORT nPrefix,
+                            sal_uInt16 nPrefix,
                             const ::rtl::OUString& rLocalName,
                             ::rtl::OUString& rRangeString );
     virtual ~SchXMLRangeSomewhereContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
@@ -761,7 +761,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
     for( sal_Int16 i = 0; i < nAttrCount; i++ )
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -801,7 +801,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
 }
 
 SvXMLImportContext* SchXMLTableCellContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -1219,7 +1219,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
 //---------------------------------------------------------------------------------------------------
 
 SchXMLRangeSomewhereContext::SchXMLRangeSomewhereContext( SvXMLImport& rImport,
-                                                USHORT nPrefix,
+                                                sal_uInt16 nPrefix,
                                                 const OUString& rLocalName,
                                                 OUString& rRangeString ) :
         SvXMLImportContext( rImport, nPrefix, rLocalName ),
@@ -1232,7 +1232,7 @@ SchXMLRangeSomewhereContext::~SchXMLRangeSomewhereContext()
 }
 
 SvXMLImportContext* SchXMLRangeSomewhereContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index 717628b18de0..14315fa8daeb 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -69,7 +69,7 @@ public:
     virtual ~SchXMLTableContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -132,7 +132,7 @@ public:
     virtual ~SchXMLTableColumnsContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
@@ -172,7 +172,7 @@ public:
     virtual ~SchXMLTableRowsContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
@@ -193,7 +193,7 @@ public:
     virtual ~SchXMLTableRowContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
@@ -219,7 +219,7 @@ public:
     virtual ~SchXMLTableCellContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx
index 5a4dd73f03e6..7a9007aa3527 100755
--- a/xmloff/source/chart/SchXMLTextListContext.cxx
+++ b/xmloff/source/chart/SchXMLTextListContext.cxx
@@ -52,7 +52,7 @@ public:
     virtual void EndElement();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
@@ -81,7 +81,7 @@ void SchXMLListItemContext::EndElement()
 }
 
 SvXMLImportContext* SchXMLListItemContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName,
+    sal_uInt16 nPrefix, const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
     SvXMLImportContext* pContext = 0;
@@ -121,7 +121,7 @@ void SchXMLTextListContext::EndElement()
 }
 
 SvXMLImportContext* SchXMLTextListContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName,
+    sal_uInt16 nPrefix, const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
     SvXMLImportContext* pContext = 0;
diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx
index 736331d10e71..4d260d05cd69 100755
--- a/xmloff/source/chart/SchXMLTextListContext.hxx
+++ b/xmloff/source/chart/SchXMLTextListContext.hxx
@@ -46,7 +46,7 @@ public:
     virtual void EndElement();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 674a8ba3accb..a0be5f4ec6a8 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -182,7 +182,7 @@ static __FAR_DATA SvXMLEnumMapEntry aXMLChartClassMap[] =
 
 SchXMLChartTypeEnum GetChartTypeEnum( const OUString& rClassName )
 {
-    USHORT nEnumVal = XML_CHART_CLASS_UNKNOWN;
+    sal_uInt16 nEnumVal = XML_CHART_CLASS_UNKNOWN;
     if( !SvXMLUnitConverter::convertEnum(
                                     nEnumVal, rClassName, aXMLChartClassMap ) )
         nEnumVal = XML_CHART_CLASS_UNKNOWN;
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
index 2678ca0ca7aa..2a60dca21599 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
@@ -42,7 +42,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx
index 419d2b61ed6d..233d36a44368 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -46,7 +46,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 8ac78f9eb0b5..18dcfa293a3c 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -85,7 +85,7 @@ SvXMLImportContext *SchXMLBodyContext_Impl::CreateChildContext(
 
 SchXMLDocContext::SchXMLDocContext( SchXMLImportHelper& rImpHelper,
                                     SvXMLImport& rImport,
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const rtl::OUString& rLName ) :
         SvXMLImportContext( rImport, nPrefix, rLName ),
         mrImportHelper( rImpHelper )
@@ -150,7 +150,7 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext(
 SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl(
         SchXMLImportHelper& i_rImpHelper,
         SchXMLImport& i_rImport,
-        USHORT i_nPrefix, const ::rtl::OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const ::rtl::OUString & i_rLName,
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
         const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder) :
     SvXMLImportContext(i_rImport, i_nPrefix, i_rLName),
@@ -164,7 +164,7 @@ SchXMLFlatDocContext_Impl::~SchXMLFlatDocContext_Impl() { }
 
 
 SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext(
-    USHORT i_nPrefix, const ::rtl::OUString& i_rLocalName,
+    sal_uInt16 i_nPrefix, const ::rtl::OUString& i_rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
 {
     // behave like meta base class iff we encounter office:meta
@@ -183,7 +183,7 @@ SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext(
 
 SchXMLBodyContext::SchXMLBodyContext( SchXMLImportHelper& rImpHelper,
                                       SvXMLImport& rImport,
-                                      USHORT nPrefix,
+                                      sal_uInt16 nPrefix,
                                       const rtl::OUString& rLName ) :
         SvXMLImportContext( rImport, nPrefix, rLName ),
         mrImportHelper( rImpHelper )
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index 1fb23147a34b..e3ec8b512793 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -77,14 +77,14 @@ public:
     SchXMLFlatDocContext_Impl(
         SchXMLImportHelper& i_rImpHelper,
         SchXMLImport& i_rImport,
-        USHORT i_nPrefix, const ::rtl::OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const ::rtl::OUString & i_rLName,
         const com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties>& i_xDocProps,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>& i_xDocBuilder);
 
     virtual ~SchXMLFlatDocContext_Impl();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT i_nPrefix, const ::rtl::OUString& i_rLocalName,
+        sal_uInt16 i_nPrefix, const ::rtl::OUString& i_rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList);
 };
 
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 0c90a23ae519..e83cb732e523 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -172,7 +172,7 @@ protected:
     com::sun::star::uno::Any&   mrAny;
     XMLConfigBaseContext*       mpBaseContext;
 public:
-    XMLConfigBaseContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     com::sun::star::uno::Any& rAny,
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigBaseContext();
@@ -192,7 +192,7 @@ class XMLConfigItemContext : public SvXMLImportContext
     XMLConfigBaseContext*       mpBaseContext;
 
 public:
-    XMLConfigItemContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     com::sun::star::uno::Any& rAny,
@@ -200,7 +200,7 @@ public:
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigItemContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -216,14 +216,14 @@ public:
 class XMLConfigItemSetContext : public XMLConfigBaseContext
 {
 public:
-    XMLConfigItemSetContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     com::sun::star::uno::Any& rAny,
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigItemSetContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -236,14 +236,14 @@ public:
 class XMLConfigItemMapNamedContext : public XMLConfigBaseContext
 {
 public:
-    XMLConfigItemMapNamedContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     com::sun::star::uno::Any& rAny,
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigItemMapNamedContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -259,7 +259,7 @@ private:
     rtl::OUString maConfigItemName;
 
 public:
-    XMLConfigItemMapIndexedContext(SvXMLImport& rImport, USHORT nPrfx,
+    XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -268,7 +268,7 @@ public:
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigItemMapIndexedContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -278,7 +278,7 @@ public:
 
 //=============================================================================
 
-SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, USHORT p_nPrefix,
+SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPrefix,
                         const rtl::OUString& rLocalName,
                         const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                         beans::PropertyValue& rProp, XMLConfigBaseContext* pBaseContext)
@@ -291,7 +291,7 @@ SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, USHORT p_nPrefix
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -352,7 +352,7 @@ struct XMLDocumentSettingsContext_Data
 
 //=============================================================================
 
-XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                     const uno::Reference<xml::sax::XAttributeList>& )
     : SvXMLImportContext( rImport, nPrfx, rLName )
     , m_pData( new XMLDocumentSettingsContext_Data )
@@ -364,7 +364,7 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext()
 {
 }
 
-SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( USHORT p_nPrefix,
+SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix,
                                      const rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -377,7 +377,7 @@ SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( USHORT p_nPr
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -505,7 +505,7 @@ void XMLDocumentSettingsContext::EndElement()
 
 //=============================================================================
 
-XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
         const rtl::OUString& rLName, com::sun::star::uno::Any& rTempAny,
         XMLConfigBaseContext* pTempBaseContext)
     : SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -523,7 +523,7 @@ XMLConfigBaseContext::~XMLConfigBaseContext()
 
 //=============================================================================
 
-XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>&,
@@ -538,7 +538,7 @@ XMLConfigItemSetContext::~XMLConfigItemSetContext()
 {
 }
 
-SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -555,7 +555,7 @@ void XMLConfigItemSetContext::EndElement()
 
 //=============================================================================
 
-XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     com::sun::star::uno::Any& rTempAny,
@@ -571,7 +571,7 @@ XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, USHORT nPrfx, c
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -587,7 +587,7 @@ XMLConfigItemContext::~XMLConfigItemContext()
 {
 }
 
-SvXMLImportContext *XMLConfigItemContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& )
@@ -757,7 +757,7 @@ void XMLConfigItemContext::ManipulateConfigItem()
 
 //=============================================================================
 
-XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>&,
                                     com::sun::star::uno::Any& rAny,
@@ -770,7 +770,7 @@ XMLConfigItemMapNamedContext::~XMLConfigItemMapNamedContext()
 {
 }
 
-SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -792,7 +792,7 @@ void XMLConfigItemMapNamedContext::EndElement()
 
 //=============================================================================
 
-XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>&,
@@ -808,7 +808,7 @@ XMLConfigItemMapIndexedContext::~XMLConfigItemMapIndexedContext()
 {
 }
 
-SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index 317818c6562f..5a6e6ed80329 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -68,13 +68,13 @@ using rtl::OUString;
 // helper functions; implemented below
 Reference<XNode> lcl_createDomInstance();
 Reference<XNode> lcl_createElement( SvXMLImport& rImport,
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const OUString rLocalName,
                                     Reference<XNode> xParent);
 
 
 DomBuilderContext::DomBuilderContext( SvXMLImport& rImport,
-                                      USHORT nPrefix,
+                                      sal_uInt16 nPrefix,
                                       const OUString& rLocalName ) :
     SvXMLImportContext( rImport, nPrefix, rLocalName ),
     mxNode( lcl_createElement( rImport, nPrefix, rLocalName,
@@ -86,7 +86,7 @@ DomBuilderContext::DomBuilderContext( SvXMLImport& rImport,
 }
 
 DomBuilderContext::DomBuilderContext( SvXMLImport& rImport,
-                                      USHORT nPrefix,
+                                      sal_uInt16 nPrefix,
                                       const OUString& rLocalName,
                                       Reference<XNode>& xParent ) :
     SvXMLImportContext( rImport, nPrefix, rLocalName ),
@@ -114,7 +114,7 @@ Reference<XNode> DomBuilderContext::getNode()
 
 
 SvXMLImportContext* DomBuilderContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList>& )
 {
@@ -214,7 +214,7 @@ Reference<XNode> lcl_createDomInstance()
 }
 
 Reference<XNode> lcl_createElement( SvXMLImport& rImport,
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const OUString rLocalName,
                                     Reference<XNode> xParent)
 {
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index cdfa84e68ac1..1a134f02bcfe 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -45,7 +45,7 @@ TYPEINIT1( XMLBase64ImportContext, SvXMLImportContext );
 
 
 XMLBase64ImportContext::XMLBase64ImportContext(
-        SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName,
+        SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList >&,
         const Reference< XOutputStream >& rOut ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index e7b3a8b48d19..83eeb8afb534 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -92,14 +92,14 @@ class XMLEmbeddedObjectImportContext_Impl : public SvXMLImportContext
 public:
     TYPEINFO();
 
-    XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, USHORT nPrfx,
+    XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::xml::sax::XDocumentHandler >& rHandler );
 
     virtual ~XMLEmbeddedObjectImportContext_Impl();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
@@ -113,7 +113,7 @@ public:
 TYPEINIT1( XMLEmbeddedObjectImportContext_Impl, SvXMLImportContext );
 
 XMLEmbeddedObjectImportContext_Impl::XMLEmbeddedObjectImportContext_Impl(
-        SvXMLImport& rImport, USHORT nPrfx,
+        SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
         const Reference< XDocumentHandler >& rHandler ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -126,7 +126,7 @@ XMLEmbeddedObjectImportContext_Impl::~XMLEmbeddedObjectImportContext_Impl()
 }
 
 SvXMLImportContext *XMLEmbeddedObjectImportContext_Impl::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const Reference< XAttributeList >& )
 {
@@ -196,7 +196,7 @@ sal_Bool XMLEmbeddedObjectImportContext::SetComponent(
 }
 
 XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
-        SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName,
+        SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList >& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName )
 {
@@ -286,7 +286,7 @@ XMLEmbeddedObjectImportContext::~XMLEmbeddedObjectImportContext()
 }
 
 SvXMLImportContext *XMLEmbeddedObjectImportContext::CreateChildContext(
-        USHORT nPrefix, const OUString& rLocalName,
+        sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< XAttributeList >& )
 {
     if( xHandler.is() )
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index b17a27e03693..e6dc7930e673 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -36,7 +36,7 @@ using namespace rtl;
 
 class SvI18NMapEntry_Impl
 {
-    USHORT          nKind;
+    sal_uInt16          nKind;
     OUString        aName;
     OUString        aNewName;
 
@@ -44,25 +44,25 @@ public:
 
     const OUString& GetNewName() const { return aNewName; }
 
-    SvI18NMapEntry_Impl( USHORT nKnd, const OUString& rName,
+    SvI18NMapEntry_Impl( sal_uInt16 nKnd, const OUString& rName,
                          const OUString& rNewName ) :
         nKind( nKnd ),
         aName( rName ),
         aNewName( rNewName )
     {}
 
-    SvI18NMapEntry_Impl( USHORT nKnd, const OUString& rName ) :
+    SvI18NMapEntry_Impl( sal_uInt16 nKnd, const OUString& rName ) :
         nKind( nKnd ),
         aName( rName )
     {}
 
-    BOOL operator==( const SvI18NMapEntry_Impl& r ) const
+    sal_Bool operator==( const SvI18NMapEntry_Impl& r ) const
     {
         return nKind == r.nKind &&
                aName == r.aName;
     }
 
-    BOOL operator<( const SvI18NMapEntry_Impl& r ) const
+    sal_Bool operator<( const SvI18NMapEntry_Impl& r ) const
     {
         return nKind < r.nKind ||
                ( nKind == r.nKind &&
@@ -76,13 +76,13 @@ SV_IMPL_OP_PTRARR_SORT( SvI18NMap_Impl, SvI18NMapEntry_ImplPtr )
 
 // ---------------------------------------------------------------------
 
-SvI18NMapEntry_Impl *SvI18NMap::_Find( USHORT nKind,
+SvI18NMapEntry_Impl *SvI18NMap::_Find( sal_uInt16 nKind,
                                      const OUString& rName ) const
 {
     SvI18NMapEntry_Impl *pRet = 0;
     SvI18NMapEntry_Impl aTst( nKind, rName );
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     if( pImpl->Seek_Entry( &aTst, &nPos ) )
     {
         pRet = (*pImpl)[nPos];
@@ -102,7 +102,7 @@ SvI18NMap::~SvI18NMap()
     delete pImpl;
 }
 
-void SvI18NMap::Add( USHORT nKind, const OUString& rName,
+void SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName,
                      const OUString& rNewName )
 {
     SvI18NMapEntry_Impl *pEntry = _Find( nKind, rName );
@@ -114,7 +114,7 @@ void SvI18NMap::Add( USHORT nKind, const OUString& rName,
     }
 }
 
-const OUString& SvI18NMap::Get( USHORT nKind, const OUString& rName ) const
+const OUString& SvI18NMap::Get( sal_uInt16 nKind, const OUString& rName ) const
 {
     SvI18NMapEntry_Impl *pEntry = _Find( nKind, rName );
     if( pEntry )
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 22e145bc5180..994db71763ae 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -470,7 +470,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
                                             OUString *pPrefix,
                                             OUString *pLocalName,
                                             OUString *pNamespace,
-                                            USHORT /*nIdxGuess*/ ) const
+                                            sal_uInt16 /*nIdxGuess*/ ) const
 {
     return _GetKeyByAttrName ( rAttrName, pPrefix, pLocalName, pNamespace );
 }
diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx
index 53ed405fa454..e1bd55ff040b 100644
--- a/xmloff/source/core/xmlcnitm.cxx
+++ b/xmloff/source/core/xmlcnitm.cxx
@@ -51,8 +51,8 @@ SvXMLAttrContainerData::SvXMLAttrContainerData(
     pLNames( new SvXMLAttrContainerData_Impl ),
     pValues( new SvXMLAttrContainerData_Impl )
 {
-    USHORT nCount = rImpl.pLNames->Count();
-    for( USHORT i=0; i<nCount; i++ )
+    sal_uInt16 nCount = rImpl.pLNames->Count();
+    for( sal_uInt16 i=0; i<nCount; i++ )
     {
         aPrefixPoss.Insert( rImpl.aPrefixPoss[i], i );
         pLNames->Insert( new OUString( *(*rImpl.pLNames)[i] ), i );
@@ -75,12 +75,12 @@ SvXMLAttrContainerData::~SvXMLAttrContainerData()
 int SvXMLAttrContainerData::operator ==(
                         const SvXMLAttrContainerData& rCmp ) const
 {
-    BOOL bRet = pLNames->Count() == rCmp.pLNames->Count() &&
+    sal_Bool bRet = pLNames->Count() == rCmp.pLNames->Count() &&
                 aNamespaceMap == rCmp.aNamespaceMap;
     if( bRet )
     {
-        USHORT nCount = pLNames->Count();
-        USHORT i;
+        sal_uInt16 nCount = pLNames->Count();
+        sal_uInt16 i;
         for( i=0; bRet && i < nCount; i++ )
             bRet = aPrefixPoss[i] == rCmp.aPrefixPoss[i];
 
@@ -95,95 +95,95 @@ int SvXMLAttrContainerData::operator ==(
     return (int)bRet;
 }
 
-BOOL SvXMLAttrContainerData::AddAttr( const OUString& rLName,
+sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rLName,
                                               const OUString& rValue )
 {
     aPrefixPoss.Insert( USHRT_MAX, aPrefixPoss.Count() );
     pLNames->Insert( new OUString(rLName), pLNames->Count() );
     pValues->Insert( new OUString(rValue), pValues->Count() );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
+sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
                                               const OUString& rNamespace,
                                            const OUString& rLName,
                                             const OUString& rValue )
 {
-    USHORT nPos = aNamespaceMap.Add( rPrefix, rNamespace );
+    sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace );
     aPrefixPoss.Insert( nPos, aPrefixPoss.Count() );
     pLNames->Insert( new OUString(rLName), pLNames->Count() );
     pValues->Insert( new OUString(rValue), pValues->Count() );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
+sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
                                            const OUString& rLName,
                                             const OUString& rValue )
 {
-    USHORT nPos = aNamespaceMap.GetIndexByPrefix( rPrefix );
+    sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix );
     if( USHRT_MAX == nPos )
-        return FALSE;
+        return sal_False;
 
     aPrefixPoss.Insert( nPos, aPrefixPoss.Count() );
     pLNames->Insert( new OUString(rLName), pLNames->Count() );
     pValues->Insert( new OUString(rValue), pValues->Count() );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::SetAt( USHORT i,
+sal_Bool SvXMLAttrContainerData::SetAt( sal_uInt16 i,
             const rtl::OUString& rLName, const rtl::OUString& rValue )
 {
     if( i >= GetAttrCount() )
-        return FALSE;
+        return sal_False;
 
     *(*pLNames)[i] = rLName;
     *(*pValues)[i] = rValue;
     aPrefixPoss[i] = USHRT_MAX;
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::SetAt( USHORT i,
+sal_Bool SvXMLAttrContainerData::SetAt( sal_uInt16 i,
             const rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
             const rtl::OUString& rLName, const rtl::OUString& rValue )
 {
     if( i >= GetAttrCount() )
-        return FALSE;
+        return sal_False;
 
-    USHORT nPos = aNamespaceMap.Add( rPrefix, rNamespace );
+    sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace );
     if( USHRT_MAX == nPos )
-        return FALSE;
+        return sal_False;
 
     *(*pLNames)[i] = rLName;
     *(*pValues)[i] = rValue;
     aPrefixPoss[i] = nPos;
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::SetAt( USHORT i,
+sal_Bool SvXMLAttrContainerData::SetAt( sal_uInt16 i,
             const rtl::OUString& rPrefix,
             const rtl::OUString& rLName,
             const rtl::OUString& rValue )
 {
     if( i >= GetAttrCount() )
-        return FALSE;
+        return sal_False;
 
-    USHORT nPos = aNamespaceMap.GetIndexByPrefix( rPrefix );
+    sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix );
     if( USHRT_MAX == nPos )
-        return FALSE;
+        return sal_False;
 
     *(*pLNames)[i] = rLName;
     *(*pValues)[i] = rValue;
     aPrefixPoss[i] = nPos;
 
-    return TRUE;
+    return sal_True;
 }
 
-void SvXMLAttrContainerData::Remove( USHORT i )
+void SvXMLAttrContainerData::Remove( sal_uInt16 i )
 {
     if( i < GetAttrCount() )
     {
diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx
index 2a2b1c2257b8..866595cd2047 100644
--- a/xmloff/source/core/xmlehelp.cxx
+++ b/xmloff/source/core/xmlehelp.cxx
@@ -167,7 +167,7 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
 
 
     sal_Int32 nLongVal = 0;
-    BOOL bOutLongVal = TRUE;
+    sal_Bool bOutLongVal = sal_True;
     if( nValue > SAL_MAX_INT32 / nMul )
     {
         // A big int is required for calculation
@@ -197,7 +197,7 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
                     rOut.append( (sal_Int32)((nBigVal / nBigFac) % nBig10 ) );
                 }
             }
-            bOutLongVal = FALSE;
+            bOutLongVal = sal_False;
         }
     }
     else
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index ebe98e9c0f69..659381b03cd2 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star;
 
 DBG_NAME(SvXMLImportContext)
 TYPEINIT0( SvXMLImportContext );
-SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, USHORT nPrfx,
+SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
                               const OUString& rLName ) :
     mrImport( rImp ),
     mnPrefix( nPrfx ),
@@ -62,7 +62,7 @@ SvXMLImportContext::~SvXMLImportContext()
     DBG_DTOR(SvXMLImportContext,NULL);
 }
 
-SvXMLImportContext *SvXMLImportContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLImportContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const OUString& rLocalName,
                                             const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index f75eec83dbd3..ff16d453cae9 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -228,7 +228,7 @@ typedef SvXMLImportContext *SvXMLImportContextPtr;
 SV_DECL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr, 20, 5 )
 SV_IMPL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr )
 
-SvXMLImportContext *SvXMLImport::CreateContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLImport::CreateContext( sal_uInt16 nPrefix,
                                          const OUString& rLocalName,
                                          const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -655,8 +655,8 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
 
     // Process namespace attributes. This must happen before creating the
     // context, because namespace decaration apply to the element name itself.
-    INT16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-    for( INT16 i=0; i < nAttrCount; i++ )
+    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
+    for( sal_Int16 i=0; i < nAttrCount; i++ )
     {
         const OUString& rAttrName = xAttrList->getNameByIndex( i );
         if ( rAttrName.equalsAscii("office:version") )
@@ -711,13 +711,13 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
 
     // Get element's namespace and local name.
     OUString aLocalName;
-    USHORT nPrefix =
+    sal_uInt16 nPrefix =
         mpNamespaceMap->GetKeyByAttrName( rName, &aLocalName );
 
     // If there are contexts already, call a CreateChildContext at the topmost
     // context. Otherwise, create a default context.
     SvXMLImportContext *pContext;
-    USHORT nCount = mpContexts->Count();
+    sal_uInt16 nCount = mpContexts->Count();
     if( nCount > 0 )
     {
         pContext = (*mpContexts)[nCount - 1]->CreateChildContext( nPrefix,
@@ -775,7 +775,7 @@ rName
 )
     throw(xml::sax::SAXException, uno::RuntimeException)
 {
-    USHORT nCount = mpContexts->Count();
+    sal_uInt16 nCount = mpContexts->Count();
     DBG_ASSERT( nCount, "SvXMLImport::endElement: no context left" );
     if( nCount > 0 )
     {
@@ -786,7 +786,7 @@ rName
 #ifdef DBG_UTIL
         // Non product only: check if endElement call matches startELement call.
         OUString aLocalName;
-        USHORT nPrefix =
+        sal_uInt16 nPrefix =
             mpNamespaceMap->GetKeyByAttrName( rName, &aLocalName );
         DBG_ASSERT( pContext->GetPrefix() == nPrefix,
                 "SvXMLImport::endElement: popped context has wrong prefix" );
@@ -816,7 +816,7 @@ rName
 void SAL_CALL SvXMLImport::characters( const OUString& rChars )
     throw(xml::sax::SAXException, uno::RuntimeException)
 {
-    USHORT nCount = mpContexts->Count();
+    sal_uInt16 nCount = mpContexts->Count();
     if( nCount > 0 )
     {
         (*mpContexts)[nCount - 1]->Characters( rChars );
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 3d0bc0936e44..807c3c060d14 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -59,13 +59,13 @@ public:
         nToken( rEntry.nToken )
     {}
 
-    BOOL operator==( const SvXMLTokenMapEntry_Impl& r ) const
+    sal_Bool operator==( const SvXMLTokenMapEntry_Impl& r ) const
     {
         return nPrefixKey == r.nPrefixKey &&
                sLocalName == r.sLocalName;
     }
 
-    BOOL operator<( const SvXMLTokenMapEntry_Impl& r ) const
+    sal_Bool operator<( const SvXMLTokenMapEntry_Impl& r ) const
     {
         return nPrefixKey < r.nPrefixKey ||
                ( nPrefixKey == r.nPrefixKey &&
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 5e91a8575b0a..c9b5d0d3e9a3 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -609,15 +609,15 @@ sal_Bool SvXMLUnitConverter::convertColor( Color& rColor,
         return sal_False;
 
     rColor.SetRed(
-        sal::static_int_cast< UINT8 >(
+        sal::static_int_cast< sal_uInt8 >(
             lcl_gethex( rValue[1] ) * 16 + lcl_gethex( rValue[2] ) ) );
 
     rColor.SetGreen(
-        sal::static_int_cast< UINT8 >(
+        sal::static_int_cast< sal_uInt8 >(
             lcl_gethex( rValue[3] ) * 16 + lcl_gethex( rValue[4] ) ) );
 
     rColor.SetBlue(
-        sal::static_int_cast< UINT8 >(
+        sal::static_int_cast< sal_uInt8 >(
             lcl_gethex( rValue[5] ) * 16 + lcl_gethex( rValue[6] ) ) );
 
     return sal_True;
@@ -711,7 +711,7 @@ sal_Bool SvXMLUnitConverter::convertNumber64( sal_Int64& rValue,
 
 /** convert double number to string (using ::rtl::math) */
 void SvXMLUnitConverter::convertDouble(::rtl::OUStringBuffer& rBuffer,
-    double fNumber, BOOL bWriteUnits) const
+    double fNumber, sal_Bool bWriteUnits) const
 {
     SvXMLUnitConverter::convertDouble(rBuffer, fNumber,
         bWriteUnits, meCoreMeasureUnit, meXMLMeasureUnit);
@@ -719,7 +719,7 @@ void SvXMLUnitConverter::convertDouble(::rtl::OUStringBuffer& rBuffer,
 
 /** convert double number to string (using ::rtl::math) */
 void SvXMLUnitConverter::convertDouble( ::rtl::OUStringBuffer& rBuffer,
-    double fNumber, BOOL bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit)
+    double fNumber, sal_Bool bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit)
 {
     if(MAP_RELATIVE == eCoreUnit)
     {
@@ -748,7 +748,7 @@ void SvXMLUnitConverter::convertDouble( ::rtl::OUStringBuffer& rBuffer, double f
 
 /** convert string to double number (using ::rtl::math) */
 sal_Bool SvXMLUnitConverter::convertDouble(double& rValue,
-    const ::rtl::OUString& rString, BOOL bLookForUnits) const
+    const ::rtl::OUString& rString, sal_Bool bLookForUnits) const
 {
     if(bLookForUnits)
     {
@@ -1113,7 +1113,7 @@ void SvXMLUnitConverter::convertDateTime( ::rtl::OUStringBuffer& rBuffer,
     }
     rBuffer.append( sal_Int32( aDate.GetYear()));
     rBuffer.append( sal_Unicode('-'));
-    USHORT nTemp = aDate.GetMonth();
+    sal_uInt16 nTemp = aDate.GetMonth();
     if (nTemp < 10)
         rBuffer.append( sal_Unicode('0'));
     rBuffer.append( sal_Int32( nTemp));
@@ -2095,7 +2095,7 @@ bool SvXMLUnitConverter::convertTimeDuration( const rtl::OUString& rString, Time
         else
         {
             if ( c == sal_Unicode('T') )            // "T" starts time part
-                bTimePart = TRUE;
+                bTimePart = sal_True;
             else if ( c == sal_Unicode('D') )
             {
                 nDays = nTemp;
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index b550477ac30c..b36c7776d905 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -160,7 +160,7 @@ public:
     void EndElement();
 
     SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
@@ -258,7 +258,7 @@ void XMLImageMapObjectContext::EndElement()
 }
 
 SvXMLImportContext* XMLImageMapObjectContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> & xAttrList )
 {
@@ -682,7 +682,7 @@ XMLImageMapContext::~XMLImageMapContext()
 }
 
 SvXMLImportContext *XMLImageMapContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> & xAttrList )
 {
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 9ad048c758ac..a387ace22a95 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -519,7 +519,7 @@ public:
         SvXMLImportContext* pSlaveContext );
     virtual ~SdXMLNumberFormatMemberImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
@@ -573,7 +573,7 @@ SdXMLNumberFormatMemberImportContext::~SdXMLNumberFormatMemberImportContext()
 {
 }
 
-SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( sal_uInt16 nPrefix,
                            const ::rtl::OUString& rLocalName,
                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
 {
@@ -737,7 +737,7 @@ void SdXMLNumberFormatImportContext::EndElement()
     }
 }
 
-SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) );
 }
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index f4dfb71a2de4..8aa853ce22af 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -602,12 +602,12 @@ void AnimationsExporterImpl::exportTransitionNode()
                 sTmp.append( sal_Unicode('s'));
                 mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() );
 
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
                 mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
 
                 if( nSubtype != TransitionSubType::DEFAULT )
                 {
-                    SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
+                    SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
                     mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
                 }
 
@@ -805,28 +805,28 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
         nTemp = xNode->getFill();
         if( nTemp != AnimationFill::DEFAULT )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_Fill) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_Fill) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FILL, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getFillDefault();
         if( nTemp != AnimationFill::INHERIT )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_FillDefault) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_FillDefault) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FILLDEFAULT, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getRestart();
         if( nTemp != AnimationRestart::DEFAULT )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_Restart) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_Restart) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_RESTART, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getRestartDefault();
         if( nTemp != AnimationRestart::INHERIT )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_RestartDefault) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_RestartDefault) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_RESTARTDEFAULT, sTmp.makeStringAndClear() );
         }
 
@@ -884,7 +884,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
         {
             if( aTemp >>= nTemp )
             {
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_Endsync) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_Endsync) );
                 mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ENDSYNC, sTmp.makeStringAndClear() );
             }
         }
@@ -903,7 +903,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                 {
                     if( (pValue->Value >>= nContainerNodeType) && (nContainerNodeType != EffectNodeType::DEFAULT) )
                     {
-                        SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nContainerNodeType, getAnimationsEnumMap(Animations_EnumMap_EffectNodeType) );
+                        SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nContainerNodeType, getAnimationsEnumMap(Animations_EnumMap_EffectNodeType) );
                         mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_NODE_TYPE, sTmp.makeStringAndClear() );
                     }
                 }
@@ -927,7 +927,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                     sal_Int16 nEffectPresetClass = sal_Int16();
                     if( pValue->Value >>= nEffectPresetClass )
                     {
-                        SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nEffectPresetClass, getAnimationsEnumMap(Animations_EnumMap_EffectPresetClass) );
+                        SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nEffectPresetClass, getAnimationsEnumMap(Animations_EnumMap_EffectPresetClass) );
                         mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PRESET_CLASS, sTmp.makeStringAndClear() );
                     }
                 }
@@ -1026,14 +1026,14 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >&
             sal_Int16 nTemp = xIter->getSubItem();
             if( nTemp )
             {
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_SubItem) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_SubItem) );
                 mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, sTmp.makeStringAndClear() );
             }
 
             nTemp = xIter->getIterateType();
             if( nTemp )
             {
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_IterateType) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_IterateType) );
                 mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_TYPE, sTmp.makeStringAndClear() );
             }
 
@@ -1105,7 +1105,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
         nTemp = xAnimate->getSubItem();
         if( nTemp )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_SubItem) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_SubItem) );
             mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, sTmp.makeStringAndClear() );
         }
 
@@ -1211,7 +1211,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
                 if( ((nNodeType == AnimationNodeType::ANIMATEMOTION ) && (nTemp != AnimationCalcMode::PACED)) ||
                     ((nNodeType != AnimationNodeType::ANIMATEMOTION ) && (nTemp != AnimationCalcMode::LINEAR)) )
                 {
-                    SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_CalcMode) );
+                    SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_CalcMode) );
                     mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_CALCMODE, sTmp.makeStringAndClear() );
                 }
 
@@ -1222,7 +1222,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
                 nTemp = xAnimate->getAdditive();
                 if( nTemp != AnimationAdditiveMode::REPLACE )
                 {
-                    SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_AdditiveMode) );
+                    SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_AdditiveMode) );
                     mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ADDITIVE, sTmp.makeStringAndClear() );
                 }
             }
@@ -1301,7 +1301,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
 
             Reference< XAnimateTransform > xTransform( xAnimate, UNO_QUERY_THROW );
             nTemp = xTransform->getTransformType();
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_TransformType) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_TransformType) );
             mrExport.AddAttribute( XML_NAMESPACE_SVG, XML_TYPE, sTmp.makeStringAndClear() );
         }
         break;
@@ -1312,13 +1312,13 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
             eElementToken = XML_TRANSITIONFILTER;
 
             sal_Int16 nTransition = xTransitionFilter->getTransition();
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
 
             sal_Int16 nSubtype = xTransitionFilter->getSubtype();
             if( nSubtype != TransitionSubType::DEFAULT )
             {
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
                 mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
             }
 
@@ -1396,7 +1396,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman
         }
 
         sal_Int16 nCommand = xCommand->getCommand();
-        SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nCommand, getAnimationsEnumMap(Animations_EnumMap_Command) );
+        SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nCommand, getAnimationsEnumMap(Animations_EnumMap_Command) );
         mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, sTmp.makeStringAndClear() );
 
 // todo virtual ::com::sun::star::uno::Any SAL_CALL getParameter() throw (::com::sun::star::uno::RuntimeException) = 0;
@@ -1626,7 +1626,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa
                 sTmp.append( (sal_Unicode)'.' );
             }
 
-            SvXMLUnitConverter::convertEnum( sTmp2, (USHORT)pEvent->Trigger, getAnimationsEnumMap(Animations_EnumMap_EventTrigger) );
+            SvXMLUnitConverter::convertEnum( sTmp2, (sal_uInt16)pEvent->Trigger, getAnimationsEnumMap(Animations_EnumMap_EventTrigger) );
 
             sTmp.append( sTmp2.makeStringAndClear() );
         }
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 0920ef4f0992..1b425786f5c0 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1294,7 +1294,7 @@ void AnimationNodeContext::init_node(  const ::com::sun::star::uno::Reference< :
     }
 }
 
-SvXMLImportContext * AnimationNodeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     if( mxNode.is())
@@ -1311,7 +1311,7 @@ public:
     AnimationsImport( const Reference< XMultiServiceFactory > & rSMgr );
     ~AnimationsImport() throw ();
 
-    SvXMLImportContext* CreateContext(USHORT nPrefix, const OUString& rLocalName,   const Reference<XAttributeList>& xAttrList);
+    SvXMLImportContext* CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName,   const Reference<XAttributeList>& xAttrList);
 
     // XInterface
     virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException);
@@ -1380,7 +1380,7 @@ void SAL_CALL AnimationsImport::release() throw ()
     SvXMLImport::release();
 }
 
-SvXMLImportContext *AnimationsImport::CreateContext(USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList)
+SvXMLImportContext *AnimationsImport::CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList)
 {
     SvXMLImportContext* pContext = 0;
 
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index c3dbd86fbe41..07f93545a352 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -412,7 +412,7 @@ public:
 
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< XAttributeList >& xAttrList );
 };
 
@@ -531,13 +531,13 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport,  s
         case XML_NAMESPACE_PRESENTATION:
             if( IsXMLToken( aLocalName, XML_EFFECT ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationEffect_EnumMap ) )
                     meEffect = (XMLEffect)eEnum;
             }
             else if( IsXMLToken(aLocalName, XML_DIRECTION ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationDirection_EnumMap ) )
                     meDirection = (XMLEffectDirection)eEnum;
             }
@@ -549,7 +549,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport,  s
             }
             else if( IsXMLToken( aLocalName, XML_SPEED ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationSpeed_EnumMap ) )
                     meSpeed = (AnimationSpeed)eEnum;
             }
@@ -566,7 +566,7 @@ XMLAnimationsEffectContext::~XMLAnimationsEffectContext()
 {
 }
 
-SvXMLImportContext * XMLAnimationsEffectContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * XMLAnimationsEffectContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
 {
     return new XMLAnimationsSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this );
 }
@@ -687,7 +687,7 @@ XMLAnimationsContext::~XMLAnimationsContext()
     delete mpImpl;
 }
 
-SvXMLImportContext * XMLAnimationsContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName,  xAttrList, mpImpl );
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 3f8fb3bb88be..f8f127f4e0c9 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -96,7 +96,7 @@ public:
     SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape );
     virtual ~SdXMLEventContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const OUString& rLocalName,    const Reference< XAttributeList>& xAttrList );
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,    const Reference< XAttributeList>& xAttrList );
     virtual void EndElement();
 
     sal_Bool mbValid;
@@ -218,19 +218,19 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  sal_uInt16 nPrfx, cons
         case XML_NAMESPACE_PRESENTATION:
             if( IsXMLToken( aAttrLocalName, XML_ACTION ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_EventActions_EnumMap ) )
                     meClickAction = (ClickAction)eEnum;
             }
             if( IsXMLToken( aAttrLocalName, XML_EFFECT ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationEffect_EnumMap ) )
                     meEffect = (XMLEffect)eEnum;
             }
             else if( IsXMLToken( aAttrLocalName, XML_DIRECTION ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationDirection_EnumMap ) )
                     meDirection = (XMLEffectDirection)eEnum;
             }
@@ -242,7 +242,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  sal_uInt16 nPrfx, cons
             }
             else if( IsXMLToken( aAttrLocalName, XML_SPEED ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationSpeed_EnumMap ) )
                     meSpeed = (AnimationSpeed)eEnum;
             }
@@ -319,7 +319,7 @@ SdXMLEventContext::~SdXMLEventContext()
 {
 }
 
-SvXMLImportContext * SdXMLEventContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLEventContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
 {
     return new XMLEventSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this );
 }
@@ -568,7 +568,7 @@ SdXMLEventsContext::~SdXMLEventsContext()
 {
 }
 
-SvXMLImportContext * SdXMLEventsContext::CreateChildContext( USHORT nPrfx, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return new SdXMLEventContext( GetImport(), nPrfx, rLocalName,  xAttrList, mxShape );
diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx
index 75441fb7657a..bac04f2bea01 100644
--- a/xmloff/source/draw/eventimp.hxx
+++ b/xmloff/source/draw/eventimp.hxx
@@ -49,7 +49,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape );
     virtual ~SdXMLEventsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 26113c1ce156..6770a11958d8 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -65,7 +65,7 @@ public:
     SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager );
     virtual ~SdXMLLayerContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
     virtual void EndElement();
 
 private:
@@ -105,7 +105,7 @@ SdXMLLayerContext::~SdXMLLayerContext()
 {
 }
 
-SvXMLImportContext * SdXMLLayerContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& )
+SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& )
 {
     if( (XML_NAMESPACE_SVG == nPrefix) && IsXMLToken(rLocalName, XML_TITLE) )
     {
@@ -173,7 +173,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext()
 {
 }
 
-SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return new SdXMLLayerContext( GetImport(), nPrefix, rLocalName, xAttrList, mxLayerManager );
diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index 9933bb8660ae..9e5eaea5199c 100644
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -50,7 +50,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~SdXMLLayerSetContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index b2dae2f23274..22a6ef13c72f 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -958,7 +958,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
             case XML_SD_TYPE_BACKFACE_CULLING:
             {
                 // #87922# DoubleSided -> BackfaceCulling
-                // This BOOL needs to be flipped, DoubleSided TRUE -> NO Backface culling
+                // This sal_Bool needs to be flipped, DoubleSided sal_True -> NO Backface culling
                 // and vice versa.
                 pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_DISABLED), GetXMLToken(XML_ENABLED) );
                 break;
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 10692cda1d54..5accd0d2ba64 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -119,7 +119,7 @@ class ImpXMLEXPPageMasterInfo
 
 public:
     ImpXMLEXPPageMasterInfo(const SdXMLExport& rExp, const Reference<XDrawPage>& xPage);
-    BOOL operator==(const ImpXMLEXPPageMasterInfo& rInfo) const;
+    sal_Bool operator==(const ImpXMLEXPPageMasterInfo& rInfo) const;
     void SetName(const OUString& rStr);
 
     const OUString& GetName() const { return msName; }
@@ -189,7 +189,7 @@ ImpXMLEXPPageMasterInfo::ImpXMLEXPPageMasterInfo(
     }
 }
 
-BOOL ImpXMLEXPPageMasterInfo::operator==(const ImpXMLEXPPageMasterInfo& rInfo) const
+sal_Bool ImpXMLEXPPageMasterInfo::operator==(const ImpXMLEXPPageMasterInfo& rInfo) const
 {
     return ((mnBorderBottom == rInfo.mnBorderBottom)
         && (mnBorderLeft == rInfo.mnBorderLeft)
@@ -224,7 +224,7 @@ class ImpXMLAutoLayoutInfo
 public:
     ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterInfo* pInf);
 
-    BOOL operator==(const ImpXMLAutoLayoutInfo& rInfo) const;
+    sal_Bool operator==(const ImpXMLAutoLayoutInfo& rInfo) const;
 
     sal_uInt16 GetLayoutType() const { return mnType; }
     sal_Int32 GetGapX() const { return mnGapX; }
@@ -236,19 +236,19 @@ public:
     const Rectangle& GetTitleRectangle() const { return maTitleRect; }
     const Rectangle& GetPresRectangle() const { return maPresRect; }
 
-    static BOOL IsCreateNecessary(sal_uInt16 nTyp);
+    static sal_Bool IsCreateNecessary(sal_uInt16 nTyp);
 };
 
-BOOL ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 nTyp)
+sal_Bool ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 nTyp)
 {
     if(nTyp == 5 /* AUTOLAYOUT_ORG */
         || nTyp == 20 /* AUTOLAYOUT_NONE */
         || nTyp >= IMP_AUTOLAYOUT_INFO_MAX)
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
-BOOL ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const
+sal_Bool ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const
 {
     return ((mnType == rInfo.mnType
         && mpPageMasterInfo == rInfo.mpPageMasterInfo));
@@ -428,8 +428,8 @@ SdXMLExport::SdXMLExport(
     mpPropertySetMapper(0L),
     mpPresPagePropsMapper(0L),
     mbIsDraw(bIsDraw),
-    mbFamilyGraphicUsed(FALSE),
-    mbFamilyPresentationUsed(FALSE),
+    mbFamilyGraphicUsed(sal_False),
+    mbFamilyPresentationUsed(sal_False),
     msZIndex( GetXMLToken(XML_ZINDEX) ),
     msEmptyPres( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ),
     msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ),
@@ -824,7 +824,7 @@ void SdXMLExport::ImpWriteObjGraphicStyleInfos()
                 aStEx.exportDefaultStyle( xDefaults, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), aMapperRef );
 
                 // write graphic family styles
-                aStEx.exportStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_NAME, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), aMapperRef, FALSE, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
+                aStEx.exportStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_NAME, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), aMapperRef, sal_False, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
             }
         }
         catch( lang::ServiceNotRegisteredException& )
@@ -867,10 +867,10 @@ void SdXMLExport::ImpPrepAutoLayoutInfos()
     }
 }
 
-BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName)
+sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName)
 {
     rName = OUString();
-    BOOL bRetval(FALSE);
+    sal_Bool bRetval(sal_False);
 
     Reference <beans::XPropertySet> xPropSet(xPage, UNO_QUERY);
     if(xPropSet.is())
@@ -903,7 +903,7 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr
 
                 // create entry and look for existance
                 ImpXMLAutoLayoutInfo* pNew = new ImpXMLAutoLayoutInfo(nType, pInfo);
-                BOOL bDidExist(FALSE);
+                sal_Bool bDidExist(sal_False);
 
                 for(sal_uInt32 nCnt = 0L; !bDidExist && nCnt < mpAutoLayoutInfoList->Count(); nCnt++)
                 {
@@ -911,7 +911,7 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr
                     {
                         delete pNew;
                         pNew = mpAutoLayoutInfoList->GetObject(nCnt);
-                        bDidExist = TRUE;
+                        bDidExist = sal_True;
                     }
                 }
 
@@ -926,7 +926,7 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr
                 }
 
                 rName = pNew->GetLayoutName();
-                bRetval = TRUE;
+                bRetval = sal_True;
             }
         }
     }
@@ -1859,7 +1859,7 @@ void SdXMLExport::ImpWritePresentationStyles()
                     aPrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
                     aStEx.exportStyleFamily(xNamed->getName(),
                         OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_NAME)),
-                        aMapperRef, FALSE,
+                        aMapperRef, sal_False,
                         XML_STYLE_FAMILY_SD_PRESENTATION_ID, &aPrefix);
                 }
             }
@@ -2272,7 +2272,7 @@ void SdXMLExport::exportPresentationSettings()
 
 //////////////////////////////////////////////////////////////////////////////
 
-void SdXMLExport::_ExportStyles(BOOL bUsed)
+void SdXMLExport::_ExportStyles(sal_Bool bUsed)
 {
     GetPropertySetMapper()->SetAutoStyles( sal_False );
 
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index aa792d43faf6..0e6bfc5bcd20 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -149,7 +149,7 @@ class SdXMLExport : public SvXMLExport
     const rtl::OUString         msEndShape;
     const rtl::OUString         msPageLayoutNames;
 
-    virtual void _ExportStyles(BOOL bUsed);
+    virtual void _ExportStyles(sal_Bool bUsed);
     virtual void _ExportAutoStyles();
     virtual void _ExportMasterStyles();
     virtual void _ExportContent();
@@ -169,7 +169,7 @@ class SdXMLExport : public SvXMLExport
     void ImpWritePresentationStyles();
     ::rtl::OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true );
 
-    BOOL ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, rtl::OUString& rName);
+    sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, rtl::OUString& rName);
     void ImpWriteAutoLayoutInfos();
     void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect);
     void ImpWriteHeaderFooterDecls();
@@ -207,13 +207,13 @@ public:
     XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; }
     XMLPageExportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper; }
 
-    BOOL IsDraw() const { return mbIsDraw; }
-    BOOL IsImpress() const { return !mbIsDraw; }
+    sal_Bool IsDraw() const { return mbIsDraw; }
+    sal_Bool IsImpress() const { return !mbIsDraw; }
 
-    BOOL IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; }
-    void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = TRUE; }
-    BOOL IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; }
-    void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = TRUE; }
+    sal_Bool IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; }
+    void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = sal_True; }
+    sal_Bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; }
+    void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = sal_True; }
 
     virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False );
     virtual void exportDataStyles();
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 4b2e2141c8d0..578b3eefc719 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -130,14 +130,14 @@ protected:
 public:
     SdXMLDocContext_Impl(
         SdXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference<xml::sax::XAttributeList>& xAttrList);
     virtual ~SdXMLDocContext_Impl();
 
     TYPEINFO();
 
-    virtual SvXMLImportContext *CreateChildContext(USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const uno::Reference<xml::sax::XAttributeList>& xAttrList);
 };
@@ -146,7 +146,7 @@ public:
 
 SdXMLDocContext_Impl::SdXMLDocContext_Impl(
     SdXMLImport& rImport,
-    USHORT nPrfx,
+    sal_uInt16 nPrfx,
     const OUString& rLName,
     const uno::Reference<xml::sax::XAttributeList>&)
 :   SvXMLImportContext(rImport, nPrfx, rLName)
@@ -164,7 +164,7 @@ TYPEINIT1( SdXMLDocContext_Impl, SvXMLImportContext );
 //////////////////////////////////////////////////////////////////////////////
 
 SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList)
 {
@@ -254,7 +254,7 @@ class SdXMLFlatDocContext_Impl
 {
 public:
     SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport,
-        USHORT i_nPrefix, const OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const OUString & i_rLName,
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList,
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
         const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder);
@@ -262,12 +262,12 @@ public:
     virtual ~SdXMLFlatDocContext_Impl();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT i_nPrefix, const OUString& i_rLocalName,
+        sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList);
 };
 
 SdXMLFlatDocContext_Impl::SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport,
-        USHORT i_nPrefix, const OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const OUString & i_rLName,
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList,
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
         const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder) :
@@ -281,7 +281,7 @@ SdXMLFlatDocContext_Impl::SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport,
 SdXMLFlatDocContext_Impl::~SdXMLFlatDocContext_Impl() { }
 
 SvXMLImportContext *SdXMLFlatDocContext_Impl::CreateChildContext(
-    USHORT i_nPrefix, const OUString& i_rLocalName,
+    sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
 {
     // behave like meta base class iff we encounter office:meta
@@ -725,7 +725,7 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix,
+SvXMLImportContext *SdXMLImport::CreateContext(sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList)
 {
@@ -805,7 +805,7 @@ SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName,
         return GetShapeImport()->GetStylesContext();
 
     GetShapeImport()->SetStylesContext(new SdXMLStylesContext(
-        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, FALSE));
+        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, sal_False));
 
     return GetShapeImport()->GetStylesContext();
 }
@@ -819,7 +819,7 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN
         return GetShapeImport()->GetAutoStylesContext();
 
     GetShapeImport()->SetAutoStylesContext(new SdXMLStylesContext(
-        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, TRUE));
+        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, sal_True));
 
     return GetShapeImport()->GetAutoStylesContext();
 }
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index e76d5bf9b9c9..aebd513995e3 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -80,7 +80,7 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
     maShapesInfos(),
     maCurrentShapesIter(maShapesInfos.end()),
     mbExportLayer( sal_False ),
-    // #88546# init to FALSE
+    // #88546# init to sal_False
     mbHandleProgressBar( sal_False ),
     msZIndex( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ),
     msPrintable( RTL_CONSTASCII_USTRINGPARAM("Printable") ),
@@ -1276,7 +1276,7 @@ void XMLShapeExport::ExportGraphicDefaults()
                 aStEx.exportDefaultStyle( xDefaults, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper );
 
                 // write graphic family styles
-                aStEx.exportStyleFamily("graphics", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper, FALSE, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
+                aStEx.exportStyleFamily("graphics", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper, sal_False, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
             }
         }
         catch( lang::ServiceNotRegisteredException& )
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 1295da204db9..7c6268571a9c 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -182,7 +182,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR
     mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr);
 
     // decide if transformation is neccessary
-    BOOL bTransformationIsNeccessary(fTRShear != 0.0 || fTRRotate != 0.0);
+    sal_Bool bTransformationIsNeccessary(fTRShear != 0.0 || fTRRotate != 0.0);
 
     if(bTransformationIsNeccessary)
     {
@@ -678,8 +678,8 @@ void XMLShapeExport::ImpExportTextBoxShape(
         uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
 
         // presentation attribute (if presentation)
-        sal_Bool bIsPresShape(FALSE);
-        sal_Bool bIsEmptyPresObj(FALSE);
+        sal_Bool bIsPresShape(sal_False);
+        sal_Bool bIsEmptyPresObj(sal_False);
         OUString aStr;
 
         switch(eShapeType)
@@ -687,49 +687,49 @@ void XMLShapeExport::ImpExportTextBoxShape(
             case XmlShapeTypePresSubtitleShape:
             {
                 aStr = GetXMLToken(XML_PRESENTATION_SUBTITLE);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresTitleTextShape:
             {
                 aStr = GetXMLToken(XML_PRESENTATION_TITLE);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresOutlinerShape:
             {
                 aStr = GetXMLToken(XML_PRESENTATION_OUTLINE);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresNotesShape:
             {
                 aStr = GetXMLToken(XML_PRESENTATION_NOTES);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresHeaderShape:
             {
                 aStr = GetXMLToken(XML_HEADER);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresFooterShape:
             {
                 aStr = GetXMLToken(XML_FOOTER);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresSlideNumberShape:
             {
                 aStr = GetXMLToken(XML_PAGE_NUMBER);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresDateTimeShape:
             {
                 aStr = GetXMLToken(XML_DATE_TIME);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             default:
@@ -926,7 +926,7 @@ void XMLShapeExport::ImpExportEllipseShape(
         awt::Size aSize = xShape->getSize();
         sal_Int32 nRx((aSize.Width + 1) / 2);
         sal_Int32 nRy((aSize.Height + 1) / 2);
-        BOOL bCircle(nRx == nRy);
+        sal_Bool bCircle(nRx == nRy);
 
         // Transformation
         ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
@@ -945,7 +945,7 @@ void XMLShapeExport::ImpExportEllipseShape(
             const double dEndAngle = nEndAngle / 100.0;
 
             // export circle kind
-            SvXMLUnitConverter::convertEnum( sStringBuffer, (USHORT)eKind, aXML_CircleKind_EnumMap );
+            SvXMLUnitConverter::convertEnum( sStringBuffer, (sal_uInt16)eKind, aXML_CircleKind_EnumMap );
             mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_KIND, sStringBuffer.makeStringAndClear() );
 
             // export start angle
@@ -991,9 +991,9 @@ void XMLShapeExport::ImpExportPolygonShape(
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
     {
-        BOOL bClosed(eShapeType == XmlShapeTypeDrawPolyPolygonShape
+        sal_Bool bClosed(eShapeType == XmlShapeTypeDrawPolyPolygonShape
             || eShapeType == XmlShapeTypeDrawClosedBezierShape);
-        BOOL bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape
+        sal_Bool bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape
             || eShapeType == XmlShapeTypeDrawOpenBezierShape);
 
         // get matrix
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index d5c06d7a8ead..36ab9c499fe5 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -212,7 +212,7 @@ void XMLShapeExport::ImpExport3DShape(
                 double fXMax = 0;
                 double fYMin = 0;
                 double fYMax = 0;
-                BOOL bInit(FALSE);
+                sal_Bool bInit(sal_False);
                 sal_Int32 nOuterSequenceCount(xPolyPolygon3D.SequenceX.getLength());
                 drawing::DoubleSequence* pInnerSequenceX = xPolyPolygon3D.SequenceX.getArray();
                 drawing::DoubleSequence* pInnerSequenceY = xPolyPolygon3D.SequenceY.getArray();
@@ -247,7 +247,7 @@ void XMLShapeExport::ImpExport3DShape(
                         {
                             fXMin = fXMax = fX;
                             fYMin = fYMax = fY;
-                            bInit = TRUE;
+                            bInit = sal_True;
                         }
                     }
 
@@ -288,7 +288,7 @@ void XMLShapeExport::ImpExport3DShape(
                     // calculate closed flag
                     awt::Point* pFirst = aPoly.getArray();
                     awt::Point* pLast = pFirst + (nInnerSequenceCount - 1);
-                    BOOL bClosed = (pFirst->X == pLast->X && pFirst->Y == pLast->Y);
+                    sal_Bool bClosed = (pFirst->X == pLast->X && pFirst->Y == pLast->Y);
 
                     aSvgDElement.AddPolygon(&aPoly, 0L, aMinPoint,
                         aMaxSize, bClosed);
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index bd79d4d2cbde..2c4018075f6b 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -159,7 +159,7 @@ XMLShapeImportHelper::XMLShapeImportHelper(
     mpImpl = new XMLShapeImportHelperImpl();
     mpImpl->mpSortContext = 0;
 
-    // #88546# init to FALSE
+    // #88546# init to sal_False
     mpImpl->mbHandleProgressBar = sal_False;
 
     mpSdPropHdlFactory = new XMLSdPropHdlFactory( rModel, rImporter );
@@ -709,7 +709,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap()
 
 SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext(
     SvXMLImport& rImport,
-    USHORT p_nPrefix,
+    sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes)
@@ -789,7 +789,7 @@ void XMLShapeImportHelper::SetAutoStylesContext(SvXMLStylesContext* pNew)
 
 SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
     SvXMLImport& rImport,
-    USHORT p_nPrefix,
+    sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
@@ -838,7 +838,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
         {
             // draw:polygon or draw:polyline inside group context
             pContext = new SdXMLPolygonShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes,
-                rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? TRUE : FALSE, bTemporaryShape );
+                rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? sal_True : sal_False, bTemporaryShape );
             break;
         }
         case XML_TOK_GROUP_PATH:
@@ -922,7 +922,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
 // This method is called from SdXMLFrameContext to create children of drawe:frame
 SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
     SvXMLImport& rImport,
-    USHORT p_nPrefix,
+    sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& rAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
@@ -1010,7 +1010,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
 
 SvXMLImportContext *XMLShapeImportHelper::CreateFrameChildContext(
     SvXMLImportContext *pThisContext,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index 43f12382d420..764b03e7a132 100644
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -42,7 +42,7 @@ using ::xmloff::token::XML_EMBEDDED_VISIBLE_AREA;
 
 //------------------------------------------------------------------
 
-SdXMLViewSettingsContext::SdXMLViewSettingsContext( SdXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) :
+SdXMLViewSettingsContext::SdXMLViewSettingsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) :
     SvXMLImportContext( rImport, nPrfx, rLName )
 {
 }
@@ -51,7 +51,7 @@ SdXMLViewSettingsContext::~SdXMLViewSettingsContext()
 {
 }
 
-SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/xmloff/source/draw/viewcontext.hxx b/xmloff/source/draw/viewcontext.hxx
index 56e6be33bf81..3506f969fa7c 100644
--- a/xmloff/source/draw/viewcontext.hxx
+++ b/xmloff/source/draw/viewcontext.hxx
@@ -39,12 +39,12 @@ class SdXMLViewSettingsContext : public SvXMLImportContext
     ::com::sun::star::awt::Rectangle maVisArea;
 
 public:
-    SdXMLViewSettingsContext( SdXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    SdXMLViewSettingsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~SdXMLViewSettingsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 230e083385fb..041220be536f 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -60,7 +60,7 @@ SdXML3DObjectContext::SdXML3DObjectContext(
     uno::Reference< drawing::XShapes >& rShapes,
     sal_Bool bTemporaryShape)
 :   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
-    mbSetTransform( FALSE )
+    mbSetTransform( sal_False )
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -145,14 +145,14 @@ void SdXML3DObjectContext::SetStyle()
     if(maDrawStyleName.getLength() && mxShape.is())
     {
         const SvXMLStyleContext* pStyle = 0L;
-        sal_Bool bAutoStyle(FALSE);
+        sal_Bool bAutoStyle(sal_False);
 
         if(GetImport().GetShapeImport()->GetAutoStylesContext())
             pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(
             XML_STYLE_FAMILY_SD_GRAPHICS_ID, maDrawStyleName);
 
         if(pStyle)
-            bAutoStyle = TRUE;
+            bAutoStyle = sal_True;
 
         if(!pStyle && GetImport().GetShapeImport()->GetStylesContext())
             pStyle = GetImport().GetShapeImport()->GetStylesContext()->
@@ -198,8 +198,8 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
 :   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
     maMinEdge(-2500.0, -2500.0, -2500.0),
     maMaxEdge(2500.0, 2500.0, 2500.0),
-    mbMinEdgeUsed(FALSE),
-    mbMaxEdgeUsed(FALSE)
+    mbMinEdgeUsed(sal_False),
+    mbMaxEdgeUsed(sal_False)
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -220,7 +220,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
                 if(aNewVec != maMinEdge)
                 {
                     maMinEdge = aNewVec;
-                    mbMinEdgeUsed = TRUE;
+                    mbMinEdgeUsed = sal_True;
                 }
                 break;
             }
@@ -232,7 +232,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
                 if(aNewVec != maMaxEdge)
                 {
                     maMaxEdge = aNewVec;
-                    mbMaxEdgeUsed = TRUE;
+                    mbMaxEdgeUsed = sal_True;
                 }
                 break;
             }
@@ -309,8 +309,8 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
 :   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
     maCenter(0.0, 0.0, 0.0),
     maSize(5000.0, 5000.0, 5000.0),
-    mbCenterUsed(FALSE),
-    mbSizeUsed(FALSE)
+    mbCenterUsed(sal_False),
+    mbSizeUsed(sal_False)
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -331,7 +331,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
                 if(aNewVec != maCenter)
                 {
                     maCenter = aNewVec;
-                    mbCenterUsed = TRUE;
+                    mbCenterUsed = sal_True;
                 }
                 break;
             }
@@ -343,7 +343,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
                 if(aNewVec != maSize)
                 {
                     maSize = aNewVec;
-                    mbSizeUsed = TRUE;
+                    mbSizeUsed = sal_True;
                 }
                 break;
             }
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index b81309d33530..ee453d42b0df 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -47,7 +47,7 @@ protected:
     // the shape group this object should be created inside
 
     com::sun::star::drawing::HomogenMatrix mxHomMat;
-    BOOL                        mbSetTransform;
+    sal_Bool                        mbSetTransform;
 
 /*
     void SetStyle();
@@ -75,8 +75,8 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext
 {
     ::basegfx::B3DVector    maMinEdge;
     ::basegfx::B3DVector    maMaxEdge;
-    BOOL                    mbMinEdgeUsed;
-    BOOL                    mbMaxEdgeUsed;
+    sal_Bool                    mbMinEdgeUsed;
+    sal_Bool                    mbMaxEdgeUsed;
 
 public:
     TYPEINFO();
@@ -99,8 +99,8 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext
 {
     ::basegfx::B3DVector    maCenter;
     ::basegfx::B3DVector    maSize;
-    BOOL                    mbCenterUsed;
-    BOOL                    mbSizeUsed;
+    sal_Bool                    mbCenterUsed;
+    sal_Bool                    mbSizeUsed;
 
 public:
     TYPEINFO();
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index dd041daddec8..37d60c761deb 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -54,8 +54,8 @@ SdXML3DLightContext::SdXML3DLightContext(
 :   SvXMLImportContext( rImport, nPrfx, rLName),
     maDiffuseColor(0x00000000),
     maDirection(0.0, 0.0, 1.0),
-    mbEnabled(FALSE),
-    mbSpecular(FALSE)
+    mbEnabled(sal_False),
+    mbSpecular(sal_False)
 {
     // read attributes for the 3DScene
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -103,7 +103,7 @@ TYPEINIT1( SdXML3DSceneShapeContext, SdXMLShapeContext );
 
 SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
     SvXMLImport& rImport,
-    USHORT nPrfx,
+    sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
@@ -180,7 +180,7 @@ void SdXML3DSceneShapeContext::EndElement()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
@@ -224,20 +224,20 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nPrefix
 
 SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImporter )
 :   mrImport( rImporter ),
-    mbSetTransform( FALSE ),
+    mbSetTransform( sal_False ),
     mxPrjMode(drawing::ProjectionMode_PERSPECTIVE),
     mnDistance(1000),
     mnFocalLength(1000),
     mnShadowSlant(0),
     mxShadeMode(drawing::ShadeMode_SMOOTH),
     maAmbientColor(0x00666666),
-    mbLightingMode(FALSE),
+    mbLightingMode(sal_False),
     maVRP(0.0, 0.0, 1.0),
     maVPN(0.0, 0.0, 1.0),
     maVUP(0.0, 1.0, 0.0),
-    mbVRPUsed(FALSE),
-    mbVPNUsed(FALSE),
-    mbVUPUsed(FALSE)
+    mbVRPUsed(sal_False),
+    mbVPNUsed(sal_False),
+    mbVUPUsed(sal_False)
 {
 }
 
@@ -283,7 +283,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVRP)
             {
                 maVRP = aNewVec;
-                mbVRPUsed = TRUE;
+                mbVRPUsed = sal_True;
             }
             return;
         }
@@ -295,7 +295,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVPN)
             {
                 maVPN = aNewVec;
-                mbVPNUsed = TRUE;
+                mbVPNUsed = sal_True;
             }
             return;
         }
@@ -307,7 +307,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVUP)
             {
                 maVUP = aNewVec;
-                mbVUPUsed = TRUE;
+                mbVUPUsed = sal_True;
             }
             return;
         }
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index f0ab566a68a7..de5703102f81 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -57,7 +57,7 @@ public:
 
     SdXML3DSceneShapeContext(
         SvXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
@@ -68,7 +68,7 @@ public:
     virtual void EndElement();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() const
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index af5fef0ff9dc..dbd0eeaac601 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -56,7 +56,7 @@ using namespace ::com::sun::star;
 //////////////////////////////////////////////////////////////////////////////
 
 SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName,
+    sal_uInt16 nPrfx, const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes)
 :   SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
@@ -71,7 +71,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
     {
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
-        USHORT nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         OUString sValue = xAttrList->getValueByIndex( i );
         const SvXMLTokenMap& rAttrTokenMap = GetSdImport().GetDrawPageAttrTokenMap();
 
@@ -166,7 +166,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
 
         if(xDrawPage.is() && xMasterPages.is())
         {
-            sal_Bool bDone(FALSE);
+            sal_Bool bDone(sal_False);
             OUString sDisplayName( rImport.GetStyleDisplayName(
                             XML_STYLE_FAMILY_MASTER_PAGE, maMasterPageName ) );
 
@@ -186,7 +186,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
                             sMasterPageName.equals(sDisplayName))
                         {
                             xDrawPage->setMasterPage(xMasterPage);
-                            bDone = TRUE;
+                            bDone = sal_True;
                         }
                     }
                 }
@@ -231,7 +231,7 @@ SdXMLDrawPageContext::~SdXMLDrawPageContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
@@ -304,7 +304,7 @@ void SdXMLDrawPageContext::EndElement()
 //////////////////////////////////////////////////////////////////////////////
 
 SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName )
+    sal_uInt16 nPrfx, const OUString& rLocalName )
 :   SvXMLImportContext( rImport, nPrfx, rLocalName )
 {
 }
@@ -318,7 +318,7 @@ SdXMLBodyContext::~SdXMLBodyContext()
 //////////////////////////////////////////////////////////////////////////////
 
 SvXMLImportContext *SdXMLBodyContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index de58459f2438..ac5ea1a53fa1 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -45,14 +45,14 @@ class SdXMLDrawPageContext : public SdXMLGenericPageContext
 
     bool                        mbHadSMILNodes;
 public:
-    SdXMLDrawPageContext( SdXMLImport& rImport, USHORT nPrfx,
+    SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
     virtual ~SdXMLDrawPageContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 
@@ -67,11 +67,11 @@ class SdXMLBodyContext : public SvXMLImportContext
     SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
 
 public:
-    SdXMLBodyContext( SdXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLocalName );
+    SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName );
     virtual ~SdXMLBodyContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 424593d830ac..c0808153cc47 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -149,7 +149,7 @@ void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest,
                          const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp,
                         const SvXMLEnumMapEntry& rMap )
 {
-    USHORT eKind;
+    sal_uInt16 eKind;
     if( SvXMLUnitConverter::convertEnum( eKind, rValue, &rMap ) )
     {
         sal_Int16 nEnum = (sal_Int16)eKind;
@@ -1286,7 +1286,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
         SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) );
 }
 
-SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( USHORT nPrefix,const rtl::OUString& rLocalName,
+SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const rtl::OUString& rLocalName,
                                                                     const uno::Reference< xml::sax::XAttributeList> & xAttrList )
 {
     EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName );
diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx
index 8cb742838151..76ed03c19f3b 100644
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -70,7 +70,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    SvXMLImportContext *CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
 };
 
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 115c3b8b778c..18a75f3bfe83 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -46,7 +46,7 @@ TYPEINIT1( SdXMLGroupShapeContext, SvXMLImportContext );
 
 SdXMLGroupShapeContext::SdXMLGroupShapeContext(
     SvXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName,
+    sal_uInt16 nPrfx, const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
     sal_Bool bTemporaryShape)
@@ -62,7 +62,7 @@ SdXMLGroupShapeContext::~SdXMLGroupShapeContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index 1b4d0f043816..901b0c432d11 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -50,14 +50,14 @@ protected:
 public:
     TYPEINFO();
 
-    SdXMLGroupShapeContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLocalName,
+    SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
         sal_Bool bTemporaryShape);
     virtual ~SdXMLGroupShapeContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual void EndElement();
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index ae657d0c32cd..89d5349bab64 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -41,7 +41,7 @@ using namespace ::xmloff::token;
 
 TYPEINIT1( SdXMLShapeLinkContext, SvXMLImportContext );
 
-SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes)
+SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes)
 : SvXMLShapeContext( rImport, nPrfx, rLocalName, false )
 , mxParent( rShapes )
 {
@@ -51,7 +51,7 @@ SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, USHORT nPrfx
     {
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
-        USHORT nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         if( (nPrefix == XML_NAMESPACE_XLINK) && IsXMLToken( aLocalName, XML_HREF ) )
         {
             msHyperlink = xAttrList->getValueByIndex( i );
@@ -68,7 +68,7 @@ SdXMLShapeLinkContext::~SdXMLShapeLinkContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index 473ad0ce712a..edcb6cbf811c 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -50,13 +50,13 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext
 public:
     TYPEINFO();
 
-    SdXMLShapeLinkContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLocalName,
+    SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
     virtual ~SdXMLShapeLinkContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual void EndElement();
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 43469ddf0f91..7330ab85a0e4 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
 //////////////////////////////////////////////////////////////////////////////
 
 SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName,
+    sal_uInt16 nPrfx, const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes)
 :   SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
@@ -111,7 +111,7 @@ SdXMLNotesContext::~SdXMLNotesContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext *SdXMLNotesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index ca5f01acdd83..5217b9a7dc34 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -42,14 +42,14 @@ private:
     rtl::OUString msPageMasterName;
 
 public:
-    SdXMLNotesContext( SdXMLImport& rImport, USHORT nPrfx,
+    SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx,
     const rtl::OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
     virtual ~SdXMLNotesContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 };
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 29aa839c2b9e..663ad84165e8 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -74,9 +74,9 @@ class DrawAnnotationContext : public SvXMLImportContext
 {
 
 public:
-    DrawAnnotationContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess );
+    DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess );
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 
 private:
@@ -87,7 +87,7 @@ private:
     OUStringBuffer maDateBuffer;
 };
 
-DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess )
+DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess )
 : SvXMLImportContext( rImport, nPrfx, rLocalName )
 , mxAnnotation( xAnnotationAccess->createAndInsertAnnotation() )
 {
@@ -141,7 +141,7 @@ DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, USHORT nPrfx
     }
 }
 
-SvXMLImportContext * DrawAnnotationContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * DrawAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     SvXMLImportContext * pContext = NULL;
 
@@ -214,7 +214,7 @@ TYPEINIT1( SdXMLGenericPageContext, SvXMLImportContext );
 
 SdXMLGenericPageContext::SdXMLGenericPageContext(
     SvXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName,
+    sal_uInt16 nPrfx, const OUString& rLocalName,
     const Reference< xml::sax::XAttributeList>& xAttrList,
     Reference< drawing::XShapes >& rShapes)
 : SvXMLImportContext( rImport, nPrfx, rLocalName )
@@ -227,7 +227,7 @@ SdXMLGenericPageContext::SdXMLGenericPageContext(
     {
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
-        USHORT nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         if( (nPrefix == XML_NAMESPACE_DRAW) && IsXMLToken( aLocalName, XML_NAV_ORDER ) )
         {
             msNavOrder = xAttrList->getValueByIndex( i );
@@ -254,7 +254,7 @@ void SdXMLGenericPageContext::StartElement( const Reference< ::com::sun::star::x
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index 8a3bff26f968..29495748b6be 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -75,14 +75,14 @@ protected:
 public:
     TYPEINFO();
 
-    SdXMLGenericPageContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLocalName,
+    SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
     virtual ~SdXMLGenericPageContext();
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 34590cbd95de..552c731230af 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -161,9 +161,9 @@ SdXMLShapeContext::SdXMLShapeContext(
 ,   mxAttrList(xAttrList)
 ,   mbListContextPushed( false )
 ,   mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID)
-,   mbIsPlaceholder(FALSE)
+,   mbIsPlaceholder(sal_False)
 ,   mbClearDefaultAttributes( true )
-,   mbIsUserTransformed(FALSE)
+,   mbIsUserTransformed(sal_False)
 ,   mnZOrder(-1)
 ,   maSize(1, 1)
 ,   maPosition(0, 0)
@@ -180,7 +180,7 @@ SdXMLShapeContext::~SdXMLShapeContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT p_nPrefix,
+SvXMLImportContext *SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
@@ -312,7 +312,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
             }
             else if( IsXMLToken( aLocalName, XML_ALIGN ) )
             {
-                USHORT eKind;
+                sal_uInt16 eKind;
                 if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueAlignment_EnumMap ) )
                 {
                     aGluePoint.PositionAlignment = (drawing::Alignment)eKind;
@@ -321,7 +321,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
             }
             else if( IsXMLToken( aLocalName, XML_ESCAPE_DIRECTION ) )
             {
-                USHORT eKind;
+                sal_uInt16 eKind;
                 if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueEscapeDirection_EnumMap ) )
                 {
                     aGluePoint.Escape = (drawing::EscapeDirection)eKind;
@@ -613,13 +613,13 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
                 break;
 
             const SvXMLStyleContext* pStyle = 0L;
-            sal_Bool bAutoStyle(FALSE);
+            sal_Bool bAutoStyle(sal_False);
 
             if(GetImport().GetShapeImport()->GetAutoStylesContext())
                 pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName);
 
             if(pStyle)
-                bAutoStyle = TRUE;
+                bAutoStyle = sal_True;
 
             if(!pStyle && GetImport().GetShapeImport()->GetStylesContext())
                 pStyle = GetImport().GetShapeImport()->GetStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName);
@@ -1187,7 +1187,7 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
     {
         if( IsXMLToken( rLocalName, XML_KIND ) )
         {
-            USHORT eKind;
+            sal_uInt16 eKind;
             if( SvXMLUnitConverter::convertEnum( eKind, rValue, aXML_CircleKind_EnumMap ) )
             {
                 meKind = eKind;
@@ -1355,7 +1355,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext(
     uno::Reference< drawing::XShapes >& rShapes,
     sal_Bool bTemporaryShape)
 :   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
-    mbClosed( TRUE )
+    mbClosed( sal_True )
 {
 }
 
@@ -1576,7 +1576,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
                 // XmlShapeTypePresTitleTextShape
                 pService = "com.sun.star.presentation.TitleTextShape";
             }
-            bIsPresShape = TRUE;
+            bIsPresShape = sal_True;
         }
     }
 
@@ -1740,7 +1740,7 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
 :   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
     maStart(0,0),
     maEnd(1,1),
-    mnType( (USHORT)drawing::ConnectorType_STANDARD ),
+    mnType( (sal_uInt16)drawing::ConnectorType_STANDARD ),
     mnStartGlueId(-1),
     mnEndGlueId(-1),
     mnDelta1(0),
@@ -2139,7 +2139,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
     {
         if(bIsPresentation && !IsXMLToken( maPresentationClass, XML_PRESENTATION_PAGE ) )
         {
-            bIsPresentation = FALSE;
+            bIsPresentation = sal_False;
         }
 
         if(bIsPresentation)
@@ -2423,7 +2423,7 @@ void SdXMLGraphicObjectShapeContext::EndElement()
 //////////////////////////////////////////////////////////////////////////////
 
 SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
@@ -2560,7 +2560,7 @@ void SdXMLChartShapeContext::Characters( const ::rtl::OUString& rChars )
         mpChartContext->Characters( rChars );
 }
 
-SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     if( mpChartContext )
@@ -2724,7 +2724,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
 }
 
 SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     // #100592#
@@ -2890,7 +2890,7 @@ void SdXMLAppletShapeContext::EndElement()
     SdXMLShapeContext::EndElement();
 }
 
-SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
     {
@@ -3162,7 +3162,7 @@ void SdXMLPluginShapeContext::EndElement()
     SdXMLShapeContext::EndElement();
 }
 
-SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
     {
@@ -3326,7 +3326,7 @@ SdXMLFrameShapeContext::~SdXMLFrameShapeContext()
 {
 }
 
-SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
@@ -3595,7 +3595,7 @@ void SdXMLCustomShapeContext::EndElement()
 //////////////////////////////////////////////////////////////////////////////
 
 SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
@@ -3761,7 +3761,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::
     SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
 }
 
-SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     if( mxTableImportContext.Is() && (nPrefix == XML_NAMESPACE_TABLE) )
         return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, xAttrList);
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index bf15534fc260..2284beb6ce0e 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -116,7 +116,7 @@ public:
     virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -180,7 +180,7 @@ class SdXMLEllipseShapeContext : public SdXMLShapeContext
     sal_Int32                   mnRX;
     sal_Int32                   mnRY;
 
-    USHORT                      meKind;
+    sal_uInt16                      meKind;
     sal_Int32                   mnStartAngle;
     sal_Int32                   mnEndAngle;
 public:
@@ -299,7 +299,7 @@ private:
     ::com::sun::star::awt::Point maStart;
     ::com::sun::star::awt::Point maEnd;
 
-    USHORT      mnType;
+    sal_uInt16      mnType;
 
     rtl::OUString   maStartShapeId;
     sal_Int32       mnStartGlueId;
@@ -419,7 +419,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -446,7 +446,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
     virtual void Characters( const ::rtl::OUString& rChars );
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
@@ -476,7 +476,7 @@ public:
     virtual void EndElement();
 
     // #100592#
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -509,7 +509,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -541,7 +541,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -594,7 +594,7 @@ public:
         sal_Bool bTemporaryShape);
     virtual ~SdXMLFrameShapeContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -626,7 +626,7 @@ public:
     virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -650,7 +650,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
     virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue );
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index c81aebf41b6a..b18ff7d5c837 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -210,7 +210,7 @@ SdXMLShowsContext::~SdXMLShowsContext()
     delete mpImpl;
 }
 
-SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT p_nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLShowsContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
 {
     if( mpImpl && p_nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SHOW ) )
     {
diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx
index 399900711c46..121deff67cfd 100644
--- a/xmloff/source/draw/ximpshow.hxx
+++ b/xmloff/source/draw/ximpshow.hxx
@@ -49,7 +49,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~SdXMLShowsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 0102ee24844a..2de7fc88c838 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -83,7 +83,7 @@ public:
     virtual ~SdXMLDrawingPagePropertySetContext();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
@@ -1663,9 +1663,9 @@ SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext( SvXMLImport& rImport
     }
 }
 
-BOOL SdXMLHeaderFooterDeclContext::IsTransient() const
+sal_Bool SdXMLHeaderFooterDeclContext::IsTransient() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 void SdXMLHeaderFooterDeclContext::EndElement()
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index df7e3358368f..f3311e3b4708 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -287,7 +287,7 @@ public:
         const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
     virtual void EndElement();
     virtual void Characters( const ::rtl::OUString& rChars );
 
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index c010b666e552..d917ea31b8c7 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1342,7 +1342,7 @@ namespace xmloff
             // we don't want say form url targets to be resolved
             // using ResolveGraphicObjectURL
             if ( 0 == _rLocalName.compareToAscii( s_pImageDataAttributeName ) )
-                sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, FALSE );
+                sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, sal_False );
             else
                 sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue );
             return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue );
@@ -1518,7 +1518,7 @@ namespace xmloff
                 }
             }
 
-            // additionally, we need to set the "RichText" property of our element to TRUE
+            // additionally, we need to set the "RichText" property of our element to sal_True
             // (the presence of the text:p is used as indicator for the value of the RichText property)
             sal_Bool bHasRichTextProperty = sal_False;
             if ( m_xInfo.is() )
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index bc0baaba551e..3028cd507890 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -51,7 +51,7 @@ XMLFormsContext::~XMLFormsContext()
 {
 }
 
-SvXMLImportContext * XMLFormsContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * XMLFormsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return GetImport().GetFormImport()->createContext( nPrefix, rLocalName, xAttrList );
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index 0de7b04b70d3..fcb6a79de597 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -65,7 +65,7 @@ namespace xmloff
     }
 
     //-------------------------------------------------------------------------
-    SvXMLImportContext* OFormsRootImport::CreateChildContext( USHORT _nPrefix, const ::rtl::OUString& _rLocalName,
+    SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName,
             const Reference< sax::XAttributeList>& xAttrList )
     {
         return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList );
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index 2ca90197adb5..f58e33d73080 100644
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -54,7 +54,7 @@ namespace xmloff
         virtual ~OFormsRootImport();
 
         // SvXMLImportContext overriabled
-        virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+        virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
             const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
         virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList );
         virtual void EndElement();
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 83b9625279b9..e2ba207e5cd6 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -58,7 +58,7 @@ private:
         ::com::sun::star::xml::sax::XDocumentHandler> mxDocBuilder;
 
 public:
-    XMLDocumentBuilderContext(SvXMLImport& rImport, USHORT nPrfx,
+    XMLDocumentBuilderContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
         const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -67,7 +67,7 @@ public:
 
     virtual ~XMLDocumentBuilderContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -81,7 +81,7 @@ public:
 };
 
 XMLDocumentBuilderContext::XMLDocumentBuilderContext(SvXMLImport& rImport,
-        USHORT nPrfx, const ::rtl::OUString& rLName,
+        sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const uno::Reference<xml::sax::XAttributeList>&,
         const uno::Reference<xml::sax::XDocumentHandler>& rDocBuilder) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -94,7 +94,7 @@ XMLDocumentBuilderContext::~XMLDocumentBuilderContext()
 }
 
 SvXMLImportContext *
-XMLDocumentBuilderContext::CreateChildContext( USHORT nPrefix,
+XMLDocumentBuilderContext::CreateChildContext( sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& rAttrs)
 {
@@ -125,7 +125,7 @@ void XMLDocumentBuilderContext::EndElement()
 //===========================================================================
 
 SvXMLMetaDocumentContext::SvXMLMetaDocumentContext(SvXMLImport& rImport,
-            USHORT nPrfx, const rtl::OUString& rLName,
+            sal_uInt16 nPrfx, const rtl::OUString& rLName,
             const uno::Reference<document::XDocumentProperties>& xDocProps,
             const uno::Reference<xml::sax::XDocumentHandler>& xDocBuilder) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -142,7 +142,7 @@ SvXMLMetaDocumentContext::~SvXMLMetaDocumentContext()
 }
 
 SvXMLImportContext *SvXMLMetaDocumentContext::CreateChildContext(
-             USHORT nPrefix, const rtl::OUString& rLocalName,
+             sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
              const uno::Reference<xml::sax::XAttributeList>& rAttrs)
 {
     if (  (XML_NAMESPACE_OFFICE == nPrefix) &&
diff --git a/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx
index c0d01a7b0264..8897dd7134b5 100644
--- a/xmloff/source/script/xmlbasici.cxx
+++ b/xmloff/source/script/xmlbasici.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::uno;
 // XMLBasicImportContext
 // =============================================================================
 
-XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const Reference< frame::XModel >& rxModel )
     :SvXMLImportContext( rImport, nPrfx, rLName )
     ,m_xModel( rxModel )
@@ -73,7 +73,7 @@ XMLBasicImportContext::~XMLBasicImportContext()
 // -----------------------------------------------------------------------------
 
 SvXMLImportContext* XMLBasicImportContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& )
 {
     SvXMLImportContext* pContext = 0;
@@ -140,7 +140,7 @@ void XMLBasicImportContext::Characters( const ::rtl::OUString& rChars )
 // XMLBasicImportChildContext
 // =============================================================================
 
-XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const Reference< xml::sax::XDocumentHandler >& rxHandler )
     :SvXMLImportContext( rImport, nPrfx, rLName )
     ,m_xHandler( rxHandler )
@@ -156,7 +156,7 @@ XMLBasicImportChildContext::~XMLBasicImportChildContext()
 // -----------------------------------------------------------------------------
 
 SvXMLImportContext* XMLBasicImportChildContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& )
 {
     return new XMLBasicImportChildContext( GetImport(), nPrefix, rLocalName, m_xHandler );
diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx
index b6f6e68d6ffd..11bfef201b08 100644
--- a/xmloff/source/script/xmlbasici.hxx
+++ b/xmloff/source/script/xmlbasici.hxx
@@ -44,12 +44,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >    m_xHandler;
 
 public:
-    XMLBasicImportContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
 
     virtual ~XMLBasicImportContext();
 
-    virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList );
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList );
@@ -70,12 +70,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >    m_xHandler;
 
 public:
-    XMLBasicImportChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rxHandler );
 
     virtual ~XMLBasicImportChildContext();
 
-    virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index d64c872d3638..d498922afa15 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -61,12 +61,12 @@ private:
     ::rtl::OUString m_aLanguage;
 
 public:
-    XMLScriptChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& rxModel,
         const ::rtl::OUString& rLanguage );
     virtual ~XMLScriptChildContext();
 
-    virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual void EndElement();
@@ -74,7 +74,7 @@ public:
 
 // -----------------------------------------------------------------------------
 
-XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const Reference< frame::XModel >& rxModel, const ::rtl::OUString& rLanguage )
     :SvXMLImportContext( rImport, nPrfx, rLName )
     ,m_xModel( rxModel )
@@ -92,7 +92,7 @@ XMLScriptChildContext::~XMLScriptChildContext()
 // -----------------------------------------------------------------------------
 
 SvXMLImportContext* XMLScriptChildContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index 72b399be47a8..0c01ba9e6db9 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -52,7 +52,7 @@ XMLEnumPropertyHdl::~XMLEnumPropertyHdl()
 
 sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
 {
-    USHORT nValue = 0;
+    sal_uInt16 nValue = 0;
 
     if( SvXMLUnitConverter::convertEnum( nValue, rStrImpValue, mpEnumMap ) )
     {
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 4ddd5ef64a82..7038f1b74495 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -90,7 +90,7 @@ void XMLGradientStyleContext::EndElement()
     {}
 }
 
-BOOL XMLGradientStyleContext::IsTransient() const
+sal_Bool XMLGradientStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -136,7 +136,7 @@ void XMLHatchStyleContext::EndElement()
     {}
 }
 
-BOOL XMLHatchStyleContext::IsTransient() const
+sal_Bool XMLHatchStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -216,7 +216,7 @@ void XMLBitmapStyleContext::EndElement()
     {}
 }
 
-BOOL XMLBitmapStyleContext::IsTransient() const
+sal_Bool XMLBitmapStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -263,7 +263,7 @@ void XMLTransGradientStyleContext::EndElement()
     {}
 }
 
-BOOL XMLTransGradientStyleContext::IsTransient() const
+sal_Bool XMLTransGradientStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -309,7 +309,7 @@ void XMLMarkerStyleContext::EndElement()
     {}
 }
 
-BOOL XMLMarkerStyleContext::IsTransient() const
+sal_Bool XMLMarkerStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -355,7 +355,7 @@ void XMLDashStyleContext::EndElement()
     {}
 }
 
-BOOL XMLDashStyleContext::IsTransient() const
+sal_Bool XMLDashStyleContext::IsTransient() const
 {
     return sal_True;
 }
diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index 52346781d0a6..32d448cbb0b1 100644
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -50,7 +50,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -71,7 +71,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -98,7 +98,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -119,7 +119,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -140,7 +140,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -161,7 +161,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 #endif  // _XMLOFF_FILLSTYLECONTEXTS_HXX_
diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx
index 9c6aa14c80ff..b8939b4cf889 100644
--- a/xmloff/source/style/PageHeaderFooterContext.cxx
+++ b/xmloff/source/style/PageHeaderFooterContext.cxx
@@ -47,7 +47,7 @@ using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES;
 //------------------------------------------------------------------
 
 PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>&,
@@ -68,7 +68,7 @@ PageHeaderFooterContext::~PageHeaderFooterContext()
 {
 }
 
-SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx
index 50dcebd1ccd8..e5b437f2ce21 100644
--- a/xmloff/source/style/PageHeaderFooterContext.hxx
+++ b/xmloff/source/style/PageHeaderFooterContext.hxx
@@ -39,7 +39,7 @@ class PageHeaderFooterContext : public SvXMLImportContext
 
 public:
 
-    PageHeaderFooterContext( SvXMLImport& rImport, USHORT nPrfx,
+    PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                        const rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -50,7 +50,7 @@ public:
 
     virtual ~PageHeaderFooterContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx
index eda42b5dcff8..3bb0f2e84d04 100644
--- a/xmloff/source/style/PagePropertySetContext.hxx
+++ b/xmloff/source/style/PagePropertySetContext.hxx
@@ -55,7 +55,7 @@ public:
     virtual ~PagePropertySetContext();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 58c99ef7abbd..073315761076 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -169,7 +169,7 @@ sal_Bool XMLTransGradientStyleImport::importXML(
                 sal_Int32 aStartTransparency;
                 SvXMLUnitConverter::convertPercent( aStartTransparency, rStrValue );
 
-                UINT8 n = sal::static_int_cast< UINT8 >(
+                sal_uInt8 n = sal::static_int_cast< sal_uInt8 >(
                     ( (100 - aStartTransparency) * 255 ) / 100 );
 
                 Color aColor( n, n, n );
@@ -181,7 +181,7 @@ sal_Bool XMLTransGradientStyleImport::importXML(
                 sal_Int32 aEndTransparency;
                 SvXMLUnitConverter::convertPercent( aEndTransparency, rStrValue );
 
-                UINT8 n = sal::static_int_cast< UINT8 >(
+                sal_uInt8 n = sal::static_int_cast< sal_uInt8 >(
                     ( (100 - aEndTransparency) * 255 ) / 100 );
 
                 Color aColor( n, n, n );
diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx
index cc4722d10216..795d9905243e 100644
--- a/xmloff/source/style/VisAreaContext.cxx
+++ b/xmloff/source/style/VisAreaContext.cxx
@@ -46,7 +46,7 @@ using namespace ::xmloff::token;
 //------------------------------------------------------------------
 
 XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                               Rectangle& rRect, const MapUnit aMapUnit ) :
@@ -62,7 +62,7 @@ XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
 }
 
 XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
-                                         USHORT nPrfx,
+                                         sal_uInt16 nPrfx,
                                                    const rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit ) :
@@ -88,7 +88,7 @@ void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList>
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -118,7 +118,7 @@ void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList>
     }
 }
 
-SvXMLImportContext *XMLVisAreaContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLVisAreaContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& )
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index f9e5e298460d..0337ff32136f 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -172,7 +172,7 @@ OUString XMLFontAutoStylePool::Add(
     OUString sPoolName;
     XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily,
                                           nPitch, eEnc );
-    ULONG nPos;
+    sal_uLong nPos;
     if( pPool->Seek_Entry( &aTmp, &nPos ) )
     {
         sPoolName = pPool->GetObject( nPos )->GetName();
@@ -226,7 +226,7 @@ OUString XMLFontAutoStylePool::Add(
     OUString sName;
     XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily,
                                           nPitch, eEnc );
-    ULONG nPos;
+    sal_uLong nPos;
     if( pPool->Seek_Entry( &aTmp, &nPos ) )
     {
         sName = pPool->GetObject( nPos )->GetName();
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx
index 1a70696583d2..bb27a1378eab 100644
--- a/xmloff/source/style/chrhghdl.cxx
+++ b/xmloff/source/style/chrhghdl.cxx
@@ -79,7 +79,7 @@ sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
     float fSize = 0;
     if( rValue >>= fSize )
     {
-        SvXMLUnitConverter::convertDouble( aOut, (double)fSize, TRUE, MAP_POINT, MAP_POINT );
+        SvXMLUnitConverter::convertDouble( aOut, (double)fSize, sal_True, MAP_POINT, MAP_POINT );
         aOut.append( sal_Unicode('p'));
         aOut.append( sal_Unicode('t'));
     }
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index c91a7edcfc03..d7e6bd7d1725 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -291,7 +291,7 @@ XMLFontPitchPropHdl::~XMLFontPitchPropHdl()
 
 sal_Bool XMLFontPitchPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
 {
-    USHORT eNewPitch;
+    sal_uInt16 eNewPitch;
     sal_Bool bRet = SvXMLUnitConverter::convertEnum( eNewPitch, rStrImpValue, aFontPitchMapping );
     if( bRet )
         rValue <<= (sal_Int16)eNewPitch;
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 63860130e1a5..38d4f8698761 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -67,7 +67,7 @@ SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp)
 SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl()
 {
     for (;;) {
-        XMLFamilyData_Impl* pData = maFamilyList.Remove( ULONG(0) );
+        XMLFamilyData_Impl* pData = maFamilyList.Remove( sal_uLong(0) );
         if (pData == NULL) {
             break;
         }
@@ -88,7 +88,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
         sal_Bool bAsFamily )
 {
     // store family in a list if not already stored
-    ULONG nPos;
+    sal_uLong nPos;
 
     sal_uInt16 nExportFlags = GetExport().getExportFlags();
     sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0;
@@ -116,7 +116,7 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString&
 {
     SvXMLAutoStylePoolNamesP_Impl *pNames = 0;
 
-    ULONG nPos;
+    sal_uLong nPos;
     XMLFamilyData_Impl aTmp( nFamily );
     if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
         pNames = maFamilyList.GetObject( nPos )->mpNameList;
@@ -187,7 +187,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
                 bool bDontSeek )
 {
     sal_Bool bRet(sal_False);
-    ULONG nPos;
+    sal_uLong nPos;
 
     XMLFamilyData_Impl *pFamily = 0;
     XMLFamilyData_Impl aTemporary( nFamily );
@@ -237,7 +237,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
 {
     // get family and parent the same way as in Add()
     sal_Bool bRet(sal_False);
-    ULONG nPos;
+    sal_uLong nPos;
 
     XMLFamilyData_Impl *pFamily = 0;
     XMLFamilyData_Impl aTemporary( nFamily );
@@ -276,7 +276,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
 OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily,
                                          const OUString& rParent )
 {
-    ULONG nPos;
+    sal_uLong nPos;
 
     XMLFamilyData_Impl *pFamily = 0;
     XMLFamilyData_Impl aTmp( nFamily );
@@ -308,7 +308,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
 {
     OUString sName;
 
-    ULONG nPos;
+    sal_uLong nPos;
     XMLFamilyData_Impl aTemporary( nFamily );
     XMLFamilyData_Impl *pFamily = 0;
     if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )
@@ -335,7 +335,7 @@ OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) cons
 {
     OUString sName;
 
-    ULONG nPos;
+    sal_uLong nPos;
     XMLFamilyData_Impl aTmp( nFamily );
     XMLFamilyData_Impl *pFamily = 0;
     if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
@@ -377,7 +377,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
     sal_uInt32 nCount = 0;
 
     // Get list of parents for current family (nFamily)
-    ULONG nPos;
+    sal_uLong nPos;
     XMLFamilyData_Impl aTmp( nFamily );
     XMLFamilyData_Impl *pFamily = 0;
     if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 99bf9ce1476e..ad26398f911c 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -477,7 +477,7 @@ void XMLStyleExport::exportStyleFamily(
         {
             if( !bUsed || xStyle->isInUse() )
             {
-                BOOL bExported = exportStyle( xStyle, rXMLFamily, rPropMapper,
+                sal_Bool bExported = exportStyle( xStyle, rXMLFamily, rPropMapper,
                                               xStyles,pPrefix );
                 if( bUsed && bFirstStyle && bExported  )
                 {
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 1765f3885cb1..e9eda292723b 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -51,7 +51,7 @@ using namespace ::xmloff::token;
 struct FontWeightMapper
 {
     float fWeight;
-    USHORT nValue;
+    sal_uInt16 nValue;
 };
 
 FontWeightMapper const aFontWeightMap[] =
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 1757e48560b9..79b2974706e5 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -134,7 +134,7 @@ void SvXMLImportPropertyMapper::importXML(
         sal_Int32 nStartIdx,
         sal_Int32 nEndIdx ) const
 {
-    INT16 nAttr = xAttrList->getLength();
+    sal_Int16 nAttr = xAttrList->getLength();
 
     Reference< XNameContainer > xAttrContainer;
 
@@ -142,11 +142,11 @@ void SvXMLImportPropertyMapper::importXML(
         nStartIdx = 0;
     if( -1 == nEndIdx )
         nEndIdx = maPropMapper->GetEntryCount();
-    for( INT16 i=0; i < nAttr; i++ )
+    for( sal_Int16 i=0; i < nAttr; i++ )
     {
         const OUString& rAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName, aPrefix, aNamespace;
-        USHORT nPrefix = rNamespaceMap.GetKeyByAttrName( rAttrName, &aPrefix,
+        sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName( rAttrName, &aPrefix,
                                                     &aLocalName, &aNamespace );
 
         if( XML_NAMESPACE_XMLNS == nPrefix )
@@ -354,7 +354,7 @@ void SvXMLImportPropertyMapper::importXML(
 }
 
 /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
-BOOL SvXMLImportPropertyMapper::handleSpecialItem(
+sal_Bool SvXMLImportPropertyMapper::handleSpecialItem(
         XMLPropertyState& rProperty,
         vector< XMLPropertyState >& rProperties,
         const OUString& rValue,
@@ -366,7 +366,7 @@ BOOL SvXMLImportPropertyMapper::handleSpecialItem(
         return mxNextMapper->handleSpecialItem( rProperty, rProperties, rValue,
                                                rUnitConverter, rNamespaceMap );
     else
-        return FALSE;
+        return sal_False;
 }
 
 void SvXMLImportPropertyMapper::FillPropertySequence(
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 448547f44717..d4e880f09b52 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -113,9 +113,9 @@ void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::s
     }
 }
 
-void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
+void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
                                     const uno::Sequence<beans::PropertyValue>& rProps,
-                                    BOOL bOutline )
+                                    sal_Bool bOutline )
 {
     sal_Int16 eType = NumberingType::CHAR_SPECIAL;
 
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 7562bfa3a9e3..9b22f1a39e29 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -810,7 +810,7 @@ xub_StrLen lcl_FindSymbol( const String& sUpperStr, const String& sCurString )
 sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString,
                             const ::com::sun::star::lang::Locale& rLocale )
 {
-    //  returns TRUE if currency element was written
+    //  returns sal_True if currency element was written
 
     sal_Bool bRet = sal_False;
 
@@ -847,7 +847,7 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString,
     else
         AddToTextElement_Impl( rString );       // simple text
 
-    return bRet;        // TRUE: currency element written
+    return bRet;        // sal_True: currency element written
 }
 
 //-------------------------------------------------------------------------
@@ -889,7 +889,7 @@ sal_Bool lcl_IsInEmbedded( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries, sa
     return sal_False;       // not found
 }
 
-BOOL lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDate, NfIndexTableOffset eBuiltIn )
+sal_Bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDate, NfIndexTableOffset eBuiltIn )
 {
     //  make an extra loop to collect date elements, to check if it is a default format
     //  before adding the automatic-order attribute
@@ -950,7 +950,7 @@ BOOL lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDat
     }
 
     if ( bDateNoDefault )
-        return FALSE;                       // additional elements
+        return sal_False;                       // additional elements
     else
     {
         NfIndexTableOffset eFound = (NfIndexTableOffset) SvXMLNumFmtDefaults::GetDefaultDateFormat(
@@ -1059,7 +1059,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
 
     //  automatic ordering for currency and date formats
     //  only used for some built-in formats
-    BOOL bAutoOrder = ( eBuiltIn == NF_CURRENCY_1000INT     || eBuiltIn == NF_CURRENCY_1000DEC2 ||
+    sal_Bool bAutoOrder = ( eBuiltIn == NF_CURRENCY_1000INT     || eBuiltIn == NF_CURRENCY_1000DEC2 ||
                         eBuiltIn == NF_CURRENCY_1000INT_RED || eBuiltIn == NF_CURRENCY_1000DEC2_RED ||
                         eBuiltIn == NF_CURRENCY_1000DEC2_DASHED ||
                         eBuiltIn == NF_DATE_SYSTEM_SHORT    || eBuiltIn == NF_DATE_SYSTEM_LONG ||
@@ -1072,16 +1072,16 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
 
     //  format source (for date and time formats)
     //  only used for some built-in formats
-    BOOL bSystemDate = ( eBuiltIn == NF_DATE_SYSTEM_SHORT ||
+    sal_Bool bSystemDate = ( eBuiltIn == NF_DATE_SYSTEM_SHORT ||
                          eBuiltIn == NF_DATE_SYSTEM_LONG  ||
                          eBuiltIn == NF_DATETIME_SYSTEM_SHORT_HHMM );
-    BOOL bLongSysDate = ( eBuiltIn == NF_DATE_SYSTEM_LONG );
+    sal_Bool bLongSysDate = ( eBuiltIn == NF_DATE_SYSTEM_LONG );
 
     // check if the format definition matches the key
     if ( bAutoOrder && ( nFmtType == NUMBERFORMAT_DATE || nFmtType == NUMBERFORMAT_DATETIME ) &&
             !lcl_IsDefaultDateFormat( rFormat, bSystemDate, eBuiltIn ) )
     {
-        bAutoOrder = bSystemDate = bLongSysDate = FALSE;        // don't write automatic-order attribute then
+        bAutoOrder = bSystemDate = bLongSysDate = sal_False;        // don't write automatic-order attribute then
     }
 
     if ( bAutoOrder &&
@@ -1196,7 +1196,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                     if ( bExpFound && pElemStr )
                         nExpDigits += pElemStr->Len();
                     else if ( !bDecDashes && pElemStr && pElemStr->GetChar(0) == '-' )
-                        bDecDashes = TRUE;
+                        bDecDashes = sal_True;
                     else if ( !bVarDecimals && !bInInteger && pElemStr && pElemStr->GetChar(0) == '#' )
                     {
                         //  If the decimal digits string starts with a '#', variable
@@ -1219,7 +1219,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                     bInInteger = sal_False;
                     break;
                 case NF_SYMBOLTYPE_CURRENCY:
-                    bCurrFound = TRUE;
+                    bCurrFound = sal_True;
                     break;
                 case NF_SYMBOLTYPE_CURREXT:
                     if (pElemStr)
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 7ba79b221e79..492210236be6 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -83,8 +83,8 @@ struct SvXMLEmbeddedElement
         nFormatPos(nFP), aText(rT) {}
 
     //  comparison operators for PTRARR sorting - sorted by position
-    BOOL operator ==( const SvXMLEmbeddedElement& r ) const { return nFormatPos == r.nFormatPos; }
-    BOOL operator < ( const SvXMLEmbeddedElement& r ) const { return nFormatPos <  r.nFormatPos; }
+    sal_Bool operator ==( const SvXMLEmbeddedElement& r ) const { return nFormatPos == r.nFormatPos; }
+    sal_Bool operator < ( const SvXMLEmbeddedElement& r ) const { return nFormatPos <  r.nFormatPos; }
 };
 
 typedef SvXMLEmbeddedElement* SvXMLEmbeddedElementPtr;
@@ -159,14 +159,14 @@ class SvXMLNumFmtElementContext : public SvXMLImportContext
     rtl::OUString           sCalendar;
 
 public:
-                SvXMLNumFmtElementContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFmtElementContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual     ~SvXMLNumFmtElementContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -184,14 +184,14 @@ class SvXMLNumFmtEmbeddedTextContext : public SvXMLImportContext
     sal_Int32                   nTextPosition;
 
 public:
-                SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumFmtElementContext& rParentContext,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual     ~SvXMLNumFmtEmbeddedTextContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -207,14 +207,14 @@ class SvXMLNumFmtMapContext : public SvXMLImportContext
     rtl::OUString           sName;
 
 public:
-                SvXMLNumFmtMapContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFmtMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual     ~SvXMLNumFmtMapContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -230,14 +230,14 @@ class SvXMLNumFmtPropContext : public SvXMLImportContext
     sal_Bool                bColSet;
 
 public:
-                SvXMLNumFmtPropContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFmtPropContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual     ~SvXMLNumFmtPropContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -422,8 +422,8 @@ SvXMLNumImpData::~SvXMLNumImpData()
 
 sal_uInt32 SvXMLNumImpData::GetKeyForName( const rtl::OUString& rName )
 {
-    USHORT nCount = aNameEntries.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = aNameEntries.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         const SvXMLNumFmtEntry* pObj = aNameEntries[i];
         if ( pObj->aName == rName )
@@ -439,8 +439,8 @@ void SvXMLNumImpData::AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_B
         //  if there is already an entry for this key without the bRemoveAfterUse flag,
         //  clear the flag for this entry, too
 
-        USHORT nCount = aNameEntries.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = aNameEntries.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             SvXMLNumFmtEntry* pObj = aNameEntries[i];
             if ( pObj->nKey == nKey && !pObj->bRemoveAfterUse )
@@ -462,8 +462,8 @@ void SvXMLNumImpData::AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_B
 
 void SvXMLNumImpData::SetUsed( sal_uInt32 nKey )
 {
-    USHORT nCount = aNameEntries.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = aNameEntries.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         SvXMLNumFmtEntry* pObj = aNameEntries[i];
         if ( pObj->nKey == nKey )
@@ -486,8 +486,8 @@ void SvXMLNumImpData::RemoveVolatileFormats()
     if ( !pFormatter )
         return;
 
-    USHORT nCount = aNameEntries.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = aNameEntries.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         const SvXMLNumFmtEntry* pObj = aNameEntries[i];
         if ( pObj->bRemoveAfterUse )
@@ -635,7 +635,7 @@ const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang )
 //
 
 SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -663,7 +663,7 @@ SvXMLNumFmtMapContext::~SvXMLNumFmtMapContext()
 }
 
 SvXMLImportContext* SvXMLNumFmtMapContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& )
 {
     // no elements supported - use default context
@@ -686,7 +686,7 @@ void SvXMLNumFmtMapContext::EndElement()
 //
 
 SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -710,7 +710,7 @@ SvXMLNumFmtPropContext::~SvXMLNumFmtPropContext()
 }
 
 SvXMLImportContext* SvXMLNumFmtPropContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& )
 {
     // no elements supported - use default context
@@ -734,7 +734,7 @@ void SvXMLNumFmtPropContext::EndElement()
 //
 
 SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumFmtElementContext& rParentContext,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -763,7 +763,7 @@ SvXMLNumFmtEmbeddedTextContext::~SvXMLNumFmtEmbeddedTextContext()
 }
 
 SvXMLImportContext* SvXMLNumFmtEmbeddedTextContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& )
 {
     // no elements supported - use default context
@@ -938,15 +938,15 @@ void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormat
 //
 
 SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     rParent( rParentContext ),
     nType( nNewType ),
     nElementLang( LANGUAGE_SYSTEM ),
-    bLong( FALSE ),
-    bTextual( FALSE )
+    bLong( sal_False ),
+    bTextual( sal_False )
 {
     OUString sLanguage, sCountry;
     sal_Int32 nAttrVal;
@@ -1034,7 +1034,7 @@ SvXMLNumFmtElementContext::~SvXMLNumFmtElementContext()
 }
 
 SvXMLImportContext* SvXMLNumFmtElementContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     //  only number:number supports number:embedded-text child element
@@ -1063,8 +1063,8 @@ void SvXMLNumFmtElementContext::AddEmbeddedElement( sal_Int32 nFormatPos, const
             //  there's already an element at this position - append text to existing element
 
             delete pObj;
-            USHORT nElementCount = aNumInfo.aEmbeddedElements.Count();
-            for (USHORT i=0; i<nElementCount; i++)
+            sal_uInt16 nElementCount = aNumInfo.aEmbeddedElements.Count();
+            for (sal_uInt16 i=0; i<nElementCount; i++)
             {
                 pObj = aNumInfo.aEmbeddedElements[i];
                 if ( pObj->nFormatPos == nFormatPos )
@@ -1266,7 +1266,7 @@ void SvXMLNumFmtElementContext::EndElement()
 
 //-------------------------------------------------------------------------
 
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongDay( const SvtSysLocale&, BOOL bLong )
+sal_Bool SvXMLNumFmtDefaults::IsSystemLongDay( const SvtSysLocale&, sal_Bool bLong )
 {
     // TODO: merge system information and defaults into i18n locale data
 #if 0
@@ -1276,7 +1276,7 @@ sal_Bool SvXMLNumFmtDefaults::IsSystemLongDay( const SvtSysLocale&, BOOL bLong )
 #endif
 }
 
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongMonth( const SvtSysLocale&, BOOL bLong )
+sal_Bool SvXMLNumFmtDefaults::IsSystemLongMonth( const SvtSysLocale&, sal_Bool bLong )
 {
     // TODO: merge system information and defaults into i18n locale data
 #if 0
@@ -1292,7 +1292,7 @@ sal_Bool SvXMLNumFmtDefaults::IsSystemLongMonth( const SvtSysLocale&, BOOL bLong
 #endif
 }
 
-sal_Bool SvXMLNumFmtDefaults::IsSystemTextualMonth( const SvtSysLocale&, BOOL bLong )
+sal_Bool SvXMLNumFmtDefaults::IsSystemTextualMonth( const SvtSysLocale&, sal_Bool bLong )
 {
     // TODO: merge system information and defaults into i18n locale data
 #if 0
@@ -1308,7 +1308,7 @@ sal_Bool SvXMLNumFmtDefaults::IsSystemTextualMonth( const SvtSysLocale&, BOOL bL
 #endif
 }
 
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongYear( const SvtSysLocale&, BOOL bLong )
+sal_Bool SvXMLNumFmtDefaults::IsSystemLongYear( const SvtSysLocale&, sal_Bool bLong )
 {
     // TODO: merge system information and defaults into i18n locale data
 #if 0
@@ -1318,13 +1318,13 @@ sal_Bool SvXMLNumFmtDefaults::IsSystemLongYear( const SvtSysLocale&, BOOL bLong
 #endif
 }
 
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongEra( const SvtSysLocale& rSysLoc, BOOL bLong )
+sal_Bool SvXMLNumFmtDefaults::IsSystemLongEra( const SvtSysLocale& rSysLoc, sal_Bool bLong )
 {
     // TODO: merge system information and defaults into i18n locale data
     return IsSystemLongYear( rSysLoc, bLong );      // no separate setting
 }
 
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongDayOfWeek( const SvtSysLocale&, BOOL bLong )
+sal_Bool SvXMLNumFmtDefaults::IsSystemLongDayOfWeek( const SvtSysLocale&, sal_Bool bLong )
 {
     // TODO: merge system information and defaults into i18n locale data
 #if 0
@@ -1367,7 +1367,7 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes
 //
 
 SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                     SvXMLStylesContext& rStyles ) :
@@ -1378,15 +1378,15 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
     nType( nNewType ),
     nKey(-1),
     nFormatLang( LANGUAGE_SYSTEM ),
-    bAutoOrder( FALSE ),
-    bFromSystem( FALSE ),
-    bTruncate( TRUE ),
-    bAutoDec( FALSE ),
-    bAutoInt( FALSE ),
-    bHasExtraText( FALSE ),
-    bHasLongDoW( FALSE ),
-    bHasEra( FALSE ),
-    bHasDateTime( FALSE ),
+    bAutoOrder( sal_False ),
+    bFromSystem( sal_False ),
+    bTruncate( sal_True ),
+    bAutoDec( sal_False ),
+    bAutoInt( sal_False ),
+    bHasExtraText( sal_False ),
+    bHasLongDoW( sal_False ),
+    bHasEra( sal_False ),
+    bHasDateTime( sal_False ),
     bRemoveAfterUse( sal_False ),
     eDateDOW( XML_DEA_NONE ),
     eDateDay( XML_DEA_NONE ),
@@ -1490,7 +1490,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
 }
 
 SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                     const sal_Int32 nTempKey,
                                     SvXMLStylesContext& rStyles ) :
@@ -1501,15 +1501,15 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
     nType( 0 ),
     nKey(nTempKey),
     nFormatLang( LANGUAGE_SYSTEM ),
-    bAutoOrder( FALSE ),
-    bFromSystem( FALSE ),
-    bTruncate( TRUE ),
-    bAutoDec( FALSE ),
-    bAutoInt( FALSE ),
-    bHasExtraText( FALSE ),
-    bHasLongDoW( FALSE ),
-    bHasEra( FALSE ),
-    bHasDateTime( FALSE ),
+    bAutoOrder( sal_False ),
+    bFromSystem( sal_False ),
+    bTruncate( sal_True ),
+    bAutoDec( sal_False ),
+    bAutoInt( sal_False ),
+    bHasExtraText( sal_False ),
+    bHasLongDoW( sal_False ),
+    bHasEra( sal_False ),
+    bHasDateTime( sal_False ),
     bRemoveAfterUse( sal_False ),
     eDateDOW( XML_DEA_NONE ),
     eDateDay( XML_DEA_NONE ),
@@ -1528,7 +1528,7 @@ SvXMLNumFormatContext::~SvXMLNumFormatContext()
 }
 
 SvXMLImportContext* SvXMLNumFormatContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
@@ -1919,7 +1919,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo )
         nGenPrec = 0;               // generate format without decimals...
 
     sal_Bool bGrouping = rInfo.bGrouping;
-    USHORT nEmbeddedCount = rInfo.aEmbeddedElements.Count();
+    sal_uInt16 nEmbeddedCount = rInfo.aEmbeddedElements.Count();
     if ( nEmbeddedCount )
         bGrouping = sal_False;      // grouping and embedded characters can't be used together
 
@@ -1962,7 +1962,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo )
         }
 
         //  aEmbeddedElements is sorted with ascending positions - loop is from right to left
-        for (USHORT nElement = 0; nElement < nEmbeddedCount; nElement++)
+        for (sal_uInt16 nElement = 0; nElement < nEmbeddedCount; nElement++)
         {
             const SvXMLEmbeddedElement* pObj = rInfo.aEmbeddedElements[nElement];
             sal_Int32 nFormatPos = pObj->nFormatPos;
@@ -2298,7 +2298,7 @@ void SvXMLNumFormatContext::AddColor( const Color& rColor )
     for ( sal_uInt16 i=0; i<XML_NUMF_COLORCOUNT; i++ )
         if ( rColor == aNumFmtStdColors[i] )
         {
-            aColName = OUString( pFormatter->GetKeyword( nFormatLang, sal::static_int_cast< USHORT >(NF_KEY_FIRSTCOLOR + i) ) );
+            aColName = OUString( pFormatter->GetKeyword( nFormatLang, sal::static_int_cast< sal_uInt16 >(NF_KEY_FIRSTCOLOR + i) ) );
             break;
         }
 
@@ -2379,7 +2379,7 @@ SvXMLNumFmtHelper::~SvXMLNumFmtHelper()
 }
 
 SvXMLStyleContext*  SvXMLNumFmtHelper::CreateChildContext( SvXMLImport& rImport,
-                USHORT nPrefix, const OUString& rLocalName,
+                sal_uInt16 nPrefix, const OUString& rLocalName,
                 const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                 SvXMLStylesContext& rStyles )
 {
diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx
index 1a906e991f5d..b87148958ddf 100644
--- a/xmloff/source/style/xmlprcon.cxx
+++ b/xmloff/source/style/xmlprcon.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
 using namespace ::std;
 
 SvXMLPropertySetContext::SvXMLPropertySetContext(
-    SvXMLImport& rImp, USHORT nPrfx,
+    SvXMLImport& rImp, sal_uInt16 nPrfx,
     const OUString& rLName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     sal_uInt32 nFam,
@@ -64,7 +64,7 @@ SvXMLPropertySetContext::~SvXMLPropertySetContext()
 }
 
 SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -92,7 +92,7 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
     SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT
 */
 SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >&,
     ::std::vector< XMLPropertyState > &,
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index c6f89c650e54..cce7d30577f3 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -216,7 +216,7 @@ void SvXMLStyleContext::Finish( sal_Bool /*bOverwrite*/ )
 {
 }
 
-BOOL SvXMLStyleContext::IsTransient() const
+sal_Bool SvXMLStyleContext::IsTransient() const
 {
     return sal_False;
 }
@@ -366,7 +366,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
 #endif
         ((SvXMLStylesContext_Impl *)this)->pIndices =
             new SvXMLStyleIndices_Impl(
-                sal::static_int_cast< USHORT >(aStyles.Count()), 5 );
+                sal::static_int_cast< sal_uInt16 >(aStyles.Count()), 5 );
         for( sal_uInt32 i=0; i < aStyles.Count(); i++ )
         {
             SvXMLStyleIndex_Impl* pStyleIndex = new SvXMLStyleIndex_Impl( aStyles.GetObject(i));
@@ -384,7 +384,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
     if( pIndices )
     {
         SvXMLStyleIndex_Impl aIndex( nFamily, rName );
-        ULONG nPos = 0;
+        sal_uLong nPos = 0;
         if( pIndices->Seek_Entry( &aIndex, &nPos ) )
             pStyle = pIndices->GetObject( nPos )->GetStyle();
     }
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 6a31d7a7cc35..d0550814d8dc 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -495,7 +495,7 @@ void XMLTableExport::exportTableStyles()
     XMLStyleExport aStEx(mrExport, OUString(), mrExport.GetAutoStylePool().get());
 
     // write graphic family styles
-    aStEx.exportStyleFamily("cell", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), mxCellExportPropertySetMapper.get(), TRUE, XML_STYLE_FAMILY_TABLE_CELL);
+    aStEx.exportStyleFamily("cell", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), mxCellExportPropertySetMapper.get(), sal_True, XML_STYLE_FAMILY_TABLE_CELL);
 
     exportTableTemplates();
 }
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 0695d8643bfa..da24e582389f 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -80,9 +80,9 @@ struct ColumnInfo
 class XMLProxyContext : public SvXMLImportContext
 {
 public:
-    XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, USHORT nPrfx, const OUString& rLName );
+    XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, sal_uInt16 nPrfx, const OUString& rLName );
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
 private:
     SvXMLImportContextRef mxParent;
@@ -108,10 +108,10 @@ typedef std::vector< boost::shared_ptr< MergeInfo > > MergeInfoVector;
 class XMLTableImportContext : public SvXMLImportContext
 {
 public:
-    XMLTableImportContext( const rtl::Reference< XMLTableImport >& xThis, USHORT nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange );
+    XMLTableImportContext( const rtl::Reference< XMLTableImport >& xThis, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange );
     virtual ~XMLTableImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
     virtual void StartElement( const Reference< XAttributeList >& xAttrList );
 
@@ -119,9 +119,9 @@ public:
 
     void InitColumns();
 
-    SvXMLImportContext * ImportColumn( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
-    SvXMLImportContext * ImportRow( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
-    SvXMLImportContext * ImportCell( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    SvXMLImportContext * ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    SvXMLImportContext * ImportRow( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    SvXMLImportContext * ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
     OUString GetDefaultCellStyleName() const;
 
@@ -148,12 +148,12 @@ public:
     XMLCellImportContext( SvXMLImport& rImport,
                           const Reference< XMergeableCell >& xCell,
                           const OUString& sDefaultCellStyleName,
-                          USHORT nPrfx, const OUString& rLName,
+                          sal_uInt16 nPrfx, const OUString& rLName,
                           const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual ~XMLCellImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
     virtual void EndElement();
 
@@ -174,9 +174,9 @@ public:
 class XMLTableTemplateContext : public SvXMLStyleContext
 {
 public:
-    XMLTableTemplateContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList );
+    XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList );
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
     virtual void StartElement( const Reference< XAttributeList >& xAttrList );
 
@@ -191,7 +191,7 @@ private:
 // class XMLProxyContext
 // --------------------------------------------------------------------
 
-XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, USHORT nPrfx, const OUString& rLName )
+XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, sal_uInt16 nPrfx, const OUString& rLName )
 : SvXMLImportContext( rImport, nPrfx, rLName )
 , mxParent( xParent )
 {
@@ -199,7 +199,7 @@ XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContext
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLProxyContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( mxParent.Is() )
         return mxParent->CreateChildContext( nPrefix, rLocalName, xAttrList );
@@ -233,7 +233,7 @@ XMLTableImport::~XMLTableImport()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext* XMLTableImport::CreateTableContext( USHORT nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange )
+SvXMLImportContext* XMLTableImport::CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange )
 {
     rtl::Reference< XMLTableImport > xThis( this );
     return new XMLTableImportContext( xThis, nPrfx, rLName, xColumnRowRange );
@@ -241,7 +241,7 @@ SvXMLImportContext* XMLTableImport::CreateTableContext( USHORT nPrfx, const OUSt
 
 // --------------------------------------------------------------------
 
-SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
+SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
 {
     return new XMLTableTemplateContext( mrImport, nPrfx, rLName, xAttrList );
 }
@@ -314,7 +314,7 @@ void XMLTableImport::finishStyles()
 // --------------------------------------------------------------------
 
 
-XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, USHORT nPrfx, const OUString& rLName,  Reference< XColumnRowRange >& xColumnRowRange )
+XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, sal_uInt16 nPrfx, const OUString& rLName,  Reference< XColumnRowRange >& xColumnRowRange )
 : SvXMLImportContext( xImporter->mrImport, nPrfx, rLName )
 , mxTableImporter( xImporter )
 , mxTable( xColumnRowRange, UNO_QUERY )
@@ -333,7 +333,7 @@ XMLTableImportContext::~XMLTableImportContext()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLTableImportContext::ImportColumn( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( mxColumns.is() && (mnCurrentRow == -1) ) try
     {
@@ -434,7 +434,7 @@ void XMLTableImportContext::InitColumns()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLTableImportContext::ImportRow( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLTableImportContext::ImportRow( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( mxRows.is() )
     {
@@ -516,7 +516,7 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( USHORT nPrefix, const OUS
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLTableImportContext::ImportCell( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     mnCurrentColumn++;
     if( mxColumns.is() ) try
@@ -551,7 +551,7 @@ SvXMLImportContext * XMLTableImportContext::ImportCell( USHORT nPrefix, const OU
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext *XMLTableImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext *XMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( nPrefix == XML_NAMESPACE_TABLE )
     {
@@ -619,7 +619,7 @@ OUString XMLTableImportContext::GetDefaultCellStyleName() const
 // XMLCellImportContext
 // --------------------------------------------------------------------
 
-XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Reference< XMergeableCell >& xCell, const OUString& sDefaultCellStyleName, USHORT nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
+XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Reference< XMergeableCell >& xCell, const OUString& sDefaultCellStyleName, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
 : SvXMLImportContext( rImport, nPrfx, rLName )
 , mxCell( xCell )
 , mbListContextPushed( false )
@@ -697,7 +697,7 @@ XMLCellImportContext::~XMLCellImportContext()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLCellImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLCellImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     // create text cursor on demand
     if( !mxCursor.is() )
@@ -763,7 +763,7 @@ void XMLCellImportContext::EndElement()
 // class XMLTableTemplateContext
 // --------------------------------------------------------------------
 
-XMLTableTemplateContext::XMLTableTemplateContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
+XMLTableTemplateContext::XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
 : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_TABLE_TEMPLATE_ID, sal_False )
 {
 }
@@ -776,7 +776,7 @@ void XMLTableTemplateContext::StartElement( const Reference< XAttributeList >& x
     for(sal_Int16 i=0; i < nAttrCount; i++)
     {
         OUString sAttrName;
-        USHORT nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
+        sal_uInt16 nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
         if( (nAttrPrefix == XML_NAMESPACE_TEXT ) && IsXMLToken( sAttrName, XML_STYLE_NAME ) )
         {
             msTemplateStyleName = xAttrList->getValueByIndex( i );
@@ -796,7 +796,7 @@ void XMLTableTemplateContext::EndElement()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( nPrefix == XML_NAMESPACE_TABLE )
     {
@@ -810,7 +810,7 @@ SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( USHORT nPrefix
             for(sal_Int16 i=0; i < nAttrCount; i++)
             {
                 OUString sAttrName;
-                USHORT nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
+                sal_uInt16 nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
                 if( (nAttrPrefix == XML_NAMESPACE_TEXT) && IsXMLToken( sAttrName, XML_STYLE_NAME ) )
                 {
                     maTableTemplate[pElements->msStyleName] = xAttrList->getValueByIndex( i );
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
index 6d14bd5ddc26..ed8e414bcb44 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
@@ -54,7 +54,7 @@ TYPEINIT1(XMLAutoTextContainerEventImport, SvXMLImportContext);
 
 XMLAutoTextContainerEventImport::XMLAutoTextContainerEventImport(
     SvXMLImport& rImport,
-    USHORT nPrfx,
+    sal_uInt16 nPrfx,
     const OUString& rLName,
     const Reference<XNameReplace> & rEvnts ) :
         SvXMLImportContext(rImport, nPrfx, rLName),
@@ -67,7 +67,7 @@ XMLAutoTextContainerEventImport::~XMLAutoTextContainerEventImport()
 }
 
 SvXMLImportContext* XMLAutoTextContainerEventImport::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> & )
 {
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
index 9d2aa2daa465..6dc762ffc960 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
@@ -55,7 +55,7 @@ public:
 
     XMLAutoTextContainerEventImport(
         SvXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
                 ::com::sun::star::container::XNameReplace > & rEvents );
@@ -66,7 +66,7 @@ public:
 protected:
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx
index 506ead5789a4..39fcb9cdc2d0 100644
--- a/xmloff/source/text/XMLChangeInfoContext.cxx
+++ b/xmloff/source/text/XMLChangeInfoContext.cxx
@@ -69,7 +69,7 @@ void XMLChangeInfoContext::StartElement(const Reference<XAttributeList> &)
 }
 
 SvXMLImportContext* XMLChangeInfoContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList >& xAttrList )
 {
diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx
index a2aeed545a48..6bb4ff3dec8d 100644
--- a/xmloff/source/text/XMLChangeInfoContext.hxx
+++ b/xmloff/source/text/XMLChangeInfoContext.hxx
@@ -75,7 +75,7 @@ public:
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 9f0658dc84da..9fa2cc660e03 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -303,7 +303,7 @@ void XMLFootnoteConfigurationImportContext::StartElement(
 }
 
 SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> & xAttrList )
 {
diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx
index 2d9df7ef1ef1..cd63a9b48a82 100644
--- a/xmloff/source/text/XMLStringBufferImportContext.cxx
+++ b/xmloff/source/text/XMLStringBufferImportContext.cxx
@@ -57,7 +57,7 @@ XMLStringBufferImportContext::~XMLStringBufferImportContext()
 }
 
 SvXMLImportContext *XMLStringBufferImportContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> &)
 {
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 4422241d822f..6bf7ba3ecdba 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -186,7 +186,7 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) :
 XMLTextListAutoStylePool::~XMLTextListAutoStylePool()
 {
     // The XMLTextListAutoStylePoolEntry_Impl object in the pool need delete explicitly in dtor.
-    ULONG nCount = pPool->Count();
+    sal_uLong nCount = pPool->Count();
     while ( nCount-- )
         delete pPool->Remove(nCount);
     delete pPool;
@@ -211,7 +211,7 @@ sal_Bool XMLTextListAutoStylePool::HasName( const OUString& rName ) const
 
 sal_uInt32 XMLTextListAutoStylePool::Find( XMLTextListAutoStylePoolEntry_Impl* pEntry ) const
 {
-    ULONG nPos;
+    sal_uLong nPos;
     if( !pEntry->IsNamed() && mxNumRuleCompare.is() )
     {
         const sal_uInt32 nCount = pPool->Count();
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 4ac42d4abebd..e9db515955c1 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -354,7 +354,7 @@ void XMLTextMarkImportContext::EndElement()
     }
 }
 
-SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix,
                                         const ::rtl::OUString& rLocalName,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >&  )
 {
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx
index c2c6a701ef8b..cfd7a43284bf 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -101,7 +101,7 @@ protected:
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
     virtual void EndElement();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx
index a1b3888b9ed6..bbbf79dc46d4 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.hxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.hxx
@@ -51,7 +51,7 @@ public:
     virtual ~XMLTextPropertySetContext();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 46aac523b55a..85d342ba5693 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -70,7 +70,7 @@ public:
     virtual ~XMLTextShapePropertySetContext_Impl();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const Reference< XAttributeList >& xAttrList,
         ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 3a4d6e6b7749..c269ad97455f 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -209,7 +209,7 @@ const sal_Char sAPI_is_fixed_language[] = "IsFixedLanguage";
 const sal_Char sAPI_is_visible[]        = "IsVisible";
 const sal_Char sAPI_TextRange[]         = "TextRange";
 
-const sal_Char sAPI_true[] = "TRUE";
+const sal_Char sAPI_true[] = "sal_True";
 
 
 TYPEINIT1( XMLTextFieldImportContext, SvXMLImportContext);
@@ -3661,7 +3661,7 @@ void XMLAnnotationImportContext::ProcessAttribute(
 }
 
 SvXMLImportContext* XMLAnnotationImportContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList >& xAttrList )
 {
@@ -3969,7 +3969,7 @@ bool lcl_ProcessLabel( const SvXMLImport& rImport,
 }
 
 SvXMLImportContext* XMLDropDownFieldImportContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 64a8b37a3539..a2cc3cbc4bfd 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -965,7 +965,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
     // rename field
     // currently: no family in use! Use 0.
     OUString sName = rImportHelper.GetRenameMap().Get(
-        sal::static_int_cast< USHORT >(eVarType), sVarName);
+        sal::static_int_cast< sal_uInt16 >(eVarType), sVarName);
 
     // get text fields supplier and field masters
     Reference<XTextFieldsSupplier> xTextFieldsSupp(rImport.GetModel(),
@@ -1017,7 +1017,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
             sNew = aBuf.makeStringAndClear();
 
             rImportHelper.GetRenameMap().Add(
-                sal::static_int_cast< USHORT >(eVarType), sName, sNew);
+                sal::static_int_cast< sal_uInt16 >(eVarType), sName, sNew);
 
             // call FindFieldMaster recursively to create new master
             return FindFieldMaster(xMaster, rImport, rImportHelper,
@@ -1042,7 +1042,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
             sNew = aBuf.makeStringAndClear();
 
             rImportHelper.GetRenameMap().Add(
-                sal::static_int_cast< USHORT >(eVarType), sName, sNew);
+                sal::static_int_cast< sal_uInt16 >(eVarType), sName, sNew);
 
             // call FindFieldMaster recursively to create new master
             return FindFieldMaster(xMaster, rImport, rImportHelper,
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index f2122ec3e0da..24488b7694be 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -154,7 +154,7 @@ bool ParseURLAsString(
     sal_Int32 params = rAttrValue.indexOf( '?' );
     if ( rAttrValue.indexOf( SCHEME ) != 0 || params < 0 )
     {
-        return FALSE;
+        return sal_False;
     }
 
     sal_Int32 start = SCHEME.getLength();
@@ -188,9 +188,9 @@ bool ParseURLAsString(
 
     if ( aLanguage.equalsIgnoreAsciiCaseAscii( "basic" ) )
     {
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 bool ParseURL(
@@ -236,11 +236,11 @@ bool ParseURL(
                     {
                         *pLocation = GetXMLToken( XML_APPLICATION );
                     }
-                    return TRUE;
+                    return sal_True;
                 }
             }
         }
-        return FALSE;
+        return sal_False;
     }
     else
     {
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index eef93b17e7fd..61bb73120da6 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -89,7 +89,7 @@ bool lcl_ConvertAttr( OUString & rOutAttribute, sal_Int32 nParam )
 
 // -----------------------------------------------------------------------------
 
-XMLTransformerContext *XMLTransformerBase::CreateContext( USHORT nPrefix,
+XMLTransformerContext *XMLTransformerBase::CreateContext( sal_uInt16 nPrefix,
     const OUString& rLocalName, const OUString& rQName )
 {
     XMLTransformerActions::key_type aKey( nPrefix, rLocalName );
diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index 8e4c6d9de48e..14f12bc5df69 100644
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -69,7 +69,7 @@ static SvXMLTokenMapEntry aChildren[] =
 
 SchemaContext::SchemaContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XDataTypeRepository>& rRepository ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributes, aChildren ),
diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index 75999d52f1dd..e3a0be34c29f 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -58,7 +58,7 @@ class SchemaContext : public TokenContext
 public:
 
     SchemaContext( SvXMLImport& rImport,
-                   USHORT nPrfx,
+                   sal_uInt16 nPrfx,
                    const ::rtl::OUString& rLName,
                    const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
     virtual ~SchemaContext();
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index 0c975b347bfc..0663aa2531f4 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -93,7 +93,7 @@ static SvXMLTokenMapEntry aChildren[] =
 
 SchemaRestrictionContext::SchemaRestrictionContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository,
     const OUString& sTypeName ) :
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index 9e43fdc43df0..c08251aadbbe 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -61,7 +61,7 @@ class SchemaRestrictionContext : public TokenContext
 public:
 
     SchemaRestrictionContext( SvXMLImport& rImport,
-                              USHORT nPrfx,
+                              sal_uInt16 nPrfx,
                               const ::rtl::OUString& rLName,
                               com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository,
                               const ::rtl::OUString& sTypeName );
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index bd327fd61ddd..821dd768fbf9 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -69,7 +69,7 @@ static SvXMLTokenMapEntry aChildren[] =
 
 SchemaSimpleTypeContext::SchemaSimpleTypeContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XDataTypeRepository>& rRepository ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributes, aChildren ),
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index e2bbcfc87b27..cf4221f7168c 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -59,7 +59,7 @@ class SchemaSimpleTypeContext : public TokenContext
 public:
 
     SchemaSimpleTypeContext( SvXMLImport& rImport,
-                             USHORT nPrfx,
+                             sal_uInt16 nPrfx,
                              const ::rtl::OUString& rLName,
                              const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
 
diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx
index 74c1e01d3433..d1310effeeb8 100644
--- a/xmloff/source/xforms/TokenContext.cxx
+++ b/xmloff/source/xforms/TokenContext.cxx
@@ -47,7 +47,7 @@ struct SvXMLTokenMapEntry aEmptyMap[1] =
 
 
 TokenContext::TokenContext( SvXMLImport& rImport,
-                            USHORT nPrefix,
+                            sal_uInt16 nPrefix,
                             const OUString& rLocalName,
                             const SvXMLTokenMapEntry* pAttributes,
                             const SvXMLTokenMapEntry* pChildren )
@@ -100,7 +100,7 @@ void TokenContext::StartElement(
 }
 
 SvXMLImportContext* TokenContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 4c726e24fbb5..7200eb0891a1 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -61,7 +61,7 @@ protected:
 public:
 
     TokenContext( SvXMLImport& rImport,
-                  USHORT nPrefix,
+                  sal_uInt16 nPrefix,
                   const ::rtl::OUString& rLocalName,
                   const SvXMLTokenMapEntry* pAttributes = NULL,
                   const SvXMLTokenMapEntry* pChildren = NULL );
@@ -84,7 +84,7 @@ public:
      * CreateChildCotnenxt may want to call the parent method for
      * handling of defaults. */
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index 51de4f2007fc..67bbf8f70b84 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -77,7 +77,7 @@ void lcl_fillNamespaceContainer( const SvXMLNamespaceMap&,
 
 XFormsBindContext::XFormsBindContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XPropertySet>& xModel ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributeMap, aEmptyMap ),
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index 43eb09d1c48b..af2d7a440e3a 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -60,7 +60,7 @@ class XFormsBindContext : public TokenContext
 public:
 
     XFormsBindContext( SvXMLImport& rImport,
-                       USHORT nPrefix,
+                       sal_uInt16 nPrefix,
                        const rtl::OUString& rLocalName,
                        const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xModel );
     virtual ~XFormsBindContext();
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index ce0573461081..06cabce7267f 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -72,7 +72,7 @@ static SvXMLTokenMapEntry aAttributes[] =
 
 XFormsInstanceContext::XFormsInstanceContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     Reference<XPropertySet> xModel ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributes, aEmptyMap ),
@@ -86,7 +86,7 @@ XFormsInstanceContext::~XFormsInstanceContext()
 }
 
 SvXMLImportContext* XFormsInstanceContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList>& )
 {
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index 924195e0fe11..2772aef7fd2f 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -63,7 +63,7 @@ class XFormsInstanceContext : public TokenContext
 public:
 
     XFormsInstanceContext( SvXMLImport& rImport,
-                           USHORT nPrfx,
+                           sal_uInt16 nPrfx,
                            const ::rtl::OUString& rLName,
                            com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xModel );
     virtual ~XFormsInstanceContext();
@@ -77,7 +77,7 @@ public:
     //
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 2bc3e13aaf62..074cbd7ddb8d 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -78,7 +78,7 @@ static SvXMLTokenMapEntry aChildren[] =
 
 
 XFormsModelContext::XFormsModelContext( SvXMLImport& rImport,
-                                        USHORT nPrefix,
+                                        sal_uInt16 nPrefix,
                                         const OUString& rLocalName ) :
     TokenContext( rImport, nPrefix, rLocalName, aAttributes, aChildren ),
     mxModel( lcl_createXFormsModel() )
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index 037c527606dd..5731b606f1bb 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -57,7 +57,7 @@ class XFormsModelContext : public TokenContext
 public:
 
     XFormsModelContext( SvXMLImport& rImport,
-                        USHORT nPrfx,
+                        sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName );
     virtual ~XFormsModelContext();
 
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 9f0bfa55bca3..7835cf5dc0a7 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -83,7 +83,7 @@ void lcl_fillNamespaceContainer( const SvXMLNamespaceMap&,
 
 XFormsSubmissionContext::XFormsSubmissionContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XPropertySet>& xModel ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributeMap, aEmptyMap ),
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index be337217caad..00cd2849603b 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -58,7 +58,7 @@ class XFormsSubmissionContext : public TokenContext
 public:
 
     XFormsSubmissionContext( SvXMLImport& rImport,
-                             USHORT nPrefix,
+                             sal_uInt16 nPrefix,
                              const rtl::OUString& rLocalName,
                              const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xModel );
     virtual ~XFormsSubmissionContext();
diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx
index 750444c62165..84908444498e 100644
--- a/xmloff/source/xforms/xformsimport.cxx
+++ b/xmloff/source/xforms/xformsimport.cxx
@@ -68,7 +68,7 @@ using rtl::OUString;
 
 SvXMLImportContext* createXFormsModelContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName )
 {
     return new XFormsModelContext( rImport, nPrefix, rLocalName );